--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Oct 18 23:00:41 2013 +0200 @@ -47,15 +47,18 @@ """ Public method to generate the action objects. """ - self.vcsNewAct = E5Action(self.trUtf8('New from repository'), - UI.PixmapCache.getIcon("vcsCheckout.png"), - self.trUtf8('&New from repository...'), 0, 0, self, 'subversion_new') + self.vcsNewAct = E5Action( + self.trUtf8('New from repository'), + UI.PixmapCache.getIcon("vcsCheckout.png"), + self.trUtf8('&New from repository...'), 0, 0, self, + 'subversion_new') self.vcsNewAct.setStatusTip(self.trUtf8( 'Create a new project from the VCS repository' )) self.vcsNewAct.setWhatsThis(self.trUtf8( """<b>New from repository</b>""" - """<p>This creates a new local project from the VCS repository.</p>""" + """<p>This creates a new local project from the VCS""" + """ repository.</p>""" )) self.vcsNewAct.triggered[()].connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) @@ -69,21 +72,24 @@ )) self.vcsUpdateAct.setWhatsThis(self.trUtf8( """<b>Update from repository</b>""" - """<p>This updates the local project from the VCS repository.</p>""" + """<p>This updates the local project from the VCS""" + """ repository.</p>""" )) self.vcsUpdateAct.triggered[()].connect(self._vcsUpdate) self.actions.append(self.vcsUpdateAct) - self.vcsCommitAct = E5Action(self.trUtf8('Commit changes to repository'), - UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('&Commit changes to repository...'), 0, 0, self, - 'subversion_commit') + self.vcsCommitAct = E5Action( + self.trUtf8('Commit changes to repository'), + UI.PixmapCache.getIcon("vcsCommit.png"), + self.trUtf8('&Commit changes to repository...'), 0, 0, self, + 'subversion_commit') self.vcsCommitAct.setStatusTip(self.trUtf8( 'Commit changes to the local project to the VCS repository' )) self.vcsCommitAct.setWhatsThis(self.trUtf8( """<b>Commit changes to repository</b>""" - """<p>This commits changes to the local project to the VCS repository.</p>""" + """<p>This commits changes to the local project to the VCS""" + """ repository.</p>""" )) self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) @@ -111,9 +117,9 @@ )) self.svnLogBrowserAct.setWhatsThis(self.trUtf8( """<b>Show log browser</b>""" - """<p>This shows a dialog to browse the log of the local project.""" - """ A limited number of entries is shown first. More can be""" - """ retrieved later on.</p>""" + """<p>This shows a dialog to browse the log of the local""" + """ project. A limited number of entries is shown first. More""" + """ can be retrieved later on.</p>""" )) self.svnLogBrowserAct.triggered[()].connect(self.__svnLogBrowser) self.actions.append(self.svnLogBrowserAct) @@ -127,21 +133,24 @@ )) self.vcsDiffAct.setWhatsThis(self.trUtf8( """<b>Show difference</b>""" - """<p>This shows the difference of the local project to the repository.</p>""" + """<p>This shows the difference of the local project to the""" + """ repository.</p>""" )) self.vcsDiffAct.triggered[()].connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) - self.svnExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), - 0, 0, self, 'subversion_extendeddiff') + self.svnExtDiffAct = E5Action( + self.trUtf8('Show difference (extended)'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show difference (extended)'), + 0, 0, self, 'subversion_extendeddiff') self.svnExtDiffAct.setStatusTip(self.trUtf8( 'Show the difference of revisions of the project to the repository' )) self.svnExtDiffAct.setWhatsThis(self.trUtf8( """<b>Show difference (extended)</b>""" - """<p>This shows the difference of selectable revisions of the project.</p>""" + """<p>This shows the difference of selectable revisions of""" + """ the project.</p>""" )) self.svnExtDiffAct.triggered[()].connect(self.__svnExtendedDiff) self.actions.append(self.svnExtDiffAct) @@ -236,7 +245,8 @@ self.vcsPropsAct = E5Action(self.trUtf8('Command options'), self.trUtf8('Command &options...'), 0, 0, self, 'subversion_options') - self.vcsPropsAct.setStatusTip(self.trUtf8('Show the VCS command options')) + self.vcsPropsAct.setStatusTip(self.trUtf8( + 'Show the VCS command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( """<b>Command options...</b>""" """<p>This shows a dialog to edit the VCS command options.</p>""" @@ -267,7 +277,8 @@ )) self.vcsMergeAct.setWhatsThis(self.trUtf8( """<b>Merge</b>""" - """<p>This merges changes of a tag/revision into the local project.</p>""" + """<p>This merges changes of a tag/revision into the local""" + """ project.</p>""" )) self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) @@ -294,7 +305,8 @@ )) self.vcsResolveAct.setWhatsThis(self.trUtf8( """<b>Conflicts resolved</b>""" - """<p>This marks all conflicts of the local project as resolved.</p>""" + """<p>This marks all conflicts of the local project as""" + """ resolved.</p>""" )) self.vcsResolveAct.triggered[()].connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) @@ -412,7 +424,8 @@ )) self.svnRelocateAct.setWhatsThis(self.trUtf8( """<b>Relocate</b>""" - """<p>This relocates the working copy to a new repository URL.</p>""" + """<p>This relocates the working copy to a new repository""" + """ URL.</p>""" )) self.svnRelocateAct.triggered[()].connect(self.__svnRelocate) self.actions.append(self.svnRelocateAct) @@ -439,7 +452,8 @@ )) self.svnConfigAct.setWhatsThis(self.trUtf8( """<b>Configure</b>""" - """<p>Show the configuration dialog with the Subversion page selected.</p>""" + """<p>Show the configuration dialog with the Subversion page""" + """ selected.</p>""" )) self.svnConfigAct.triggered[()].connect(self.__svnConfigure) self.actions.append(self.svnConfigAct) @@ -543,13 +557,15 @@ def __svnExtendedDiff(self): """ - Private slot used to perform a svn diff with the selection of revisions. + Private slot used to perform a svn diff with the selection of + revisions. """ self.vcs.svnExtendedDiff(self.project.ppath) def __svnUrlDiff(self): """ - Private slot used to perform a svn diff with the selection of repository URLs. + Private slot used to perform a svn diff with the selection of + repository URLs. """ self.vcs.svnUrlDiff(self.project.ppath) @@ -581,7 +597,8 @@ """ Private slot to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") + e5App().getObject("UserInterface")\ + .showPreferences("zzz_subversionPage") def __svnChangeLists(self): """