Made final changes to review window, it does what is supposed to do now

umbra/controller.py

@@ -90,7 +90,7 @@ class Controller:
             file_paths = [folder_path + '/' + x
                           for x in file_names if '.csv' in x]
             self._set_path(file_paths, type_code)
-            self._view.update_files(file_paths, type_code)
+            self._view.update_file_list(file_paths, type_code)
             self._toggle_new()
         else:
             self._view.update_message('no_file')
@@ -117,7 +117,7 @@ class Controller:
         files = getattr(self, '_{}_files'.format(type_code))
         selection = self._view.select_files(type_code)
         files.extend(selection)
-        self._view.update_files(files, type_code)
+        self._view.update_file_list(files, type_code)
         self._toggle_new()
 
     def _delete_files(self, type_code, remove_all=False):
@@ -145,7 +145,7 @@ class Controller:
                 self._model.remove_task(selection)
                 self._view.button_status('select_folder {}'.format(type_code),
                                          'normal')
-            self._view.update_files(files, type_code)
+            self._view.update_file_list(files, type_code)
         self._toggle_new()
 
     def _compare_files(self):
@@ -266,13 +266,13 @@ class Controller:
 
         # Mistakes retrieved from Treeview are strings, therefore:
         for m in Mistake:
-            if mistake_string.split(".")[1].lower() == m.value:
+            if mistake_string.lower() == m.value:
                 new_mistake = m
 
         # Change into selected mistake
         for item in selection:
             source, onset_src, shadow, onset_shd, mistake, review = tree.item(item)['values']
-            newvals = (source, onset_src, shadow, onset_shd, mistake, new_mistake)
+            newvals = (source, onset_src, shadow, onset_shd, mistake, new_mistake.name)
             tree.item(item, values=newvals)
 
 
@@ -323,7 +323,8 @@ class Controller:
                             mistake = s.mistake
                             tree.insert(part1, "end",  text="{}".format(e),
                                         values=(source, onset_src, shadow,
-                                                onset_shd, mistake, mistake))
+                                                onset_shd, mistake.name,
+                                                mistake.name))
                 # Handle shadow words
                 for s in participant.shadow:
                     if s.source is None: # Without source word
@@ -335,7 +336,8 @@ class Controller:
                         if mistake is not None:
                             tree.insert(part1, "end",  text="{}".format(e),
                                         values=(source, onset_src, shadow,
-                                                onset_shd, mistake, mistake))
+                                                onset_shd, mistake.name,
+                                                mistake.name))
                     else:   # Without shadow word
                         source = s.source.word
                         onset_src = s.source.onset
@@ -345,7 +347,8 @@ class Controller:
                         if mistake is not None:
                             tree.insert(part1, "end",  text="{}".format(e),
                                         values=(source, onset_src, shadow,
-                                                onset_shd, mistake, mistake))
+                                                onset_shd, mistake.name,
+                                                mistake.name))
             counter += 1
 
     def save_review(self):
@@ -365,7 +368,7 @@ class Controller:
                         mistake = None
                         for m in Mistake:
                             # Mistakes are strings, therefore:
-                            if new_mistake.split(".")[1].lower() == m.value:
+                            if new_mistake.lower() == m.value:
                                 mistake = m
                         changed.append([src, shd, mistake])
 

umbra/view.py

@@ -253,7 +253,7 @@ class View:
         self._pos_right = int(width + width_pad)
         self._pos_down = int(height + height_pad)
         window.geometry('+{}+{}'.format(self._pos_right, self._pos_down))
-        window.overrideredirect(overrode_direct)
+        #window.overrideredirect(overrode_direct)
         window.update()
         if withdraw:
             window.withdraw()
@@ -592,9 +592,9 @@ class ReviewWindow(tk.Toplevel, View):
         action_function = partial(self._perform_action, key="combobox_review")
         self._elements['mistake_box'].bind("<<ComboboxSelected>>",
                                            action_function)
-        mistakes = [Mistake.FORM, Mistake.SEMANTIC, Mistake.RANDOM,
-                    Mistake.PHONETIC, Mistake.SKIPPED, Mistake.REPETITION,
-                    Mistake.CORRECT]
+        mistakes = ["CORRECT","FORM","PHONETIC", "RANDOM", "REPETITION",
+                     "SEMANTIC", "SKIPPED"
+                    ]
         self._set_entries_combobox(self._elements['mistake_box'], mistakes)
 
     def _create_tree(self):