Merge pull request #150 from robertbasic/fix/issue148

Fix/issue148. Fixes #148

Author: robertbasic

CHANGELOG.md

@@ -11,6 +11,7 @@
  - 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
+ - Deleting current project doesn't break pugdebug any more
 
 ### Removed
 

pugdebug/gui/main_window.py

@@ -59,6 +59,10 @@ def __init__(self):
         if has_setting("current_project"):
             self.set_window_title(get_setting("current_project"))
 
+        self.projects_browser.project_deleted_signal.connect(
+            self.handle_project_deleted
+        )
+
     def closeEvent(self, event):
         set_setting("window/geometry", self.saveGeometry())
         set_setting("window/state", self.saveState())
@@ -298,8 +302,15 @@ def get_breakpoint_viewer(self):
     def get_expression_viewer(self):
         return self.expression_viewer
 
+    def handle_project_deleted(self, is_project_current):
+        if is_project_current:
+            self.set_window_title(None)
+
     def set_window_title(self, project_name):
-        title = "pugdebug / %s " % project_name
+        if project_name is not None:
+            title = "pugdebug / %s " % project_name
+        else:
+            title = "pugdebug"
         self.setWindowTitle(title)
 
     def set_debugging_status(self, status):

pugdebug/gui/projects.py

@@ -9,7 +9,7 @@
 
 __author__ = "robertbasic"
 
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, pyqtSignal
 from PyQt5.QtWidgets import (QDialog, QPushButton, QVBoxLayout, QHBoxLayout,
                              QFormLayout, QLineEdit, QTreeView, QAction, QMenu,
                              QMessageBox)
@@ -90,6 +90,8 @@ def load_settings(self):
 
 class PugdebugProjectsBrowser(QTreeView):
 
+    project_deleted_signal = pyqtSignal(bool)
+
     def __init__(self):
         super(PugdebugProjectsBrowser, self).__init__()
 
@@ -141,6 +143,10 @@ def handle_delete_action(self):
         answer = messageBox.exec()
 
         if answer == QMessageBox.Yes:
+            is_project_current = project.is_project_current()
+
             project.delete()
 
             self.load_projects()
+
+            self.project_deleted_signal.emit(is_project_current)

pugdebug/models/projects.py

@@ -14,7 +14,9 @@
 from PyQt5.QtCore import QCoreApplication, QSettings
 from PyQt5.QtGui import QStandardItemModel, QStandardItem
 
-from pugdebug.models.settings import get_projects, has_setting, delete_project
+from pugdebug.models.settings import (get_projects, delete_project,
+                                      get_setting, has_setting,
+                                      remove_setting)
 
 
 class PugdebugProject(QSettings):
@@ -38,6 +40,15 @@ def __init__(self, project_name):
     def get_project_name(self):
         return self.project_name
 
+    def is_project_current(self):
+        if has_setting('current_project'):
+            current_project = get_setting('current_project')
+
+            if current_project == self.get_project_name():
+                return True
+
+        return False
+
     def get_settings(self):
         project_settings = {}
 
@@ -52,6 +63,9 @@ def set_settings(self, new_settings):
             self.setValue(key, value)
 
     def delete(self):
+        if self.is_project_current():
+            remove_setting('current_project')
+
         delete_project(self.get_project_name())
 
         filename = self.fileName()

pugdebug/models/settings.py

@@ -63,6 +63,9 @@ def has(self, key):
     def set(self, key, value):
         return self.application_settings.setValue(key, value)
 
+    def remove(self, key):
+        return self.application_settings.remove(key)
+
     def add_project(self, project):
         index = self.__get_next_index(project)
 
@@ -161,6 +164,10 @@ def set_setting(key, value):
     settings.set(key, value)
 
 
+def remove_setting(key):
+    settings.remove(key)
+
+
 def save_settings(new_settings):
     changed_settings = {}