Mercurial Repositories > eric / file diff

--- a/QScintilla/Editor.py	Mon Mar 02 19:09:27 2015 +0100
+++ b/QScintilla/Editor.py	Tue Mar 03 19:53:50 2015 +0100
@@ -720,13 +720,15 @@
         self.menuActs["TypingAidsEnabled"].setChecked(
             self.completer is not None and self.completer.isEnabled())
         self.menuActs["AutoCompletionEnable"] = self.menu.addAction(
-            self.tr("Autocompletion enabled"),
+            self.tr("Automatic Completion enabled"),
             self.__toggleAutoCompletionEnable)
         self.menuActs["AutoCompletionEnable"].setCheckable(True)
         self.menuActs["AutoCompletionEnable"].setChecked(
             self.autoCompletionThreshold() != -1)
         if not self.isResourcesFile:
             self.menu.addMenu(self.autocompletionMenu)
+            self.menuActs["calltip"] = self.menu.addAction(
+                self.tr('Calltip'), self.callTip)
         self.menu.addSeparator()
         if self.isResourcesFile:
             self.menu.addMenu(self.resourcesMenu)
@@ -790,7 +792,7 @@
         
         @return reference to the generated menu (QMenu)
         """
-        menu = QMenu(self.tr('Autocomplete'))
+        menu = QMenu(self.tr('Complete'))
         
         self.menuActs["acDynamic"] = menu.addAction(
             self.tr('dynamic'), self.autoComplete)
@@ -801,9 +803,6 @@
             self.tr('from APIs'), self.autoCompleteFromAPIs)
         self.menuActs["acAPIDocument"] = menu.addAction(
             self.tr('from Document and APIs'), self.autoCompleteFromAll)
-        menu.addSeparator()
-        self.menuActs["calltip"] = menu.addAction(
-            self.tr('Calltip'), self.callTip)
         
         menu.aboutToShow.connect(self.__showContextMenuAutocompletion)
         
@@ -4735,6 +4734,8 @@
         self.menuActs["TypingAidsEnabled"].setChecked(
             self.completer is not None and self.completer.isEnabled())
         
+        self.menuActs["calltip"].setEnabled(self.acAPI)
+        
         from .SpellChecker import SpellChecker
         spellingAvailable = SpellChecker.isAvailable()
         self.menuActs["SpellCheck"].setEnabled(spellingAvailable)