Skip to content

fix: Gray out update transfer interface when updates are disabled #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ut005973 wants to merge 1 commit into from
Closed

fix: Gray out update transfer interface when updates are disabled #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/dcc-update-plugin/qml/UpdateSetting.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ DccObject {
parentName: "advancedSettingGroup"
weight: 40
visible: dccData.work().p2pUpdateSupported()
enabled: !dccData.model().updateProhibited
pageType: DccObject.Item
page: DccGroupView {
height: implicitHeight + 10
Expand All @@ -353,7 +354,7 @@ DccObject {
displayName: qsTr("Delivery Optimization")
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.")
weight: 10
enabled: !dccData.model().isPrivateUpdate
enabled: !dccData.model().isPrivateUpdate && !dccData.model().updateProhibited
pageType: DccObject.Editor
page: D.Switch {
id: upgradeDeliverySwitch
Expand Down Expand Up @@ -382,7 +383,7 @@ DccObject {
displayName: qsTr("Delivery Optimization-Upload throttling")
visible: dccData.model().upgradeDeliveryEnable
weight: 20
enabled: !dccData.model().upgradeUploadSpeedIsOnline
enabled: !dccData.model().upgradeUploadSpeedIsOnline && !dccData.model().updateProhibited
pageType: DccObject.Item
Connections {
target: dccData.model()
Expand Down Expand Up @@ -486,7 +487,7 @@ DccObject {
displayName: qsTr("Delivery Optimization-Limit Speed")
visible: dccData.model().upgradeDeliveryEnable
weight: 30
enabled: !dccData.model().upgradeDownloadSpeedIsOnline
enabled: !dccData.model().upgradeDownloadSpeedIsOnline && !dccData.model().updateProhibited
pageType: DccObject.Item
Connections {
target: dccData.model()
Expand Down
2 changes: 1 addition & 1 deletion src/private-lastore-tray/privatelastoreplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const QString PrivateLastorePlugin::pluginName() const

const QString PrivateLastorePlugin::pluginDisplayName() const
{
return tr("Private Lastore");
return tr("Private Update");
}

void PrivateLastorePlugin::init(PluginProxyInterface *proxyInter)
Expand Down
2 changes: 1 addition & 1 deletion src/private-lastore-tray/tipswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bool TipsWidget::checkShutdownUpdate()
int lastoreStatus = DConfigHelper::instance()->getConfig("org.deepin.dde.lastore", "org.deepin.dde.lastore", "","lastore-daemon-status", 0).toInt();
if (lastoreStatus == SHUTDOWNUPDATESTATUS) {
m_textList.append(tr("Download complete"));
m_textList.append(tr("Shutdown update"));
m_textList.append(tr("Updates will begin on the next shutdown or restart"));
return true;
} else {
return false;
Expand Down
4 changes: 2 additions & 2 deletions src/private-lastore-tray/translations/private-lastore-tray_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<context>
<name>PrivateLastorePlugin</name>
<message>
<source>Private Lastore</source>
<source>Private Update</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand All @@ -15,7 +15,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Shutdown update</source>
<source>Updates will begin on the next shutdown or restart</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
4 changes: 2 additions & 2 deletions src/private-lastore-tray/translations/private-lastore-tray_en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<context>
<name>PrivateLastorePlugin</name>
<message>
<source>Private Lastore</source>
<source>Private Update</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand All @@ -15,7 +15,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Shutdown update</source>
<source>Updates will begin on the next shutdown or restart</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
6 changes: 3 additions & 3 deletions src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<context>
<name>PrivateLastorePlugin</name>
<message>
<source>Private Lastore</source>
<translation>更新独立客户端</translation>
<source>Private Update</source>
<translation>私有化更新</translation>
</message>
</context>
<context>
Expand All @@ -15,7 +15,7 @@
<translation>更新包下载完成</translation>
</message>
<message>
<source>Shutdown update</source>
<source>Updates will begin on the next shutdown or restart</source>
<translation>将在下次关机/重启时开始更新</translation>
</message>
<message>
Expand Down
6 changes: 3 additions & 3 deletions src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<context>
<name>PrivateLastorePlugin</name>
<message>
<source>Private Lastore</source>
<translation>更新獨立客戶端</translation>
<source>Private Update</source>
<translation>私有化更新</translation>
</message>
</context>
<context>
Expand All @@ -15,7 +15,7 @@
<translation>更新包下載完成</translation>
</message>
<message>
<source>Shutdown update</source>
<source>Updates will begin on the next shutdown or restart</source>
<translation>將在下次關機/重啟時開始更新</translation>
</message>
<message>
Expand Down
6 changes: 3 additions & 3 deletions src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<context>
<name>PrivateLastorePlugin</name>
<message>
<source>Private Lastore</source>
<translation>更新獨立客戶端</translation>
<source>Private Update</source>
<translation>私有化更新</translation>
</message>
</context>
<context>
Expand All @@ -15,7 +15,7 @@
<translation>更新包下載完成</translation>
</message>
<message>
<source>Shutdown update</source>
<source>Updates will begin on the next shutdown or restart</source>
<translation>將在下次關機/重新啟動時開始更新</translation>
</message>
<message>
Expand Down
Loading