Merge branch 'release/0.2.0'

akehrer · Mar 17, 2014 · 9a9d737 · 9a9d737
2 parents 771788a + bcbd934
commit 9a9d737
Show file tree

Hide file tree

Showing 68 changed files with 5,320 additions and 2,971 deletions.
diff --git a/Motome/Controllers/MainWindow.py b/Motome/Controllers/MainWindow.py
diff --git a/Motome/Modules/SettingsDialog.py → Motome/Controllers/SettingsDialog.py b/Motome/Modules/SettingsDialog.py → Motome/Controllers/SettingsDialog.py
@@ -32,17 +32,17 @@ def __init__(self, conf):
         except KeyError:
             pass
 
-        if 'conf_checkbox_history' in self.conf.keys():
-            if int(self.conf['conf_checkbox_history']) == 0:
-                self.ui.conf_checkbox_history.setChecked(False)
+        # if 'conf_checkbox_history' in self.conf.keys():
+        #     if int(self.conf['conf_checkbox_history']) == 0:
+        #         self.ui.conf_checkbox_history.setChecked(False)
+        # else:
+        #     self.ui.conf_checkbox_history.setChecked(True)
+
+        if 'conf_checkbox_recordonsave' in self.conf.keys():
+            if int(self.conf['conf_checkbox_recordonsave']) == 0:
+                self.ui.conf_checkbox_recordonsave.setChecked(False)
         else:
-            self.ui.conf_checkbox_history.setChecked(True)
-
-        if 'conf_checkbox_deleteempty' in self.conf.keys():
-            if int(self.conf['conf_checkbox_deleteempty']) == 0:
-                self.ui.conf_checkbox_deleteempty.setChecked(False)
-        else:
-            self.ui.conf_checkbox_deleteempty.setChecked(True)
+            self.ui.conf_checkbox_recordonsave.setChecked(True)
 
         if 'conf_checkbox_recordonexit' in self.conf.keys():
             if int(self.conf['conf_checkbox_recordonexit']) == 0:
@@ -74,5 +74,5 @@ def load_folder_location(self):
         else:
             dirpath = None
 
-        savedir = QtGui.QFileDialog.getExistingDirectory (self, 'Notes Directory', dirpath)
+        savedir = QtGui.QFileDialog.getExistingDirectory(self, 'Notes Directory', dirpath)
         self.ui.conf_notesLocation.setText(savedir)
diff --git a/Motome/Controllers/__init__.py b/Motome/Controllers/__init__.py
@@ -0,0 +1 @@
+__author__ = 'Aaron Kehrer'
diff --git a/Motome/Modules/AutoCompleterModel.py → Motome/Models/AutoCompleterModel.py b/Motome/Modules/AutoCompleterModel.py → Motome/Models/AutoCompleterModel.py
diff --git a/Motome/Models/External/__init__.py b/Motome/Models/External/__init__.py
@@ -0,0 +1,3 @@
+"""
+Modules included from external sources.
+"""