GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
ChrisTerBeke 2019-01-17 10:23:38 +01:00
commit b51317b4f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/CuraDrive/src/qml/components/BackupListFooter.qml
View File

@ -30,7 +30,7 @@ RowLayout
id: createBackupButton id: createBackupButton
text: catalog.i18nc("@button", "Backup Now") text: catalog.i18nc("@button", "Backup Now")
iconSource: UM.Theme.getIcon("plus") iconSource: UM.Theme.getIcon("plus")
enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup && !backupListFooter.showInfoButton enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup
onClicked: CuraDrive.createBackup() onClicked: CuraDrive.createBackup()
busy: CuraDrive.isCreatingBackup busy: CuraDrive.isCreatingBackup
} }

6
plugins/CuraDrive/src/qml/pages/BackupsPage.qml
View File

@ -40,7 +40,7 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
wrapMode: Label.WordWrap wrapMode: Label.WordWrap
visible: backupList.count == 0 visible: backupList.model.length == 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -62,14 +62,14 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
wrapMode: Label.WordWrap wrapMode: Label.WordWrap
visible: backupList.count > 4 visible: backupList.model.length > 4
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
BackupListFooter BackupListFooter
{ {
id: backupListFooter id: backupListFooter
showInfoButton: backupList.count > 4 showInfoButton: backupList.model.length > 4
} }
} }
} }