GUI v0.1.8

weilueluo · Oct 19, 2019 · 82c59a2 · 82c59a2
1 parent 304630a
commit 82c59a2
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/gui/dist/latest/Pikax 0.1.7.zip → gui/dist/Pikax 0.1.8.zip b/gui/dist/latest/Pikax 0.1.7.zip → gui/dist/Pikax 0.1.8.zip
diff --git a/gui/dist/change_log.txt b/gui/dist/change_log.txt
@@ -1,8 +1,8 @@
 Pikax GUI Change Log
 
-v0.1.8 [not release yet]
+v0.1.8 20 Oct 2019
 - Added ability to filter likes for artists
-- Workaround flashing when changing frame
+- Workaround avoid flashing when changing frame
 - Fix minor language issue
 - Fix window shows up before configuring
 

diff --git a/gui/dist/latest/Pikax 0.1.8.zip b/gui/dist/latest/Pikax 0.1.8.zip
diff --git a/gui/lib/pikax/models.py b/gui/lib/pikax/models.py
@@ -118,7 +118,7 @@ def _compare(self, compare_operator, value):
             folder = util.clean_filename(str(self.outer_self.folder) + '_' + operator_name + '_' + str(value))
             result = self.result_maker(artworks=new_artworks, folder=folder)
 
-            util.log(f'[ done ] {old_len} => {new_len}', inform=True)
+            util.log(f'[ {texts.get("DONE")} ] {old_len} => {new_len}', inform=True)
             return result
 
     @property

diff --git a/gui/lib/pikax/util.py b/gui/lib/pikax/util.py
@@ -272,16 +272,17 @@ def print_progress(self, curr, total, title=None, msg=None):
     def print_done(self, msg=None):
         if msg:
             if self.is_first_print:
-                log(f' [ done ] => {msg}', normal=True)
+                log(f' [ {texts.get("DONE")} ] => {msg}', normal=True)
             else:
-                log(' [ done ] => {0:.2f}{s} \n{msg}'.format(time.time() - self.start_time, msg=msg,
-                                                             s=texts.get('SECOND')),
+                log(' [ {done} ] => {0:.2f}{s} \n{msg}'.format(time.time() - self.start_time, msg=msg,
+                                                               s=texts.get('SECOND'), done=texts.get("DONE")),
                     normal=True)
         else:
             if self.is_first_print:
-                log(' [ done ]', normal=True)
+                log(f' [ {texts.get("DONE")} ]', normal=True)
             else:
-                log(' [ done ] => {0:.2f}{s}'.format(time.time() - self.start_time, s=texts.get('SECOND')), normal=True)
+                log(' [ {done} ] => {0:.2f}{s}'.format(time.time() - self.start_time, s=texts.get('SECOND'),
+                                                       done=texts.get("DONE")), normal=True)
         self.is_first_print = True
         self.start_time = None
         self.last_percent = None

diff --git a/gui/main.spec b/gui/main.spec
@@ -26,7 +26,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
-          name='Pikax 0.1.7',
+          name='Pikax 0.1.8',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,

diff --git a/gui/models.py b/gui/models.py
@@ -311,7 +311,7 @@ def language_button_clicked(self, _=None):
         self.save_inputs()
         texts.set_next_lang()
         save_language()
-        refresh(self)
+        self.refresh = refresh(self)
 
     def make_frame(self, *args, **kwargs):
         return tk.Frame(master=self.master, *args, **kwargs)

diff --git a/gui/settings.py b/gui/settings.py
@@ -5,7 +5,7 @@
 MAIN_WINDOW_WIDTH = 1000
 DOWNLOAD_WINDOW_WIDTH = 600
 DOWNLOAD_WINDOW_HEIGHT = 400
-VERSION = '0.1.7'
+VERSION = '0.1.8'
 
 # Paths
 CANVAS_BACKGROUND_PATH = 'assets/images/background.jpg'

diff --git a/gui/texts.py b/gui/texts.py
@@ -70,6 +70,11 @@ def values_translate(key, value, src_lang, dest_lang):
     '中文': '{file} 损坏，已删除\n消息: {msg}'
 }
 
+DONE = {
+    'English': 'Done',
+    '中文': '完成'
+}
+
 #
 # Models
 #
@@ -146,8 +151,8 @@ def values_translate(key, value, src_lang, dest_lang):
 }
 
 ANDROID_LOGGING_TEXT = {
-    'English': 'Attempting Android Login ...',
-    '中文': '正在尝试安卓登录 。。。'
+    'English': 'Attempting Login ...',
+    '中文': '正在尝试登录 。。。'
 }
 
 ANDROID_LOGIN_FAILED = {