--- a/CxFreeze/CxfreezeConfigDialog.ui Thu Jun 03 14:27:52 2021 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.ui Thu Jun 03 17:51:56 2021 +0200
@@ -21,22 +21,7 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTabWidget" name="tabWidget2">
<property name="currentIndex">
@@ -46,31 +31,141 @@
<attribute name="title">
<string>&General</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout">
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel5_2">
- <property name="text">
- <string>Application icon:</string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
+ <string>Target directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="EricPathPicker" 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 name of the file to create</string>
+ </property>
+ <property name="whatsThis">
+ <string><p>Enter the name of the directory in which to place the target file and any dependant files.</p></string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
+ <string>Target name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="targetNameEdit">
+ <property name="toolTip">
+ <string>Enter the name of the file to create</string>
+ </property>
+ <property name="whatsThis">
+ <string><p>Enter the name of the file to create instead of the base name of the script and the extension of the base binary.</p></string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
+ <string>Base name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="basenameCombo">
+ <property name="toolTip">
+ <string>Enter the name of a file on which to base the target file</string>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ <property name="insertPolicy">
+ <enum>QComboBox::InsertAtTop</enum>
+ </property>
+ <property name="duplicatesEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
+ <string>Init script:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="initscriptCombo">
+ <property name="toolTip">
+ <string>Enter name of script which will be executed upon startup</string>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ <property name="insertPolicy">
+ <enum>QComboBox::InsertAtTop</enum>
+ </property>
+ <property name="duplicatesEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel5_2">
+ <property name="text">
+ <string>Application icon:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="EricPathPicker" name="applicationIconPicker" 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 application icon</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="textLabel6_2">
+ <property name="text">
+ <string>cx_Freeze executable:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="cxfreezeExecCombo">
+ <property name="toolTip">
+ <string>Select the cx_freeze executable</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="3" column="1" colspan="2">
- <widget class="QComboBox" name="initscriptCombo">
- <property name="toolTip">
- <string>Enter name of script which will be executed upon startup</string>
- </property>
- <property name="editable">
- <bool>true</bool>
- </property>
- <property name="insertPolicy">
- <enum>QComboBox::InsertAtTop</enum>
- </property>
- <property name="duplicatesEnabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="0" colspan="3">
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="keeppathCheckBox">
@@ -107,71 +202,7 @@
</item>
</layout>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel2">
- <property name="text">
- <string>Init script:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="text">
- <string>Target name:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="targetNameEdit">
- <property name="toolTip">
- <string>Enter the name of the file to create</string>
- </property>
- <property name="whatsThis">
- <string><p>Enter the name of the file to create instead of the base name of the script and the extension of the base binary.</p></string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1">
- <property name="text">
- <string>Base name:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="targetDirEdit">
- <property name="toolTip">
- <string>Enter the name of the target directory</string>
- </property>
- <property name="whatsThis">
- <string><p>Enter the name of the directory in which to place the target file and any dependant files.</p></string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2">
- <widget class="QComboBox" name="basenameCombo">
- <property name="toolTip">
- <string>Enter the name of a file on which to base the target file</string>
- </property>
- <property name="editable">
- <bool>true</bool>
- </property>
- <property name="insertPolicy">
- <enum>QComboBox::InsertAtTop</enum>
- </property>
- <property name="duplicatesEnabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel3">
- <property name="text">
- <string>Target directory:</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="3">
+ <item>
<widget class="QGroupBox" name="optimizeGroup">
<property name="toolTip">
<string>Select to optimize generated bytecode</string>
@@ -228,33 +259,6 @@
</layout>
</widget>
</item>
- <item row="5" column="1" colspan="2">
- <widget class="QComboBox" name="cxfreezeExecCombo">
- <property name="toolTip">
- <string>Select the cx_freeze executable</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="textLabel6_2">
- <property name="text">
- <string>cx_Freeze executable:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="applicationIconEdit">
- <property name="toolTip">
- <string>Enter the name of the application icon.</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QToolButton" name="targetDirButton"/>
- </item>
- <item row="4" column="2">
- <widget class="QToolButton" name="iconFileButton"/>
- </item>
</layout>
</widget>
<widget class="QWidget" name="advancedTab">
@@ -275,7 +279,7 @@
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
+ <item row="0" column="1">
<widget class="QLineEdit" name="defaultPathEdit">
<property name="toolTip">
<string>Enter directories to initialize sys.path</string>
@@ -285,16 +289,6 @@
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="includePathEdit">
- <property name="toolTip">
- <string>Enter directories to modify sys.path</string>
- </property>
- <property name="whatsThis">
- <string><p>Enter a list of paths separated by the standard path separator, which will be used to modify sys.path prior to running the module finder.</p></string>
- </property>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel3_2">
<property name="text">
@@ -302,6 +296,16 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="includePathEdit">
+ <property name="toolTip">
+ <string>Enter directories to modify sys.path</string>
+ </property>
+ <property name="whatsThis">
+ <string><p>Enter a list of paths separated by the standard path separator, which will be used to modify sys.path prior to running the module finder.</p></string>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel4_2">
<property name="text">
@@ -309,7 +313,7 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2">
+ <item row="2" column="1">
<widget class="QLineEdit" name="replacePathsEdit">
<property name="toolTip">
<string>Enter replacement directives</string>
@@ -326,7 +330,7 @@
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2">
+ <item row="3" column="1">
<widget class="QLineEdit" name="includeModulesEdit">
<property name="toolTip">
<string>Enter a comma separated list of modules to include</string>
@@ -340,20 +344,13 @@
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2">
+ <item row="4" column="1">
<widget class="QLineEdit" name="excludeModulesEdit">
<property name="toolTip">
<string>Enter a comma separated list of modules to exclude</string>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="extListFileEdit">
- <property name="toolTip">
- <string>Enter the name of a file in which to place the list of included modules</string>
- </property>
- </widget>
- </item>
<item row="5" column="0">
<widget class="QLabel" name="textLabel7">
<property name="text">
@@ -361,6 +358,22 @@
</property>
</widget>
</item>
+ <item row="5" column="1">
+ <widget class="EricPathPicker" name="extListFilePicker" 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 a file in which to place the list of included modules</string>
+ </property>
+ </widget>
+ </item>
<item row="6" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
@@ -368,19 +381,12 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>17</width>
+ <height>103</height>
</size>
</property>
</spacer>
</item>
- <item row="5" column="2">
- <widget class="QToolButton" name="extListFileButton">
- <property name="toolTip">
- <string>Press to select the external list file via a file selection dialog</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab">
@@ -410,7 +416,7 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="addFilesButtonBox">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="deleteSelectedButton">
<property name="enabled">
@@ -443,6 +449,9 @@
<string>Enter a file or directory to be added.
Wildcards are allowed, e.g. *.ui</string>
</property>
+ <property name="clearButtonEnabled">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -472,15 +481,21 @@
</widget>
<layoutdefault spacing="6" margin="6"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>EricPathPicker</class>
+ <extends>QWidget</extends>
+ <header>EricWidgets/EricPathPicker.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
<tabstops>
<tabstop>tabWidget2</tabstop>
- <tabstop>targetDirEdit</tabstop>
- <tabstop>targetDirButton</tabstop>
+ <tabstop>targetDirPicker</tabstop>
<tabstop>targetNameEdit</tabstop>
<tabstop>basenameCombo</tabstop>
<tabstop>initscriptCombo</tabstop>
- <tabstop>applicationIconEdit</tabstop>
- <tabstop>iconFileButton</tabstop>
+ <tabstop>applicationIconPicker</tabstop>
<tabstop>cxfreezeExecCombo</tabstop>
<tabstop>keeppathCheckBox</tabstop>
<tabstop>compressCheckBox</tabstop>
@@ -492,14 +507,12 @@
<tabstop>replacePathsEdit</tabstop>
<tabstop>includeModulesEdit</tabstop>
<tabstop>excludeModulesEdit</tabstop>
- <tabstop>extListFileEdit</tabstop>
- <tabstop>extListFileButton</tabstop>
- <tabstop>selectFileOrFolderButton</tabstop>
+ <tabstop>extListFilePicker</tabstop>
+ <tabstop>fileOrFolderList</tabstop>
+ <tabstop>deleteSelectedButton</tabstop>
<tabstop>fileOrFolderEdit</tabstop>
<tabstop>addFileOrFolderButton</tabstop>
- <tabstop>deleteSelectedButton</tabstop>
- <tabstop>fileOrFolderList</tabstop>
- <tabstop>buttonBox</tabstop>
+ <tabstop>selectFileOrFolderButton</tabstop>
</tabstops>
<resources/>
<connections>
