Re-fixed the recent editor issue. 5_4_x

Sat, 17 May 2014 11:43:07 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 17 May 2014 11:43:07 +0200
branch
5_4_x
changeset 3584
e92f4aa860f6
parent 3577
a51fd3a75493
child 3599
1a3123f385b6

Re-fixed the recent editor issue.
(grafted from 3e8e0346d6393ddff144cc78baf78f96256d98a0)

QScintilla/Editor.py file | annotate | diff | comparison | revisions
--- a/QScintilla/Editor.py	Thu May 15 18:45:31 2014 +0200
+++ b/QScintilla/Editor.py	Sat May 17 11:43:07 2014 +0200
@@ -605,12 +605,12 @@
             self.menuShow = self.__initContextMenuShow()
             self.graphicsMenu = self.__initContextMenuGraphics()
             self.autocompletionMenu = self.__initContextMenuAutocompletion()
-            self.toolsMenu = self.__initContextMenuTools()
             self.__menus["Checks"] = self.checksMenu
             self.__menus["Show"] = self.menuShow
             self.__menus["Graphics"] = self.graphicsMenu
             self.__menus["Autocompletion"] = self.autocompletionMenu
-            self.__menus["Tools"] = self.toolsMenu
+        self.toolsMenu = self.__initContextMenuTools()
+        self.__menus["Tools"] = self.toolsMenu
         self.exportersMenu = self.__initContextMenuExporters()
         self.__menus["Exporters"] = self.exportersMenu
         self.eolMenu = self.__initContextMenuEol()
@@ -715,8 +715,8 @@
             self.menuActs["Show"] = self.menu.addMenu(self.menuShow)
             self.menu.addSeparator()
             self.menuActs["Diagrams"] = self.menu.addMenu(self.graphicsMenu)
-            self.menu.addSeparator()
-            self.menuActs["Tools"] = self.menu.addMenu(self.toolsMenu)
+        self.menu.addSeparator()
+        self.menuActs["Tools"] = self.menu.addMenu(self.toolsMenu)
         self.menu.addSeparator()
         self.menu.addAction(
             UI.PixmapCache.getIcon("documentNewView.png"),
@@ -4653,8 +4653,7 @@
             self.menuActs["NewSplit"].setIcon(
                 UI.PixmapCache.getIcon("splitVertical.png"))
         
-        if not self.isResourcesFile:
-            self.menuActs["Tools"].setEnabled(not self.toolsMenu.isEmpty())
+        self.menuActs["Tools"].setEnabled(not self.toolsMenu.isEmpty())
         
         self.showMenu.emit("Main", self.menu,  self)
         

eric ide

mercurial