[pyqgis-console] just shows the context menu on tabs (does not on tabbar)

slarosa · slarosa · commit 471dab184a2b · 2013-05-05T22:34:14.000+02:00
diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -790,31 +790,32 @@ def __init__(self, parent):
     def contextMenuEvent(self, e):
         tabBar = self.tabBar()
         self.idx = tabBar.tabAt(e.pos())
-        cW = self.currentWidget()
-        menu = QMenu(self)
-        menu.addSeparator()
-        newTabAction = menu.addAction("New Editor",
-                                        self.newTabEditor)
-        menu.addSeparator()
-        closeTabAction = menu.addAction("Close Tab",
-                                        cW.close)
-        closeAllTabAction = menu.addAction("Close All",
-                                        self.closeAll)
-        closeOthersTabAction = menu.addAction("Close Others",
-                                        self.closeOthers)
-        menu.addSeparator()
-        saveAction = menu.addAction("Save",
-                                        cW.save)
-        saveAsAction = menu.addAction("Save As",
-                                        self.parent.saveAsScriptFile)
-        closeTabAction.setEnabled(False)
-        closeAllTabAction.setEnabled(False)
-        closeOthersTabAction.setEnabled(False)
-        if self.count() > 1:
-            closeTabAction.setEnabled(True)
-            closeAllTabAction.setEnabled(True)
-            closeOthersTabAction.setEnabled(True)
-        action = menu.exec_(self.mapToGlobal(e.pos()))
+        if self.widget(self.idx):
+            cW = self.currentWidget()
+            menu = QMenu(self)
+            menu.addSeparator()
+            newTabAction = menu.addAction("New Editor",
+                                            self.newTabEditor)
+            menu.addSeparator()
+            closeTabAction = menu.addAction("Close Tab",
+                                            cW.close)
+            closeAllTabAction = menu.addAction("Close All",
+                                            self.closeAll)
+            closeOthersTabAction = menu.addAction("Close Others",
+                                            self.closeOthers)
+            menu.addSeparator()
+            saveAction = menu.addAction("Save",
+                                            cW.save)
+            saveAsAction = menu.addAction("Save As",
+                                            self.parent.saveAsScriptFile)
+            closeTabAction.setEnabled(False)
+            closeAllTabAction.setEnabled(False)
+            closeOthersTabAction.setEnabled(False)
+            if self.count() > 1:
+                closeTabAction.setEnabled(True)
+                closeAllTabAction.setEnabled(True)
+                closeOthersTabAction.setEnabled(True)
+            action = menu.exec_(self.mapToGlobal(e.pos()))
 
     def closeOthers(self):
         idx = self.idx
