--- a/Project/ProjectResourcesBrowser.py Fri Jan 10 19:30:21 2014 +0100
+++ b/Project/ProjectResourcesBrowser.py Sat Jan 11 11:55:33 2014 +0100
@@ -58,9 +58,9 @@
self.selectedItemsFilter = \
[ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
- self.setWindowTitle(self.trUtf8('Resources'))
+ self.setWindowTitle(self.tr('Resources'))
- self.setWhatsThis(self.trUtf8(
+ self.setWhatsThis(self.tr(
"""<b>Project Resources Browser</b>"""
"""<p>This allows to easily see all resources contained in the"""
""" current project. Several actions can be executed via the"""
@@ -83,10 +83,10 @@
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
self.menu.addAction(
- self.trUtf8('Compile resource'),
+ self.tr('Compile resource'),
self.__compileResource)
self.menu.addAction(
- self.trUtf8('Compile all resources'),
+ self.tr('Compile all resources'),
self.__compileAllResources)
self.menu.addSeparator()
else:
@@ -94,89 +94,89 @@
self.menu.addAction(
self.hooksMenuEntries.get(
"compileResource",
- self.trUtf8('Compile resource')),
+ self.tr('Compile resource')),
self.__compileResource)
if self.hooks["compileAllResources"] is not None:
self.menu.addAction(
self.hooksMenuEntries.get(
"compileAllResources",
- self.trUtf8('Compile all resources')),
+ self.tr('Compile all resources')),
self.__compileAllResources)
if self.hooks["compileResource"] is not None or \
self.hooks["compileAllResources"] is not None:
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Open'), self.__openFile)
+ self.menu.addAction(self.tr('Open'), self.__openFile)
self.menu.addSeparator()
- act = self.menu.addAction(self.trUtf8('Rename file'), self._renameFile)
+ act = self.menu.addAction(self.tr('Rename file'), self._renameFile)
self.menuActions.append(act)
act = self.menu.addAction(
- self.trUtf8('Remove from project'), self._removeFile)
+ self.tr('Remove from project'), self._removeFile)
self.menuActions.append(act)
- act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteFile)
+ act = self.menu.addAction(self.tr('Delete'), self.__deleteFile)
self.menuActions.append(act)
self.menu.addSeparator()
if self.project.getProjectType() in \
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
self.menu.addAction(
- self.trUtf8('New resource...'), self.__newResource)
+ self.tr('New resource...'), self.__newResource)
else:
if self.hooks["newResource"] is not None:
self.menu.addAction(
self.hooksMenuEntries.get(
"newResource",
- self.trUtf8('New resource...')), self.__newResource)
+ self.tr('New resource...')), self.__newResource)
self.menu.addAction(
- self.trUtf8('Add resources...'), self.__addResourceFiles)
+ self.tr('Add resources...'), self.__addResourceFiles)
self.menu.addAction(
- self.trUtf8('Add resources directory...'),
+ self.tr('Add resources directory...'),
self.__addResourcesDirectory)
self.menu.addSeparator()
self.menu.addAction(
- self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard)
+ self.tr('Copy Path to Clipboard'), self._copyToClipboard)
self.menu.addSeparator()
self.menu.addAction(
- self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.tr('Expand all directories'), self._expandAllDirs)
self.menu.addAction(
- self.trUtf8('Collapse all directories'), self._collapseAllDirs)
+ self.tr('Collapse all directories'), self._collapseAllDirs)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Configure...'), self._configure)
+ self.menu.addAction(self.tr('Configure...'), self._configure)
self.backMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
self.backMenu.addAction(
- self.trUtf8('Compile all resources'),
+ self.tr('Compile all resources'),
self.__compileAllResources)
self.backMenu.addSeparator()
self.backMenu.addAction(
- self.trUtf8('New resource...'), self.__newResource)
+ self.tr('New resource...'), self.__newResource)
else:
if self.hooks["compileAllResources"] is not None:
self.backMenu.addAction(
self.hooksMenuEntries.get(
"compileAllResources",
- self.trUtf8('Compile all resources')),
+ self.tr('Compile all resources')),
self.__compileAllResources)
self.backMenu.addSeparator()
if self.hooks["newResource"] is not None:
self.backMenu.addAction(
self.hooksMenuEntries.get(
"newResource",
- self.trUtf8('New resource...')), self.__newResource)
+ self.tr('New resource...')), self.__newResource)
self.backMenu.addAction(
- self.trUtf8('Add resources...'), self.project.addResourceFiles)
+ self.tr('Add resources...'), self.project.addResourceFiles)
self.backMenu.addAction(
- self.trUtf8('Add resources directory...'),
+ self.tr('Add resources directory...'),
self.project.addResourceDir)
self.backMenu.addSeparator()
self.backMenu.addAction(
- self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.tr('Expand all directories'), self._expandAllDirs)
self.backMenu.addAction(
- self.trUtf8('Collapse all directories'), self._collapseAllDirs)
+ self.tr('Collapse all directories'), self._collapseAllDirs)
self.backMenu.addSeparator()
- self.backMenu.addAction(self.trUtf8('Configure...'), self._configure)
+ self.backMenu.addAction(self.tr('Configure...'), self._configure)
self.backMenu.setEnabled(False)
# create the menu for multiple selected files
@@ -185,7 +185,7 @@
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
act = self.multiMenu.addAction(
- self.trUtf8('Compile resources'),
+ self.tr('Compile resources'),
self.__compileSelectedResources)
self.multiMenu.addSeparator()
else:
@@ -193,31 +193,31 @@
act = self.multiMenu.addAction(
self.hooksMenuEntries.get(
"compileSelectedResources",
- self.trUtf8('Compile resources')),
+ self.tr('Compile resources')),
self.__compileSelectedResources)
self.multiMenu.addSeparator()
- self.multiMenu.addAction(self.trUtf8('Open'), self.__openFile)
+ self.multiMenu.addAction(self.tr('Open'), self.__openFile)
self.multiMenu.addSeparator()
act = self.multiMenu.addAction(
- self.trUtf8('Remove from project'), self._removeFile)
+ self.tr('Remove from project'), self._removeFile)
self.multiMenuActions.append(act)
act = self.multiMenu.addAction(
- self.trUtf8('Delete'), self.__deleteFile)
+ self.tr('Delete'), self.__deleteFile)
self.multiMenuActions.append(act)
self.multiMenu.addSeparator()
self.multiMenu.addAction(
- self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.tr('Expand all directories'), self._expandAllDirs)
self.multiMenu.addAction(
- self.trUtf8('Collapse all directories'), self._collapseAllDirs)
+ self.tr('Collapse all directories'), self._collapseAllDirs)
self.multiMenu.addSeparator()
- self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure)
+ self.multiMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
self.dirMenu.addAction(
- self.trUtf8('Compile all resources'),
+ self.tr('Compile all resources'),
self.__compileAllResources)
self.dirMenu.addSeparator()
else:
@@ -225,40 +225,40 @@
self.dirMenu.addAction(
self.hooksMenuEntries.get(
"compileAllResources",
- self.trUtf8('Compile all resources')),
+ self.tr('Compile all resources')),
self.__compileAllResources)
self.dirMenu.addSeparator()
act = self.dirMenu.addAction(
- self.trUtf8('Remove from project'), self._removeDir)
+ self.tr('Remove from project'), self._removeDir)
self.dirMenuActions.append(act)
act = self.dirMenu.addAction(
- self.trUtf8('Delete'), self._deleteDirectory)
+ self.tr('Delete'), self._deleteDirectory)
self.dirMenuActions.append(act)
self.dirMenu.addSeparator()
self.dirMenu.addAction(
- self.trUtf8('New resource...'), self.__newResource)
+ self.tr('New resource...'), self.__newResource)
self.dirMenu.addAction(
- self.trUtf8('Add resources...'), self.__addResourceFiles)
+ self.tr('Add resources...'), self.__addResourceFiles)
self.dirMenu.addAction(
- self.trUtf8('Add resources directory...'),
+ self.tr('Add resources directory...'),
self.__addResourcesDirectory)
self.dirMenu.addSeparator()
self.dirMenu.addAction(
- self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard)
+ self.tr('Copy Path to Clipboard'), self._copyToClipboard)
self.dirMenu.addSeparator()
self.dirMenu.addAction(
- self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.tr('Expand all directories'), self._expandAllDirs)
self.dirMenu.addAction(
- self.trUtf8('Collapse all directories'), self._collapseAllDirs)
+ self.tr('Collapse all directories'), self._collapseAllDirs)
self.dirMenu.addSeparator()
- self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure)
+ self.dirMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMultiMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
"PySide", "PySideC"]:
self.dirMultiMenu.addAction(
- self.trUtf8('Compile all resources'),
+ self.tr('Compile all resources'),
self.__compileAllResources)
self.dirMultiMenu.addSeparator()
else:
@@ -266,23 +266,23 @@
self.dirMultiMenu.addAction(
self.hooksMenuEntries.get(
"compileAllResources",
- self.trUtf8('Compile all resources')),
+ self.tr('Compile all resources')),
self.__compileAllResources)
self.dirMultiMenu.addSeparator()
self.dirMultiMenu.addAction(
- self.trUtf8('Add resources...'),
+ self.tr('Add resources...'),
self.project.addResourceFiles)
self.dirMultiMenu.addAction(
- self.trUtf8('Add resources directory...'),
+ self.tr('Add resources directory...'),
self.project.addResourceDir)
self.dirMultiMenu.addSeparator()
self.dirMultiMenu.addAction(
- self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.tr('Expand all directories'), self._expandAllDirs)
self.dirMultiMenu.addAction(
- self.trUtf8('Collapse all directories'), self._collapseAllDirs)
+ self.tr('Collapse all directories'), self._collapseAllDirs)
self.dirMultiMenu.addSeparator()
self.dirMultiMenu.addAction(
- self.trUtf8('Configure...'), self._configure)
+ self.tr('Configure...'), self._configure)
self.menu.aboutToShow.connect(self.__showContextMenu)
self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
@@ -437,9 +437,9 @@
else:
fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
self,
- self.trUtf8("New Resource"),
+ self.tr("New Resource"),
path,
- self.trUtf8("Qt Resource Files (*.qrc)"),
+ self.tr("Qt Resource Files (*.qrc)"),
"",
E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
@@ -456,8 +456,8 @@
if os.path.exists(fname):
res = E5MessageBox.yesNo(
self,
- self.trUtf8("New Resource"),
- self.trUtf8("The file already exists! Overwrite it?"),
+ self.tr("New Resource"),
+ self.tr("The file already exists! Overwrite it?"),
icon=E5MessageBox.Warning)
if not res:
# user selected to not overwrite
@@ -478,8 +478,8 @@
except IOError as e:
E5MessageBox.critical(
self,
- self.trUtf8("New Resource"),
- self.trUtf8(
+ self.tr("New Resource"),
+ self.tr(
"<p>The new resource file <b>{0}</b> could not"
" be created.<br>Problem: {1}</p>")
.format(fname, str(e)))
@@ -506,8 +506,8 @@
DeleteFilesConfirmationDialog
dlg = DeleteFilesConfirmationDialog(
self.parent(),
- self.trUtf8("Delete resources"),
- self.trUtf8(
+ self.tr("Delete resources"),
+ self.tr(
"Do you really want to delete these resources from the"
" project?"),
files)
@@ -579,35 +579,35 @@
if not self.noDialog and not ui.notificationsEnabled():
E5MessageBox.information(
self,
- self.trUtf8("Resource Compilation"),
- self.trUtf8("The compilation of the resource file"
- " was successful."))
+ self.tr("Resource Compilation"),
+ self.tr("The compilation of the resource file"
+ " was successful."))
else:
ui.showNotification(
UI.PixmapCache.getPixmap("resourcesCompiler48.png"),
- self.trUtf8("Resource Compilation"),
- self.trUtf8("The compilation of the resource file"
- " was successful."))
+ self.tr("Resource Compilation"),
+ self.tr("The compilation of the resource file"
+ " was successful."))
except IOError as msg:
if not self.noDialog:
E5MessageBox.information(
self,
- self.trUtf8("Resource Compilation"),
- self.trUtf8(
+ self.tr("Resource Compilation"),
+ self.tr(
"<p>The compilation of the resource file"
" failed.</p><p>Reason: {0}</p>").format(str(msg)))
else:
if not self.noDialog:
E5MessageBox.information(
self,
- self.trUtf8("Resource Compilation"),
- self.trUtf8(
+ self.tr("Resource Compilation"),
+ self.tr(
"The compilation of the resource file failed."))
else:
ui.showNotification(
UI.PixmapCache.getPixmap("resourcesCompiler48.png"),
- self.trUtf8("Resource Compilation"),
- self.trUtf8(
+ self.tr("Resource Compilation"),
+ self.tr(
"The compilation of the resource file failed."))
self.compileProc = None
@@ -692,8 +692,8 @@
progress.cancel()
E5MessageBox.critical(
self,
- self.trUtf8('Process Generation Error'),
- self.trUtf8(
+ self.tr('Process Generation Error'),
+ self.tr(
'Could not start {0}.<br>'
'Ensure that it is in the search path.'
).format(self.rccCompiler))
@@ -720,9 +720,9 @@
else:
numResources = len(self.project.pdata["RESOURCES"])
progress = E5ProgressDialog(
- self.trUtf8("Compiling resources..."),
- self.trUtf8("Abort"), 0, numResources,
- self.trUtf8("%v/%m Resources"), self)
+ self.tr("Compiling resources..."),
+ self.tr("Abort"), 0, numResources,
+ self.tr("%v/%m Resources"), self)
progress.setModal(True)
progress.setMinimumDuration(0)
i = 0
@@ -756,9 +756,9 @@
else:
numResources = len(files)
progress = E5ProgressDialog(
- self.trUtf8("Compiling resources..."),
- self.trUtf8("Abort"), 0, numResources,
- self.trUtf8("%v/%m Resources"), self)
+ self.tr("Compiling resources..."),
+ self.tr("Abort"), 0, numResources,
+ self.tr("%v/%m Resources"), self)
progress.setModal(True)
progress.setMinimumDuration(0)
i = 0
@@ -826,8 +826,8 @@
self.project.pdata["RESOURCES"])
else:
progress = E5ProgressDialog(
- self.trUtf8("Determining changed resources..."),
- None, 0, 100, self.trUtf8("%v/%m Resources"))
+ self.tr("Determining changed resources..."),
+ None, 0, 100, self.tr("%v/%m Resources"))
progress.setMinimumDuration(0)
i = 0
@@ -860,7 +860,7 @@
if changedResources:
progress.setLabelText(
- self.trUtf8("Compiling changed resources..."))
+ self.tr("Compiling changed resources..."))
progress.setMaximum(len(changedResources))
i = 0
progress.setValue(i)
