diff -r 10516539f238 -r 0a02c433f52d Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py --- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Nov 01 15:48:48 2013 +0100 @@ -103,10 +103,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)) @@ -211,7 +211,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): @@ -395,7 +396,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -711,7 +713,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getCommitableItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Commit"), self.trUtf8("""There are no entries selected to be""" """ committed.""")) @@ -750,7 +753,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getUnversionedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add"), self.trUtf8("""There are no unversioned entries""" """ available/selected.""")) @@ -771,7 +775,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -794,7 +799,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -811,7 +817,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Differences"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -831,13 +838,15 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) return elif len(names) > 1: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""Only one file with uncommitted changes""" """ must be selected.""")) @@ -852,7 +861,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.unlockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Lock"), self.trUtf8("""There are no unlocked files""" """ available/selected.""")) @@ -868,7 +878,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.lockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Unlock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -885,7 +896,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Break Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -902,7 +914,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Steal Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -918,7 +931,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getNonChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected not """ @@ -936,7 +950,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected belonging"""