Mercurial Repositories > eric / changeset
changeset
Fixed an inconvenience in the project and project translations viewer.
Fri, 29 Apr 2011 18:35:48 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 29 Apr 2011 18:35:48 +0200
- branch
- 5_1_x
- changeset 1004
- 9ff75adb6170
- parent 1001
- c4aa6e1a23b7
- child 1013
- bdf49619d9c6
Fixed an inconvenience in the project and project translations viewer.
--- a/APIs/Python3/eric5.api Tue Apr 26 17:08:48 2011 +0200 +++ b/APIs/Python3/eric5.api Fri Apr 29 18:35:48 2011 +0200 @@ -1461,6 +1461,7 @@ eric5.E5XML.Config.sessionFileFormatVersion?7 eric5.E5XML.Config.shortcutsFileFormatVersion?7 eric5.E5XML.Config.tasksFileFormatVersion?7 +eric5.E5XML.Config.tasksFileFormatVersionAlternative?7 eric5.E5XML.Config.templatesFileFormatVersion?7 eric5.E5XML.Config.userProjectFileFormatVersion?7 eric5.E5XML.DebuggerPropertiesReader.DebuggerPropertiesReader.readXML?4(quiet = False) @@ -4647,6 +4648,7 @@ eric5.Project.Project.Project.getSources?4(normalized = False) eric5.Project.Project.Project.getStatusMonitorAutoUpdate?4() eric5.Project.Project.Project.getStatusMonitorInterval?4() +eric5.Project.Project.Project.getTranslationPattern?4() eric5.Project.Project.Project.getVcs?4() eric5.Project.Project.Project.handleApplicationDiagram?4() eric5.Project.Project.Project.handlePreferencesChanged?4()
--- a/Documentation/Help/source.qhp Tue Apr 26 17:08:48 2011 +0200 +++ b/Documentation/Help/source.qhp Fri Apr 29 18:35:48 2011 +0200 @@ -4744,6 +4744,7 @@ <keyword name="Project.getSources" id="Project.getSources" ref="eric5.Project.Project.html#Project.getSources" /> <keyword name="Project.getStatusMonitorAutoUpdate" id="Project.getStatusMonitorAutoUpdate" ref="eric5.Project.Project.html#Project.getStatusMonitorAutoUpdate" /> <keyword name="Project.getStatusMonitorInterval" id="Project.getStatusMonitorInterval" ref="eric5.Project.Project.html#Project.getStatusMonitorInterval" /> + <keyword name="Project.getTranslationPattern" id="Project.getTranslationPattern" ref="eric5.Project.Project.html#Project.getTranslationPattern" /> <keyword name="Project.getVcs" id="Project.getVcs" ref="eric5.Project.Project.html#Project.getVcs" /> <keyword name="Project.handleApplicationDiagram" id="Project.handleApplicationDiagram" ref="eric5.Project.Project.html#Project.handleApplicationDiagram" /> <keyword name="Project.handlePreferencesChanged" id="Project.handlePreferencesChanged" ref="eric5.Project.Project.html#Project.handlePreferencesChanged" />
--- a/Documentation/Source/eric5.Debugger.DebugServer.html Tue Apr 26 17:08:48 2011 +0200 +++ b/Documentation/Source/eric5.Debugger.DebugServer.html Fri Apr 29 18:35:48 2011 +0200 @@ -793,7 +793,7 @@ name of the test (string) </dd><dt><i>traceback</i></dt> <dd> -lines of traceback info (string) +lines of traceback info (list of strings) </dd> </dl><a NAME="DebugServer.clientUtTestFailed" ID="DebugServer.clientUtTestFailed"></a> <h4>DebugServer.clientUtTestFailed</h4> @@ -806,7 +806,7 @@ name of the test (string) </dd><dt><i>traceback</i></dt> <dd> -lines of traceback info (string) +lines of traceback info (list of strings) </dd> </dl><a NAME="DebugServer.getBreakPointModel" ID="DebugServer.getBreakPointModel"></a> <h4>DebugServer.getBreakPointModel</h4>
--- a/Documentation/Source/eric5.E5XML.Config.html Tue Apr 26 17:08:48 2011 +0200 +++ b/Documentation/Source/eric5.E5XML.Config.html Fri Apr 29 18:35:48 2011 +0200 @@ -26,7 +26,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>debuggerPropertiesFileFormatVersion</td></tr><tr><td>highlightingStylesFileFormatVersion</td></tr><tr><td>multiProjectFileFormatVersion</td></tr><tr><td>pluginRepositoryFileFormatVersion</td></tr><tr><td>projectFileFormatVersion</td></tr><tr><td>sessionFileFormatVersion</td></tr><tr><td>shortcutsFileFormatVersion</td></tr><tr><td>tasksFileFormatVersion</td></tr><tr><td>templatesFileFormatVersion</td></tr><tr><td>userProjectFileFormatVersion</td></tr> +<tr><td>debuggerPropertiesFileFormatVersion</td></tr><tr><td>highlightingStylesFileFormatVersion</td></tr><tr><td>multiProjectFileFormatVersion</td></tr><tr><td>pluginRepositoryFileFormatVersion</td></tr><tr><td>projectFileFormatVersion</td></tr><tr><td>sessionFileFormatVersion</td></tr><tr><td>shortcutsFileFormatVersion</td></tr><tr><td>tasksFileFormatVersion</td></tr><tr><td>tasksFileFormatVersionAlternative</td></tr><tr><td>templatesFileFormatVersion</td></tr><tr><td>userProjectFileFormatVersion</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric5.Project.Project.html Tue Apr 26 17:08:48 2011 +0200 +++ b/Documentation/Source/eric5.Project.Project.html Fri Apr 29 18:35:48 2011 +0200 @@ -476,6 +476,9 @@ <td><a href="#Project.getStatusMonitorInterval">getStatusMonitorInterval</a></td> <td>Public method to get the monitor interval.</td> </tr><tr> +<td><a href="#Project.getTranslationPattern">getTranslationPattern</a></td> +<td>Public method to get the translation pattern.</td> +</tr><tr> <td><a href="#Project.getVcs">getVcs</a></td> <td>Public method to get a reference to the VCS object.</td> </tr><tr> @@ -1599,6 +1602,16 @@ <dd> interval in seconds (integer) </dd> +</dl><a NAME="Project.getTranslationPattern" ID="Project.getTranslationPattern"></a> +<h4>Project.getTranslationPattern</h4> +<b>getTranslationPattern</b>(<i></i>) +<p> + Public method to get the translation pattern. +</p><dl> +<dt>Returns:</dt> +<dd> +translation pattern (string) +</dd> </dl><a NAME="Project.getVcs" ID="Project.getVcs"></a> <h4>Project.getVcs</h4> <b>getVcs</b>(<i></i>)
--- a/Project/Project.py Tue Apr 26 17:08:48 2011 +0200 +++ b/Project/Project.py Fri Apr 29 18:35:48 2011 +0200 @@ -1030,14 +1030,23 @@ if autoContinue is not None: self.dbgAutoContinue = autoContinue + def getTranslationPattern(self): + """ + Public method to get the translation pattern. + + @return translation pattern (string) + """ + if self.pdata["TRANSLATIONPATTERN"]: + return self.pdata["TRANSLATIONPATTERN"][0] + else: + return "" + def addLanguage(self): """ Public slot used to add a language to the project. """ - if self.pdata["PROJECTTYPE"][0] in \ - ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"] and \ - (len(self.pdata["TRANSLATIONPATTERN"]) == 0 or \ - self.pdata["TRANSLATIONPATTERN"][0] == ''): + if len(self.pdata["TRANSLATIONPATTERN"]) == 0 or \ + self.pdata["TRANSLATIONPATTERN"][0] == '': E5MessageBox.critical(self.ui, self.trUtf8("Add Language"), self.trUtf8("You have to specify a translation pattern first.")) @@ -1805,6 +1814,9 @@ self.menuApidocAct.setEnabled(True) self.menuPackagersAct.setEnabled(True) self.pluginGrp.setEnabled(self.pdata["PROJECTTYPE"][0] == "E4Plugin") + self.addLanguageAct.setEnabled( + len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \ + self.pdata["TRANSLATIONPATTERN"][0] != '') self.projectAboutToBeCreated.emit() @@ -2309,6 +2321,9 @@ self.menuApidocAct.setEnabled(True) self.menuPackagersAct.setEnabled(True) self.pluginGrp.setEnabled(self.pdata["PROJECTTYPE"][0] == "E4Plugin") + self.addLanguageAct.setEnabled( + len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \ + self.pdata["TRANSLATIONPATTERN"][0] != '') self.__model.projectOpened() self.projectOpenedHooks.emit()
--- a/Project/ProjectTranslationsBrowser.py Tue Apr 26 17:08:48 2011 +0200 +++ b/Project/ProjectTranslationsBrowser.py Fri Apr 29 18:35:48 2011 +0200 @@ -199,7 +199,8 @@ act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteLanguageFile) self.menuActions.append(act) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Add translation...'), self.project.addLanguage) + self.__addTranslationAct = self.menu.addAction( + self.trUtf8('Add translation...'), self.project.addLanguage) self.menu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.menu.addSeparator() @@ -250,8 +251,8 @@ self.__releaseAll) self.qmprocBackMenuActions.append(act) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Add translation...'), - self.project.addLanguage) + self.__addTranslationBackAct = self.backMenu.addAction( + self.trUtf8('Add translation...'), self.project.addLanguage) self.backMenu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.backMenu.addSeparator() @@ -373,8 +374,8 @@ self.__releaseAll) self.qmprocDirMenuActions.append(act) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Add translation...'), - self.project.addLanguage) + self.__addTranslationDirAct = self.dirMenu.addAction( + self.trUtf8('Add translation...'), self.project.addLanguage) self.dirMenu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.dirMenu.addSeparator() @@ -464,6 +465,7 @@ if self.lreleaseProcRunning: for act in self.qmprocMenuActions: act.setEnabled(True) + self.__addTranslationAct.setEnabled(self.project.getTranslationPattern() != "") ProjectBaseBrowser._showContextMenu(self, self.menu) @@ -520,6 +522,7 @@ if self.lreleaseProcRunning: for act in self.qmprocDirMenuActions: act.setEnabled(True) + self.__addTranslationDirAct.setEnabled(self.project.getTranslationPattern() != "") ProjectBaseBrowser._showContextMenuDir(self, self.dirMenu) @@ -537,6 +540,8 @@ if self.lreleaseProcRunning: for act in self.qmprocBackMenuActions: act.setEnabled(True) + self.__addTranslationBackAct.setEnabled( + self.project.getTranslationPattern() != "") self.showMenu.emit("MainBack", self.backMenu)
