diff --git a/src/Mod/Start/Gui/FirstStartWidget.cpp b/src/Mod/Start/Gui/FirstStartWidget.cpp index 16050e1358..9a00acfbcc 100644 --- a/src/Mod/Start/Gui/FirstStartWidget.cpp +++ b/src/Mod/Start/Gui/FirstStartWidget.cpp @@ -48,7 +48,7 @@ FirstStartWidget::FirstStartWidget(QWidget* parent) , _generalSettingsWidget {nullptr} , _welcomeLabel {nullptr} , _descriptionLabel {nullptr} - , doneButton {nullptr} + , _doneButton {nullptr} { setObjectName(QLatin1String("FirstStartWidget")); setupUi(); @@ -71,10 +71,11 @@ void FirstStartWidget::setupUi() outerLayout->addWidget(_generalSettingsWidget); outerLayout->addWidget(_themeSelectorWidget); - doneButton = gsl::owner(new QPushButton); + _doneButton = gsl::owner(new QPushButton); + connect(_doneButton, &QPushButton::clicked, this, &FirstStartWidget::dismissed); auto buttonBar = gsl::owner(new QHBoxLayout); buttonBar->addStretch(); - buttonBar->addWidget(doneButton); + buttonBar->addWidget(_doneButton); outerLayout->addLayout(buttonBar); outerLayout->addStretch(); @@ -91,7 +92,7 @@ bool FirstStartWidget::eventFilter(QObject* object, QEvent* event) void FirstStartWidget::retranslateUi() { - doneButton->setText(tr("Done")); + _doneButton->setText(tr("Done")); QString application = QString::fromUtf8(App::Application::Config()["ExeName"].c_str()); _welcomeLabel->setText(QLatin1String("

") + tr("Welcome to %1").arg(application) + QLatin1String("

")); diff --git a/src/Mod/Start/Gui/FirstStartWidget.h b/src/Mod/Start/Gui/FirstStartWidget.h index 7cc4031e91..7a5b4505c6 100644 --- a/src/Mod/Start/Gui/FirstStartWidget.h +++ b/src/Mod/Start/Gui/FirstStartWidget.h @@ -42,7 +42,7 @@ class FirstStartWidget: public QGroupBox public: explicit FirstStartWidget(QWidget* parent = nullptr); bool eventFilter(QObject* object, QEvent* event) override; - QPushButton* doneButton; + Q_SIGNAL void dismissed(); private: void retranslateUi(); @@ -53,6 +53,7 @@ private: QLabel* _welcomeLabel; QLabel* _descriptionLabel; + QPushButton* _doneButton; }; } // namespace StartGui diff --git a/src/Mod/Start/Gui/StartView.cpp b/src/Mod/Start/Gui/StartView.cpp index b10d2d7887..481e142398 100644 --- a/src/Mod/Start/Gui/StartView.cpp +++ b/src/Mod/Start/Gui/StartView.cpp @@ -120,10 +120,10 @@ StartView::StartView(QWidget* parent) auto firstStartRegion = gsl::owner(new QHBoxLayout(firstStartScrollArea)); firstStartRegion->addStretch(); auto firstStartWidget = gsl::owner(new FirstStartWidget(this)); - connect(firstStartWidget->doneButton, - &QPushButton::clicked, + connect(firstStartWidget, + &FirstStartWidget::dismissed, this, - &StartView::firstStartWidgetDoneClicked); + &StartView::firstStartWidgetDismissed); firstStartRegion->addWidget(firstStartWidget); firstStartRegion->addStretch(); _contents->addWidget(firstStartScrollArea); @@ -452,7 +452,7 @@ void StartView::openFirstStartClicked() _contents->setCurrentIndex(0); } -void StartView::firstStartWidgetDoneClicked() +void StartView::firstStartWidgetDismissed() { auto hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/Mod/Start"); diff --git a/src/Mod/Start/Gui/StartView.h b/src/Mod/Start/Gui/StartView.h index ebe5d87ee3..1c4f589551 100644 --- a/src/Mod/Start/Gui/StartView.h +++ b/src/Mod/Start/Gui/StartView.h @@ -90,7 +90,7 @@ protected: void fileCardSelected(const QModelIndex& index); void showOnStartupChanged(bool checked); void openFirstStartClicked(); - void firstStartWidgetDoneClicked(); + void firstStartWidgetDismissed(); QString fileCardStyle() const;