diff -r 76999ca7bbf1 -r 3a1d1d4c6f4f Project/AddDirectoryDialog.ui --- a/Project/AddDirectoryDialog.ui Sat Nov 28 19:47:23 2015 +0100 +++ b/Project/AddDirectoryDialog.ui Sat Nov 28 19:48:11 2015 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>391</width> - <height>174</height> + <height>141</height> </rect> </property> <property name="windowTitle"> @@ -23,96 +23,93 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> - <item> - <layout class="QGridLayout"> - <item row="0" column="1" colspan="2"> - <widget class="QComboBox" name="filterComboBox"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="targetDirLabel"> - <property name="text"> - <string>&Target Directory:</string> - </property> - <property name="buddy"> - <cstring>targetDirEdit</cstring> - </property> - </widget> - </item> - <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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>&File Type:</string> + </property> + <property name="buddy"> + <cstring>filterComboBox</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="filterComboBox"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="sourceDirLabel"> + <property name="text"> + <string>&Source Directory:</string> + </property> + <property name="buddy"> + <cstring>sourceDirPicker</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5PathPicker" name="sourceDirPicker" 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 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. - You may select it with a dialog by pressing the button to - the right.</p></string> - </property> - </widget> - </item> - <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"> - <string>&Recurse into subdirectories</string> - </property> - </widget> - </item> - <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> + You may select it with a dialog by pressing the button to the right.</p></string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="targetDirLabel"> + <property name="text"> + <string>&Target Directory:</string> + </property> + <property name="buddy"> + <cstring>targetDirPicker</cstring> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5PathPicker" name="targetDirPicker" 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 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> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="sourceDirLabel"> - <property name="text"> - <string>&Source Directory:</string> - </property> - <property name="buddy"> - <cstring>sourceDirEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="textLabel1"> - <property name="text"> - <string>&File Type:</string> - </property> - <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> + </property> + </widget> </item> - <item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="recursiveCheckBox"> + <property name="toolTip"> + <string>Select, whether a recursive add should be performed</string> + </property> + <property name="text"> + <string>&Recurse into subdirectories</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -126,12 +123,18 @@ </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>filterComboBox</tabstop> - <tabstop>sourceDirEdit</tabstop> - <tabstop>sourceDirButton</tabstop> - <tabstop>targetDirEdit</tabstop> - <tabstop>targetDirButton</tabstop> + <tabstop>sourceDirPicker</tabstop> + <tabstop>targetDirPicker</tabstop> <tabstop>recursiveCheckBox</tabstop> </tabstops> <resources/>