Skip to content

Commit 67ad8dd

Browse files
committed
fix: Gray out update transfer interface when updates are disabled
[V25 2500U1][Update Management System][Control Center Update Client][Tenth Round Testing][System Update][Public Network][Control Center][System Update] When checking for updates is turned off, the transfer optimization related configuration items should be grayed out and non-operable Log: As above Bug: https://pms.uniontech.com/bug-view-360209.html Influence: Affects the update transfer interface when updates are disabled fix: 更新被禁用时更新传递界面置灰 【V25 2500U1】【更新管理系统】【控制中心更新客户端】【第十轮测试】【系统更新】【公网】【控制中心】【系统更新】关闭检查更新,传递优化相关配置项需要置灰不可操作 Log:如上所述 Bug:https://pms.uniontech.com/bug-view-360209.html Influence:影响更新被禁用时更新传递界面
1 parent 91b66ea commit 67ad8dd

8 files changed

Lines changed: 19 additions & 18 deletions

File tree

src/dcc-update-plugin/qml/UpdateSetting.qml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ DccObject {
335335
parentName: "advancedSettingGroup"
336336
weight: 40
337337
visible: dccData.work().p2pUpdateSupported()
338+
enabled: !dccData.model().updateProhibited
338339
pageType: DccObject.Item
339340
page: DccGroupView {
340341
height: implicitHeight + 10
@@ -353,7 +354,7 @@ DccObject {
353354
displayName: qsTr("Delivery Optimization")
354355
description: qsTr("When enabled, your device may share previously downloaded system updates with other devices on your local network.When you turn it off, cached files from update delivery will be cleared during the next restart.")
355356
weight: 10
356-
enabled: !dccData.model().isPrivateUpdate
357+
enabled: !dccData.model().isPrivateUpdate && !dccData.model().updateProhibited
357358
pageType: DccObject.Editor
358359
page: D.Switch {
359360
id: upgradeDeliverySwitch
@@ -382,7 +383,7 @@ DccObject {
382383
displayName: qsTr("Delivery Optimization-Upload throttling")
383384
visible: dccData.model().upgradeDeliveryEnable
384385
weight: 20
385-
enabled: !dccData.model().upgradeUploadSpeedIsOnline
386+
enabled: !dccData.model().upgradeUploadSpeedIsOnline && !dccData.model().updateProhibited
386387
pageType: DccObject.Item
387388
Connections {
388389
target: dccData.model()
@@ -486,7 +487,7 @@ DccObject {
486487
displayName: qsTr("Delivery Optimization-Limit Speed")
487488
visible: dccData.model().upgradeDeliveryEnable
488489
weight: 30
489-
enabled: !dccData.model().upgradeDownloadSpeedIsOnline
490+
enabled: !dccData.model().upgradeDownloadSpeedIsOnline && !dccData.model().updateProhibited
490491
pageType: DccObject.Item
491492
Connections {
492493
target: dccData.model()

src/private-lastore-tray/privatelastoreplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const QString PrivateLastorePlugin::pluginName() const
4848

4949
const QString PrivateLastorePlugin::pluginDisplayName() const
5050
{
51-
return tr("Private Lastore");
51+
return tr("Private Update");
5252
}
5353

5454
void PrivateLastorePlugin::init(PluginProxyInterface *proxyInter)

src/private-lastore-tray/tipswidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ bool TipsWidget::checkShutdownUpdate()
6464
int lastoreStatus = DConfigHelper::instance()->getConfig("org.deepin.dde.lastore", "org.deepin.dde.lastore", "","lastore-daemon-status", 0).toInt();
6565
if (lastoreStatus == SHUTDOWNUPDATESTATUS) {
6666
m_textList.append(tr("Download complete"));
67-
m_textList.append(tr("Shutdown update"));
67+
m_textList.append(tr("Updates will begin on the next shutdown or restart"));
6868
return true;
6969
} else {
7070
return false;

src/private-lastore-tray/translations/private-lastore-tray_en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>PrivateLastorePlugin</name>
66
<message>
7-
<source>Private Lastore</source>
7+
<source>Private Update</source>
88
<translation type="unfinished"></translation>
99
</message>
1010
</context>
@@ -15,7 +15,7 @@
1515
<translation type="unfinished"></translation>
1616
</message>
1717
<message>
18-
<source>Shutdown update</source>
18+
<source>Updates will begin on the next shutdown or restart</source>
1919
<translation type="unfinished"></translation>
2020
</message>
2121
<message>

src/private-lastore-tray/translations/private-lastore-tray_en_US.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>PrivateLastorePlugin</name>
66
<message>
7-
<source>Private Lastore</source>
7+
<source>Private Update</source>
88
<translation type="unfinished"></translation>
99
</message>
1010
</context>
@@ -15,7 +15,7 @@
1515
<translation type="unfinished"></translation>
1616
</message>
1717
<message>
18-
<source>Shutdown update</source>
18+
<source>Updates will begin on the next shutdown or restart</source>
1919
<translation type="unfinished"></translation>
2020
</message>
2121
<message>

src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<context>
55
<name>PrivateLastorePlugin</name>
66
<message>
7-
<source>Private Lastore</source>
8-
<translation>更新独立客户端</translation>
7+
<source>Private Update</source>
8+
<translation>私有化更新</translation>
99
</message>
1010
</context>
1111
<context>
@@ -15,7 +15,7 @@
1515
<translation>更新包下载完成</translation>
1616
</message>
1717
<message>
18-
<source>Shutdown update</source>
18+
<source>Updates will begin on the next shutdown or restart</source>
1919
<translation>将在下次关机/重启时开始更新</translation>
2020
</message>
2121
<message>

src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<context>
55
<name>PrivateLastorePlugin</name>
66
<message>
7-
<source>Private Lastore</source>
8-
<translation>更新獨立客戶端</translation>
7+
<source>Private Update</source>
8+
<translation>私有化更新</translation>
99
</message>
1010
</context>
1111
<context>
@@ -15,7 +15,7 @@
1515
<translation>更新包下載完成</translation>
1616
</message>
1717
<message>
18-
<source>Shutdown update</source>
18+
<source>Updates will begin on the next shutdown or restart</source>
1919
<translation>將在下次關機/重啟時開始更新</translation>
2020
</message>
2121
<message>

src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<context>
55
<name>PrivateLastorePlugin</name>
66
<message>
7-
<source>Private Lastore</source>
8-
<translation>更新獨立客戶端</translation>
7+
<source>Private Update</source>
8+
<translation>私有化更新</translation>
99
</message>
1010
</context>
1111
<context>
@@ -15,7 +15,7 @@
1515
<translation>更新包下載完成</translation>
1616
</message>
1717
<message>
18-
<source>Shutdown update</source>
18+
<source>Updates will begin on the next shutdown or restart</source>
1919
<translation>將在下次關機/重新啟動時開始更新</translation>
2020
</message>
2121
<message>

0 commit comments

Comments
 (0)