Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of visible indentation issues.
Wed, 16 Oct 2013 15:16:54 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 16 Oct 2013 15:16:54 +0200
- changeset 3025
- 67064c71df21
- parent 3024
- 17c01303a239
- child 3026
- ca34cf6c413f
- child 3028
- ca4a0a322c44
Fixed a bunch of visible indentation issues.
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Wed Oct 16 15:16:54 2013 +0200 @@ -205,15 +205,18 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) @@ -223,7 +226,8 @@ self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) @@ -234,50 +238,63 @@ self.vcsMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsSbsDiff.png"), self.trUtf8('Show difference side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) - self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), + self.blameAct = menu.addAction( + self.trUtf8('Show annotated file'), self.__SVNBlame) self.vcsMenuActions.append(self.blameAct) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( @@ -285,16 +302,20 @@ self.vcsMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLock.png"), self.trUtf8('Lock'), self.__SVNLock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Unlock'), self.__SVNUnlock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Break Lock'), self.__SVNBreakLock) self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Steal Lock'), self.__SVNStealLock) self.vcsMenuActions.append(act) menu.addSeparator() @@ -307,13 +328,13 @@ self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -343,52 +364,63 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) if 1 in self.browser.specialMenuEntries: - self.vcsMultiMenuAddTree = \ - menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + self.vcsMultiMenuAddTree = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( @@ -396,16 +428,20 @@ self.vcsMultiMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLock.png"), self.trUtf8('Lock'), self.__SVNLock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Unlock'), self.__SVNUnlock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Break Lock'), self.__SVNBreakLock) self.vcsMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUnlock.png"), self.trUtf8('Steal Lock'), self.__SVNStealLock) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -418,13 +454,13 @@ self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -451,13 +487,13 @@ menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -489,18 +525,22 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) @@ -511,40 +551,50 @@ self.vcsDirMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( @@ -560,13 +610,13 @@ self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure) @@ -598,50 +648,62 @@ act.setFont(font) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsUpdate.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsUpdate.png"), self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsCommit.png"), self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsAdd.png"), self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) if self.vcs.version >= (1, 5, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction( + self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction( + self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsStatus.png"), self.trUtf8('Show status'), self._VCSStatus) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() - act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), + act = menu.addAction( + UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( @@ -657,13 +719,13 @@ self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), - self.browser.selectLocalEntries) + self.browser.selectLocalEntries) menu.addAction(self.trUtf8('Select all versioned file entries'), - self.browser.selectVCSEntries) + self.browser.selectVCSEntries) menu.addAction(self.trUtf8('Select all local directory entries'), - self.browser.selectLocalDirEntries) + self.browser.selectLocalDirEntries) menu.addAction(self.trUtf8('Select all versioned directory entries'), - self.browser.selectVCSDirEntries) + self.browser.selectVCSDirEntries) menu.addSeparator() menu.addAction(self.trUtf8("Configure..."), self.__SVNConfigure)
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Wed Oct 16 15:16:54 2013 +0200 @@ -61,10 +61,11 @@ self.vcsNewAct.triggered[()].connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) - self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), - UI.PixmapCache.getIcon("vcsUpdate.png"), - self.trUtf8('&Update from repository'), 0, 0, self, - 'subversion_update') + self.vcsUpdateAct = E5Action( + self.trUtf8('Update from repository'), + UI.PixmapCache.getIcon("vcsUpdate.png"), + self.trUtf8('&Update from repository'), 0, 0, self, + 'subversion_update') self.vcsUpdateAct.setStatusTip(self.trUtf8( 'Update the local project from the VCS repository' )) @@ -92,10 +93,11 @@ self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action(self.trUtf8('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show &log'), - 0, 0, self, 'subversion_log') + self.vcsLogAct = E5Action( + self.trUtf8('Show log'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show &log'), + 0, 0, self, 'subversion_log') self.vcsLogAct.setStatusTip(self.trUtf8( 'Show the log of the local project' )) @@ -106,10 +108,11 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show log browser'), - 0, 0, self, 'subversion_log_browser') + self.svnLogBrowserAct = E5Action( + self.trUtf8('Show log browser'), + UI.PixmapCache.getIcon("vcsLog.png"), + self.trUtf8('Show log browser'), + 0, 0, self, 'subversion_log_browser') self.svnLogBrowserAct.setStatusTip(self.trUtf8( 'Show a dialog to browse the log of the local project' )) @@ -122,10 +125,11 @@ self.svnLogBrowserAct.triggered[()].connect(self.__svnLogBrowser) self.actions.append(self.svnLogBrowserAct) - self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show &difference'), - 0, 0, self, 'subversion_diff') + self.vcsDiffAct = E5Action( + self.trUtf8('Show difference'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show &difference'), + 0, 0, self, 'subversion_diff') self.vcsDiffAct.setStatusTip(self.trUtf8( 'Show the difference of the local project to the repository' )) @@ -153,10 +157,11 @@ self.svnExtDiffAct.triggered[()].connect(self.__svnExtendedDiff) self.actions.append(self.svnExtDiffAct) - self.svnUrlDiffAct = E5Action(self.trUtf8('Show difference (URLs)'), - UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), - 0, 0, self, 'subversion_urldiff') + self.svnUrlDiffAct = E5Action( + self.trUtf8('Show difference (URLs)'), + UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show difference (URLs)'), + 0, 0, self, 'subversion_urldiff') self.svnUrlDiffAct.setStatusTip(self.trUtf8( 'Show the difference of the project between two repository URLs' )) @@ -168,10 +173,11 @@ self.svnUrlDiffAct.triggered[()].connect(self.__svnUrlDiff) self.actions.append(self.svnUrlDiffAct) - self.vcsStatusAct = E5Action(self.trUtf8('Show status'), - UI.PixmapCache.getIcon("vcsStatus.png"), - self.trUtf8('Show &status'), - 0, 0, self, 'subversion_status') + self.vcsStatusAct = E5Action( + self.trUtf8('Show status'), + UI.PixmapCache.getIcon("vcsStatus.png"), + self.trUtf8('Show &status'), + 0, 0, self, 'subversion_status') self.vcsStatusAct.setStatusTip(self.trUtf8( 'Show the status of the local project' )) @@ -182,10 +188,11 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) - self.svnChangeListsAct = E5Action(self.trUtf8('Show change lists'), - UI.PixmapCache.getIcon("vcsChangeLists.png"), - self.trUtf8('Show change lists'), - 0, 0, self, 'subversion_changelists') + self.svnChangeListsAct = E5Action( + self.trUtf8('Show change lists'), + UI.PixmapCache.getIcon("vcsChangeLists.png"), + self.trUtf8('Show change lists'), + 0, 0, self, 'subversion_changelists') self.svnChangeListsAct.setStatusTip(self.trUtf8( 'Show the change lists and associated files of the local project' )) @@ -197,10 +204,11 @@ self.svnChangeListsAct.triggered[()].connect(self.__svnChangeLists) self.actions.append(self.svnChangeListsAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), - UI.PixmapCache.getIcon("vcsTag.png"), - self.trUtf8('&Tag in repository...'), - 0, 0, self, 'subversion_tag') + self.vcsTagAct = E5Action( + self.trUtf8('Tag in repository'), + UI.PixmapCache.getIcon("vcsTag.png"), + self.trUtf8('&Tag in repository...'), + 0, 0, self, 'subversion_tag') self.vcsTagAct.setStatusTip(self.trUtf8( 'Tag the local project in the repository' )) @@ -211,10 +219,11 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), - UI.PixmapCache.getIcon("vcsExport.png"), - self.trUtf8('&Export from repository...'), - 0, 0, self, 'subversion_export') + self.vcsExportAct = E5Action( + self.trUtf8('Export from repository'), + UI.PixmapCache.getIcon("vcsExport.png"), + self.trUtf8('&Export from repository...'), + 0, 0, self, 'subversion_export') self.vcsExportAct.setStatusTip(self.trUtf8( 'Export a project from the repository' )) @@ -225,9 +234,10 @@ self.vcsExportAct.triggered[()].connect(self._vcsExport) self.actions.append(self.vcsExportAct) - self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'), 0, 0, self, - 'subversion_options') + 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.setWhatsThis(self.trUtf8( @@ -237,10 +247,11 @@ self.vcsPropsAct.triggered[()].connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) - self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), - UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Re&vert changes'), - 0, 0, self, 'subversion_revert') + self.vcsRevertAct = E5Action( + self.trUtf8('Revert changes'), + UI.PixmapCache.getIcon("vcsRevert.png"), + self.trUtf8('Re&vert changes'), + 0, 0, self, 'subversion_revert') self.vcsRevertAct.setStatusTip(self.trUtf8( 'Revert all changes made to the local project' )) @@ -251,10 +262,11 @@ self.vcsRevertAct.triggered[()].connect(self._vcsRevert) self.actions.append(self.vcsRevertAct) - self.vcsMergeAct = E5Action(self.trUtf8('Merge'), - UI.PixmapCache.getIcon("vcsMerge.png"), - self.trUtf8('Mer&ge changes...'), - 0, 0, self, 'subversion_merge') + self.vcsMergeAct = E5Action( + self.trUtf8('Merge'), + UI.PixmapCache.getIcon("vcsMerge.png"), + self.trUtf8('Mer&ge changes...'), + 0, 0, self, 'subversion_merge') self.vcsMergeAct.setStatusTip(self.trUtf8( 'Merge changes of a tag/revision into the local project' )) @@ -266,10 +278,11 @@ self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) - self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), - UI.PixmapCache.getIcon("vcsSwitch.png"), - self.trUtf8('S&witch...'), - 0, 0, self, 'subversion_switch') + self.vcsSwitchAct = E5Action( + self.trUtf8('Switch'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.trUtf8('S&witch...'), + 0, 0, self, 'subversion_switch') self.vcsSwitchAct.setStatusTip(self.trUtf8( 'Switch the local copy to another tag/branch' )) @@ -280,9 +293,10 @@ self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) - self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), - self.trUtf8('Con&flicts resolved'), - 0, 0, self, 'subversion_resolve') + self.vcsResolveAct = E5Action( + self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), + 0, 0, self, 'subversion_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( 'Mark all conflicts of the local project as resolved' )) @@ -294,9 +308,10 @@ self.vcsResolveAct.triggered[()].connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) - self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), - self.trUtf8('Cleanu&p'), - 0, 0, self, 'subversion_cleanup') + self.vcsCleanupAct = E5Action( + self.trUtf8('Cleanup'), + self.trUtf8('Cleanu&p'), + 0, 0, self, 'subversion_cleanup') self.vcsCleanupAct.setStatusTip(self.trUtf8( 'Cleanup the local project' )) @@ -307,9 +322,10 @@ self.vcsCleanupAct.triggered[()].connect(self._vcsCleanup) self.actions.append(self.vcsCleanupAct) - self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), - self.trUtf8('E&xecute command...'), - 0, 0, self, 'subversion_command') + self.vcsCommandAct = E5Action( + self.trUtf8('Execute command'), + self.trUtf8('E&xecute command...'), + 0, 0, self, 'subversion_command') self.vcsCommandAct.setStatusTip(self.trUtf8( 'Execute an arbitrary VCS command' )) @@ -320,9 +336,10 @@ self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) - self.svnTagListAct = E5Action(self.trUtf8('List tags'), - self.trUtf8('List tags...'), - 0, 0, self, 'subversion_list_tags') + self.svnTagListAct = E5Action( + self.trUtf8('List tags'), + self.trUtf8('List tags...'), + 0, 0, self, 'subversion_list_tags') self.svnTagListAct.setStatusTip(self.trUtf8( 'List tags of the project' )) @@ -333,9 +350,10 @@ self.svnTagListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnTagListAct) - self.svnBranchListAct = E5Action(self.trUtf8('List branches'), - self.trUtf8('List branches...'), - 0, 0, self, 'subversion_list_branches') + self.svnBranchListAct = E5Action( + self.trUtf8('List branches'), + self.trUtf8('List branches...'), + 0, 0, self, 'subversion_list_branches') self.svnBranchListAct.setStatusTip(self.trUtf8( 'List branches of the project' )) @@ -346,9 +364,10 @@ self.svnBranchListAct.triggered[()].connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) - self.svnListAct = E5Action(self.trUtf8('List repository contents'), - self.trUtf8('List repository contents...'), - 0, 0, self, 'subversion_contents') + self.svnListAct = E5Action( + self.trUtf8('List repository contents'), + self.trUtf8('List repository contents...'), + 0, 0, self, 'subversion_contents') self.svnListAct.setStatusTip(self.trUtf8( 'Lists the contents of the repository' )) @@ -359,9 +378,10 @@ self.svnListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnListAct) - self.svnPropSetAct = E5Action(self.trUtf8('Set Property'), - self.trUtf8('Set Property...'), - 0, 0, self, 'subversion_property_set') + self.svnPropSetAct = E5Action( + self.trUtf8('Set Property'), + self.trUtf8('Set Property...'), + 0, 0, self, 'subversion_property_set') self.svnPropSetAct.setStatusTip(self.trUtf8( 'Set a property for the project files' )) @@ -372,9 +392,10 @@ self.svnPropSetAct.triggered[()].connect(self.__svnPropSet) self.actions.append(self.svnPropSetAct) - self.svnPropListAct = E5Action(self.trUtf8('List Properties'), - self.trUtf8('List Properties...'), - 0, 0, self, 'subversion_property_list') + self.svnPropListAct = E5Action( + self.trUtf8('List Properties'), + self.trUtf8('List Properties...'), + 0, 0, self, 'subversion_property_list') self.svnPropListAct.setStatusTip(self.trUtf8( 'List properties of the project files' )) @@ -385,9 +406,10 @@ self.svnPropListAct.triggered[()].connect(self.__svnPropList) self.actions.append(self.svnPropListAct) - self.svnPropDelAct = E5Action(self.trUtf8('Delete Property'), - self.trUtf8('Delete Property...'), - 0, 0, self, 'subversion_property_delete') + self.svnPropDelAct = E5Action( + self.trUtf8('Delete Property'), + self.trUtf8('Delete Property...'), + 0, 0, self, 'subversion_property_delete') self.svnPropDelAct.setStatusTip(self.trUtf8( 'Delete a property for the project files' )) @@ -398,10 +420,11 @@ self.svnPropDelAct.triggered[()].connect(self.__svnPropDel) self.actions.append(self.svnPropDelAct) - self.svnRelocateAct = E5Action(self.trUtf8('Relocate'), - UI.PixmapCache.getIcon("vcsSwitch.png"), - self.trUtf8('Relocate...'), - 0, 0, self, 'subversion_relocate') + self.svnRelocateAct = E5Action( + self.trUtf8('Relocate'), + UI.PixmapCache.getIcon("vcsSwitch.png"), + self.trUtf8('Relocate...'), + 0, 0, self, 'subversion_relocate') self.svnRelocateAct.setStatusTip(self.trUtf8( 'Relocate the working copy to a new repository URL' )) @@ -413,10 +436,11 @@ self.svnRelocateAct.triggered[()].connect(self.__svnRelocate) self.actions.append(self.svnRelocateAct) - self.svnRepoBrowserAct = E5Action(self.trUtf8('Repository Browser'), - UI.PixmapCache.getIcon("vcsRepoBrowser.png"), - self.trUtf8('Repository Browser...'), - 0, 0, self, 'subversion_repo_browser') + self.svnRepoBrowserAct = E5Action( + self.trUtf8('Repository Browser'), + UI.PixmapCache.getIcon("vcsRepoBrowser.png"), + self.trUtf8('Repository Browser...'), + 0, 0, self, 'subversion_repo_browser') self.svnRepoBrowserAct.setStatusTip(self.trUtf8( 'Show the Repository Browser dialog' )) @@ -427,9 +451,10 @@ self.svnRepoBrowserAct.triggered[()].connect(self.__svnRepoBrowser) self.actions.append(self.svnRepoBrowserAct) - self.svnConfigAct = E5Action(self.trUtf8('Configure'), - self.trUtf8('Configure...'), - 0, 0, self, 'subversion_configure') + self.svnConfigAct = E5Action( + self.trUtf8('Configure'), + self.trUtf8('Configure...'), + 0, 0, self, 'subversion_configure') self.svnConfigAct.setStatusTip(self.trUtf8( 'Show the configuration dialog with the Subversion page selected' ))
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -165,7 +165,8 @@ @param author author of the change (string) @param text line of text from the annotated file (string) """ - itm = QTreeWidgetItem(self.blameList, + itm = QTreeWidgetItem( + self.blameList, [revision, author, "{0:d}".format(self.lineno), text]) self.lineno += 1 itm.setTextAlignment(0, Qt.AlignRight)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -64,10 +64,10 @@ self.recentCommitMessages.remove(msg) self.recentCommitMessages.insert(0, msg) no = int(Preferences.Prefs.settings\ - .value('Subversion/CommitMessages', 20)) + .value('Subversion/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Subversion/Commits', - self.recentCommitMessages) + Preferences.Prefs.settings.setValue( + 'Subversion/Commits', self.recentCommitMessages) return msg def hasChangelists(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -400,7 +400,8 @@ except IOError as why: E5MessageBox.critical( self, self.trUtf8('Save Diff'), - self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' + self.trUtf8( + '<p>The patch file <b>{0}</b> could not be saved.' '<br>Reason: {1}</p>') .format(fname, str(why)))
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -125,7 +125,8 @@ """ Private method to resort the log tree. """ - self.logTree.sortItems(self.logTree.sortColumn(), + self.logTree.sortItems( + self.logTree.sortColumn(), self.logTree.header().sortIndicatorOrder()) def __resizeColumnsFiles(self): @@ -140,10 +141,10 @@ Private method to resort the changed files tree. """ sortColumn = self.filesTree.sortColumn() - self.filesTree.sortItems(1, - self.filesTree.header().sortIndicatorOrder()) - self.filesTree.sortItems(sortColumn, - self.filesTree.header().sortIndicatorOrder()) + self.filesTree.sortItems( + 1, self.filesTree.header().sortIndicatorOrder()) + self.filesTree.sortItems( + sortColumn, self.filesTree.header().sortIndicatorOrder()) def __generateLogItem(self, author, date, message, revision, changedPaths): """ @@ -346,8 +347,9 @@ }) elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): if len(log) > 1: - self.__generateLogItem(log["author"], log["date"], - log["message"], log["revision"], changedPaths) + self.__generateLogItem( + log["author"], log["date"], log["message"], + log["revision"], changedPaths) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and \ not self.__minDate.isValid(): @@ -463,8 +465,9 @@ changes = current.data(0, self.__changesRole) if len(changes) > 0: for change in changes: - self.__generateFileItem(change["action"], change["path"], - change["copyfrom_path"], change["copyfrom_revision"]) + self.__generateFileItem( + change["action"], change["path"], change["copyfrom_path"], + change["copyfrom_revision"]) self.__resizeColumnsFiles() self.__resortFiles()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -59,7 +59,8 @@ """ Private method to resort the tree. """ - self.propsList.sortItems(self.propsList.sortColumn(), + self.propsList.sortItems( + self.propsList.sortColumn(), self.propsList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -83,7 +83,8 @@ """ Private method to resort the tree. """ - self.repoTree.sortItems(self.repoTree.sortColumn(), + self.repoTree.sortItems( + self.repoTree.sortColumn(), self.repoTree.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -97,10 +97,10 @@ self.__removeFromChangelist)) if self.vcs.version >= (1, 2, 0): self.menu.addSeparator() - self.menuactions.append(self.menu.addAction(self.trUtf8("Lock"), - self.__lock)) - self.menuactions.append(self.menu.addAction(self.trUtf8("Unlock"), - self.__unlock)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Lock"), self.__lock)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Unlock"), self.__unlock)) self.menuactions.append(self.menu.addAction( self.trUtf8("Break lock"), self.__breakLock)) @@ -205,7 +205,8 @@ """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems( + self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -115,7 +115,8 @@ E5MessageBox.critical( self, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The list operation will""" """ be aborted""")) return @@ -216,7 +217,8 @@ """ Private method to resort the tree. """ - self.tagList.sortItems(self.tagList.sortColumn(), + self.tagList.sortItems( + self.tagList.sortColumn(), self.tagList.header().sortIndicatorOrder()) def __resizeColumns(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -65,7 +65,8 @@ E5MessageBox.critical( self, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The list operation will""" """ be aborted""")) self.reject()
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Wed Oct 16 15:16:54 2013 +0200 @@ -302,8 +302,8 @@ args.append(self.__svnURL(vcsDir)) if noDialog: - status = self.startSynchronizedProcess(QProcess(), "svn", args, - os.path.join(tmpDir, project)) + status = self.startSynchronizedProcess( + QProcess(), "svn", args, os.path.join(tmpDir, project)) else: dia = SvnDialog( self.trUtf8('Importing project into Subversion repository')) @@ -345,7 +345,8 @@ type, ok = QInputDialog.getItem( None, self.trUtf8("Subversion Checkout"), - self.trUtf8("The tag must be a normal tag (tags) or" + self.trUtf8( + "The tag must be a normal tag (tags) or" " a branch tag (branches)." " Please select from the list."), self.tagTypeList, @@ -400,7 +401,8 @@ type, ok = QInputDialog.getItem( None, self.trUtf8("Subversion Export"), - self.trUtf8("The tag must be a normal tag (tags) or" + self.trUtf8( + "The tag must be a normal tag (tags) or" " a branch tag (branches)." " Please select from the list."), self.tagTypeList, @@ -652,7 +654,7 @@ os.path.normcase(repodir) and \ (d not in tree2 + tree) and \ (os.path.normcase(d) not in self.statusCache or \ - self.statusCache[os.path.normcase(d)] == \ + self.statusCache[os.path.normcase(d)] == \ self.canBeAdded): tree2.append(d) d = os.path.dirname(d) @@ -857,7 +859,7 @@ res = self.startSynchronizedProcess(QProcess(), "svn", args) else: dia = SvnDialog(self.trUtf8('Moving {0}') - .format(name)) + .format(name)) res = dia.startProcess(args) if res: dia.exec_() @@ -979,7 +981,8 @@ E5MessageBox.critical( self.__ui, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The tag operation will""" """ be aborted""")) return @@ -1011,7 +1014,7 @@ args.append(url) dia = SvnDialog(self.trUtf8('Tagging {0} in the Subversion repository') - .format(name)) + .format(name)) res = dia.startProcess(args) if res: dia.exec_() @@ -1039,7 +1042,8 @@ if names[0]: from UI.DeleteFilesConfirmationDialog import \ DeleteFilesConfirmationDialog - dlg = DeleteFilesConfirmationDialog(self.parent(), + dlg = DeleteFilesConfirmationDialog( + self.parent(), self.trUtf8("Revert changes"), self.trUtf8("Do you really want to revert all changes to" " these files or directories?"), @@ -1099,7 +1103,8 @@ E5MessageBox.critical( self.__ui, self.trUtf8("Subversion Error"), - self.trUtf8("""The URL of the project repository has an""" + self.trUtf8( + """The URL of the project repository has an""" """ invalid format. The switch operation will""" """ be aborted""")) return False @@ -1127,7 +1132,7 @@ args.append(name) dia = SvnDialog(self.trUtf8('Switching to {0}') - .format(tn)) + .format(tn)) res = dia.startProcess(args, setLanguage=True) if res: dia.exec_() @@ -1458,7 +1463,7 @@ args.append(name) dia = SvnDialog(self.trUtf8('Cleaning up {0}') - .format(name)) + .format(name)) res = dia.startProcess(args) if res: dia.exec_() @@ -1580,7 +1585,8 @@ info['committed-time'] = "{0}{1}".format( time.split('.')[0], time[-1]) - return QApplication.translate('subversion', + return QApplication.translate( + 'subversion', """<h3>Repository information</h3>""" """<table>""" """<tr><td><b>Subversion V.</b></td><td>{0}</td></tr>""" @@ -1689,7 +1695,7 @@ args.append(target) dia = SvnDialog(self.trUtf8('Copying {0}') - .format(name)) + .format(name)) res = dia.startProcess(args) if res: dia.exec_() @@ -1906,7 +1912,7 @@ from .SvnUrlSelectionDialog import SvnUrlSelectionDialog dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, - dname) + dname) if dlg.exec_() == QDialog.Accepted: urls, summary = dlg.getURLs() from .SvnDiffDialog import SvnDiffDialog @@ -1941,17 +1947,20 @@ finished = process.waitForFinished(30000) if finished: if process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str( + process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') else: - error = str(process.readAllStandardError(), + error = str( + process.readAllStandardError(), Preferences.getSystem("IOEncoding"), 'replace') else: error = self.trUtf8( "The svn process did not finish within 30s.") else: - error = self.trUtf8('The process {0} could not be started. ' - 'Ensure, that it is in the search path.').format('svn') + error = self.trUtf8( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.').format('svn') return output, error
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Wed Oct 16 15:16:54 2013 +0200 @@ -225,7 +225,8 @@ Private method to initialize the viewlist context menu. """ self.__menu = QMenu(self) - self.__menu.addAction(UI.PixmapCache.getIcon("tabClose.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("tabClose.png"), self.trUtf8('Close'), self.__contextMenuClose) self.closeOthersMenuAct = self.__menu.addAction( UI.PixmapCache.getIcon("tabCloseOther.png"), @@ -234,19 +235,22 @@ self.__menu.addAction( self.trUtf8('Close All'), self.__contextMenuCloseAll) self.__menu.addSeparator() - self.saveMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("fileSave.png"), + self.saveMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8('Save'), self.__contextMenuSave) - self.__menu.addAction(UI.PixmapCache.getIcon("fileSaveAs.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("fileSaveAs.png"), self.trUtf8('Save As...'), self.__contextMenuSaveAs) - self.__menu.addAction(UI.PixmapCache.getIcon("fileSaveAll.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("fileSaveAll.png"), self.trUtf8('Save All'), self.__contextMenuSaveAll) self.__menu.addSeparator() - self.openRejectionsMenuAct = \ - self.__menu.addAction(self.trUtf8("Open 'rejection' file"), + self.openRejectionsMenuAct = self.__menu.addAction( + self.trUtf8("Open 'rejection' file"), self.__contextMenuOpenRejections) self.__menu.addSeparator() - self.__menu.addAction(UI.PixmapCache.getIcon("print.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__contextMenuPrintFile) self.__menu.addSeparator() self.copyPathAct = self.__menu.addAction(
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Wed Oct 16 15:16:54 2013 +0200 @@ -230,20 +230,21 @@ Private method to initialize the tab context menu. """ self.__menu = QMenu(self) - self.leftMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("1leftarrow.png"), + self.leftMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("1leftarrow.png"), self.trUtf8('Move Left'), self.__contextMenuMoveLeft) - self.rightMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("1rightarrow.png"), + self.rightMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("1rightarrow.png"), self.trUtf8('Move Right'), self.__contextMenuMoveRight) - self.firstMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("2leftarrow.png"), + self.firstMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("2leftarrow.png"), self.trUtf8('Move First'), self.__contextMenuMoveFirst) - self.lastMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("2rightarrow.png"), + self.lastMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("2rightarrow.png"), self.trUtf8('Move Last'), self.__contextMenuMoveLast) self.__menu.addSeparator() - self.__menu.addAction(UI.PixmapCache.getIcon("tabClose.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("tabClose.png"), self.trUtf8('Close'), self.__contextMenuClose) self.closeOthersMenuAct = self.__menu.addAction( UI.PixmapCache.getIcon("tabCloseOther.png"), @@ -251,19 +252,22 @@ self.__menu.addAction( self.trUtf8('Close All'), self.__contextMenuCloseAll) self.__menu.addSeparator() - self.saveMenuAct = \ - self.__menu.addAction(UI.PixmapCache.getIcon("fileSave.png"), + self.saveMenuAct = self.__menu.addAction( + UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8('Save'), self.__contextMenuSave) - self.__menu.addAction(UI.PixmapCache.getIcon("fileSaveAs.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("fileSaveAs.png"), self.trUtf8('Save As...'), self.__contextMenuSaveAs) - self.__menu.addAction(UI.PixmapCache.getIcon("fileSaveAll.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("fileSaveAll.png"), self.trUtf8('Save All'), self.__contextMenuSaveAll) self.__menu.addSeparator() - self.openRejectionsMenuAct = \ - self.__menu.addAction(self.trUtf8("Open 'rejection' file"), + self.openRejectionsMenuAct = self.__menu.addAction( + self.trUtf8("Open 'rejection' file"), self.__contextMenuOpenRejections) self.__menu.addSeparator() - self.__menu.addAction(UI.PixmapCache.getIcon("print.png"), + self.__menu.addAction( + UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__contextMenuPrintFile) self.__menu.addSeparator() self.copyPathAct = self.__menu.addAction( @@ -508,8 +512,8 @@ @param targetIndex index position to place it to (integer) """ editor = self.widget(sourceIndex).getEditor() - newEditor, assembly = self.vm.cloneEditor(editor, editor.getFileType(), - editor.getFileName()) + newEditor, assembly = self.vm.cloneEditor( + editor, editor.getFileType(), editor.getFileName()) self.vm.insertView(assembly, self, targetIndex, editor.getFileName(), editor.getNoName())
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -247,13 +247,14 @@ Private method to test the selected options. """ if self.rAbout.isChecked(): - E5MessageBox.about(None, + E5MessageBox.about( + None, self.eCaption.text(), self.eMessage.toPlainText() ) elif self.rAboutQt.isChecked(): - E5MessageBox.aboutQt(None, - self.eCaption.text() + E5MessageBox.aboutQt( + None, self.eCaption.text() ) elif self.rInformation.isChecked() or \ self.rQuestion.isChecked() or \ @@ -303,28 +304,32 @@ self.defaultCombo.currentIndex()] if self.rInformation.isChecked(): - E5MessageBox.information(self, + E5MessageBox.information( + self, self.eCaption.text(), self.eMessage.toPlainText(), E5MessageBox.StandardButtons(buttons), defaultButton ) elif self.rQuestion.isChecked(): - E5MessageBox.question(self, + E5MessageBox.question( + self, self.eCaption.text(), self.eMessage.toPlainText(), E5MessageBox.StandardButtons(buttons), defaultButton ) elif self.rWarning.isChecked(): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.eCaption.text(), self.eMessage.toPlainText(), E5MessageBox.StandardButtons(buttons), defaultButton ) elif self.rCritical.isChecked(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.eCaption.text(), self.eMessage.toPlainText(), E5MessageBox.StandardButtons(buttons), @@ -342,20 +347,23 @@ icon = E5MessageBox.Critical if self.rYesNo.isChecked(): - E5MessageBox.yesNo(self, + E5MessageBox.yesNo( + self, self.eCaption.text(), self.eMessage.toPlainText(), icon=icon, yesDefault=self.yesDefaultCheck.isChecked() ) elif self.rRetryAbort.isChecked(): - E5MessageBox.retryAbort(self, + E5MessageBox.retryAbort( + self, self.eCaption.text(), self.eMessage.toPlainText(), icon=icon ) elif self.rOkToClearData.isChecked(): - E5MessageBox.okToClearData(self, + E5MessageBox.okToClearData( + self, self.eCaption.text(), self.eMessage.toPlainText(), lambda: True @@ -434,7 +442,8 @@ btnCode = "" defaultIndex = self.defaultCombo.currentIndex() if defaultIndex: - btnCode = ',{0}{1}{2}'.format(os.linesep, istring, + btnCode = ',{0}{1}{2}'.format( + os.linesep, istring, self.buttonsCodeListText[defaultIndex]) return btnCode
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -84,8 +84,8 @@ hlayout0.setContentsMargins(0, 0, 0, 0) hlayout0.setSpacing(6) hlayout0.setObjectName("hlayout0") - self.moreSinglesButton = QPushButton(self.trUtf8("Additional Entries"), - self.singlesBox) + self.moreSinglesButton = QPushButton( + self.trUtf8("Additional Entries"), self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) hspacer0 = QSpacerItem( @@ -118,8 +118,8 @@ hlayout1.setContentsMargins(0, 0, 0, 0) hlayout1.setSpacing(6) hlayout1.setObjectName("hlayout1") - self.moreRangesButton = QPushButton(self.trUtf8("Additional Entries"), - self.rangesBox) + self.moreRangesButton = QPushButton( + self.trUtf8("Additional Entries"), self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) hspacer1 = QSpacerItem(
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -119,8 +119,8 @@ hlayout0.setContentsMargins(0, 0, 0, 0) hlayout0.setSpacing(6) hlayout0.setObjectName("hlayout0") - self.moreSinglesButton = QPushButton(self.trUtf8("Additional Entries"), - self.singlesBox) + self.moreSinglesButton = QPushButton( + self.trUtf8("Additional Entries"), self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) hspacer0 = QSpacerItem( @@ -154,8 +154,8 @@ hlayout1.setContentsMargins(0, 0, 0, 0) hlayout1.setSpacing(6) hlayout1.setObjectName("hlayout1") - self.moreRangesButton = QPushButton(self.trUtf8("Additional Entries"), - self.rangesBox) + self.moreRangesButton = QPushButton( + self.trUtf8("Additional Entries"), self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) hspacer1 = QSpacerItem( @@ -588,7 +588,7 @@ return "" if self.__mode in [QRegExpWizardCharactersDialog.RegExpMode, - QRegExpWizardCharactersDialog.W3CMode]: + QRegExpWizardCharactersDialog.W3CMode]: if format == "-h": return "\\x{0}".format(char.lower()) elif format == "-o":
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -87,8 +87,8 @@ hlayout0.setContentsMargins(0, 0, 0, 0) hlayout0.setSpacing(6) hlayout0.setObjectName("hlayout0") - self.moreSinglesButton = QPushButton(self.trUtf8("Additional Entries"), - self.singlesBox) + self.moreSinglesButton = QPushButton( + self.trUtf8("Additional Entries"), self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) hspacer0 = QSpacerItem( @@ -122,8 +122,8 @@ hlayout1.setContentsMargins(0, 0, 0, 0) hlayout1.setSpacing(6) hlayout1.setObjectName("hlayout1") - self.moreRangesButton = QPushButton(self.trUtf8("Additional Entries"), - self.rangesBox) + self.moreRangesButton = QPushButton( + self.trUtf8("Additional Entries"), self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) hspacer1 = QSpacerItem(
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Wed Oct 16 15:16:54 2013 +0200 @@ -137,9 +137,9 @@ responseDict["errorMessage"] = error responseDict["errorOffset"] = errorOffset else: - matched, captures = rxExecute(commandDict["regexp"], - commandDict["options"], commandDict["text"], - commandDict["startpos"]) + matched, captures = rxExecute( + commandDict["regexp"], commandDict["options"], + commandDict["text"], commandDict["startpos"]) responseDict["matched"] = matched responseDict["captures"] = captures except ValueError as err:
--- a/Preferences/ConfigurationDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -418,8 +418,8 @@ self.leftVBoxLayout.setContentsMargins(0, 0, 0, 0) self.leftVBoxLayout.setSpacing(0) self.leftVBoxLayout.setObjectName("leftVBoxLayout") - self.configListFilter = E5ClearableLineEdit(self, - self.trUtf8("Enter filter text...")) + self.configListFilter = E5ClearableLineEdit( + self, self.trUtf8("Enter filter text...")) self.configListFilter.setObjectName("configListFilter") self.leftVBoxLayout.addWidget(self.configListFilter) self.configList = QTreeWidget() @@ -616,7 +616,8 @@ if page is None: page = self.emptyPage elif setCurrent: - items = self.configList.findItems(pageData[0], + items = self.configList.findItems( + pageData[0], Qt.MatchFixedString | Qt.MatchRecursive) if items: self.configList.setCurrentItem(items[0])
--- a/Preferences/ConfigurationPages/ApplicationPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/ApplicationPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -65,9 +65,11 @@ """ Public slot to save the Application configuration. """ - Preferences.setUI("SingleApplicationMode", + Preferences.setUI( + "SingleApplicationMode", self.singleApplicationCheckBox.isChecked()) - Preferences.setUI("ShowSplash", + Preferences.setUI( + "ShowSplash", self.splashScreenCheckBox.isChecked()) if self.noOpenRadioButton.isChecked(): @@ -94,10 +96,12 @@ period = 4 Preferences.setUI("PerformVersionCheck", period) - Preferences.setUser("UseSystemEmailClient", + Preferences.setUser( + "UseSystemEmailClient", self.systemEmailClientCheckBox.isChecked()) - Preferences.setUI("CheckErrorLog", + Preferences.setUI( + "CheckErrorLog", self.errorlogCheckBox.isChecked())
--- a/Preferences/ConfigurationPages/CooperationPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/CooperationPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -54,15 +54,20 @@ """ Public slot to save the Cooperation configuration. """ - Preferences.setCooperation("AutoStartServer", + Preferences.setCooperation( + "AutoStartServer", self.autostartCheckBox.isChecked()) - Preferences.setCooperation("TryOtherPorts", + Preferences.setCooperation( + "TryOtherPorts", self.otherPortsCheckBox.isChecked()) - Preferences.setCooperation("AutoAcceptConnections", + Preferences.setCooperation( + "AutoAcceptConnections", self.autoAcceptCheckBox.isChecked()) - Preferences.setCooperation("ServerPort", + Preferences.setCooperation( + "ServerPort", self.serverPortSpin.value()) - Preferences.setCooperation("MaxPortsToTry", + Preferences.setCooperation( + "MaxPortsToTry", self.portToTrySpin.value()) bannedUsers = []
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -144,18 +144,24 @@ """ Public slot to save the Debugger General (1) configuration. """ - Preferences.setDebugger("RemoteDbgEnabled", + Preferences.setDebugger( + "RemoteDbgEnabled", self.remoteCheckBox.isChecked()) - Preferences.setDebugger("RemoteHost", + Preferences.setDebugger( + "RemoteHost", self.hostLineEdit.text()) - Preferences.setDebugger("RemoteExecution", + Preferences.setDebugger( + "RemoteExecution", self.execLineEdit.text()) - Preferences.setDebugger("PassiveDbgEnabled", + Preferences.setDebugger( + "PassiveDbgEnabled", self.passiveDbgCheckBox.isChecked()) - Preferences.setDebugger("PassiveDbgPort", + Preferences.setDebugger( + "PassiveDbgPort", self.passiveDbgPortSpinBox.value()) - Preferences.setDebugger("PassiveDbgType", + Preferences.setDebugger( + "PassiveDbgType", self.passiveDbgBackendCombo.currentText()) if self.allInterfacesButton.isChecked(): @@ -175,31 +181,44 @@ allowedHosts.append(self.allowedHostsList.item(row).text()) Preferences.setDebugger("AllowedHosts", allowedHosts) - Preferences.setDebugger("DebugEnvironmentReplace", + Preferences.setDebugger( + "DebugEnvironmentReplace", self.debugEnvironReplaceCheckBox.isChecked()) - Preferences.setDebugger("DebugEnvironment", + Preferences.setDebugger( + "DebugEnvironment", self.debugEnvironEdit.text()) - Preferences.setDebugger("AutomaticReset", + Preferences.setDebugger( + "AutomaticReset", self.automaticResetCheckBox.isChecked()) - Preferences.setDebugger("Autosave", + Preferences.setDebugger( + "Autosave", self.debugAutoSaveScriptsCheckBox.isChecked()) - Preferences.setDebugger("ConsoleDbgEnabled", + Preferences.setDebugger( + "ConsoleDbgEnabled", self.consoleDbgCheckBox.isChecked()) - Preferences.setDebugger("ConsoleDbgCommand", + Preferences.setDebugger( + "ConsoleDbgCommand", self.consoleDbgEdit.text()) - Preferences.setDebugger("PathTranslation", + Preferences.setDebugger( + "PathTranslation", self.dbgPathTranslationCheckBox.isChecked()) - Preferences.setDebugger("PathTranslationRemote", + Preferences.setDebugger( + "PathTranslationRemote", self.dbgTranslationRemoteEdit.text()) - Preferences.setDebugger("PathTranslationLocal", + Preferences.setDebugger( + "PathTranslationLocal", self.dbgTranslationLocalEdit.text()) - Preferences.setDebugger("ThreeStateBreakPoints", + Preferences.setDebugger( + "ThreeStateBreakPoints", self.debugThreeStateBreakPoint.isChecked()) - Preferences.setDebugger("SuppressClientExit", + Preferences.setDebugger( + "SuppressClientExit", self.dontShowClientExitCheckBox.isChecked()) - Preferences.setDebugger("BreakAlways", + Preferences.setDebugger( + "BreakAlways", self.exceptionBreakCheckBox.isChecked()) - Preferences.setDebugger("AutoViewSourceCode", + Preferences.setDebugger( + "AutoViewSourceCode", self.autoViewSourcecodeCheckBox.isChecked()) def on_allowedHostsList_currentItemChanged(self, current, previous):
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Wed Oct 16 15:16:54 2013 +0200 @@ -59,9 +59,11 @@ """ Public slot to save the Debugger Python configuration. """ - Preferences.setDebugger("CustomPython3Interpreter", + Preferences.setDebugger( + "CustomPython3Interpreter", self.customPyCheckBox.isChecked()) - Preferences.setDebugger("Python3Interpreter", + Preferences.setDebugger( + "Python3Interpreter", self.interpreterEdit.text()) if self.standardButton.isChecked(): dct = "standard" @@ -70,13 +72,17 @@ else: dct = "custom" Preferences.setDebugger("DebugClientType3", dct) - Preferences.setDebugger("DebugClient3", + Preferences.setDebugger( + "DebugClient3", self.debugClientEdit.text()) - Preferences.setDebugger("Python3Redirect", + Preferences.setDebugger( + "Python3Redirect", self.pyRedirectCheckBox.isChecked()) - Preferences.setDebugger("Python3NoEncoding", + Preferences.setDebugger( + "Python3NoEncoding", self.pyNoEncodingCheckBox.isChecked()) - Preferences.setDebugger("Python3Extensions", + Preferences.setDebugger( + "Python3Extensions", self.sourceExtensionsEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -57,7 +57,8 @@ """ Public slot to save the Debugger Python configuration. """ - Preferences.setDebugger("PythonInterpreter", + Preferences.setDebugger( + "PythonInterpreter", self.interpreterEdit.text()) if self.standardButton.isChecked(): dct = "standard" @@ -66,13 +67,17 @@ else: dct = "custom" Preferences.setDebugger("DebugClientType", dct) - Preferences.setDebugger("DebugClient", + Preferences.setDebugger( + "DebugClient", self.debugClientEdit.text()) - Preferences.setDebugger("PythonRedirect", + Preferences.setDebugger( + "PythonRedirect", self.pyRedirectCheckBox.isChecked()) - Preferences.setDebugger("PythonNoEncoding", + Preferences.setDebugger( + "PythonNoEncoding", self.pyNoEncodingCheckBox.isChecked()) - Preferences.setDebugger("PythonExtensions", + Preferences.setDebugger( + "PythonExtensions", self.sourceExtensionsEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -44,9 +44,11 @@ """ Public slot to save the Debugger Ruby configuration. """ - Preferences.setDebugger("RubyInterpreter", + Preferences.setDebugger( + "RubyInterpreter", self.rubyInterpreterEdit.text()) - Preferences.setDebugger("RubyRedirect", + Preferences.setDebugger( + "RubyRedirect", self.rbRedirectCheckBox.isChecked()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -46,8 +46,8 @@ import QScintilla.Lexers self.apis = {} - apiLanguages = sorted([''] + \ - list(QScintilla.Lexers.getSupportedLanguages().keys())) + apiLanguages = sorted( + [''] + list(QScintilla.Lexers.getSupportedLanguages().keys())) for lang in apiLanguages: if lang != "Guessed": self.apiLanguageComboBox.addItem(lang) @@ -61,7 +61,8 @@ """ Public slot to save the Editor APIs configuration. """ - Preferences.setEditor("AutoPrepareAPIs", + Preferences.setEditor( + "AutoPrepareAPIs", self.apiAutoPrepareCheckBox.isChecked()) lang = self.apiLanguageComboBox.currentText()
--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -40,13 +40,17 @@ """ Public slot to save the Editor Autocompletion configuration. """ - Preferences.setEditor("AutoCompletionEnabled", + Preferences.setEditor( + "AutoCompletionEnabled", self.acEnabledCheckBox.isChecked()) - Preferences.setEditor("AutoCompletionCaseSensitivity", + Preferences.setEditor( + "AutoCompletionCaseSensitivity", self.acCaseSensitivityCheckBox.isChecked()) - Preferences.setEditor("AutoCompletionReplaceWord", + Preferences.setEditor( + "AutoCompletionReplaceWord", self.acReplaceWordCheckBox.isChecked()) - Preferences.setEditor("AutoCompletionThreshold", + Preferences.setEditor( + "AutoCompletionThreshold", self.acThresholdSlider.value())
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -30,9 +30,11 @@ self.setObjectName("EditorCalltipsPage") if QSCINTILLA_VERSION() >= 0x020700: - self.positionComboBox.addItem(self.trUtf8("Below Text"), + self.positionComboBox.addItem( + self.trUtf8("Below Text"), QsciScintilla.CallTipsBelowText) - self.positionComboBox.addItem(self.trUtf8("Above Text"), + self.positionComboBox.addItem( + self.trUtf8("Above Text"), QsciScintilla.CallTipsAboveText) else: self.calltipsPositionBox.hide() @@ -44,7 +46,7 @@ self.ctVisibleSlider.setValue( Preferences.getEditor("CallTipsVisible")) self.initColour("CallTipsBackground", self.calltipsBackgroundButton, - Preferences.getEditorColour) + Preferences.getEditorColour) self.ctScintillaCheckBox.setChecked( Preferences.getEditor("CallTipsScintillaOnFail")) @@ -58,18 +60,22 @@ """ Public slot to save the EditorCalltips configuration. """ - Preferences.setEditor("CallTipsEnabled", + Preferences.setEditor( + "CallTipsEnabled", self.ctEnabledCheckBox.isChecked()) - Preferences.setEditor("CallTipsVisible", + Preferences.setEditor( + "CallTipsVisible", self.ctVisibleSlider.value()) self.saveColours(Preferences.setEditorColour) - Preferences.setEditor("CallTipsScintillaOnFail", + Preferences.setEditor( + "CallTipsScintillaOnFail", self.ctScintillaCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020700: - Preferences.setEditor("CallTipsPosition", + Preferences.setEditor( + "CallTipsPosition", self.positionComboBox.itemData( self.positionComboBox.currentIndex()))
--- a/Preferences/ConfigurationPages/EditorExportersPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorExportersPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -106,53 +106,72 @@ Public slot to save the Editor Typing configuration. """ # HTML - Preferences.setEditorExporter("HTML/WYSIWYG", + Preferences.setEditorExporter( + "HTML/WYSIWYG", self.htmlWysiwygCheckBox.isChecked()) - Preferences.setEditorExporter("HTML/Folding", + Preferences.setEditorExporter( + "HTML/Folding", self.htmlFoldingCheckBox.isChecked()) - Preferences.setEditorExporter("HTML/OnlyStylesUsed", + Preferences.setEditorExporter( + "HTML/OnlyStylesUsed", self.htmlStylesCheckBox.isChecked()) - Preferences.setEditorExporter("HTML/FullPathAsTitle", + Preferences.setEditorExporter( + "HTML/FullPathAsTitle", self.htmlTitleCheckBox.isChecked()) - Preferences.setEditorExporter("HTML/UseTabs", + Preferences.setEditorExporter( + "HTML/UseTabs", self.htmlTabsCheckBox.isChecked()) # ODT - Preferences.setEditorExporter("ODT/WYSIWYG", + Preferences.setEditorExporter( + "ODT/WYSIWYG", self.odtWysiwygCheckBox.isChecked()) - Preferences.setEditorExporter("ODT/OnlyStylesUsed", + Preferences.setEditorExporter( + "ODT/OnlyStylesUsed", self.odtStylesCheckBox.isChecked()) - Preferences.setEditorExporter("ODT/UseTabs", + Preferences.setEditorExporter( + "ODT/UseTabs", self.odtTabsCheckBox.isChecked()) # PDF - Preferences.setEditorExporter("PDF/Magnification", + Preferences.setEditorExporter( + "PDF/Magnification", self.pdfMagnificationSlider.value()) - Preferences.setEditorExporter("PDF/Font", + Preferences.setEditorExporter( + "PDF/Font", self.pdfFontCombo.itemData(self.pdfFontCombo.currentIndex())) - Preferences.setEditorExporter("PDF/PageSize", + Preferences.setEditorExporter( + "PDF/PageSize", self.pdfPageSizeCombo.itemData( self.pdfPageSizeCombo.currentIndex())) - Preferences.setEditorExporter("PDF/MarginTop", + Preferences.setEditorExporter( + "PDF/MarginTop", self.pdfMarginTopSpin.value()) - Preferences.setEditorExporter("PDF/MarginBottom", + Preferences.setEditorExporter( + "PDF/MarginBottom", self.pdfMarginBottomSpin.value()) - Preferences.setEditorExporter("PDF/MarginLeft", + Preferences.setEditorExporter( + "PDF/MarginLeft", self.pdfMarginLeftSpin.value()) - Preferences.setEditorExporter("PDF/MarginRight", + Preferences.setEditorExporter( + "PDF/MarginRight", self.pdfMarginRightSpin.value()) # RTF - Preferences.setEditorExporter("RTF/WYSIWYG", + Preferences.setEditorExporter( + "RTF/WYSIWYG", self.rtfWysiwygCheckBox.isChecked()) - Preferences.setEditorExporter("RTF/UseTabs", + Preferences.setEditorExporter( + "RTF/UseTabs", self.rtfTabsCheckBox.isChecked()) Preferences.setEditorExporter("RTF/Font", self.rtfFont) # TeX - Preferences.setEditorExporter("TeX/OnlyStylesUsed", + Preferences.setEditorExporter( + "TeX/OnlyStylesUsed", self.texStylesCheckBox.isChecked()) - Preferences.setEditorExporter("TeX/FullPathAsTitle", + Preferences.setEditorExporter( + "TeX/FullPathAsTitle", self.texTitleCheckBox.isChecked()) @pyqtSlot(str)
--- a/Preferences/ConfigurationPages/EditorFilePage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Wed Oct 16 15:16:54 2013 +0200 @@ -90,29 +90,39 @@ """ Public slot to save the Editor File Handling configuration. """ - Preferences.setEditor("AutosaveInterval", + Preferences.setEditor( + "AutosaveInterval", self.autosaveSlider.value()) - Preferences.setEditor("CreateBackupFile", + Preferences.setEditor( + "CreateBackupFile", self.createBackupFileCheckBox.isChecked()) enc = self.defaultEncodingComboBox.currentText() if not enc: enc = "utf-8" Preferences.setEditor("DefaultEncoding", enc) - Preferences.setEditor("AdvancedEncodingDetection", + Preferences.setEditor( + "AdvancedEncodingDetection", self.advEncodingCheckBox.isChecked()) - Preferences.setEditor("WarnFilesize", + Preferences.setEditor( + "WarnFilesize", self.warnFilesizeSpinBox.value()) - Preferences.setEditor("ClearBreaksOnClose", + Preferences.setEditor( + "ClearBreaksOnClose", self.clearBreakpointsCheckBox.isChecked()) - Preferences.setEditor("AutoReopen", + Preferences.setEditor( + "AutoReopen", self.automaticReopenCheckBox.isChecked()) - Preferences.setEditor("StripTrailingWhitespace", + Preferences.setEditor( + "StripTrailingWhitespace", self.stripWhitespaceCheckBox.isChecked()) - Preferences.setEditor("DefaultOpenFilter", + Preferences.setEditor( + "DefaultOpenFilter", self.openFilesFilterComboBox.currentText()) - Preferences.setEditor("DefaultSaveFilter", + Preferences.setEditor( + "DefaultSaveFilter", self.saveFilesFilterComboBox.currentText()) - Preferences.setEditor("AutomaticEOLConversion", + Preferences.setEditor( + "AutomaticEOLConversion", self.automaticEolConversionCheckBox.isChecked()) if self.crlfRadioButton.isChecked(): @@ -126,13 +136,16 @@ Preferences.setEditor("AdditionalOpenFilters", self.openFileFilters) Preferences.setEditor("AdditionalSaveFilters", self.saveFileFilters) - Preferences.setEditor("PreviewHtmlFileNameExtensions", + Preferences.setEditor( + "PreviewHtmlFileNameExtensions", [ext.strip() for ext in self.previewHtmlExtensionsEdit.text().split()]) - Preferences.setEditor("PreviewMarkdownFileNameExtensions", + Preferences.setEditor( + "PreviewMarkdownFileNameExtensions", [ext.strip() for ext in self.previewMarkdownExtensionsEdit.text().split()]) - Preferences.setEditor("PreviewRestFileNameExtensions", + Preferences.setEditor( + "PreviewRestFileNameExtensions", [ext.strip() for ext in self.previewRestExtensionsEdit.text().split()])
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -55,21 +55,29 @@ """ Public slot to save the Editor General configuration. """ - Preferences.setEditor("TabWidth", + Preferences.setEditor( + "TabWidth", self.tabwidthSlider.value()) - Preferences.setEditor("IndentWidth", + Preferences.setEditor( + "IndentWidth", self.indentwidthSlider.value()) - Preferences.setEditor("IndentationGuides", + Preferences.setEditor( + "IndentationGuides", self.indentguidesCheckBox.isChecked()) - Preferences.setEditor("TabForIndentation", + Preferences.setEditor( + "TabForIndentation", self.tabforindentationCheckBox.isChecked()) - Preferences.setEditor("TabIndents", + Preferences.setEditor( + "TabIndents", self.tabindentsCheckBox.isChecked()) - Preferences.setEditor("ConvertTabsOnLoad", + Preferences.setEditor( + "ConvertTabsOnLoad", self.converttabsCheckBox.isChecked()) - Preferences.setEditor("AutoIndentation", + Preferences.setEditor( + "AutoIndentation", self.autoindentCheckBox.isChecked()) - Preferences.setEditor("CommentColumn0", + Preferences.setEditor( + "CommentColumn0", self.comment0CheckBox.isChecked()) virtualSpaceOptions = QsciScintillaBase.SCVS_NONE
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -98,7 +98,8 @@ self.editorFileExtEdit.clear() self.editorLexerCombo.setCurrentIndex(0) self.pygmentsLexerCombo.setCurrentIndex(0) - self.editorLexerList.sortItems(self.editorLexerList.sortColumn(), + self.editorLexerList.sortItems( + self.editorLexerList.sortColumn(), self.editorLexerList.header().sortIndicatorOrder()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -34,8 +34,8 @@ self.__keywords = { "": ["", "", "", "", "", "", "", "", "", ""] } - languages = sorted([''] + \ - list(QScintilla.Lexers.getSupportedLanguages().keys())) + languages = sorted( + [''] + list(QScintilla.Lexers.getSupportedLanguages().keys())) for lang in languages: if lang: lex = QScintilla.Lexers.getLexer(lang)
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -277,195 +277,263 @@ Public slot to save the Editor Properties (1) configuration. """ # All - Preferences.setEditor("AllFoldCompact", + Preferences.setEditor( + "AllFoldCompact", self.allFoldCompactCheckBox.isChecked()) # Bash - Preferences.setEditor("BashFoldComment", + Preferences.setEditor( + "BashFoldComment", self.foldBashCommentCheckBox.isChecked()) # CMake - Preferences.setEditor("CMakeFoldAtElse", + Preferences.setEditor( + "CMakeFoldAtElse", self.cmakeFoldAtElseCheckBox.isChecked()) # C++ - Preferences.setEditor("CppFoldComment", + Preferences.setEditor( + "CppFoldComment", self.foldCppCommentCheckBox.isChecked()) - Preferences.setEditor("CppFoldPreprocessor", + Preferences.setEditor( + "CppFoldPreprocessor", self.foldCppPreprocessorCheckBox.isChecked()) - Preferences.setEditor("CppFoldAtElse", + Preferences.setEditor( + "CppFoldAtElse", self.foldCppAtElseCheckBox.isChecked()) - Preferences.setEditor("CppIndentOpeningBrace", + Preferences.setEditor( + "CppIndentOpeningBrace", self.cppIndentOpeningBraceCheckBox.isChecked()) - Preferences.setEditor("CppIndentClosingBrace", + Preferences.setEditor( + "CppIndentClosingBrace", self.cppIndentClosingBraceCheckBox.isChecked()) - Preferences.setEditor("CppCaseInsensitiveKeywords", + Preferences.setEditor( + "CppCaseInsensitiveKeywords", self.cppCaseInsensitiveCheckBox.isChecked()) - Preferences.setEditor("CppDollarsAllowed", + Preferences.setEditor( + "CppDollarsAllowed", self.cppDollarAllowedCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("CppStylePreprocessor", + Preferences.setEditor( + "CppStylePreprocessor", self.cppStylePreprocessorCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor("CppHighlightTripleQuotedStrings", + Preferences.setEditor( + "CppHighlightTripleQuotedStrings", self.cppHighlightTripleQuotedCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020700: - Preferences.setEditor("CppHighlightHashQuotedStrings", + Preferences.setEditor( + "CppHighlightHashQuotedStrings", self.cppHighlightHashQuotedCheckBox.isChecked()) # CSS - Preferences.setEditor("CssFoldComment", + Preferences.setEditor( + "CssFoldComment", self.foldCssCommentCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020700: - Preferences.setEditor("CssHssSupport", + Preferences.setEditor( + "CssHssSupport", self.cssHssCheckBox.isChecked()) - Preferences.setEditor("CssLessSupport", + Preferences.setEditor( + "CssLessSupport", self.cssLessCheckBox.isChecked()) - Preferences.setEditor("CssSassySupport", + Preferences.setEditor( + "CssSassySupport", self.cssSassyCheckBox.isChecked()) # D - Preferences.setEditor("DFoldComment", + Preferences.setEditor( + "DFoldComment", self.foldDCommentCheckBox.isChecked()) - Preferences.setEditor("DFoldAtElse", + Preferences.setEditor( + "DFoldAtElse", self.foldDAtElseCheckBox.isChecked()) - Preferences.setEditor("DIndentOpeningBrace", + Preferences.setEditor( + "DIndentOpeningBrace", self.dIndentOpeningBraceCheckBox.isChecked()) - Preferences.setEditor("DIndentClosingBrace", + Preferences.setEditor( + "DIndentClosingBrace", self.dIndentClosingBraceCheckBox.isChecked()) # HTML - Preferences.setEditor("HtmlFoldPreprocessor", + Preferences.setEditor( + "HtmlFoldPreprocessor", self.foldHtmlPreprocessorCheckBox.isChecked()) - Preferences.setEditor("HtmlCaseSensitiveTags", + Preferences.setEditor( + "HtmlCaseSensitiveTags", self.htmlCaseSensitiveTagsCheckBox.isChecked()) - Preferences.setEditor("HtmlFoldScriptComments", + Preferences.setEditor( + "HtmlFoldScriptComments", self.foldHtmlScriptCommentsCheckBox.isChecked()) - Preferences.setEditor("HtmlFoldScriptHeredocs", + Preferences.setEditor( + "HtmlFoldScriptHeredocs", self.foldHtmlScriptHereDocsCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("HtmlDjangoTemplates", + Preferences.setEditor( + "HtmlDjangoTemplates", self.htmlDjangoCheckBox.isChecked()) - Preferences.setEditor("HtmlMakoTemplates", + Preferences.setEditor( + "HtmlMakoTemplates", self.htmlMakoCheckBox.isChecked()) # Pascal if "Pascal" in self.languages: - Preferences.setEditor("PascalFoldComment", + Preferences.setEditor( + "PascalFoldComment", self.foldPascalCommentCheckBox.isChecked()) - Preferences.setEditor("PascalFoldPreprocessor", + Preferences.setEditor( + "PascalFoldPreprocessor", self.foldPascalPreprocessorCheckBox.isChecked()) - Preferences.setEditor("PascalSmartHighlighting", + Preferences.setEditor( + "PascalSmartHighlighting", self.pascalSmartHighlightingCheckBox.isChecked()) # Perl - Preferences.setEditor("PerlFoldComment", + Preferences.setEditor( + "PerlFoldComment", self.foldPerlCommentCheckBox.isChecked()) - Preferences.setEditor("PerlFoldPackages", + Preferences.setEditor( + "PerlFoldPackages", self.foldPerlPackagesCheckBox.isChecked()) - Preferences.setEditor("PerlFoldPODBlocks", + Preferences.setEditor( + "PerlFoldPODBlocks", self.foldPerlPODBlocksCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor("PerlFoldAtElse", + Preferences.setEditor( + "PerlFoldAtElse", self.foldPerlAtElseCheckBox.isChecked()) # PostScript if "PostScript" in self.languages: - Preferences.setEditor("PostScriptFoldAtElse", + Preferences.setEditor( + "PostScriptFoldAtElse", self.psFoldAtElseCheckBox.isChecked()) - Preferences.setEditor("PostScriptTokenize", + Preferences.setEditor( + "PostScriptTokenize", self.psMarkTokensCheckBox.isChecked()) - Preferences.setEditor("PostScriptLevel", + Preferences.setEditor( + "PostScriptLevel", self.psLevelSpinBox.value()) # Povray - Preferences.setEditor("PovFoldComment", + Preferences.setEditor( + "PovFoldComment", self.foldPovrayCommentCheckBox.isChecked()) - Preferences.setEditor("PovFoldDirectives", + Preferences.setEditor( + "PovFoldDirectives", self.foldPovrayDirectivesCheckBox.isChecked()) # Properties if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("PropertiesInitialSpaces", + Preferences.setEditor( + "PropertiesInitialSpaces", self.propertiesInitialSpacesCheckBox.isChecked()) # Python - Preferences.setEditor("PythonFoldComment", + Preferences.setEditor( + "PythonFoldComment", self.foldPythonCommentCheckBox.isChecked()) - Preferences.setEditor("PythonFoldString", + Preferences.setEditor( + "PythonFoldString", self.foldPythonStringCheckBox.isChecked()) - Preferences.setEditor("PythonBadIndentation", + Preferences.setEditor( + "PythonBadIndentation", self.pythonBadIndentationCheckBox.isChecked()) - Preferences.setEditor("PythonAutoIndent", + Preferences.setEditor( + "PythonAutoIndent", self.pythonAutoindentCheckBox.isChecked()) - Preferences.setEditor("PythonAllowV2Unicode", + Preferences.setEditor( + "PythonAllowV2Unicode", self.pythonV2UnicodeAllowedCheckBox.isChecked()) - Preferences.setEditor("PythonAllowV3Binary", + Preferences.setEditor( + "PythonAllowV3Binary", self.pythonV3BinaryAllowedCheckBox.isChecked()) - Preferences.setEditor("PythonAllowV3Bytes", + Preferences.setEditor( + "PythonAllowV3Bytes", self.pythonV3BytesAllowedCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("PythonFoldQuotes", + Preferences.setEditor( + "PythonFoldQuotes", self.foldPythonQuotesCheckBox.isChecked()) - Preferences.setEditor("PythonStringsOverNewLineAllowed", + Preferences.setEditor( + "PythonStringsOverNewLineAllowed", self.pythonStringsOverNewlineCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor("PythonHighlightSubidentifier", + Preferences.setEditor( + "PythonHighlightSubidentifier", self.pythonHighlightSubidentifierCheckBox.isChecked()) # Ruby if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("RubyFoldComment", + Preferences.setEditor( + "RubyFoldComment", self.foldRubyCommentCheckBox.isChecked()) # SQL - Preferences.setEditor("SqlFoldComment", + Preferences.setEditor( + "SqlFoldComment", self.foldSqlCommentCheckBox.isChecked()) - Preferences.setEditor("SqlBackslashEscapes", + Preferences.setEditor( + "SqlBackslashEscapes", self.sqlBackslashEscapesCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("SqlFoldAtElse", + Preferences.setEditor( + "SqlFoldAtElse", self.sqlFoldAtElseCheckBox.isChecked()) - Preferences.setEditor("SqlFoldOnlyBegin", + Preferences.setEditor( + "SqlFoldOnlyBegin", self.sqlFoldOnlyBeginCheckBox.isChecked()) - Preferences.setEditor("SqlDottedWords", + Preferences.setEditor( + "SqlDottedWords", self.sqlDottedWordsCheckBox.isChecked()) - Preferences.setEditor("SqlHashComments", + Preferences.setEditor( + "SqlHashComments", self.sqlHashCommentsCheckBox.isChecked()) - Preferences.setEditor("SqlQuotedIdentifiers", + Preferences.setEditor( + "SqlQuotedIdentifiers", self.sqlQuotedIdentifiersCheckBox.isChecked()) # TCL if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("TclFoldComment", + Preferences.setEditor( + "TclFoldComment", self.foldTclCommentCheckBox.isChecked()) # TeX if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor("TexFoldComment", + Preferences.setEditor( + "TexFoldComment", self.foldTexCommentCheckBox.isChecked()) - Preferences.setEditor("TexProcessComments", + Preferences.setEditor( + "TexProcessComments", self.texProcessCommentsCheckBox.isChecked()) - Preferences.setEditor("TexProcessIf", + Preferences.setEditor( + "TexProcessIf", self.texProcessIfCheckBox.isChecked()) # VHDL - Preferences.setEditor("VHDLFoldComment", + Preferences.setEditor( + "VHDLFoldComment", self.vhdlFoldCommentCheckBox.isChecked()) - Preferences.setEditor("VHDLFoldAtElse", + Preferences.setEditor( + "VHDLFoldAtElse", self.vhdlFoldAtElseCheckBox.isChecked()) - Preferences.setEditor("VHDLFoldAtBegin", + Preferences.setEditor( + "VHDLFoldAtBegin", self.vhdlFoldAtBeginCheckBox.isChecked()) - Preferences.setEditor("VHDLFoldAtParenthesis", + Preferences.setEditor( + "VHDLFoldAtParenthesis", self.vhdlFoldAtParenthesisCheckBox.isChecked()) # XML - Preferences.setEditor("XMLStyleScripts", + Preferences.setEditor( + "XMLStyleScripts", self.xmlSyleScriptsCheckBox.isChecked()) # YAML if "YAML" in self.languages: - Preferences.setEditor("YAMLFoldComment", + Preferences.setEditor( + "YAMLFoldComment", self.foldYamlCommentCheckBox.isChecked())
--- a/Preferences/ConfigurationPages/EditorSearchPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorSearchPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -38,21 +38,26 @@ self.markOccurrencesTimeoutSpinBox.setValue( Preferences.getEditor("MarkOccurrencesTimeout")) - self.initColour("SearchMarkers", self.searchMarkerButton, + self.initColour( + "SearchMarkers", self.searchMarkerButton, Preferences.getEditorColour, hasAlpha=True) def save(self): """ Public slot to save the Editor Search configuration. """ - Preferences.setEditor("SearchMarkersEnabled", + Preferences.setEditor( + "SearchMarkersEnabled", self.searchMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("QuickSearchMarkersEnabled", + Preferences.setEditor( + "QuickSearchMarkersEnabled", self.quicksearchMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("MarkOccurrencesEnabled", + Preferences.setEditor( + "MarkOccurrencesEnabled", self.occurrencesMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("MarkOccurrencesTimeout", + Preferences.setEditor( + "MarkOccurrencesTimeout", self.markOccurrencesTimeoutSpinBox.value()) self.saveColours(Preferences.setEditorColour)
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -56,7 +56,8 @@ self.minimumWordSizeSlider.setValue( Preferences.getEditor("SpellCheckingMinWordSize")) - self.initColour("SpellingMarkers", self.spellingMarkerButton, + self.initColour( + "SpellingMarkers", self.spellingMarkerButton, Preferences.getEditorColour, hasAlpha=True) self.pwlEdit.setText(
--- a/Preferences/ConfigurationPages/EditorSyntaxPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorSyntaxPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -45,17 +45,22 @@ """ Public slot to save the Editor Syntax Checker configuration. """ - Preferences.setEditor("OnlineSyntaxCheck", + Preferences.setEditor( + "OnlineSyntaxCheck", self.onlineCheckBox.isChecked()) - Preferences.setEditor("OnlineSyntaxCheckInterval", + Preferences.setEditor( + "OnlineSyntaxCheckInterval", self.onlineTimeoutSpinBox.value()) - Preferences.setEditor("AutoCheckSyntax", + Preferences.setEditor( + "AutoCheckSyntax", self.automaticSyntaxCheckCheckBox.isChecked()) # pyflakes related stuff - Preferences.setFlakes("IncludeInSyntaxCheck", + Preferences.setFlakes( + "IncludeInSyntaxCheck", self.includeCheckBox.isChecked()) - Preferences.setFlakes("IgnoreStarImportWarnings", + Preferences.setFlakes( + "IgnoreStarImportWarnings", self.ignoreStarImportCheckBox.isChecked())
--- a/Preferences/ConfigurationPages/EditorTypingPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorTypingPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -89,49 +89,70 @@ Public slot to save the Editor Typing configuration. """ # Python - Preferences.setEditorTyping("Python/EnabledTypingAids", + Preferences.setEditorTyping( + "Python/EnabledTypingAids", self.pythonGroup.isChecked()) - Preferences.setEditorTyping("Python/InsertClosingBrace", + Preferences.setEditorTyping( + "Python/InsertClosingBrace", self.pythonInsertClosingBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Python/SkipBrace", + Preferences.setEditorTyping( + "Python/SkipBrace", self.pythonSkipBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Python/IndentBrace", + Preferences.setEditorTyping( + "Python/IndentBrace", self.pythonIndentBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Python/InsertQuote", + Preferences.setEditorTyping( + "Python/InsertQuote", self.pythonInsertQuoteCheckBox.isChecked()) - Preferences.setEditorTyping("Python/DedentElse", + Preferences.setEditorTyping( + "Python/DedentElse", self.pythonDedentElseCheckBox.isChecked()) - Preferences.setEditorTyping("Python/DedentExcept", + Preferences.setEditorTyping( + "Python/DedentExcept", self.pythonDedentExceptCheckBox.isChecked()) - Preferences.setEditorTyping("Python/Py24StyleTry", + Preferences.setEditorTyping( + "Python/Py24StyleTry", self.pythonDedentExceptPy24CheckBox.isChecked()) - Preferences.setEditorTyping("Python/InsertImport", + Preferences.setEditorTyping( + "Python/InsertImport", self.pythonInsertImportCheckBox.isChecked()) - Preferences.setEditorTyping("Python/InsertSelf", + Preferences.setEditorTyping( + "Python/InsertSelf", self.pythonInsertSelfCheckBox.isChecked()) - Preferences.setEditorTyping("Python/InsertBlank", + Preferences.setEditorTyping( + "Python/InsertBlank", self.pythonInsertBlankCheckBox.isChecked()) - Preferences.setEditorTyping("Python/ColonDetection", + Preferences.setEditorTyping( + "Python/ColonDetection", self.pythonColonDetectionCheckBox.isChecked()) - Preferences.setEditorTyping("Python/DedentDef", + Preferences.setEditorTyping( + "Python/DedentDef", self.pythonDedentDefCheckBox.isChecked()) # Ruby - Preferences.setEditorTyping("Ruby/EnabledTypingAids", + Preferences.setEditorTyping( + "Ruby/EnabledTypingAids", self.rubyGroup.isChecked()) - Preferences.setEditorTyping("Ruby/InsertClosingBrace", + Preferences.setEditorTyping( + "Ruby/InsertClosingBrace", self.rubyInsertClosingBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/SkipBrace", + Preferences.setEditorTyping( + "Ruby/SkipBrace", self.rubySkipBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/IndentBrace", + Preferences.setEditorTyping( + "Ruby/IndentBrace", self.rubyIndentBraceCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/InsertQuote", + Preferences.setEditorTyping( + "Ruby/InsertQuote", self.rubyInsertQuoteCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/InsertBlank", + Preferences.setEditorTyping( + "Ruby/InsertBlank", self.rubyInsertBlankCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/InsertHereDoc", + Preferences.setEditorTyping( + "Ruby/InsertHereDoc", self.rubyInsertHereDocCheckBox.isChecked()) - Preferences.setEditorTyping("Ruby/InsertInlineDoc", + Preferences.setEditorTyping( + "Ruby/InsertInlineDoc", self.rubyInsertInlineDocCheckBox.isChecked()) @pyqtSlot(str)
--- a/Preferences/ConfigurationPages/EmailPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -50,21 +50,29 @@ """ Public slot to save the Email configuration. """ - Preferences.setUser("MailServer", + Preferences.setUser( + "MailServer", self.mailServerEdit.text()) - Preferences.setUser("MailServerPort", + Preferences.setUser( + "MailServerPort", self.portSpin.value()) - Preferences.setUser("Email", + Preferences.setUser( + "Email", self.emailEdit.text()) - Preferences.setUser("Signature", + Preferences.setUser( + "Signature", self.signatureEdit.toPlainText()) - Preferences.setUser("MailServerAuthentication", + Preferences.setUser( + "MailServerAuthentication", self.mailAuthenticationCheckBox.isChecked()) - Preferences.setUser("MailServerUser", + Preferences.setUser( + "MailServerUser", self.mailUserEdit.text()) - Preferences.setUser("MailServerPassword", + Preferences.setUser( + "MailServerPassword", self.mailPasswordEdit.text()) - Preferences.setUser("MailServerUseTLS", + Preferences.setUser( + "MailServerUseTLS", self.useTlsCheckBox.isChecked()) def __updateTestButton(self):
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Wed Oct 16 15:16:54 2013 +0200 @@ -90,7 +90,8 @@ Preferences.setHelp("StandardFont", self.standardFont) Preferences.setHelp("FixedFont", self.fixedFont) - Preferences.setHelp("AutoLoadImages", + Preferences.setHelp( + "AutoLoadImages", self.autoLoadImagesCheckBox.isChecked()) Preferences.setHelp("UserStyleSheet", self.styleSheetEdit.text()) @@ -99,10 +100,12 @@ from ..ConfigurationDialog import ConfigurationWidget if self.__displayMode == ConfigurationWidget.HelpBrowserMode: - Preferences.setUI("SingleCloseButton", + Preferences.setUI( + "SingleCloseButton", self.tabsCloseButtonCheckBox.isChecked()) - Preferences.setHelp("WarnOnMultipleClose", + Preferences.setHelp( + "WarnOnMultipleClose", self.warnOnMultipleCloseCheckBox.isChecked()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -69,19 +69,26 @@ """ Public slot to save the Help Documentation configuration. """ - Preferences.setHelp("Python2DocDir", + Preferences.setHelp( + "Python2DocDir", self.python2DocDirEdit.text()) - Preferences.setHelp("PythonDocDir", + Preferences.setHelp( + "PythonDocDir", self.pythonDocDirEdit.text()) - Preferences.setHelp("Qt4DocDir", + Preferences.setHelp( + "Qt4DocDir", self.qt4DocDirEdit.text()) - Preferences.setHelp("Qt5DocDir", + Preferences.setHelp( + "Qt5DocDir", self.qt5DocDirEdit.text()) - Preferences.setHelp("PyQt4DocDir", + Preferences.setHelp( + "PyQt4DocDir", self.pyqt4DocDirEdit.text()) - Preferences.setHelp("PyQt5DocDir", + Preferences.setHelp( + "PyQt5DocDir", self.pyqt5DocDirEdit.text()) - Preferences.setHelp("PySideDocDir", + Preferences.setHelp( + "PySideDocDir", self.pysideDocDirEdit.text()) @pyqtSlot() @@ -93,7 +100,8 @@ self, self.trUtf8("Select Python 2 documentation entry"), QUrl(self.python2DocDirEdit.text()).path(), - self.trUtf8("HTML Files (*.html *.htm);;" + self.trUtf8( + "HTML Files (*.html *.htm);;" "Compressed Help Files (*.chm);;" "All Files (*)")) @@ -109,7 +117,8 @@ self, self.trUtf8("Select Python 3 documentation entry"), QUrl(self.pythonDocDirEdit.text()).path(), - self.trUtf8("HTML Files (*.html *.htm);;" + self.trUtf8( + "HTML Files (*.html *.htm);;" "Compressed Help Files (*.chm);;" "All Files (*)"))
--- a/Preferences/ConfigurationPages/HelpInterfacePage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpInterfacePage.py Wed Oct 16 15:16:54 2013 +0200 @@ -44,7 +44,8 @@ styleIndex = self.styleComboBox.currentIndex() style = self.styleComboBox.itemData(styleIndex) Preferences.setUI("Style", style) - Preferences.setUI("StyleSheet", + Preferences.setUI( + "StyleSheet", self.styleSheetEdit.text()) def __populateStyleCombo(self):
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -66,7 +66,8 @@ elif self.customViewerButton.isChecked(): hvId = 4 Preferences.setHelp("HelpViewerType", hvId) - Preferences.setHelp("CustomViewer", + Preferences.setHelp( + "CustomViewer", self.customViewerEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -48,11 +48,14 @@ """ Public slot to save the VirusTotal configuration. """ - Preferences.setHelp("VirusTotalEnabled", + Preferences.setHelp( + "VirusTotalEnabled", self.vtEnabledCheckBox.isChecked()) - Preferences.setHelp("VirusTotalSecure", + Preferences.setHelp( + "VirusTotalSecure", self.vtSecureCheckBox.isChecked()) - Preferences.setHelp("VirusTotalServiceKey", + Preferences.setHelp( + "VirusTotalServiceKey", self.vtServiceKeyEdit.text()) @pyqtSlot(str)
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -159,57 +159,79 @@ """ Public slot to save the Help Viewers configuration. """ - Preferences.setHelp("SingleHelpWindow", + Preferences.setHelp( + "SingleHelpWindow", self.singleHelpWindowCheckBox.isChecked()) - Preferences.setHelp("SaveGeometry", + Preferences.setHelp( + "SaveGeometry", self.saveGeometryCheckBox.isChecked()) - Preferences.setHelp("WebSearchSuggestions", + Preferences.setHelp( + "WebSearchSuggestions", self.webSuggestionsCheckBox.isChecked()) - Preferences.setHelp("ShowPreview", + Preferences.setHelp( + "ShowPreview", self.showTabPreviews.isChecked()) - Preferences.setHelp("AccessKeysEnabled", + Preferences.setHelp( + "AccessKeysEnabled", self.accessKeysCheckBox.isChecked()) - Preferences.setHelp("JavaEnabled", + Preferences.setHelp( + "JavaEnabled", self.javaCheckBox.isChecked()) - Preferences.setHelp("JavaScriptEnabled", + Preferences.setHelp( + "JavaScriptEnabled", self.javaScriptCheckBox.isChecked()) - Preferences.setHelp("JavaScriptCanOpenWindows", + Preferences.setHelp( + "JavaScriptCanOpenWindows", self.jsOpenWindowsCheckBox.isChecked()) - Preferences.setHelp("JavaScriptCanAccessClipboard", + Preferences.setHelp( + "JavaScriptCanAccessClipboard", self.jsClipboardCheckBox.isChecked()) - Preferences.setHelp("PluginsEnabled", + Preferences.setHelp( + "PluginsEnabled", self.pluginsCheckBox.isChecked()) - Preferences.setHelp("ClickToFlashEnabled", + Preferences.setHelp( + "ClickToFlashEnabled", self.clickToFlashCheckBox.isChecked()) - Preferences.setHelp("DoNotTrack", + Preferences.setHelp( + "DoNotTrack", self.doNotTrackCheckBox.isChecked()) - Preferences.setHelp("SendReferer", + Preferences.setHelp( + "SendReferer", self.sendRefererCheckBox.isChecked()) - Preferences.setHelp("DiskCacheEnabled", + Preferences.setHelp( + "DiskCacheEnabled", self.diskCacheCheckBox.isChecked()) - Preferences.setHelp("DiskCacheSize", + Preferences.setHelp( + "DiskCacheSize", self.cacheSizeSpinBox.value()) if self.cacheKeepButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp( + "CachePolicy", QNetworkRequest.PreferNetwork) elif self.cachePreferButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp( + "CachePolicy", QNetworkRequest.PreferCache) elif self.cacheOfflineButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp( + "CachePolicy", QNetworkRequest.AlwaysCache) - Preferences.setHelp("PrintBackgrounds", + Preferences.setHelp( + "PrintBackgrounds", self.printBackgroundsCheckBox.isChecked()) - Preferences.setHelp("StartupBehavior", + Preferences.setHelp( + "StartupBehavior", self.startupCombo.currentIndex()) - Preferences.setHelp("HomePage", + Preferences.setHelp( + "HomePage", self.homePageEdit.text()) - Preferences.setHelp("DefaultScheme", + Preferences.setHelp( + "DefaultScheme", self.defaultSchemeCombo.currentText()) idx = self.expireHistory.currentIndex() @@ -238,16 +260,20 @@ Preferences.setHelp("SearchLanguage", language) if hasattr(QWebSettings, "SpatialNavigationEnabled"): - Preferences.setHelp("SpatialNavigationEnabled", + Preferences.setHelp( + "SpatialNavigationEnabled", self.spatialCheckBox.isChecked()) if hasattr(QWebSettings, "LinksIncludedInFocusChain"): - Preferences.setHelp("LinksIncludedInFocusChain", + Preferences.setHelp( + "LinksIncludedInFocusChain", self.linksInFocusChainCheckBox.isChecked()) if hasattr(QWebSettings, "XSSAuditingEnabled"): - Preferences.setHelp("XSSAuditingEnabled", + Preferences.setHelp( + "XSSAuditingEnabled", self.xssAuditingCheckBox.isChecked()) if hasattr(QWebSettings, "SiteSpecificQuirksEnabled"): - Preferences.setHelp("SiteSpecificQuirksEnabled", + Preferences.setHelp( + "SiteSpecificQuirksEnabled", self.quirksCheckBox.isChecked()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/IconsPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/IconsPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -76,7 +76,8 @@ @param txt the text of the directory edit (string) """ self.addIconDirectoryButton.setEnabled(txt != "") - self.showIconsButton.setEnabled(txt != "" or \ + self.showIconsButton.setEnabled( + txt != "" or \ self.iconDirectoryList.currentRow() != -1) @pyqtSlot()
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -31,5 +31,6 @@ dir = QDir(dirName) for icon in dir.entryList(["*.png"]): - QListWidgetItem(QIcon(os.path.join(dirName, icon)), + QListWidgetItem( + QIcon(os.path.join(dirName, icon)), icon, self.iconView)
--- a/Preferences/ConfigurationPages/InterfacePage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/InterfacePage.py Wed Oct 16 15:16:54 2013 +0200 @@ -103,7 +103,8 @@ self.tabsCloseButtonCheckBox.setChecked( Preferences.getUI("SingleCloseButton")) - self.initColour("LogStdErrColour", self.stderrTextColourButton, + self.initColour( + "LogStdErrColour", self.stderrTextColourButton, Preferences.getUI) self.delaySpinBox.setValue(Preferences.getUI("SidebarDelay")) @@ -118,34 +119,47 @@ Preferences.setUI("Style", style) # save the other UI related settings - Preferences.setUI("BrowsersListFoldersFirst", + Preferences.setUI( + "BrowsersListFoldersFirst", self.uiBrowsersListFoldersFirstCheckBox.isChecked()) - Preferences.setUI("BrowsersHideNonPublic", + Preferences.setUI( + "BrowsersHideNonPublic", self.uiBrowsersHideNonPublicCheckBox.isChecked()) - Preferences.setUI("BrowsersListContentsByOccurrence", + Preferences.setUI( + "BrowsersListContentsByOccurrence", self.uiBrowsersSortByOccurrenceCheckBox.isChecked()) - Preferences.setUI("BrowsersListHiddenFiles", + Preferences.setUI( + "BrowsersListHiddenFiles", self.uiBrowsersShowHiddenCheckBox.isChecked()) - Preferences.setUI("BrowsersFileFilters", + Preferences.setUI( + "BrowsersFileFilters", self.fileFiltersEdit.text()) - Preferences.setUI("LogViewerAutoRaise", + Preferences.setUI( + "LogViewerAutoRaise", self.lvAutoRaiseCheckBox.isChecked()) - Preferences.setUI("CaptionShowsFilename", + Preferences.setUI( + "CaptionShowsFilename", self.uiCaptionShowsFilenameGroupBox.isChecked()) - Preferences.setUI("CaptionFilenameLength", + Preferences.setUI( + "CaptionFilenameLength", self.filenameLengthSpinBox.value()) - Preferences.setUI("StyleSheet", + Preferences.setUI( + "StyleSheet", self.styleSheetEdit.text()) # save the dockarea corner settings - Preferences.setUI("TopLeftByLeft", + Preferences.setUI( + "TopLeftByLeft", self.tlLeftButton.isChecked()) - Preferences.setUI("BottomLeftByLeft", + Preferences.setUI( + "BottomLeftByLeft", self.blLeftButton.isChecked()) - Preferences.setUI("TopRightByRight", + Preferences.setUI( + "TopRightByRight", self.trRightButton.isChecked()) - Preferences.setUI("BottomRightByRight", + Preferences.setUI( + "BottomRightByRight", self.brRightButton.isChecked()) # save the language settings @@ -177,7 +191,8 @@ layout = (layout1, layout2, layout3) Preferences.setUILayout(layout) - Preferences.setUI("SingleCloseButton", + Preferences.setUI( + "SingleCloseButton", self.tabsCloseButtonCheckBox.isChecked()) Preferences.setUI("SidebarDelay", self.delaySpinBox.value())
--- a/Preferences/ConfigurationPages/IrcPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/IrcPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -153,7 +153,8 @@ "AutoUserInfoInterval", self.whoIntervalSpinBox.value()) # Markers - Preferences.setIrc("MarkPositionWhenHidden", + Preferences.setIrc( + "MarkPositionWhenHidden", self.markWhenHiddenCheckBox.isChecked()) # Shutdown
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -46,13 +46,17 @@ """ Public slot to save the Project configuration. """ - Preferences.setMultiProject("OpenMasterAutomatically", + Preferences.setMultiProject( + "OpenMasterAutomatically", self.openMasterAutomaticallyCheckBox.isChecked()) - Preferences.setMultiProject("XMLTimestamp", + Preferences.setMultiProject( + "XMLTimestamp", self.multiProjectTimestampCheckBox.isChecked()) - Preferences.setMultiProject("RecentNumber", + Preferences.setMultiProject( + "RecentNumber", self.multiProjectRecentSpinBox.value()) - Preferences.setMultiProject("Workspace", + Preferences.setMultiProject( + "Workspace", self.workspaceEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/NetworkPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/NetworkPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -110,9 +110,11 @@ """ Public slot to save the Networj configuration. """ - Preferences.setUI("DownloadPath", + Preferences.setUI( + "DownloadPath", self.downloadDirEdit.text()) - Preferences.setUI("RequestDownloadFilename", + Preferences.setUI( + "RequestDownloadFilename", self.requestFilenameCheckBox.isChecked()) from Helpviewer.Download.DownloadManager import DownloadManager if self.cleanupNeverButton.isChecked(): @@ -123,38 +125,51 @@ policy = DownloadManager.RemoveSuccessFullDownload Preferences.setHelp("DownloadManagerRemovePolicy", policy) - Preferences.setUI("UseProxy", + Preferences.setUI( + "UseProxy", self.proxyGroup.isChecked()) - Preferences.setUI("UseSystemProxy", + Preferences.setUI( + "UseSystemProxy", self.systemProxyButton.isChecked()) - Preferences.setUI("UseHttpProxyForAll", + Preferences.setUI( + "UseHttpProxyForAll", self.httpProxyForAllCheckBox.isChecked()) # HTTP proxy - Preferences.setUI("ProxyHost/Http", + Preferences.setUI( + "ProxyHost/Http", self.httpProxyHostEdit.text()) - Preferences.setUI("ProxyPort/Http", + Preferences.setUI( + "ProxyPort/Http", self.httpProxyPortSpin.value()) # HTTPS proxy - Preferences.setUI("ProxyHost/Https", + Preferences.setUI( + "ProxyHost/Https", self.httpsProxyHostEdit.text()) - Preferences.setUI("ProxyPort/Https", + Preferences.setUI( + "ProxyPort/Https", self.httpsProxyPortSpin.value()) # FTP proxy - Preferences.setUI("ProxyHost/Ftp", + Preferences.setUI( + "ProxyHost/Ftp", self.ftpProxyHostEdit.text()) - Preferences.setUI("ProxyPort/Ftp", + Preferences.setUI( + "ProxyPort/Ftp", self.ftpProxyPortSpin.value()) - Preferences.setUI("ProxyType/Ftp", + Preferences.setUI( + "ProxyType/Ftp", self.ftpProxyTypeCombo.itemData( self.ftpProxyTypeCombo.currentIndex())) - Preferences.setUI("ProxyUser/Ftp", + Preferences.setUI( + "ProxyUser/Ftp", self.ftpProxyUserEdit.text()) - Preferences.setUI("ProxyPassword/Ftp", + Preferences.setUI( + "ProxyPassword/Ftp", self.ftpProxyPasswordEdit.text()) - Preferences.setUI("ProxyAccount/Ftp", + Preferences.setUI( + "ProxyAccount/Ftp", self.ftpProxyAccountEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -45,9 +45,11 @@ """ Public slot to save the Viewmanager configuration. """ - Preferences.setPluginManager("ActivateExternal", + Preferences.setPluginManager( + "ActivateExternal", self.activateExternalPluginsCheckBox.isChecked()) - Preferences.setPluginManager("DownloadPath", + Preferences.setPluginManager( + "DownloadPath", self.downloadDirEdit.text()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/PrinterPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/PrinterPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -55,7 +55,8 @@ """ Public slot to save the Printer configuration. """ - Preferences.setPrinter("PrinterName", + Preferences.setPrinter( + "PrinterName", self.printerNameEdit.text()) if self.printerColorButton.isChecked(): Preferences.setPrinter("ColorMode", 1) @@ -65,16 +66,21 @@ Preferences.setPrinter("FirstPageFirst", 1) else: Preferences.setPrinter("FirstPageFirst", 0) - Preferences.setPrinter("Magnification", + Preferences.setPrinter( + "Magnification", self.printMagnificationSpinBox.value()) Preferences.setPrinter("HeaderFont", self.printheaderFont) - Preferences.setPrinter("LeftMargin", + Preferences.setPrinter( + "LeftMargin", self.leftMarginSpinBox.value()) - Preferences.setPrinter("RightMargin", + Preferences.setPrinter( + "RightMargin", self.rightMarginSpinBox.value()) - Preferences.setPrinter("TopMargin", + Preferences.setPrinter( + "TopMargin", self.topMarginSpinBox.value()) - Preferences.setPrinter("BottomMargin", + Preferences.setPrinter( + "BottomMargin", self.bottomMarginSpinBox.value()) @pyqtSlot()
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -44,7 +44,8 @@ except KeyError: self.pbGroup.setEnabled(False) - self.initColour("Highlighted", self.pbHighlightedButton, + self.initColour( + "Highlighted", self.pbHighlightedButton, Preferences.getProjectBrowserColour) self.followEditorCheckBox.setChecked( @@ -62,13 +63,17 @@ """ self.saveColours(Preferences.setProjectBrowserColour) - Preferences.setProject("FollowEditor", + Preferences.setProject( + "FollowEditor", self.followEditorCheckBox.isChecked()) - Preferences.setProject("FollowCursorLine", + Preferences.setProject( + "FollowCursorLine", self.followCursorLineCheckBox.isChecked()) - Preferences.setProject("AutoPopulateItems", + Preferences.setProject( + "AutoPopulateItems", self.autoPopulateCheckBox.isChecked()) - Preferences.setProject("HideGeneratedForms", + Preferences.setProject( + "HideGeneratedForms", self.hideGeneratedCheckBox.isChecked()) if self.pbGroup.isEnabled():
--- a/Preferences/ConfigurationPages/ProjectPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/ProjectPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -60,34 +60,48 @@ """ Public slot to save the Project configuration. """ - Preferences.setProject("SearchNewFilesRecursively", + Preferences.setProject( + "SearchNewFilesRecursively", self.projectSearchNewFilesRecursiveCheckBox.isChecked()) - Preferences.setProject("SearchNewFiles", + Preferences.setProject( + "SearchNewFiles", self.projectSearchNewFilesCheckBox.isChecked()) - Preferences.setProject("AutoIncludeNewFiles", + Preferences.setProject( + "AutoIncludeNewFiles", self.projectAutoIncludeNewFilesCheckBox.isChecked()) - Preferences.setProject("AutoLoadSession", + Preferences.setProject( + "AutoLoadSession", self.projectLoadSessionCheckBox.isChecked()) - Preferences.setProject("AutoSaveSession", + Preferences.setProject( + "AutoSaveSession", self.projectSaveSessionCheckBox.isChecked()) - Preferences.setProject("SessionAllBreakpoints", + Preferences.setProject( + "SessionAllBreakpoints", self.projectSessionAllBpCheckBox.isChecked()) - Preferences.setProject("AutoLoadDbgProperties", + Preferences.setProject( + "AutoLoadDbgProperties", self.projectLoadDebugPropertiesCheckBox.isChecked()) - Preferences.setProject("AutoSaveDbgProperties", + Preferences.setProject( + "AutoSaveDbgProperties", self.projectSaveDebugPropertiesCheckBox.isChecked()) - Preferences.setProject("AutoCompileForms", + Preferences.setProject( + "AutoCompileForms", self.projectAutoCompileFormsCheckBox.isChecked()) - Preferences.setProject("AutoCompileResources", + Preferences.setProject( + "AutoCompileResources", self.projectAutoCompileResourcesCheckBox.isChecked()) - Preferences.setProject("XMLTimestamp", + Preferences.setProject( + "XMLTimestamp", self.projectTimestampCheckBox.isChecked()) - Preferences.setProject("RecentNumber", + Preferences.setProject( + "RecentNumber", self.projectRecentSpinBox.value()) - Preferences.setProject("DeterminePyFromProject", + Preferences.setProject( + "DeterminePyFromProject", self.pythonVariantCheckBox.isChecked()) - Preferences.setTasks("TasksProjectAutoSave", + Preferences.setTasks( + "TasksProjectAutoSave", self.autosaveTasksCheckBox.isChecked())
--- a/Preferences/ConfigurationPages/PythonPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/PythonPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -57,9 +57,11 @@ enc = "utf-8" Preferences.setSystem("IOEncoding", enc) - Preferences.setDebugger("PythonExtensions", + Preferences.setDebugger( + "PythonExtensions", self.py2ExtensionsEdit.text()) - Preferences.setDebugger("Python3Extensions", + Preferences.setDebugger( + "Python3Extensions", self.py3ExtensionsEdit.text())
--- a/Preferences/ConfigurationPages/SecurityPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/SecurityPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -54,12 +54,15 @@ """ Public slot to save the Help Viewers configuration. """ - Preferences.setUser("SavePasswords", + Preferences.setUser( + "SavePasswords", self.savePasswordsCheckBox.isChecked()) - Preferences.setUser("UseMasterPassword", + Preferences.setUser( + "UseMasterPassword", self.masterPasswordCheckBox.isChecked()) if self.dnsPrefetchCheckBox.isEnabled(): - Preferences.setHelp("DnsPrefetchEnabled", + Preferences.setHelp( + "DnsPrefetchEnabled", self.dnsPrefetchCheckBox.isChecked()) if self.__oldUseMasterPassword != \ @@ -77,7 +80,8 @@ from .MasterPasswordEntryDialog import MasterPasswordEntryDialog dlg = MasterPasswordEntryDialog("", self) if dlg.exec_() == QDialog.Accepted: - Preferences.setUser("MasterPassword", + Preferences.setUser( + "MasterPassword", dlg.getMasterPassword()) self.masterPasswordButton.setEnabled(True) self.__newPassword = dlg.getMasterPassword() @@ -96,7 +100,8 @@ dlg = MasterPasswordEntryDialog( Preferences.getUser("MasterPassword"), self) if dlg.exec_() == QDialog.Accepted: - Preferences.setUser("MasterPassword", + Preferences.setUser( + "MasterPassword", dlg.getMasterPassword()) if self.__oldUseMasterPassword != \
--- a/Preferences/ConfigurationPages/ShellPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/ShellPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -54,23 +54,31 @@ """ Public slot to save the Shell configuration. """ - Preferences.setShell("LinenoMargin", + Preferences.setShell( + "LinenoMargin", self.shellLinenoCheckBox.isChecked()) - Preferences.setShell("WrapEnabled", + Preferences.setShell( + "WrapEnabled", self.shellWordWrapCheckBox.isChecked()) - Preferences.setShell("AutoCompletionEnabled", + Preferences.setShell( + "AutoCompletionEnabled", self.shellACEnabledCheckBox.isChecked()) - Preferences.setShell("CallTipsEnabled", + Preferences.setShell( + "CallTipsEnabled", self.shellCTEnabledCheckBox.isChecked()) - Preferences.setShell("SyntaxHighlightingEnabled", + Preferences.setShell( + "SyntaxHighlightingEnabled", self.shellSyntaxHighlightingCheckBox.isChecked()) - Preferences.setShell("MaxHistoryEntries", + Preferences.setShell( + "MaxHistoryEntries", self.shellHistorySpinBox.value()) - Preferences.setShell("ShowStdOutErr", + Preferences.setShell( + "ShowStdOutErr", self.stdOutErrCheckBox.isChecked()) Preferences.setShell("MonospacedFont", self.monospacedFont) - Preferences.setShell("UseMonospacedFont", + Preferences.setShell( + "UseMonospacedFont", self.monospacedCheckBox.isChecked()) Preferences.setShell("MarginsFont", self.marginsFont)
--- a/Preferences/ConfigurationPages/TasksPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/TasksPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -35,13 +35,17 @@ self.tasksMarkerNoteEdit.setText( Preferences.getTasks("TasksNoteMarkers")) - self.initColour("TasksFixmeColor", self.tasksFixmeColourButton, + self.initColour( + "TasksFixmeColor", self.tasksFixmeColourButton, Preferences.getTasks) - self.initColour("TasksWarningColor", self.tasksWarningColourButton, + self.initColour( + "TasksWarningColor", self.tasksWarningColourButton, Preferences.getTasks) - self.initColour("TasksTodoColor", self.tasksTodoColourButton, + self.initColour( + "TasksTodoColor", self.tasksTodoColourButton, Preferences.getTasks) - self.initColour("TasksNoteColor", self.tasksNoteColourButton, + self.initColour( + "TasksNoteColor", self.tasksNoteColourButton, Preferences.getTasks) self.clearCheckBox.setChecked(Preferences.getTasks("ClearOnFileClose"))
--- a/Preferences/ConfigurationPages/TemplatesPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/TemplatesPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -41,14 +41,17 @@ """ Public slot to save the Templates configuration. """ - Preferences.setTemplates("AutoOpenGroups", + Preferences.setTemplates( + "AutoOpenGroups", self.templatesAutoOpenGroupsCheckBox.isChecked()) sepChar = self.templatesSeparatorCharEdit.text() if sepChar: Preferences.setTemplates("SeparatorChar", sepChar) - Preferences.setTemplates("SingleDialog", + Preferences.setTemplates( + "SingleDialog", self.templatesSingleDialogButton.isChecked()) - Preferences.setTemplates("ShowTooltip", + Preferences.setTemplates( + "ShowTooltip", self.templatesToolTipCheckBox.isChecked())
--- a/Preferences/ConfigurationPages/VcsPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/VcsPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -38,34 +38,46 @@ self.autoUpdateCheckBox.setChecked( Preferences.getVCS("AutoUpdate")) - self.initColour("VcsAdded", self.pbVcsAddedButton, + self.initColour( + "VcsAdded", self.pbVcsAddedButton, Preferences.getProjectBrowserColour) - self.initColour("VcsConflict", self.pbVcsConflictButton, + self.initColour( + "VcsConflict", self.pbVcsConflictButton, Preferences.getProjectBrowserColour) - self.initColour("VcsModified", self.pbVcsModifiedButton, + self.initColour( + "VcsModified", self.pbVcsModifiedButton, Preferences.getProjectBrowserColour) - self.initColour("VcsReplaced", self.pbVcsReplacedButton, + self.initColour( + "VcsReplaced", self.pbVcsReplacedButton, Preferences.getProjectBrowserColour) - self.initColour("VcsUpdate", self.pbVcsUpdateButton, + self.initColour( + "VcsUpdate", self.pbVcsUpdateButton, Preferences.getProjectBrowserColour) - self.initColour("VcsRemoved", self.pbVcsRemovedButton, + self.initColour( + "VcsRemoved", self.pbVcsRemovedButton, Preferences.getProjectBrowserColour) def save(self): """ Public slot to save the VCS configuration. """ - Preferences.setVCS("AutoClose", + Preferences.setVCS( + "AutoClose", self.vcsAutoCloseCheckBox.isChecked()) - Preferences.setVCS("AutoSaveFiles", + Preferences.setVCS( + "AutoSaveFiles", self.vcsAutoSaveCheckBox.isChecked()) - Preferences.setVCS("AutoSaveProject", + Preferences.setVCS( + "AutoSaveProject", self.vcsAutoSaveProjectCheckBox.isChecked()) - Preferences.setVCS("StatusMonitorInterval", + Preferences.setVCS( + "StatusMonitorInterval", self.vcsStatusMonitorIntervalSpinBox.value()) - Preferences.setVCS("MonitorLocalStatus", + Preferences.setVCS( + "MonitorLocalStatus", self.vcsMonitorLocalStatusCheckBox.isChecked()) - Preferences.setVCS("AutoUpdate", + Preferences.setVCS( + "AutoUpdate", self.autoUpdateCheckBox.isChecked()) self.saveColours(Preferences.setProjectBrowserColour)
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ConfigurationPages/ViewmanagerPage.py Wed Oct 16 15:16:54 2013 +0200 @@ -59,14 +59,17 @@ """ Public slot to save the Viewmanager configuration. """ - vm = \ - self.windowComboBox.itemData(self.windowComboBox.currentIndex()) + vm = self.windowComboBox.itemData( + self.windowComboBox.currentIndex()) Preferences.setViewManager(vm) - Preferences.setUI("TabViewManagerFilenameLength", + Preferences.setUI( + "TabViewManagerFilenameLength", self.filenameLengthSpinBox.value()) - Preferences.setUI("TabViewManagerFilenameOnly", + Preferences.setUI( + "TabViewManagerFilenameOnly", self.filenameOnlyCheckBox.isChecked()) - Preferences.setUI("RecentNumber", + Preferences.setUI( + "RecentNumber", self.recentFilesSpinBox.value()) @pyqtSlot(int)
--- a/Preferences/PreferencesLexer.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/PreferencesLexer.py Wed Oct 16 15:16:54 2013 +0200 @@ -22,9 +22,9 @@ """ Constructor """ - self._errorMessage = \ - QApplication.translate("PreferencesLexerError", - "Unspecific PreferencesLexer error.") + self._errorMessage = QApplication.translate( + "PreferencesLexerError", + "Unspecific PreferencesLexer error.") def __repr__(self): """ @@ -54,9 +54,9 @@ @param language lexer language (string) """ PreferencesLexerError.__init__(self) - self._errorMessage = \ - QApplication.translate("PreferencesLexerError", - 'Unsupported Lexer Language: {0}').format(language) + self._errorMessage = QApplication.translate( + "PreferencesLexerError", + 'Unsupported Lexer Language: {0}').format(language) class PreferencesLexer(QsciLexer):
--- a/Preferences/ProgramsDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ProgramsDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -87,34 +87,40 @@ 'lrelease', -1) # 1b. Qt Designer if Utilities.isWindowsPlatform(): - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), "{0}.exe".format(Utilities.generateQtToolName("designer"))) elif Utilities.isMacPlatform(): exe = Utilities.getQtMacBundle("designer") else: - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), Utilities.generateQtToolName("designer")) self.__createProgramEntry( self.trUtf8("Qt Designer"), exe, version=version) # 1c. Qt Linguist if Utilities.isWindowsPlatform(): - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), "{0}.exe".format(Utilities.generateQtToolName("linguist"))) elif Utilities.isMacPlatform(): exe = Utilities.getQtMacBundle("linguist") else: - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), Utilities.generateQtToolName("linguist")) self.__createProgramEntry( self.trUtf8("Qt Linguist"), exe, version=version) # 1d. Qt Assistant if Utilities.isWindowsPlatform(): - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), "{0}.exe".format(Utilities.generateQtToolName("assistant"))) elif Utilities.isMacPlatform(): exe = Utilities.getQtMacBundle("assistant") else: - exe = os.path.join(Utilities.getQtBinariesPath(), + exe = os.path.join( + Utilities.getQtBinariesPath(), Utilities.generateQtToolName("assistant")) self.__createProgramEntry( self.trUtf8("Qt Assistant"), exe, version=version) @@ -170,11 +176,13 @@ # 4. do the Ruby programs # 4a. Forms Compiler for Qt4 - self.__createProgramEntry(self.trUtf8("Forms Compiler (Ruby, Qt4)"), + self.__createProgramEntry( + self.trUtf8("Forms Compiler (Ruby, Qt4)"), Utilities.isWindowsPlatform() and "rbuic4.exe" or "rbuic4", '-version', 'Qt', -1) # 4b. Resource Compiler for Qt4 - self.__createProgramEntry(self.trUtf8("Resource Compiler (Ruby, Qt4)"), + self.__createProgramEntry( + self.trUtf8("Resource Compiler (Ruby, Qt4)"), Utilities.isWindowsPlatform() and "rbrcc.exe" or "rbrcc", '-version', 'Ruby Resource Compiler', -1) @@ -183,8 +191,8 @@ exe = Preferences.getCorba("omniidl") if Utilities.isWindowsPlatform(): exe += ".exe" - self.__createProgramEntry(self.trUtf8("CORBA IDL Compiler"), exe, - '-V', 'omniidl', -1) + self.__createProgramEntry( + self.trUtf8("CORBA IDL Compiler"), exe, '-V', 'omniidl', -1) # 6. do the spell checking entry try:
--- a/Preferences/ShortcutDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ShortcutDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -168,8 +168,10 @@ self.__setKeyEditText( QKeySequence(self.keys[0], self.keys[1]).toString()) elif self.keyIndex == 3: - self.__setKeyEditText(QKeySequence(self.keys[0], self.keys[1], + self.__setKeyEditText(QKeySequence( + self.keys[0], self.keys[1], self.keys[2]).toString()) elif self.keyIndex == 4: - self.__setKeyEditText(QKeySequence(self.keys[0], self.keys[1], + self.__setKeyEditText(QKeySequence( + self.keys[0], self.keys[1], self.keys[2], self.keys[3]).toString())
--- a/Preferences/Shortcuts.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/Shortcuts.py Wed Oct 16 15:16:54 2013 +0200 @@ -267,47 +267,47 @@ """ if "Project" in shortcuts: __setAction(e5App().getObject("Project").getActions(), - shortcuts["Project"]) + shortcuts["Project"]) if "General" in shortcuts: __setAction(e5App().getObject("UserInterface").getActions('ui'), - shortcuts["General"]) + shortcuts["General"]) if "Wizards" in shortcuts: __setAction(e5App().getObject("UserInterface").getActions('wizards'), - shortcuts["Wizards"]) + shortcuts["Wizards"]) if "Debug" in shortcuts: __setAction(e5App().getObject("DebugUI").getActions(), - shortcuts["Debug"]) + shortcuts["Debug"]) if "Edit" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('edit'), - shortcuts["Edit"]) + shortcuts["Edit"]) if "File" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('file'), - shortcuts["File"]) + shortcuts["File"]) if "Search" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('search'), - shortcuts["Search"]) + shortcuts["Search"]) if "View" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('view'), - shortcuts["View"]) + shortcuts["View"]) if "Macro" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('macro'), - shortcuts["Macro"]) + shortcuts["Macro"]) if "Bookmarks" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('bookmark'), - shortcuts["Bookmarks"]) + shortcuts["Bookmarks"]) if "Spelling" in shortcuts: __setAction(e5App().getObject("ViewManager").getActions('spelling'), - shortcuts["Spelling"]) + shortcuts["Spelling"]) if "Window" in shortcuts: actions = e5App().getObject("ViewManager").getActions('window') @@ -321,4 +321,4 @@ if "HelpViewer" in shortcuts: __setAction(e5App().getObject("DummyHelpViewer").getActions(), - shortcuts["HelpViewer"]) + shortcuts["HelpViewer"])
--- a/Preferences/ShortcutsDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ShortcutsDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -60,7 +60,8 @@ """ Private method to resort the tree. """ - self.shortcutsList.sortItems(self.shortcutsList.sortColumn(), + self.shortcutsList.sortItems( + self.shortcutsList.sortColumn(), self.shortcutsList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -94,7 +95,8 @@ @keyparam objectType type of the object (string). Objects of the same type are not checked for duplicate shortcuts. """ - itm = QTreeWidgetItem(category, + itm = QTreeWidgetItem( + category, [action.iconText(), action.shortcut().toString(), action.alternateShortcut().toString()]) itm.setIcon(0, action.icon()) @@ -381,27 +383,38 @@ """ Private slot to handle the OK button press. """ - self.__saveCategoryActions(self.projectItem, + self.__saveCategoryActions( + self.projectItem, e5App().getObject("Project").getActions()) - self.__saveCategoryActions(self.uiItem, + self.__saveCategoryActions( + self.uiItem, e5App().getObject("UserInterface").getActions('ui')) - self.__saveCategoryActions(self.wizardsItem, + self.__saveCategoryActions( + self.wizardsItem, e5App().getObject("UserInterface").getActions('wizards')) - self.__saveCategoryActions(self.debugItem, + self.__saveCategoryActions( + self.debugItem, e5App().getObject("DebugUI").getActions()) - self.__saveCategoryActions(self.editItem, + self.__saveCategoryActions( + self.editItem, e5App().getObject("ViewManager").getActions('edit')) - self.__saveCategoryActions(self.fileItem, + self.__saveCategoryActions( + self.fileItem, e5App().getObject("ViewManager").getActions('file')) - self.__saveCategoryActions(self.searchItem, + self.__saveCategoryActions( + self.searchItem, e5App().getObject("ViewManager").getActions('search')) - self.__saveCategoryActions(self.viewItem, + self.__saveCategoryActions( + self.viewItem, e5App().getObject("ViewManager").getActions('view')) - self.__saveCategoryActions(self.macroItem, + self.__saveCategoryActions( + self.macroItem, e5App().getObject("ViewManager").getActions('macro')) - self.__saveCategoryActions(self.bookmarkItem, + self.__saveCategoryActions( + self.bookmarkItem, e5App().getObject("ViewManager").getActions('bookmark')) - self.__saveCategoryActions(self.spellingItem, + self.__saveCategoryActions( + self.spellingItem, e5App().getObject("ViewManager").getActions('spelling')) actions = e5App().getObject("ViewManager").getActions('window') @@ -414,7 +427,8 @@ if ref is not None and hasattr(ref, "getActions"): self.__saveCategoryActions(categoryItem, ref.getActions()) - self.__saveCategoryActions(self.helpViewerItem, + self.__saveCategoryActions( + self.helpViewerItem, e5App().getObject("DummyHelpViewer").getActions()) Shortcuts.saveShortcuts()
--- a/Preferences/ToolConfigurationDialog.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/ToolConfigurationDialog.py Wed Oct 16 15:16:54 2013 +0200 @@ -100,7 +100,8 @@ E5MessageBox.critical( self, self.trUtf8("Add tool entry"), - self.trUtf8("You have to set an executable to add to the" + self.trUtf8( + "You have to set an executable to add to the" " Tools-Menu first.")) return @@ -108,7 +109,8 @@ E5MessageBox.critical( self, self.trUtf8("Add tool entry"), - self.trUtf8("You have to insert a menuentry text to add the" + self.trUtf8( + "You have to insert a menuentry text to add the" " selected program to the Tools-Menu first.")) return @@ -116,7 +118,8 @@ E5MessageBox.critical( self, self.trUtf8("Add tool entry"), - self.trUtf8("The selected file could not be found or" + self.trUtf8( + "The selected file could not be found or" " is not an executable." " Please choose an executable filename.")) return @@ -159,7 +162,8 @@ E5MessageBox.critical( self, self.trUtf8("Change tool entry"), - self.trUtf8("You have to set an executable to change the" + self.trUtf8( + "You have to set an executable to change the" " Tools-Menu entry.")) return @@ -167,7 +171,8 @@ E5MessageBox.critical( self, self.trUtf8("Change tool entry"), - self.trUtf8("You have to insert a menuentry text to change the" + self.trUtf8( + "You have to insert a menuentry text to change the" " selected Tools-Menu entry.")) return @@ -175,7 +180,8 @@ E5MessageBox.critical( self, self.trUtf8("Change tool entry"), - self.trUtf8("The selected file could not be found or" + self.trUtf8( + "The selected file could not be found or" " is not an executable." " Please choose an existing executable filename.")) return @@ -269,7 +275,8 @@ E5MessageBox.critical( self, self.trUtf8("Select executable"), - self.trUtf8("The selected file is not an executable." + self.trUtf8( + "The selected file is not an executable." " Please choose an executable filename.")) return
--- a/Preferences/__init__.py Tue Oct 15 19:13:32 2013 +0200 +++ b/Preferences/__init__.py Wed Oct 16 15:16:54 2013 +0200 @@ -1175,7 +1175,8 @@ None, QCoreApplication.translate("Preferences", "Export Preferences"), "", - QCoreApplication.translate("Preferences", + QCoreApplication.translate( + "Preferences", "Properties File (*.ini);;All Files (*)"), None, E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) @@ -1202,7 +1203,8 @@ None, QCoreApplication.translate("Preferences", "Import Preferences"), "", - QCoreApplication.translate("Preferences", + QCoreApplication.translate( + "Preferences", "Properties File (*.ini);;All Files (*)")) if filename: settingsFile = prefClass.settings.fileName() @@ -1239,10 +1241,10 @@ @param prefClass preferences class used as the storage area @return a tuple defining the variables filter """ - localsFilter = eval(prefClass.settings.value("Variables/LocalsFilter", - prefClass.varDefaults["LocalsFilter"])) - globalsFilter = eval(prefClass.settings.value("Variables/GlobalsFilter", - prefClass.varDefaults["GlobalsFilter"])) + localsFilter = eval(prefClass.settings.value( + "Variables/LocalsFilter", prefClass.varDefaults["LocalsFilter"])) + globalsFilter = eval(prefClass.settings.value( + "Variables/GlobalsFilter", prefClass.varDefaults["GlobalsFilter"])) return (localsFilter, globalsFilter) @@ -1276,20 +1278,20 @@ "SuppressClientExit", "BreakAlways", "AutoViewSourceCode", ]: - return toBool(prefClass.settings.value("Debugger/" + key, - prefClass.debuggerDefaults[key])) + return toBool(prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key])) elif key in ["PassiveDbgPort"]: return int( - prefClass.settings.value("Debugger/" + key, - prefClass.debuggerDefaults[key])) + prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key])) elif key in ["AllowedHosts"]: return toList( - prefClass.settings.value("Debugger/" + key, - prefClass.debuggerDefaults[key])) + prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key])) elif key == "PythonInterpreter": interpreter = \ - prefClass.settings.value("Debugger/" + key, - prefClass.debuggerDefaults[key]) + prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key]) if not interpreter: interpreters = findPython2Interpreters() if interpreters: @@ -1298,9 +1300,10 @@ else: selection, ok = QInputDialog.getItem( None, - QCoreApplication.translate("Preferences", - "Select Python2 Interpreter"), - QCoreApplication.translate("Preferences", + QCoreApplication.translate( + "Preferences", "Select Python2 Interpreter"), + QCoreApplication.translate( + "Preferences", "Select the Python2 interpreter to be used:"), interpreters, 0, False) @@ -1310,8 +1313,8 @@ setDebugger("PythonInterpreter", interpreter) return interpreter else: - return prefClass.settings.value("Debugger/" + key, - prefClass.debuggerDefaults[key]) + return prefClass.settings.value( + "Debugger/" + key, prefClass.debuggerDefaults[key]) def setDebugger(key, value, prefClass=Prefs): @@ -1391,16 +1394,16 @@ @return the UI layout as a tuple of main layout, flag for an embedded shell and a value for an embedded file browser """ - layoutType = prefClass.settings.value("UI/LayoutType", - prefClass.uiDefaults["LayoutType"]) + layoutType = prefClass.settings.value( + "UI/LayoutType", prefClass.uiDefaults["LayoutType"]) if layoutType in ["DockWindows", "FloatingWindows"]: # change old fashioned layouts to the modern default layoutType = prefClass.uiDefaults["LayoutType"] layout = (layoutType, - int(prefClass.settings.value("UI/LayoutShellEmbedded", - prefClass.uiDefaults["LayoutShellEmbedded"])), - int(prefClass.settings.value("UI/LayoutFileBrowserEmbedded", - prefClass.uiDefaults["LayoutFileBrowserEmbedded"])), + int(prefClass.settings.value("UI/LayoutShellEmbedded", + prefClass.uiDefaults["LayoutShellEmbedded"])), + int(prefClass.settings.value("UI/LayoutFileBrowserEmbedded", + prefClass.uiDefaults["LayoutFileBrowserEmbedded"])), ) return layout @@ -1424,8 +1427,8 @@ @param prefClass preferences class used as the storage area @return the viewmanager type """ - return prefClass.settings.value("UI/ViewManager", - prefClass.uiDefaults["ViewManager"]) + return prefClass.settings.value( + "UI/ViewManager", prefClass.uiDefaults["ViewManager"]) def setViewManager(vm, prefClass=Prefs): @@ -1459,15 +1462,15 @@ "RequestDownloadFilename", "LayoutShellEmbedded", "LayoutFileBrowserEmbedded", "CheckErrorLog", "NotificationsEnabled"]: - return toBool(prefClass.settings.value("UI/" + key, - prefClass.uiDefaults[key])) + return toBool(prefClass.settings.value( + "UI/" + key, prefClass.uiDefaults[key])) elif key in ["TabViewManagerFilenameLength", "CaptionFilenameLength", "ProxyPort/Http", "ProxyPort/Https", "ProxyPort/Ftp", "ProxyType/Ftp", "OpenOnStartup", "PerformVersionCheck", "RecentNumber", "NotificationTimeout", "SidebarDelay"]: - return int(prefClass.settings.value("UI/" + key, - prefClass.uiDefaults[key])) + return int(prefClass.settings.value( + "UI/" + key, prefClass.uiDefaults[key])) elif key in ["ProxyPassword/Http", "ProxyPassword/Https", "ProxyPassword/Ftp", ]: from Utilities.crypto import pwConvert @@ -1631,17 +1634,17 @@ @return the requested UI setting """ if key in ["AutoStartServer", "TryOtherPorts", "AutoAcceptConnections"]: - return toBool(prefClass.settings.value("Cooperation/" + key, - prefClass.cooperationDefaults[key])) + return toBool(prefClass.settings.value( + "Cooperation/" + key, prefClass.cooperationDefaults[key])) elif key in ["ServerPort", "MaxPortsToTry"]: - return int(prefClass.settings.value("Cooperation/" + key, - prefClass.cooperationDefaults[key])) + return int(prefClass.settings.value( + "Cooperation/" + key, prefClass.cooperationDefaults[key])) elif key in ["BannedUsers"]: - return toList(prefClass.settings.value("Cooperation/" + key, - prefClass.cooperationDefaults[key])) + return toList(prefClass.settings.value( + "Cooperation/" + key, prefClass.cooperationDefaults[key])) else: - return prefClass.settings.value("Cooperation/" + key, - prefClass.cooperationDefaults[key]) + return prefClass.settings.value( + "Cooperation/" + key, prefClass.cooperationDefaults[key]) def setCooperation(key, value, prefClass=Prefs): @@ -1666,8 +1669,8 @@ if key in ["DefaultEncoding", "DefaultOpenFilter", "DefaultSaveFilter", "SpellCheckingDefaultLanguage", "SpellCheckingPersonalWordList", "SpellCheckingPersonalExcludeList"]: - return prefClass.settings.value("Editor/" + key, - prefClass.editorDefaults[key]) + return prefClass.settings.value( + "Editor/" + key, prefClass.editorDefaults[key]) elif key in ["AutosaveInterval", "TabWidth", "IndentWidth", "FoldingStyle", "WarnFilesize", "EdgeMode", "EdgeColumn", "CaretWidth", "AutoCompletionSource", @@ -1678,17 +1681,17 @@ "OnlineSyntaxCheckInterval", "OnlineChangeTraceInterval", "WrapLongLinesMode", "WrapVisualFlag", "CallTipsPosition", "VirtualSpaceOptions"]: - return int(prefClass.settings.value("Editor/" + key, - prefClass.editorDefaults[key])) + return int(prefClass.settings.value( + "Editor/" + key, prefClass.editorDefaults[key])) elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters", "PreviewMarkdownFileNameExtensions", "PreviewRestFileNameExtensions", "PreviewHtmlFileNameExtensions"]: - return toList(prefClass.settings.value("Editor/" + key, - prefClass.editorDefaults[key])) + return toList(prefClass.settings.value( + "Editor/" + key, prefClass.editorDefaults[key])) else: - return toBool(prefClass.settings.value("Editor/" + key, - prefClass.editorDefaults[key])) + return toBool(prefClass.settings.value( + "Editor/" + key, prefClass.editorDefaults[key])) def setEditor(key, value, prefClass=Prefs): @@ -1752,8 +1755,8 @@ @return the requested editor font (QFont) """ f = QFont() - f.fromString(prefClass.settings.value("Editor/Other Fonts/" + key, - prefClass.editorOtherFontsDefaults[key])) + f.fromString(prefClass.settings.value( + "Editor/Other Fonts/" + key, prefClass.editorOtherFontsDefaults[key])) return f @@ -1874,8 +1877,8 @@ if key not in assocs: prefClass.settings.remove("Editor/LexerAssociations/" + key) for key in assocs: - prefClass.settings.setValue("Editor/LexerAssociations/" + key, - assocs[key]) + prefClass.settings.setValue( + "Editor/LexerAssociations/" + key, assocs[key]) def getEditorLexerAssoc(filename, prefClass=Prefs): @@ -1902,8 +1905,8 @@ @param prefClass preferences class used as the storage area @return the requested editor setting """ - return toBool(prefClass.settings.value("Editor/Typing/" + key, - prefClass.editorTypingDefaults[key])) + return toBool(prefClass.settings.value( + "Editor/Typing/" + key, prefClass.editorTypingDefaults[key])) def setEditorTyping(key, value, prefClass=Prefs): @@ -1927,22 +1930,22 @@ """ if key in ["RTF/Font"]: f = QFont() - f.fromString(prefClass.settings.value("Editor/Exporters/" + key, - prefClass.editorExporterDefaults[key])) + f.fromString(prefClass.settings.value( + "Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) return f elif key in ["HTML/WYSIWYG", "HTML/Folding", "HTML/OnlyStylesUsed", "HTML/FullPathAsTitle", "HTML/UseTabs", "RTF/WYSIWYG", "RTF/UseTabs", "TeX/OnlyStylesUsed", "TeX/FullPathAsTitle", "ODT/WYSIWYG", "ODT/OnlyStylesUsed", "ODT/UseTabs"]: - return toBool(prefClass.settings.value("Editor/Exporters/" + key, - prefClass.editorExporterDefaults[key])) + return toBool(prefClass.settings.value( + "Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) elif key in ["PDF/Magnification", "PDF/MarginLeft", "PDF/MarginRight", "PDF/MarginTop", "PDF/MarginBottom"]: - return int(prefClass.settings.value("Editor/Exporters/" + key, - prefClass.editorExporterDefaults[key])) + return int(prefClass.settings.value( + "Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) else: - return prefClass.settings.value("Editor/Exporters/" + key, - prefClass.editorExporterDefaults[key]) + return prefClass.settings.value( + "Editor/Exporters/" + key, prefClass.editorExporterDefaults[key]) def setEditorExporter(key, value, prefClass=Prefs): @@ -1954,8 +1957,8 @@ @param prefClass preferences class used as the storage area """ if key in ["RTF/Font"]: - prefClass.settings.setValue("Editor/Exporters/" + key, - value.toString()) + prefClass.settings.setValue( + "Editor/Exporters/" + key, value.toString()) else: prefClass.settings.setValue("Editor/Exporters/" + key, value) @@ -1969,22 +1972,22 @@ @return the requested printer setting """ if key in ["ColorMode", "FirstPageFirst"]: - return toBool(prefClass.settings.value("Printer/" + key, - prefClass.printerDefaults[key])) + return toBool(prefClass.settings.value( + "Printer/" + key, prefClass.printerDefaults[key])) elif key in ["Magnification", "Orientation", "PageSize"]: - return int(prefClass.settings.value("Printer/" + key, - prefClass.printerDefaults[key])) + return int(prefClass.settings.value( + "Printer/" + key, prefClass.printerDefaults[key])) elif key in ["LeftMargin", "RightMargin", "TopMargin", "BottomMargin"]: - return float(prefClass.settings.value("Printer/" + key, - prefClass.printerDefaults[key])) + return float(prefClass.settings.value( + "Printer/" + key, prefClass.printerDefaults[key])) elif key in ["HeaderFont"]: f = QFont() - f.fromString(prefClass.settings.value("Printer/" + key, - prefClass.printerDefaults[key])) + f.fromString(prefClass.settings.value( + "Printer/" + key, prefClass.printerDefaults[key])) return f else: - return prefClass.settings.value("Printer/" + key, - prefClass.printerDefaults[key]) + return prefClass.settings.value( + "Printer/" + key, prefClass.printerDefaults[key]) def setPrinter(key, value, prefClass=Prefs): @@ -2011,15 +2014,15 @@ """ if key in ["MonospacedFont", "MarginsFont"]: f = QFont() - f.fromString(prefClass.settings.value("Shell/" + key, - prefClass.shellDefaults[key])) + f.fromString(prefClass.settings.value( + "Shell/" + key, prefClass.shellDefaults[key])) return f elif key in ["MaxHistoryEntries"]: - return int(prefClass.settings.value("Shell/" + key, - prefClass.shellDefaults[key])) + return int(prefClass.settings.value( + "Shell/" + key, prefClass.shellDefaults[key])) else: - return toBool(prefClass.settings.value("Shell/" + key, - prefClass.shellDefaults[key])) + return toBool(prefClass.settings.value( + "Shell/" + key, prefClass.shellDefaults[key])) def setShell(key, value, prefClass=Prefs): @@ -2045,11 +2048,11 @@ @return the requested project setting """ if key in ["RecentNumber"]: - return int(prefClass.settings.value("Project/" + key, - prefClass.projectDefaults[key])) + return int(prefClass.settings.value( + "Project/" + key, prefClass.projectDefaults[key])) else: - return toBool(prefClass.settings.value("Project/" + key, - prefClass.projectDefaults[key])) + return toBool(prefClass.settings.value( + "Project/" + key, prefClass.projectDefaults[key])) def setProject(key, value, prefClass=Prefs): @@ -2076,8 +2079,8 @@ except KeyError: default = AllBrowsersFlag - return int(prefClass.settings.value("Project/BrowserFlags/" + key, - default)) + return int(prefClass.settings.value( + "Project/BrowserFlags/" + key, default)) def setProjectBrowserFlags(key, value, prefClass=Prefs): @@ -2147,14 +2150,14 @@ @return the requested project setting """ if key in ["RecentNumber"]: - return int(prefClass.settings.value("MultiProject/" + key, - prefClass.multiProjectDefaults[key])) + return int(prefClass.settings.value( + "MultiProject/" + key, prefClass.multiProjectDefaults[key])) elif key in ["OpenMasterAutomatically", "XMLTimestamp"]: - return toBool(prefClass.settings.value("MultiProject/" + key, - prefClass.multiProjectDefaults[key])) + return toBool(prefClass.settings.value( + "MultiProject/" + key, prefClass.multiProjectDefaults[key])) else: - return prefClass.settings.value("MultiProject/" + key, - prefClass.multiProjectDefaults[key]) + return prefClass.settings.value( + "MultiProject/" + key, prefClass.multiProjectDefaults[key]) def setMultiProject(key, value, prefClass=Prefs): @@ -2175,8 +2178,8 @@ @param prefClass preferences class used as the storage area @return the requested Qt4DocDir setting (string) """ - s = prefClass.settings.value("Help/Qt4DocDir", - prefClass.helpDefaults["Qt4DocDir"]) + s = prefClass.settings.value( + "Help/Qt4DocDir", prefClass.helpDefaults["Qt4DocDir"]) if s == "": s = os.getenv("QT4DOCDIR", "") if s == "": @@ -2192,8 +2195,8 @@ @param prefClass preferences class used as the storage area @return the requested Qt4DocDir setting (string) """ - s = prefClass.settings.value("Help/Qt5DocDir", - prefClass.helpDefaults["Qt5DocDir"]) + s = prefClass.settings.value( + "Help/Qt5DocDir", prefClass.helpDefaults["Qt5DocDir"]) if s == "": s = os.getenv("QT5DOCDIR", "") if s == "": @@ -2215,8 +2218,8 @@ if key in ["StandardFont", "FixedFont"]: f = QFont() - f.fromString(prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key])) + f.fromString(prefClass.settings.value( + "Help/" + key, prefClass.helpDefaults[key])) return f elif key in ["SaveUrlColor"]: col = prefClass.settings.value("Help/" + key) @@ -2264,8 +2267,8 @@ return feeds elif key in ["SyncFtpPassword", "SyncEncryptionKey"]: from Utilities.crypto import pwConvert - return pwConvert(prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key]), encode=False) + return pwConvert(prefClass.settings.value( + "Help/" + key, prefClass.helpDefaults[key]), encode=False) elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies", "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", "OfflineStorageDatabaseQuota", @@ -2273,8 +2276,8 @@ "DownloadManagerRemovePolicy", "AdBlockUpdatePeriod", "SearchLanguage", "SyncType", "SyncFtpPort", "SyncFtpIdleTimeout", "SyncEncryptionKeyLength"]: - return int(prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key])) + return int(prefClass.settings.value( + "Help/" + key, prefClass.helpDefaults[key])) elif key in ["SingleHelpWindow", "SaveGeometry", "WebSearchSuggestions", "DiskCacheEnabled", "FilterTrackingCookies", "PrintBackgrounds", "AdBlockEnabled", "AutoLoadImages", @@ -2294,13 +2297,13 @@ "SyncEncryptPasswordsOnly", "WarnOnMultipleClose", "ClickToFlashEnabled" ]: - return toBool(prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key])) + return toBool(prefClass.settings.value( + "Help/" + key, prefClass.helpDefaults[key])) elif key in ["AdBlockSubscriptions", "AdBlockExceptions", "ClickToFlashWhitelist", "SendRefererWhitelist", "GreaseMonkeyDisabledScripts", "NoCacheHosts"]: - return toList(prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key])) + return toList(prefClass.settings.value( + "Help/" + key, prefClass.helpDefaults[key])) else: return prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key]) @@ -2372,8 +2375,8 @@ """ from Utilities import supportedCodecs if key in ["StringEncoding", "IOEncoding"]: - encoding = prefClass.settings.value("System/" + key, - prefClass.sysDefaults[key]) + encoding = prefClass.settings.value( + "System/" + key, prefClass.sysDefaults[key]) if encoding not in supportedCodecs: encoding = prefClass.sysDefaults[key] return encoding @@ -2397,8 +2400,8 @@ @param prefClass preferences class used as the storage area @return the requested Qt4TranslationsDir setting (string) """ - s = prefClass.settings.value("Qt/Qt4TranslationsDir", - prefClass.qtDefaults["Qt4TranslationsDir"]) + s = prefClass.settings.value( + "Qt/Qt4TranslationsDir", prefClass.qtDefaults["Qt4TranslationsDir"]) if s == "": s = os.getenv("QT4TRANSLATIONSDIR", "") if s == "": @@ -2443,8 +2446,8 @@ @param prefClass preferences class used as the storage area @return the requested corba setting """ - return prefClass.settings.value("Corba/" + key, - prefClass.corbaDefaults[key]) + return prefClass.settings.value( + "Corba/" + key, prefClass.corbaDefaults[key]) def setCorba(key, value, prefClass=Prefs): @@ -2468,19 +2471,19 @@ """ if key == "MailServerPassword": from Utilities.crypto import pwConvert - return pwConvert(prefClass.settings.value("User/" + key, - prefClass.userDefaults[key]), encode=False) + return pwConvert(prefClass.settings.value( + "User/" + key, prefClass.userDefaults[key]), encode=False) elif key in ["MailServerPort"]: - return int(prefClass.settings.value("User/" + key, - prefClass.userDefaults[key])) + return int(prefClass.settings.value( + "User/" + key, prefClass.userDefaults[key])) elif key in ["MailServerAuthentication", "MailServerUseTLS", "UseSystemEmailClient", "UseMasterPassword", "SavePasswords"]: - return toBool(prefClass.settings.value("User/" + key, - prefClass.userDefaults[key])) + return toBool(prefClass.settings.value( + "User/" + key, prefClass.userDefaults[key])) else: - return prefClass.settings.value("User/" + key, - prefClass.userDefaults[key]) + return prefClass.settings.value( + "User/" + key, prefClass.userDefaults[key]) def setUser(key, value, prefClass=Prefs): @@ -2512,11 +2515,11 @@ @return the requested user setting """ if key in ["StatusMonitorInterval"]: - return int(prefClass.settings.value("VCS/" + key, - prefClass.vcsDefaults[key])) + return int(prefClass.settings.value( + "VCS/" + key, prefClass.vcsDefaults[key])) else: - return toBool(prefClass.settings.value("VCS/" + key, - prefClass.vcsDefaults[key])) + return toBool(prefClass.settings.value( + "VCS/" + key, prefClass.vcsDefaults[key])) def setVCS(key, value, prefClass=Prefs): @@ -2546,11 +2549,11 @@ else: return prefClass.tasksDefaults[key] elif key in ["ClearOnFileClose", "TasksProjectAutoSave"]: - return toBool(prefClass.settings.value("Tasks/" + key, - prefClass.tasksDefaults[key])) + return toBool(prefClass.settings.value( + "Tasks/" + key, prefClass.tasksDefaults[key])) else: - return prefClass.settings.value("Tasks/" + key, - prefClass.tasksDefaults[key]) + return prefClass.settings.value( + "Tasks/" + key, prefClass.tasksDefaults[key]) def setTasks(key, value, prefClass=Prefs): @@ -2577,11 +2580,11 @@ @return the requested user setting """ if key in ["SeparatorChar"]: - return prefClass.settings.value("Templates/" + key, - prefClass.templatesDefaults[key]) + return prefClass.settings.value( + "Templates/" + key, prefClass.templatesDefaults[key]) else: - return toBool(prefClass.settings.value("Templates/" + key, - prefClass.templatesDefaults[key])) + return toBool(prefClass.settings.value( + "Templates/" + key, prefClass.templatesDefaults[key])) def setTemplates(key, value, prefClass=Prefs): @@ -2604,11 +2607,11 @@ @return the requested user setting """ if key in ["DownloadPath"]: - return prefClass.settings.value("PluginManager/" + key, - prefClass.pluginManagerDefaults[key]) + return prefClass.settings.value( + "PluginManager/" + key, prefClass.pluginManagerDefaults[key]) else: - return toBool(prefClass.settings.value("PluginManager/" + key, - prefClass.pluginManagerDefaults[key])) + return toBool(prefClass.settings.value( + "PluginManager/" + key, prefClass.pluginManagerDefaults[key])) def setPluginManager(key, value, prefClass=Prefs): @@ -2631,8 +2634,8 @@ @return the requested user setting """ if key in ["Font"]: - font = prefClass.settings.value("Graphics/" + key, - prefClass.graphicsDefaults[key]) + font = prefClass.settings.value( + "Graphics/" + key, prefClass.graphicsDefaults[key]) if isinstance(font, QFont): # workaround for an old bug in eric < 4.4 return font @@ -2641,8 +2644,8 @@ f.fromString(font) return f else: - return prefClass.settings.value("Graphics/" + key, - prefClass.graphicsDefaults[key]) + return prefClass.settings.value( + "Graphics/" + key, prefClass.graphicsDefaults[key]) def setGraphics(key, value, prefClass=Prefs): @@ -2667,8 +2670,8 @@ @param prefClass preferences class used as the storage area @return the requested user setting """ - return prefClass.settings.value("IconEditor/" + key, - prefClass.iconEditorDefaults[key]) + return prefClass.settings.value( + "IconEditor/" + key, prefClass.iconEditorDefaults[key]) def setIconEditor(key, value, prefClass=Prefs): @@ -2692,10 +2695,10 @@ """ if key in ["IncludeInSyntaxCheck", "IgnoreStarImportWarnings"]: return toBool(prefClass.settings.value("Py3Flakes/" + key, - prefClass.py3flakesDefaults[key])) + prefClass.py3flakesDefaults[key])) else: - return prefClass.settings.value("Py3Flakes/" + key, - prefClass.py3flakesDefaults[key]) + return prefClass.settings.value( + "Py3Flakes/" + key, prefClass.py3flakesDefaults[key]) def setFlakes(key, value, prefClass=Prefs): @@ -2717,8 +2720,8 @@ @param prefClass preferences class used as the storage area @return the requested user setting """ - return prefClass.settings.value("TrayStarter/" + key, - prefClass.trayStarterDefaults[key]) + return prefClass.settings.value( + "TrayStarter/" + key, prefClass.trayStarterDefaults[key]) def setTrayStarter(key, value, prefClass=Prefs): @@ -2744,14 +2747,14 @@ "NotifyJoinPart", "NotifyMessage", "NotifyNick", "EnableIrcColours", "AutoUserInfoLookup", "MarkPositionWhenHidden", "AskOnShutdown"]: - return toBool(prefClass.settings.value("IRC/" + key, - prefClass.ircDefaults[key])) + return toBool(prefClass.settings.value( + "IRC/" + key, prefClass.ircDefaults[key])) elif key in ["AutoUserInfoMax", "AutoUserInfoInterval"]: - return int(prefClass.settings.value("IRC/" + key, - prefClass.ircDefaults[key])) + return int(prefClass.settings.value( + "IRC/" + key, prefClass.ircDefaults[key])) else: - return prefClass.settings.value("IRC/" + key, - prefClass.ircDefaults[key]) + return prefClass.settings.value( + "IRC/" + key, prefClass.ircDefaults[key]) def setIrc(key, value, prefClass=Prefs): @@ -2774,7 +2777,8 @@ @return the requested geometry setting """ if key in ["MainMaximized"]: - return toBool(prefClass.settings.value("Geometry/" + key, + return toBool(prefClass.settings.value( + "Geometry/" + key, prefClass.geometryDefaults[key])) else: v = prefClass.settings.value("Geometry/" + key) @@ -2829,7 +2833,8 @@ """ if prefClass.resetLayout: for key in list(prefClass.geometryDefaults.keys()): - prefClass.settings.setValue("Geometry/" + key, + prefClass.settings.setValue( + "Geometry/" + key, prefClass.geometryDefaults[key])
