Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: 把部分配置交由任务栏单独安装

Browse Source 
防止任务栏运行找不到配置报错

Log:
Change-Id: I0dbcdd5da742494b0d00425fc4681fdc1961302c
This commit is contained in:
Fan PengCheng 2021-04-25 11:40:30 +08:00
parent 943f66c1fc
commit e01ce3a0f9
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gschema/com.deepin.dde.dock.module.gschema.xml
View File

@ -509,4 +509,11 @@
<description>Determine to show dock only in primary monitor</description> <description>Determine to show dock only in primary monitor</description>
</key> </key>
</schema> </schema>
<schema path="/com/deepin/dde/dock/" id="com.deepin.dde.dock" gettext-domain="DDE">
<key type="i" name="wireless-scan-interval">
<default>5</default>
<summary></summary>
<description>wireless scan interval</description>
</key>
</schema>
</schemalist> </schemalist>

15
plugins/network/networkitem.cpp
View File

@ -3,6 +3,7 @@
#include "item/wirelessitem.h" #include "item/wirelessitem.h"
#include "../../widgets/tipswidget.h" #include "../../widgets/tipswidget.h"
#include "../frame/util/imageutil.h" #include "../frame/util/imageutil.h"
#include "utils.h"
#include <DHiDPIHelper> #include <DHiDPIHelper>
#include <DApplicationHelper> #include <DApplicationHelper>
@ -48,7 +49,7 @@ NetworkItem::NetworkItem(QWidget *parent)
, m_timer(new QTimer(this)) , m_timer(new QTimer(this))
, m_switchWireTimer(new QTimer(this)) , m_switchWireTimer(new QTimer(this))
, m_wirelessScanTimer(new QTimer(this)) , m_wirelessScanTimer(new QTimer(this))
, m_wirelessScanInterval(10) , m_wirelessScanInterval(Utils::SettingValue("com.deepin.dde.dock", QByteArray(), "wireless-scan-interval", 10).toInt())
{ {
m_timer->setInterval(100); m_timer->setInterval(100);
@ -146,11 +147,12 @@ NetworkItem::NetworkItem(QWidget *parent)
connect(m_switchWirelessBtn, &DSwitchButton::toggled, this, &NetworkItem::wirelessEnable); connect(m_switchWirelessBtn, &DSwitchButton::toggled, this, &NetworkItem::wirelessEnable);
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &NetworkItem::onThemeTypeChanged); connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, &NetworkItem::onThemeTypeChanged);
QGSettings *gsetting = new QGSettings("com.deepin.dde.dock", QByteArray(), this); const QGSettings *gsetting = Utils::SettingsPtr("com.deepin.dde.dock", "wireless-scan-interval", this);
connect(gsetting, &QGSettings::changed, [&](const QString &key) { if (gsetting)
connect(gsetting, &QGSettings::changed, [&](const QString &key) {
if (key == "wireless-scan-interval") { if (key == "wireless-scan-interval") {
m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt(); m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt() * 1000;
m_wirelessScanTimer->setInterval(m_wirelessScanInterval * 1000); m_wirelessScanTimer->setInterval(m_wirelessScanInterval);
} }
}); });
connect(m_wirelessScanTimer, &QTimer::timeout, [&] { connect(m_wirelessScanTimer, &QTimer::timeout, [&] {
@ -160,7 +162,8 @@ NetworkItem::NetworkItem(QWidget *parent)
} }
} }
}); });
m_wirelessScanInterval = gsetting->get("wireless-scan-interval").toInt();
m_wirelessScanTimer->setInterval(m_wirelessScanInterval);
} }
QWidget *NetworkItem::itemApplet() QWidget *NetworkItem::itemApplet()