Merge pull request #102 from ihabunek/feature/settings

Some improvements to settings. Thanks @ihabunek !

Author: robertbasic

pugdebug/gui/main_window.py

@@ -85,12 +85,6 @@ def setup_docks(self):
             Qt.LeftDockWidgetArea
         )
 
-        self.__add_dock_widget(
-            self.settings_window,
-            "Settings",
-            Qt.LeftDockWidgetArea
-        )
-
         self.__add_dock_widget(
             self.variable_viewer,
             "Variables",
@@ -179,6 +173,11 @@ def setup_actions(self):
         self.quit_action.setShortcut(QKeySequence("Alt+F4"))
         self.quit_action.triggered.connect(self.close)
 
+        self.show_settings_action = QAction("&Settings", self)
+        self.show_settings_action.setToolTip("Show settings")
+        self.show_settings_action.setStatusTip("Show the settings window.")
+        self.show_settings_action.triggered.connect(self.settings_window.exec)
+
     def setup_toolbar(self):
         toolbar = QToolBar("Main Toolbar")
         toolbar.setObjectName("main-toolbar")
@@ -199,6 +198,7 @@ def setup_menubar(self):
 
         file_menu = menu_bar.addMenu("&File")
         file_menu.addAction(self.quit_action)
+        file_menu.addAction(self.show_settings_action)
 
         view_menu = menu_bar.addMenu("&View")
 

pugdebug/gui/settings.py

@@ -9,13 +9,13 @@
 
 __author__ = "robertbasic"
 
-from PyQt5.QtWidgets import (QWidget, QLineEdit, QFormLayout,
+from PyQt5.QtWidgets import (QDialog, QLineEdit, QFormLayout,
                              QSpinBox, QCheckBox)
 
 from pugdebug.models.settings import get_setting, set_setting
 
 
-class PugdebugSettingsWindow(QWidget):
+class PugdebugSettingsWindow(QDialog):
 
     layout = QFormLayout()
 

pugdebug/models/settings.py

@@ -11,11 +11,27 @@
 
 import os
 
-from PyQt5.QtCore import QCoreApplication, QSettings
+from PyQt5.QtCore import QCoreApplication, QSettings, Qt
 
 
 class PugdebugSettings():
 
+    defaults = {
+        'debugger': {
+            'host': '127.0.0.1',
+            'port_number': 9000,
+            'idekey': 'pugdebug',
+            'break_at_first_line': Qt.Checked,
+            'max_depth': '3',
+            'max_children': '128',
+            'max_data': '512'
+        },
+        'path': {
+            'project_root': os.path.expanduser('~'),
+            'path_mapping': ''
+        }
+    }
+
     def __init__(self):
         """Model object to handle application settings
 
@@ -30,60 +46,19 @@ def __init__(self):
         QCoreApplication.setApplicationName("pugdebug")
         self.application_settings = QSettings()
 
-        self.setup_debugger_settings()
-        self.setup_path_settings()
-
-    def setup_debugger_settings(self):
-        """Set up initial debugger settings
-
-        Sets up the initial host to 127.0.0.1.
-        Sets up the initial port number to 9000.
-        Sets up the initial IDE key to pugdebug.
-        """
-        self.application_settings.beginGroup("debugger")
-
-        if not self.application_settings.contains('host'):
-            self.application_settings.setValue('host', '127.0.0.1')
-
-        if not self.application_settings.contains('port_number'):
-            self.application_settings.setValue('port_number', 9000)
-
-        if not self.application_settings.contains('idekey'):
-            self.application_settings.setValue('idekey', 'pugdebug')
-
-        if not self.application_settings.contains('break_at_first_line'):
-            # 2 is the init value because 1 is some weird
-            # between checked and unchecked state
-            self.application_settings.setValue('break_at_first_line', 2)
-
-        if not self.application_settings.contains('max_depth'):
-            self.application_settings.setValue('max_depth', '3')
-
-        if not self.application_settings.contains('max_children'):
-            self.application_settings.setValue('max_children', '128')
-
-        if not self.application_settings.contains('max_data'):
-            self.application_settings.setValue('max_data', '512')
-
-        self.application_settings.endGroup()
-
-    def setup_path_settings(self):
-        """Set up initial path settings
-
-        Sets up the initial project root to the user's home directory.
-        Sets up the initial path mapping to an empty string.
-        """
+        self.setup_default_settings()
 
-        self.application_settings.beginGroup("path")
+    def setup_default_settings(self):
+        """Set up initial debugger settings"""
 
-        if not self.application_settings.contains('project_root'):
-            home_path = os.path.expanduser('~')
-            self.application_settings.setValue('project_root', home_path)
+        for group, settings in self.defaults.items():
+            self.application_settings.beginGroup(group)
 
-        if not self.application_settings.contains('path_mapping'):
-            self.application_settings.setValue('path_mapping', '')
+            for key, value in settings.items():
+                if not self.application_settings.contains(key):
+                    self.application_settings.setValue(key, value)
 
-        self.application_settings.endGroup()
+            self.application_settings.endGroup()
 
     def get(self, key):
         return self.application_settings.value(key)