Wed, 08 Jan 2014 19:07:23 +0100
Changed all the file or directory selection buttons to QToolButton and gave them an icon.
--- a/Cooperation/ChatWidget.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Cooperation/ChatWidget.ui Wed Jan 08 19:07:23 2014 +0100 @@ -14,7 +14,16 @@ <string>Chat</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -117,9 +126,6 @@ <property name="toolTip"> <string>Press to toggle the shared status of the current editor</string> </property> - <property name="text"> - <string>...</string> - </property> <property name="checkable"> <bool>true</bool> </property> @@ -133,9 +139,6 @@ <property name="toolTip"> <string>Press to start a shared edit</string> </property> - <property name="text"> - <string>...</string> - </property> <property name="checkable"> <bool>true</bool> </property> @@ -149,9 +152,6 @@ <property name="toolTip"> <string>Press to end the edit and send the changes</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -162,9 +162,6 @@ <property name="toolTip"> <string>Press to cancel the shared edit</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item>
--- a/Debugger/EditBreakpointDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/EditBreakpointDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ from .Ui_EditBreakpointDialog import Ui_EditBreakpointDialog import Utilities +import UI.PixmapCache class EditBreakpointDialog(QDialog, Ui_EditBreakpointDialog): @@ -47,6 +48,8 @@ self.setObjectName(name) self.setModal(modal) + self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) self.filenameCompleter = E5FileCompleter(self.filenameCombo)
--- a/Debugger/EditBreakpointDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/EditBreakpointDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,105 +1,106 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>EditBreakpointDialog</class> - <widget class="QDialog" name="EditBreakpointDialog" > - <property name="geometry" > + <widget class="QDialog" name="EditBreakpointDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>428</width> - <height>216</height> + <height>229</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Edit Breakpoint</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout" > - <item row="6" column="0" colspan="4" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <layout class="QGridLayout"> + <item row="6" column="0" colspan="4"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> - <item row="5" column="0" colspan="4" > - <widget class="QCheckBox" name="enabledCheckBox" > - <property name="toolTip" > + <item row="5" column="0" colspan="4"> + <widget class="QCheckBox" name="enabledCheckBox"> + <property name="toolTip"> <string>Select, whether the breakpoint is enabled</string> </property> - <property name="text" > + <property name="text"> <string>Enabled</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="4" column="0" colspan="4" > - <widget class="QCheckBox" name="temporaryCheckBox" > - <property name="toolTip" > + <item row="4" column="0" colspan="4"> + <widget class="QCheckBox" name="temporaryCheckBox"> + <property name="toolTip"> <string>Select whether this is a temporary breakpoint</string> </property> - <property name="text" > + <property name="text"> <string>Temporary Breakpoint</string> </property> </widget> </item> - <item row="0" column="1" colspan="3" > - <widget class="QComboBox" name="filenameCombo" > - <property name="toolTip" > + <item row="0" column="1" colspan="3"> + <widget class="QComboBox" name="filenameCombo"> + <property name="toolTip"> <string>Enter the filename of the breakpoint</string> </property> - <property name="editable" > + <property name="editable"> <bool>true</bool> </property> - <property name="autoCompletion" > + <property name="autoCompletion"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="1" colspan="3" > - <widget class="QComboBox" name="conditionCombo" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="2" column="1" colspan="3"> + <widget class="QComboBox" name="conditionCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter or select a condition for the breakpoint</string> </property> - <property name="editable" > + <property name="editable"> <bool>true</bool> </property> - <property name="autoCompletion" > + <property name="autoCompletion"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QSpinBox" name="ignoreSpinBox" > - <property name="toolTip" > + <item row="3" column="1"> + <widget class="QSpinBox" name="ignoreSpinBox"> + <property name="toolTip"> <string>Enter an ignore count for the breakpoint</string> </property> - <property name="maximum" > + <property name="maximum"> <number>9999</number> </property> </widget> </item> - <item row="3" column="2" colspan="2" > + <item row="3" column="2" colspan="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>250</width> <height>20</height> @@ -107,28 +108,28 @@ </property> </spacer> </item> - <item row="1" column="1" > - <widget class="QSpinBox" name="linenoSpinBox" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QSpinBox" name="linenoSpinBox"> + <property name="toolTip"> <string>Enter the linenumber of the breakpoint</string> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>99999</number> </property> </widget> </item> - <item row="1" column="2" > + <item row="1" column="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>200</width> <height>20</height> @@ -136,47 +137,44 @@ </property> </spacer> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="fileButton" > - <property name="toolTip" > - <string>Press to open a file selection dialog</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="textLabel2_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="textLabel2_2"> + <property name="text"> <string>Linenumber:</string> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="textLabel1_2" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_2"> + <property name="text"> <string>Filename:</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>Condition:</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="textLabel2" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="textLabel2"> + <property name="text"> <string>Ignore Count:</string> </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="fileButton"> + <property name="toolTip"> + <string>Press to open a file selection dialog</string> + </property> + </widget> + </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>filenameCombo</tabstop> @@ -195,11 +193,11 @@ <receiver>EditBreakpointDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>21</x> <y>179</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>21</x> <y>201</y> </hint> @@ -211,11 +209,11 @@ <receiver>EditBreakpointDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>97</x> <y>187</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>97</x> <y>204</y> </hint>
--- a/Debugger/StartCoverageDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/StartCoverageDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>488</width> - <height>222</height> + <height>225</height> </rect> </property> <property name="windowTitle"> @@ -101,20 +101,6 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select directory using a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -235,6 +221,17 @@ </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select directory using a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Select directory</b> +<p>Select the working directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="6"/>
--- a/Debugger/StartDebugDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/StartDebugDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>488</width> - <height>282</height> + <height>300</height> </rect> </property> <property name="windowTitle"> @@ -101,20 +101,6 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select directory using a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -287,6 +273,17 @@ </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select directory using a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Select directory</b> +<p>Select the working directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="6"/>
--- a/Debugger/StartDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/StartDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -15,6 +15,7 @@ import Utilities import Preferences +import UI.PixmapCache class StartDialog(QDialog): @@ -75,6 +76,7 @@ from .Ui_StartProfileDialog import Ui_StartProfileDialog self.ui = Ui_StartProfileDialog() self.ui.setupUi(self) + self.ui.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) self.clearButton = self.ui.buttonBox.addButton( self.trUtf8("Clear Histories"), QDialogButtonBox.ActionRole)
--- a/Debugger/StartProfileDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/StartProfileDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>488</width> - <height>183</height> + <height>196</height> </rect> </property> <property name="windowTitle"> @@ -101,20 +101,6 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select directory using a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -235,6 +221,17 @@ </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select directory using a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Select directory</b> +<p>Select the working directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="6"/>
--- a/Debugger/StartRunDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Debugger/StartRunDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>488</width> - <height>254</height> + <height>271</height> </rect> </property> <property name="windowTitle"> @@ -101,20 +101,6 @@ </property> </widget> </item> - <item row="1" column="3"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select directory using a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -258,6 +244,17 @@ </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select directory using a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Select directory</b> +<p>Select the working directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="6"/>
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -20,6 +20,7 @@ import Utilities import Globals +import UI.PixmapCache class BookmarksImportDialog(QDialog, Ui_BookmarksImportDialog): @@ -37,6 +38,8 @@ super().__init__(parent) self.setupUi(self) + self.chooseButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.sourcesList.setIconSize(QSize(48, 48)) for icon, displayText, idText in BookmarksImporters.getImporters(): itm = QListWidgetItem(icon, displayText, self.sourcesList)
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImportDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -25,9 +25,21 @@ <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QStackedWidget" name="pagesWidget"> + <property name="currentIndex"> + <number>0</number> + </property> <widget class="QWidget" name="sourcePage"> <layout class="QVBoxLayout" name="verticalLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -48,7 +60,16 @@ </widget> <widget class="QWidget" name="filePage"> <layout class="QGridLayout" name="gridLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item row="0" column="0"> @@ -126,11 +147,7 @@ </widget> </item> <item> - <widget class="QPushButton" name="chooseButton"> - <property name="text"> - <string notr="true">...</string> - </property> - </widget> + <widget class="QToolButton" name="chooseButton"/> </item> </layout> </item>
--- a/Helpviewer/Sync/SyncDirectorySettingsPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Helpviewer/Sync/SyncDirectorySettingsPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ import Preferences import Utilities +import UI.PixmapCache class SyncDirectorySettingsPage(QWizardPage, Ui_SyncDirectorySettingsPage): @@ -31,6 +32,8 @@ super().__init__(parent) self.setupUi(self) + self.directoryButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.directoryEdit.setText(Preferences.getHelp("SyncDirectoryPath")) self.directoryEdit.textChanged.connect(self.completeChanged)
--- a/Helpviewer/Sync/SyncDirectorySettingsPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Helpviewer/Sync/SyncDirectorySettingsPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -41,13 +41,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="directoryButton"> + <widget class="QToolButton" name="directoryButton"> <property name="toolTip"> <string>Select the shared directory via a directory selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/MultiProject/AddProjectDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/MultiProject/AddProjectDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_AddProjectDialog import Ui_AddProjectDialog import Utilities +import UI.PixmapCache class AddProjectDialog(QDialog, Ui_AddProjectDialog): @@ -33,6 +34,8 @@ super().__init__(parent) self.setupUi(self) + self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.fileCompleter = E5FileCompleter(self.filenameEdit) self.startdir = startdir
--- a/MultiProject/AddProjectDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/MultiProject/AddProjectDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -53,16 +53,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="fileButton"> - <property name="toolTip"> - <string>Select the project file via a file selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> @@ -99,6 +89,13 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="fileButton"> + <property name="toolTip"> + <string>Select the project file via a file selection dialog</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -89,6 +89,15 @@ super().__init__(parent) self.setupUi(self) + self.excludeMessagesSelectButton.setIcon( + UI.PixmapCache.getIcon("select.png")) + self.includeMessagesSelectButton.setIcon( + UI.PixmapCache.getIcon("select.png")) + self.fixIssuesSelectButton.setIcon( + UI.PixmapCache.getIcon("select.png")) + self.noFixIssuesSelectButton.setIcon( + UI.PixmapCache.getIcon("select.png")) + self.docTypeComboBox.addItem(self.trUtf8("PEP-257"), "pep257") self.docTypeComboBox.addItem(self.trUtf8("Eric"), "eric")
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -28,7 +28,16 @@ <enum>QFrame::NoFrame</enum> </property> <layout class="QGridLayout" name="gridLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item row="0" column="0"> @@ -141,9 +150,6 @@ <property name="toolTip"> <string>Press to select the message codes from a list</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item row="2" column="0"> @@ -165,9 +171,6 @@ <property name="toolTip"> <string>Press to select the message codes from a list</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item row="3" column="0"> @@ -189,9 +192,6 @@ <property name="toolTip"> <string>Press to select the message codes from a list</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item row="4" column="0"> @@ -213,9 +213,6 @@ <property name="toolTip"> <string>Press to select the message codes from a list</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item row="5" column="0">
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -19,6 +19,7 @@ from .Ui_EricapiConfigDialog import Ui_EricapiConfigDialog import Utilities +import UI.PixmapCache import DocumentationTools from eric5config import getConfig @@ -39,6 +40,9 @@ super().__init__(parent) self.setupUi(self) + self.outputDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.ignoreDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) for language in sorted( DocumentationTools.supportedExtensionsDictForApis.keys()):
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -29,24 +29,21 @@ </property> </widget> </item> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel6"> + <property name="text"> + <string>Output File:</string> + </property> + </widget> + </item> <item row="0" column="2"> - <widget class="QPushButton" name="outputFileButton"> + <widget class="QToolButton" name="outputFileButton"> <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> <string>Press to open a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="TextLabel6"> - <property name="text"> - <string>Output File:</string> - </property> </widget> </item> </layout> @@ -209,24 +206,21 @@ </property> </widget> </item> + <item row="0" column="0" colspan="4"> + <widget class="QListWidget" name="ignoreDirsList"> + <property name="toolTip"> + <string>List of directory basenames to be ignored</string> + </property> + </widget> + </item> <item row="1" column="3"> - <widget class="QPushButton" name="ignoreDirButton"> + <widget class="QToolButton" name="ignoreDirButton"> <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> <string>Press to open a directory selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="4"> - <widget class="QListWidget" name="ignoreDirsList"> - <property name="toolTip"> - <string>List of directory basenames to be ignored</string> - </property> </widget> </item> </layout>
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,6 +21,7 @@ from DocumentationTools.Config import eric5docDefaultColors, \ eric5docColorParameterNames import Utilities +import UI.PixmapCache from eric5config import getConfig @@ -40,6 +41,11 @@ super().__init__(parent) self.setupUi(self) + self.outputDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.ignoreDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.cssButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.qtHelpDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) self.__initializeDefaults()
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,74 +1,72 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>EricdocConfigDialog</class> - <widget class="QDialog" name="EricdocConfigDialog" > - <property name="geometry" > + <widget class="QDialog" name="EricdocConfigDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>542</width> + <width>554</width> <height>550</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Ericdoc Configuration</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QTabWidget" name="tabWidget" > - <property name="currentIndex" > + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="generalTab" > - <attribute name="title" > + <widget class="QWidget" name="generalTab"> + <attribute name="title"> <string>General</string> </attribute> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="TextLabel6" > - <property name="text" > + <widget class="QLabel" name="TextLabel6"> + <property name="text"> <string>Output Directory:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="outputDirEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="outputDirEdit"> + <property name="toolTip"> <string>Enter an output directory</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="outputDirButton" > - <property name="focusPolicy" > + <widget class="QToolButton" name="outputDirButton"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Press to open a directory selection dialog</string> </property> - <property name="text" > - <string>...</string> - </property> </widget> </item> </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="textLabel1_3" > - <property name="text" > + <widget class="QLabel" name="textLabel1_3"> + <property name="text"> <string>Additional source extensions:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="sourceExtEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="sourceExtEdit"> + <property name="toolTip"> <string>Enter additional source extensions separated by a comma</string> </property> </widget> @@ -76,36 +74,36 @@ </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QCheckBox" name="recursionCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="recursionCheckBox"> + <property name="toolTip"> <string>Select to recurse into subdirectories</string> </property> - <property name="text" > + <property name="text"> <string>Recurse into subdirectories</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="noindexCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="noindexCheckBox"> + <property name="toolTip"> <string>Select, if no index files should be generated</string> </property> - <property name="text" > + <property name="text"> <string>Don't generate index files</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>145</width> <height>20</height> @@ -116,26 +114,26 @@ </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QCheckBox" name="noemptyCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="noemptyCheckBox"> + <property name="toolTip"> <string>Select to exclude empty modules</string> </property> - <property name="text" > + <property name="text"> <string>Don't include empty modules</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -146,17 +144,17 @@ </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Exclude Files:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="excludeFilesEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="excludeFilesEdit"> + <property name="toolTip"> <string>Enter filename patterns of files to be excluded separated by a comma</string> </property> </widget> @@ -164,55 +162,52 @@ </layout> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Exclude Directories</string> </property> - <layout class="QGridLayout" > - <item row="1" column="2" > - <widget class="QLineEdit" name="ignoreDirEdit" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="1" column="2"> + <widget class="QLineEdit" name="ignoreDirEdit"> + <property name="toolTip"> <string>Enter a directory basename to be ignored</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QPushButton" name="addButton" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> <string>Press to add the entered directory to the list</string> </property> - <property name="text" > + <property name="text"> <string>Add</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QPushButton" name="deleteButton" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QPushButton" name="deleteButton"> + <property name="toolTip"> <string>Press to delete the selected directory from the list</string> </property> - <property name="text" > + <property name="text"> <string>Delete</string> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="ignoreDirButton" > - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="toolTip" > - <string>Press to open a directory selection dialog</string> - </property> - <property name="text" > - <string>...</string> + <item row="0" column="0" colspan="4"> + <widget class="QListWidget" name="ignoreDirsList"> + <property name="toolTip"> + <string>List of directory basenames to be ignored</string> </property> </widget> </item> - <item row="0" column="0" colspan="4" > - <widget class="QListWidget" name="ignoreDirsList" > - <property name="toolTip" > - <string>List of directory basenames to be ignored</string> + <item row="1" column="3"> + <widget class="QToolButton" name="ignoreDirButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string>Press to open a directory selection dialog</string> </property> </widget> </item> @@ -221,142 +216,139 @@ </item> </layout> </widget> - <widget class="QWidget" name="styleTab" > - <attribute name="title" > + <widget class="QWidget" name="styleTab"> + <attribute name="title"> <string>Style</string> </attribute> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QGroupBox" name="groupBox_3" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> <string>Style Sheet</string> </property> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLineEdit" name="cssEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="cssEdit"> + <property name="toolTip"> <string>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="cssButton" > - <property name="focusPolicy" > + <widget class="QToolButton" name="cssButton"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Press to open a file selection dialog</string> </property> - <property name="text" > - <string>...</string> - </property> </widget> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Colours</string> </property> - <layout class="QGridLayout" > - <item row="3" column="1" > - <widget class="QPushButton" name="cfBgButton" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="3" column="1"> + <widget class="QPushButton" name="cfBgButton"> + <property name="toolTip"> <string>Press to select the class and function header background colour.</string> </property> - <property name="text" > + <property name="text"> <string>Class/Function Header Background</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QPushButton" name="cfFgButton" > - <property name="toolTip" > + <item row="3" column="0"> + <widget class="QPushButton" name="cfFgButton"> + <property name="toolTip"> <string>Press to select the class and function header foreground colour.</string> </property> - <property name="text" > + <property name="text"> <string>Class/Function Header Foreground</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QPushButton" name="l2BgButton" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QPushButton" name="l2BgButton"> + <property name="toolTip"> <string>Press to select the level 2 header background colour.</string> </property> - <property name="text" > + <property name="text"> <string>Level 2 Header Background</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QPushButton" name="l2FgButton" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QPushButton" name="l2FgButton"> + <property name="toolTip"> <string>Press to select the level 2 header foreground colour.</string> </property> - <property name="text" > + <property name="text"> <string>Level 2 Header Foreground</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QPushButton" name="l1BgButton" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QPushButton" name="l1BgButton"> + <property name="toolTip"> <string>Press to select the level 1 header background colour.</string> </property> - <property name="text" > + <property name="text"> <string>Level 1 Header Background</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QPushButton" name="l1FgButton" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QPushButton" name="l1FgButton"> + <property name="toolTip"> <string>Press to select the level 1 header foreground colour.</string> </property> - <property name="text" > + <property name="text"> <string>Level 1 Header Foreground</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QPushButton" name="bodyBgButton" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QPushButton" name="bodyBgButton"> + <property name="toolTip"> <string>Press to select the body background colour.</string> </property> - <property name="text" > + <property name="text"> <string>Body Background</string> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QPushButton" name="bodyFgButton" > - <property name="toolTip" > + <item row="0" column="0"> + <widget class="QPushButton" name="bodyFgButton"> + <property name="toolTip"> <string>Press to select the body foreground colour.</string> </property> - <property name="text" > + <property name="text"> <string>Body Foreground</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QPushButton" name="linkFgButton" > - <property name="toolTip" > + <item row="4" column="0"> + <widget class="QPushButton" name="linkFgButton"> + <property name="toolTip"> <string>Press to select the foreground colour of links.</string> </property> - <property name="text" > + <property name="text"> <string>Links</string> </property> </widget> </item> - <item row="5" column="0" colspan="2" > - <widget class="QTextEdit" name="sample" > - <property name="toolTip" > + <item row="5" column="0" colspan="2"> + <widget class="QTextEdit" name="sample"> + <property name="toolTip"> <string>This shows an example of the selected colours.</string> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> @@ -366,140 +358,137 @@ </item> </layout> </widget> - <widget class="QWidget" name="qtHelpTab" > - <attribute name="title" > + <widget class="QWidget" name="qtHelpTab"> + <attribute name="title"> <string>QtHelp</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QGroupBox" name="qtHelpGroup" > - <property name="title" > + <widget class="QGroupBox" name="qtHelpGroup"> + <property name="title"> <string>Generate QtHelp Files</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="TextLabel6_2" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel6_2"> + <property name="text"> <string>Output Directory:</string> </property> </widget> </item> - <item row="0" column="1" > - <layout class="QHBoxLayout" name="horizontalLayout" > + <item row="0" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLineEdit" name="qtHelpDirEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="qtHelpDirEdit"> + <property name="toolTip"> <string>Enter an output directory</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="qtHelpDirButton" > - <property name="focusPolicy" > + <widget class="QToolButton" name="qtHelpDirButton"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Press to open a directory selection dialog</string> </property> - <property name="text" > - <string>...</string> - </property> </widget> </item> </layout> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Namespace:</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="qtHelpNamespaceEdit" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QLineEdit" name="qtHelpNamespaceEdit"> + <property name="toolTip"> <string>Enter the namespace</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Virtual Folder:</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QLineEdit" name="qtHelpFolderEdit" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QLineEdit" name="qtHelpFolderEdit"> + <property name="toolTip"> <string>Enter the name of the virtual folder (must not contain '/')</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Filter Name:</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QLineEdit" name="qtHelpFilterNameEdit" > - <property name="toolTip" > + <item row="3" column="1"> + <widget class="QLineEdit" name="qtHelpFilterNameEdit"> + <property name="toolTip"> <string>Enter the name of the custom filter</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_5" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> <string>Filter Attributes:</string> </property> </widget> </item> - <item row="4" column="1" > - <widget class="QLineEdit" name="qtHelpFilterAttributesEdit" > - <property name="toolTip" > + <item row="4" column="1"> + <widget class="QLineEdit" name="qtHelpFilterAttributesEdit"> + <property name="toolTip"> <string>Enter the filter attributes separated by ':'</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QLabel" name="label_6" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> <string>Title:</string> </property> </widget> </item> - <item row="5" column="1" > - <widget class="QLineEdit" name="qtHelpTitleEdit" > - <property name="toolTip" > + <item row="5" column="1"> + <widget class="QLineEdit" name="qtHelpTitleEdit"> + <property name="toolTip"> <string>Enter a short title for the top entry</string> </property> </widget> </item> - <item row="6" column="0" colspan="2" > - <widget class="QCheckBox" name="qtHelpGenerateCollectionCheckBox" > - <property name="toolTip" > + <item row="6" column="0" colspan="2"> + <widget class="QCheckBox" name="qtHelpGenerateCollectionCheckBox"> + <property name="toolTip"> <string>Select to generate the QtHelp collection files</string> </property> - <property name="text" > + <property name="text"> <string>Generate QtHelp collection files</string> </property> </widget> </item> - <item row="7" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="7" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>271</height> @@ -515,18 +504,18 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>tabWidget</tabstop> @@ -569,11 +558,11 @@ <receiver>EricdocConfigDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>31</x> <y>480</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>31</x> <y>498</y> </hint> @@ -585,11 +574,11 @@ <receiver>EricdocConfigDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>125</x> <y>482</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>125</x> <y>499</y> </hint>
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -15,6 +15,7 @@ from E5Gui import E5FileDialog, E5MessageBox import Utilities +import UI.PixmapCache from .Ui_HgAddSubrepositoryDialog import Ui_HgAddSubrepositoryDialog @@ -33,6 +34,8 @@ super().__init__(parent) self.setupUi(self) + self.pathButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__ok = self.buttonBox.button(QDialogButtonBox.Ok) self.__ok.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>550</width> - <height>135</height> + <height>142</height> </rect> </property> <property name="windowTitle"> @@ -41,9 +41,6 @@ <property name="toolTip"> <string>Select the path of the sub-repository with a directory selection dialog</string> </property> - <property name="text"> - <string notr="true">...</string> - </property> </widget> </item> </layout>
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_HgArchiveDialog import Ui_HgArchiveDialog import Utilities +import UI.PixmapCache class HgArchiveDialog(QDialog, Ui_HgArchiveDialog): @@ -32,6 +33,8 @@ super().__init__(parent) self.setupUi(self) + self.archiveButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__archiveFileCompleter = E5FileCompleter() self.__archiveDirCompleter = E5DirCompleter() self.__activeCompleter = self.__archiveFileCompleter
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>145</height> + <height>167</height> </rect> </property> <property name="windowTitle"> @@ -31,16 +31,6 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QPushButton" name="archiveButton"> - <property name="toolTip"> - <string>Press to select the archive file name via a file selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> @@ -89,6 +79,13 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="archiveButton"> + <property name="toolTip"> + <string>Press to select the archive file name via a file selection dialog</string> + </property> + </widget> + </item> </layout> </widget> <tabstops>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ from .Ui_HgCopyDialog import Ui_HgCopyDialog import Utilities +import UI.PixmapCache class HgCopyDialog(QDialog, Ui_HgCopyDialog): @@ -36,6 +37,8 @@ """ super().__init__(parent) self.setupUi(self) + + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) self.source = source if os.path.isdir(self.source):
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -19,20 +19,6 @@ <layout class="QVBoxLayout"> <item> <layout class="QGridLayout"> - <item row="1" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Press to open a selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Target directory</b> -<p>Select the target name for the operation via a selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -72,6 +58,17 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Press to open a selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ from .Ui_HgExportDialog import Ui_HgExportDialog import Utilities +import UI.PixmapCache class HgExportDialog(QDialog, Ui_HgExportDialog): @@ -33,6 +34,8 @@ super().__init__(parent) self.setupUi(self) + self.directoryButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) self.__directoryCompleter = E5DirCompleter(self.directoryEdit)
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>456</width> - <height>299</height> + <height>301</height> </rect> </property> <property name="windowTitle"> @@ -29,16 +29,6 @@ <item row="0" column="1"> <widget class="QLineEdit" name="directoryEdit"/> </item> - <item row="0" column="2"> - <widget class="QPushButton" name="directoryButton"> - <property name="toolTip"> - <string>Press to select the export directory via a directory selection dialog</string> - </property> - <property name="text"> - <string notr="true">...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> @@ -89,6 +79,13 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="directoryButton"> + <property name="toolTip"> + <string>Press to select the export directory via a directory selection dialog</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_HgImportDialog import Ui_HgImportDialog import Utilities +import UI.PixmapCache class HgImportDialog(QDialog, Ui_HgImportDialog): @@ -31,6 +32,8 @@ super().__init__(parent) self.setupUi(self) + self.patchFileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) self.__patchFileCompleter = E5FileCompleter(self.patchFileEdit)
--- a/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>500</width> - <height>374</height> + <height>380</height> </rect> </property> <property name="windowTitle"> @@ -173,13 +173,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="patchFileButton"> + <widget class="QToolButton" name="patchFileButton"> <property name="toolTip"> <string>Press to select the patch file via a file selection dialog</string> </property> - <property name="text"> - <string notr="true">...</string> - </property> </widget> </item> </layout>
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,6 +21,7 @@ import Utilities import Preferences +import UI.PixmapCache class HgNewProjectOptionsDialog(QDialog, Ui_HgNewProjectOptionsDialog): @@ -38,6 +39,9 @@ super().__init__(parent) self.setupUi(self) + self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit) self.vcsProjectDirCompleter = E5DirCompleter(self.vcsProjectDirEdit)
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -58,16 +58,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="vcsRevisionLabel"> <property name="text"> @@ -110,13 +100,16 @@ </property> </widget> </item> - <item row="3" column="2"> - <widget class="QPushButton" name="projectDirButton"> - <property name="text"> - <string>...</string> + <item row="1" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog</string> </property> </widget> </item> + <item row="3" column="2"> + <widget class="QToolButton" name="projectDirButton"/> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,7 +16,7 @@ from .Ui_SvnCommandDialog import Ui_SvnCommandDialog import Utilities - +import UI.PixmapCache class SvnCommandDialog(QDialog, Ui_SvnCommandDialog): """ @@ -38,6 +38,8 @@ super().__init__(parent) self.setupUi(self) + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.workdirCompleter = E5DirCompleter(self.workdirCombo) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>628</width> - <height>137</height> + <height>141</height> </rect> </property> <property name="windowTitle"> @@ -58,20 +58,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select the working directory via a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Working directory</b> -<p>Select the working directory for the Subversion command via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="1"> <widget class="QComboBox" name="workdirCombo"> <property name="sizePolicy"> @@ -139,6 +125,17 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select the working directory via a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Working directory</b> +<p>Select the working directory for the Subversion command via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ from .Ui_SvnCopyDialog import Ui_SvnCopyDialog import Utilities +import UI.PixmapCache class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): @@ -37,6 +38,8 @@ super().__init__(parent) self.setupUi(self) + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.source = source if os.path.isdir(self.source): self.targetCompleter = E5DirCompleter(self.targetEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>409</width> - <height>135</height> + <height>138</height> </rect> </property> <property name="windowTitle"> @@ -19,20 +19,6 @@ <layout class="QVBoxLayout"> <item> <layout class="QGridLayout"> - <item row="1" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Press to open a selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Target name</b> -<p>Select the target name for the operation via a selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -72,6 +58,17 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Press to open a selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Target name</b> +<p>Select the target name for the operation via a selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,7 +21,7 @@ import Utilities import Preferences - +import UI.PixmapCache class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog): """ @@ -38,6 +38,9 @@ super().__init__(parent) self.setupUi(self) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit) self.vcsProjectDirCompleter = E5DirCompleter(self.vcsProjectDirEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -35,16 +35,6 @@ </property> </widget> </item> - <item row="3" column="2"> - <widget class="QPushButton" name="projectDirButton"> - <property name="toolTip"> - <string>Select the project directory via a directory selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QComboBox" name="protocolCombo"> <property name="toolTip"> @@ -110,16 +100,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog or the repository browser</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="3" column="0"> <widget class="QLabel" name="TextLabel4"> <property name="text"> @@ -140,6 +120,20 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog or the repository browser</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QToolButton" name="projectDirButton"> + <property name="toolTip"> + <string>Select the project directory via a directory selection dialog</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -20,6 +20,7 @@ from .Config import ConfigSvnProtocols import Utilities +import UI.PixmapCache class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog): @@ -38,6 +39,8 @@ super().__init__(parent) self.setupUi(self) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit) self.project = project
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>565</width> - <height>165</height> + <height>169</height> </rect> </property> <property name="windowTitle"> @@ -57,16 +57,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog or the repository browser</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="vcsUrlLabel"> <property name="text"> @@ -111,6 +101,13 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog or the repository browser</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_SvnCommandDialog import Ui_SvnCommandDialog import Utilities +import UI.PixmapCache class SvnCommandDialog(QDialog, Ui_SvnCommandDialog): @@ -38,6 +39,8 @@ super().__init__(parent) self.setupUi(self) + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.workdirCompleter = E5DirCompleter(self.workdirCombo) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>628</width> - <height>137</height> + <height>141</height> </rect> </property> <property name="windowTitle"> @@ -58,20 +58,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Select the working directory via a directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Working directory</b> -<p>Select the working directory for the Subversion command via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="1"> <widget class="QComboBox" name="workdirCombo"> <property name="sizePolicy"> @@ -139,6 +125,17 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Select the working directory via a directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Working directory</b> +<p>Select the working directory for the Subversion command via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,7 +18,7 @@ from .Ui_SvnCopyDialog import Ui_SvnCopyDialog import Utilities - +import UI.PixmapCache class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ @@ -36,7 +36,9 @@ """ super().__init__(parent) self.setupUi(self) - + + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.source = source if os.path.isdir(self.source): self.targetCompleter = E5DirCompleter(self.targetEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>409</width> - <height>135</height> + <height>138</height> </rect> </property> <property name="windowTitle"> @@ -19,20 +19,6 @@ <layout class="QVBoxLayout"> <item> <layout class="QGridLayout"> - <item row="1" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Press to open a selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Target directory</b> -<p>Select the target name for the operation via a selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="textLabel1"> <property name="text"> @@ -72,6 +58,17 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Press to open a selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Target directory</b> +<p>Select the target name for the operation via a selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,6 +21,7 @@ import Utilities import Preferences +import UI.PixmapCache class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog): @@ -38,6 +39,9 @@ super().__init__(parent) self.setupUi(self) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.projectDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit) self.vcsProjectDirCompleter = E5DirCompleter(self.vcsProjectDirEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -35,13 +35,6 @@ </property> </widget> </item> - <item row="3" column="2"> - <widget class="QPushButton" name="projectDirButton"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QComboBox" name="protocolCombo"> <property name="toolTip"> @@ -107,16 +100,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog or the repository browser</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="3" column="0"> <widget class="QLabel" name="TextLabel4"> <property name="text"> @@ -137,6 +120,16 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog or the repository browser</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QToolButton" name="projectDirButton"/> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -20,6 +20,7 @@ from .Config import ConfigSvnProtocols import Utilities +import UI.PixmapCache class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog): @@ -38,6 +39,8 @@ super().__init__(parent) self.setupUi(self) + self.vcsUrlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit) self.project = project
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>565</width> - <height>167</height> + <height>169</height> </rect> </property> <property name="windowTitle"> @@ -57,16 +57,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog or the repository browser</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="vcsUrlLabel"> <property name="text"> @@ -111,6 +101,13 @@ </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="vcsUrlButton"> + <property name="toolTip"> + <string>Select the repository url via a directory selection dialog or the repository browser</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog import Utilities +import UI.PixmapCache class SvnPropSetDialog(QDialog, Ui_SvnPropSetDialog): @@ -31,6 +32,8 @@ super().__init__(parent) self.setupUi(self) + self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.propFileCompleter = E5FileCompleter(self.propFileEdit) @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnPropSetDialog</class> - <widget class="QDialog" name="SvnPropSetDialog" > - <property name="geometry" > + <widget class="QDialog" name="SvnPropSetDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,25 +10,25 @@ <height>385</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Set Subversion Property</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>Property Name:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="propNameEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="propNameEdit"> + <property name="toolTip"> <string>Enter the name of the property to be set</string> </property> </widget> @@ -35,64 +36,61 @@ </layout> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Select property source</string> </property> - <layout class="QGridLayout" > - <item row="2" column="0" colspan="2" > - <widget class="QRadioButton" name="fileRadioButton" > - <property name="focusPolicy" > + <layout class="QGridLayout"> + <item row="2" column="0" colspan="2"> + <widget class="QRadioButton" name="fileRadioButton"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="text" > + <property name="text"> <string>File</string> </property> </widget> </item> - <item row="0" column="0" colspan="2" > - <widget class="QRadioButton" name="textRadioButton" > - <property name="text" > + <item row="0" column="0" colspan="2"> + <widget class="QRadioButton" name="textRadioButton"> + <property name="text"> <string>Text</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QTextEdit" name="propTextEdit" > - <property name="toolTip" > + <item row="1" column="0" colspan="2"> + <widget class="QTextEdit" name="propTextEdit"> + <property name="toolTip"> <string>Enter text of the property</string> </property> - <property name="tabChangesFocus" > + <property name="tabChangesFocus"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QPushButton" name="fileButton" > - <property name="enabled" > + <item row="3" column="0"> + <widget class="QLineEdit" name="propFileEdit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > - <string>Press to select the file via a file selection dialog</string> - </property> - <property name="text" > - <string>...</string> + <property name="toolTip"> + <string>Enter the name of a file for the property</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLineEdit" name="propFileEdit" > - <property name="enabled" > + <item row="3" column="1"> + <widget class="QToolButton" name="fileButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > - <string>Enter the name of a file for the property</string> + <property name="toolTip"> + <string>Press to select the file via a file selection dialog</string> </property> </widget> </item> @@ -100,18 +98,18 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>propNameEdit</tabstop> @@ -128,11 +126,11 @@ <receiver>propTextEdit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>49</x> <y>78</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>76</x> <y>140</y> </hint> @@ -144,43 +142,27 @@ <receiver>propFileEdit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>35</x> <y>287</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>49</x> <y>319</y> </hint> </hints> </connection> <connection> - <sender>fileRadioButton</sender> - <signal>toggled(bool)</signal> - <receiver>fileButton</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel" > - <x>454</x> - <y>290</y> - </hint> - <hint type="destinationlabel" > - <x>450</x> - <y>317</y> - </hint> - </hints> - </connection> - <connection> <sender>buttonBox</sender> <signal>accepted()</signal> <receiver>SvnPropSetDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>67</x> <y>360</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>74</x> <y>380</y> </hint> @@ -192,11 +174,11 @@ <receiver>SvnPropSetDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>196</x> <y>367</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>199</x> <y>385</y> </hint>
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -110,9 +110,6 @@ The following example could clarify the regexp which match a valid date: </p> <p>(?#year)(19|20)\d\d[- /.](?#month)(0[1-9]|1[012])[- /.](?#day)(0[1-9]|[12][0-9]|3[01])</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -123,9 +120,6 @@ <property name="whatsThis"> <string><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p>s</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -140,9 +134,6 @@ E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -155,9 +146,6 @@ <string><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -172,9 +160,6 @@ group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -191,9 +176,6 @@ One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -209,9 +191,6 @@ the work to do on the match becomes a bit complicated. One can access the backreference via the group name (i.e (?P=<i>groupname</i>)). E.g. (?P<foo>[abc])x(?P=foo)x(?P=foo)x matches 'axaxax','bxbxbx' or 'cxcxcx' ('foo' is the group name)</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -226,9 +205,6 @@ found by the corresponding named group. In the following example, (?P=foo) may refer to the charaters 'a','b' or 'c'.</p> <p>E.g. (?P<foo>[abc])x(?P=foo)x(?P=foo)x matches 'axaxax','bxbxbx' or 'cxcxcx'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -244,9 +220,6 @@ Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -260,9 +233,6 @@ <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -275,9 +245,6 @@ <string><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -291,9 +258,6 @@ <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -307,9 +271,6 @@ <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -324,9 +285,6 @@ Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -341,9 +299,6 @@ followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a trivial regexp which may be replaced by a more complex expression; 'q(?![abc])' will match a 'q' if it is followed by anything else than 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -358,9 +313,6 @@ It is used to match a character only if preceded by another one. Writting '(?&lt;=u)q' means that you want to match the 'q' character only if it is preceded by 'u'. As with lookhead, 'u' may be replaced by a more complex expression; '(?&lt;=[abc])q' will match a 'q' if preceded by either 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -376,9 +328,6 @@ character only if it is not preceded by 'u'. As other lookaround, 'u' may be replaced by a more complex expression; '(?&lt;![abc])q' will match a 'q' only if not preceded by either 'a', 'b' nor 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -402,9 +351,6 @@ <property name="toolTip"> <string><b>Undo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -412,9 +358,6 @@ <property name="toolTip"> <string><b>Redo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item>
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -78,9 +78,6 @@ <property name="toolTip"> <string><b>Undo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -88,9 +85,6 @@ <property name="toolTip"> <string><b>Redo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -111,7 +105,16 @@ <item> <widget class="QFrame" name="regexpButtonsFrame"> <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -122,9 +125,6 @@ <property name="whatsThis"> <string><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -139,9 +139,6 @@ E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -154,9 +151,6 @@ <string><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -171,9 +165,6 @@ group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -190,9 +181,6 @@ One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -208,9 +196,6 @@ Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -224,9 +209,6 @@ <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -239,9 +221,6 @@ <string><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -255,9 +234,6 @@ <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -271,9 +247,6 @@ <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -288,9 +261,6 @@ Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -305,9 +275,6 @@ followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a trivial regexp which may be replaced by a more complex expression; 'q(?![abc])' will match a 'q' if it is followed by anything else than 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -332,7 +299,16 @@ <item> <widget class="QFrame" name="wildcardButtonsFrame"> <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -343,9 +319,6 @@ <property name="whatsThis"> <string><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -359,9 +332,6 @@ <p>Select to insert a question mark (?) in your regexp. The question mark matches a single character. E.g. 'gr?y' matches 'gray', 'grey', 'gr%y', etc.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -374,9 +344,6 @@ <string><b>Repeat contents</b> <p>Inserts a repetition (*) character into the regexp. That will match zero or more of any character.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -398,7 +365,16 @@ <item> <widget class="QFrame" name="w3cButtonsFrame"> <layout class="QHBoxLayout" name="horizontalLayout_4"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -409,9 +385,6 @@ <property name="whatsThis"> <string><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -426,9 +399,6 @@ E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -441,9 +411,6 @@ <string><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -457,9 +424,6 @@ <p>Select to insert some capturing brackets. They can be used to apply a regexp quantifier (e.g. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(Value)?' matches 'Set' or 'SetValue'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -473,9 +437,6 @@ <p>Select to insert the alternation symbol '|'. The alternation is used to match a single regular expression out of several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item>
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -58,9 +58,6 @@ The following example could clarify the regexp which match a valid date: </p> <p>(?#year)(19|20)\d\d[- /.](?#month)(0[1-9]|1[012])[- /.](?#day)(0[1-9]|[12][0-9]|3[01])</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -71,9 +68,6 @@ <property name="whatsThis"> <string><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p>s</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -88,9 +82,6 @@ E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -103,9 +94,6 @@ <string><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -120,9 +108,6 @@ group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -137,9 +122,6 @@ group of characters inside the brakets. E.g. the regex 'Set(?>Value)?' matches 'Set' or 'SetValue'. The '?>' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -156,9 +138,6 @@ One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -174,9 +153,6 @@ the work to do on the match becomes a bit complicated. One can access the backreference via the group name (i.e (?P=<i>groupname</i>)). E.g. (?P<foo>[abc])x(?P=foo)x(?P=foo)x matches 'axaxax','bxbxbx' or 'cxcxcx' ('foo' is the group name)</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -191,9 +167,6 @@ found by the corresponding named group. In the following example, (?P=foo) may refer to the charaters 'a','b' or 'c'.</p> <p>E.g. (?P<foo>[abc])x(?P=foo)x(?P=foo)x matches 'axaxax','bxbxbx' or 'cxcxcx'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -209,9 +182,6 @@ Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -225,9 +195,6 @@ <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -240,9 +207,6 @@ <string><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -256,9 +220,6 @@ <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -272,9 +233,6 @@ <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -289,9 +247,6 @@ Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -306,9 +261,6 @@ followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a trivial regexp which may be replaced by a more complex expression; 'q(?![abc])' will match a 'q' if it is followed by anything else than 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -323,9 +275,6 @@ It is used to match a character only if preceded by another one. Writting '(?&lt;=u)q' means that you want to match the 'q' character only if it is preceded by 'u'. As with lookhead, 'u' may be replaced by a more complex expression; '(?&lt;=[abc])q' will match a 'q' if preceded by either 'a', 'b' or 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -341,9 +290,6 @@ character only if it is not preceded by 'u'. As other lookaround, 'u' may be replaced by a more complex expression; '(?&lt;![abc])q' will match a 'q' only if not preceded by either 'a', 'b' nor 'c'.</p></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -367,9 +313,6 @@ <property name="toolTip"> <string><b>Undo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -377,9 +320,6 @@ <property name="toolTip"> <string><b>Redo last edit</b></string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item>
--- a/Preferences/ConfigurationPages/CorbaPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class CorbaPage(ConfigurationPageBase, Ui_CorbaPage): @@ -31,6 +32,8 @@ self.setupUi(self) self.setObjectName("CorbaPage") + self.idlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.idlCompleter = E5FileCompleter(self.idlEdit) # set initial values
--- a/Preferences/ConfigurationPages/CorbaPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>CorbaPage</class> - <widget class="QWidget" name="CorbaPage" > - <property name="geometry" > + <widget class="QWidget" name="CorbaPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,54 +10,51 @@ <height>490</height> </rect> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure CORBA support</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure CORBA support</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line13" > - <property name="frameShape" > + <widget class="Line" name="line13"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>IDL Compiler</string> </property> - <layout class="QGridLayout" > - <item row="0" column="1" > - <widget class="QPushButton" name="idlButton" > - <property name="toolTip" > - <string>Press to select the IDL compiler via a file selection dialog.</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLineEdit" name="idlEdit" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QLineEdit" name="idlEdit"> + <property name="toolTip"> <string>Enter the path to the IDL compiler.</string> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QLabel" name="textLabel1_4" > - <property name="text" > - <string><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</string> + <item row="1" column="0" colspan="2"> + <widget class="QLabel" name="textLabel1_4"> + <property name="text"> + <string><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="idlButton"> + <property name="toolTip"> + <string>Press to select the IDL compiler via a file selection dialog.</string> </property> </widget> </item> @@ -65,10 +63,10 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>81</height>
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class DebuggerPython3Page(ConfigurationPageBase, Ui_DebuggerPython3Page): @@ -31,6 +32,9 @@ self.setupUi(self) self.setObjectName("DebuggerPython3Page") + self.interpreterButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.debugClientButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.interpreterCompleter = E5FileCompleter(self.interpreterEdit) self.debugClientCompleter = E5FileCompleter(self.debugClientEdit)
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>453</width> + <width>455</width> <height>449</height> </rect> </property> @@ -55,13 +55,10 @@ </widget> </item> <item row="1" column="1"> - <widget class="QPushButton" name="interpreterButton"> + <widget class="QToolButton" name="interpreterButton"> <property name="toolTip"> <string>Press to select the Python3 interpreter via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -86,16 +83,13 @@ </widget> </item> <item> - <widget class="QPushButton" name="debugClientButton"> + <widget class="QToolButton" name="debugClientButton"> <property name="enabled"> <bool>false</bool> </property> <property name="toolTip"> <string>Press to select the Debug Client via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -221,21 +215,5 @@ </hint> </hints> </connection> - <connection> - <sender>customButton</sender> - <signal>toggled(bool)</signal> - <receiver>debugClientButton</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>455</x> - <y>195</y> - </hint> - <hint type="destinationlabel"> - <x>463</x> - <y>222</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class DebuggerPythonPage(ConfigurationPageBase, Ui_DebuggerPythonPage): @@ -31,6 +32,9 @@ self.setupUi(self) self.setObjectName("DebuggerPythonPage") + self.interpreterButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.debugClientButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.interpreterCompleter = E5FileCompleter(self.interpreterEdit) self.debugClientCompleter = E5FileCompleter(self.debugClientEdit)
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>453</width> + <width>455</width> <height>449</height> </rect> </property> @@ -45,13 +45,10 @@ </widget> </item> <item row="0" column="1"> - <widget class="QPushButton" name="interpreterButton"> + <widget class="QToolButton" name="interpreterButton"> <property name="toolTip"> <string>Press to select the Python interpreter via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -76,16 +73,13 @@ </widget> </item> <item> - <widget class="QPushButton" name="debugClientButton"> + <widget class="QToolButton" name="debugClientButton"> <property name="enabled"> <bool>false</bool> </property> <property name="toolTip"> <string>Press to select the Debug Client via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -210,21 +204,5 @@ </hint> </hints> </connection> - <connection> - <sender>customButton</sender> - <signal>toggled(bool)</signal> - <receiver>debugClientButton</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>455</x> - <y>195</y> - </hint> - <hint type="destinationlabel"> - <x>463</x> - <y>222</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class DebuggerRubyPage(ConfigurationPageBase, Ui_DebuggerRubyPage): @@ -31,6 +32,8 @@ self.setupUi(self) self.setObjectName("DebuggerRubyPage") + self.rubyInterpreterButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.rubyInterpreterCompleter = E5FileCompleter( self.rubyInterpreterEdit)
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -45,13 +45,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="rubyInterpreterButton"> + <widget class="QToolButton" name="rubyInterpreterButton"> <property name="toolTip"> <string>Press to select the Ruby interpreter via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -19,6 +19,7 @@ import Preferences import Utilities +import UI.PixmapCache class EditorAPIsPage(ConfigurationPageBase, Ui_EditorAPIsPage): @@ -33,6 +34,8 @@ self.setupUi(self) self.setObjectName("EditorAPIsPage") + self.apiFileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.prepareApiButton.setText(self.trUtf8("Compile APIs")) self.__currentAPI = None self.__inPreparation = False
--- a/Preferences/ConfigurationPages/EditorAPIsPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>EditorAPIsPage</class> - <widget class="QWidget" name="EditorAPIsPage" > - <property name="geometry" > + <widget class="QWidget" name="EditorAPIsPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,61 +10,61 @@ <height>422</height> </rect> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure API files</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure API files</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line5" > - <property name="frameShape" > + <widget class="Line" name="line5"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QCheckBox" name="apiAutoPrepareCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="apiAutoPrepareCheckBox"> + <property name="toolTip"> <string>Select to compile the APIs automatically upon loading</string> </property> - <property name="text" > + <property name="text"> <string>Compile APIs automatically</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="TextLabel1_3_3" > - <property name="toolTip" > + <widget class="QLabel" name="TextLabel1_3_3"> + <property name="toolTip"> <string/> </property> - <property name="text" > + <property name="text"> <string>Language:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring></cstring> </property> </widget> </item> <item> - <widget class="QComboBox" name="apiLanguageComboBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <widget class="QComboBox" name="apiLanguageComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select the language to be configured.</string> </property> </widget> @@ -71,111 +72,108 @@ </layout> </item> <item> - <widget class="QGroupBox" name="apiGroup" > - <property name="enabled" > + <widget class="QGroupBox" name="apiGroup"> + <property name="enabled"> <bool>false</bool> </property> - <property name="title" > + <property name="title"> <string>APIs</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" colspan="4" > - <widget class="QListWidget" name="apiList" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="0" column="0" colspan="4"> + <widget class="QListWidget" name="apiList"> + <property name="toolTip"> <string>List of API files</string> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QPushButton" name="deleteApiFileButton" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QPushButton" name="deleteApiFileButton"> + <property name="toolTip"> <string>Press to delete the selected file from the list</string> </property> - <property name="text" > + <property name="text"> <string>Delete</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QPushButton" name="addApiFileButton" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QPushButton" name="addApiFileButton"> + <property name="toolTip"> <string>Press to add the entered file to the list</string> </property> - <property name="text" > + <property name="text"> <string>Add</string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QLineEdit" name="apiFileEdit" > - <property name="toolTip" > + <item row="1" column="2"> + <widget class="QLineEdit" name="apiFileEdit"> + <property name="toolTip"> <string>Enter a file to be added</string> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="apiFileButton" > - <property name="toolTip" > - <string>Press to select an API file via a selection dialog</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="2" column="1" colspan="3" > - <widget class="QPushButton" name="addInstalledApiFileButton" > - <property name="toolTip" > + <item row="2" column="1" colspan="3"> + <widget class="QPushButton" name="addInstalledApiFileButton"> + <property name="toolTip"> <string>Press to select an API file from the list of installed API files</string> </property> - <property name="text" > + <property name="text"> <string>Add from installed APIs</string> </property> </widget> </item> - <item row="3" column="1" colspan="3" > - <widget class="QPushButton" name="addPluginApiFileButton" > - <property name="toolTip" > + <item row="3" column="1" colspan="3"> + <widget class="QPushButton" name="addPluginApiFileButton"> + <property name="toolTip"> <string>Press to select an API file from the list of API files installed by plugins</string> </property> - <property name="text" > + <property name="text"> <string>Add from Plugin APIs</string> </property> </widget> </item> - <item row="4" column="0" colspan="4" > - <widget class="Line" name="line" > - <property name="orientation" > + <item row="4" column="0" colspan="4"> + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="5" column="0" colspan="2" > - <widget class="QPushButton" name="prepareApiButton" > - <property name="toolTip" > + <item row="5" column="0" colspan="2"> + <widget class="QPushButton" name="prepareApiButton"> + <property name="toolTip"> <string>Press to compile the selected APIs definition</string> </property> - <property name="text" > + <property name="text"> <string>Compile APIs</string> </property> </widget> </item> - <item row="5" column="2" colspan="2" > - <widget class="QProgressBar" name="prepareApiProgressBar" > - <property name="value" > + <item row="5" column="2" colspan="2"> + <widget class="QProgressBar" name="prepareApiProgressBar"> + <property name="value"> <number>0</number> </property> - <property name="textVisible" > + <property name="textVisible"> <bool>false</bool> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> + <item row="1" column="3"> + <widget class="QToolButton" name="apiFileButton"> + <property name="toolTip"> + <string>Press to select an API file via a selection dialog</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class EditorSpellCheckingPage(ConfigurationPageBase, @@ -32,6 +33,9 @@ self.setupUi(self) self.setObjectName("EditorSpellCheckingPage") + self.pwlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pelButton.setIcon(UI.PixmapCache.getIcon("open.png")) + from QScintilla.SpellChecker import SpellChecker languages = sorted(SpellChecker.getAvailableLanguages()) self.defaultLanguageCombo.addItems(languages)
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>576</width> + <width>578</width> <height>666</height> </rect> </property> @@ -47,7 +47,16 @@ <enum>QFrame::Plain</enum> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -229,16 +238,6 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QPushButton" name="pwlButton"> - <property name="toolTip"> - <string>Select the personal word list file via a file selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> @@ -253,16 +252,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="pelButton"> - <property name="toolTip"> - <string>Select the personal exclude list file via a file selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0" colspan="3"> <widget class="QLabel" name="label_6"> <property name="text"> @@ -277,6 +266,20 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="pwlButton"> + <property name="toolTip"> + <string>Select the personal word list file via a file selection dialog</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="pelButton"> + <property name="toolTip"> + <string>Select the personal exclude list file via a file selection dialog</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class HelpAppearancePage(ConfigurationPageBase, Ui_HelpAppearancePage): @@ -31,6 +32,8 @@ self.setupUi(self) self.setObjectName("HelpAppearancePage") + self.styleSheetButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.styleSheetCompleter = E5FileCompleter(self.styleSheetEdit) self.__displayMode = None
--- a/Preferences/ConfigurationPages/HelpAppearancePage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>497</width> + <width>499</width> <height>547</height> </rect> </property> @@ -177,13 +177,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="styleSheetButton"> + <widget class="QToolButton" name="styleSheetButton"> <property name="toolTip"> <string>Select the user style sheet via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class HelpDocumentationPage(ConfigurationPageBase, Ui_HelpDocumentationPage): @@ -31,9 +32,18 @@ self.setupUi(self) self.setObjectName("HelpDocumentationPage") + self.python2DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pythonDocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.qt4DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.qt5DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pyqt4DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pyqt5DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pysideDocDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.python2DocDirCompleter = E5FileCompleter(self.python2DocDirEdit) self.pythonDocDirCompleter = E5FileCompleter(self.pythonDocDirEdit) self.qt4DocDirCompleter = E5FileCompleter(self.qt4DocDirEdit) + self.qt5DocDirCompleter = E5FileCompleter(self.qt5DocDirEdit) self.pyqt4DocDirCompleter = E5FileCompleter(self.pyqt4DocDirEdit) self.pyqt5DocDirCompleter = E5FileCompleter(self.pyqt5DocDirEdit) self.pysideDocDirCompleter = E5FileCompleter(self.pysideDocDirEdit)
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>526</width> - <height>842</height> + <height>894</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -37,16 +37,6 @@ <string>Python 2 Documentation</string> </property> <layout class="QGridLayout" name="_2"> - <item row="0" column="1"> - <widget class="QPushButton" name="python2DocDirButton"> - <property name="toolTip"> - <string>Press to select the Python 2 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="python2DocDirEdit"> <property name="toolTip"> @@ -64,6 +54,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="python2DocDirButton"> + <property name="toolTip"> + <string>Press to select the Python 2 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -73,16 +70,6 @@ <string>Python 3 Documentation</string> </property> <layout class="QGridLayout"> - <item row="0" column="1"> - <widget class="QPushButton" name="pythonDocDirButton"> - <property name="toolTip"> - <string>Press to select the Python 3 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="pythonDocDirEdit"> <property name="toolTip"> @@ -100,6 +87,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="pythonDocDirButton"> + <property name="toolTip"> + <string>Press to select the Python 3 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -109,16 +103,6 @@ <string>Qt4 Documentation</string> </property> <layout class="QGridLayout"> - <item row="0" column="1"> - <widget class="QPushButton" name="qt4DocDirButton"> - <property name="toolTip"> - <string>Press to select the Qt4 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="qt4DocDirEdit"> <property name="toolTip"> @@ -136,6 +120,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="qt4DocDirButton"> + <property name="toolTip"> + <string>Press to select the Qt4 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -145,16 +136,6 @@ <string>Qt5 Documentation</string> </property> <layout class="QGridLayout" name="_3"> - <item row="0" column="1"> - <widget class="QPushButton" name="qt5DocDirButton"> - <property name="toolTip"> - <string>Press to select the Qt5 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="qt5DocDirEdit"> <property name="toolTip"> @@ -172,6 +153,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="qt5DocDirButton"> + <property name="toolTip"> + <string>Press to select the Qt5 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -181,16 +169,6 @@ <string>PyQt4 Documentation</string> </property> <layout class="QGridLayout"> - <item row="0" column="1"> - <widget class="QPushButton" name="pyqt4DocDirButton"> - <property name="toolTip"> - <string>Press to select the PyQt4 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="pyqt4DocDirEdit"> <property name="toolTip"> @@ -208,6 +186,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="pyqt4DocDirButton"> + <property name="toolTip"> + <string>Press to select the PyQt4 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -217,16 +202,6 @@ <string>PyQt5 Documentation</string> </property> <layout class="QGridLayout" name="_4"> - <item row="0" column="1"> - <widget class="QPushButton" name="pyqt5DocDirButton"> - <property name="toolTip"> - <string>Press to select the PyQt5 documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="pyqt5DocDirEdit"> <property name="toolTip"> @@ -244,6 +219,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="pyqt5DocDirButton"> + <property name="toolTip"> + <string>Press to select the PyQt5 documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -253,16 +235,6 @@ <string>PySide Documentation</string> </property> <layout class="QGridLayout"> - <item row="0" column="1"> - <widget class="QPushButton" name="pysideDocDirButton"> - <property name="toolTip"> - <string>Press to select the PySide documentation directory via a dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLineEdit" name="pysideDocDirEdit"> <property name="toolTip"> @@ -280,6 +252,13 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QToolButton" name="pysideDocDirButton"> + <property name="toolTip"> + <string>Press to select the PySide documentation directory via a dialog</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/ConfigurationPages/HelpInterfacePage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpInterfacePage.py Wed Jan 08 19:07:23 2014 +0100 @@ -15,7 +15,7 @@ import Preferences import Utilities - +import UI.PixmapCache class HelpInterfacePage(ConfigurationPageBase, Ui_HelpInterfacePage): """ @@ -30,6 +30,8 @@ self.setupUi(self) self.setObjectName("InterfacePage") + self.styleSheetButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.styleSheetCompleter = E5FileCompleter(self.styleSheetEdit) # set initial values
--- a/Preferences/ConfigurationPages/HelpInterfacePage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpInterfacePage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>555</width> + <width>557</width> <height>152</height> </rect> </property> @@ -62,13 +62,10 @@ </widget> </item> <item row="1" column="2"> - <widget class="QPushButton" name="styleSheetButton"> + <widget class="QToolButton" name="styleSheetButton"> <property name="toolTip"> <string>Select the style sheet file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,7 +18,7 @@ import Preferences import Utilities - +import UI.PixmapCache class HelpViewersPage(ConfigurationPageBase, Ui_HelpViewersPage): """ @@ -32,6 +32,8 @@ self.setupUi(self) self.setObjectName("HelpViewersPage") + self.customViewerButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.helpViewerGroup = QButtonGroup() self.helpViewerGroup.addButton(self.helpBrowserButton) self.helpViewerGroup.addButton(self.qtAssistantButton)
--- a/Preferences/ConfigurationPages/HelpViewersPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/HelpViewersPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -50,16 +50,13 @@ </widget> </item> <item> - <widget class="QPushButton" name="customViewerSelectionButton"> + <widget class="QToolButton" name="customViewerSelectionButton"> <property name="enabled"> <bool>false</bool> </property> <property name="toolTip"> <string>Press to select the custom viewer via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -151,21 +148,5 @@ </hint> </hints> </connection> - <connection> - <sender>customViewerButton</sender> - <signal>toggled(bool)</signal> - <receiver>customViewerSelectionButton</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>592</x> - <y>94</y> - </hint> - <hint type="destinationlabel"> - <x>591</x> - <y>127</y> - </hint> - </hints> - </connection> </connections> </ui>
--- a/Preferences/ConfigurationPages/IconsPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/IconsPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities +import UI.PixmapCache class IconsPage(ConfigurationPageBase, Ui_IconsPage): @@ -32,6 +33,8 @@ self.setupUi(self) self.setObjectName("IconsPage") + self.iconDirectoryButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.iconDirectoryCompleter = E5DirCompleter(self.iconDirectoryEdit) # set initial values
--- a/Preferences/ConfigurationPages/IconsPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/IconsPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>IconsPage</class> - <widget class="QWidget" name="IconsPage" > - <property name="geometry" > + <widget class="QWidget" name="IconsPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,102 +10,99 @@ <height>371</height> </rect> </property> - <layout class="QGridLayout" > - <item row="0" column="0" colspan="2" > - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure icon directories</b></string> + <layout class="QGridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure icon directories</b></string> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="Line" name="line10" > - <property name="frameShape" > + <item row="1" column="0" colspan="2"> + <widget class="Line" name="line10"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="2" column="0" colspan="2" > - <widget class="QLabel" name="TextLabel1_2_2_2_2" > - <property name="text" > - <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="TextLabel1_2_2_2_2"> + <property name="text"> + <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> </property> </widget> </item> - <item row="4" column="0" > - <layout class="QHBoxLayout" > + <item row="4" column="0"> + <layout class="QHBoxLayout"> <item> - <widget class="QPushButton" name="deleteIconDirectoryButton" > - <property name="enabled" > + <widget class="QPushButton" name="deleteIconDirectoryButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Press to delete the selected directory from the list</string> </property> - <property name="text" > + <property name="text"> <string>Delete</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="addIconDirectoryButton" > - <property name="enabled" > + <widget class="QPushButton" name="addIconDirectoryButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Press to add the entered directory to the list</string> </property> - <property name="text" > + <property name="text"> <string>Add</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="iconDirectoryEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="iconDirectoryEdit"> + <property name="toolTip"> <string>Enter a directory to be added</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="iconDirectoryButton" > - <property name="toolTip" > + <widget class="QToolButton" name="iconDirectoryButton"> + <property name="toolTip"> <string>Press to select an icon directory via a selection dialog</string> </property> - <property name="text" > - <string>...</string> - </property> </widget> </item> </layout> </item> - <item row="4" column="1" > - <widget class="QPushButton" name="showIconsButton" > - <property name="enabled" > + <item row="4" column="1"> + <widget class="QPushButton" name="showIconsButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Show</string> </property> </widget> </item> - <item row="3" column="1" > - <layout class="QVBoxLayout" > + <item row="3" column="1"> + <layout class="QVBoxLayout"> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>209</height> @@ -113,34 +111,34 @@ </spacer> </item> <item> - <widget class="QPushButton" name="upButton" > - <property name="enabled" > + <widget class="QPushButton" name="upButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Up</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="downButton" > - <property name="enabled" > + <widget class="QPushButton" name="downButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Down</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>170</height> @@ -150,12 +148,12 @@ </item> </layout> </item> - <item row="3" column="0" > - <widget class="QListWidget" name="iconDirectoryList" > - <property name="toolTip" > + <item row="3" column="0"> + <widget class="QListWidget" name="iconDirectoryList"> + <property name="toolTip"> <string>List of icon directories</string> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> </widget>
--- a/Preferences/ConfigurationPages/InterfacePage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/InterfacePage.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,6 +21,7 @@ import Preferences import Utilities +import UI.PixmapCache from eric5config import getConfig @@ -37,6 +38,8 @@ self.setupUi(self) self.setObjectName("InterfacePage") + self.styleSheetButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.styleSheetCompleter = E5FileCompleter(self.styleSheetEdit) # set initial values
--- a/Preferences/ConfigurationPages/InterfacePage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/InterfacePage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -241,13 +241,10 @@ </widget> </item> <item row="1" column="2"> - <widget class="QPushButton" name="styleSheetButton"> + <widget class="QToolButton" name="styleSheetButton"> <property name="toolTip"> <string>Select the style sheet file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ import Preferences import Utilities +import UI.PixmapCache class MultiProjectPage(ConfigurationPageBase, Ui_MultiProjectPage): @@ -30,6 +31,8 @@ self.setupUi(self) self.setObjectName("MultiProjectPage") + self.workspaceButton.setIcon(UI.PixmapCache.getIcon("open.png")) + # set initial values self.openMasterAutomaticallyCheckBox.setChecked( Preferences.getMultiProject("OpenMasterAutomatically"))
--- a/Preferences/ConfigurationPages/MultiProjectPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/MultiProjectPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>494</width> - <height>357</height> + <height>359</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -49,13 +49,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="workspaceButton"> + <widget class="QToolButton" name="workspaceButton"> <property name="toolTip"> <string>Select the workspace directory via a directory selection button</string> </property> - <property name="text"> - <string notr="true">...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/NetworkPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/NetworkPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -20,6 +20,7 @@ import Preferences import Utilities +import UI.PixmapCache class NetworkPage(ConfigurationPageBase, Ui_NetworkPage): @@ -34,6 +35,8 @@ self.setupUi(self) self.setObjectName("NetworkPage") + self.downloadDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.downloadDirCompleter = E5DirCompleter(self.downloadDirEdit) self.ftpProxyTypeCombo.addItem(
--- a/Preferences/ConfigurationPages/NetworkPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/NetworkPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>589</width> - <height>698</height> + <width>591</width> + <height>769</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> @@ -54,13 +54,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="downloadDirButton"> + <widget class="QToolButton" name="downloadDirButton"> <property name="toolTip"> <string>Select the download directory via a directory selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -19,6 +19,7 @@ import Preferences import Utilities +import UI.PixmapCache class PluginManagerPage(ConfigurationPageBase, Ui_PluginManagerPage): @@ -33,6 +34,8 @@ self.setupUi(self) self.setObjectName("PluginManagerPage") + self.downloadDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.downloadDirCompleter = E5DirCompleter(self.downloadDirEdit) # set initial values
--- a/Preferences/ConfigurationPages/PluginManagerPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/PluginManagerPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>507</width> + <width>528</width> <height>299</height> </rect> </property> @@ -48,13 +48,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="downloadDirButton"> + <widget class="QToolButton" name="downloadDirButton"> <property name="toolTip"> <string>Select the plugins download directory via a directory selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Preferences/ConfigurationPages/QtPage.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/QtPage.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities +import UI.PixmapCache class QtPage(ConfigurationPageBase, Ui_QtPage): @@ -31,6 +32,8 @@ self.setupUi(self) self.setObjectName("QtPage") + self.qt4TransButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.qt4TransCompleter = E5DirCompleter(self.qt4TransEdit) # set initial values
--- a/Preferences/ConfigurationPages/QtPage.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ConfigurationPages/QtPage.ui Wed Jan 08 19:07:23 2014 +0100 @@ -37,16 +37,6 @@ <string>Qt Translations Directory</string> </property> <layout class="QGridLayout"> - <item row="1" column="1"> - <widget class="QPushButton" name="qt4TransButton"> - <property name="toolTip"> - <string>Press to select the Qt translations directory via a directory selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLineEdit" name="qt4TransEdit"> <property name="toolTip"> @@ -71,6 +61,13 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QToolButton" name="qt4TransButton"> + <property name="toolTip"> + <string>Press to select the Qt translations directory via a directory selection dialog</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/ToolConfigurationDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ToolConfigurationDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,8 +16,9 @@ from E5Gui import E5MessageBox, E5FileDialog from .Ui_ToolConfigurationDialog import Ui_ToolConfigurationDialog + import Utilities - +import UI.PixmapCache class ToolConfigurationDialog(QDialog, Ui_ToolConfigurationDialog): """ @@ -33,6 +34,9 @@ super().__init__(parent) self.setupUi(self) + self.iconButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.executableButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.iconCompleter = E5FileCompleter(self.iconEdit) self.executableCompleter = E5FileCompleter(self.executableEdit)
--- a/Preferences/ToolConfigurationDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Preferences/ToolConfigurationDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ToolConfigurationDialog</class> - <widget class="QDialog" name="ToolConfigurationDialog" > - <property name="geometry" > + <widget class="QDialog" name="ToolConfigurationDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,180 +10,166 @@ <height>487</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Configure Tools Menu</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QGridLayout" > - <item row="7" column="3" > - <widget class="QPushButton" name="separatorButton" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="7" column="3"> + <widget class="QPushButton" name="separatorButton"> + <property name="toolTip"> <string>Add a separator</string> </property> - <property name="whatsThis" > - <string><b>Add separator</b><p>Add a separator for the menu.</p></string> + <property name="whatsThis"> + <string><b>Add separator</b><p>Add a separator for the menu.</p></string> </property> - <property name="text" > + <property name="text"> <string>Add &Separator</string> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="addButton" > - <property name="toolTip" > + <item row="1" column="3"> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> <string>Add a new tools entry</string> </property> - <property name="whatsThis" > - <string><b>Add</b> -<p>Add a new tools entry with the values entered below.</p></string> + <property name="whatsThis"> + <string><b>Add</b> +<p>Add a new tools entry with the values entered below.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Add</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+A</string> </property> </widget> </item> - <item rowspan="9" row="0" column="0" colspan="3" > - <widget class="QListWidget" name="toolsList" /> + <item row="0" column="0" rowspan="9" colspan="3"> + <widget class="QListWidget" name="toolsList"/> </item> - <item row="13" column="1" colspan="2" > - <widget class="QComboBox" name="redirectCombo" > - <property name="toolTip" > + <item row="13" column="1" colspan="2"> + <widget class="QComboBox" name="redirectCombo"> + <property name="toolTip"> <string>Select the output redirection mode</string> </property> - <property name="whatsThis" > - <string><b>Redirect output<b><p>Select the output redirection mode. The standard error channel is either not redirected or shown in the log viewer.</p></string> + <property name="whatsThis"> + <string><b>Redirect output<b><p>Select the output redirection mode. The standard error channel is either not redirected or shown in the log viewer.</p></string> </property> </widget> </item> - <item row="12" column="1" > - <widget class="QLineEdit" name="argumentsEdit" > - <property name="toolTip" > + <item row="12" column="1"> + <widget class="QLineEdit" name="argumentsEdit"> + <property name="toolTip"> <string>Enter the arguments for the executable</string> </property> - <property name="whatsThis" > - <string><b>Arguments</b> -<p>Enter the arguments for the executable.</p></string> + <property name="whatsThis"> + <string><b>Arguments</b> +<p>Enter the arguments for the executable.</p></string> </property> </widget> </item> - <item row="4" column="3" > - <widget class="QPushButton" name="upButton" > - <property name="enabled" > + <item row="4" column="3"> + <widget class="QPushButton" name="upButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Move up</string> </property> - <property name="whatsThis" > - <string><b>Move Up</b> -<p>Move the selected entry up.</p></string> + <property name="whatsThis"> + <string><b>Move Up</b> +<p>Move the selected entry up.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Up</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+U</string> </property> </widget> </item> - <item row="3" column="3" > - <widget class="QPushButton" name="deleteButton" > - <property name="enabled" > + <item row="3" column="3"> + <widget class="QPushButton" name="deleteButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Delete the selected entry</string> </property> - <property name="whatsThis" > - <string><b>Delete</b> -<p>Delete the selected entry.</p></string> + <property name="whatsThis"> + <string><b>Delete</b> +<p>Delete the selected entry.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Delete</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+D</string> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QPushButton" name="newButton" > - <property name="toolTip" > + <item row="0" column="3"> + <widget class="QPushButton" name="newButton"> + <property name="toolTip"> <string>Clear all entry fields</string> </property> - <property name="whatsThis" > - <string><b>New</b> -<p>Clear all entry fields for entering a new tools entry.</p></string> + <property name="whatsThis"> + <string><b>New</b> +<p>Clear all entry fields for entering a new tools entry.</p></string> </property> - <property name="text" > + <property name="text"> <string>&New</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+N</string> </property> </widget> </item> - <item row="10" column="2" > - <widget class="QPushButton" name="iconButton" > - <property name="toolTip" > - <string>Select the icon via a file selection dialog</string> + <item row="11" column="1"> + <widget class="QLineEdit" name="executableEdit"> + <property name="toolTip"> + <string>Enter the filename of the executable</string> </property> - <property name="whatsThis" > - <string><b>Icon</b> -<p>Select the icon via a file selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> + <property name="whatsThis"> + <string><b>Executable</b> +<p>Enter the filename of the executable.</p></string> </property> </widget> </item> - <item row="11" column="1" > - <widget class="QLineEdit" name="executableEdit" > - <property name="toolTip" > - <string>Enter the filename of the executable</string> - </property> - <property name="whatsThis" > - <string><b>Executable</b> -<p>Enter the filename of the executable.</p></string> - </property> - </widget> - </item> - <item row="5" column="3" > - <widget class="QPushButton" name="downButton" > - <property name="enabled" > + <item row="5" column="3"> + <widget class="QPushButton" name="downButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Move down</string> </property> - <property name="whatsThis" > - <string><b>Move Down</b> -<p>Move the selected entry down.</p></string> + <property name="whatsThis"> + <string><b>Move Down</b> +<p>Move the selected entry down.</p></string> </property> - <property name="text" > + <property name="text"> <string>Do&wn</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+W</string> </property> </widget> </item> - <item row="8" column="3" > + <item row="8" column="3"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>105</width> <height>22</height> @@ -190,134 +177,142 @@ </property> </spacer> </item> - <item row="9" column="1" > - <widget class="QLineEdit" name="menuEdit" > - <property name="toolTip" > + <item row="9" column="1"> + <widget class="QLineEdit" name="menuEdit"> + <property name="toolTip"> <string>Enter the menu text</string> </property> - <property name="whatsThis" > - <string><b>Menu text</b> -<p>Enter the menu text. Precede the accelerator key with an & character.</p></string> + <property name="whatsThis"> + <string><b>Menu text</b> +<p>Enter the menu text. Precede the accelerator key with an & character.</p></string> </property> </widget> </item> - <item row="2" column="3" > - <widget class="QPushButton" name="changeButton" > - <property name="enabled" > + <item row="2" column="3"> + <widget class="QPushButton" name="changeButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Change the values of the selected entry</string> </property> - <property name="whatsThis" > - <string><b>Change</b> -<p>Change the values of the selected entry.</p></string> + <property name="whatsThis"> + <string><b>Change</b> +<p>Change the values of the selected entry.</p></string> </property> - <property name="text" > + <property name="text"> <string>C&hange</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+H</string> </property> </widget> </item> - <item row="10" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="10" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>&Icon file:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>iconEdit</cstring> </property> </widget> </item> - <item row="12" column="0" > - <widget class="QLabel" name="TextLabel3" > - <property name="text" > + <item row="12" column="0"> + <widget class="QLabel" name="TextLabel3"> + <property name="text"> <string>Ar&guments:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>argumentsEdit</cstring> </property> </widget> </item> - <item row="9" column="0" > - <widget class="QLabel" name="TextLabel2" > - <property name="text" > + <item row="9" column="0"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> <string>&Menu text:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>menuEdit</cstring> </property> </widget> </item> - <item row="6" column="3" > - <widget class="Line" name="line" > - <property name="orientation" > + <item row="6" column="3"> + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="11" column="2" > - <widget class="QPushButton" name="executableButton" > - <property name="toolTip" > - <string>Select the executable via a file selection dialog</string> + <item row="10" column="1"> + <widget class="QLineEdit" name="iconEdit"> + <property name="toolTip"> + <string>Enter the filename of the icon</string> </property> - <property name="whatsThis" > - <string><b>Executable</b> -<p>Select the executable via a file selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> + <property name="whatsThis"> + <string><b>Icon</b> +<p>Enter the filename of the icon.</p></string> </property> </widget> </item> - <item row="10" column="1" > - <widget class="QLineEdit" name="iconEdit" > - <property name="toolTip" > - <string>Enter the filename of the icon</string> - </property> - <property name="whatsThis" > - <string><b>Icon</b> -<p>Enter the filename of the icon.</p></string> - </property> - </widget> - </item> - <item row="13" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="13" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>&Redirect output</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>redirectCombo</cstring> </property> </widget> </item> - <item row="11" column="0" > - <widget class="QLabel" name="TextLabel1" > - <property name="text" > + <item row="11" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> <string>&Executable file:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>executableEdit</cstring> </property> </widget> </item> + <item row="10" column="2"> + <widget class="QToolButton" name="iconButton"> + <property name="toolTip"> + <string>Select the icon via a file selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Icon</b> +<p>Select the icon via a file selection dialog.</p></string> + </property> + </widget> + </item> + <item row="11" column="2"> + <widget class="QToolButton" name="executableButton"> + <property name="toolTip"> + <string>Select the executable via a file selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Executable</b> +<p>Select the executable via a file selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>toolsList</tabstop> @@ -344,11 +339,11 @@ <receiver>ToolConfigurationDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>62</x> <y>465</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>62</x> <y>486</y> </hint> @@ -360,11 +355,11 @@ <receiver>ToolConfigurationDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>177</x> <y>466</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>178</x> <y>486</y> </hint>
--- a/Project/AddDirectoryDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/AddDirectoryDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_AddDirectoryDialog import Ui_AddDirectoryDialog import Utilities +import UI.PixmapCache class AddDirectoryDialog(QDialog, Ui_AddDirectoryDialog): @@ -38,6 +39,9 @@ self.setObjectName(name) self.setupUi(self) + self.sourceDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.targetDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.sourceDirCompleter = E5DirCompleter(self.sourceDirEdit) self.targetDirCompleter = E5DirCompleter(self.targetDirEdit)
--- a/Project/AddDirectoryDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/AddDirectoryDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>AddDirectoryDialog</class> - <widget class="QDialog" name="AddDirectoryDialog" > - <property name="geometry" > + <widget class="QDialog" name="AddDirectoryDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,127 +10,121 @@ <height>174</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Add Directory</string> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Add a directory to the current project</string> </property> - <property name="whatsThis" > - <string><b>Add Directory Dialog</b> -<p>This dialog is used to add a directory to the current project.</p></string> + <property name="whatsThis"> + <string><b>Add Directory Dialog</b> +<p>This dialog is used to add a directory to the current project.</p></string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QGridLayout" > - <item row="0" column="1" colspan="2" > - <widget class="QComboBox" name="filterComboBox" /> + <layout class="QGridLayout"> + <item row="0" column="1" colspan="2"> + <widget class="QComboBox" name="filterComboBox"/> </item> - <item row="2" column="2" > - <widget class="QPushButton" name="targetDirButton" > - <property name="whatsThis" > - <string><b>Target Directory</b> -<p>Select the target directory via a directory selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="targetDirLabel" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="targetDirLabel"> + <property name="text"> <string>&Target Directory:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>targetDirEdit</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="sourceDirEdit" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QLineEdit" name="sourceDirEdit"> + <property name="toolTip"> <string>Enter the name of the directory to add</string> </property> - <property name="whatsThis" > - <string><b>Source Directory</b> -<p>Enter the name of the directory to add to the current project. + <property name="whatsThis"> + <string><b>Source Directory</b> +<p>Enter the name of the directory to add to the current project. You may select it with a dialog by pressing the button to - the right.</p></string> + the right.</p></string> </property> </widget> </item> - <item row="3" column="0" colspan="3" > - <widget class="QCheckBox" name="recursiveCheckBox" > - <property name="toolTip" > + <item row="3" column="0" colspan="3"> + <widget class="QCheckBox" name="recursiveCheckBox"> + <property name="toolTip"> <string>Select, whether a recursive add should be performed</string> </property> - <property name="text" > + <property name="text"> <string>&Recurse into subdirectories</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QLineEdit" name="targetDirEdit" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QLineEdit" name="targetDirEdit"> + <property name="toolTip"> <string>Enter the target directory for the file</string> </property> - <property name="whatsThis" > - <string><b>Target Directory</b> -<p>Enter the target directory. You may select it - with a dialog by pressing the button to the right.</p></string> + <property name="whatsThis"> + <string><b>Target Directory</b> +<p>Enter the target directory. You may select it + with a dialog by pressing the button to the right.</p></string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QPushButton" name="sourceDirButton" > - <property name="whatsThis" > - <string><b>Source Directory</b> -<p>Select the source directory via a directory selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="sourceDirLabel" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="sourceDirLabel"> + <property name="text"> <string>&Source Directory:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>sourceDirEdit</cstring> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>&File Type:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>filterComboBox</cstring> </property> </widget> </item> + <item row="1" column="2"> + <widget class="QToolButton" name="sourceDirButton"> + <property name="whatsThis"> + <string><b>Source Directory</b> +<p>Select the source directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="targetDirButton"> + <property name="whatsThis"> + <string><b>Target Directory</b> +<p>Select the target directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>filterComboBox</tabstop> @@ -147,11 +142,11 @@ <receiver>AddDirectoryDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>29</x> <y>126</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>30</x> <y>153</y> </hint> @@ -163,11 +158,11 @@ <receiver>AddDirectoryDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>111</x> <y>131</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>112</x> <y>152</y> </hint>
--- a/Project/AddFileDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/AddFileDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -12,12 +12,13 @@ from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QDialog -from E5Gui.E5Completers import E5DirCompleter +from E5Gui.E5Completers import E5DirCompleter, E5FileCompleter from E5Gui import E5FileDialog from .Ui_AddFileDialog import Ui_AddFileDialog import Utilities +import UI.PixmapCache class AddFileDialog(QDialog, Ui_AddFileDialog): @@ -40,7 +41,11 @@ self.setObjectName(name) self.setupUi(self) + self.targetDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.sourceFileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.targetDirCompleter = E5DirCompleter(self.targetDirEdit) + self.sourceFileCompleter = E5FileCompleter(self.sourceFileCompleter) self.targetDirEdit.setText(pro.ppath) self.filter = filter
--- a/Project/AddFileDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/AddFileDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>AddFileDialog</class> - <widget class="QDialog" name="AddFileDialog" > - <property name="geometry" > + <widget class="QDialog" name="AddFileDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,114 +10,108 @@ <height>141</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Add Files</string> </property> - <property name="whatsThis" > - <string><b>Add Files Dialog</b> -<p>This dialog is used to add files to the current project.</p></string> + <property name="whatsThis"> + <string><b>Add Files Dialog</b> +<p>This dialog is used to add files to the current project.</p></string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QGridLayout" > - <item row="0" column="2" > - <widget class="QPushButton" name="sourceFileButton" > - <property name="whatsThis" > - <string><b>Source Files</b> -<p>Select the source files via a files selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="targetDirLabel" > - <property name="text" > + <layout class="QGridLayout"> + <item row="1" column="0"> + <widget class="QLabel" name="targetDirLabel"> + <property name="text"> <string>&Target Directory:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>targetDirEdit</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="targetDirEdit" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QLineEdit" name="targetDirEdit"> + <property name="toolTip"> <string>Enter the target directory for the file</string> </property> - <property name="whatsThis" > - <string><b>Target Directory</b> -<p>Enter the target directory. You may select it - with a dialog by pressing the button to the right.</p></string> + <property name="whatsThis"> + <string><b>Target Directory</b> +<p>Enter the target directory. You may select it + with a dialog by pressing the button to the right.</p></string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QPushButton" name="targetDirButton" > - <property name="whatsThis" > - <string><b>Target Directory</b> -<p>Select the target directory via a directory selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="sourceFileLabel" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="sourceFileLabel"> + <property name="text"> <string>&Source Files:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>sourceFileEdit</cstring> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="sourceFileEdit" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QLineEdit" name="sourceFileEdit"> + <property name="toolTip"> <string>Enter the name of files to add separated by the path separator</string> </property> - <property name="whatsThis" > - <string><b>Source Files</b> -<p>Enter the name of files to add to the current project separated + <property name="whatsThis"> + <string><b>Source Files</b> +<p>Enter the name of files to add to the current project separated by the path separator. You may select them with a dialog by pressing -the button to the right.</p></string> +the button to the right.</p></string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="sourceFileButton"> + <property name="whatsThis"> + <string><b>Source Files</b> +<p>Select the source files via a files selection dialog.</p></string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="targetDirButton"> + <property name="whatsThis"> + <string><b>Target Directory</b> +<p>Select the target directory via a directory selection dialog.</p></string> </property> </widget> </item> </layout> </item> <item> - <widget class="QCheckBox" name="sourcecodeCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="sourcecodeCheckBox"> + <property name="toolTip"> <string>Select, if the files should be added as sourcecode (overriding automatic detection)</string> </property> - <property name="text" > + <property name="text"> <string>Is source&code files</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+C</string> </property> </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>sourceFileEdit</tabstop> @@ -133,11 +128,11 @@ <receiver>AddFileDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>43</x> <y>112</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>43</x> <y>128</y> </hint> @@ -149,11 +144,11 @@ <receiver>AddFileDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>124</x> <y>120</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>124</x> <y>128</y> </hint>
--- a/Project/DebuggerPropertiesDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/DebuggerPropertiesDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -19,6 +19,7 @@ from .Ui_DebuggerPropertiesDialog import Ui_DebuggerPropertiesDialog import Utilities +import UI.PixmapCache from eric5config import getConfig @@ -41,6 +42,9 @@ self.setObjectName(name) self.setupUi(self) + self.debugClientButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.interpreterButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.debugClientCompleter = E5FileCompleter(self.debugClientEdit) self.interpreterCompleter = E5FileCompleter(self.interpreterEdit) self.translationLocalCompleter = E5DirCompleter(
--- a/Project/DebuggerPropertiesDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/DebuggerPropertiesDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>592</width> - <height>592</height> + <height>656</height> </rect> </property> <property name="windowTitle"> @@ -31,13 +31,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="debugClientButton"> + <widget class="QToolButton" name="debugClientButton"> <property name="toolTip"> <string>Press to select the Debug Client via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -57,13 +54,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="interpreterButton"> + <widget class="QToolButton" name="interpreterButton"> <property name="toolTip"> <string>Press to select the interpreter via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/Project/NewDialogClassDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/NewDialogClassDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,8 @@ from .Ui_NewDialogClassDialog import Ui_NewDialogClassDialog +import UI.PixmapCache + class NewDialogClassDialog(QDialog, Ui_NewDialogClassDialog): """ @@ -35,6 +37,8 @@ super().__init__(parent) self.setupUi(self) + self.pathButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) self.okButton.setEnabled(False)
--- a/Project/NewDialogClassDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/NewDialogClassDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,92 +1,90 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>NewDialogClassDialog</class> - <widget class="QDialog" name="NewDialogClassDialog" > - <property name="geometry" > + <widget class="QDialog" name="NewDialogClassDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>600</width> - <height>139</height> + <height>140</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>New Dialog Class</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="_2" > + <layout class="QVBoxLayout" name="_2"> <item> - <layout class="QGridLayout" name="_3" > - <item row="2" column="1" > - <widget class="QLineEdit" name="pathnameEdit" > - <property name="toolTip" > + <layout class="QGridLayout" name="_3"> + <item row="2" column="1"> + <widget class="QLineEdit" name="pathnameEdit"> + <property name="toolTip"> <string>Enter the path of the file for the forms code</string> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>&Classname:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>classnameEdit</cstring> </property> </widget> </item> - <item row="2" column="2" > - <widget class="QPushButton" name="pathButton" > - <property name="toolTip" > - <string>Select the source file path via a directory selection dialog</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>&Filename:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>filenameEdit</cstring> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>&Path:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>pathnameEdit</cstring> </property> </widget> </item> - <item row="0" column="1" colspan="2" > - <widget class="QLineEdit" name="classnameEdit" > - <property name="toolTip" > + <item row="0" column="1" colspan="2"> + <widget class="QLineEdit" name="classnameEdit"> + <property name="toolTip"> <string>Enter the name of the new class</string> </property> </widget> </item> - <item row="1" column="1" colspan="2" > - <widget class="QLineEdit" name="filenameEdit" > - <property name="toolTip" > + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="filenameEdit"> + <property name="toolTip"> <string>Enter the name of the file for the forms code</string> </property> </widget> </item> + <item row="2" column="2"> + <widget class="QToolButton" name="pathButton"> + <property name="toolTip"> + <string>Select the source file path via a directory selection dialog</string> + </property> + </widget> + </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -108,11 +106,11 @@ <receiver>NewDialogClassDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -124,11 +122,11 @@ <receiver>NewDialogClassDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint>
--- a/Project/PropertiesDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/PropertiesDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -20,6 +20,7 @@ import Utilities import Preferences +import UI.PixmapCache class PropertiesDialog(QDialog, Ui_PropertiesDialog): @@ -40,6 +41,9 @@ self.setObjectName(name) self.setupUi(self) + self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.mainscriptButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.project = project self.newProject = new self.transPropertiesDlg = None
--- a/Project/PropertiesDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/PropertiesDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>600</width> - <height>550</height> + <height>555</height> </rect> </property> <property name="maximumSize"> @@ -130,20 +130,6 @@ </property> </widget> </item> - <item row="5" column="2"> - <widget class="QPushButton" name="dirButton"> - <property name="toolTip"> - <string>Show directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Project Directory</b> -<p>Select a project directory via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="6" column="0"> <widget class="QLabel" name="versionLabel"> <property name="text"> @@ -187,20 +173,6 @@ </property> </widget> </item> - <item row="7" column="2"> - <widget class="QPushButton" name="mainscriptButton"> - <property name="toolTip"> - <string>Show file selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Main Script</b> -<p>Select the projects main script via a file selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="8" column="1"> <widget class="QPushButton" name="transPropertiesButton"> <property name="toolTip"> @@ -320,6 +292,28 @@ </property> </widget> </item> + <item row="5" column="2"> + <widget class="QToolButton" name="dirButton"> + <property name="toolTip"> + <string>Show directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Project Directory</b> +<p>Select a project directory via a directory selection dialog.</p></string> + </property> + </widget> + </item> + <item row="7" column="2"> + <widget class="QToolButton" name="mainscriptButton"> + <property name="toolTip"> + <string>Show file selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Main Script</b> +<p>Select the projects main script via a file selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item> @@ -374,7 +368,6 @@ </item> </layout> <zorder>buttonBox</zorder> - <zorder>vcsInfoButton</zorder> <zorder>vcsCheckBox</zorder> </widget> <layoutdefault spacing="6" margin="6"/>
--- a/Project/SpellingPropertiesDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/SpellingPropertiesDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -19,6 +19,7 @@ import Utilities import Preferences +import UI.PixmapCache class SpellingPropertiesDialog(QDialog, Ui_SpellingPropertiesDialog): @@ -36,6 +37,9 @@ super().__init__(parent) self.setupUi(self) + self.pwlButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.pelButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.project = project self.parent = parent
--- a/Project/SpellingPropertiesDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/SpellingPropertiesDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,98 +1,79 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SpellingPropertiesDialog</class> - <widget class="QDialog" name="SpellingPropertiesDialog" > - <property name="geometry" > + <widget class="QDialog" name="SpellingPropertiesDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>600</width> - <height>187</height> + <height>213</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Spelling Properties</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="textLabel1_3" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_3"> + <property name="text"> <string>Project &Language:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>spellingComboBox</cstring> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QComboBox" name="spellingComboBox" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QComboBox" name="spellingComboBox"> + <property name="toolTip"> <string>Select the project's language</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Project &Word List:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>pwlEdit</cstring> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLineEdit" name="pwlEdit" > - <property name="toolTip" > + <item row="3" column="0"> + <widget class="QLineEdit" name="pwlEdit"> + <property name="toolTip"> <string>Enter the filename of the project word list</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QPushButton" name="pwlButton" > - <property name="toolTip" > - <string>Select the project word list file via a file selection dialog</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Project E&xclude List:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>pelEdit</cstring> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QLineEdit" name="pelEdit" > - <property name="toolTip" > + <item row="5" column="0"> + <widget class="QLineEdit" name="pelEdit"> + <property name="toolTip"> <string>Enter the filename of the project exclude list</string> </property> </widget> </item> - <item row="5" column="1" > - <widget class="QPushButton" name="pelButton" > - <property name="toolTip" > - <string>Select the project exclude list file via a file selection dialog</string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="6" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="6" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>2</height> @@ -100,16 +81,30 @@ </property> </spacer> </item> - <item row="7" column="0" colspan="2" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="7" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> + <item row="3" column="1"> + <widget class="QToolButton" name="pwlButton"> + <property name="toolTip"> + <string>Select the project word list file via a file selection dialog</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QToolButton" name="pelButton"> + <property name="toolTip"> + <string>Select the project exclude list file via a file selection dialog</string> + </property> + </widget> + </item> </layout> </widget> <tabstops> @@ -128,11 +123,11 @@ <receiver>SpellingPropertiesDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>222</x> <y>171</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>186</y> </hint> @@ -144,11 +139,11 @@ <receiver>SpellingPropertiesDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>290</x> <y>177</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>186</y> </hint>
--- a/Project/TranslationPropertiesDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/TranslationPropertiesDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,6 +18,7 @@ from .Ui_TranslationPropertiesDialog import Ui_TranslationPropertiesDialog import Utilities +import UI.PixmapCache class TranslationPropertiesDialog(QDialog, Ui_TranslationPropertiesDialog): @@ -35,6 +36,9 @@ super().__init__(parent) self.setupUi(self) + self.transBinPathButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.transPatternButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.project = project self.parent = parent
--- a/Project/TranslationPropertiesDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/Project/TranslationPropertiesDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -19,20 +19,6 @@ <layout class="QVBoxLayout" name="_2"> <item> <layout class="QGridLayout" name="_3"> - <item row="3" column="1"> - <widget class="QPushButton" name="transBinPathButton"> - <property name="toolTip"> - <string>Show directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Binary Translations Path</b> -<p>Select the directory for the binary translations via a directory selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="3" column="0"> <widget class="QLineEdit" name="transBinPathEdit"> <property name="toolTip"> @@ -44,20 +30,6 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QPushButton" name="transPatternButton"> - <property name="toolTip"> - <string>Show directory selection dialog</string> - </property> - <property name="whatsThis"> - <string><b>Translation Pattern</b> -<p>Select a translation file via a file selection dialog.</p></string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="2" column="0" colspan="2"> <widget class="QLabel" name="label"> <property name="text"> @@ -93,6 +65,28 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QToolButton" name="transPatternButton"> + <property name="toolTip"> + <string>Show directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Translation Pattern</b> +<p>Select a translation file via a file selection dialog.</p></string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QToolButton" name="transBinPathButton"> + <property name="toolTip"> + <string>Show directory selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>Binary Translations Path</b> +<p>Select the directory for the binary translations via a directory selection dialog.</p></string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/PyUnit/UnittestDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/PyUnit/UnittestDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -60,6 +60,8 @@ self.setObjectName(name) self.setupUi(self) + self.fileDialogButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.startButton = self.buttonBox.addButton( self.trUtf8("Start"), QDialogButtonBox.ActionRole) self.startButton.setToolTip(self.trUtf8(
--- a/PyUnit/UnittestDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/PyUnit/UnittestDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -75,16 +75,6 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QPushButton" name="fileDialogButton"> - <property name="toolTip"> - <string>Open a file selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="testsuiteLabel"> <property name="text"> @@ -95,6 +85,13 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="fileDialogButton"> + <property name="toolTip"> + <string>Open a file selection dialog</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/SqlBrowser/SqlConnectionDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/SqlBrowser/SqlConnectionDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -17,6 +17,7 @@ from .Ui_SqlConnectionDialog import Ui_SqlConnectionDialog import Utilities +import UI.PixmapCache class SqlConnectionDialog(QDialog, Ui_SqlConnectionDialog): @@ -32,6 +33,8 @@ super().__init__(parent) self.setupUi(self) + self.databaseFileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.databaseFileCompleter = E5FileCompleter() self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/SqlBrowser/SqlConnectionDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/SqlBrowser/SqlConnectionDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>259</height> + <height>265</height> </rect> </property> <property name="windowTitle"> @@ -69,16 +69,6 @@ </property> </spacer> </item> - <item row="2" column="2"> - <widget class="QPushButton" name="databaseFileButton"> - <property name="toolTip"> - <string>Press to select a database file</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> <item row="3" column="0"> <widget class="QLabel" name="textLabel4"> <property name="text"> @@ -159,6 +149,13 @@ </property> </widget> </item> + <item row="2" column="2"> + <widget class="QToolButton" name="databaseFileButton"> + <property name="toolTip"> + <string>Press to select a database file</string> + </property> + </widget> + </item> </layout> </item> <item>
--- a/UI/CompareDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/CompareDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -96,6 +96,9 @@ super().__init__(parent) self.setupUi(self) + self.file1Button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.file2Button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.file1Completer = E5FileCompleter(self.file1Edit) self.file2Completer = E5FileCompleter(self.file2Edit)
--- a/UI/CompareDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/CompareDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -23,7 +23,16 @@ <bool>true</bool> </property> <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -44,13 +53,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="file1Button"> + <widget class="QToolButton" name="file1Button"> <property name="toolTip"> <string>Press to select the file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -71,13 +77,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="file2Button"> + <widget class="QToolButton" name="file2Button"> <property name="toolTip"> <string>Press to select the file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/UI/DiffDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/DiffDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -22,6 +22,7 @@ import Utilities import Preferences +import UI.PixmapCache from difflib import SequenceMatcher @@ -210,6 +211,9 @@ super().__init__(parent) self.setupUi(self) + self.file1Button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.file2Button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.file1Completer = E5FileCompleter(self.file1Edit) self.file2Completer = E5FileCompleter(self.file2Edit)
--- a/UI/DiffDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/DiffDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -34,13 +34,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="file1Button"> + <widget class="QToolButton" name="file1Button"> <property name="toolTip"> <string>Press to select the file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -65,13 +62,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="file2Button"> + <widget class="QToolButton" name="file2Button"> <property name="toolTip"> <string>Press to select the file via a file selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout>
--- a/UI/FindFileDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/FindFileDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -21,7 +21,7 @@ import Utilities import Preferences - +import UI.PixmapCache class FindFileDialog(QDialog, Ui_FindFileDialog): """ @@ -56,6 +56,8 @@ self.setupUi(self) self.setWindowFlags(Qt.WindowFlags(Qt.Window)) + self.dirSelectButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__replaceMode = replaceMode self.stopButton = \
--- a/UI/FindFileDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/FindFileDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -286,16 +286,13 @@ </widget> </item> <item> - <widget class="QPushButton" name="dirSelectButton"> + <widget class="QToolButton" name="dirSelectButton"> <property name="enabled"> <bool>false</bool> </property> <property name="toolTip"> <string>Select the directory via a directory selection dialog</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -431,22 +428,6 @@ <resources/> <connections> <connection> - <sender>dirButton</sender> - <signal>toggled(bool)</signal> - <receiver>dirSelectButton</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>392</x> - <y>136</y> - </hint> - <hint type="destinationlabel"> - <x>577</x> - <y>168</y> - </hint> - </hints> - </connection> - <connection> <sender>buttonBox</sender> <signal>rejected()</signal> <receiver>FindFileDialog</receiver>
--- a/UI/FindFileNameDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/FindFileNameDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -18,9 +18,10 @@ from E5Gui import E5FileDialog from .Ui_FindFileNameDialog import Ui_FindFileNameDialog + from Utilities import direntries import Utilities - +import UI.PixmapCache class FindFileNameDialog(QWidget, Ui_FindFileNameDialog): """ @@ -46,6 +47,8 @@ super().__init__(parent) self.setupUi(self) + self.searchDirButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.searchDirCompleter = E5DirCompleter(self.searchDirEdit) self.fileList.headerItem().setText(self.fileList.columnCount(), "")
--- a/UI/FindFileNameDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/FindFileNameDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>FindFileNameDialog</class> - <widget class="QWidget" name="FindFileNameDialog" > - <property name="geometry" > + <widget class="QWidget" name="FindFileNameDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,48 +10,48 @@ <height>478</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Find File</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>Enter filename (? matches any single character, * matches everything)</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLineEdit" name="fileNameEdit" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <widget class="QLineEdit" name="fileNameEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>9</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter file name to search for </string> </property> </widget> </item> <item> - <widget class="QLabel" name="extsepLabel" > - <property name="text" > + <widget class="QLabel" name="extsepLabel"> + <property name="text"> <string>.</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="fileExtEdit" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <widget class="QLineEdit" name="fileExtEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter file extension to search for</string> </property> </widget> @@ -58,63 +59,60 @@ </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QCheckBox" name="searchDirCheckBox" > - <property name="enabled" > + <widget class="QCheckBox" name="searchDirCheckBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enabled to include the entered directory into the search</string> </property> - <property name="text" > + <property name="text"> <string>Search Path:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="searchDirEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="searchDirEdit"> + <property name="toolTip"> <string>Enter the directory, the file should be searched in</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="searchDirButton" > - <property name="toolTip" > + <widget class="QToolButton" name="searchDirButton"> + <property name="toolTip"> <string>Press to select the directory, the file should be searched in</string> </property> - <property name="text" > - <string>...</string> - </property> </widget> </item> </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QCheckBox" name="projectCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="projectCheckBox"> + <property name="toolTip"> <string>Select to search in the project path</string> </property> - <property name="text" > + <property name="text"> <string>Search in &project</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+P</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="syspathCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="syspathCheckBox"> + <property name="toolTip"> <string>Select to search in sys.path</string> </property> - <property name="text" > + <property name="text"> <string>Search in &sys.path</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+S</string> </property> </widget> @@ -122,31 +120,31 @@ </layout> </item> <item> - <widget class="QTreeWidget" name="fileList" > - <property name="rootIsDecorated" > + <widget class="QTreeWidget" name="fileList"> + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Filename</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Close|QDialogButtonBox::Open</set> </property> </widget> @@ -171,11 +169,11 @@ <receiver>FindFileNameDialog</receiver> <slot>close()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>40</x> <y>458</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>41</x> <y>477</y> </hint>
--- a/UI/NumbersWidget.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/UI/NumbersWidget.ui Wed Jan 08 19:07:23 2014 +0100 @@ -7,14 +7,23 @@ <x>0</x> <y>0</y> <width>749</width> - <height>147</height> + <height>160</height> </rect> </property> <property name="windowTitle"> <string>Numbers Formats</string> </property> <layout class="QGridLayout" name="gridLayout_2"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item row="0" column="0" colspan="2"> @@ -25,7 +34,16 @@ <string>Binary</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -33,9 +51,6 @@ <property name="toolTip"> <string>Press to import the selected binary number</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -53,9 +68,6 @@ <property name="toolTip"> <string>Press to send the binary number to the current editor</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -67,7 +79,16 @@ <string>Octal</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -75,9 +96,6 @@ <property name="toolTip"> <string>Press to import the selected octal number</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -95,9 +113,6 @@ <property name="toolTip"> <string>Press to send the octal number to the current editor</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -109,7 +124,16 @@ <string>Decimal</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_4"> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -117,9 +141,6 @@ <property name="toolTip"> <string>Press to import the selected decimal number</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -137,9 +158,6 @@ <property name="toolTip"> <string>Press to send the decimal number to the current editor</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -151,7 +169,16 @@ <string>Hexadecimal</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_5"> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -159,9 +186,6 @@ <property name="toolTip"> <string>Press to import the selected hex number</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> <item> @@ -179,9 +203,6 @@ <property name="toolTip"> <string>Press to send the hex number to the current editor</string> </property> - <property name="text"> - <string>...</string> - </property> </widget> </item> </layout> @@ -218,9 +239,6 @@ <attribute name="verticalHeaderVisible"> <bool>false</bool> </attribute> - <attribute name="verticalHeaderVisible"> - <bool>false</bool> - </attribute> </widget> </item> <item row="1" column="1">
--- a/ViewManager/BookmarkedFilesDialog.py Tue Jan 07 18:08:40 2014 +0100 +++ b/ViewManager/BookmarkedFilesDialog.py Wed Jan 08 19:07:23 2014 +0100 @@ -16,6 +16,7 @@ from .Ui_BookmarkedFilesDialog import Ui_BookmarkedFilesDialog import Utilities +import UI.PixmapCache class BookmarkedFilesDialog(QDialog, Ui_BookmarkedFilesDialog): @@ -32,6 +33,8 @@ super().__init__(parent) self.setupUi(self) + self.fileButton.setIcon(UI.PixmapCache.getIcon("open.png")) + self.fileCompleter = E5FileCompleter(self.fileEdit) self.bookmarks = bookmarks[:]
--- a/ViewManager/BookmarkedFilesDialog.ui Tue Jan 07 18:08:40 2014 +0100 +++ b/ViewManager/BookmarkedFilesDialog.ui Wed Jan 08 19:07:23 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>BookmarkedFilesDialog</class> - <widget class="QDialog" name="BookmarkedFilesDialog" > - <property name="geometry" > + <widget class="QDialog" name="BookmarkedFilesDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,51 +10,51 @@ <height>391</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Configure Bookmarked Files Menu</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QGridLayout" > - <item rowspan="6" row="0" column="0" colspan="3" > - <widget class="QListWidget" name="filesList" > - <property name="alternatingRowColors" > + <layout class="QGridLayout"> + <item row="0" column="0" rowspan="6" colspan="3"> + <widget class="QListWidget" name="filesList"> + <property name="alternatingRowColors"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="3" > - <widget class="QPushButton" name="deleteButton" > - <property name="enabled" > + <item row="2" column="3"> + <widget class="QPushButton" name="deleteButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Delete the selected entry</string> </property> - <property name="whatsThis" > - <string><b>Delete</b> -<p>Delete the selected entry.</p></string> + <property name="whatsThis"> + <string><b>Delete</b> +<p>Delete the selected entry.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Delete</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+D</string> </property> </widget> </item> - <item row="5" column="3" > + <item row="5" column="3"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>87</width> <height>130</height> @@ -61,136 +62,133 @@ </property> </spacer> </item> - <item row="3" column="3" > - <widget class="QPushButton" name="upButton" > - <property name="enabled" > + <item row="3" column="3"> + <widget class="QPushButton" name="upButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Move up</string> </property> - <property name="whatsThis" > - <string><b>Move Up</b> -<p>Move the selected entry up.</p></string> + <property name="whatsThis"> + <string><b>Move Up</b> +<p>Move the selected entry up.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Up</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+U</string> </property> </widget> </item> - <item row="6" column="2" > - <widget class="QPushButton" name="fileButton" > - <property name="toolTip" > - <string>Select the file via a file selection dialog</string> - </property> - <property name="whatsThis" > - <string><b>File</b> -<p>Select the file to be bookmarked via a file selection dialog.</p></string> - </property> - <property name="text" > - <string>...</string> - </property> - </widget> - </item> - <item row="4" column="3" > - <widget class="QPushButton" name="downButton" > - <property name="enabled" > + <item row="4" column="3"> + <widget class="QPushButton" name="downButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Move down</string> </property> - <property name="whatsThis" > - <string><b>Move Down</b> -<p>Move the selected entry down.</p></string> + <property name="whatsThis"> + <string><b>Move Down</b> +<p>Move the selected entry down.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Down</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+D</string> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QPushButton" name="addButton" > - <property name="enabled" > + <item row="0" column="3"> + <widget class="QPushButton" name="addButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Add a new bookmarked file</string> </property> - <property name="whatsThis" > - <string><b>Add</b> -<p>Add a new bookmarked file with the value entered below.</p></string> + <property name="whatsThis"> + <string><b>Add</b> +<p>Add a new bookmarked file with the value entered below.</p></string> </property> - <property name="text" > + <property name="text"> <string>&Add</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+A</string> </property> </widget> </item> - <item row="6" column="0" > - <widget class="QLabel" name="TextLabel1" > - <property name="text" > + <item row="6" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> <string>&File:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>fileEdit</cstring> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QPushButton" name="changeButton" > - <property name="enabled" > + <item row="1" column="3"> + <widget class="QPushButton" name="changeButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Change the value of the selected entry</string> </property> - <property name="whatsThis" > - <string><b>Change</b> -<p>Change the value of the selected entry.</p></string> + <property name="whatsThis"> + <string><b>Change</b> +<p>Change the value of the selected entry.</p></string> </property> - <property name="text" > + <property name="text"> <string>C&hange</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+H</string> </property> </widget> </item> - <item row="6" column="1" > - <widget class="QLineEdit" name="fileEdit" > - <property name="toolTip" > + <item row="6" column="1"> + <widget class="QLineEdit" name="fileEdit"> + <property name="toolTip"> <string>Enter the filename of the file</string> </property> - <property name="whatsThis" > - <string><b>File</b> -<p>Enter the filename of the bookmarked file.</p></string> + <property name="whatsThis"> + <string><b>File</b> +<p>Enter the filename of the bookmarked file.</p></string> + </property> + </widget> + </item> + <item row="6" column="2"> + <widget class="QToolButton" name="fileButton"> + <property name="toolTip"> + <string>Select the file via a file selection dialog</string> + </property> + <property name="whatsThis"> + <string><b>File</b> +<p>Select the file to be bookmarked via a file selection dialog.</p></string> </property> </widget> </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>filesList</tabstop> @@ -210,11 +208,11 @@ <receiver>BookmarkedFilesDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>25</x> <y>373</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>25</x> <y>388</y> </hint> @@ -226,11 +224,11 @@ <receiver>BookmarkedFilesDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>105</x> <y>370</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>105</x> <y>389</y> </hint>
--- a/i18n/eric5_cs.ts Tue Jan 07 18:08:40 2014 +0100 +++ b/i18n/eric5_cs.ts Wed Jan 08 19:07:23 2014 +0100 @@ -469,24 +469,24 @@ <context> <name>AddDirectoryDialog</name> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="13"/> + <location filename="../Project/AddDirectoryDialog.ui" line="14"/> <source>Add Directory</source> <translation>Přidat adresář</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="16"/> + <location filename="../Project/AddDirectoryDialog.ui" line="17"/> <source>Add a directory to the current project</source> <translation>Přidat adresář do aktuálního projektu</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="19"/> + <location filename="../Project/AddDirectoryDialog.ui" line="20"/> <source><b>Add Directory Dialog</b> <p>This dialog is used to add a directory to the current project.</p></source> <translation><b>Dialogové okno Přidat adresář</b> <p>Toto dialogové okno slouží k přidání adresáře do aktuálního projektu</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="34"/> + <location filename="../Project/AddDirectoryDialog.ui" line="108"/> <source><b>Target Directory</b> <p>Select the target directory via a directory selection dialog.</p></source> <translation><b>Cílový adresář</b> @@ -495,20 +495,20 @@ <message> <location filename="../Project/AddDirectoryDialog.ui" line="94"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.ui" line="35"/> + <source>&Target Directory:</source> + <translation>&Cílový adresář:</translation> </message> <message> <location filename="../Project/AddDirectoryDialog.ui" line="45"/> - <source>&Target Directory:</source> - <translation>&Cílový adresář:</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="55"/> <source>Enter the name of the directory to add</source> <translation>Vložte jméno adresáře, který se má přidat</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="58"/> + <location filename="../Project/AddDirectoryDialog.ui" line="48"/> <source><b>Source Directory</b> <p>Enter the name of the directory to add to the current project. You may select it with a dialog by pressing the button to @@ -518,22 +518,22 @@ Stisknutím pravého tlačítka jej můžete vybrat pomocí dialogového okna.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="68"/> + <location filename="../Project/AddDirectoryDialog.ui" line="58"/> <source>Select, whether a recursive add should be performed</source> <translation>Vybrat, jestliže přidávání bude rekurzivní</translation> </message> <message> + <location filename="../Project/AddDirectoryDialog.ui" line="61"/> + <source>&Recurse into subdirectories</source> + <translation>&Rekurzivně i pro podadresáře</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.ui" line="68"/> + <source>Enter the target directory for the file</source> + <translation>Název cílového adresáře pro soubor</translation> + </message> + <message> <location filename="../Project/AddDirectoryDialog.ui" line="71"/> - <source>&Recurse into subdirectories</source> - <translation>&Rekurzivně i pro podadresáře</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="78"/> - <source>Enter the target directory for the file</source> - <translation>Název cílového adresáře pro soubor</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="81"/> <source><b>Target Directory</b> <p>Enter the target directory. You may select it with a dialog by pressing the button to the right.</p></source> @@ -542,49 +542,49 @@ jej můžete vybrat v dialogovém okně.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="90"/> + <location filename="../Project/AddDirectoryDialog.ui" line="100"/> <source><b>Source Directory</b> <p>Select the source directory via a directory selection dialog.</p></source> <translation><b>Zdrojový adresář</b> <p>Výběr zdrojového adresáře přes dialogové okno.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="101"/> + <location filename="../Project/AddDirectoryDialog.ui" line="80"/> <source>&Source Directory:</source> <translation>Zdrojový adre&sář:</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="111"/> + <location filename="../Project/AddDirectoryDialog.ui" line="90"/> <source>&File Type:</source> <translation>&Typ souboru:</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="107"/> + <location filename="../Project/AddDirectoryDialog.py" line="111"/> <source>Select directory</source> <translation>Výběr adresáře</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="66"/> + <location filename="../Project/AddDirectoryDialog.py" line="70"/> <source>Source Files</source> <translation>Zdrojové soubory</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="68"/> - <source>Forms Files</source> - <translation>Soubory s formuláři</translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.py" line="72"/> + <source>Forms Files</source> + <translation>Soubory s formuláři</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.py" line="76"/> <source>Interface Files</source> <translation>Interface soubory</translation> </message> <message> + <location filename="../Project/AddDirectoryDialog.py" line="78"/> + <source>Other Files (*)</source> + <translation>Jiné soubory (*)</translation> + </message> + <message> <location filename="../Project/AddDirectoryDialog.py" line="74"/> - <source>Other Files (*)</source> - <translation>Jiné soubory (*)</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.py" line="70"/> <source>Resource Files</source> <translation>Resource soubory</translation> </message> @@ -592,19 +592,19 @@ <context> <name>AddFileDialog</name> <message> - <location filename="../Project/AddFileDialog.ui" line="13"/> + <location filename="../Project/AddFileDialog.ui" line="14"/> <source>Add Files</source> <translation>Přidat soubory</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="16"/> + <location filename="../Project/AddFileDialog.ui" line="17"/> <source><b>Add Files Dialog</b> <p>This dialog is used to add files to the current project.</p></source> <translation><b>Dialog Přidat soubory</b> <p>Tento dialog slouží k přidání souborů do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="28"/> + <location filename="../Project/AddFileDialog.ui" line="74"/> <source><b>Source Files</b> <p>Select the source files via a files selection dialog.</p></source> <translation><b>Zdrojové soubory</b> @@ -613,44 +613,44 @@ <message> <location filename="../Project/AddFileDialog.ui" line="65"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.ui" line="29"/> + <source>&Target Directory:</source> + <translation>&Cílový adresář:</translation> </message> <message> <location filename="../Project/AddFileDialog.ui" line="39"/> - <source>&Target Directory:</source> - <translation>&Cílový adresář:</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.ui" line="49"/> <source>Enter the target directory for the file</source> <translation>Zadejte cílový adresář pro soubor</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="52"/> + <location filename="../Project/AddFileDialog.ui" line="42"/> <source><b>Target Directory</b> <p>Enter the target directory. You may select it with a dialog by pressing the button to the right.</p></source> <translation><b>Cílový adresář</b><p>Zadejte cílový adresář. Stisknutím pravého tlačítka jej můžete vybrat v dialogovém okně.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="61"/> + <location filename="../Project/AddFileDialog.ui" line="82"/> <source><b>Target Directory</b> <p>Select the target directory via a directory selection dialog.</p></source> <translation><b>Cílový adresář</b> <p>Výběr cílového adresáře přes dialog výběru adresáře.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="72"/> + <location filename="../Project/AddFileDialog.ui" line="51"/> <source>&Source Files:</source> <translation>&Zdrojové soubory:</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="82"/> + <location filename="../Project/AddFileDialog.ui" line="61"/> <source>Enter the name of files to add separated by the path separator</source> <translation>Zadejte jména souborů oddělená oddělovačem cesty</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="85"/> + <location filename="../Project/AddFileDialog.ui" line="64"/> <source><b>Source Files</b> <p>Enter the name of files to add to the current project separated by the path separator. You may select them with a dialog by pressing @@ -659,92 +659,92 @@ <p>Vložte jména souborů oddělená oddělovačem cesty, krerá se přidají do aktuálního projektu. Stisknutím pravého tlačítka je můžete vybrat pomocí dialogového okna.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="97"/> + <location filename="../Project/AddFileDialog.ui" line="92"/> <source>Select, if the files should be added as sourcecode (overriding automatic detection)</source> <translation>Označte, jestliže soubory mají být přidány jako zdrojový kód (přepíše automatickou detekci)</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="100"/> + <location filename="../Project/AddFileDialog.ui" line="95"/> <source>Is source&code files</source> <translation>Soubor je zdrojový &kód</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="103"/> + <location filename="../Project/AddFileDialog.ui" line="98"/> <source>Alt+C</source> <translation></translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="63"/> + <location filename="../Project/AddFileDialog.py" line="68"/> <source>Select target directory</source> <translation>Výběr cílového adresáře</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="106"/> + <location filename="../Project/AddFileDialog.py" line="111"/> <source>Select Files</source> <translation>Výběr souborů</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="114"/> + <location filename="../Project/AddFileDialog.py" line="119"/> <source>Select user-interface files</source> <translation>Výběr user-interface souborů</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="122"/> + <location filename="../Project/AddFileDialog.py" line="127"/> <source>Select resource files</source> <translation>Výběr resource souborů</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="148"/> + <location filename="../Project/AddFileDialog.py" line="153"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="130"/> + <location filename="../Project/AddFileDialog.py" line="135"/> <source>Select source files</source> <translation>Výběr zdrojových souborů</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="138"/> + <location filename="../Project/AddFileDialog.py" line="143"/> <source>Select interface files</source> <translation>Výběr interface souborů</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="146"/> + <location filename="../Project/AddFileDialog.py" line="151"/> <source>Select translation files</source> <translation>Výběr souborů s překlady</translation> </message> <message> + <location filename="../Project/AddFileDialog.py" line="154"/> + <source>Select files</source> + <translation>Výběr souborů</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="98"/> + <source>Source Files ({0});;Forms Files ({1});;Resource Files ({2});;Interface Files ({3});;Translation Files ({4});;All Files (*)</source> + <translation>Zdrojové soubory ({0});;Soubory s formuláři ({1});;Resource soubory ({2});;Interface soubory ({3});; Soubory s překlady ({4});;Všechny soubory (*)</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="117"/> + <source>Forms Files ({0})</source> + <translation>Soubory s formuláři ({0})</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="125"/> + <source>Resource Files ({0})</source> + <translation>Zdrojové soubory {0})</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="133"/> + <source>Source Files ({0});;All Files (*)</source> + <translation>Zdrojové soubory ({0});;Všechny soubory (*)</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="141"/> + <source>Interface Files ({0})</source> + <translation>Interface soubory ({0})</translation> + </message> + <message> <location filename="../Project/AddFileDialog.py" line="149"/> - <source>Select files</source> - <translation>Výběr souborů</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="93"/> - <source>Source Files ({0});;Forms Files ({1});;Resource Files ({2});;Interface Files ({3});;Translation Files ({4});;All Files (*)</source> - <translation>Zdrojové soubory ({0});;Soubory s formuláři ({1});;Resource soubory ({2});;Interface soubory ({3});; Soubory s překlady ({4});;Všechny soubory (*)</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="112"/> - <source>Forms Files ({0})</source> - <translation>Soubory s formuláři ({0})</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="120"/> - <source>Resource Files ({0})</source> - <translation>Zdrojové soubory {0})</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="128"/> - <source>Source Files ({0});;All Files (*)</source> - <translation>Zdrojové soubory ({0});;Všechny soubory (*)</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="136"/> - <source>Interface Files ({0})</source> - <translation>Interface soubory ({0})</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.py" line="144"/> <source>Translation Files ({0})</source> <translation>Soubory s překlady ({0})</translation> </message> @@ -1122,7 +1122,7 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="62"/> + <location filename="../MultiProject/AddProjectDialog.py" line="65"/> <source>Add Project</source> <translation>Nový projekt</translation> </message> @@ -1147,17 +1147,17 @@ <translation>Zadejte název souboru projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> <source>Select the project file via a file selection dialog</source> <translation>Výběr projektu přes dialogové okno výběru souboru</translation> </message> <message> <location filename="../MultiProject/AddProjectDialog.ui" line="62"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="82"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> <source>Enter a short description for the project</source> <translation>Zadejte krátký popis projektu</translation> </message> @@ -1177,27 +1177,27 @@ <translation type="obsolete">Soubory projektu (*.e4p *.e4pz)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="69"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> <source>&Description:</source> <translation>&Popis:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="44"/> + <location filename="../MultiProject/AddProjectDialog.py" line="47"/> <source>Project Properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="62"/> + <location filename="../MultiProject/AddProjectDialog.py" line="65"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="98"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> @@ -1566,144 +1566,144 @@ <context> <name>BookmarkedFilesDialog</name> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="13"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="14"/> <source>Configure Bookmarked Files Menu</source> <translation>Konfigurace menu souborů v záložkách</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="34"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="35"/> <source>Delete the selected entry</source> <translation>Smazat vybranou položku</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="37"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="38"/> <source><b>Delete</b> <p>Delete the selected entry.</p></source> <translation><b>Smazat</b> <p>Smazat vybranou položku.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="41"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="42"/> <source>&Delete</source> <translation>Sma&zat</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="114"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="101"/> <source>Alt+D</source> <translation></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="70"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="71"/> <source>Move up</source> <translation>Posunout nahoru</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="73"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="74"/> <source><b>Move Up</b> <p>Move the selected entry up.</p></source> <translation><b>Posunout nahoru</b> <p>Posunout vybranou položku nahoru.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="77"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="78"/> <source>&Up</source> <translation>Nahor&u</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="80"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="81"/> <source>Alt+U</source> <translation></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="87"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="169"/> <source>Select the file via a file selection dialog</source> <translation>Vybrat soubor přes dialog výběru souborů</translation> </message> <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="94"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="104"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="91"/> <source>Move down</source> <translation>Posunout dolů</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="107"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="94"/> <source><b>Move Down</b> <p>Move the selected entry down.</p></source> <translation><b>Posunout dolů</b> <p>Posunout vybranou položku dolů.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="111"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="98"/> <source>&Down</source> <translation>&Dolů</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="124"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="111"/> <source>Add a new bookmarked file</source> <translation>Přidat novou záložku</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="127"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="114"/> <source><b>Add</b> <p>Add a new bookmarked file with the value entered below.</p></source> <translation><b>Přidat</b> <p>Přidat novou záložku s hodnotou zadanou níže.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="131"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="118"/> <source>&Add</source> <translation>Přid&at</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="134"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="121"/> <source>Alt+A</source> <translation></translation> </message> <message> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="128"/> + <source>&File:</source> + <translation>&Soubor:</translation> + </message> + <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="141"/> - <source>&File:</source> - <translation>&Soubor:</translation> - </message> - <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="154"/> <source>Change the value of the selected entry</source> <translation>Změnit hodnotu vybrané položky</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="157"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="144"/> <source><b>Change</b> <p>Change the value of the selected entry.</p></source> <translation><b>Změnit</b> <p>Změnit hodnotu vybrané položky.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="161"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="148"/> <source>C&hange</source> <translation>Z&měnit</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="164"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="151"/> <source>Alt+H</source> <translation></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="171"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="158"/> <source>Enter the filename of the file</source> <translation>Vložte jméno souboru</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="90"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="172"/> <source><b>File</b> <p>Select the file to be bookmarked via a file selection dialog.</p></source> <translation><b>Soubor</b> <p>Výběr souboru, který bude uložen do záložek, pomocí dialogu výběru souborů.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="174"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="161"/> <source><b>File</b> <p>Enter the filename of the bookmarked file.</p></source> <translation><b>Soubor</b> @@ -1849,12 +1849,12 @@ <translation type="unfinished">Importovat záložky</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="48"/> <source>Choose source from which you want to import bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="55"/> <source>Choose the source to import from</source> <translation type="unfinished"></translation> </message> @@ -1864,42 +1864,42 @@ <translation type="obsolete">Další</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="196"/> <source>Cancel</source> <translation type="unfinished">Zrušit</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="89"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="92"/> <source>Choose Directory ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="99"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="102"/> <source>Choose File ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="124"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="127"/> <source><b>Importing from {0}</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="134"/> <source>Finish</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="146"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="149"/> <source>Error importing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="145"/> <source>Shows the name of the bookmarks file or directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="189"/> <source>Next ></source> <translation type="unfinished">Další ></translation> </message> @@ -2673,52 +2673,52 @@ <context> <name>ChatWidget</name> <message> - <location filename="../Cooperation/ChatWidget.ui" line="54"/> + <location filename="../Cooperation/ChatWidget.ui" line="63"/> <source>Chat</source> <translation>Pokec</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="29"/> + <location filename="../Cooperation/ChatWidget.ui" line="38"/> <source>Users</source> <translation>Uživatelé</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="80"/> + <location filename="../Cooperation/ChatWidget.ui" line="89"/> <source>Press to send the text above</source> <translation>Stisknutím odeslat výše uvedený text</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="83"/> + <location filename="../Cooperation/ChatWidget.ui" line="92"/> <source>Send</source> <translation>Odeslat</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="189"/> + <location filename="../Cooperation/ChatWidget.ui" line="186"/> <source>Connection</source> <translation>Připojení</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="197"/> + <location filename="../Cooperation/ChatWidget.ui" line="194"/> <source>Host:</source> <translation>Host:</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="277"/> + <location filename="../Cooperation/ChatWidget.ui" line="274"/> <source>Port:</source> <translation>Port:</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="259"/> + <location filename="../Cooperation/ChatWidget.ui" line="256"/> <source>Shows the connection status</source> <translation>Zobrazuje stav připojení</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="271"/> + <location filename="../Cooperation/ChatWidget.ui" line="268"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="319"/> + <location filename="../Cooperation/ChatWidget.ui" line="316"/> <source>Shows the status of the server</source> <translation>Zobrazuje stav serveru</translation> </message> @@ -2771,27 +2771,27 @@ <translation>Připojeno</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="96"/> + <location filename="../Cooperation/ChatWidget.ui" line="105"/> <source>Share Editor</source> <translation>Sdílený editor</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="118"/> + <location filename="../Cooperation/ChatWidget.ui" line="127"/> <source>Press to toggle the shared status of the current editor</source> <translation>Stisknutím přepnout sdílený status aktuálního editoru</translation> </message> <message> <location filename="../Cooperation/ChatWidget.ui" line="166"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Cooperation/ChatWidget.ui" line="134"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Cooperation/ChatWidget.ui" line="140"/> <source>Press to start a shared edit</source> <translation>Stisknutím spustit sdílený editor</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="150"/> + <location filename="../Cooperation/ChatWidget.ui" line="153"/> <source>Press to end the edit and send the changes</source> <translation>Stisknutím ukončit editaci a odeslat změny</translation> </message> @@ -2841,12 +2841,12 @@ <translation><p>Obsah pokecu se nepodařilo zapsat do <b>{0}</b></p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="73"/> + <location filename="../Cooperation/ChatWidget.ui" line="82"/> <source>Enter the text to send</source> <translation>Zadejte text k odeslání</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="284"/> + <location filename="../Cooperation/ChatWidget.ui" line="281"/> <source>Enter the server port</source> <translation>Zadejte port serveru</translation> </message> @@ -2866,7 +2866,7 @@ <translation type="obsolete">Stisknutím odebrat hosta</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.ui" line="227"/> <source>Press to clear the hosts list</source> <translation>Stisknutím vymazat seznam hostů</translation> </message> @@ -2951,7 +2951,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="210"/> + <location filename="../Cooperation/ChatWidget.ui" line="207"/> <source>Enter the host and port to connect to in the form "host@port"</source> <translation type="unfinished"></translation> </message> @@ -3274,72 +3274,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="37"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="46"/> <source>Exclude Files:</source> <translation type="unfinished">Nevkládat soubory:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="53"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished">Zadejte patterny jmen souborů oddělené čárkami, které se nemají vkládat</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="63"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="72"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="66"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="75"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="73"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="82"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="76"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> <source>Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="96"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="105"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="99"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="108"/> <source>Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="115"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="109"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="118"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="116"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="119"/> - <source>Reset Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="128"/> + <source>Reset Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="137"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="135"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="144"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> @@ -3351,25 +3351,25 @@ <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="217"/> <source>...</source> - <translation type="unfinished">...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="152"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="158"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="159"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="165"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="183"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="186"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> @@ -3384,57 +3384,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="224"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="221"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="233"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="230"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="267"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="264"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="276"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="273"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="297"/> + <source>Select to allow hanging closing brackets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="300"/> - <source>Select to allow hanging closing brackets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="303"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="324"/> + <source>Select to repeat each message type</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="327"/> - <source>Select to repeat each message type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="337"/> + <source>Select to fix some issues</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="340"/> - <source>Select to fix some issues</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="386"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="383"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3442,72 +3442,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="402"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="399"/> <source>File/Line</source> <translation type="unfinished">Soubor/Řádek</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Code</source> <translation type="unfinished">Kód</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="412"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> <source>Message</source> <translation type="unfinished">Zpráva</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="101"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> - <source>Eric</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> - <source>Statistics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="97"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="100"/> - <source>Show</source> - <translation type="unfinished">Zobrazit</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="102"/> + <source>Eric</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="104"/> + <source>Statistics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="106"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="109"/> + <source>Show</source> + <translation type="unfinished">Zobrazit</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="111"/> <source>Press to show all files containing an issue</source> <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="403"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="412"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="885"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="894"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="546"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="555"/> <source>No issues found.</source> <translation type="unfinished">Žádné problémy nenalezeny.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="433"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="442"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="439"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -4209,112 +4209,112 @@ <translation>Porovnání souboru</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="32"/> + <location filename="../UI/CompareDialog.ui" line="41"/> <source>File &1:</source> <translation>Soubor &1:</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="42"/> + <location filename="../UI/CompareDialog.ui" line="51"/> <source>Enter the name of the first file</source> <translation>Zadejte jméno prvního souboru</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="76"/> + <location filename="../UI/CompareDialog.ui" line="82"/> <source>Press to select the file via a file selection dialog</source> <translation>Stisknout pro výběr souboru přes dialogové okno</translation> </message> <message> <location filename="../UI/CompareDialog.ui" line="79"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="59"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="65"/> <source>File &2:</source> <translation>Soubor &2:</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="69"/> + <location filename="../UI/CompareDialog.ui" line="75"/> <source>Enter the name of the second file</source> <translation>Zadejte jméno druhého souboru</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="148"/> + <location filename="../UI/CompareDialog.ui" line="151"/> <source>Press to move to the first difference</source> <translation>Stisknout pro posun na první rozdíl</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="158"/> + <location filename="../UI/CompareDialog.ui" line="161"/> <source>Press to move to the previous difference</source> <translation>Stisknout pro posun na předchozí rozdíl</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="168"/> + <location filename="../UI/CompareDialog.ui" line="171"/> <source>Press to move to the next difference</source> <translation>Stisknout pro posun na další rozdíl</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="178"/> + <location filename="../UI/CompareDialog.ui" line="181"/> <source>Press to move to the last difference</source> <translati
