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

Font size defaults (#2521)

Browse source
This commit is contained in:
Zach H 2017-03-19 20:20:06 -04:00 committed by GitHub
parent a2a7561613
commit b5b9527c13
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/dlg_settings.cpp
View file

@ -352,11 +352,11 @@ AppearanceSettingsPage::AppearanceSettingsPage()
connect(&minPlayersForMultiColumnLayoutEdit, SIGNAL(valueChanged(int)), settingsCache, SLOT(setMinPlayersForMultiColumnLayout(int))); connect(&minPlayersForMultiColumnLayoutEdit, SIGNAL(valueChanged(int)), settingsCache, SLOT(setMinPlayersForMultiColumnLayout(int)));
minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit); minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit);
connect(&maxFontSizeForCardsEdit, SIGNAL(valueChanged(int)), settingsCache, SLOT(setMaxFontSize(int)));
maxFontSizeForCardsEdit.setValue(settingsCache->getMaxFontSize());
maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit);
maxFontSizeForCardsEdit.setMinimum(9); maxFontSizeForCardsEdit.setMinimum(9);
maxFontSizeForCardsEdit.setMaximum(100); maxFontSizeForCardsEdit.setMaximum(100);
maxFontSizeForCardsEdit.setValue(settingsCache->getMaxFontSize());
connect(&maxFontSizeForCardsEdit, SIGNAL(valueChanged(int)), settingsCache, SLOT(setMaxFontSize(int)));
maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit);
QGridLayout *tableGrid = new QGridLayout; QGridLayout *tableGrid = new QGridLayout;
tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2); tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2);

2
cockatrice/src/settingscache.cpp
View file

@ -233,6 +233,8 @@ SettingsCache::SettingsCache()
soundEnabled = settings->value("sound/enabled", false).toBool(); soundEnabled = settings->value("sound/enabled", false).toBool();
soundThemeName = settings->value("sound/theme").toString(); soundThemeName = settings->value("sound/theme").toString();
maxFontSize = settings->value("game/maxfontsize", DEFAULT_FONT_SIZE).toInt();
priceTagFeature = settings->value("deckeditor/pricetags", false).toBool(); priceTagFeature = settings->value("deckeditor/pricetags", false).toBool();
priceTagSource = settings->value("deckeditor/pricetagsource", 0).toInt(); priceTagSource = settings->value("deckeditor/pricetagsource", 0).toInt();

4
cockatrice/src/settingscache.h
View file

@ -24,6 +24,8 @@ class ReleaseChannel;
#define DEFAULT_LANG_CODE "en" #define DEFAULT_LANG_CODE "en"
#define DEFAULT_LANG_NAME "English" #define DEFAULT_LANG_NAME "English"
#define DEFAULT_FONT_SIZE 12
class QSettings; class QSettings;
class SettingsCache : public QObject { class SettingsCache : public QObject {
@ -188,7 +190,7 @@ public:
bool getSpectatorsCanSeeEverything() const { return spectatorsCanSeeEverything; } bool getSpectatorsCanSeeEverything() const { return spectatorsCanSeeEverything; }
bool getRememberGameSettings() const { return rememberGameSettings; } bool getRememberGameSettings() const { return rememberGameSettings; }
int getKeepAlive() const { return keepalive; } int getKeepAlive() const { return keepalive; }
int getMaxFontSize() const { return (maxFontSize > 1) ? maxFontSize : 9; } int getMaxFontSize() const { return maxFontSize; }
void setClientID(QString clientID); void setClientID(QString clientID);
void setKnownMissingFeatures(QString _knownMissingFeatures); void setKnownMissingFeatures(QString _knownMissingFeatures);
QString getClientID() { return clientID; } QString getClientID() { return clientID; }