Merge pull request #149 from robertbasic/fix/issue125

Fix/issue125. Fixes #125

Author: robertbasic

CHANGELOG.md

@@ -10,6 +10,7 @@
 ### Fixed
  - Fix for GTK critical errors on Ubuntu
  - Do not jump to top of the file every time a debugging session starts
+ - Updating settings now updates current project's settings as well
 
 ### Removed
 

pugdebug/gui/projects.py

@@ -107,6 +107,16 @@ def load_projects(self):
         model = self.model()
         model.load_projects()
 
+    def load_project_by_name(self, project_name):
+        model = self.model()
+        items = model.findItems(project_name)
+        if len(items) > 0:
+            item = items[0]
+            project = model.get_project_by_item(item)
+            return project
+
+        return None
+
     def show_context_menu(self, point):
         context_menu = QMenu(self)
 

pugdebug/gui/settings.py

@@ -20,7 +20,7 @@
 
 class PugdebugSettingsWindow(QDialog):
 
-    settings_changed_signal = pyqtSignal(set)
+    settings_changed_signal = pyqtSignal(dict)
 
     def __init__(self, parent):
         super(PugdebugSettingsWindow, self).__init__(parent)

pugdebug/models/projects.py

@@ -47,6 +47,10 @@ def get_settings(self):
 
         return project_settings
 
+    def set_settings(self, new_settings):
+        for key, value in new_settings.items():
+            self.setValue(key, value)
+
     def delete(self):
         delete_project(self.get_project_name())
 

pugdebug/models/settings.py

@@ -162,13 +162,13 @@ def set_setting(key, value):
 
 
 def save_settings(new_settings):
-    changed_settings = set()
+    changed_settings = {}
 
     for key in new_settings:
         value = new_settings[key]
         if not has_setting(key) or get_setting(key) != value:
             set_setting(key, value)
-            changed_settings.add(key)
+            changed_settings[key] = value
 
     return changed_settings
 

pugdebug/pugdebug.py

@@ -21,7 +21,8 @@
 from pugdebug.models.documents import PugdebugDocuments
 from pugdebug.models.file_browser import PugdebugFileBrowser
 from pugdebug.models.projects import PugdebugProjects
-from pugdebug.models.settings import get_setting, set_setting, save_settings
+from pugdebug.models.settings import (get_setting, set_setting,
+                                      save_settings, has_setting)
 
 
 class Pugdebug(QObject):
@@ -257,10 +258,10 @@ def handle_new_project_created(self, project_name):
         """
         self.projects_browser.load_projects()
 
-        item = self.projects_browser.model().findItems(project_name)[0]
-        project = self.projects_browser.model().get_project_by_item(item)
+        project = self.projects_browser.load_project_by_name(project_name)
 
-        self.load_project(project)
+        if project is not None:
+            self.load_project(project)
 
     def projects_browser_item_activated(self, index):
         """Handle when a projects browser item gets activated
@@ -418,14 +419,26 @@ def handle_settings_changed(self, changed_settings):
 
         Given argument is a set of settings's names which have been changed.
         """
-        if 'path/project_root' in changed_settings:
+
+        if has_setting('current_project'):
+            project_name = get_setting('current_project')
+
+            project = self.projects_browser.load_project_by_name(project_name)
+
+            if project is not None:
+                project.set_settings(changed_settings)
+
+        changed_setting_keys = changed_settings.keys()
+
+        if 'path/project_root' in changed_setting_keys:
             self.handle_project_root_changed()
 
         features = ['debugger/max_depth',
                     'debugger/max_children',
                     'debugger/max_data']
 
-        if any(True for feature in features if feature in changed_settings):
+        if any(True for feature in features
+               if feature in changed_setting_keys):
             self.handle_debugger_features_changed()
 
     def handle_project_root_changed(self):