--- a/ViewManager/BookmarkedFilesDialog.ui Sun Nov 29 13:21:15 2015 +0100 +++ b/ViewManager/BookmarkedFilesDialog.ui Sun Nov 29 14:33:38 2015 +0100 @@ -16,17 +16,57 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QGridLayout"> - <item row="0" column="0" rowspan="6" colspan="3"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" rowspan="6" colspan="2"> <widget class="QListWidget" name="filesList"> <property name="alternatingRowColors"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="3"> + <item row="0" column="2"> + <widget class="QPushButton" name="addButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <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> + <property name="text"> + <string>&Add</string> + </property> + <property name="shortcut"> + <string>Alt+A</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="changeButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <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> + <property name="text"> + <string>C&hange</string> + </property> + <property name="shortcut"> + <string>Alt+H</string> + </property> + </widget> + </item> + <item row="2" column="2"> <widget class="QPushButton" name="deleteButton"> <property name="enabled"> <bool>false</bool> @@ -46,23 +86,7 @@ </property> </widget> </item> - <item row="5" column="3"> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>87</width> - <height>130</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="3"> + <item row="3" column="2"> <widget class="QPushButton" name="upButton"> <property name="enabled"> <bool>false</bool> @@ -82,7 +106,7 @@ </property> </widget> </item> - <item row="4" column="3"> + <item row="4" column="2"> <widget class="QPushButton" name="downButton"> <property name="enabled"> <bool>false</bool> @@ -102,25 +126,21 @@ </property> </widget> </item> - <item row="0" column="3"> - <widget class="QPushButton" name="addButton"> - <property name="enabled"> - <bool>false</bool> + <item row="5" column="2"> + <spacer> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="toolTip"> - <string>Add a new bookmarked file</string> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> </property> - <property name="whatsThis"> - <string><b>Add</b> -<p>Add a new bookmarked file with the value entered below.</p></string> + <property name="sizeHint" stdset="0"> + <size> + <width>87</width> + <height>118</height> + </size> </property> - <property name="text"> - <string>&Add</string> - </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> - </widget> + </spacer> </item> <item row="6" column="0"> <widget class="QLabel" name="TextLabel1"> @@ -128,32 +148,21 @@ <string>&File:</string> </property> <property name="buddy"> - <cstring>fileEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="QPushButton" name="changeButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <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> - <property name="text"> - <string>C&hange</string> - </property> - <property name="shortcut"> - <string>Alt+H</string> + <cstring>filePicker</cstring> </property> </widget> </item> <item row="6" column="1"> - <widget class="QLineEdit" name="fileEdit"> + <widget class="E5PathPicker" name="filePicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> <property name="toolTip"> <string>Enter the filename of the file</string> </property> @@ -163,17 +172,6 @@ </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> @@ -190,6 +188,14 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> <tabstops> <tabstop>filesList</tabstop> <tabstop>addButton</tabstop> @@ -197,8 +203,6 @@ <tabstop>deleteButton</tabstop> <tabstop>upButton</tabstop> <tabstop>downButton</tabstop> - <tabstop>fileEdit</tabstop> - <tabstop>fileButton</tabstop> </tabstops> <resources/> <connections>