diff --git a/src/modules/dock/docksettings.cpp b/src/modules/dock/docksettings.cpp index b627a55..afff3dc 100644 --- a/src/modules/dock/docksettings.cpp +++ b/src/modules/dock/docksettings.cpp @@ -22,17 +22,18 @@ #include "docksettings.h" #include "settings.h" +#include + #include #include #include -#include DCORE_USE_NAMESPACE DockSettings::DockSettings(QObject *parent) : QObject (parent) - , dockSettings(Settings::ConfigPtr(configDock)) - , appearanceSettings(Settings::ConfigPtr(configAppearance)) + , m_dockSettings(Settings::ConfigPtr(configDock)) + , m_appearanceSettings(Settings::ConfigPtr(configAppearance)) { init(); } @@ -40,16 +41,16 @@ DockSettings::DockSettings(QObject *parent) void DockSettings::init() { // 绑定属性 - if (dockSettings) { - connect(dockSettings, &DConfig::valueChanged, this, [&] (const QString &key) { + if (m_dockSettings) { + connect(m_dockSettings, &DConfig::valueChanged, this, [&] (const QString &key) { if (key == keyHideMode) { - Q_EMIT hideModeChanged(HideMode(dockSettings->value(key).toInt())); + Q_EMIT hideModeChanged(HideMode(m_dockSettings->value(key).toInt())); } else if(key == keyDisplayMode) { - Q_EMIT displayModeChanged(DisplayMode(dockSettings->value(key).toInt())); + Q_EMIT displayModeChanged(DisplayMode(m_dockSettings->value(key).toInt())); } else if (key == keyPosition) { - Q_EMIT positionModeChanged(PositionMode(dockSettings->value(key).toInt())); + Q_EMIT positionModeChanged(PositionMode(m_dockSettings->value(key).toInt())); } else if (key == keyForceQuitApp){ - QString mode = dockSettings->value(key).toString(); + QString mode = m_dockSettings->value(key).toString(); Q_EMIT forceQuitAppChanged(ForceQuitAppModeHandler(mode).toEnum()); } }); @@ -59,8 +60,8 @@ void DockSettings::init() HideMode DockSettings::getHideMode() { HideMode ret = HideMode::KeepShowing; - if (dockSettings) { - QString mode = dockSettings->value(keyHideMode).toString(); + if (m_dockSettings) { + QString mode = m_dockSettings->value(keyHideMode).toString(); HideModeHandler handler(mode); return handler.toEnum(); } @@ -69,16 +70,16 @@ HideMode DockSettings::getHideMode() void DockSettings::setHideMode(HideMode mode) { - if (dockSettings) { - dockSettings->setValue(keyHideMode, HideModeHandler(mode).toString()); + if (m_dockSettings) { + m_dockSettings->setValue(keyHideMode, HideModeHandler(mode).toString()); } } DisplayMode DockSettings::getDisplayMode() { DisplayMode ret = DisplayMode::Efficient; - if (dockSettings) { - QString mode = dockSettings->value(keyDisplayMode).toString(); + if (m_dockSettings) { + QString mode = m_dockSettings->value(keyDisplayMode).toString(); DisplayModeHandler handler(mode); return handler.toEnum(); } @@ -87,16 +88,16 @@ DisplayMode DockSettings::getDisplayMode() void DockSettings::setDisplayMode(DisplayMode mode) { - if (dockSettings) { - dockSettings->setValue(keyDisplayMode, DisplayModeHandler(mode).toString()); + if (m_dockSettings) { + m_dockSettings->setValue(keyDisplayMode, DisplayModeHandler(mode).toString()); } } PositionMode DockSettings::getPositionMode() { PositionMode ret = PositionMode::Bottom; - if (dockSettings) { - QString mode = dockSettings->value(keyPosition).toString(); + if (m_dockSettings) { + QString mode = m_dockSettings->value(keyPosition).toString(); PositionModeHandler handler(mode); ret = handler.toEnum(); } @@ -105,16 +106,16 @@ PositionMode DockSettings::getPositionMode() void DockSettings::setPositionMode(PositionMode mode) { - if (dockSettings) { - dockSettings->setValue(keyPosition, PositionModeHandler(mode).toString()); + if (m_dockSettings) { + m_dockSettings->setValue(keyPosition, PositionModeHandler(mode).toString()); } } ForceQuitAppMode DockSettings::getForceQuitAppMode() { ForceQuitAppMode ret = ForceQuitAppMode::Enabled; - if (dockSettings) { - QString mode = dockSettings->value(keyForceQuitApp).toString(); + if (m_dockSettings) { + QString mode = m_dockSettings->value(keyForceQuitApp).toString(); ForceQuitAppModeHandler handler(mode); ret = handler.toEnum(); } @@ -123,98 +124,98 @@ ForceQuitAppMode DockSettings::getForceQuitAppMode() void DockSettings::setForceQuitAppMode(ForceQuitAppMode mode) { - if (dockSettings) { - dockSettings->setValue(keyForceQuitApp, ForceQuitAppModeHandler(mode).toString()); + if (m_dockSettings) { + m_dockSettings->setValue(keyForceQuitApp, ForceQuitAppModeHandler(mode).toString()); } } uint DockSettings::getIconSize() { uint size = 36; - if (dockSettings) { - size = dockSettings->value(keyIconSize).toUInt(); + if (m_dockSettings) { + size = m_dockSettings->value(keyIconSize).toUInt(); } return size; } void DockSettings::setIconSize(uint size) { - if (dockSettings) { - dockSettings->setValue(keyIconSize, size); + if (m_dockSettings) { + m_dockSettings->setValue(keyIconSize, size); } } uint DockSettings::getShowTimeout() { uint time = 100; - if (dockSettings) { - time = dockSettings->value(keyShowTimeout).toUInt(); + if (m_dockSettings) { + time = m_dockSettings->value(keyShowTimeout).toUInt(); } return time; } void DockSettings::setShowTimeout(uint time) { - if (dockSettings) { - dockSettings->setValue(keyShowTimeout, time); + if (m_dockSettings) { + m_dockSettings->setValue(keyShowTimeout, time); } } uint DockSettings::getHideTimeout() { uint time = 0; - if (dockSettings) { - time = dockSettings->value(keyHideTimeout).toUInt(); + if (m_dockSettings) { + time = m_dockSettings->value(keyHideTimeout).toUInt(); } return time; } void DockSettings::setHideTimeout(uint time) { - if (dockSettings) { - dockSettings->setValue(keyHideTimeout, time); + if (m_dockSettings) { + m_dockSettings->setValue(keyHideTimeout, time); } } uint DockSettings::getWindowSizeEfficient() { uint size = 40; - if (dockSettings) { - size = dockSettings->value(keyWindowSizeEfficient).toUInt(); + if (m_dockSettings) { + size = m_dockSettings->value(keyWindowSizeEfficient).toUInt(); } return size; } void DockSettings::setWindowSizeEfficient(uint size) { - if (dockSettings) { - dockSettings->setValue(keyWindowSizeEfficient, size); + if (m_dockSettings) { + m_dockSettings->setValue(keyWindowSizeEfficient, size); } } uint DockSettings::getWindowSizeFashion() { uint size = 48; - if (dockSettings) { - size = dockSettings->value(keyWindowSizeFashion).toUInt(); + if (m_dockSettings) { + size = m_dockSettings->value(keyWindowSizeFashion).toUInt(); } return size; } void DockSettings::setWindowSizeFashion(uint size) { - if (dockSettings) { - dockSettings->setValue(keyWindowSizeFashion, size); + if (m_dockSettings) { + m_dockSettings->setValue(keyWindowSizeFashion, size); } } QStringList DockSettings::getDockedApps() { QStringList ret; - if (!dockSettings) + if (!m_dockSettings) return ret; - for(const auto &var : dockSettings->value(keyDockedApps).toList()) { + for(const auto &var : m_dockSettings->value(keyDockedApps).toList()) { if (var.isValid()) ret.push_back(var.toString()); } @@ -224,7 +225,7 @@ QStringList DockSettings::getDockedApps() void DockSettings::setDockedApps(QList &apps) { - if (!dockSettings) + if (!m_dockSettings) return; qDebug() << "docked apps:" << apps; @@ -233,14 +234,14 @@ void DockSettings::setDockedApps(QList &apps) list << QVariant(app); } - dockSettings->setValue(keyDockedApps, list); + m_dockSettings->setValue(keyDockedApps, list); } double DockSettings::getOpacity() { double opacity = 0.4; - if (appearanceSettings) { - opacity = appearanceSettings->value(keyOpacity).toDouble(); + if (m_appearanceSettings) { + opacity = m_appearanceSettings->value(keyOpacity).toDouble(); } return opacity; } @@ -248,8 +249,8 @@ double DockSettings::getOpacity() QVector DockSettings::getWinIconPreferredApps() { QVector ret; - if (dockSettings) { - for(const auto &var : dockSettings->value(keyWinIconPreferredApps).toList()) { + if (m_dockSettings) { + for(const auto &var : m_dockSettings->value(keyWinIconPreferredApps).toList()) { if (var.isValid()) ret.push_back(var.toString()); } @@ -261,8 +262,8 @@ QVector DockSettings::getWinIconPreferredApps() QString DockSettings::getPluginSettings() { QString ret; - if (dockSettings) { - ret = dockSettings->value(keyPluginSettings).toString(); + if (m_dockSettings) { + ret = m_dockSettings->value(keyPluginSettings).toString(); } qInfo() << "getpluginsettings:" << ret; @@ -274,8 +275,8 @@ void DockSettings::setPluginSettings(QString jsonStr) if (jsonStr.isEmpty()) return; - if (dockSettings) { - dockSettings->setValue(keyPluginSettings, jsonStr); + if (m_dockSettings) { + m_dockSettings->setValue(keyPluginSettings, jsonStr); } } diff --git a/src/modules/dock/docksettings.h b/src/modules/dock/docksettings.h index 3bfccc9..d9c6e2c 100644 --- a/src/modules/dock/docksettings.h +++ b/src/modules/dock/docksettings.h @@ -254,8 +254,8 @@ private: DockSettings(const DockSettings &); DockSettings& operator= (const DockSettings &); - DConfig *dockSettings; - DConfig *appearanceSettings; + DConfig *m_dockSettings; + DConfig *m_appearanceSettings; }; #endif // DOCKSETTINGS_H diff --git a/src/modules/launcher/launchersettings.cpp b/src/modules/launcher/launchersettings.cpp index 9df02ff..da876f4 100644 --- a/src/modules/launcher/launchersettings.cpp +++ b/src/modules/launcher/launchersettings.cpp @@ -22,23 +22,24 @@ #include "launchersettings.h" #include "settings.h" +#include + #include #include #include -#include DCORE_USE_NAMESPACE LauncherSettings::LauncherSettings(QObject *parent) : QObject(parent) - , dconfig(Settings::ConfigPtr(configLauncher)) + , m_dconfig(Settings::ConfigPtr(configLauncher)) { // 绑定属性 - connect(dconfig, &DConfig::valueChanged, this, [&] (const QString &key) { + connect(m_dconfig, &DConfig::valueChanged, this, [&] (const QString &key) { if (key == keyDisplayMode) { - Q_EMIT displayModeChanged(dconfig->value(key).toString()); + Q_EMIT displayModeChanged(m_dconfig->value(key).toString()); } else if (key == keyFullscreen) { - Q_EMIT fullscreenChanged(dconfig->value(key).toBool()); + Q_EMIT fullscreenChanged(m_dconfig->value(key).toBool()); } else if (key == keyAppsHidden) { Q_EMIT hiddenAppsChanged(); } @@ -51,7 +52,7 @@ LauncherSettings::LauncherSettings(QObject *parent) */ QString LauncherSettings::getDisplayMode() { - return dconfig ? dconfig->value(keyDisplayMode).toString() : ""; + return m_dconfig ? m_dconfig->value(keyDisplayMode).toString() : ""; } /** @@ -60,8 +61,8 @@ QString LauncherSettings::getDisplayMode() */ void LauncherSettings::setDisplayMode(QString value) { - if (dconfig) { - dconfig->setValue(keyDisplayMode, value); + if (m_dconfig) { + m_dconfig->setValue(keyDisplayMode, value); } } @@ -71,7 +72,7 @@ void LauncherSettings::setDisplayMode(QString value) */ int LauncherSettings::getFullscreenMode() { - return dconfig ? dconfig->value(keyFullscreen).toBool() : false; + return m_dconfig ? m_dconfig->value(keyFullscreen).toBool() : false; } /** @@ -80,8 +81,8 @@ int LauncherSettings::getFullscreenMode() */ void LauncherSettings::setFullscreenMode(int value) { - if (dconfig) { - dconfig->setValue(keyFullscreen, value); + if (m_dconfig) { + m_dconfig->setValue(keyFullscreen, value); } } @@ -92,8 +93,8 @@ void LauncherSettings::setFullscreenMode(int value) QVector LauncherSettings::getDisableScalingApps() { QVector ret; - if (dconfig) { - QList apps = dconfig->value(keyAppsDisableScaling).toList(); + if (m_dconfig) { + QList apps = m_dconfig->value(keyAppsDisableScaling).toList(); for (auto app : apps) { ret.push_back(app.toString()); } @@ -107,12 +108,12 @@ QVector LauncherSettings::getDisableScalingApps() */ void LauncherSettings::setDisableScalingApps(const QVector &value) { - if (dconfig) { + if (m_dconfig) { QList apps; for (const auto &app : value) apps.push_back(app); - dconfig->setValue(keyAppsDisableScaling, apps); + m_dconfig->setValue(keyAppsDisableScaling, apps); } } @@ -123,8 +124,8 @@ void LauncherSettings::setDisableScalingApps(const QVector &value) QVector LauncherSettings::getUseProxyApps() { QVector ret; - if (dconfig) { - QList apps = dconfig->value(keyAppsUseProxy).toList(); + if (m_dconfig) { + QList apps = m_dconfig->value(keyAppsUseProxy).toList(); for (auto app : apps) { ret.push_back(app.toString()); } @@ -138,12 +139,12 @@ QVector LauncherSettings::getUseProxyApps() */ void LauncherSettings::setUseProxy(const QVector &value) { - if (dconfig) { + if (m_dconfig) { QList apps; for (const auto &app : value) apps.push_back(app); - dconfig->setValue(keyAppsUseProxy, apps); + m_dconfig->setValue(keyAppsUseProxy, apps); } } @@ -154,8 +155,8 @@ void LauncherSettings::setUseProxy(const QVector &value) QVector LauncherSettings::getHiddenApps() { QVector ret; - if (dconfig) { - QList hiddenApps = dconfig->value(keyAppsHidden).toList(); + if (m_dconfig) { + QList hiddenApps = m_dconfig->value(keyAppsHidden).toList(); for (auto app : hiddenApps) { ret.push_back(app.toString()); } diff --git a/src/modules/launcher/launchersettings.h b/src/modules/launcher/launchersettings.h index 240725d..240c6dd 100644 --- a/src/modules/launcher/launchersettings.h +++ b/src/modules/launcher/launchersettings.h @@ -42,7 +42,7 @@ class LauncherSettings : public QObject LauncherSettings(QObject *paret = nullptr); LauncherSettings(const LauncherSettings &); LauncherSettings& operator= (const LauncherSettings &); - DConfig *dconfig; + DConfig *m_dconfig; public: static inline LauncherSettings *instance() { diff --git a/src/modules/startmanager/startmanagersettings.cpp b/src/modules/startmanager/startmanagersettings.cpp index 000373f..4e4c3d5 100644 --- a/src/modules/startmanager/startmanagersettings.cpp +++ b/src/modules/startmanager/startmanagersettings.cpp @@ -23,18 +23,19 @@ #include "settings.h" #include "gsetting.h" +#include + #include #include #include -#include DCORE_USE_NAMESPACE StartManagerSettings::StartManagerSettings(QObject *parent) : QObject (parent) - , launchConfig(Settings::ConfigPtr(configLauncher)) - , startConfig(Settings::ConfigPtr(configStartdde)) - , xsettingsConfig(Settings::ConfigPtr(configXsettings)) + , m_launchConfig(Settings::ConfigPtr(configLauncher)) + , m_startConfig(Settings::ConfigPtr(configStartdde)) + , m_xsettingsConfig(Settings::ConfigPtr(configXsettings)) { } @@ -42,10 +43,10 @@ StartManagerSettings::StartManagerSettings(QObject *parent) QVector StartManagerSettings::getUseProxyApps() { QVector ret; - if (!launchConfig) + if (!m_launchConfig) return ret; - QList apps = launchConfig->value(keyAppsUseProxy).toList(); + QList apps = m_launchConfig->value(keyAppsUseProxy).toList(); for (auto app : apps) { ret.push_back(app.toString()); } @@ -56,10 +57,10 @@ QVector StartManagerSettings::getUseProxyApps() QVector StartManagerSettings::getDisableScalingApps() { QVector ret; - if (!launchConfig) + if (!m_launchConfig) return ret; - QList apps = launchConfig->value(keyAppsDisableScaling).toList(); + QList apps = m_launchConfig->value(keyAppsDisableScaling).toList(); for (auto app : apps) { ret.push_back(app.toString()); } @@ -70,8 +71,8 @@ QVector StartManagerSettings::getDisableScalingApps() bool StartManagerSettings::getMemCheckerEnabled() { bool ret = false; - if (startConfig) { - ret = startConfig->value(keyMemCheckerEnabled).toBool(); + if (m_startConfig) { + ret = m_startConfig->value(keyMemCheckerEnabled).toBool(); } return ret; } @@ -79,8 +80,8 @@ bool StartManagerSettings::getMemCheckerEnabled() double StartManagerSettings::getScaleFactor() { double ret = 0; - if (xsettingsConfig) { - xsettingsConfig->value(keyScaleFactor).toDouble(); + if (m_xsettingsConfig) { + m_xsettingsConfig->value(keyScaleFactor).toDouble(); } return ret; } diff --git a/src/modules/startmanager/startmanagersettings.h b/src/modules/startmanager/startmanagersettings.h index 0541945..e3e79f4 100644 --- a/src/modules/startmanager/startmanagersettings.h +++ b/src/modules/startmanager/startmanagersettings.h @@ -65,9 +65,9 @@ private: StartManagerSettings(const StartManagerSettings &); StartManagerSettings& operator= (const StartManagerSettings &); - DConfig *launchConfig; - DConfig *startConfig; - DConfig *xsettingsConfig; + DConfig *m_launchConfig; + DConfig *m_startConfig; + DConfig *m_xsettingsConfig; }; #endif // STARTMANAGERSETTINGS_H