Restore tabs on Python console load

qgis · Aug 13, 2014 · d42c24f · d42c24f
1 parent b88723d
commit d42c24f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/python/console/console.py b/python/console/console.py
@@ -539,6 +539,8 @@ def __init__(self, parent=None):
         self.findPrevButton.clicked.connect(self._findPrev)
         self.lineEditFind.textChanged.connect(self._textFindChanged)
 
+        self.tabEditorWidget.restoreTabsOrAddNew()
+
     def _findText(self):
         self.tabEditorWidget.currentWidget().newEditor.findText(True)
 

diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -901,16 +901,6 @@ def __init__(self, parent):
         self.connect(self.restoreTabsButton, SIGNAL('clicked()'), self.restoreTabs)
         self.connect(self.clButton, SIGNAL('clicked()'), self.closeRestore)
 
-        # Restore script of the previuos session
-        self.settings = QSettings()
-        tabScripts = self.settings.value("pythonConsole/tabScripts", [])
-        self.restoreTabList = tabScripts
-
-        if self.restoreTabList:
-            self.topFrame.show()
-        else:
-            self.newTabEditor(filename=None)
-
         ## Fixes #7653
         if sys.platform != 'darwin':
             self.setDocumentMode(True)
@@ -949,6 +939,7 @@ def __init__(self, parent):
         self.setCornerWidget(self.newTabButton, Qt.TopLeftCorner)
         self.connect(self.newTabButton, SIGNAL('clicked()'), self.newTabEditor)
 
+
     def _currentWidgetChanged(self, tab):
         if self.settings.value("pythonConsole/enableObjectInsp",
                                False, type=bool):
@@ -1113,6 +1104,20 @@ def closeCurrentWidget(self):
         if currWidget.path in self.restoreTabList:
             self.parent.updateTabListScript(currWidget.path, action='remove')
 
+    def restoreTabsOrAddNew(self):
+        """
+        Restore tabs if they are found in the settings. If none are found it will add a new empty tab.
+        """
+        # Restore script of the previuos session
+        self.settings = QSettings()
+        tabScripts = self.settings.value("pythonConsole/tabScripts", [])
+        self.restoreTabList = tabScripts
+
+        if self.restoreTabList:
+            self.restoreTabs()
+        else:
+            self.newTabEditor(filename=None)
+
     def restoreTabs(self):
         for script in self.restoreTabList:
             pathFile = unicode(script)