Mercurial Repositories > eric / file diff

--- a/Tools/TrayStarter.py	Thu Jul 29 18:34:15 2010 +0200
+++ b/Tools/TrayStarter.py	Thu Jul 29 20:00:59 2010 +0200
@@ -211,94 +211,106 @@
         """
         Private slot to start the eric5 Mini Editor.
         """
-        self.__startProc("eric5-editor.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-editor.py", "--config={0}".format(
+            Utilities.getConfigDir()))
     
     def __startEric(self):
         """
         Private slot to start the eric5 IDE.
         """
-        self.__startProc("eric5.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startPreferences(self):
         """
         Private slot to start the eric5 configuration dialog.
         """
-        self.__startProc("eric5-configure.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-configure.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startPluginInstall(self):
         """
         Private slot to start the eric5 plugin installation dialog.
         """
-        self.__startProc("eric5-plugininstall.py", 
-                         "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-plugininstall.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startPluginUninstall(self):
         """
         Private slot to start the eric5 plugin uninstallation dialog.
         """
-        self.__startProc("eric5-pluginuninstall.py", 
-                         "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-pluginuninstall.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startPluginRepository(self):
         """
         Private slot to start the eric5 plugin repository dialog.
         """
-        self.__startProc("eric5-pluginrepository.py", 
-                         "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-pluginrepository.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startHelpViewer(self):
         """
         Private slot to start the eric5 web browser.
         """
-        self.__startProc("eric5-webbrowser.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-webbrowser.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startUIPreviewer(self):
         """
         Private slot to start the eric5 UI previewer.
         """
-        self.__startProc("eric5-uipreviewer.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-uipreviewer.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startTRPreviewer(self):
         """
         Private slot to start the eric5 translations previewer.
         """
-        self.__startProc("eric5-trpreviewer.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-trpreviewer.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startUnittest(self):
         """
         Private slot to start the eric5 unittest dialog.
         """
-        self.__startProc("eric5-unittest.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-unittest.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startDiff(self):
         """
         Private slot to start the eric5 diff dialog.
         """
-        self.__startProc("eric5-diff.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-diff.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startCompare(self):
         """
         Private slot to start the eric5 compare dialog.
         """
-        self.__startProc("eric5-compare.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-compare.py", "--config={0}".format(
+            Utilities.getConfigDir()))
     
     def __startSqlBrowser(self):
         """
         Private slot to start the eric5 sql browser dialog.
         """
-        self.__startProc("eric5-sqlbrowser.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-sqlbrowser.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startQRegExp(self):
         """
         Private slot to start the eric5 QRegExp editor dialog.
         """
-        self.__startProc("eric5-qregexp.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-qregexp.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __startPyRe(self):
         """
         Private slot to start the eric5 Python re editor dialog.
         """
-        self.__startProc("eric5-re.py", "--config=%s" % Utilities.getConfigDir())
+        self.__startProc("eric5-re.py", "--config={0}".format(
+            Utilities.getConfigDir()))
 
     def __showRecentProjectsMenu(self):
         """
@@ -313,11 +325,11 @@
         idx = 1
         for rp in self.recentProjects:
             if idx < 10:
-                formatStr = '&%d. %s'
+                formatStr = '&{0:d}. {1}'
             else:
-                formatStr = '%d. %s'
+                formatStr = '{0:d}. {1}'
             act = self.recentProjectsMenu.addAction(
-                formatStr % (idx, 
+                formatStr.format(idx, 
                     Utilities.compactPath(rp, self.maxMenuFilePathLen)))
             act.setData(rp)
             idx += 1
@@ -335,11 +347,11 @@
         idx = 1
         for rmp in self.recentMultiProjects:
             if idx < 10:
-                formatStr = '&%d. %s'
+                formatStr = '&{0:d}. {1}'
             else:
-                formatStr = '%d. %s'
+                formatStr = '{0:d}. {1}'
             act = self.recentMultiProjectsMenu.addAction(
-                formatStr % (idx, 
+                formatStr.format(idx, 
                     Utilities.compactPath(rmp, self.maxMenuFilePathLen)))
             act.setData(rmp)
             idx += 1
@@ -357,11 +369,11 @@
         idx = 1
         for rf in self.recentFiles:
             if idx < 10:
-                formatStr = '&%d. %s'
+                formatStr = '&{0:d}. {1}'
             else:
-                formatStr = '%d. %s'
+                formatStr = '{0:d}. {1}'
             act = self.recentFilesMenu.addAction(\
-                formatStr % (idx, 
+                formatStr.format(idx, 
                     Utilities.compactPath(rf, self.maxMenuFilePathLen)))
             act.setData(rf)
             idx += 1