[pyqgis-console] disables tab widget editor if restore tabs is prompt…

…ed and adds tab tooltip
qgis · Apr 20, 2013 · cfa3f57 · cfa3f57
1 parent 6488725
commit cfa3f57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/python/console/console.py b/python/console/console.py
@@ -331,7 +331,7 @@ def __init__(self, parent=None):
         self.toolBarEditor = QToolBar()
         self.toolBarEditor.setStyleSheet('QToolBar{background-color: rgb(200, 200, 200);\
                                           border-right: 1px solid rgb(155, 155, 155);}')
-        self.toolBarEditor.setEnabled(True)
+        self.toolBarEditor.setEnabled(False)
         self.toolBarEditor.setFocusPolicy(Qt.NoFocus)
         self.toolBarEditor.setContextMenuPolicy(Qt.DefaultContextMenu)
         self.toolBarEditor.setLayoutDirection(Qt.LeftToRight)

diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -570,9 +570,11 @@ def __init__(self, parent):
         self.settings = QSettings()
         tabScripts = self.settings.value("pythonConsole/tabScripts")
         self.restoreTabList = tabScripts.toList()
-        self.newTabEditor(filename=None)
+
         if self.restoreTabList:
             self.topFrame.show()
+        else:
+            self.newTabEditor(filename=None)
 
         self.setDocumentMode(True)
         self.setMovable(True)
@@ -615,6 +617,10 @@ def newTabEditor(self, tabName=None, filename=None):
         self.iconTab = QgsApplication.getThemeIcon('console/iconTabEditorConsole.png')
         self.addTab(self.tab, self.iconTab, tabName)
         self.setCurrentWidget(self.tab)
+        if filename:
+            self.setTabToolTip(self.currentIndex(), unicode(filename))
+        else:
+            self.setTabToolTip(self.currentIndex(), tabName)
 
     def tabModified(self, tab, modified):
         index = self.indexOf(tab)
@@ -685,10 +691,13 @@ def restoreTabs(self):
                         tabName = pathFile.split('/')[-1]
                         self.newTabEditor(tabName, pathFile)
         self.topFrame.close()
+        self.parent.toolBarEditor.setEnabled(True)
 
     def closeRestore(self):
         self.parent.updateTabListScript('empty')
         self.topFrame.close()
+        self.newTabEditor(filename=None)
+        self.parent.toolBarEditor.setEnabled(True)
 
     def showFileTabMenu(self):
         self.fileTabMenu.clear()