From 4e3da81c9ac00791ee4a3c221147cbca5e3f9984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= Date: Tue, 7 Jul 2020 09:26:40 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=86=E8=BE=A8=E7=8E=87=E5=90=8E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BA=E5=A4=A7=E5=B0=8F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在分辨率发生变化,应该优先更新屏幕的大小信息再根据这些信息及计算出任务栏的位置,代码里逻辑是反的 Log: 修复切换分辨率后任务栏显示大小异常的问题 Bug: https://pms.uniontech.com/zentao/bug-view-36796.html --- frame/util/docksettings.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index a8dc34efb..7de277e47 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -691,11 +691,6 @@ void DockSettings::monitorAdded(const QString &path) connect(inter, &MonitorInter::YChanged, mon, &Monitor::setY); connect(inter, &MonitorInter::WidthChanged, mon, &Monitor::setW); connect(inter, &MonitorInter::HeightChanged, mon, &Monitor::setH); - // 当屏幕的大小或者坐标信息发生变化后，需要更新一下监听区域．防止无法唤醒任务栏 - connect(inter, &MonitorInter::XChanged, this, &DockSettings::requestUpdateRegionWatch); - connect(inter, &MonitorInter::YChanged, this, &DockSettings::requestUpdateRegionWatch); - connect(inter, &MonitorInter::WidthChanged, this, &DockSettings::requestUpdateRegionWatch); - connect(inter, &MonitorInter::HeightChanged, this, &DockSettings::requestUpdateRegionWatch); connect(inter, &MonitorInter::MmWidthChanged, mon, &Monitor::setMmWidth); connect(inter, &MonitorInter::MmHeightChanged, mon, &Monitor::setMmHeight); connect(inter, &MonitorInter::RotationChanged, mon, &Monitor::setRotate); @@ -704,6 +699,14 @@ void DockSettings::monitorAdded(const QString &path) connect(inter, &MonitorInter::ModesChanged, mon, &Monitor::setModeList); connect(inter, &MonitorInter::RotationsChanged, mon, &Monitor::setRotateList); connect(inter, &MonitorInter::EnabledChanged, mon, &Monitor::setMonitorEnable); + + // 当屏幕的大小或者坐标信息发生变化后，需要更新一下监听区域和任务栏大小 + connect(mon, &Monitor::geometryChanged, this, [ = ] { + calculateWindowConfig(); + emit windowGeometryChanged(); + emit requestUpdateRegionWatch(); + }); + connect(m_displayInter, static_cast(&DisplayInter::PrimaryChanged), mon, &Monitor::setPrimary); // NOTE: DO NOT using async dbus call. because we need to have a unique name to distinguish each monitor From b37dd7d8c778206f44567e36d9bf726acc187e3c Mon Sep 17 00:00:00 2001 From: chenwei Date: Mon, 6 Jul 2020 17:56:35 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DAcessible?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 控件相关的类添加了命名空间，将命名空间去掉 Log: 修复任务栏应用图标Tips没有Accessible标记的问题 --- frame/window/accessible.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/window/accessible.h b/frame/window/accessible.h index ef13e5708..38c32272a 100644 --- a/frame/window/accessible.h +++ b/frame/window/accessible.h @@ -101,7 +101,7 @@ QAccessibleInterface *accessibleFactory(const QString &classname, QObject *objec USE_ACCESSIBLE(classname, MainWindow); USE_ACCESSIBLE(classname, MainPanelControl); - USE_ACCESSIBLE(classname, TipsWidget); + USE_ACCESSIBLE(QString(classname).replace("Dock::", ""), TipsWidget); USE_ACCESSIBLE(classname, DockPopupWindow); USE_ACCESSIBLE(classname, LauncherItem); USE_ACCESSIBLE(classname, AppItem); From de355c2ae79c0bf372dea47c5ab40ee07b0513dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E6=88=90?= Date: Tue, 7 Jul 2020 14:01:29 +0800 Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9,=E4=B8=8D=E5=8A=A0=E8=BD=BD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8F=92=E4=BB=B6(=E6=B7=BB=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=A8=A1=E5=BC=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加配置项,不加载部分或全部插件 Log: 添加配置项,不加载部分插件(添加安全模式) Bug: https://pms.uniontech.com/zentao/task-view-28389.html --- frame/util/pluginloader.cpp | 10 +++++++++- gschema/com.deepin.dde.dock.module.gschema.xml | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/frame/util/pluginloader.cpp b/frame/util/pluginloader.cpp index eda710b15..3b2e90168 100644 --- a/frame/util/pluginloader.cpp +++ b/frame/util/pluginloader.cpp @@ -24,6 +24,7 @@ #include #include #include +#include PluginLoader::PluginLoader(const QString &pluginDirPath, QObject *parent) : QThread(parent) @@ -35,8 +36,10 @@ void PluginLoader::run() { QDir pluginsDir(m_pluginDirPath); const QStringList plugins = pluginsDir.entryList(QDir::Files); + static const QGSettings gsetting("com.deepin.dde.dock.disableplugins", "/com/deepin/dde/dock/disableplugins/"); + static const auto disable_plugins_list = gsetting.get("disable-plugins-list").toStringList(); - for (const QString file : plugins) + for (QString file : plugins) { if (!QLibrary::isLibrary(file)) continue; @@ -45,6 +48,11 @@ void PluginLoader::run() if (file.startsWith("libdde-dock-")) continue; + if (disable_plugins_list.contains(file)) { + qDebug() << "disable loading plugin:" << file; + continue; + } + emit pluginFounded(pluginsDir.absoluteFilePath(file)); } diff --git a/gschema/com.deepin.dde.dock.module.gschema.xml b/gschema/com.deepin.dde.dock.module.gschema.xml index 2af4a9313..1107352a3 100644 --- a/gschema/com.deepin.dde.dock.module.gschema.xml +++ b/gschema/com.deepin.dde.dock.module.gschema.xml @@ -16,6 +16,13 @@ + + + [] + disable loading plugins + dock disable loading plugins + + false From c714a08927e6418f22856388887c123bbb0934ce Mon Sep 17 00:00:00 2001 From: yexin <1072390773@qq.com> Date: Tue, 7 Jul 2020 14:16:59 +0800 Subject: [PATCH 04/13] =?UTF-8?q?fix(network):=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E7=82=B9=E5=87=BB=E7=BD=91=E7=BB=9C=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=97=E8=A1=A8=E4=B8=AD=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E7=BD=91=E7=BB=9C=E6=A8=A1=E5=9D=97=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log: 列表中标题翻译错误 Bug: https://pms.uniontech.com/zentao/bug-view-36847.html --- translations/dde-dock.ts | 16 ++-- translations/dde-dock_ar.ts | 16 ++-- translations/dde-dock_ca.ts | 16 ++-- translations/dde-dock_cs.ts | 16 ++-- translations/dde-dock_da.ts | 16 ++-- translations/dde-dock_de.ts | 18 ++-- translations/dde-dock_es.ts | 16 ++-- translations/dde-dock_fi.ts | 18 ++-- translations/dde-dock_fr.ts | 16 ++-- translations/dde-dock_hr.ts | 18 ++-- translations/dde-dock_hu.ts | 150 +++++++++++++++++++++++++++------ translations/dde-dock_it.ts | 16 ++-- translations/dde-dock_ko.ts | 30 +++---- translations/dde-dock_lt.ts | 16 ++-- translations/dde-dock_ms.ts | 16 ++-- translations/dde-dock_pl.ts | 20 ++--- translations/dde-dock_pt.ts | 16 ++-- translations/dde-dock_pt_BR.ts | 22 ++--- translations/dde-dock_ro.ts | 16 ++-- translations/dde-dock_ru.ts | 20 ++--- translations/dde-dock_si.ts | 16 ++-- translations/dde-dock_sk.ts | 16 ++-- translations/dde-dock_sq.ts | 18 ++-- translations/dde-dock_sr.ts | 20 ++--- translations/dde-dock_tr.ts | 16 ++-- translations/dde-dock_uk.ts | 16 ++-- translations/dde-dock_vi.ts | 16 ++-- translations/dde-dock_zh_CN.ts | 16 ++-- translations/dde-dock_zh_HK.ts | 16 ++-- translations/dde-dock_zh_TW.ts | 16 ++-- 30 files changed, 376 insertions(+), 278 deletions(-) diff --git a/translations/dde-dock.ts b/translations/dde-dock.ts index ae7cbd0b5..6c8f168c5 100644 --- a/translations/dde-dock.ts +++ b/translations/dde-dock.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Wireless connection - - - Wired connection - Wired connection - Disable wired connection Disable wired connection @@ -280,6 +272,14 @@ Network cable unplugged Network cable unplugged + + Wireless Network + Wireless Network + + + Wired Network + Wired Network + NetworkPlugin diff --git a/translations/dde-dock_ar.ts b/translations/dde-dock_ar.ts index 6c3913db0..c599399ce 100644 --- a/translations/dde-dock_ar.ts +++ b/translations/dde-dock_ar.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - اتصال لاسلكي - - - Wired connection - اتصال سلكي - Disable wired connection تعطيل الاتصال السلكي @@ -280,6 +272,14 @@ Network cable unplugged سلك الشبكة غير موصول + + Wireless Network + شبكة لاسلكية + + + Wired Network + شبكة سلكية + NetworkPlugin diff --git a/translations/dde-dock_ca.ts b/translations/dde-dock_ca.ts index 85caf7bed..09b6387f5 100644 --- a/translations/dde-dock_ca.ts +++ b/translations/dde-dock_ca.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Connexió sense fil - - - Wired connection - Connexió amb fil - Disable wired connection Inhabilita la connexió amb fil @@ -280,6 +272,14 @@ Network cable unplugged El cable de xarxa està desendollat. + + Wireless Network + Xarxa sense fil + + + Wired Network + Xarxa amb fil + NetworkPlugin diff --git a/translations/dde-dock_cs.ts b/translations/dde-dock_cs.ts index 784d42a56..40c5503f4 100644 --- a/translations/dde-dock_cs.ts +++ b/translations/dde-dock_cs.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Bezdrátové připojení - - - Wired connection - Drátové připojení - Disable wired connection Vypnout drátové připojení @@ -280,6 +272,14 @@ Network cable unplugged Síťový kabel odpojen + + Wireless Network + Bezdrátová síť + + + Wired Network + Drátová síť + NetworkPlugin diff --git a/translations/dde-dock_da.ts b/translations/dde-dock_da.ts index 514922b2b..691c87332 100644 --- a/translations/dde-dock_da.ts +++ b/translations/dde-dock_da.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Trådløs forbindelse - - - Wired connection - Kablet forbindelse - Disable wired connection Deaktivér kablet forbindelse @@ -280,6 +272,14 @@ Network cable unplugged Netværkskablet er frakoblet + + Wireless Network + Trådløst netværk + + + Wired Network + Kablet netværk + NetworkPlugin diff --git a/translations/dde-dock_de.ts b/translations/dde-dock_de.ts index 311506145..30691dedb 100644 --- a/translations/dde-dock_de.ts +++ b/translations/dde-dock_de.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Drahtlosverbindung - - - Wired connection - Kabelgebundene Verbindung - Disable wired connection Kabelgebundene Verbindung deaktivieren @@ -280,6 +272,14 @@ Network cable unplugged Netzwerkkabel abgezogen + + Wireless Network + Drahtlosnetzwerk + + + Wired Network + Kabelgebundenes Netzwerk + NetworkPlugin @@ -347,7 +347,7 @@ Capacity %1 ... - + Kapazität %1 ... Capacity %1, fully charged diff --git a/translations/dde-dock_es.ts b/translations/dde-dock_es.ts index 9b5573ad9..bd94c3a4a 100644 --- a/translations/dde-dock_es.ts +++ b/translations/dde-dock_es.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Conexión inalámbrica - - - Wired connection - Conexión cableada - Disable wired connection Deshabilitar conexión cableada @@ -280,6 +272,14 @@ Network cable unplugged Cable de red desconectado + + Wireless Network + Red inalámbrica + + + Wired Network + Red cableada + NetworkPlugin diff --git a/translations/dde-dock_fi.ts b/translations/dde-dock_fi.ts index 14f5f98ad..cafcd2c33 100644 --- a/translations/dde-dock_fi.ts +++ b/translations/dde-dock_fi.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Langaton - - - Wired connection - Verkkokaapeli - Disable wired connection Poista kiinteä yhteys @@ -280,6 +272,14 @@ Network cable unplugged Verkkokaapeli irrotettu + + Wireless Network + Langaton verkko + + + Wired Network + Kaapeli + NetworkPlugin @@ -300,7 +300,7 @@ OnboardPlugin Onboard - Näyttönäppäimistö + Näppäimistö Settings diff --git a/translations/dde-dock_fr.ts b/translations/dde-dock_fr.ts index bfaa7df21..e23c9ad71 100644 --- a/translations/dde-dock_fr.ts +++ b/translations/dde-dock_fr.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Connexion sans fil - - - Wired connection - Connexion filaire - Disable wired connection Désactiver la connexion filaire @@ -280,6 +272,14 @@ Network cable unplugged Câble réseau débranché + + Wireless Network + Réseau sans fil + + + Wired Network + Réseau filaire + NetworkPlugin diff --git a/translations/dde-dock_hr.ts b/translations/dde-dock_hr.ts index 7263417e3..a4c9a54e5 100644 --- a/translations/dde-dock_hr.ts +++ b/translations/dde-dock_hr.ts @@ -45,7 +45,7 @@ Turned off - + Isključeno @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Bežično povezivanje - - - Wired connection - Žično povezivanje - Disable wired connection Onemogući žično povezivanje @@ -280,6 +272,14 @@ Network cable unplugged Mrežni kabel je isključen + + Wireless Network + Bežična mreža + + + Wired Network + Žična mreža + NetworkPlugin diff --git a/translations/dde-dock_hu.ts b/translations/dde-dock_hu.ts index 3def62777..9542d8556 100644 --- a/translations/dde-dock_hu.ts +++ b/translations/dde-dock_hu.ts @@ -6,6 +6,55 @@ %1 bővítmény nem kompatibilis a rendszerrel. + + BluetoothApplet + + Bluetooth + Bluetooth + + + Bluetooth settings + + + + + BluetoothItem + + Turn off + + + + Turn on + + + + Bluetooth settings + + + + %1 connected + + + + Connecting... + + + + Bluetooth + Bluetooth + + + Turned off + + + + + BluetoothPlugin + + Bluetooth + Bluetooth + + DBusAdaptors @@ -165,12 +214,87 @@ Eltávolítás a Dokkról + + NetworkItem + + Disable wired connection + + + + Enable wired connection + + + + Disable wireless connection + + + + Enable wireless connection + + + + Disable network + Hálózat letiltása + + + Enable network + Hálózat engedélyezése + + + Network settings + Hálózati beállítások + + + Device disabled + Eszköz letiltva + + + Wireless connection: %1 + + + + Wired connection: %1 + Vezetékes kapcsolat: %1 + + + Not connected + Nincs csatlakozva + + + Connecting + Csatlakozás + + + Connected but no Internet access + Csatlakozva helyi hálózathoz + + + Network cable unplugged + Hálózati kábel kihúzva + + + Wireless Network + Vezeték nélküli hálózat + + + Wired Network + Vezetékes hálózat + + NetworkPlugin Network Hálózat + + Wired Network + Vezetékes hálózat + + + Wired Network %1 + Vezetékes hálózat %1 + OnboardPlugin @@ -350,32 +474,6 @@ Rendszertálca - - WiredItem - - Unknown - Ismeretlen - - - Wired connection: %1 - Vezetékes kapcsolat: %1 - - - - WirelessItem - - No Network - Nincs hálózat - - - Connected but no Internet access - Csatlakozva helyi hálózathoz - - - Wireless connection: %1 - - - WirelessList diff --git a/translations/dde-dock_it.ts b/translations/dde-dock_it.ts index 0aaa7ae8e..9820abd0f 100644 --- a/translations/dde-dock_it.ts +++ b/translations/dde-dock_it.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Connessione WiFi - - - Wired connection - Connessione cablata - Disable wired connection Disattiva connessione cablata @@ -280,6 +272,14 @@ Network cable unplugged Cavo di rete scollegato + + Wireless Network + Rete wireless + + + Wired Network + Connessione cablata + NetworkPlugin diff --git a/translations/dde-dock_ko.ts b/translations/dde-dock_ko.ts index 177bdcbf1..295181a75 100644 --- a/translations/dde-dock_ko.ts +++ b/translations/dde-dock_ko.ts @@ -33,11 +33,11 @@ %1 connected - + %1 연결됨 Connecting... - + 연결하는 중... Bluetooth @@ -45,7 +45,7 @@ Turned off - + 꺼짐 @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - 무선 연결 - - - Wired connection - 유선 연결 - Disable wired connection 유선 연결 사용안함 @@ -280,6 +272,14 @@ Network cable unplugged 네트워크 케이블 제거됨 + + Wireless Network + 무선 네트워크 + + + Wired Network + 유선 네트워크 + NetworkPlugin @@ -339,7 +339,7 @@ Capacity %1 - + 용량 %1 Charging %1 @@ -347,11 +347,11 @@ Capacity %1 ... - + 용량 %1 .... Capacity %1, fully charged - + 용량 %1, 완전히 충전됨 @@ -377,7 +377,7 @@ Suspend - 절전 모드 + 대기모드 Hibernate diff --git a/translations/dde-dock_lt.ts b/translations/dde-dock_lt.ts index 1372526b7..b0cdc5945 100644 --- a/translations/dde-dock_lt.ts +++ b/translations/dde-dock_lt.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Belaidis ryšys - - - Wired connection - Laidinis ryšys - Disable wired connection Išjungti laidinį ryšį @@ -280,6 +272,14 @@ Network cable unplugged Atjungtas tinklo laidas + + Wireless Network + Belaidis tinklas + + + Wired Network + Laidinis tinklas + NetworkPlugin diff --git a/translations/dde-dock_ms.ts b/translations/dde-dock_ms.ts index cf1c271bf..a9fb3b635 100644 --- a/translations/dde-dock_ms.ts +++ b/translations/dde-dock_ms.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - - - - Wired connection - - Disable wired connection @@ -280,6 +272,14 @@ Network cable unplugged Kabel rangkaian telah dicabut + + Wireless Network + Rangkaian Tanpa Wayar + + + Wired Network + Rangkaian Berwayar + NetworkPlugin diff --git a/translations/dde-dock_pl.ts b/translations/dde-dock_pl.ts index 0b6180160..54e5a234b 100644 --- a/translations/dde-dock_pl.ts +++ b/translations/dde-dock_pl.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Połączenie bezprzewodowe - - - Wired connection - Połączenie przewodowe - Disable wired connection Wyłącz połączenie przewodowe @@ -280,6 +272,14 @@ Network cable unplugged Kabel sieciowy jest odłączony + + Wireless Network + Sieć bezprzewodowa + + + Wired Network + Sieć przewodowa + NetworkPlugin @@ -347,11 +347,11 @@ Capacity %1 ... - + Pojemność %1... Capacity %1, fully charged - + Pojemność %1, w pełni naładowana diff --git a/translations/dde-dock_pt.ts b/translations/dde-dock_pt.ts index 4d48de32d..dce761309 100644 --- a/translations/dde-dock_pt.ts +++ b/translations/dde-dock_pt.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Ligação sem fios - - - Wired connection - Ligação por cabo - Disable wired connection Desativar ligação por cabo @@ -280,6 +272,14 @@ Network cable unplugged Cabo de rede desligado + + Wireless Network + Rede sem fios + + + Wired Network + Rede por cabo + NetworkPlugin diff --git a/translations/dde-dock_pt_BR.ts b/translations/dde-dock_pt_BR.ts index aa6a5bba1..5cef0607b 100644 --- a/translations/dde-dock_pt_BR.ts +++ b/translations/dde-dock_pt_BR.ts @@ -70,11 +70,11 @@ 12-hour time - Formato de 12 Horas + Formato de 12 horas 24-hour time - Formato de 24 Horas + Formato de 24 horas Time settings @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Conexão Wi-Fi - - - Wired connection - Conexão Cabeada - Disable wired connection Desativar a conexão cabeada @@ -280,6 +272,14 @@ Network cable unplugged Cabo de rede desconectado + + Wireless Network + Rede Wi-Fi + + + Wired Network + Rede Cabeada + NetworkPlugin @@ -358,7 +358,7 @@ ShowDesktopPlugin Show Desktop - Exibir Área de Trabalho + Área de Trabalho Undock diff --git a/translations/dde-dock_ro.ts b/translations/dde-dock_ro.ts index 9ca14f975..008592fb2 100644 --- a/translations/dde-dock_ro.ts +++ b/translations/dde-dock_ro.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Conexiune fără fir - - - Wired connection - Conexiune prin cablu - Disable wired connection Dezactivați conexiunea prin cablu @@ -280,6 +272,14 @@ Network cable unplugged Cablu Reţea Deconectat + + Wireless Network + Rețea fără fir + + + Wired Network + Rețea conectată + NetworkPlugin diff --git a/translations/dde-dock_ru.ts b/translations/dde-dock_ru.ts index 89098ba5a..d55bd2dad 100644 --- a/translations/dde-dock_ru.ts +++ b/translations/dde-dock_ru.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Беспроводное соединение - - - Wired connection - Проводное соединение - Disable wired connection Отключить проводное соединение @@ -280,6 +272,14 @@ Network cable unplugged Сетевой кабель отключен + + Wireless Network + Беспроводная Сеть + + + Wired Network + Проводная Сеть + NetworkPlugin @@ -347,11 +347,11 @@ Capacity %1 ... - + Заряд %1 ... Capacity %1, fully charged - + Заряд %1, полностью заряжен diff --git a/translations/dde-dock_si.ts b/translations/dde-dock_si.ts index 3f6169838..7e10d4fcf 100644 --- a/translations/dde-dock_si.ts +++ b/translations/dde-dock_si.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - රැහැන් රහිත සම්බන්ධතාවය - - - Wired connection - රැහැන් සම්බන්ධතාවය - Disable wired connection රැහැන් සම්බන්ධතාවය අක්‍රීය කරන්න @@ -280,6 +272,14 @@ Network cable unplugged ජාල කේබලය විසන්ධි කර ඇත + + Wireless Network + රැහැන් රහිත ජාලය + + + Wired Network + රැහැන්ගත ජාලය + NetworkPlugin diff --git a/translations/dde-dock_sk.ts b/translations/dde-dock_sk.ts index 025dcfcf4..9853a7e4c 100644 --- a/translations/dde-dock_sk.ts +++ b/translations/dde-dock_sk.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Bezdrôtové pripojenie - - - Wired connection - Káblové pripojenie - Disable wired connection Vypnúť káblové pripojenie @@ -280,6 +272,14 @@ Network cable unplugged Sieťový kábel odpojený + + Wireless Network + Bezdrôtová sieť + + + Wired Network + Drôtová sieť + NetworkPlugin diff --git a/translations/dde-dock_sq.ts b/translations/dde-dock_sq.ts index 5d0f68651..04833fbb5 100644 --- a/translations/dde-dock_sq.ts +++ b/translations/dde-dock_sq.ts @@ -45,7 +45,7 @@ Turned off - I aktivizuar + I çaktivizuar @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Lidhje pa fill - - - Wired connection - Lidhje me fill - Disable wired connection Çaktivizo lidhje me fill @@ -280,6 +272,14 @@ Network cable unplugged Kablloja e rrjetit është e hequr + + Wireless Network + Rrjet Pa Fill + + + Wired Network + Rrjet Me Fill + NetworkPlugin diff --git a/translations/dde-dock_sr.ts b/translations/dde-dock_sr.ts index 8ad4035c1..7b2b7ab50 100644 --- a/translations/dde-dock_sr.ts +++ b/translations/dde-dock_sr.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Бежична веза - - - Wired connection - Жичана веза - Disable wired connection Искључи жичану везу @@ -280,6 +272,14 @@ Network cable unplugged Мрежни кабл је ископчан + + Wireless Network + Бежична мрежа + + + Wired Network + Жичана мрежа + NetworkPlugin @@ -347,11 +347,11 @@ Capacity %1 ... - Капацитет %1 ... + Ниво %1 .... Capacity %1, fully charged - Капацитет %1, напуњено + Ниво %1, напуњено diff --git a/translations/dde-dock_tr.ts b/translations/dde-dock_tr.ts index ca4c63999..0b39392eb 100644 --- a/translations/dde-dock_tr.ts +++ b/translations/dde-dock_tr.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Kablosuz bağlantı - - - Wired connection - Kablolu bağlantı - Disable wired connection Kablolu bağlantıyı devre dışı bırak @@ -280,6 +272,14 @@ Network cable unplugged Ağ kablosu takılı değil + + Wireless Network + Kablosuz Ağ + + + Wired Network + Kablolu Ağ + NetworkPlugin diff --git a/translations/dde-dock_uk.ts b/translations/dde-dock_uk.ts index a628357b3..623e8911f 100644 --- a/translations/dde-dock_uk.ts +++ b/translations/dde-dock_uk.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Бездротове підключення - - - Wired connection - Дротове підключення - Disable wired connection Вимкнути дротове з'єднання @@ -280,6 +272,14 @@ Network cable unplugged Вийнято інтернет-кабель + + Wireless Network + Бездротова мережа + + + Wired Network + Провідна мережа + NetworkPlugin diff --git a/translations/dde-dock_vi.ts b/translations/dde-dock_vi.ts index 26a9c22ad..8a9025c3f 100644 --- a/translations/dde-dock_vi.ts +++ b/translations/dde-dock_vi.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - Kết nội wifi - - - Wired connection - Kết nối có dây - Disable wired connection Tắt kết nối mạng dây @@ -280,6 +272,14 @@ Network cable unplugged Mạng dây đã ngắt + + Wireless Network + Mạng không dây + + + Wired Network + Mạng kết nối dây + NetworkPlugin diff --git a/translations/dde-dock_zh_CN.ts b/translations/dde-dock_zh_CN.ts index b7e2f1d61..04ab9e52b 100644 --- a/translations/dde-dock_zh_CN.ts +++ b/translations/dde-dock_zh_CN.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - 无线连接 - - - Wired connection - 有线连接 - Disable wired connection 关闭有线网络 @@ -280,6 +272,14 @@ Network cable unplugged 未插入网线 + + Wireless Network + 无线网络 + + + Wired Network + 有线网络 + NetworkPlugin diff --git a/translations/dde-dock_zh_HK.ts b/translations/dde-dock_zh_HK.ts index 9f180e32a..ed6a36143 100644 --- a/translations/dde-dock_zh_HK.ts +++ b/translations/dde-dock_zh_HK.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - 無線連接 - - - Wired connection - 有線連接 - Disable wired connection 關閉有線網絡 @@ -280,6 +272,14 @@ Network cable unplugged 未插入網線 + + Wireless Network + 无线网络 + + + Wired Network + 有线网络 + NetworkPlugin diff --git a/translations/dde-dock_zh_TW.ts b/translations/dde-dock_zh_TW.ts index d6d2ceaba..2ea57986f 100644 --- a/translations/dde-dock_zh_TW.ts +++ b/translations/dde-dock_zh_TW.ts @@ -216,14 +216,6 @@ NetworkItem - - Wireless connection - 無線連接 - - - Wired connection - 有線連接 - Disable wired connection 關閉有線網路 @@ -280,6 +272,14 @@ Network cable unplugged 已拔除網路線 + + Wireless Network + 無線網路 + + + Wired Network + 有線網路 + NetworkPlugin From 52e62425e99305a4c031a709cd97e657759fab8a Mon Sep 17 00:00:00 2001 From: fengshaoxiong Date: Thu, 16 Jul 2020 08:35:27 +0000 Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=89?= =?UTF-8?q?=E7=BA=BF=E5=92=8C=E6=97=A0=E7=BA=BF=E7=BD=91=E7=BB=9C=E7=9A=84?= =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将有线连接和无线连接的文案信息修改成有线和无线网络; Log: 修改网络文案信息 Bug：https://pms.uniontech.com/zentao/bug-view-36850.html (cherry picked from commit ada8d27cd1e1207568160dee6fc5d72e6545fadb) --- plugins/network/networkitem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp index d9037ede6..c1f232cc8 100644 --- a/plugins/network/networkitem.cpp +++ b/plugins/network/networkitem.cpp @@ -55,7 +55,7 @@ NetworkItem::NetworkItem(QWidget *parent) m_wirelessControlPanel = new QWidget(this); m_wirelessTitle = new QLabel(m_wirelessControlPanel); - m_wirelessTitle->setText(tr("Wireless connection")); + m_wirelessTitle->setText(tr("Wireless Network")); m_wirelessTitle->setFont(titlefont); initFontColor(m_wirelessTitle); m_switchWirelessBtn = new DSwitchButton(m_wirelessControlPanel); @@ -93,7 +93,7 @@ NetworkItem::NetworkItem(QWidget *parent) m_wiredControlPanel = new QWidget(this); m_wiredTitle = new QLabel(m_wiredControlPanel); - m_wiredTitle->setText(tr("Wired connection")); + m_wiredTitle->setText(tr("Wired Network")); m_wiredTitle->setFont(titlefont); initFontColor(m_wiredTitle); m_switchWiredBtn = new DSwitchButton(m_wiredControlPanel); From 218e6ae8678e4afea2d3ef8c3fa3ae0a11a292d6 Mon Sep 17 00:00:00 2001 From: fengshaoxiong Date: Thu, 16 Jul 2020 06:28:02 +0000 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3accesible?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 通知中心的tips消息是根据数量改变的需要按照objectName来显示，不可变换，系统插件和托盘插件未显示对应的信息 Log: 修改自动化标记问题 (cherry picked from commit 52b5cfa1f46a245c4c72a52593de6a5805f69ef8) --- frame/util/dockpopupwindow.cpp | 3 ++- frame/window/accessible.h | 2 +- plugins/trash/trashplugin.cpp | 2 +- plugins/tray/snitraywidget.cpp | 1 + plugins/tray/system-trays/systemtrayitem.cpp | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frame/util/dockpopupwindow.cpp b/frame/util/dockpopupwindow.cpp index e34df79ba..be2916f5a 100644 --- a/frame/util/dockpopupwindow.cpp +++ b/frame/util/dockpopupwindow.cpp @@ -69,7 +69,8 @@ void DockPopupWindow::setContent(QWidget *content) QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); - setAccessibleName(content->objectName() + "-popup"); + if (!content->objectName().trimmed().isEmpty()) + setAccessibleName(content->objectName() + "-popup"); DArrowRectangle::setContent(content); } diff --git a/frame/window/accessible.h b/frame/window/accessible.h index 38c32272a..504754a9f 100644 --- a/frame/window/accessible.h +++ b/frame/window/accessible.h @@ -91,7 +91,7 @@ SET_FORM_ACCESSIBLE(MultitaskingWidget, "plugin-multitasking") SET_FORM_ACCESSIBLE(ShowDesktopWidget, "plugin-showdesktop") SET_FORM_ACCESSIBLE(OverlayWarningWidget, "plugin-overlaywarningwidget") SET_FORM_ACCESSIBLE(QWidget, m_w->objectName().isEmpty() ? "widget" : m_w->objectName()) -SET_LABEL_ACCESSIBLE(QLabel, m_w->text().isEmpty() ? m_w->objectName().isEmpty() ? "text" : m_w->objectName() : m_w->text()) +SET_LABEL_ACCESSIBLE(QLabel, m_w->objectName() == "notifications" ? m_w->objectName() : m_w->text().isEmpty() ? m_w->objectName().isEmpty() ? "text" : m_w->objectName() : m_w->text()) SET_BUTTON_ACCESSIBLE(DIconButton, m_w->objectName().isEmpty() ? "imagebutton" : m_w->objectName()) SET_BUTTON_ACCESSIBLE(DSwitchButton, m_w->text().isEmpty() ? "switchbutton" : m_w->text()) SET_BUTTON_ACCESSIBLE(DesktopWidget, "desktopWidget"); diff --git a/plugins/trash/trashplugin.cpp b/plugins/trash/trashplugin.cpp index 794a8f29e..7474f7ee4 100644 --- a/plugins/trash/trashplugin.cpp +++ b/plugins/trash/trashplugin.cpp @@ -40,7 +40,7 @@ TrashPlugin::TrashPlugin(QObject *parent) , m_trashWidget(nullptr) , m_tipsLabel(new TipsWidget) { - m_tipsLabel->setObjectName("trashtips"); + m_tipsLabel->setObjectName("trash"); } const QString TrashPlugin::pluginName() const diff --git a/plugins/tray/snitraywidget.cpp b/plugins/tray/snitraywidget.cpp index db4f0f55b..039484067 100644 --- a/plugins/tray/snitraywidget.cpp +++ b/plugins/tray/snitraywidget.cpp @@ -603,6 +603,7 @@ void SNITrayWidget::showHoverTips() return; m_tipsLabel->setText(tooltip.title); + m_tipsLabel->setAccessibleName(tooltip.title); showPopupWindow(m_tipsLabel); } diff --git a/plugins/tray/system-trays/systemtrayitem.cpp b/plugins/tray/system-trays/systemtrayitem.cpp index ec06a5d02..3e85d1323 100644 --- a/plugins/tray/system-trays/systemtrayitem.cpp +++ b/plugins/tray/system-trays/systemtrayitem.cpp @@ -137,11 +137,13 @@ void SystemTrayItem::sendClick(uint8_t mouseButton, int x, int y) QWidget *SystemTrayItem::trayTipsWidget() { + m_pluginInter->itemTipsWidget(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); return m_pluginInter->itemTipsWidget(m_itemKey); } QWidget *SystemTrayItem::trayPopupApplet() { + m_pluginInter->itemPopupApplet(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); return m_pluginInter->itemPopupApplet(m_itemKey); } From 40af8358d572adefb06180570f6617d4514578d8 Mon Sep 17 00:00:00 2001 From: chenjun Date: Wed, 22 Jul 2020 13:18:13 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E6=94=B9=E5=8F=98=E9=9F=B3?= =?UTF-8?q?=E9=87=8F=E6=97=B6=E4=B8=8D=E5=86=8D=E6=94=B9=E5=8F=98=E9=9D=99?= =?UTF-8?q?=E9=9F=B3=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在设置静音后，点击滑动条时，改变了音量的同时会取消静音状态，不符合设计需求 Log: 修复托盘区域音量显示问题(bug:6382) Bug: https://pms.uniontech.com/zentao/bug-view-6382.html Change-Id: Ib65f22af4bb5de07cdb6c9df90627d2d9c8f22c1 --- plugins/sound/soundapplet.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/sound/soundapplet.cpp b/plugins/sound/soundapplet.cpp index f33d0159b..86ec26a97 100644 --- a/plugins/sound/soundapplet.cpp +++ b/plugins/sound/soundapplet.cpp @@ -223,8 +223,7 @@ void SoundApplet::toggleMute() void SoundApplet::onPlaySoundEffect() { - // set the mute property to false to play sound effects. - m_defSinkInter->SetMuteQueued(false); + } void SoundApplet::increaseVolumeChanged() From 0187ab1151937b9e357d32290fe451d46e91b387 Mon Sep 17 00:00:00 2001 From: chenjun Date: Wed, 22 Jul 2020 17:08:59 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=E5=9C=A8Dock=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E5=88=B0EntryAdded=E4=BF=A1=E5=8F=B7=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9B=B8=E5=90=8CappID=E7=9A=84=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dock的Daemon守护进程在应用打开时，有时会连续发送多次EntryAdded信号，Dock在接收到多个信号时，会在界面上创建多个相同的应用 图标，因此在接收到此信号时，先判断下是否已经存在相同appID的应用图标，如果存在则不再创建图标。 Log: 修复反复启动画板，任务栏会出现双图标问题(bug: 38782) Bug: https://pms.uniontech.com/zentao/bug-view-38782.html Change-Id: I730ca14be1c466f50f579d3237e989fd95a4756e --- frame/controller/dockitemmanager.cpp | 9 +++++++++ frame/controller/dockitemmanager.h | 1 + 2 files changed, 10 insertions(+) diff --git a/frame/controller/dockitemmanager.cpp b/frame/controller/dockitemmanager.cpp index 96cf53f48..e6db5857c 100644 --- a/frame/controller/dockitemmanager.cpp +++ b/frame/controller/dockitemmanager.cpp @@ -190,6 +190,12 @@ void DockItemManager::appItemAdded(const QDBusObjectPath &path, const int index) } AppItem *item = new AppItem(path); + + if (m_appIDist.contains(item->appId())) { + delete item; + return; + } + manageItem(item); connect(item, &AppItem::requestActivateWindow, m_appInter, &DBusDock::ActivateWindow, Qt::QueuedConnection); @@ -197,6 +203,7 @@ void DockItemManager::appItemAdded(const QDBusObjectPath &path, const int index) connect(item, &AppItem::requestCancelPreview, m_appInter, &DBusDock::CancelPreviewWindow); m_itemList.insert(insertIndex, item); + m_appIDist.append(item->appId()); if (index != -1) { emit itemInserted(insertIndex - 1, item); @@ -220,6 +227,8 @@ void DockItemManager::appItemRemoved(const QString &appId) appItemRemoved(app); } } + + m_appIDist.removeAll(appId); } void DockItemManager::appItemRemoved(AppItem *appItem) diff --git a/frame/controller/dockitemmanager.h b/frame/controller/dockitemmanager.h index 37b45352d..e74c4fb16 100644 --- a/frame/controller/dockitemmanager.h +++ b/frame/controller/dockitemmanager.h @@ -79,6 +79,7 @@ private: static DockItemManager *INSTANCE; QList> m_itemList; + QList m_appIDist; }; #endif // DOCKITEMMANAGER_H From cc9af0844ce7c9ead76df0a4d99c6d9cc2463295 Mon Sep 17 00:00:00 2001 From: chenjun Date: Wed, 22 Jul 2020 20:38:24 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E5=A3=B0=E9=9F=B3=E3=80=81?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E3=80=81=E9=94=AE=E7=9B=98=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E7=AD=89=E5=9B=BE=E6=A0=87=E6=8E=92=E5=BA=8F=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=8C=BA=E5=88=86=E6=98=AF=E5=90=A6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87,=E5=90=8C=E6=97=B6=E5=B0=86=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80=E6=88=90pos=5F%1?= =?UTF-8?q?=5F%2=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在图标排序时，对于系统图标，会自动全部排在其他图标后面，而声音图标正好是属于系统图标，在切换Dock显示模式时，会将声音图标显示在网络图标后面 Log: 修复调整声音插件顺序,切换任务栏模式之后，声音插件顺序改变问题(bug:38862) Bug: https://pms.uniontech.com/zentao/bug-view-38862.html Change-Id: Ib080d6eed3a361974142911ff81e9fa0003ae01f Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/343 Reviewed-by: lizhongming Tested-by: lizhongming --- plugins/datetime/datetimeplugin.cpp | 6 +++--- plugins/keyboard-layout/keyboardplugin.cpp | 14 ++++++++++++++ plugins/keyboard-layout/keyboardplugin.h | 3 +++ .../fashiontray/containers/abstractcontainer.cpp | 3 --- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 3306ca7a0..e17a96a71 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -59,7 +59,7 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter) QSettings settings("deepin", "dde-dock-datetime"); if (QFile::exists(settings.fileName())) { Dock::DisplayMode mode = displayMode(); - const QString key = QString("pos_%1").arg(mode); + const QString key = QString("pos_%1_%2").arg(pluginName()).arg(mode); proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 5 : -1)); QFile::remove(settings.fileName()); } @@ -110,7 +110,7 @@ int DatetimePlugin::itemSortKey(const QString &itemKey) { Q_UNUSED(itemKey); - const QString key = QString("pos_%1").arg(Dock::Efficient); + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); return m_proxyInter->getValue(this, key, 5).toInt(); } @@ -118,7 +118,7 @@ void DatetimePlugin::setSortKey(const QString &itemKey, const int order) { Q_UNUSED(itemKey); - const QString key = QString("pos_%1").arg(Dock::Efficient); + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); m_proxyInter->saveValue(this, key, order); } diff --git a/plugins/keyboard-layout/keyboardplugin.cpp b/plugins/keyboard-layout/keyboardplugin.cpp index 26d86d625..665c41554 100644 --- a/plugins/keyboard-layout/keyboardplugin.cpp +++ b/plugins/keyboard-layout/keyboardplugin.cpp @@ -77,3 +77,17 @@ QWidget *KeyboardPlugin::itemTipsWidget(const QString &itemKey) return nullptr; } + +int KeyboardPlugin::itemSortKey(const QString &itemKey) +{ + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); + + return m_proxyInter->getValue(this, key, 2).toInt(); +} + +void KeyboardPlugin::setSortKey(const QString &itemKey, const int order) +{ + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); + + m_proxyInter->saveValue(this, key, order); +} diff --git a/plugins/keyboard-layout/keyboardplugin.h b/plugins/keyboard-layout/keyboardplugin.h index 62a44f24a..30cb754c9 100644 --- a/plugins/keyboard-layout/keyboardplugin.h +++ b/plugins/keyboard-layout/keyboardplugin.h @@ -40,6 +40,9 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; + int itemSortKey(const QString &itemKey) override; + void setSortKey(const QString &itemKey, const int order) override; + private: DBusAdaptors *m_dbusAdaptors = nullptr; }; diff --git a/plugins/tray/fashiontray/containers/abstractcontainer.cpp b/plugins/tray/fashiontray/containers/abstractcontainer.cpp index 72a7f23cb..a07996198 100644 --- a/plugins/tray/fashiontray/containers/abstractcontainer.cpp +++ b/plugins/tray/fashiontray/containers/abstractcontainer.cpp @@ -293,9 +293,6 @@ int AbstractContainer::whereToInsert(FashionTrayWidgetWrapper *wrapper) return m_wrapperList.size(); } - if (wrapper->absTrayWidget()->trayTyep() == AbstractTrayWidget::TrayType::SystemTray) - destSortKey += m_wrapperList.size(); - // 当目标插入位置为列表的大小时将从最后面追加到列表中 int destIndex = m_wrapperList.size(); for (int i = 0; i < m_wrapperList.size(); ++i) { From 26824712fa9bb19f51bfeab3cdb0fa0f79284dbb Mon Sep 17 00:00:00 2001 From: chenjun Date: Thu, 23 Jul 2020 14:00:44 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A0=8F=E5=85=B3=E6=9C=BA=E5=92=8C=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按照设计需求，任务栏插件的顺序为屏幕键盘、桌面智能助手（仅桌面版）、关机、时间、回收站、通知中心，重新调整机和时间的顺序，关机在前，时间在后。 Log: 修复插件区域预装顺序有误的问题(bug:37234) Bug: https://pms.uniontech.com/zentao/bug-view-37234.html Change-Id: Id6cb6732ca7367ff78eefe211ed72dc79487603c Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/407 Reviewed-by: lizhongming Tested-by: lizhongming --- plugins/datetime/datetimeplugin.cpp | 4 ++-- plugins/shutdown/shutdownplugin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index e17a96a71..4183293db 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -60,7 +60,7 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter) if (QFile::exists(settings.fileName())) { Dock::DisplayMode mode = displayMode(); const QString key = QString("pos_%1_%2").arg(pluginName()).arg(mode); - proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 5 : -1)); + proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 6 : -1)); QFile::remove(settings.fileName()); } @@ -111,7 +111,7 @@ int DatetimePlugin::itemSortKey(const QString &itemKey) Q_UNUSED(itemKey); const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 5).toInt(); + return m_proxyInter->getValue(this, key, 6).toInt(); } void DatetimePlugin::setSortKey(const QString &itemKey, const int order) diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index 8d3d3a965..38371f911 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -216,7 +216,7 @@ void ShutdownPlugin::displayModeChanged(const Dock::DisplayMode displayMode) int ShutdownPlugin::itemSortKey(const QString &itemKey) { const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 6).toInt(); + return m_proxyInter->getValue(this, key, 5).toInt(); } void ShutdownPlugin::setSortKey(const QString &itemKey, const int order) From 89a4d80350e72f2548d1090673fb536d5f8523d8 Mon Sep 17 00:00:00 2001 From: Lvpeilong Date: Sat, 25 Jul 2020 15:03:39 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 未进行空指针判断，导致任务栏崩溃重启问题 Log: 添加空指针判断，修复任务栏崩溃重启问题 Bug: https://pms.uniontech.com/zentao/bug-view-39522.html Change-Id: I1686558280ef690a03f508283696a7b25c1ab9ea Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/626 Reviewed-by: panyangzhengqiu Tested-by: panyangzhengqiu --- plugins/tray/system-trays/systemtrayitem.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/tray/system-trays/systemtrayitem.cpp b/plugins/tray/system-trays/systemtrayitem.cpp index 3e85d1323..4a0ca8669 100644 --- a/plugins/tray/system-trays/systemtrayitem.cpp +++ b/plugins/tray/system-trays/systemtrayitem.cpp @@ -137,13 +137,15 @@ void SystemTrayItem::sendClick(uint8_t mouseButton, int x, int y) QWidget *SystemTrayItem::trayTipsWidget() { - m_pluginInter->itemTipsWidget(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); + if(nullptr != m_pluginInter->itemTipsWidget(m_itemKey)) + m_pluginInter->itemTipsWidget(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); return m_pluginInter->itemTipsWidget(m_itemKey); } QWidget *SystemTrayItem::trayPopupApplet() { - m_pluginInter->itemPopupApplet(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); + if(nullptr != m_pluginInter->itemPopupApplet(m_itemKey)) + m_pluginInter->itemPopupApplet(m_itemKey)->setAccessibleName(m_pluginInter->pluginName()); return m_pluginInter->itemPopupApplet(m_itemKey); } From 554c324d14cb3fab76832419f19c88f857a8781f Mon Sep 17 00:00:00 2001 From: chenjun Date: Thu, 30 Jul 2020 17:27:17 +0800 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9B=BE=E6=A0=87=E5=90=91=E4=B8=8B=E5=8F=96=E5=81=B6?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E5=A4=A7=E5=B0=8F=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原代码本意是为了解决在调整任务栏大小时，调整图标大小一致的，但是代码本身无法调整一致大小的图标，反而造成鼠标在界面上移动时，图标大小会变化而抖动 的问题 Log: 修复打开多个应用，将任务栏位置调整至左边或者右边，鼠标在任务栏和桌面间移动，任务栏固定区域和应用区域图标抖动的问题 Bug: https://pms.uniontech.com/zentao/bug-view-40176.html Change-Id: Ibb18d4e16eeecd09be7d2e8b407dac17a12a2e7d Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/983 Reviewed-by: Reviewed-by: lizhongming Tested-by: --- frame/panel/mainpanelcontrol.cpp | 19 ------------------- frame/panel/mainpanelcontrol.h | 2 -- 2 files changed, 21 deletions(-) diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index fc8cb5365..37a0d05b6 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -300,7 +300,6 @@ void MainPanelControl::updateAppAreaSonWidgetSize() m_appAreaSonWidget->adjustSize(); moveAppSonWidget(); - updateFixedAreaIcon(); } void MainPanelControl::setPositonValue(Dock::Position position) @@ -556,7 +555,6 @@ bool MainPanelControl::eventFilter(QObject *watched, QEvent *event) if (event->type() == QEvent::LayoutRequest) { m_appAreaSonWidget->adjustSize(); resizeDockIcon(); - updateFixedAreaIcon(); } else { moveAppSonWidget(); } @@ -1086,20 +1084,3 @@ void MainPanelControl::resizeDesktopWidget() if (DisplayMode::Fashion == m_dislayMode) m_desktopWidget->setFixedSize(0, 0); } - -void MainPanelControl::updateFixedAreaIcon() -{ - QLayoutItem *appLayoutItem = m_appAreaSonLayout->itemAt(0); - if (appLayoutItem) { - QWidget *appWidget = appLayoutItem->widget(); - if (appWidget) { - int w = appWidget->width(); - int h = appWidget->height(); - for (int i = 0; i < m_fixedAreaLayout->count(); ++ i) { - // 取最近较小偶数, 去抖 - m_fixedAreaLayout->itemAt(i)->widget()->setFixedSize((w | 1) - 1, (h | 1) - 1); - } - } - } -} - diff --git a/frame/panel/mainpanelcontrol.h b/frame/panel/mainpanelcontrol.h index 51d5b69ba..b1da64160 100755 --- a/frame/panel/mainpanelcontrol.h +++ b/frame/panel/mainpanelcontrol.h @@ -102,8 +102,6 @@ private: void calcuDockIconSize(int w, int h, PluginsItem *trashPlugin, PluginsItem *shutdownPlugin, PluginsItem *keyboardPlugin, PluginsItem *notificationPlugin); void resizeDesktopWidget(); - void updateFixedAreaIcon(); - public slots: void insertItem(const int index, DockItem *item); void removeItem(DockItem *item); From 2f8f6880cde4300d891ec9f2758da64f3143e706 Mon Sep 17 00:00:00 2001 From: chenjun Date: Thu, 30 Jul 2020 17:00:25 +0800 Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=A4=9A=E4=B8=AA=E5=BA=94=E7=94=A8=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=BB=BB=E5=8A=A1=E6=A0=8F=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 因为鼠标在进入预览窗口时，触发了requestCancelPreviewWindow信号，将预览窗口的指针给置为空，当关闭应用时，无法隐藏并刷新 预览窗口 Log: 修复打开多个应用窗口，在任务栏预览中无法关闭窗口的问题 Bug: https://pms.uniontech.com/zentao/bug-view-40031.html Change-Id: I00e08d24409d346fd44f16cb5f3813694e5daaf8 Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/974 Reviewed-by: Reviewed-by: lizhongming Tested-by: --- frame/item/components/previewcontainer.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/frame/item/components/previewcontainer.cpp b/frame/item/components/previewcontainer.cpp index a2d5ed807..042b4637d 100644 --- a/frame/item/components/previewcontainer.cpp +++ b/frame/item/components/previewcontainer.cpp @@ -224,7 +224,6 @@ void PreviewContainer::onSnapshotClicked(const WId wid) Q_EMIT requestActivateWindow(wid); m_needActivate = true; m_waitForShowPreviewTimer->stop(); - requestCancelPreviewWindow(); requestHidePopup(); } @@ -248,8 +247,6 @@ void PreviewContainer::previewEntered(const WId wid) m_floatingPreview->trackWindow(snap); - requestCancelPreviewWindow(); - if (m_waitForShowPreviewTimer->isActive()) { return; }