eric: comparison UI/UserInterface.py

-:96cc7d322f89
+:497e188ee86e
 elif self.layout == "FloatingWindows":
 logging.debug("Creating floating windows...")
 self.__createFloatingWindowsLayout(debugServer)
 else:
-raise RuntimeError("wrong layout type given (%s)" % self.layout)
+raise RuntimeError("wrong layout type given ({0})".format(self.layout))
 logging.debug("Created Layout")
 def __createFloatingWindowsLayout(self, debugServer):
 """
 Private method to create the FloatingWindows layout.
 if arg[0] in argChars or ddseen:
 if argsStr is None:
 argsStr = arg
 else:
-argsStr = "%s %s" % (argsStr, arg)
+argsStr = "{0} {1}".format(argsStr, arg)
 continue
 ext = os.path.splitext(arg)[1]
 ext = os.path.normcase(ext)
 .format(self.capProject, self.capEditor, Program))
 else:
 if not self.capProject and not self.capEditor:
 self.setWindowTitle(Program)
 elif self.capProject and not self.capEditor:
-self.setWindowTitle("%s - %s" % (self.capProject, Program))
+self.setWindowTitle("{0} - {1}".format(self.capProject, Program))
 elif not self.capProject and self.capEditor:
-self.setWindowTitle("%s - %s" % (self.capEditor, Program))
+self.setWindowTitle("{0} - {1}".format(self.capEditor, Program))
 else:
-self.setWindowTitle("%s - %s - %s" % \
+self.setWindowTitle("{0} - {1} - {2}".format(
-(self.capProject, self.capEditor, Program))
+self.capProject, self.capEditor, Program))
 def __initActions(self):
 """
 Private method to define the user interface actions.
 """
 self.utProjectAct.setEnabled(False)
 self.actions.append(self.utProjectAct)
 # check for Qt4 designer and linguist
 designerExe = Utilities.isWindowsPlatform() and \
-"%s.exe" % Utilities.generateQtToolName("designer") or \
+"{0}.exe".format(Utilities.generateQtToolName("designer")) or \
 Utilities.generateQtToolName("designer")
 if Utilities.isinpath(designerExe):
 self.designer4Act = E5Action(self.trUtf8('Qt-Designer 4'),
 UI.PixmapCache.getIcon("designer4.png"),
 self.trUtf8('&Designer 4...'), 0, 0, self, 'qt_designer4')
 self.actions.append(self.designer4Act)
 else:
 self.designer4Act = None
 linguistExe = Utilities.isWindowsPlatform() and \
-"%s.exe" % Utilities.generateQtToolName("linguist") or \
+"{0}.exe".format(Utilities.generateQtToolName("linguist")) or \
 Utilities.generateQtToolName("linguist")
 if Utilities.isinpath(linguistExe):
 self.linguist4Act = E5Action(self.trUtf8('Qt-Linguist 4'),
 UI.PixmapCache.getIcon("linguist4.png"),
 self.trUtf8('&Linguist 4...'), 0, 0, self, 'qt_linguist4')
 category = self.trUtf8("External Tools/{0}").format(toolGroup[0])
 for tool in toolGroup[1]:
 if tool['menutext'] != '--':
 act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'],
 self)
-act.setObjectName("%s@@%s" % (toolGroup[0],
+act.setObjectName("{0}@@{1}".format(toolGroup[0],
 tool['menutext']))
 self.connect(act, SIGNAL("triggered()"), self.__toolActionTriggered)
 self.toolGroupActions[act.objectName()] = act
 self.toolbarManager.addAction(act, category)
 def __updateExternalToolsActions(self):
 """
 Private method to update the external tools actions for the current tool group.
 """
 toolGroup = self.toolGroups[self.currentToolGroup]
-groupkey = "%s@@" % toolGroup[0]
+groupkey = "{0}@@".format(toolGroup[0])
 groupActionKeys = []
 # step 1: get actions for this group
 for key in self.toolGroupActions:
 if key.startswith(groupkey):
 groupActionKeys.append(key)
 # step 2: build keys for all actions i.a.w. current configuration
 ckeys = []
 for tool in toolGroup[1]:
 if tool['menutext'] != '--':
-ckeys.append("%s@@%s" % (toolGroup[0], tool['menutext']))
+ckeys.append("{0}@@{1}".format(toolGroup[0], tool['menutext']))
 # step 3: remove all actions not configured any more
 for key in groupActionKeys:
 if key not in ckeys:
 self.toolbarManager.removeAction(self.toolGroupActions[key])
 # step 4: add all newly configured tools
 category = self.trUtf8("External Tools/{0}").format(toolGroup[0])
 for tool in toolGroup[1]:
 if tool['menutext'] != '--':
-key = "%s@@%s" % (toolGroup[0], tool['menutext'])
+key = "{0}@@{1}".format(toolGroup[0], tool['menutext'])
 if key not in groupActionKeys:
 act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'],
 self)
 act.setObjectName(key)
 self.connect(act, SIGNAL("triggered()"), self.__toolActionTriggered)
 body = f.read()
 f.close()
 if deleteAttachFile:
 os.remove(attachFile)
 else:
-body = "\r\n----\r\n%s----\r\n%s----\r\n%s" % \
+body = "\r\n----\r\n{0}----\r\n{1}----\r\n{2}".format(
-(Utilities.generateVersionInfo("\r\n"),
+Utilities.generateVersionInfo("\r\n"),
 Utilities.generatePluginsVersionInfo("\r\n"),
 Utilities.generateDistroInfo("\r\n"))
-url = QUrl("mailto:%s" % address)
+url = QUrl("mailto:{0}".format(address))
 url.addQueryItem("subject", subject)
 url.addQueryItem("body", body)
 QDesktopServices.openUrl(url)
 def checkForErrorLog(self):
 @param toolbar reference to the toolbar to be registered (QToolBar)
 @exception KeyError raised, if a toolbar with the given name was
 already registered
 """
 if name in self.__toolbars:
