aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels.

Browse source
This commit is contained in:
Peng Liu 2014-08-07 14:15:02 -04:00
parent ae80752497
commit d3459aabf9
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cockatrice/src/dlg_settings.cpp
View file

@ -42,6 +42,9 @@ GeneralSettingsPage::GeneralSettingsPage()
picDownloadCheckBox = new QCheckBox; picDownloadCheckBox = new QCheckBox;
picDownloadCheckBox->setChecked(settingsCache->getPicDownload()); picDownloadCheckBox->setChecked(settingsCache->getPicDownload());
QPushButton *clearDownloadedPicsButton = new QPushButton(tr("Reset/Clear Downloaded Pictures"));
connect(clearDownloadedPicsButton, SIGNAL(clicked()), this, SLOT(clearDownloadedPicsButtonClicked()));
picDownloadHqCheckBox = new QCheckBox; picDownloadHqCheckBox = new QCheckBox;
picDownloadHqCheckBox->setChecked(settingsCache->getPicDownloadHq()); picDownloadHqCheckBox->setChecked(settingsCache->getPicDownloadHq());
@ -55,6 +58,7 @@ GeneralSettingsPage::GeneralSettingsPage()
personalGrid->addWidget(languageBox, 0, 1); personalGrid->addWidget(languageBox, 0, 1);
personalGrid->addWidget(picDownloadCheckBox, 1, 0, 1, 2); personalGrid->addWidget(picDownloadCheckBox, 1, 0, 1, 2);
personalGrid->addWidget(picDownloadHqCheckBox, 2, 0, 1, 2); personalGrid->addWidget(picDownloadHqCheckBox, 2, 0, 1, 2);
personalGrid->addWidget(clearDownloadedPicsButton, 3, 0, 1, 1);
personalGroupBox = new QGroupBox; personalGroupBox = new QGroupBox;
personalGroupBox->setLayout(personalGrid); personalGroupBox->setLayout(personalGrid);
@ -76,8 +80,6 @@ GeneralSettingsPage::GeneralSettingsPage()
picsPathEdit->setReadOnly(true); picsPathEdit->setReadOnly(true);
QPushButton *picsPathButton = new QPushButton("..."); QPushButton *picsPathButton = new QPushButton("...");
connect(picsPathButton, SIGNAL(clicked()), this, SLOT(picsPathButtonClicked())); connect(picsPathButton, SIGNAL(clicked()), this, SLOT(picsPathButtonClicked()));
QPushButton *clearDownloadedPicsButton = new QPushButton(tr("Clear Downloaded Pics"));
connect(clearDownloadedPicsButton, SIGNAL(clicked()), this, SLOT(clearDownloadedPicsButtonClicked()));
cardDatabasePathLabel = new QLabel; cardDatabasePathLabel = new QLabel;
cardDatabasePathEdit = new QLineEdit(settingsCache->getCardDatabasePath()); cardDatabasePathEdit = new QLineEdit(settingsCache->getCardDatabasePath());
@ -101,13 +103,12 @@ GeneralSettingsPage::GeneralSettingsPage()
pathsGrid->addWidget(picsPathLabel, 2, 0); pathsGrid->addWidget(picsPathLabel, 2, 0);
pathsGrid->addWidget(picsPathEdit, 2, 1); pathsGrid->addWidget(picsPathEdit, 2, 1);
pathsGrid->addWidget(picsPathButton, 2, 2); pathsGrid->addWidget(picsPathButton, 2, 2);
pathsGrid->addWidget(clearDownloadedPicsButton, 3, 1); pathsGrid->addWidget(cardDatabasePathLabel, 3, 0);
pathsGrid->addWidget(cardDatabasePathLabel, 4, 0); pathsGrid->addWidget(cardDatabasePathEdit, 3, 1);
pathsGrid->addWidget(cardDatabasePathEdit, 4, 1); pathsGrid->addWidget(cardDatabasePathButton, 3, 2);
pathsGrid->addWidget(cardDatabasePathButton, 4, 2); pathsGrid->addWidget(tokenDatabasePathLabel, 4, 0);
pathsGrid->addWidget(tokenDatabasePathLabel, 5, 0); pathsGrid->addWidget(tokenDatabasePathEdit, 4, 1);
pathsGrid->addWidget(tokenDatabasePathEdit, 5, 1); pathsGrid->addWidget(tokenDatabasePathButton, 4, 2);
pathsGrid->addWidget(tokenDatabasePathButton, 5, 2);
pathsGroupBox = new QGroupBox; pathsGroupBox = new QGroupBox;
pathsGroupBox->setLayout(pathsGrid); pathsGroupBox->setLayout(pathsGrid);
@ -183,9 +184,9 @@ void GeneralSettingsPage::clearDownloadedPicsButtonClicked()
QDir(picsPath).rmdir(dirs.at(i)); QDir(picsPath).rmdir(dirs.at(i));
} }
if (outerSuccessRemove) if (outerSuccessRemove)
QMessageBox::information(this, tr("Success"), tr("Downloaded card images have been cleared.")); QMessageBox::information(this, tr("Success"), tr("Downloaded card pictures have been reset."));
else else
QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card images could not be cleared.")); QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card pictures could not be cleared."));
} }
void GeneralSettingsPage::cardDatabasePathButtonClicked() void GeneralSettingsPage::cardDatabasePathButtonClicked()
@ -223,8 +224,8 @@ void GeneralSettingsPage::retranslateUi()
deckPathLabel->setText(tr("Decks directory:")); deckPathLabel->setText(tr("Decks directory:"));
replaysPathLabel->setText(tr("Replays directory:")); replaysPathLabel->setText(tr("Replays directory:"));
picsPathLabel->setText(tr("Pictures directory:")); picsPathLabel->setText(tr("Pictures directory:"));
cardDatabasePathLabel->setText(tr("Path to card database:")); cardDatabasePathLabel->setText(tr("Card database:"));
tokenDatabasePathLabel->setText(tr("Path to token database:")); tokenDatabasePathLabel->setText(tr("Token database:"));
} }
AppearanceSettingsPage::AppearanceSettingsPage() AppearanceSettingsPage::AppearanceSettingsPage()
@ -362,11 +363,11 @@ AppearanceSettingsPage::AppearanceSettingsPage()
void AppearanceSettingsPage::retranslateUi() void AppearanceSettingsPage::retranslateUi()
{ {
zoneBgGroupBox->setTitle(tr("Zone background pictures")); zoneBgGroupBox->setTitle(tr("Zone background pictures"));
handBgLabel->setText(tr("Path to hand background:")); handBgLabel->setText(tr("Hand background:"));
stackBgLabel->setText(tr("Path to stack background:")); stackBgLabel->setText(tr("Stack background:"));
tableBgLabel->setText(tr("Path to table background:")); tableBgLabel->setText(tr("Table background:"));
playerAreaBgLabel->setText(tr("Path to player info background:")); playerAreaBgLabel->setText(tr("Player info background:"));
cardBackPicturePathLabel->setText(tr("Path to picture of card back:")); cardBackPicturePathLabel->setText(tr("Card back:"));
cardsGroupBox->setTitle(tr("Card rendering")); cardsGroupBox->setTitle(tr("Card rendering"));
displayCardNamesCheckBox->setText(tr("Display card names on cards having a picture")); displayCardNamesCheckBox->setText(tr("Display card names on cards having a picture"));