diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 46d8b8a9..69e9f81c 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -509,6 +509,7 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() connect(mpSpoilerPathButton, SIGNAL(clicked()), this, SLOT(spoilerPathButtonClicked())); updateNowButton = new QPushButton(tr("Update Spoilers")); + updateNowButton->setFixedWidth(150); connect(updateNowButton, SIGNAL(clicked()), this, SLOT(updateSpoilers())); // Update the GUI depending on if the box is ticked or not @@ -518,11 +519,12 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() lpGeneralGrid->addWidget(&mcGeneralMessageLabel, 0, 0); lpSpoilerGrid->addWidget(&mcDownloadSpoilersCheckBox, 0, 0); - lpSpoilerGrid->addWidget(updateNowButton, 0, 2); lpSpoilerGrid->addWidget(&mcSpoilerSaveLabel, 1, 0); lpSpoilerGrid->addWidget(mpSpoilerSavePathLineEdit, 1, 1); lpSpoilerGrid->addWidget(mpSpoilerPathButton, 1, 2); - lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 2, 0, 1, 3, Qt::AlignTop); + lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0); + lpSpoilerGrid->addWidget(updateNowButton, 2, 1); + lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop); // On a change to the check box, hide/unhide the other fields connect(&mcDownloadSpoilersCheckBox, SIGNAL(toggled(bool)), settingsCache, SLOT(setDownloadSpoilerStatus(bool))); @@ -590,6 +592,7 @@ void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput) mcSpoilerSaveLabel.setEnabled(anInput); mpSpoilerSavePathLineEdit->setEnabled(anInput); mpSpoilerPathButton->setEnabled(anInput); + lastUpdatedLabel.setEnabled(anInput); updateNowButton->setEnabled(anInput); infoOnSpoilersLabel.setEnabled(anInput); @@ -604,8 +607,8 @@ void DeckEditorSettingsPage::retranslateUi() mcDownloadSpoilersCheckBox.setText(tr("Download Spoilers Automatically")); mcSpoilerSaveLabel.setText(tr("Spoiler Location:")); mcGeneralMessageLabel.setText(tr("Hey, something's here finally!")); - infoOnSpoilersLabel.setText(tr("Last Updated") + ": " + getLastUpdateTime() + "\n\n" + - tr("Spoilers download automatically on launch") + "\n" + + lastUpdatedLabel.setText(tr("Last Updated") + ": " + getLastUpdateTime()); + infoOnSpoilersLabel.setText(tr("Spoilers download automatically on launch") + "\n" + tr("Press the button to manually update without relaunching") + "\n\n" + tr("Do not close settings until manual update complete")); } @@ -1082,4 +1085,4 @@ void DlgSettings::retranslateUi() dynamic_cast(pagesWidget->widget(i))->retranslateUi(); contentsWidget->reset(); -} \ No newline at end of file +} diff --git a/cockatrice/src/dlg_settings.h b/cockatrice/src/dlg_settings.h index 6f02086f..f65df011 100644 --- a/cockatrice/src/dlg_settings.h +++ b/cockatrice/src/dlg_settings.h @@ -156,6 +156,7 @@ private: QLineEdit *mpSpoilerSavePathLineEdit; QLabel mcSpoilerSaveLabel; QLabel mcGeneralMessageLabel; + QLabel lastUpdatedLabel; QLabel infoOnSpoilersLabel; QPushButton *mpSpoilerPathButton; QPushButton *updateNowButton;