Fix FirstStartWidget dismiss signal handling
This commit is contained in:
@@ -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<QPushButton*>(new QPushButton);
|
||||
_doneButton = gsl::owner<QPushButton*>(new QPushButton);
|
||||
connect(_doneButton, &QPushButton::clicked, this, &FirstStartWidget::dismissed);
|
||||
auto buttonBar = gsl::owner<QHBoxLayout*>(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("<h1>") + tr("Welcome to %1").arg(application)
|
||||
+ QLatin1String("</h1>"));
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -120,10 +120,10 @@ StartView::StartView(QWidget* parent)
|
||||
auto firstStartRegion = gsl::owner<QHBoxLayout*>(new QHBoxLayout(firstStartScrollArea));
|
||||
firstStartRegion->addStretch();
|
||||
auto firstStartWidget = gsl::owner<FirstStartWidget*>(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");
|
||||
|
||||
@@ -90,7 +90,7 @@ protected:
|
||||
void fileCardSelected(const QModelIndex& index);
|
||||
void showOnStartupChanged(bool checked);
|
||||
void openFirstStartClicked();
|
||||
void firstStartWidgetDoneClicked();
|
||||
void firstStartWidgetDismissed();
|
||||
|
||||
QString fileCardStyle() const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user