Editor: fixed an issue where a language change did not get propagated to the language menu and the language icon.

Sat, 17 Oct 2020 14:35:29 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 17 Oct 2020 14:35:29 +0200
changeset 7790
32b8db5a1fb4
parent 7789
4e68cf958634
child 7791
f07ded9bc64d

Editor: fixed an issue where a language change did not get propagated to the language menu and the language icon.

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric6/Toolbox/Startup.py file | annotate | diff | comparison | revisions
diff -r 4e68cf958634 -r 32b8db5a1fb4 eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Oct 16 17:28:14 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Oct 17 14:35:29 2020 +0200
@@ -306,6 +306,7 @@
         if not msg:
             msg = '***'
         
+        # TODO: hg init has to be run with the hg command line client
         args = self.initCommand("init")
         args.append(projectDir)
         # init is not possible with the command server
diff -r 4e68cf958634 -r 32b8db5a1fb4 eric6/QScintilla/Editor.py
--- a/eric6/QScintilla/Editor.py	Fri Oct 16 17:28:14 2020 +0200
+++ b/eric6/QScintilla/Editor.py	Sat Oct 17 14:35:29 2020 +0200
@@ -4403,6 +4403,8 @@
             Preferences.getEditor("ShowMarkerMapOnRight"))
         self.__markerMap.initColors()
         
+        self.setLanguage(self.fileName)
+        
         self.settingsRead.emit()
     
     def __setLineMarkerColours(self):
diff -r 4e68cf958634 -r 32b8db5a1fb4 eric6/Toolbox/Startup.py
--- a/eric6/Toolbox/Startup.py	Fri Oct 16 17:28:14 2020 +0200
+++ b/eric6/Toolbox/Startup.py	Sat Oct 17 14:35:29 2020 +0200
@@ -189,6 +189,7 @@
     
     global loaded_translators
     
+    # TODO: qt has been split into several files; add these here
     translations = ("qt", "eric6") + translationFiles
     loc = Preferences.getUILanguage()
     if loc is None:

eric ide

mercurial