mirror of
https://github.com/YACReader/yacreader
synced 2025-07-17 20:44:32 -04:00
clang-format
This commit is contained in:
Luis Ángel San Martín
@ -20,12 +20,12 @@ HelpAboutDialog::HelpAboutDialog(QWidget *parent)
|
||||
|
||||
tabWidget->addTab(aboutText = new QTextBrowser(), tr("About"));
|
||||
aboutText->setOpenExternalLinks(true);
|
||||
//aboutText->setFont(QFont("Comic Sans MS", 10)); //purisa
|
||||
// aboutText->setFont(QFont("Comic Sans MS", 10)); //purisa
|
||||
tabWidget->addTab(helpText = new QTextBrowser(), tr("Help"));
|
||||
helpText->setOpenExternalLinks(true);
|
||||
//helpText->setFont(QFont("Comic Sans MS", 10));
|
||||
//helpText->setDisabled(true);
|
||||
//tabWidget->addTab(,"About Qt");
|
||||
// helpText->setFont(QFont("Comic Sans MS", 10));
|
||||
// helpText->setDisabled(true);
|
||||
// tabWidget->addTab(,"About Qt");
|
||||
|
||||
layout->addWidget(tabWidget);
|
||||
layout->setContentsMargins(1, 3, 1, 1);
|
||||
|
||||
@ -85,7 +85,7 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent)
|
||||
|
||||
mainLayout->addWidget(scrollArea);
|
||||
|
||||
//containerLayout->addWidget(content);
|
||||
// containerLayout->addWidget(content);
|
||||
scrollArea->setWidget(content);
|
||||
scrollArea->setWidgetResizable(true);
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
YACReaderDarkMenu::YACReaderDarkMenu(QWidget *parent)
|
||||
: QMenu(parent)
|
||||
{
|
||||
//solid color: #454545
|
||||
// solid color: #454545
|
||||
QString style = "QMenu {background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6B6B6B, stop: 1 #424242); "
|
||||
"border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BCBCBC, stop: 1 #4C4C4C);"
|
||||
"border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BCBCBC, stop: 1 #4C4C4C);"
|
||||
@ -22,17 +22,17 @@ YACReaderDarkMenu::YACReaderDarkMenu(QWidget *parent)
|
||||
setStyleSheet(style);
|
||||
|
||||
/*
|
||||
QPixmap p(":/images/icon.png");
|
||||
QLabel * l = new QLabel();
|
||||
l->setPixmap(p);
|
||||
l->move(0,-10);
|
||||
QPixmap p(":/images/icon.png");
|
||||
QLabel * l = new QLabel();
|
||||
l->setPixmap(p);
|
||||
l->move(0,-10);
|
||||
|
||||
//test
|
||||
YACReaderDarkMenu * customMenu = new YACReaderDarkMenu(this);
|
||||
customMenu->addAction(toggleFullScreenAction);
|
||||
customMenu->addAction(createLibraryAction);
|
||||
customMenu->addSeparator();
|
||||
customMenu->addAction(openComicAction);
|
||||
customMenu->show();
|
||||
*/
|
||||
//test
|
||||
YACReaderDarkMenu * customMenu = new YACReaderDarkMenu(this);
|
||||
customMenu->addAction(toggleFullScreenAction);
|
||||
customMenu->addAction(createLibraryAction);
|
||||
customMenu->addSeparator();
|
||||
customMenu->addAction(openComicAction);
|
||||
customMenu->show();
|
||||
*/
|
||||
}
|
||||
@ -81,19 +81,19 @@ void YACReaderDeletingProgress::paintEvent(QPaintEvent *event)
|
||||
|
||||
QPainter painter(this);
|
||||
|
||||
//corners
|
||||
// corners
|
||||
painter.drawPixmap(0, 0, pL);
|
||||
painter.drawPixmap(this->width() - borderRight, 0, pR);
|
||||
painter.drawPixmap(0, this->height() - pBL.height(), pBL);
|
||||
painter.drawPixmap(this->width() - pBR.width(), this->height() - borderBottom, pBR);
|
||||
|
||||
//middle
|
||||
// middle
|
||||
painter.drawPixmap(borderRight, 0, width, borderTop, pM);
|
||||
painter.drawPixmap(0, borderTop, borderLeft, height, pLM);
|
||||
painter.drawPixmap(width + borderLeft, borderTop, borderRight, height, pRM);
|
||||
painter.drawPixmap(pBR.width(), height + borderTop, this->width() - pBR.width() - pBL.width(), pBR.height(), pBM);
|
||||
|
||||
//center
|
||||
// center
|
||||
painter.fillRect(borderLeft, borderTop, width, height, QColor("#FAFAFA"));
|
||||
|
||||
QWidget::paintEvent(event);
|
||||
|
||||
@ -10,7 +10,7 @@ YACReaderFieldEdit::YACReaderFieldEdit(QWidget *parent)
|
||||
setModified(false);
|
||||
restore = new QAction(tr("Restore to default"), this);
|
||||
this->addAction(restore);
|
||||
//this->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
// this->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
}
|
||||
|
||||
void YACReaderFieldEdit::focusInEvent(QFocusEvent *e)
|
||||
|
||||
@ -9,7 +9,7 @@ YACReaderFieldPlainTextEdit::YACReaderFieldPlainTextEdit(QWidget *parent)
|
||||
setPlainText(tr("Click to overwrite"));
|
||||
restore = new QAction(tr("Restore to default"), this);
|
||||
this->addAction(restore);
|
||||
//this->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
// this->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
}
|
||||
|
||||
void YACReaderFieldPlainTextEdit::focusInEvent(QFocusEvent *e)
|
||||
@ -26,14 +26,14 @@ void YACReaderFieldPlainTextEdit::focusInEvent(QFocusEvent *e)
|
||||
void YACReaderFieldPlainTextEdit::focusOutEvent(QFocusEvent *e)
|
||||
{
|
||||
/*if (e->reason() == Qt::MouseFocusReason || e->reason() == Qt::TabFocusReason)
|
||||
{
|
||||
if(toPlainText().isEmpty())
|
||||
{
|
||||
setPlainText(tr("Click to overwrite"));
|
||||
document()->setModified(false);
|
||||
}
|
||||
}
|
||||
*/
|
||||
{
|
||||
if(toPlainText().isEmpty())
|
||||
{
|
||||
setPlainText(tr("Click to overwrite"));
|
||||
document()->setModified(false);
|
||||
}
|
||||
}
|
||||
*/
|
||||
QPlainTextEdit::focusOutEvent(e);
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ YACReaderFlowConfigWidget::YACReaderFlowConfigWidget(QWidget *parent)
|
||||
opt3->addWidget(lOpt3);
|
||||
vbox->addLayout(opt3);
|
||||
|
||||
//vbox->addStretch(1);
|
||||
// vbox->addStretch(1);
|
||||
groupBox->setLayout(vbox);
|
||||
|
||||
layout->addWidget(groupBox);
|
||||
|
||||
@ -14,23 +14,23 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget *parent /* = 0
|
||||
{
|
||||
QVBoxLayout *layout = new QVBoxLayout(this);
|
||||
|
||||
//PRESETS------------------------------------------------------------------
|
||||
// PRESETS------------------------------------------------------------------
|
||||
QGroupBox *groupBox = new QGroupBox(tr("Presets:"));
|
||||
|
||||
radioClassic = new QRadioButton(tr("Classic look"));
|
||||
//connect(radioClassic,SIGNAL(toggled(bool)),this,SLOT(setClassicConfig()));
|
||||
// connect(radioClassic,SIGNAL(toggled(bool)),this,SLOT(setClassicConfig()));
|
||||
|
||||
radioStripe = new QRadioButton(tr("Stripe look"));
|
||||
//connect(radioStripe,SIGNAL(toggled(bool)),this,SLOT(setStripeConfig()));
|
||||
// connect(radioStripe,SIGNAL(toggled(bool)),this,SLOT(setStripeConfig()));
|
||||
|
||||
radioOver = new QRadioButton(tr("Overlapped Stripe look"));
|
||||
//connect(radioOver,SIGNAL(toggled(bool)),this,SLOT(setOverlappedStripeConfig()));
|
||||
// connect(radioOver,SIGNAL(toggled(bool)),this,SLOT(setOverlappedStripeConfig()));
|
||||
|
||||
radionModern = new QRadioButton(tr("Modern look"));
|
||||
//connect(radionModern,SIGNAL(toggled(bool)),this,SLOT(setModernConfig()));
|
||||
// connect(radionModern,SIGNAL(toggled(bool)),this,SLOT(setModernConfig()));
|
||||
|
||||
radioDown = new QRadioButton(tr("Roulette look"));
|
||||
//connect(radioDown,SIGNAL(toggled(bool)),this,SLOT(setRouletteConfig()));
|
||||
// connect(radioDown,SIGNAL(toggled(bool)),this,SLOT(setRouletteConfig()));
|
||||
|
||||
QVBoxLayout *vbox = new QVBoxLayout;
|
||||
QHBoxLayout *opt1 = new QHBoxLayout;
|
||||
@ -81,74 +81,74 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget *parent /* = 0
|
||||
|
||||
groupBox->setLayout(vbox);
|
||||
|
||||
//OPTIONS------------------------------------------------------------------
|
||||
// OPTIONS------------------------------------------------------------------
|
||||
optionsGroupBox = new QGroupBox(tr("Custom:"));
|
||||
|
||||
xRotation = new YACReaderSpinSliderWidget(this);
|
||||
xRotation->setText(tr("View angle"));
|
||||
xRotation->setRange(0, 90);
|
||||
//connect(xRotation,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(xRotation,SIGNAL(valueChanged(int)),this,SLOT(saveXRotation(int)));
|
||||
// connect(xRotation,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(xRotation,SIGNAL(valueChanged(int)),this,SLOT(saveXRotation(int)));
|
||||
|
||||
yPosition = new YACReaderSpinSliderWidget(this);
|
||||
yPosition->setText(tr("Position"));
|
||||
yPosition->setRange(-100, 100);
|
||||
//connect(yPosition,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(yPosition,SIGNAL(valueChanged(int)),this,SLOT(saveYPosition(int)));
|
||||
// connect(yPosition,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(yPosition,SIGNAL(valueChanged(int)),this,SLOT(saveYPosition(int)));
|
||||
|
||||
coverDistance = new YACReaderSpinSliderWidget(this);
|
||||
coverDistance->setText(tr("Cover gap"));
|
||||
coverDistance->setRange(0, 150);
|
||||
//connect(coverDistance,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(coverDistance,SIGNAL(valueChanged(int)),this,SLOT(saveCoverDistance(int)));
|
||||
// connect(coverDistance,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(coverDistance,SIGNAL(valueChanged(int)),this,SLOT(saveCoverDistance(int)));
|
||||
|
||||
centralDistance = new YACReaderSpinSliderWidget(this);
|
||||
centralDistance->setText(tr("Central gap"));
|
||||
centralDistance->setRange(0, 150);
|
||||
//connect(centralDistance,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(centralDistance,SIGNAL(valueChanged(int)),this,SLOT(saveCentralDistance(int)));
|
||||
// connect(centralDistance,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(centralDistance,SIGNAL(valueChanged(int)),this,SLOT(saveCentralDistance(int)));
|
||||
|
||||
zoomLevel = new YACReaderSpinSliderWidget(this);
|
||||
zoomLevel->setText(tr("Zoom"));
|
||||
zoomLevel->setRange(-20, 0);
|
||||
//connect(zoomLevel,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(zoomLevel,SIGNAL(valueChanged(int)),this,SLOT(saveZoomLevel(int)));
|
||||
// connect(zoomLevel,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(zoomLevel,SIGNAL(valueChanged(int)),this,SLOT(saveZoomLevel(int)));
|
||||
|
||||
yCoverOffset = new YACReaderSpinSliderWidget(this);
|
||||
yCoverOffset->setText(tr("Y offset"));
|
||||
yCoverOffset->setRange(-50, 50);
|
||||
//connect(yCoverOffset,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(yCoverOffset,SIGNAL(valueChanged(int)),this,SLOT(saveYCoverOffset(int)));
|
||||
// connect(yCoverOffset,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(yCoverOffset,SIGNAL(valueChanged(int)),this,SLOT(saveYCoverOffset(int)));
|
||||
|
||||
zCoverOffset = new YACReaderSpinSliderWidget(this);
|
||||
zCoverOffset->setText(tr("Z offset"));
|
||||
zCoverOffset->setRange(-50, 50);
|
||||
//connect(zCoverOffset,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(zCoverOffset,SIGNAL(valueChanged(int)),this,SLOT(saveZCoverOffset(int)));
|
||||
// connect(zCoverOffset,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(zCoverOffset,SIGNAL(valueChanged(int)),this,SLOT(saveZCoverOffset(int)));
|
||||
|
||||
coverRotation = new YACReaderSpinSliderWidget(this);
|
||||
coverRotation->setText(tr("Cover Angle"));
|
||||
coverRotation->setRange(0, 360);
|
||||
//connect(coverRotation,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(coverRotation,SIGNAL(valueChanged(int)),this,SLOT(saveCoverRotation(int)));
|
||||
// connect(coverRotation,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(coverRotation,SIGNAL(valueChanged(int)),this,SLOT(saveCoverRotation(int)));
|
||||
|
||||
fadeOutDist = new YACReaderSpinSliderWidget(this);
|
||||
fadeOutDist->setText(tr("Visibility"));
|
||||
fadeOutDist->setRange(0, 10);
|
||||
//connect(fadeOutDist,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(fadeOutDist,SIGNAL(valueChanged(int)),this,SLOT(saveFadeOutDist(int)));
|
||||
// connect(fadeOutDist,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(fadeOutDist,SIGNAL(valueChanged(int)),this,SLOT(saveFadeOutDist(int)));
|
||||
|
||||
lightStrength = new YACReaderSpinSliderWidget(this);
|
||||
lightStrength->setText(tr("Light"));
|
||||
lightStrength->setRange(0, 10);
|
||||
//connect(lightStrength,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(lightStrength,SIGNAL(valueChanged(int)),this,SLOT(saveLightStrength(int)));
|
||||
// connect(lightStrength,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(lightStrength,SIGNAL(valueChanged(int)),this,SLOT(saveLightStrength(int)));
|
||||
|
||||
maxAngle = new YACReaderSpinSliderWidget(this);
|
||||
maxAngle->setText(tr("Max angle"));
|
||||
maxAngle->setRange(0, 90);
|
||||
//connect(maxAngle,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
//connect(maxAngle,SIGNAL(valueChanged(int)),this,SLOT(saveMaxAngle(int)));
|
||||
// connect(maxAngle,SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
|
||||
// connect(maxAngle,SIGNAL(valueChanged(int)),this,SLOT(saveMaxAngle(int)));
|
||||
|
||||
QVBoxLayout *optionsLayoutStretch = new QVBoxLayout;
|
||||
optionsLayoutStretch->setContentsMargins(0, 0, 0, 0);
|
||||
@ -200,8 +200,8 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget *parent /* = 0
|
||||
|
||||
QGroupBox *performanceGroupBox = new QGroupBox(tr("Performance:"));
|
||||
|
||||
//connect(performanceSlider, SIGNAL(valueChanged(int)),this,SLOT(savePerformance(int)));
|
||||
//connect(performanceSlider, SIGNAL(valueChanged(int)),this,SLOT(optionsChanged()));
|
||||
// connect(performanceSlider, SIGNAL(valueChanged(int)),this,SLOT(savePerformance(int)));
|
||||
// connect(performanceSlider, SIGNAL(valueChanged(int)),this,SLOT(optionsChanged()));
|
||||
|
||||
performanceGroupBox->setLayout(performanceLayout);
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ class YACReaderGLFlowConfigWidget : public QWidget
|
||||
public:
|
||||
YACReaderGLFlowConfigWidget(QWidget *parent = 0);
|
||||
|
||||
//GL.........................
|
||||
// GL.........................
|
||||
QRadioButton *radioClassic;
|
||||
QRadioButton *radioStripe;
|
||||
QRadioButton *radioOver;
|
||||
|
||||
@ -12,7 +12,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin
|
||||
mainLayout->setMargin(0);
|
||||
mainLayout->setSpacing(0);
|
||||
|
||||
//installEventFilter(this);
|
||||
// installEventFilter(this);
|
||||
|
||||
QPixmap iconPixmap(":/images/sidebar/libraryIcon.png");
|
||||
icon = new QLabel(this);
|
||||
@ -22,8 +22,8 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin
|
||||
|
||||
options = new QToolButton(this);
|
||||
#ifdef Q_OS_MAC
|
||||
//TODO fix this crazy hack for having a propper retina icon for the options
|
||||
//this hack has been perpetrated using Qt 5.5.0
|
||||
// TODO fix this crazy hack for having a propper retina icon for the options
|
||||
// this hack has been perpetrated using Qt 5.5.0
|
||||
QString sourceOptionsImage;
|
||||
if (devicePixelRatio() > 1)
|
||||
sourceOptionsImage = ":/images/sidebar/libraryOptions@2x.png";
|
||||
@ -44,23 +44,23 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin
|
||||
options->setStyleSheet("QToolButton {border:none;}");
|
||||
connect(options, &QAbstractButton::clicked, this, &YACReaderLibraryItemWidget::showOptions);
|
||||
/*up = new QToolButton(this);
|
||||
up->setIcon(QIcon(":/images/libraryUp.png"));
|
||||
up->setHidden(true);
|
||||
up->setFixedWidth(18);
|
||||
up->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
|
||||
up->setIcon(QIcon(":/images/libraryUp.png"));
|
||||
up->setHidden(true);
|
||||
up->setFixedWidth(18);
|
||||
up->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
|
||||
|
||||
down = new QToolButton(this);
|
||||
down->setIcon(QIcon(":/images/libraryDown.png"));
|
||||
down->setHidden(true);
|
||||
down->setFixedWidth(18);
|
||||
down->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);*/
|
||||
down = new QToolButton(this);
|
||||
down->setIcon(QIcon(":/images/libraryDown.png"));
|
||||
down->setHidden(true);
|
||||
down->setFixedWidth(18);
|
||||
down->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);*/
|
||||
|
||||
mainLayout->addWidget(icon);
|
||||
mainLayout->addWidget(nameLabel, Qt::AlignLeft);
|
||||
mainLayout->addStretch();
|
||||
mainLayout->addWidget(options);
|
||||
/*mainLayout->addWidget(up);
|
||||
mainLayout->addWidget(down);*/
|
||||
mainLayout->addWidget(down);*/
|
||||
|
||||
setLayout(mainLayout);
|
||||
#ifndef Q_OS_MAC
|
||||
@ -85,39 +85,39 @@ void YACReaderLibraryItemWidget::showUpDownButtons(bool show)
|
||||
|
||||
/*
|
||||
bool YACReaderLibraryItemWidget::eventFilter(QObject *object, QEvent *event){
|
||||
if(!isSelected && object==this && (event->type()==QEvent::Enter))
|
||||
{
|
||||
QString styleSheet = "background-color:#5E5E5E; border-top: 1px solid #5E5E5E;border-bottom: 1px solid #5E5E5E; ";
|
||||
setStyleSheet(styleSheet);
|
||||
if(!isSelected && object==this && (event->type()==QEvent::Enter))
|
||||
{
|
||||
QString styleSheet = "background-color:#5E5E5E; border-top: 1px solid #5E5E5E;border-bottom: 1px solid #5E5E5E; ";
|
||||
setStyleSheet(styleSheet);
|
||||
|
||||
up->setHidden(false);
|
||||
down->setHidden(false);
|
||||
options->setHidden(false);
|
||||
up->setHidden(false);
|
||||
down->setHidden(false);
|
||||
options->setHidden(false);
|
||||
|
||||
return true;
|
||||
}
|
||||
if(!isSelected && object==this && (event->type()==QEvent::Leave))
|
||||
{
|
||||
QString styleSheet = "background-color:#454545; border-top: 1px solid #454545;border-bottom: 1px solid #454545;";
|
||||
setStyleSheet(styleSheet);
|
||||
return true;
|
||||
}
|
||||
if(!isSelected && object==this && (event->type()==QEvent::Leave))
|
||||
{
|
||||
QString styleSheet = "background-color:#454545; border-top: 1px solid #454545;border-bottom: 1px solid #454545;";
|
||||
setStyleSheet(styleSheet);
|
||||
|
||||
up->setHidden(true);
|
||||
down->setHidden(true);
|
||||
options->setHidden(true);
|
||||
up->setHidden(true);
|
||||
down->setHidden(true);
|
||||
options->setHidden(true);
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(object==this && (event->type()==QEvent::MouseButtonRelease))
|
||||
{
|
||||
QString styleSheet = "background-color:#2E2E2E; border-top: 1px solid #1F1F1F;border-bottom: 1px solid #636363; padding-top:1px; padding-bottom:1px;";
|
||||
setStyleSheet(styleSheet);
|
||||
emit(selected(name,path));
|
||||
isSelected = true;
|
||||
return true;
|
||||
}
|
||||
if(object==this && (event->type()==QEvent::MouseButtonRelease))
|
||||
{
|
||||
QString styleSheet = "background-color:#2E2E2E; border-top: 1px solid #1F1F1F;border-bottom: 1px solid #636363; padding-top:1px; padding-bottom:1px;";
|
||||
setStyleSheet(styleSheet);
|
||||
emit(selected(name,path));
|
||||
isSelected = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return false;
|
||||
}*/
|
||||
|
||||
void YACReaderLibraryItemWidget::deselect()
|
||||
@ -135,7 +135,7 @@ void YACReaderLibraryItemWidget::deselect()
|
||||
icon->setPixmap(iconPixmap);
|
||||
|
||||
/*up->setHidden(true);
|
||||
down->setHidden(true);*/
|
||||
down->setHidden(true);*/
|
||||
options->setHidden(true);
|
||||
|
||||
isSelected = false;
|
||||
@ -144,7 +144,7 @@ void YACReaderLibraryItemWidget::deselect()
|
||||
void YACReaderLibraryItemWidget::select()
|
||||
{
|
||||
#ifdef Q_OS_MAC
|
||||
//QString styleSheet ="color: white; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;";
|
||||
// QString styleSheet ="color: white; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;";
|
||||
QString styleSheet = "color: white; background-color:#91c4f4; border-bottom:1px solid #91c4f4;";
|
||||
#else
|
||||
QString styleSheet = "color: white; background-color:#2E2E2E; font-weight:bold;";
|
||||
|
||||
@ -24,7 +24,7 @@ signals:
|
||||
public slots:
|
||||
void showUpDownButtons(bool show);
|
||||
|
||||
//bool eventFilter(QObject *object, QEvent *event);
|
||||
// bool eventFilter(QObject *object, QEvent *event);
|
||||
void select();
|
||||
void deselect();
|
||||
void setName(const QString &name);
|
||||
|
||||
@ -29,8 +29,8 @@ void YACReaderLibraryListWidget::addItem(QString name, QString path)
|
||||
|
||||
librariesList.insert(itr, library);
|
||||
|
||||
//connect(library,SIGNAL(selected(QString,QString)),this,SIGNAL(librarySelected(QString,QString)));
|
||||
//connect(library,SIGNAL(selected(QString,QString)),this,SLOT(updateLibraries(QString,QString)));
|
||||
// connect(library,SIGNAL(selected(QString,QString)),this,SIGNAL(librarySelected(QString,QString)));
|
||||
// connect(library,SIGNAL(selected(QString,QString)),this,SLOT(updateLibraries(QString,QString)));
|
||||
|
||||
mainLayout->insertWidget(i, library);
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include "yacreader_global.h"
|
||||
|
||||
//Wrapper for NSTextField
|
||||
// Wrapper for NSTextField
|
||||
class YACReaderMacOSXSearchLineEdit : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -18,7 +18,7 @@ public:
|
||||
public slots:
|
||||
QString text();
|
||||
void clear();
|
||||
void clearText(); //no signal emited
|
||||
void clearText(); // no signal emited
|
||||
void setDisabled(bool disabled);
|
||||
void setEnabled(bool enabled);
|
||||
|
||||
@ -26,7 +26,7 @@ private:
|
||||
void *nstextfield;
|
||||
|
||||
signals:
|
||||
//convenience signal for YACReaderLibrary search edit
|
||||
// convenience signal for YACReaderLibrary search edit
|
||||
void filterChanged(YACReader::SearchModifiers, QString);
|
||||
};
|
||||
|
||||
@ -53,7 +53,7 @@ public:
|
||||
explicit YACReaderMacOSXToolbar(QObject *parent = 0);
|
||||
void addAction(QAction *action);
|
||||
void addDropDownItem(const QList<QAction *> &actions, const QAction *defaultAction = 0);
|
||||
void addSpace(int size); //size in points
|
||||
void addSpace(int size); // size in points
|
||||
void addSeparator();
|
||||
void addStretch();
|
||||
void addWidget(QWidget *widget);
|
||||
@ -61,13 +61,13 @@ public:
|
||||
void hide();
|
||||
QMap<QString, QAction *> actions;
|
||||
|
||||
//hacks everywhere
|
||||
//convenience method for YACReaderLibrary search edit
|
||||
// hacks everywhere
|
||||
// convenience method for YACReaderLibrary search edit
|
||||
YACReaderMacOSXSearchLineEdit *addSearchEdit();
|
||||
//convenience method for showing the fit to width slider in MacOSX
|
||||
// convenience method for showing the fit to width slider in MacOSX
|
||||
QAction *addFitToWidthSlider(QAction *attachToAction);
|
||||
|
||||
//convenience method for switching the icon of the view selector
|
||||
// convenience method for switching the icon of the view selector
|
||||
void updateViewSelectorIcon(const QIcon &icon);
|
||||
|
||||
signals:
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#import "shortcuts_manager.h"
|
||||
|
||||
//----------------------------
|
||||
//A custom items separator for NSToolbar
|
||||
// A custom items separator for NSToolbar
|
||||
@interface CustomSeparator : NSView
|
||||
|
||||
@end
|
||||
@ -30,7 +30,7 @@
|
||||
@end
|
||||
|
||||
//----------------------------
|
||||
//Toolbar delegate, needed for allow disabled/enabled items
|
||||
// Toolbar delegate, needed for allow disabled/enabled items
|
||||
@interface MyToolbarDelegate : NSObject <NSToolbarDelegate> {
|
||||
@public
|
||||
YACReaderMacOSXToolbar *mytoolbar;
|
||||
@ -131,8 +131,8 @@
|
||||
@end
|
||||
|
||||
//----------------------------
|
||||
//detect changes in native text field
|
||||
//TODO implement validation and auto completion
|
||||
// detect changes in native text field
|
||||
// TODO implement validation and auto completion
|
||||
@interface MyTextFieldDelegate : NSObject <NSTextFieldDelegate> {
|
||||
@public
|
||||
YACReaderMacOSXSearchLineEdit *mylineedit;
|
||||
@ -154,7 +154,7 @@
|
||||
YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent)
|
||||
: viewSelector(0)
|
||||
{
|
||||
//setup native toolbar
|
||||
// setup native toolbar
|
||||
nativeToolBar = nativeToolbar();
|
||||
[nativeToolBar setDisplayMode:NSToolbarDisplayModeIconOnly];
|
||||
[nativeToolBar setAllowsUserCustomization:NO];
|
||||
@ -167,18 +167,18 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent)
|
||||
NSWindow *nswindow = (NSWindow *)qApp->platformNativeInterface()->nativeResourceForWindow("nswindow", ((QMainWindow *)parent)->windowHandle());
|
||||
if ([nswindow respondsToSelector:@selector(setTitleVisibility:)]) {
|
||||
yosemite = true;
|
||||
//TODO yosemite new constants are not found in compilation time
|
||||
// TODO yosemite new constants are not found in compilation time
|
||||
[nswindow setTitleVisibility:NSWindowTitleHidden];
|
||||
//TODO NSFullSizeContentViewWindowMask produces an offset in the windows' content
|
||||
//nswindow.styleMask |= 1 << 15; // NSFullSizeContentViewWindowMask;
|
||||
[nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; //TODO figure out how to load specific images in Yosemite
|
||||
// TODO NSFullSizeContentViewWindowMask produces an offset in the windows' content
|
||||
// nswindow.styleMask |= 1 << 15; // NSFullSizeContentViewWindowMask;
|
||||
[nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; // TODO figure out how to load specific images in Yosemite
|
||||
} else {
|
||||
[nativeToolBar setSizeMode:NSToolbarSizeModeSmall];
|
||||
yosemite = false;
|
||||
}
|
||||
#else
|
||||
yosemite = false;
|
||||
[nativeToolBar setAutosavesConfiguration:YES]; //TODO this doesn't work
|
||||
[nativeToolBar setAutosavesConfiguration:YES]; // TODO this doesn't work
|
||||
[nativeToolBar setSizeMode:NSToolbarSizeModeSmall];
|
||||
#endif
|
||||
}
|
||||
@ -194,12 +194,12 @@ void YACReaderMacOSXToolbar::addAction(QAction *action)
|
||||
actions.insert(QString::fromNSString(nativeItem.itemIdentifier), action);
|
||||
|
||||
MacToolBarItemWrapper *wrapper = new MacToolBarItemWrapper(action, toolBarItem);
|
||||
//wrapper->actionToogled(true);
|
||||
// wrapper->actionToogled(true);
|
||||
}
|
||||
|
||||
void YACReaderMacOSXToolbar::addDropDownItem(const QList<QAction *> &actions, const QAction *defaultAction)
|
||||
{
|
||||
//TODO
|
||||
// TODO
|
||||
}
|
||||
|
||||
void YACReaderMacOSXToolbar::addSpace(int size)
|
||||
@ -213,10 +213,10 @@ void YACReaderMacOSXToolbar::addSpace(int size)
|
||||
[nativeItem setView:view];
|
||||
}
|
||||
|
||||
//reimplemented for convenience
|
||||
// reimplemented for convenience
|
||||
void YACReaderMacOSXToolbar::addSeparator()
|
||||
{
|
||||
//QMacToolBar::addSeparator();
|
||||
// QMacToolBar::addSeparator();
|
||||
|
||||
QMacToolBarItem *toolBarItem = addItem(QIcon(), "");
|
||||
NSToolbarItem *nativeItem = toolBarItem->nativeToolBarItem();
|
||||
@ -235,7 +235,7 @@ void YACReaderMacOSXToolbar::addStretch()
|
||||
|
||||
void YACReaderMacOSXToolbar::addWidget(QWidget *widget)
|
||||
{
|
||||
//TODO fix it
|
||||
// TODO fix it
|
||||
/* QMacNativeWidget *nativeWidget = new QMacNativeWidget();
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
layout->addWidget(widget);
|
||||
@ -277,7 +277,7 @@ YACReaderMacOSXSearchLineEdit *YACReaderMacOSXToolbar::addSearchEdit()
|
||||
return searchEdit;
|
||||
}
|
||||
|
||||
//deprecated
|
||||
// deprecated
|
||||
QAction *YACReaderMacOSXToolbar::addFitToWidthSlider(QAction *attachToAction)
|
||||
{
|
||||
QMacToolBarItem *toolBarItem = addItem(QIcon(":/images/viewer_toolbar/toWidthSlider.png"), "fit to width slider");
|
||||
@ -302,7 +302,7 @@ YACReaderMacOSXSearchLineEdit::YACReaderMacOSXSearchLineEdit()
|
||||
: QObject()
|
||||
{
|
||||
NSRect searchEditFrameRect = { { 0.0, -3.0 }, { 165, 32.0 } };
|
||||
//NSTextField * searchEdit = [[NSTextField alloc] initWithFrame:searchEditFrameRect];
|
||||
// NSTextField * searchEdit = [[NSTextField alloc] initWithFrame:searchEditFrameRect];
|
||||
|
||||
NSTextField *searchEdit = [[NSSearchField alloc] initWithFrame:searchEditFrameRect];
|
||||
//[searchEdit setBezelStyle:NSTextFieldRoundedBezel];
|
||||
@ -341,7 +341,7 @@ void YACReaderMacOSXSearchLineEdit::clear()
|
||||
|
||||
void YACReaderMacOSXSearchLineEdit::clearText()
|
||||
{
|
||||
//TODO be sure that this will not generate any event....
|
||||
// TODO be sure that this will not generate any event....
|
||||
[((NSTextField *)nstextfield) setStringValue:@""];
|
||||
}
|
||||
|
||||
|
||||
@ -49,12 +49,12 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget *parent)
|
||||
#ifdef FORCE_ANGLE
|
||||
useGL->setHidden(true);
|
||||
#endif
|
||||
//sw CONNECTIONS
|
||||
// sw CONNECTIONS
|
||||
connect(sw->radio1, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setClassicConfigSW);
|
||||
connect(sw->radio2, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setStripeConfigSW);
|
||||
connect(sw->radio3, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setOverlappedStripeConfigSW);
|
||||
#ifndef NO_OPENGL
|
||||
//gl CONNECTIONS
|
||||
// gl CONNECTIONS
|
||||
connect(gl->radioClassic, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setClassicConfig);
|
||||
connect(gl->radioStripe, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setStripeConfig);
|
||||
connect(gl->radioOver, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setOverlappedStripeConfig);
|
||||
@ -219,7 +219,7 @@ void YACReaderOptionsDialog::restoreOptions(QSettings *settings)
|
||||
{
|
||||
this->settings = settings;
|
||||
|
||||
//FLOW CONFIG
|
||||
// FLOW CONFIG
|
||||
#ifndef NO_OPENGL
|
||||
if (settings->contains(USE_OPEN_GL) && settings->value(USE_OPEN_GL).toInt() == Qt::Checked) {
|
||||
sw->setVisible(false);
|
||||
@ -304,7 +304,7 @@ void YACReaderOptionsDialog::restoreOptions(QSettings *settings)
|
||||
return;
|
||||
}
|
||||
|
||||
//END FLOW CONFIG
|
||||
// END FLOW CONFIG
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
|
||||
setAttribute(Qt::WA_MacShowFocusRect, false);
|
||||
setPlaceholderText(tr("type to search"));
|
||||
|
||||
//search modifiers
|
||||
// search modifiers
|
||||
modifiers << "[read]"
|
||||
<< "[unread]"; //<< "[author]";
|
||||
modifiersCompleter = new QCompleter(modifiers);
|
||||
@ -77,7 +77,7 @@ void YACReaderSearchLineEdit::clearText()
|
||||
connect(this, &QLineEdit::textChanged, this, &YACReaderSearchLineEdit::processText);
|
||||
}
|
||||
|
||||
//modifiers are not returned
|
||||
// modifiers are not returned
|
||||
const QString YACReaderSearchLineEdit::text()
|
||||
{
|
||||
QString text = QLineEdit::text();
|
||||
@ -118,7 +118,7 @@ void YACReaderSearchLineEdit::processText(const QString &text)
|
||||
|
||||
QRegExp regExp("(\\[.*\\])(.*)");
|
||||
if (text.startsWith("[")) {
|
||||
if (regExp.exactMatch(text)) //avoid search while the modifiers are being written
|
||||
if (regExp.exactMatch(text)) // avoid search while the modifiers are being written
|
||||
{
|
||||
QString modifier = regExp.cap(1);
|
||||
QString searchText = regExp.cap(2).trimmed();
|
||||
@ -126,7 +126,7 @@ void YACReaderSearchLineEdit::processText(const QString &text)
|
||||
int indexOfModifier = modifiers.indexOf(modifier);
|
||||
if (indexOfModifier != -1) {
|
||||
QLOG_TRACE() << "modifier : " << modifier << "text : " << searchText;
|
||||
emit filterChanged(static_cast<YACReader::SearchModifiers>(indexOfModifier + 1), searchText); //TODO, do not use on indexOF
|
||||
emit filterChanged(static_cast<YACReader::SearchModifiers>(indexOfModifier + 1), searchText); // TODO, do not use on indexOF
|
||||
} else {
|
||||
QLOG_ERROR() << "invalid modifier : " << modifier;
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ class YACReaderSearchLineEdit : public QLineEdit
|
||||
|
||||
public:
|
||||
YACReaderSearchLineEdit(QWidget *parent = 0);
|
||||
void clearText(); //no signal emited;
|
||||
void clearText(); // no signal emited;
|
||||
const QString text();
|
||||
|
||||
protected:
|
||||
|
||||
@ -15,10 +15,10 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
{
|
||||
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
|
||||
|
||||
settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor
|
||||
settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); // TODO unificar la creación del fichero de config con el servidor
|
||||
settings->beginGroup("libraryConfig");
|
||||
|
||||
//widgets
|
||||
// widgets
|
||||
foldersView = new YACReaderFoldersView;
|
||||
readingListsView = new YACReaderReadingListsView;
|
||||
selectedLibrary = new YACReaderLibraryListWidget;
|
||||
@ -49,12 +49,12 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
selectedLibrary->setAttribute(Qt::WA_MacShowFocusRect, false);
|
||||
selectedLibrary->setFocusPolicy(Qt::NoFocus);
|
||||
|
||||
//layout
|
||||
// layout
|
||||
QVBoxLayout *l = new QVBoxLayout;
|
||||
|
||||
l->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
//LIBRARIES-------------------------------------------------------
|
||||
// LIBRARIES-------------------------------------------------------
|
||||
#ifndef Q_OS_MAC
|
||||
l->addSpacing(5);
|
||||
#endif
|
||||
@ -74,22 +74,22 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
l->addSpacing(6);
|
||||
#endif
|
||||
|
||||
//END LIBRARIES---------------------------------------------------
|
||||
// END LIBRARIES---------------------------------------------------
|
||||
|
||||
//FOLDERS---------------------------------------------------------
|
||||
// FOLDERS---------------------------------------------------------
|
||||
QWidget *foldersContainer = new QWidget(this);
|
||||
QVBoxLayout *foldersLayout = new QVBoxLayout;
|
||||
foldersLayout->setContentsMargins(0, 0, 0, 0);
|
||||
foldersLayout->setSpacing(0);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
//foldersLayout->addSpacing(6);
|
||||
// foldersLayout->addSpacing(6);
|
||||
|
||||
//foldersLayout->addSpacing(5);
|
||||
// foldersLayout->addSpacing(5);
|
||||
foldersLayout->addWidget(new YACReaderSideBarSeparator(this));
|
||||
foldersLayout->addSpacing(4);
|
||||
#else
|
||||
//foldersLayout->addSpacing(6);
|
||||
// foldersLayout->addSpacing(6);
|
||||
#endif
|
||||
|
||||
foldersLayout->addWidget(foldersTitle);
|
||||
@ -105,9 +105,9 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
|
||||
foldersContainer->setLayout(foldersLayout);
|
||||
splitter->addWidget(foldersContainer);
|
||||
//END FOLDERS------------------------------------------------------
|
||||
// END FOLDERS------------------------------------------------------
|
||||
|
||||
//READING LISTS----------------------------------------------------
|
||||
// READING LISTS----------------------------------------------------
|
||||
splitter->addWidget(readingListsView);
|
||||
|
||||
QVBoxLayout *readingListsHeaderLayout = new QVBoxLayout;
|
||||
@ -115,13 +115,13 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
readingListsHeaderLayout->setSpacing(0);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
//readingListsHeaderLayout->addSpacing(6);
|
||||
// readingListsHeaderLayout->addSpacing(6);
|
||||
|
||||
//readingListsHeaderLayout->addSpacing(5);
|
||||
// readingListsHeaderLayout->addSpacing(5);
|
||||
readingListsHeaderLayout->addWidget(new YACReaderSideBarSeparator(this));
|
||||
readingListsHeaderLayout->addSpacing(4);
|
||||
#else
|
||||
//readingListsHeaderLayout->addSpacing(6);
|
||||
// readingListsHeaderLayout->addSpacing(6);
|
||||
#endif
|
||||
|
||||
readingListsHeaderLayout->addWidget(readingListsTitle);
|
||||
@ -132,12 +132,12 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
|
||||
readingListsHeaderLayout->addSpacing(4);
|
||||
#endif
|
||||
|
||||
//readingListsLayout->addWidget(readingListsView);
|
||||
// readingListsLayout->addWidget(readingListsView);
|
||||
readingListsHeaderLayout->addStretch();
|
||||
QSplitterHandle *handle = splitter->handle(1);
|
||||
//handle->setCursor(QCursor(Qt::ArrowCursor));
|
||||
// handle->setCursor(QCursor(Qt::ArrowCursor));
|
||||
handle->setLayout(readingListsHeaderLayout);
|
||||
//END READING LISTS------------------------------------------------
|
||||
// END READING LISTS------------------------------------------------
|
||||
|
||||
l->addWidget(splitter);
|
||||
l->setSpacing(0);
|
||||
@ -160,16 +160,16 @@ void YACReaderSideBar::paintEvent(QPaintEvent *event)
|
||||
QPainter painter(this);
|
||||
|
||||
painter.fillRect(0, 0, width(), height(), QColor("#454545"));
|
||||
//QWidget::paintEvent(event);
|
||||
// QWidget::paintEvent(event);
|
||||
#endif
|
||||
|
||||
//QPixmap shadow(":/images/side_bar/shadow.png");
|
||||
//painter.drawPixmap(width()-shadow.width(),0,shadow.width(),height(),shadow);
|
||||
// QPixmap shadow(":/images/side_bar/shadow.png");
|
||||
// painter.drawPixmap(width()-shadow.width(),0,shadow.width(),height(),shadow);
|
||||
|
||||
// painter.setRenderHint(QPainter::Antialiasing);
|
||||
// painter.drawLine(rect().topLeft(), rect().bottomRight());
|
||||
|
||||
//QWidget::paintEvent(event);
|
||||
// QWidget::paintEvent(event);
|
||||
}
|
||||
|
||||
void YACReaderSideBar::closeEvent(QCloseEvent *event)
|
||||
|
||||
@ -16,8 +16,8 @@ YACReaderSocialDialog::YACReaderSocialDialog(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
{
|
||||
|
||||
//setWindowFlags(Qt::Window | Qt::Dialog | Qt::FramelessWindowHint);
|
||||
//setModal(true);
|
||||
// setWindowFlags(Qt::Window | Qt::Dialog | Qt::FramelessWindowHint);
|
||||
// setModal(true);
|
||||
|
||||
QToolButton *close = new QToolButton(this);
|
||||
close->setIcon(QIcon(":/images/social_dialog/close.png"));
|
||||
@ -90,11 +90,11 @@ void YACReaderSocialDialog::paintEvent(QPaintEvent *event)
|
||||
{
|
||||
QPainter painter(this);
|
||||
|
||||
//center
|
||||
// center
|
||||
painter.fillRect(169, 0, 291, 369, QColor("#F0F0F0"));
|
||||
painter.fillRect(169, 96, 291, 155, QColor("#FFFFFF"));
|
||||
|
||||
//QPixmap cover = QPixmap("c:/temp/6.jpg").scaledToHeight(369,Qt::SmoothTransformation);
|
||||
// QPixmap cover = QPixmap("c:/temp/6.jpg").scaledToHeight(369,Qt::SmoothTransformation);
|
||||
painter.drawPixmap(0, 0, 169, 369, cover, 0, 0, (169 * cover.height()) / 369, cover.height());
|
||||
|
||||
QPixmap shadow(":/images/social_dialog/shadow.png");
|
||||
|
||||
@ -88,5 +88,5 @@ QSize YACReaderSpinSliderWidget::minimumSizeHint() const
|
||||
void YACReaderSpinSliderWidget::setTracking(bool b)
|
||||
{
|
||||
tracking = b;
|
||||
//slider->setTracking(b);
|
||||
// slider->setTracking(b);
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ YACReaderTableView::YACReaderTableView(QWidget *parent)
|
||||
"QHeaderView::section:vertical {border-bottom: 1px solid #DFDFDF;border-top: 1px solid #FEFEFE;}"
|
||||
//"QTableView::item:hover {border-bottom: 1px solid #A3A3A3;border-top: 1px solid #A3A3A3; padding-bottom:1px; background-color: #A3A3A3; color: #FFFFFF; }"
|
||||
"");
|
||||
//comicView->setItemDelegate(new YACReaderComicViewDelegate());
|
||||
// comicView->setItemDelegate(new YACReaderComicViewDelegate());
|
||||
setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
|
||||
setShowGrid(false);
|
||||
@ -44,19 +44,19 @@ YACReaderTableView::YACReaderTableView(QWidget *parent)
|
||||
verticalHeader()->setResizeMode(QHeaderView::Fixed);
|
||||
#endif
|
||||
|
||||
//comicView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
|
||||
// comicView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
|
||||
horizontalHeader()->setStretchLastSection(true);
|
||||
#if QT_VERSION >= 0x050000
|
||||
horizontalHeader()->setSectionsClickable(false);
|
||||
#else
|
||||
horizontalHeader()->setClickable(false);
|
||||
#endif
|
||||
//comicView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
|
||||
// comicView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
|
||||
verticalHeader()->setDefaultSectionSize(24);
|
||||
#if QT_VERSION >= 0x050000
|
||||
verticalHeader()->setSectionsClickable(false); //TODO comportamiento anómalo
|
||||
verticalHeader()->setSectionsClickable(false); // TODO comportamiento anómalo
|
||||
#else
|
||||
verticalHeader()->setClickable(false); //TODO comportamiento anómalo
|
||||
verticalHeader()->setClickable(false); // TODO comportamiento anómalo
|
||||
#endif
|
||||
|
||||
setCornerButtonEnabled(false);
|
||||
@ -70,13 +70,13 @@ YACReaderTableView::YACReaderTableView(QWidget *parent)
|
||||
setMouseTracking(true);
|
||||
/*deletingProgress = new YACReaderDeletingProgress(this);
|
||||
|
||||
showDeletingProgressAnimation = new QPropertyAnimation(deletingProgress,"pos");
|
||||
showDeletingProgressAnimation->setDuration(150);*/
|
||||
showDeletingProgressAnimation = new QPropertyAnimation(deletingProgress,"pos");
|
||||
showDeletingProgressAnimation->setDuration(150);*/
|
||||
|
||||
//drag: if the default drag is enabled there is no way for setting a custom image
|
||||
//TODO report bug/suggestion
|
||||
//setDragEnabled(true);
|
||||
//setDragDropMode(QAbstractItemView::DragDrop);
|
||||
// drag: if the default drag is enabled there is no way for setting a custom image
|
||||
// TODO report bug/suggestion
|
||||
// setDragEnabled(true);
|
||||
// setDragDropMode(QAbstractItemView::DragDrop);
|
||||
setAcceptDrops(true);
|
||||
}
|
||||
|
||||
@ -102,14 +102,14 @@ void YACReaderTableView::mouseMoveEvent(QMouseEvent *event)
|
||||
} else
|
||||
closeRatingEditor();
|
||||
|
||||
//are we in a drag action??
|
||||
// are we in a drag action??
|
||||
if (event->buttons() & Qt::LeftButton) {
|
||||
int distance = (event->pos() - startDragPos).manhattanLength();
|
||||
if (distance >= QApplication::startDragDistance())
|
||||
performDrag();
|
||||
}
|
||||
|
||||
//disabled mouseMoveEvent in the parent class
|
||||
// disabled mouseMoveEvent in the parent class
|
||||
}
|
||||
void YACReaderTableView::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
@ -130,7 +130,7 @@ void YACReaderTableView::mousePressEvent(QMouseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
//this could be the origin of a new drag acction
|
||||
// this could be the origin of a new drag acction
|
||||
if (event->button() == Qt::LeftButton) {
|
||||
startDragPos = event->pos();
|
||||
}
|
||||
@ -146,7 +146,7 @@ void YACReaderTableView::performDrag()
|
||||
QLOG_DEBUG() << "performDrag";
|
||||
QDrag *drag = new QDrag(this);
|
||||
drag->setMimeData(model()->mimeData(selectionModel()->selectedRows()));
|
||||
drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); //TODO add better image
|
||||
drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); // TODO add better image
|
||||
|
||||
/*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
|
||||
}
|
||||
@ -194,7 +194,7 @@ void YACReaderTableView::closeEditor(QWidget *editor, QAbstractItemDelegate::End
|
||||
}
|
||||
void YACReaderTableView::commitData(QWidget *editor)
|
||||
{
|
||||
//TODO
|
||||
// TODO
|
||||
StarEditor *starEditor = qobject_cast<StarEditor *>(editor);
|
||||
if (starEditor->getShouldCommitData())
|
||||
emit comicRated(((StarEditor *)editor)->starRating().starCount(), currentIndexEditing);
|
||||
@ -204,37 +204,37 @@ void YACReaderTableView::showDeleteProgress()
|
||||
{
|
||||
/*showDelete = true;
|
||||
|
||||
showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
|
||||
showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,1));
|
||||
showDeletingProgressAnimation->start();*/
|
||||
showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
|
||||
showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,1));
|
||||
showDeletingProgressAnimation->start();*/
|
||||
}
|
||||
|
||||
void YACReaderTableView::hideDeleteProgress()
|
||||
{
|
||||
/*showDelete = false;
|
||||
|
||||
if(showDeletingProgressAnimation->state()==QPropertyAnimation::Running)
|
||||
showDeletingProgressAnimation->stop();
|
||||
if(showDeletingProgressAnimation->state()==QPropertyAnimation::Running)
|
||||
showDeletingProgressAnimation->stop();
|
||||
|
||||
showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
|
||||
showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,-deletingProgress->height()));
|
||||
showDeletingProgressAnimation->start();*/
|
||||
showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
|
||||
showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,-deletingProgress->height()));
|
||||
showDeletingProgressAnimation->start();*/
|
||||
}
|
||||
|
||||
void YACReaderTableView::resizeEvent(QResizeEvent *event)
|
||||
{
|
||||
/*event->size();
|
||||
|
||||
if(showDelete)
|
||||
deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,1);
|
||||
else
|
||||
deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,-deletingProgress->height());*/
|
||||
if(showDelete)
|
||||
deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,1);
|
||||
else
|
||||
deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,-deletingProgress->height());*/
|
||||
|
||||
QTableView::resizeEvent(event);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//YACReaderRatingDelegate-------------------------------------------------------
|
||||
// YACReaderRatingDelegate-------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
void YACReaderRatingDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const
|
||||
@ -307,7 +307,7 @@ void YACReaderRatingDelegate::sendCloseEditor()
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------
|
||||
//StarRating---------------------------------------------------------------------
|
||||
// StarRating---------------------------------------------------------------------
|
||||
//-------------------------------------------------------------------------------
|
||||
|
||||
const int PaintingScaleFactor = 20;
|
||||
@ -347,9 +347,9 @@ void StarRating::paint(QPainter *painter, const QRect &rect,
|
||||
painter->setRenderHint(QPainter::Antialiasing, true);
|
||||
painter->setPen(Qt::NoPen);
|
||||
|
||||
//if (mode == Editable) {
|
||||
// painter->setBrush(palette.highlight());
|
||||
//} else {
|
||||
// if (mode == Editable) {
|
||||
// painter->setBrush(palette.highlight());
|
||||
// } else {
|
||||
QBrush brush(QColor("#e9be0f"));
|
||||
painter->setBrush(brush);
|
||||
//}
|
||||
@ -408,14 +408,14 @@ void StarRating::paintSelected(QPainter *painter, const QRect &rect,
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------
|
||||
//StarEditor---------------------------------------------------------------------
|
||||
// StarEditor---------------------------------------------------------------------
|
||||
//-------------------------------------------------------------------------------
|
||||
|
||||
StarEditor::StarEditor(QWidget *parent)
|
||||
: QWidget(parent), shouldCommitData(false)
|
||||
{
|
||||
//setMouseTracking(true);
|
||||
//setAutoFillBackground(true);
|
||||
// setMouseTracking(true);
|
||||
// setAutoFillBackground(true);
|
||||
}
|
||||
|
||||
QSize StarEditor::sizeHint() const
|
||||
@ -426,9 +426,9 @@ QSize StarEditor::sizeHint() const
|
||||
void StarEditor::paintEvent(QPaintEvent *)
|
||||
{
|
||||
/*
|
||||
QPainter painter(this);
|
||||
myStarRating.paintSelected(&painter, rect(), this->palette(),
|
||||
StarRating::Editable,QColor("#615f59"));*/
|
||||
QPainter painter(this);
|
||||
myStarRating.paintSelected(&painter, rect(), this->palette(),
|
||||
StarRating::Editable,QColor("#615f59"));*/
|
||||
}
|
||||
|
||||
void StarEditor::mouseMoveEvent(QMouseEvent *event)
|
||||
@ -436,10 +436,10 @@ void StarEditor::mouseMoveEvent(QMouseEvent *event)
|
||||
Q_UNUSED(event)
|
||||
/*int star = starAtPosition(event->x());
|
||||
|
||||
if (star != myStarRating.starCount() && star != -1) {
|
||||
myStarRating.setStarCount(star);
|
||||
update();
|
||||
}*/
|
||||
if (star != myStarRating.starCount() && star != -1) {
|
||||
myStarRating.setStarCount(star);
|
||||
update();
|
||||
}*/
|
||||
}
|
||||
void StarEditor::leaveEvent(QEvent *event)
|
||||
{
|
||||
|
||||
@ -43,7 +43,7 @@ private:
|
||||
QModelIndex currentIndexEditing;
|
||||
QWidget *myeditor;
|
||||
|
||||
//drag from here
|
||||
// drag from here
|
||||
QPoint startDragPos;
|
||||
};
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ YACReaderTitledToolBar::YACReaderTitledToolBar(const QString &title, QWidget *pa
|
||||
#ifdef Q_OS_MAC
|
||||
QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}";
|
||||
nameLabel->setColor(QColor("#808080"));
|
||||
//nameLabel->setDropShadowColor(QColor("#F9FAFB"));
|
||||
// nameLabel->setDropShadowColor(QColor("#F9FAFB"));
|
||||
#else
|
||||
QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}";
|
||||
nameLabel->setColor(QColor("#BDBFBF"));
|
||||
@ -93,7 +93,7 @@ void YACReaderTitledToolBar::addAction(QAction *action)
|
||||
{
|
||||
QHBoxLayout *mainLayout = dynamic_cast<QHBoxLayout *>(layout());
|
||||
|
||||
//fix for QToolButton and retina support in OSX
|
||||
// fix for QToolButton and retina support in OSX
|
||||
#ifdef Q_OS_MAC
|
||||
QPushButton *pb = new QPushButton(this);
|
||||
pb->setCursor(QCursor(Qt::ArrowCursor));
|
||||
@ -109,7 +109,7 @@ void YACReaderTitledToolBar::addAction(QAction *action)
|
||||
tb->setDefaultAction(action);
|
||||
tb->setIconSize(QSize(16, 16));
|
||||
tb->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||
//tb->setStyleSheet("QToolButton:hover {background-color:#C5C5C5;}");
|
||||
// tb->setStyleSheet("QToolButton:hover {background-color:#C5C5C5;}");
|
||||
|
||||
mainLayout->addWidget(tb);
|
||||
#endif
|
||||
|
||||
@ -7,7 +7,7 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent)
|
||||
setDragDropMode(QAbstractItemView::DropOnly);
|
||||
setItemsExpandable(true);
|
||||
|
||||
//setDragEnabled(true);
|
||||
// setDragEnabled(true);
|
||||
/*viewport()->setAcceptDrops(true);
|
||||
setDropIndicatorShown(true);*/
|
||||
|
||||
@ -84,7 +84,7 @@ void YACReaderTreeView::dragMoveEvent(QDragMoveEvent *event)
|
||||
{
|
||||
QTreeView::dragMoveEvent(event);
|
||||
|
||||
//fix for drop auto expand
|
||||
// fix for drop auto expand
|
||||
QModelIndex underMouse = indexAt(event->pos());
|
||||
if (underMouse.isValid()) {
|
||||
expandPos = event->pos();
|
||||
@ -92,7 +92,7 @@ void YACReaderTreeView::dragMoveEvent(QDragMoveEvent *event)
|
||||
expandTimer.setSingleShot(true);
|
||||
expandTimer.start(500);
|
||||
}
|
||||
//force mouse hover decoration, TODO why the event loop is not working here?
|
||||
// force mouse hover decoration, TODO why the event loop is not working here?
|
||||
if (!t.isActive()) {
|
||||
t.setSingleShot(true);
|
||||
t.setInterval(50);
|
||||
|
||||
@ -10,17 +10,17 @@ public:
|
||||
explicit YACReaderTreeView(QWidget *parent = 0);
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
protected slots:
|
||||
//fix for drop auto expand
|
||||
// fix for drop auto expand
|
||||
void expandCurrent();
|
||||
|
||||
protected:
|
||||
//Drop to import
|
||||
// Drop to import
|
||||
void dragEnterEvent(QDragEnterEvent *event);
|
||||
void dragLeaveEvent(QDragLeaveEvent *event);
|
||||
void dragMoveEvent(QDragMoveEvent *event);
|
||||
void dropEvent(QDropEvent *event);
|
||||
|
||||
//fix for drop auto expand
|
||||
// fix for drop auto expand
|
||||
QTimer expandTimer;
|
||||
QTimer t;
|
||||
QPoint expandPos;
|
||||
|
||||
Reference in New Issue
Block a user