Mercurial Repositories > eric / changeset
changeset
Continued to shorten the code lines to max. 79 characters.
Thu, 10 Oct 2013 19:24:20 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 10 Oct 2013 19:24:20 +0200
- changeset 3005
- 3953ddfb991d
- parent 3004
- c4bf32c791d0
- child 3006
- 66b769f458c9
Continued to shorten the code lines to max. 79 characters.
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Thu Oct 10 19:24:20 2013 +0200 @@ -10,8 +10,8 @@ import os from PyQt4.QtCore import pyqtSignal, QFileInfo, QEvent, Qt -from PyQt4.QtGui import QStackedWidget, QSplitter, QListWidget, QListWidgetItem, \ - QSizePolicy, QMenu, QApplication +from PyQt4.QtGui import QStackedWidget, QSplitter, QListWidget, \ + QListWidgetItem, QSizePolicy, QMenu, QApplication from ViewManager.ViewManager import ViewManager @@ -126,7 +126,8 @@ def firstEditor(self): """ - Public method to retrieve the first editor in the list of managed editors. + Public method to retrieve the first editor in the list of managed + editors. @return first editor in list (QScintilla.Editor.Editor) """ @@ -144,21 +145,24 @@ @signal editorOpened(str) emitted after an editor window was opened @signal editorOpenedEd(Editor) emitted after an editor window was opened @signal editorClosed(str) emitted just before an editor window gets closed - @signal editorClosedEd(Editor) emitted just before an editor window gets closed + @signal editorClosedEd(Editor) emitted just before an editor window gets + closed @signal editorSaved(str) emitted after an editor window was saved @signal checkActions(Editor) emitted when some actions should be checked - for their status - @signal cursorChanged(Editor) emitted after the cursor position of the active - window has changed + for their status + @signal cursorChanged(Editor) emitted after the cursor position of the + active window has changed @signal breakpointToggled(Editor) emitted when a breakpoint is toggled. @signal bookmarkToggled(Editor) emitted when a bookmark is toggled. @signal syntaxerrorToggled(Editor) emitted when a syntax error is toggled. - @signal previewStateChanged(bool) emitted to signal a change in the preview state + @signal previewStateChanged(bool) emitted to signal a change in the + preview state @signal editorLanguageChanged(Editor) emitted to signal a change of an - editors language - @signal editorTextChanged(Editor) emitted to signal a change of an editor's text - @signal editorLineChanged(str,int) emitted to signal a change of an editor's - current line (line is given one based) + editors language + @signal editorTextChanged(Editor) emitted to signal a change of an + editor's text + @signal editorLineChanged(str,int) emitted to signal a change of an + editor's current line (line is given one based) """ changeCaption = pyqtSignal(str) editorChanged = pyqtSignal(str) @@ -224,9 +228,11 @@ self.__menu.addAction(UI.PixmapCache.getIcon("tabClose.png"), self.trUtf8('Close'), self.__contextMenuClose) self.closeOthersMenuAct = self.__menu.addAction( - UI.PixmapCache.getIcon("tabCloseOther.png"), self.trUtf8("Close Others"), + UI.PixmapCache.getIcon("tabCloseOther.png"), + self.trUtf8("Close Others"), self.__contextMenuCloseOthers) - self.__menu.addAction(self.trUtf8('Close All'), self.__contextMenuCloseAll) + self.__menu.addAction( + self.trUtf8('Close All'), self.__contextMenuCloseAll) self.__menu.addSeparator() self.saveMenuAct = \ self.__menu.addAction(UI.PixmapCache.getIcon("fileSave.png"), @@ -243,7 +249,8 @@ self.__menu.addAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__contextMenuPrintFile) self.__menu.addSeparator() - self.copyPathAct = self.__menu.addAction(self.trUtf8("Copy Path to Clipboard"), + self.copyPathAct = self.__menu.addAction( + self.trUtf8("Copy Path to Clipboard"), self.__contextMenuCopyPathToClipboard) def __showMenu(self, point): @@ -260,16 +267,19 @@ self.contextMenuEditor = self.editors[row] self.contextMenuIndex = row if self.contextMenuEditor: - self.saveMenuAct.setEnabled(self.contextMenuEditor.isModified()) + self.saveMenuAct.setEnabled( + self.contextMenuEditor.isModified()) fileName = self.contextMenuEditor.getFileName() self.copyPathAct.setEnabled(bool(fileName)) if fileName: rej = "{0}.rej".format(fileName) - self.openRejectionsMenuAct.setEnabled(os.path.exists(rej)) + self.openRejectionsMenuAct.setEnabled( + os.path.exists(rej)) else: self.openRejectionsMenuAct.setEnabled(False) - self.closeOthersMenuAct.setEnabled(self.viewlist.count() > 1) + self.closeOthersMenuAct.setEnabled( + self.viewlist.count() > 1) self.__menu.popup(self.viewlist.mapToGlobal(point)) @@ -474,7 +484,8 @@ def _initWindowActions(self): """ - Protected method to define the user interface actions for window handling. + Protected method to define the user interface actions for window + handling. """ pass @@ -507,13 +518,17 @@ currentRow = self.viewlist.currentRow() index = self.editors.index(editor) if m: - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("fileModified.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("fileModified.png")) elif editor.hasSyntaxErrors(): - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("syntaxError.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("syntaxError.png")) elif editor.hasFlakesWarnings(): - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("warning.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("warning.png")) else: - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("empty.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("empty.png")) self.viewlist.setCurrentRow(currentRow) self._checkActions(editor) @@ -526,13 +541,17 @@ currentRow = self.viewlist.currentRow() index = self.editors.index(editor) if editor.hasSyntaxErrors(): - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("syntaxError.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("syntaxError.png")) elif editor.hasFlakesWarnings(): - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("warning.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("warning.png")) elif editor.isModified(): - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("fileModified.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("fileModified.png")) else: - self.viewlist.item(index).setIcon(UI.PixmapCache.getIcon("empty.png")) + self.viewlist.item(index).setIcon( + UI.PixmapCache.getIcon("empty.png")) self.viewlist.setCurrentRow(currentRow) ViewManager._syntaxErrorToggled(self, editor) @@ -552,7 +571,8 @@ size = self.stackArea.width() else: size = self.stackArea.height() - self.stackArea.setSizes([int(size / len(self.stacks))] * len(self.stacks)) + self.stackArea.setSizes( + [int(size / len(self.stacks))] * len(self.stacks)) self.splitRemoveAct.setEnabled(True) self.nextSplitAct.setEnabled(True) self.prevSplitAct.setEnabled(True) @@ -680,7 +700,8 @@ def __contextMenuOpenRejections(self): """ - Private slot to open a rejections file associated with the selected editor. + Private slot to open a rejections file associated with the selected + editor. """ if self.contextMenuEditor: fileName = self.contextMenuEditor.getFileName() @@ -698,7 +719,8 @@ def __contextMenuCopyPathToClipboard(self): """ - Private method to copy the file name of the selected editor to the clipboard. + Private method to copy the file name of the selected editor to the + clipboard. """ if self.contextMenuEditor: fn = self.contextMenuEditor.getFileName() @@ -726,7 +748,8 @@ self.changeCaption.emit(fn) if not self.__inRemoveView: self.editorChanged.emit(fn) - self.editorLineChanged.emit(fn, editor.getCursorPosition()[0] + 1) + self.editorLineChanged.emit( + fn, editor.getCursorPosition()[0] + 1) else: self.changeCaption.emit("") self.editorChangedEd.emit(editor) @@ -767,7 +790,8 @@ self.changeCaption.emit(fn) if switched: self.editorChanged.emit(fn) - self.editorLineChanged.emit(fn, aw.getCursorPosition()[0] + 1) + self.editorLineChanged.emit( + fn, aw.getCursorPosition()[0] + 1) else: self.changeCaption.emit("") self.editorChangedEd.emit(aw)
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Thu Oct 10 19:24:20 2013 +0200 @@ -9,9 +9,10 @@ import os -from PyQt4.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, QMimeData, Qt -from PyQt4.QtGui import QWidget, QColor, QHBoxLayout, QDrag, QPixmap, QSplitter, \ - QTabBar, QApplication, QToolButton, QMenu, QLabel +from PyQt4.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, \ + QMimeData, Qt +from PyQt4.QtGui import QWidget, QColor, QHBoxLayout, QDrag, QPixmap, \ + QSplitter, QTabBar, QApplication, QToolButton, QMenu, QLabel from E5Gui.E5Application import e5App @@ -35,11 +36,11 @@ """ Class implementing a customized tab bar supporting drag & drop. - @signal tabMoveRequested(int, int) emitted to signal a tab move request giving - the old and new index position - @signal tabRelocateRequested(str, int, int) emitted to signal a tab relocation - request giving the string encoded id of the old tab widget, the index in - the old tab widget and the new index position + @signal tabMoveRequested(int, int) emitted to signal a tab move request + giving the old and new index position + @signal tabRelocateRequested(str, int, int) emitted to signal a tab + relocation request giving the string encoded id of the old tab widget, + the index in the old tab widget and the new index position @signal tabCopyRequested(str, int, int) emitted to signal a clone request giving the string encoded id of the source tab widget, the index in the source tab widget and the new index position @@ -86,8 +87,9 @@ mimeData.setText(self.tabText(index)) mimeData.setData("action", "tab-reordering") mimeData.setData("tabbar-id", str(id(self))) - mimeData.setData("source-index", - QByteArray.number(self.tabAt(self.__dragStartPos))) + mimeData.setData( + "source-index", + QByteArray.number(self.tabAt(self.__dragStartPos))) mimeData.setData("tabwidget-id", str(id(self.parentWidget()))) drag.setMimeData(mimeData) if event.modifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier): @@ -125,7 +127,8 @@ if oldID != id(self): parentID = int(mimeData.data("tabwidget-id")) if event.proposedAction() == Qt.MoveAction: - self.tabRelocateRequested.emit(str(parentID), fromIndex, toIndex) + self.tabRelocateRequested.emit( + str(parentID), fromIndex, toIndex) event.acceptProposedAction() elif event.proposedAction() == Qt.CopyAction: self.tabCopyRequested[str, int, int].emit( @@ -165,7 +168,8 @@ self.__tabBar.tabMoveRequested.connect(self.moveTab) self.__tabBar.tabRelocateRequested.connect(self.__relocateTab) - self.__tabBar.tabCopyRequested[str, int, int].connect(self.__copyTabOther) + self.__tabBar.tabCopyRequested[str, int, int].connect( + self.__copyTabOther) self.__tabBar.tabCopyRequested[int, int].connect(self.__copyTab) self.vm = vm @@ -195,7 +199,8 @@ not hasattr(self, 'setTabsClosable'): self.closeButton = QToolButton(self) self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) - self.closeButton.setToolTip(self.trUtf8("Close the current editor")) + self.closeButton.setToolTip( + self.trUtf8("Close the current editor")) self.closeButton.setEnabled(False) self.closeButton.clicked[bool].connect(self.__closeButtonClicked) self.rightCornerWidgetLayout.addWidget(self.closeButton) @@ -212,11 +217,13 @@ self.setTabContextMenuPolicy(Qt.CustomContextMenu) self.customTabContextMenuRequested.connect(self.__showContextMenu) - ericPic = QPixmap(os.path.join(getConfig('ericPixDir'), 'eric_small.png')) + ericPic = QPixmap( + os.path.join(getConfig('ericPixDir'), 'eric_small.png')) self.emptyLabel = QLabel() self.emptyLabel.setPixmap(ericPic) self.emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter) - super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "") + super().addTab(self.emptyLabel, + UI.PixmapCache.getIcon("empty.png"), "") def __initMenu(self): """ @@ -239,9 +246,10 @@ self.__menu.addAction(UI.PixmapCache.getIcon("tabClose.png"), self.trUtf8('Close'), self.__contextMenuClose) self.closeOthersMenuAct = self.__menu.addAction( - UI.PixmapCache.getIcon("tabCloseOther.png"), self.trUtf8("Close Others"), - self.__contextMenuCloseOthers) - self.__menu.addAction(self.trUtf8('Close All'), self.__contextMenuCloseAll) + UI.PixmapCache.getIcon("tabCloseOther.png"), + self.trUtf8("Close Others"), self.__contextMenuCloseOthers) + self.__menu.addAction( + self.trUtf8('Close All'), self.__contextMenuCloseAll) self.__menu.addSeparator() self.saveMenuAct = \ self.__menu.addAction(UI.PixmapCache.getIcon("fileSave.png"), @@ -258,7 +266,8 @@ self.__menu.addAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__contextMenuPrintFile) self.__menu.addSeparator() - self.copyPathAct = self.__menu.addAction(self.trUtf8("Copy Path to Clipboard"), + self.copyPathAct = self.__menu.addAction( + self.trUtf8("Copy Path to Clipboard"), self.__contextMenuCopyPathToClipboard) def __showContextMenu(self, coord, index): @@ -271,7 +280,8 @@ if self.editors: self.contextMenuEditor = self.widget(index).getEditor() if self.contextMenuEditor: - self.saveMenuAct.setEnabled(self.contextMenuEditor.isModified()) + self.saveMenuAct.setEnabled( + self.contextMenuEditor.isModified()) fileName = self.contextMenuEditor.getFileName() self.copyPathAct.setEnabled(bool(fileName)) if fileName: @@ -381,7 +391,8 @@ """ Private slot to handle Caption change signals from the editor. - Updates the tab text and tooltip text to reflect the new caption information. + Updates the tab text and tooltip text to reflect the new caption + information. @param cap Caption for the editor @param editor Editor to update the caption for @@ -393,7 +404,8 @@ else: txt = e5App().getObject("Project").getRelativePath(fn) - maxFileNameChars = Preferences.getUI("TabViewManagerFilenameLength") + maxFileNameChars = Preferences.getUI( + "TabViewManagerFilenameLength") if len(txt) > maxFileNameChars: txt = "...{0}".format(txt[-maxFileNameChars:]) if editor.isReadOnly(): @@ -434,7 +446,8 @@ self.removeTab(index) if not self.editors: - super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "") + super().addTab( + self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "") self.emptyLabel.show() if self.closeButton: self.closeButton.setEnabled(False) @@ -482,8 +495,8 @@ tw = self.vm.getTabWidgetById(int(sourceId)) if tw is not None: editor = tw.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()) @@ -596,7 +609,8 @@ def __contextMenuOpenRejections(self): """ - Private slot to open a rejections file associated with the selected tab. + Private slot to open a rejections file associated with the selected + tab. """ if self.contextMenuEditor: fileName = self.contextMenuEditor.getFileName() @@ -614,7 +628,8 @@ def __contextMenuCopyPathToClipboard(self): """ - Private method to copy the file name of the selected tab to the clipboard. + Private method to copy the file name of the selected tab to the + clipboard. """ if self.contextMenuEditor: fn = self.contextMenuEditor.getFileName() @@ -681,21 +696,24 @@ @signal editorOpened(str) emitted after an editor window was opened @signal editorOpenedEd(Editor) emitted after an editor window was opened @signal editorClosed(str) emitted just before an editor window gets closed - @signal editorClosedEd(Editor) emitted just before an editor window gets closed + @signal editorClosedEd(Editor) emitted just before an editor window gets + closed @signal editorSaved(str) emitted after an editor window was saved @signal checkActions(Editor) emitted when some actions should be checked - for their status - @signal cursorChanged(Editor) emitted after the cursor position of the active - window has changed + for their status + @signal cursorChanged(Editor) emitted after the cursor position of the + active window has changed @signal breakpointToggled(Editor) emitted when a breakpoint is toggled. @signal bookmarkToggled(Editor) emitted when a bookmark is toggled. @signal syntaxerrorToggled(Editor) emitted when a syntax error is toggled. - @signal previewStateChanged(bool) emitted to signal a change in the preview state + @signal previewStateChanged(bool) emitted to signal a change in the + preview state @signal editorLanguageChanged(Editor) emitted to signal a change of an - editors language - @signal editorTextChanged(Editor) emitted to signal a change of an editor's text - @signal editorLineChanged(str,int) emitted to signal a change of an editor's - current line (line is given one based) + editors language + @signal editorTextChanged(Editor) emitted to signal a change of an + editor's text + @signal editorLineChanged(str,int) emitted to signal a change of an + editor's current line (line is given one based) """ changeCaption = pyqtSignal(str) editorChanged = pyqtSignal(str) @@ -737,7 +755,8 @@ self.setOrientation(Qt.Vertical) self.__inRemoveView = False - self.maxFileNameChars = Preferences.getUI("TabViewManagerFilenameLength") + self.maxFileNameChars = Preferences.getUI( + "TabViewManagerFilenameLength") self.filenameOnly = Preferences.getUI("TabViewManagerFilenameOnly") def canCascade(self): @@ -800,7 +819,8 @@ # if this was the last editor in this view, switch to the next, that # still has open editors for i in list(range(self.tabWidgets.index(tw), -1, -1)) + \ - list(range(self.tabWidgets.index(tw) + 1, len(self.tabWidgets))): + list(range(self.tabWidgets.index(tw) + 1, + len(self.tabWidgets))): if self.tabWidgets[i].hasEditors(): self.currentTabWidget.showIndicator(False) self.currentTabWidget = self.tabWidgets[i] @@ -861,7 +881,8 @@ Protected method to add a view (i.e. window). @param win editor assembly to be inserted - @param tabWidget reference to the tab widget to insert the editor into (TabWidget) + @param tabWidget reference to the tab widget to insert the editor into + (TabWidget) @param index index position to insert at (integer) @param fn filename of this editor (string) @param noName name to be used for an unnamed editor (string) @@ -938,7 +959,8 @@ def _initWindowActions(self): """ - Protected method to define the user interface actions for window handling. + Protected method to define the user interface actions for window + handling. """ pass @@ -1021,7 +1043,8 @@ size = self.width() else: size = self.height() - self.setSizes([int(size / len(self.tabWidgets))] * len(self.tabWidgets)) + self.setSizes( + [int(size / len(self.tabWidgets))] * len(self.tabWidgets)) self.splitRemoveAct.setEnabled(True) self.nextSplitAct.setEnabled(True) self.prevSplitAct.setEnabled(True) @@ -1122,7 +1145,8 @@ self.changeCaption.emit(fn) if not self.__inRemoveView: self.editorChanged.emit(fn) - self.editorLineChanged.emit(fn, editor.getCursorPosition()[0] + 1) + self.editorLineChanged.emit( + fn, editor.getCursorPosition()[0] + 1) else: self.changeCaption.emit("") self.editorChangedEd.emit(editor) @@ -1146,7 +1170,8 @@ self.currentTabWidget = watched.parent() if switched: index = self.currentTabWidget.selectTab(event.pos()) - switched = self.currentTabWidget.widget(index) is self.activeWindow() + switched = self.currentTabWidget.widget(index) is \ + self.activeWindow() elif isinstance(watched, QScintilla.Editor.Editor): for tw in self.tabWidgets: if tw.hasEditor(watched): @@ -1164,7 +1189,8 @@ self.changeCaption.emit(fn) if switched: self.editorChanged.emit(fn) - self.editorLineChanged.emit(fn, aw.getCursorPosition()[0] + 1) + self.editorLineChanged.emit( + fn, aw.getCursorPosition()[0] + 1) else: self.changeCaption.emit("") self.editorChangedEd.emit(aw) @@ -1177,7 +1203,8 @@ """ ViewManager.preferencesChanged(self) - self.maxFileNameChars = Preferences.getUI("TabViewManagerFilenameLength") + self.maxFileNameChars = Preferences.getUI( + "TabViewManagerFilenameLength") self.filenameOnly = Preferences.getUI("TabViewManagerFilenameOnly") for tabWidget in self.tabWidgets: @@ -1189,7 +1216,8 @@ if self.filenameOnly: txt = os.path.basename(fn) else: - txt = e5App().getObject("Project").getRelativePath(fn) + txt = e5App().getObject("Project")\ + .getRelativePath(fn) if len(txt) > self.maxFileNameChars: txt = "...{0}".format(txt[-self.maxFileNameChars:]) if not QFileInfo(fn).isWritable():
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Thu Oct 10 19:24:20 2013 +0200 @@ -33,8 +33,8 @@ super().__init__(parent) self.setupUi(self) - self.bTest = \ - self.buttonBox.addButton(self.trUtf8("Test"), QDialogButtonBox.ActionRole) + self.bTest = self.buttonBox.addButton( + self.trUtf8("Test"), QDialogButtonBox.ActionRole) def on_buttonBox_clicked(self, button): """ @@ -66,7 +66,8 @@ except: E5MessageBox.critical(self, self.trUtf8("QColorDialog Wizard Error"), - self.trUtf8("""<p>The colour <b>{0}</b> is not valid.</p>""") + self.trUtf8( + """<p>The colour <b>{0}</b> is not valid.</p>""") .format(coStr)) elif self.rRGBA.isChecked(): @@ -132,9 +133,8 @@ code += ', None,{0}'.format(os.linesep) code += '{0}self.trUtf8("{1}"),{2}'.format( istring, self.eTitle.text(), os.linesep) - code += \ - '{0}QColorDialog.ColorDialogOptions(QColorDialog.ShowAlphaChannel)'\ - .format(istring) + code += '{0}QColorDialog.ColorDialogOptions(' \ + 'QColorDialog.ShowAlphaChannel)'.format(istring) code += '){0}'.format(estring) elif self.rRGBA.isChecked(): code += 'getColor(' @@ -147,9 +147,8 @@ code += '{0}None,{1}'.format(istring, os.linesep) code += '{0}self.trUtf8("{1}"),{2}'.format( istring, self.eTitle.text(), os.linesep) - code += \ - '{0}QColorDialog.ColorDialogOptions(QColorDialog.ShowAlphaChannel)'\ - .format(istring) + code += '{0}QColorDialog.ColorDialogOptions(' \ + 'QColorDialog.ShowAlphaChannel)'.format(istring) code += '){0}'.format(estring) return code
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Thu Oct 10 19:24:20 2013 +0200 @@ -8,13 +8,16 @@ """ from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \ - QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel +from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ + QLineEdit, QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, \ + QRegExpValidator, QLabel -from .Ui_PyRegExpWizardCharactersDialog import Ui_PyRegExpWizardCharactersDialog +from .Ui_PyRegExpWizardCharactersDialog import \ + Ui_PyRegExpWizardCharactersDialog -class PyRegExpWizardCharactersDialog(QDialog, Ui_PyRegExpWizardCharactersDialog): +class PyRegExpWizardCharactersDialog( + QDialog, Ui_PyRegExpWizardCharactersDialog): """ Class implementing a dialog for entering character classes. """ @@ -41,8 +44,10 @@ self.comboItems = [] self.singleComboItems = [] # these are in addition to the above self.comboItems.append(self.trUtf8("Normal character")) - self.comboItems.append(self.trUtf8("Unicode character in hexadecimal notation")) - self.comboItems.append(self.trUtf8("Unicode character in octal notation")) + self.comboItems.append( + self.trUtf8("Unicode character in hexadecimal notation")) + self.comboItems.append( + self.trUtf8("Unicode character in octal notation")) self.singleComboItems.append(self.trUtf8("---")) self.singleComboItems.append(self.trUtf8("Bell character (\\a)")) self.singleComboItems.append(self.trUtf8("Page break (\\f)")) @@ -83,7 +88,8 @@ self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) - hspacer0 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer0 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) @@ -116,7 +122,8 @@ self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) - hspacer1 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer1 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) self.moreRangesButton.clicked[()].connect(self.__addRangesLine) @@ -211,7 +218,8 @@ def __singlesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the single chars combo boxes. + Private slot to handle the activated(int) signal of the single chars + combo boxes. @param index selected list index (integer) """ @@ -223,7 +231,8 @@ def __rangesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the char ranges combo boxes. + Private slot to handle the activated(int) signal of the char ranges + combo boxes. @param index selected list index (integer) """ @@ -299,8 +308,9 @@ self.__formatCharacter(index, char2)) if regexp: - if (len(regexp) == 2 and \ - (regexp in self.predefinedClasses or regexp in self.specialChars)) or \ + if (len(regexp) == 2 and + (regexp in self.predefinedClasses or + regexp in self.specialChars)) or \ len(regexp) == 1: return regexp else:
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Thu Oct 10 19:24:20 2013 +0200 @@ -8,8 +8,9 @@ """ from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \ - QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel +from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ + QLineEdit, QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, \ + QRegExpValidator, QLabel from .Ui_QRegExpWizardCharactersDialog import Ui_QRegExpWizardCharactersDialog @@ -54,28 +55,39 @@ self.comboItems.append((self.trUtf8( "ASCII/Latin1 character in octal notation"), "-o")) self.singleComboItems.append(("---", "-i")) - self.singleComboItems.append((self.trUtf8("Bell character (\\a)"), "\\a")) - self.singleComboItems.append((self.trUtf8("Page break (\\f)"), "\\f")) - self.singleComboItems.append((self.trUtf8("Line feed (\\n)"), "\\n")) - self.singleComboItems.append((self.trUtf8("Carriage return (\\r)"), "\\r")) + self.singleComboItems.append( + (self.trUtf8("Bell character (\\a)"), "\\a")) + self.singleComboItems.append( + (self.trUtf8("Page break (\\f)"), "\\f")) + self.singleComboItems.append( + (self.trUtf8("Line feed (\\n)"), "\\n")) + self.singleComboItems.append( + (self.trUtf8("Carriage return (\\r)"), "\\r")) self.singleComboItems.append( (self.trUtf8("Horizontal tabulator (\\t)"), "\\t")) - self.singleComboItems.append((self.trUtf8("Vertical tabulator (\\v)"), "\\v")) + self.singleComboItems.append( + (self.trUtf8("Vertical tabulator (\\v)"), "\\v")) elif mode == QRegExpWizardCharactersDialog.W3CMode: self.comboItems.append((self.trUtf8( "Unicode character in hexadecimal notation"), "-h")) self.comboItems.append((self.trUtf8( "ASCII/Latin1 character in octal notation"), "-o")) self.singleComboItems.append(("---", "-i")) - self.singleComboItems.append((self.trUtf8("Line feed (\\n)"), "\\n")) - self.singleComboItems.append((self.trUtf8("Carriage return (\\r)"), "\\r")) + self.singleComboItems.append( + (self.trUtf8("Line feed (\\n)"), "\\n")) + self.singleComboItems.append( + (self.trUtf8("Carriage return (\\r)"), "\\r")) self.singleComboItems.append( (self.trUtf8("Horizontal tabulator (\\t)"), "\\t")) self.singleComboItems.append(("---", "-i")) - self.singleComboItems.append((self.trUtf8("Character Category"), "-ccp")) - self.singleComboItems.append((self.trUtf8("Character Block"), "-cbp")) - self.singleComboItems.append((self.trUtf8("Not Character Category"), "-ccn")) - self.singleComboItems.append((self.trUtf8("Not Character Block"), "-cbn")) + self.singleComboItems.append( + (self.trUtf8("Character Category"), "-ccp")) + self.singleComboItems.append( + (self.trUtf8("Character Block"), "-cbp")) + self.singleComboItems.append( + (self.trUtf8("Not Character Category"), "-ccn")) + self.singleComboItems.append( + (self.trUtf8("Not Character Block"), "-cbn")) self.charValidator = QRegExpValidator(QRegExp(".{0,1}"), self) self.hexValidator = QRegExpValidator(QRegExp("[0-9a-fA-F]{0,4}"), self) @@ -110,7 +122,8 @@ self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) - hspacer0 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer0 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) @@ -144,7 +157,8 @@ self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) - hspacer1 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer1 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) self.moreRangesButton.clicked[()].connect(self.__addRangesLine) @@ -530,7 +544,8 @@ def __singlesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the single chars combo boxes. + Private slot to handle the activated(int) signal of the single chars + combo boxes. @param index selected list index (integer) """ @@ -538,12 +553,14 @@ for entriesList in self.singlesEntries: if combo == entriesList[0]: format = combo.itemData(index) - self.__performSelectedAction(format, entriesList[1], entriesList[2]) + self.__performSelectedAction( + format, entriesList[1], entriesList[2]) break def __rangesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the char ranges combo boxes. + Private slot to handle the activated(int) signal of the char ranges + combo boxes. @param index selected list index (integer) """
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Thu Oct 10 19:24:20 2013 +0200 @@ -8,8 +8,9 @@ """ from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QWidget, QDialog, QVBoxLayout, QHBoxLayout, QScrollArea, \ - QPushButton, QSpacerItem, QSizePolicy, QComboBox, QRegExpValidator, QLineEdit, QLabel +from PyQt4.QtGui import QWidget, QDialog, QVBoxLayout, QHBoxLayout, \ + QScrollArea, QPushButton, QSpacerItem, QSizePolicy, QComboBox, \ + QRegExpValidator, QLineEdit, QLabel from .Ui_QRegularExpressionWizardCharactersDialog import \ Ui_QRegularExpressionWizardCharactersDialog @@ -90,7 +91,8 @@ self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) - hspacer0 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer0 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) @@ -124,7 +126,8 @@ self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) - hspacer1 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + hspacer1 = QSpacerItem( + 30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) self.moreRangesButton.clicked[()].connect(self.__addRangesLine) @@ -176,118 +179,118 @@ ) self.__specialCharacterCategories = ( - # display name code - (self.trUtf8("Alphanumeric"), "Xan"), - (self.trUtf8("POSIX Space"), "Xps"), - (self.trUtf8("Perl Space"), "Xsp"), - (self.trUtf8("Universal Character"), "Xuc"), - (self.trUtf8("Perl Word"), "Xan"), + # display name code + (self.trUtf8("Alphanumeric"), "Xan"), + (self.trUtf8("POSIX Space"), "Xps"), + (self.trUtf8("Perl Space"), "Xsp"), + (self.trUtf8("Universal Character"), "Xuc"), + (self.trUtf8("Perl Word"), "Xan"), ) self.__characterBlocks = ( - # display name code - (self.trUtf8("Arabic"), "Arabic"), - (self.trUtf8("Armenian"), "Armenian"), - (self.trUtf8("Avestan"), "Avestan"), - (self.trUtf8("Balinese"), "Balinese"), - (self.trUtf8("Bamum"), "Bamum"), - (self.trUtf8("Batak"), "Batak"), - (self.trUtf8("Bengali"), "Bengali"), - (self.trUtf8("Bopomofo"), "Bopomofo"), - (self.trUtf8("Brahmi"), "Brahmi"), - (self.trUtf8("Braille"), "Braille"), - (self.trUtf8("Buginese"), "Buginese"), - (self.trUtf8("Buhid"), "Buhid"), - (self.trUtf8("Canadian Aboriginal"), "Canadian_Aboriginal"), - (self.trUtf8("Carian"), "Carian"), - (self.trUtf8("Chakma"), "Chakma"), - (self.trUtf8("Cham"), "Cham"), - (self.trUtf8("Cherokee"), "Cherokee"), - (self.trUtf8("Common"), "Common"), - (self.trUtf8("Coptic"), "Coptic"), - (self.trUtf8("Cuneiform"), "Cuneiform"), - (self.trUtf8("Cypriot"), "Cypriot"), - (self.trUtf8("Cyrillic"), "Cyrillic"), - (self.trUtf8("Deseret"), "Deseret,"), - (self.trUtf8("Devanagari"), "Devanagari"), - (self.trUtf8("Egyptian Hieroglyphs"), "Egyptian_Hieroglyphs"), - (self.trUtf8("Ethiopic"), "Ethiopic"), - (self.trUtf8("Georgian"), "Georgian"), - (self.trUtf8("Glagolitic"), "Glagolitic"), - (self.trUtf8("Gothic"), "Gothic"), - (self.trUtf8("Greek"), "Greek"), - (self.trUtf8("Gujarati"), "Gujarati"), - (self.trUtf8("Gurmukhi"), "Gurmukhi"), - (self.trUtf8("Han"), "Han"), - (self.trUtf8("Hangul"), "Hangul"), - (self.trUtf8("Hanunoo"), "Hanunoo"), - (self.trUtf8("Hebrew"), "Hebrew"), - (self.trUtf8("Hiragana"), "Hiragana"), - (self.trUtf8("Imperial Aramaic"), "Imperial_Aramaic"), - (self.trUtf8("Inherited"), "Inherited"), - (self.trUtf8("Inscriptional Pahlavi"), "Inscriptional_Pahlavi"), - (self.trUtf8("Inscriptional Parthian"), "Inscriptional_Parthian"), - (self.trUtf8("Javanese"), "Javanese"), - (self.trUtf8("Kaithi"), "Kaithi"), - (self.trUtf8("Kannada"), "Kannada"), - (self.trUtf8("Katakana"), "Katakana"), - (self.trUtf8("Kayah Li"), "Kayah_Li"), - (self.trUtf8("Kharoshthi"), "Kharoshthi"), - (self.trUtf8("Khmer"), "Khmer"), - (self.trUtf8("Lao"), "Lao"), - (self.trUtf8("Latin"), "Latin"), - (self.trUtf8("Lepcha"), "Lepcha"), - (self.trUtf8("Limbu"), "Limbu"), - (self.trUtf8("Linear B"), "Linear_B"), - (self.trUtf8("Lisu"), "Lisu"), - (self.trUtf8("Lycian"), "Lycian"), - (self.trUtf8("Lydian"), "Lydian"), - (self.trUtf8("Malayalam"), "Malayalam"), - (self.trUtf8("Mandaic"), "Mandaic"), - (self.trUtf8("Meetei Mayek"), "Meetei_Mayek"), - (self.trUtf8("Meroitic Cursive"), "Meroitic_Cursive"), - (self.trUtf8("Meroitic Hieroglyphs"), "Meroitic_Hieroglyphs"), - (self.trUtf8("Miao"), "Miao"), - (self.trUtf8("Mongolian"), "Mongolian"), - (self.trUtf8("Myanmar"), "Myanmar"), - (self.trUtf8("New Tai Lue"), "New_Tai_Lue"), - (self.trUtf8("N'Ko"), "Nko"), - (self.trUtf8("Ogham"), "Ogham"), - (self.trUtf8("Old Italic"), "Old_Italic"), - (self.trUtf8("Old Persian"), "Old_Persian"), - (self.trUtf8("Old South Arabian"), "Old_South_Arabian"), - (self.trUtf8("Old Turkic"), "Old_Turkic,"), - (self.trUtf8("Ol Chiki"), "Ol_Chiki"), - (self.trUtf8("Oriya"), "Oriya"), - (self.trUtf8("Osmanya"), "Osmanya"), - (self.trUtf8("Phags-pa"), "Phags_Pa"), - (self.trUtf8("Phoenician"), "Phoenician"), - (self.trUtf8("Rejang"), "Rejang"), - (self.trUtf8("Runic"), "Runic"), - (self.trUtf8("Samaritan"), "Samaritan"), - (self.trUtf8("Saurashtra"), "Saurashtra"), - (self.trUtf8("Sharada"), "Sharada"), - (self.trUtf8("Shavian"), "Shavian"), - (self.trUtf8("Sinhala"), "Sinhala"), - (self.trUtf8("Sora Sompeng"), "Sora_Sompeng"), - (self.trUtf8("Sundanese"), "Sundanese"), - (self.trUtf8("Syloti Nagri"), "Syloti_Nagri"), - (self.trUtf8("Syriac"), "Syriac"), - (self.trUtf8("Tagalog"), "Tagalog"), - (self.trUtf8("Tagbanwa"), "Tagbanwa"), - (self.trUtf8("Tai Le"), "Tai_Le"), - (self.trUtf8("Tai Tham"), "Tai_Tham"), - (self.trUtf8("Tai Viet"), "Tai_Viet"), - (self.trUtf8("Takri"), "Takri"), - (self.trUtf8("Tamil"), "Tamil"), - (self.trUtf8("Telugu"), "Telugu"), - (self.trUtf8("Thaana"), "Thaana"), - (self.trUtf8("Thai"), "Thai"), - (self.trUtf8("Tibetan"), "Tibetan"), - (self.trUtf8("Tifinagh"), "Tifinagh"), - (self.trUtf8("Ugaritic"), "Ugaritic"), - (self.trUtf8("Vai"), "Vai"), - (self.trUtf8("Yi"), "Yi"), + # display name code + (self.trUtf8("Arabic"), "Arabic"), + (self.trUtf8("Armenian"), "Armenian"), + (self.trUtf8("Avestan"), "Avestan"), + (self.trUtf8("Balinese"), "Balinese"), + (self.trUtf8("Bamum"), "Bamum"), + (self.trUtf8("Batak"), "Batak"), + (self.trUtf8("Bengali"), "Bengali"), + (self.trUtf8("Bopomofo"), "Bopomofo"), + (self.trUtf8("Brahmi"), "Brahmi"), + (self.trUtf8("Braille"), "Braille"), + (self.trUtf8("Buginese"), "Buginese"), + (self.trUtf8("Buhid"), "Buhid"), + (self.trUtf8("Canadian Aboriginal"), "Canadian_Aboriginal"), + (self.trUtf8("Carian"), "Carian"), + (self.trUtf8("Chakma"), "Chakma"), + (self.trUtf8("Cham"), "Cham"), + (self.trUtf8("Cherokee"), "Cherokee"), + (self.trUtf8("Common"), "Common"), + (self.trUtf8("Coptic"), "Coptic"), + (self.trUtf8("Cuneiform"), "Cuneiform"), + (self.trUtf8("Cypriot"), "Cypriot"), + (self.trUtf8("Cyrillic"), "Cyrillic"), + (self.trUtf8("Deseret"), "Deseret,"), + (self.trUtf8("Devanagari"), "Devanagari"), + (self.trUtf8("Egyptian Hieroglyphs"), "Egyptian_Hieroglyphs"), + (self.trUtf8("Ethiopic"), "Ethiopic"), + (self.trUtf8("Georgian"), "Georgian"), + (self.trUtf8("Glagolitic"), "Glagolitic"), + (self.trUtf8("Gothic"), "Gothic"), + (self.trUtf8("Greek"), "Greek"), + (self.trUtf8("Gujarati"), "Gujarati"), + (self.trUtf8("Gurmukhi"), "Gurmukhi"), + (self.trUtf8("Han"), "Han"), + (self.trUtf8("Hangul"), "Hangul"), + (self.trUtf8("Hanunoo"), "Hanunoo"), + (self.trUtf8("Hebrew"), "Hebrew"), + (self.trUtf8("Hiragana"), "Hiragana"), + (self.trUtf8("Imperial Aramaic"), "Imperial_Aramaic"), + (self.trUtf8("Inherited"), "Inherited"), + (self.trUtf8("Inscriptional Pahlavi"), "Inscriptional_Pahlavi"), + (self.trUtf8("Inscriptional Parthian"), "Inscriptional_Parthian"), + (self.trUtf8("Javanese"), "Javanese"), + (self.trUtf8("Kaithi"), "Kaithi"), + (self.trUtf8("Kannada"), "Kannada"), + (self.trUtf8("Katakana"), "Katakana"), + (self.trUtf8("Kayah Li"), "Kayah_Li"), + (self.trUtf8("Kharoshthi"), "Kharoshthi"), + (self.trUtf8("Khmer"), "Khmer"), + (self.trUtf8("Lao"), "Lao"), + (self.trUtf8("Latin"), "Latin"), + (self.trUtf8("Lepcha"), "Lepcha"), + (self.trUtf8("Limbu"), "Limbu"), + (self.trUtf8("Linear B"), "Linear_B"), + (self.trUtf8("Lisu"), "Lisu"), + (self.trUtf8("Lycian"), "Lycian"), + (self.trUtf8("Lydian"), "Lydian"), + (self.trUtf8("Malayalam"), "Malayalam"), + (self.trUtf8("Mandaic"), "Mandaic"), + (self.trUtf8("Meetei Mayek"), "Meetei_Mayek"), + (self.trUtf8("Meroitic Cursive"), "Meroitic_Cursive"), + (self.trUtf8("Meroitic Hieroglyphs"), "Meroitic_Hieroglyphs"), + (self.trUtf8("Miao"), "Miao"), + (self.trUtf8("Mongolian"), "Mongolian"), + (self.trUtf8("Myanmar"), "Myanmar"), + (self.trUtf8("New Tai Lue"), "New_Tai_Lue"), + (self.trUtf8("N'Ko"), "Nko"), + (self.trUtf8("Ogham"), "Ogham"), + (self.trUtf8("Old Italic"), "Old_Italic"), + (self.trUtf8("Old Persian"), "Old_Persian"), + (self.trUtf8("Old South Arabian"), "Old_South_Arabian"), + (self.trUtf8("Old Turkic"), "Old_Turkic,"), + (self.trUtf8("Ol Chiki"), "Ol_Chiki"), + (self.trUtf8("Oriya"), "Oriya"), + (self.trUtf8("Osmanya"), "Osmanya"), + (self.trUtf8("Phags-pa"), "Phags_Pa"), + (self.trUtf8("Phoenician"), "Phoenician"), + (self.trUtf8("Rejang"), "Rejang"), + (self.trUtf8("Runic"), "Runic"), + (self.trUtf8("Samaritan"), "Samaritan"), + (self.trUtf8("Saurashtra"), "Saurashtra"), + (self.trUtf8("Sharada"), "Sharada"), + (self.trUtf8("Shavian"), "Shavian"), + (self.trUtf8("Sinhala"), "Sinhala"), + (self.trUtf8("Sora Sompeng"), "Sora_Sompeng"), + (self.trUtf8("Sundanese"), "Sundanese"), + (self.trUtf8("Syloti Nagri"), "Syloti_Nagri"), + (self.trUtf8("Syriac"), "Syriac"), + (self.trUtf8("Tagalog"), "Tagalog"), + (self.trUtf8("Tagbanwa"), "Tagbanwa"), + (self.trUtf8("Tai Le"), "Tai_Le"), + (self.trUtf8("Tai Tham"), "Tai_Tham"), + (self.trUtf8("Tai Viet"), "Tai_Viet"), + (self.trUtf8("Takri"), "Takri"), + (self.trUtf8("Tamil"), "Tamil"), + (self.trUtf8("Telugu"), "Telugu"), + (self.trUtf8("Thaana"), "Thaana"), + (self.trUtf8("Thai"), "Thai"), + (self.trUtf8("Tibetan"), "Tibetan"), + (self.trUtf8("Tifinagh"), "Tifinagh"), + (self.trUtf8("Ugaritic"), "Ugaritic"), + (self.trUtf8("Vai"), "Vai"), + (self.trUtf8("Yi"), "Yi"), ) self.__posixNamedSets = ( @@ -444,7 +447,8 @@ lineedit.setValidator(self.hexValidator) elif format == "-o": lineedit.setValidator(self.octValidator) - elif format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn"]: + elif format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", + "-psp", "-psn"]: lineedit.setEnabled(False) lineedit.hide() if combo is not None: @@ -459,7 +463,8 @@ def __singlesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the single chars combo boxes. + Private slot to handle the activated(int) signal of the single chars + combo boxes. @param index selected list index (integer) """ @@ -467,12 +472,14 @@ for entriesList in self.singlesEntries: if combo == entriesList[0]: format = combo.itemData(index) - self.__performSelectedAction(format, entriesList[1], entriesList[2]) + self.__performSelectedAction( + format, entriesList[1], entriesList[2]) break def __rangesCharTypeSelected(self, index): """ - Private slot to handle the activated(int) signal of the char ranges combo boxes. + Private slot to handle the activated(int) signal of the char ranges + combo boxes. @param index selected list index (integer) """ @@ -563,7 +570,8 @@ # single characters for entrieslist in self.singlesEntries: format = entrieslist[0].itemData(entrieslist[0].currentIndex()) - if format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn"]: + if format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", + "-psp", "-psn"]: char = entrieslist[2].itemData(entrieslist[2].currentIndex()) else: char = entrieslist[1].text()
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Thu Oct 10 19:03:45 2013 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Thu Oct 10 19:24:20 2013 +0200 @@ -124,14 +124,14 @@ except ImportError: responseDict["available"] = False elif command == "validate": - valid, error, errorOffset = rxValidate(commandDict["regexp"], - commandDict["options"]) + valid, error, errorOffset = rxValidate( + commandDict["regexp"], commandDict["options"]) responseDict["valid"] = valid responseDict["errorMessage"] = error responseDict["errorOffset"] = errorOffset elif command == "execute": - valid, error, errorOffset = rxValidate(commandDict["regexp"], - commandDict["options"]) + valid, error, errorOffset = rxValidate( + commandDict["regexp"], commandDict["options"]) if not valid: responseDict["valid"] = valid responseDict["errorMessage"] = error
