blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: 修改代码风格

Browse Source 
修改代码风格

Log:
Task: https://pms.uniontech.com/task-view-145329.html
Influence: 代码更清晰
Change-Id: I01c878350beb4a2b53a4c4cf0385c503f1174df6
This commit is contained in:
weizhixiang
2022-06-07 19:45:57 +08:00
parent 290a45c6e8
commit 0206f1abea
6 changed files with 99 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/modules/dock/docksettings.cpp
View File

@ -22,17 +22,18 @@
#include "docksettings.h"
#include "settings.h"
#include <DConfig>
#include <QDebug>
#include <QJsonObject>
#include <QJsonDocument>
#include <DConfig>
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<QString> &apps)
{
if (!dockSettings)
if (!m_dockSettings)
return;
qDebug() << "docked apps:" << apps;
@ -233,14 +234,14 @@ void DockSettings::setDockedApps(QList<QString> &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<QString> DockSettings::getWinIconPreferredApps()
{
QVector<QString> 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<QString> 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);
}
}

4
src/modules/dock/docksettings.h
View File

@ -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