From 05fbb7833951df9176bcadb3da809ff41f2e7d56 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 10 Apr 2018 23:52:11 +0200 Subject: Add clock, refactor settings class to be static --- src/settings.h | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index 0a03567..f55d6ce 100644 --- a/src/settings.h +++ b/src/settings.h @@ -5,23 +5,26 @@ #define CONFIG_FILE "/etc/lightdm/qt-lightdm-greeter.conf" +class Settings; +extern Settings *s_settings; + class Settings : public QSettings { public: - Settings() : QSettings(QString("/etc/lightdm/qt-lightdm-greeter.conf"), QSettings::NativeFormat) {} - QString iconThemeName() const { return value("greeter-icon-theme").toString(); } - QString backgrundImagePath() const { return value("greeter-background-image").toString(); } - QString offsetX() const { return value("loginform-offset-x").toString(); } - QString offsetY() const { return value("loginform-offset-y").toString(); } - QString miniIconPath() const { return value("loginform-mini-icon").toString(); } - QString bannerImagePath() const { return value("greeter-banner-image").toString(); } - QString bottomLeftLogoPath() const { return value("greeter-bottom-left-logo-path").toString(); } - QStringList gradientColors() const { return value("greeter-background-gradient").toString().split(QRegExp("\\s"), QString::SkipEmptyParts); } - QString logMessageFile() const { return value("greeter-message-file").toString(); } - QString autoLoginCheckCmd() const { return value("auto-login-check-cmd").toString(); } -}; - - + Settings() : QSettings(QString(CONFIG_FILE), NativeFormat) {} + static QString iconThemeName() { return s_settings->value("greeter-icon-theme").toString(); } + static QString backgrundImagePath() { return s_settings->value("greeter-background-image").toString(); } + static QString offsetX() { return s_settings->value("loginform-offset-x").toString(); } + static QString offsetY() { return s_settings->value("loginform-offset-y").toString(); } + static QString miniIconPath() { return s_settings->value("loginform-mini-icon").toString(); } + static QString bannerImagePath() { return s_settings->value("greeter-banner-image").toString(); } + static QString bottomLeftLogoPath() { return s_settings->value("greeter-bottom-left-logo-path").toString(); } + static QStringList gradientColors() { return s_settings->value("greeter-background-gradient").toString().split(QRegExp("\\s"), QString::SkipEmptyParts); } + static QString logMessageFile() { return s_settings->value("greeter-message-file").toString(); } + static QString autoLoginCheckCmd() { return s_settings->value("auto-login-check-cmd").toString(); } + static QString clockStyle() { return s_settings->value("clock-style").toString(); } + static QStringList clockShadow() { return s_settings->value("clock-shadow").toString().split(QRegExp("\\s"), QString::SkipEmptyParts); } +}; #endif // SETTINGS_H -- cgit v1.2.3-55-g7522