diff --git a/com.github.Melawy.ArchUpdate/contents/assets/default.svg b/com.github.Melawy.ArchUpdate/contents/assets/default.svg index 997346d..90875ee 100644 --- a/com.github.Melawy.ArchUpdate/contents/assets/default.svg +++ b/com.github.Melawy.ArchUpdate/contents/assets/default.svg @@ -1,64 +1,85 @@ - - + + + + + + + - - - - - - - + inkscape:current-layer="svg19685" /> + + + + + + diff --git a/com.github.Melawy.ArchUpdate/contents/assets/error.svg b/com.github.Melawy.ArchUpdate/contents/assets/error.svg index 1ace9b6..e55a0c2 100644 --- a/com.github.Melawy.ArchUpdate/contents/assets/error.svg +++ b/com.github.Melawy.ArchUpdate/contents/assets/error.svg @@ -1,73 +1,82 @@ - - - - - - - - - - + id="defs18"> + + + + + + + + + + + + diff --git a/com.github.Melawy.ArchUpdate/contents/assets/install.svg b/com.github.Melawy.ArchUpdate/contents/assets/install.svg new file mode 100644 index 0000000..7293b75 --- /dev/null +++ b/com.github.Melawy.ArchUpdate/contents/assets/install.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + diff --git a/com.github.Melawy.ArchUpdate/contents/assets/ready.svg b/com.github.Melawy.ArchUpdate/contents/assets/ready.svg index d6eaaca..05c6978 100644 --- a/com.github.Melawy.ArchUpdate/contents/assets/ready.svg +++ b/com.github.Melawy.ArchUpdate/contents/assets/ready.svg @@ -1,72 +1,85 @@ - - + + + + + + + - - - - - - - - + inkscape:current-layer="svg14" /> + + + + + + diff --git a/com.github.Melawy.ArchUpdate/contents/assets/refresh.svg b/com.github.Melawy.ArchUpdate/contents/assets/refresh.svg index ee4e33e..ebf286c 100644 --- a/com.github.Melawy.ArchUpdate/contents/assets/refresh.svg +++ b/com.github.Melawy.ArchUpdate/contents/assets/refresh.svg @@ -1,4 +1,91 @@ - - - + + + + + + + + + + + + + + + + + + diff --git a/com.github.Melawy.ArchUpdate/contents/service/Updater.qml b/com.github.Melawy.ArchUpdate/contents/service/Updater.qml index b60681a..6d7f372 100644 --- a/com.github.Melawy.ArchUpdate/contents/service/Updater.qml +++ b/com.github.Melawy.ArchUpdate/contents/service/Updater.qml @@ -17,11 +17,12 @@ Item { return } else { + root.upgradeStatus = root.installingStatus + updateUi() cmd.exec(Plasmoid.configuration.commandForUpgrade) } } - // execute function count each 30 minutes Timer { id: timer interval: Plasmoid.configuration.updateInterval * 60000 // minute to milisecond @@ -33,7 +34,7 @@ Item { Timer { id: startUpTimer - interval: 10000 // 10 seconds + interval: 20000 // 20 seconds running: true repeat: false triggeredOnStart: false diff --git a/com.github.Melawy.ArchUpdate/contents/ui/Compact.qml b/com.github.Melawy.ArchUpdate/contents/ui/Compact.qml index 3d8c7c8..ec7c049 100644 --- a/com.github.Melawy.ArchUpdate/contents/ui/Compact.qml +++ b/com.github.Melawy.ArchUpdate/contents/ui/Compact.qml @@ -30,7 +30,7 @@ Item { radius: Math.round(width / 2) color: "Black" opacity: 0.7 - visible: true + visible: false anchors { right: parent.right top: parent.top diff --git a/com.github.Melawy.ArchUpdate/contents/ui/main.qml b/com.github.Melawy.ArchUpdate/contents/ui/main.qml index de8d63d..a0abb41 100644 --- a/com.github.Melawy.ArchUpdate/contents/ui/main.qml +++ b/com.github.Melawy.ArchUpdate/contents/ui/main.qml @@ -17,6 +17,7 @@ Item { property string iconDefault: "../assets/default.svg" property string iconRefresh: "../assets/refresh.svg" property string iconReadyToUpgrade: "../assets/ready.svg" + property string iconInstalling: "../assets/install.svg" property string iconError: "../assets/error.svg" property string mainIcon: iconDefault @@ -32,7 +33,8 @@ Item { property int normalStatus: 0 property int checkingUpdatesStatus: 1 property int readyStatus: 2 - property int errorStatus: 3 + property int installingStatus: 3 + property int errorStatus: 4 property int upgradeStatus: defaultStatus @@ -76,22 +78,31 @@ Item { switch (upgradeStatus) { case normalStatus: mainIcon = iconDefault + compactRep.circle.visible = false break case checkingUpdatesStatus: mainIcon = iconRefresh //total = 0 + compactRep.circle.visible = true total = "↻" break case readyStatus: mainIcon = iconReadyToUpgrade + compactRep.circle.visible = true + break + case installingStatus: + mainIcon = iconInstalling + compactRep.circle.visible = true break case errorStatus: - mainIcon=iconError + mainIcon = iconError total = 0 + compactRep.circle.visible = false break default: mainIcon = iconDefault total = 0 + compactRep.circle.visible = false } }