-raise KeyError("Toolbar '%s' already registered." % name)
+raise KeyError("Toolbar '{0}' already registered.".format(name))
 self.__toolbars[name] = [text, toolbar]
 def reregisterToolbar(self, name, text):
 """
 if toolProcData[0] is None or \
 toolProcData[1] not in ["insert", "replaceSelection"]:
 # not connected to an editor or wrong mode
 while toolProc.canReadLine():
-s = "%s - " % program
+s = "{0} - ".format(program)
 output = str(toolProc.readLine(), ioEncoding, 'replace')
 s.append(output)
 self.appendToStdout(s)
 else:
 if toolProcData[1] == "insert":
 # loop through all running tool processes
 for program, toolProc, toolProcData in self.toolProcs:
 toolProc.setReadChannel(QProcess.StandardError)
 while toolProc.canReadLine():
-s = "%s - " % program
+s = "{0} - ".format(program)
 error = str(toolProc.readLine(), ioEncoding, 'replace')
 s.append(error)
 self.appendToStderr(s)
 def __toolFinished(self, exitCode, exitStatus):
 if not os.path.splitext(pythonDocDir)[1]:
 home = Utilities.normjoinpath(pythonDocDir, 'index.html')
 if Utilities.isWindowsPlatform() and not os.path.exists(home):
 pyversion = sys.hexversion >> 16
-vers = "%d%d" % ((pyversion >> 8) & 0xff, pyversion & 0xff)
+vers = "{0:d}{1:d}".format((pyversion >> 8) & 0xff, pyversion & 0xff)
-home = os.path.join(pythonDocDir, "python%s.chm" % vers)
+home = os.path.join(pythonDocDir, "python{0}.chm".format(vers))
 else:
 home = pythonDocDir
 if not os.path.exists(home):
 QMessageBox.warning(None,

Mercurial Repositories > eric / file comparison

comparison: UI/UserInterface.py

UI/UserInterface.py