Differential D11034 Diff 30148 src/core/ApplicationSettings.cpp

Changeset View

Standalone View

View Options

src/core/ApplicationSettings.cpp

Context not available.
92 m_config(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + 92​ m_config(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) +
93 "/gcompris/" + GCOMPRIS_APPLICATION_NAME + ".conf", QSettings::IniFormat) 93​ "/gcompris/" + GCOMPRIS_APPLICATION_NAME + ".conf", QSettings::IniFormat)
94{ 94​{
95 const QRect &screenSize = QApplication::desktop()->screenGeometry(); 95​ getConstructor();
96​}
97​
98​ApplicationSettings::ApplicationSettings(QObject *parent, QString path): QObject(parent),
99​ m_baseFontSizeMin(-7), m_baseFontSizeMax(7),
100​ m_fontLetterSpacingMin(0.0), m_fontLetterSpacingMax(8.0),
101​ m_config(path, QSettings::IniFormat)
102​{
103​ getConstructor();
104​}
105​
106​void ApplicationSettings::getConstructor()
107​{
108​ const QRect &screenSize = QApplication::desktop()->screenGeometry();
96 109​
97 // initialize from settings file or default 110​ // initialize from settings file or default
98 111​
Context not available.
168 m_isBarHidden = false; 181​ m_isBarHidden = false;
169 182​
170 connect(this, &ApplicationSettings::showLockedActivitiesChanged, this, &ApplicationSettings::notifyShowLockedActivitiesChanged); 183​ connect(this, &ApplicationSettings::showLockedActivitiesChanged, this, &ApplicationSettings::notifyShowLockedActivitiesChanged);
171 connect(this, &ApplicationSettings::audioVoicesEnabledChanged, this, &ApplicationSettings::notifyAudioVoicesEnabledChanged); 184​ connect(this, &ApplicationSettings::audioVoicesEnabledChanged, this, &ApplicationSettings::notifyAudioVoicesEnabledChanged);
172 connect(this, &ApplicationSettings::audioEffectsEnabledChanged, this, &ApplicationSettings::notifyAudioEffectsEnabledChanged); 185​ connect(this, &ApplicationSettings::audioEffectsEnabledChanged, this, &ApplicationSettings::notifyAudioEffectsEnabledChanged);
173 connect(this, &ApplicationSettings::fullscreenChanged, this, &ApplicationSettings::notifyFullscreenChanged); 186​ connect(this, &ApplicationSettings::fullscreenChanged, this, &ApplicationSettings::notifyFullscreenChanged);
174 connect(this, &ApplicationSettings::previousHeightChanged, this, &ApplicationSettings::notifyPreviousHeightChanged); 187​ connect(this, &ApplicationSettings::previousHeightChanged, this, &ApplicationSettings::notifyPreviousHeightChanged);
175 connect(this, &ApplicationSettings::previousWidthChanged, this, &ApplicationSettings::notifyPreviousWidthChanged); 188​ connect(this, &ApplicationSettings::previousWidthChanged, this, &ApplicationSettings::notifyPreviousWidthChanged);
176 connect(this, &ApplicationSettings::localeChanged, this, &ApplicationSettings::notifyLocaleChanged); 189​ connect(this, &ApplicationSettings::localeChanged, this, &ApplicationSettings::notifyLocaleChanged);
Context not available.