Fixed console output in GUI and yaml output

Should be a bit better visually now.

Author: 2Cas

README.md

@@ -1,7 +1,7 @@
 ## Description
 ```
 Q2K Keymap Parser 
-ver. 1.1.0.a2 (Pre-Alpha) 
+ver. 1.1.1.a1 (Pre-Alpha) 
 by 2Cas (c) 2018
 ```
 

bin/Win/q2k_util.exe

@@ -695,15 +695,17 @@ def __find(self):
             try:
                 with open(self.__loc, 'r') as f:
                     self.kbo_list = yaml.load(f)
-                    self.__console.note(['Using cached list from '+self.__loc, '--cache to reset', defaults.print_lines])
+                    self.__console.note(['Using cached list from '+self.__loc, '--cache to reset'])
             except:
-                self.__console.warning(['Failed to load from '+self.__loc, 'Generating new cache_kb.yaml...'])
+                self.__console.warning(['Failed to load from '+self.__loc])
                 self.__write()
         else:
                 self.__write()
 
     def __write(self):
 
+        self.__console.note([defaults.print_lines, 'Generating new cache_kb.yaml in '+self.__loc])
+
         templist = []
         keymaplist = []
         qdir = os.path.join(self.__qmk, 'keyboards')
@@ -812,9 +814,9 @@ def __write(self):
         if self.kbo_list:
             # Dump cache info to text file for faster processing in future
             self.__save_cache()
-            self.__console.note(['New cache_kb.yaml successfully generated', 'Location: '+self.__loc, defaults.print_lines])
+            self.__console.note(['New cache_kb.yaml successfully generated', 'Location: '+self.__loc])
         else:
-            self.__console.warning(['No keyboard information found', 'Check QMK directory location in pref.yaml : '+self.__qmk, defaults.print_lines])
+            self.__console.warning(['No keyboard information found', 'Check QMK directory location in pref.yaml : '+self.__qmk])
 
 
     def __find_layout_names(self, kbo):

q2k/core.py

@@ -633,41 +633,41 @@ class ref:
 ---
 <ERRORS>
 
-report_mode: auto_nkro # options: auto_nkro, 6kro, nkro
+report_mode : auto_nkro # options: auto_nkro, 6kro, nkro
 
-devices:
-  <KB_NAME>:
-    id: 0
-    layout: <LAYOUT_NAME>
-    layout_offset: 0
-    scan_mode:
-      mode: col_row # options: col_row, pins, none
-      rows: <ROWS>
-      cols: <COLS>
+devices :
+  <KB_NAME> :
+    id : 0
+    layout : <LAYOUT_NAME>
+    layout_offset : 0
+    scan_mode :
+      mode : col_row # options:  col_row, row_col, pins, none
+      rows : <ROWS>
+      cols : <COLS>
       # Maps how keys are physically wired, to how they appear visually
-      matrix_map: [
+      matrix_map : [
         <MATRIX_MAP>
       ]
       # Debounce settings
-      debounce:
-         debounce_time_press: 5
-         debounce_time_release: 5
-         trigger_time_press: 1
-         trigger_time_release: 1
-         parasitic_discharge_delay_idle: 10.0
-         parasitic_discharge_delay_debouncing: 10.0
+      debounce :
+         debounce_time_press : 5
+         debounce_time_release : 5
+         trigger_time_press : 1
+         trigger_time_release : 1
+         parasitic_discharge_delay_idle : 10.0
+         parasitic_discharge_delay_debouncing : 10.0
 <KEYCODES>
-layouts:
+layouts :
   <LAYOUT_NAME> :
-    default_layer: 0
-    layers: [
+    default_layer : 0
+    layers : [
 <LAYOUT>    ]
 '''
 
     keyplus_yaml_keycode_template = '''
-  <KEYCODE>:
-    keycode: hold
-    delay: 200
-    tap_key: <TAP>
-    hold_key: <HOLD>
-'''
+  <KEYCODE> :
+    keycode : hold
+    delay : 200
+    tap_key : <TAP>
+    hold_key : <HOLD>
+'''

q2k/reference.py

@@ -1 +1 @@
-q2kversion = '1.1.0.a2'
+q2kversion = '1.1.1.a1'