mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

GoTo flows: Untangle and refactor goTo signal to new syntax

Browse Source
This commit is contained in:
Felix Kauselmann 2021-06-22 08:25:54 +02:00
parent a3a1e32198
commit 5dbbaad73b
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReader/goto_flow.cpp
View File

@ -43,7 +43,7 @@ GoToFlow::GoToFlow(QWidget *parent, FlowType flowType)
connect(flow, &PictureFlow::centerIndexChanged, this, &GoToFlow::preload); connect(flow, &PictureFlow::centerIndexChanged, this, &GoToFlow::preload);
connect(flow, &PictureFlow::centerIndexChangedSilent, this, &GoToFlow::preload); connect(flow, &PictureFlow::centerIndexChangedSilent, this, &GoToFlow::preload);
connect(toolBar, SIGNAL(goTo(unsigned int)), this, SIGNAL(goToPage(unsigned int))); connect(toolBar, &GoToFlowToolBar::goToPage, this, &GoToFlow::goToPage);
connect(toolBar, &GoToFlowToolBar::setCenter, flow, &PictureFlow::showSlide); connect(toolBar, &GoToFlowToolBar::setCenter, flow, &PictureFlow::showSlide);
mainLayout->addWidget(flow); mainLayout->addWidget(flow);

3
YACReader/goto_flow.h
View File

@ -63,9 +63,6 @@ public slots:
void setFlowType(FlowType flowType) override; void setFlowType(FlowType flowType) override;
void updateConfig(QSettings *settings) override; void updateConfig(QSettings *settings) override;
void setFlowRightToLeft(bool b) override; void setFlowRightToLeft(bool b) override;
signals:
void goToPage(unsigned int page);
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
YACReader/goto_flow_gl.cpp
View File

@ -24,7 +24,7 @@ GoToFlowGL::GoToFlowGL(QWidget *parent, FlowType flowType)
connect(flow, &YACReaderFlowGL::centerIndexChanged, this, &GoToFlowWidget::setPageNumber); connect(flow, &YACReaderFlowGL::centerIndexChanged, this, &GoToFlowWidget::setPageNumber);
connect(flow, &YACReaderFlowGL::selected, this, &GoToFlowGL::goToPage); connect(flow, &YACReaderFlowGL::selected, this, &GoToFlowGL::goToPage);
connect(toolBar, SIGNAL(goTo(unsigned int)), this, SIGNAL(goToPage(unsigned int))); connect(toolBar, &GoToFlowToolBar::goToPage, this, &GoToFlowGL::goToPage);
connect(toolBar, &GoToFlowToolBar::setCenter, flow, &YACReaderFlowGL::setCenterIndex); connect(toolBar, &GoToFlowToolBar::setCenter, flow, &YACReaderFlowGL::setCenterIndex);
mainLayout->addWidget(flow); mainLayout->addWidget(flow);

3
YACReader/goto_flow_gl.h
View File

@ -27,9 +27,6 @@ public:
void updateConfig(QSettings *settings); void updateConfig(QSettings *settings);
void setFlowRightToLeft(bool b) override; void setFlowRightToLeft(bool b) override;
signals:
void goToPage(unsigned int page);
private: private:
YACReaderPageFlowGL *flow; YACReaderPageFlowGL *flow;
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;

8
YACReader/goto_flow_toolbar.cpp
View File

@ -32,7 +32,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget *parent)
" border-radius: 1px;" " border-radius: 1px;"
"}"); "}");
connect(slider, &QSlider::valueChanged, this, [&](int v) { emit(setCenter(v)); }); connect(slider, &QSlider::valueChanged, this, [this](int v) { emit(setCenter(v)); });
pageHint = new QLabel("<b>" + tr("Page : ") + "</b>", this); pageHint = new QLabel("<b>" + tr("Page : ") + "</b>", this);
v = new QIntValidator(this); v = new QIntValidator(this);
@ -47,7 +47,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget *parent)
//edit->resize(QSize(54,50)); //edit->resize(QSize(54,50));
edit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); edit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
//edit->setAutoFillBackground(false); //edit->setAutoFillBackground(false);
connect(edit, SIGNAL(returnPressed()), this, SLOT(goTo())); connect(edit, &QLineEdit::returnPressed, this, &GoToFlowToolBar::goTo);
QString centerButtonCSS = "QPushButton {background-image: url(:/images/imgCenterSlide.png); width: 100%; height:100%; background-repeat: none; border: none;} " QString centerButtonCSS = "QPushButton {background-image: url(:/images/imgCenterSlide.png); width: 100%; height:100%; background-repeat: none; border: none;} "
"QPushButton:focus { border: none; outline: none;}" "QPushButton:focus { border: none; outline: none;}"
@ -68,7 +68,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget *parent)
goToButton->setFixedSize(32, 50); goToButton->setFixedSize(32, 50);
goToButton->setAttribute(Qt::WA_LayoutUsesWidgetRect, true); goToButton->setAttribute(Qt::WA_LayoutUsesWidgetRect, true);
connect(goToButton, SIGNAL(clicked()), this, SLOT(goTo())); connect(goToButton, &QPushButton::clicked, this, &GoToFlowToolBar::goTo);
normalLayout->setMargin(0); normalLayout->setMargin(0);
normalLayout->setSpacing(0); normalLayout->setSpacing(0);
@ -110,7 +110,7 @@ void GoToFlowToolBar::setTop(int numPages)
void GoToFlowToolBar::goTo() void GoToFlowToolBar::goTo()
{ {
if (edit->text().toInt() != 0) if (edit->text().toInt() != 0)
emit(goTo(edit->text().toInt() - 1)); emit(goToPage(edit->text().toInt() - 1));
} }
void GoToFlowToolBar::centerSlide() void GoToFlowToolBar::centerSlide()

2
YACReader/goto_flow_toolbar.h
View File

@ -34,7 +34,7 @@ public slots:
void updateOptions(); void updateOptions();
signals: signals:
void setCenter(unsigned int); void setCenter(unsigned int);
void goTo(unsigned int); void goToPage(unsigned int);
}; };
#endif #endif

2
YACReader/goto_flow_widget.h
View File

@ -31,6 +31,8 @@ public slots:
virtual void updateSize(); virtual void updateSize();
virtual void updateConfig(QSettings *settings); virtual void updateConfig(QSettings *settings);
virtual void setFlowRightToLeft(bool b) = 0; virtual void setFlowRightToLeft(bool b) = 0;
signals:
void goToPage(unsigned int);
protected: protected:
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;

2
YACReader/viewer.cpp
View File

@ -158,7 +158,7 @@ void Viewer::createConnections()
connect(goToDialog, &GoToDialog::goToPage, this, &Viewer::goTo); connect(goToDialog, &GoToDialog::goToPage, this, &Viewer::goTo);
//goToFlow goTo //goToFlow goTo
connect(goToFlow, SIGNAL(goToPage(unsigned int)), this, SLOT(goTo(unsigned int))); connect(goToFlow, &GoToFlowWidget::goToPage, this, &Viewer::goTo);
//current time //current time
auto t = new QTimer(this); auto t = new QTimer(this);