v1.0.1 : Fix GUI version

Author: BenSouchet

core.py

@@ -11,7 +11,7 @@
 
 SCRIPT_NAME = 'CW Wizard'
 
-VERSION = '1.0.0'
+VERSION = '1.0.1'
 
 EXIT_ERROR_MSG = 'The Wizard encountered issue(s) please check previous logs.\n'
 EXIT_SUCCESS_MSG = 'The Wizard has finish is work, have a great day!\n'
@@ -90,6 +90,9 @@ def append(self, result):
             self.status = 'warning'
         self.messages = [*self.messages, *result.messages]
 
+    def setResult(self, element):
+        self.result = element
+
     def addResult(self, element):
         if not self.result:
             self.result = element
@@ -596,7 +599,7 @@ def build_result_page(wantlists_info, max_sellers, sellers, relevant_sellers):
 
     return funct_result
 
-def cardmarket_wantlist_wizard(credentials, wantlist_urls, continue_on_warning, max_sellers, articles_comment):
+def cardmarket_wantlist_wizard(credentials, wantlist_urls, continue_on_warning, max_sellers, articles_comment=False):
     funct_result = FunctResult()
     LOG.debug('------- Calling the Wizard...\r\n')
 
@@ -647,7 +650,10 @@ def cardmarket_wantlist_wizard(credentials, wantlist_urls, continue_on_warning,
                 build_result = build_result_page(wantlists_info, max_sellers, sellers, relevant_sellers)
                 build_result.logMessages()
 
-                funct_result.append(populate_result)
+                funct_result.append(build_result)
+                result_path = build_result.getResult()
+                if result_path != None:
+                    funct_result.setResult(result_path)
 
         # Step 5: Logout from Cardmarket, simply a safety mesure.
         logout_result = cardmarket_log_out(session)

cw-wizard-gui.py

@@ -8,8 +8,6 @@
 from functools import partial
 
 from core import SCRIPT_NAME, VERSION, MAXIMUM_SELLERS
-from core import FunctResult
-from core import init_logger
 from core import create_credentials_file
 from core import get_credentials_from_file
 from core import check_credentials_validity
@@ -77,7 +75,7 @@ def create_label(parent, text, font_style, bg_color):
     return label
 
 def create_button(parent, text, bg_color):
-    button = tkinter.Button(parent, font=GUI_FONT_STYLES['button'], background=bg_color, highlightbackground=bg_color)
+    button = tkinter.Button(parent, font=GUI_FONT_STYLES['button']['font'], background=GUI_FONT_STYLES['button']['background-color'], highlightbackground=bg_color, foreground=GUI_FONT_STYLES['button']['font-color'], disabledforeground=GUI_FONT_STYLES['button']['disabled-font-color'])
     if isinstance(text, tkinter.StringVar):
         button.configure(textvariable=text)
     else:
@@ -127,7 +125,7 @@ def _populate_font_styles():
     GUI_FONT_STYLES['title'] = { 'font': (font_name, 22, tkinter.font.BOLD), 'font-color': '#FFFFFF' }
     GUI_FONT_STYLES['description'] = { 'font': (font_name, 12), 'font-color': '#aaaaaa' }
     GUI_FONT_STYLES['content'] = { 'font': (font_name, 12), 'font-color': '#FFFFFF' }
-    GUI_FONT_STYLES['button'] = { 'font': (font_name, 12), 'font-color': '#aaaaaa' }
+    GUI_FONT_STYLES['button'] = { 'font': (font_name, 12), 'font-color': '#24201d', 'disabled-font-color': '#4a4542', 'background-color': '#feffff' }
 
 def close_window(window):
     window.root.destroy()
@@ -275,11 +273,13 @@ def create_default_widgets(window):
     window.button_next = create_button(frame_buttons, window.button_next_text, window.main_bg_color)
     window.button_next.grid(column=1, row=0, sticky=tkinter.NE)
 
-def set_window_description(window, message, is_error=False):
+def set_window_description(window, message, is_error=False, is_warn=False):
     if is_error:
         window.description_label.configure(foreground='red')
+    elif is_warn:
+        window.description_label.configure(foreground='yellow')
     else:
-        window.description_label.configure(foreground= GUI_FONT_STYLES['description']['font-color'])
+        window.description_label.configure(foreground=GUI_FONT_STYLES['description']['font-color'])
 
     window.description.set(message)
 
@@ -432,7 +432,7 @@ def window_wait_screen(window):
     content_label.configure(wraplength=472)
 
     # Step 3: Set texts according to the current step
-    set_window_description(window, 'Please wait until the process as finish.')
+    set_window_description(window, 'Please wait for the process to finish.')
     if window.step == 'request_credentials':
         window.title.set('Checking credentials...')
         content_msg.set('The program check if we can estasblish a connection to Cardmarket using your credentials, this can takes up to 1 minute.')