Fix showing Current slot suffix, current slot and Switch Slot button

ubports-xiaomi-sdm660 · Feb 25, 2023 · adc34d7 · adc34d7
1 parent 299e752
commit adc34d7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/manifest.json.in b/manifest.json.in
@@ -9,7 +9,7 @@
             "desktop":  "switch-my-slot.desktop"
         }
     },
-    "version": "0.5",
+    "version": "0.6",
     "maintainer": "Shoko <shou@disroot.org>",
     "framework" : "ubuntu-sdk-20.04"
 }
diff --git a/po/fr.po b/po/fr.po
@@ -25,8 +25,8 @@ msgid "HAL Version: "
 msgstr "Version de HAL: "
 
 #: ../qml/Main.qml:37
-msgid "App Version: v0.5"
-msgstr "Version de l'application: v0.5"
+msgid "App Version: v0.6"
+msgstr "Version de l'application: v0.6"
 
 #: ../qml/Main.qml:45
 msgid "Number of slots: "

diff --git a/po/nl.po b/po/nl.po
@@ -27,8 +27,8 @@ msgid "HAL Version: "
 msgstr "HAL-versie: "
 
 #: ../qml/Main.qml:37
-msgid "App Version: v0.5"
-msgstr "Appversie: 0.5"
+msgid "App Version: v0.6"
+msgstr "Appversie: 0.6"
 
 #: ../qml/Main.qml:45
 msgid "Number of slots: "

diff --git a/po/switch-my-slot.shouko.pot b/po/switch-my-slot.shouko.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: switch-my-slot.shouko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-12 22:58+0000\n"
+"POT-Creation-Date: 2023-02-25 00:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgid "HAL Version: "
 msgstr ""
 
 #: ../qml/Main.qml:37
-msgid "App Version: v0.5"
+msgid "App Version: v0.6"
 msgstr ""
 
 #: ../qml/Main.qml:45

diff --git a/qml/Main.qml b/qml/Main.qml
@@ -34,7 +34,7 @@ MainView {
                 top: halVersionLabel.bottom
             }
             id: appVersionLabel
-            text: i18n.tr('App Version: v0.5')
+            text: i18n.tr('App Version: v0.6')
         }
 
         Label {

diff --git a/src/logic.py b/src/logic.py
@@ -13,20 +13,20 @@
 
 stream = os.popen(prefix + 'get-current-slot')
 output = stream.read()
-temp = output
+temp = (int(output))
 
-if temp.__eq__(0):
+if (temp == 0):
     pyotherside.send('currentSlot', "A")
 
-elif s1.__eq__(1):
+elif (temp == 1):
     pyotherside.send('currentSlot', "B")
 
-stream = os.popen(prefix + 'get-suffix ' + temp)
+stream = os.popen(prefix + 'get-suffix ' + str(temp))
 output = stream.read()
 pyotherside.send('currentSlotSuffix', output)
 
 def switchSlotFunc():
-    if temp.__eq__(0):
-        os.system(prefix + 'set-active-boot-slot ' + '1 && sudo reboot') # will only reboot if no password is set on device
-    elif temp.__eq__(1):
-        os.system(prefix + 'set-active-boot-slot ' + '0 && sudo reboot')
+    if (temp == 0):
+        os.system(prefix + 'set-active-boot-slot 1 && sudo reboot') # will only reboot if no password is set on device
+    elif (temp == 1):
+        os.system(prefix + 'set-active-boot-slot 0 && sudo reboot')