On Wed, Dec 07, 2016 at 06:15:02PM +0100, Jean-Marc Lasgouttes wrote: > > Yes, your patch make the separation clearer (although I am not sure that I > like the oval rect).
I thought it would have helped in distingushing the sections, but this is a mere detail. > But the fact that this converter pane is already crowed means that we cannot > implement a proper UI for converter flags. It might be that such an UI would > be much too big anyway. Why would you think that a proper implementation (if and when that will be performed) would need more space? However, please have a look at the attached patch, which leaves more space to the converters definitions. No need to revert f0f555b5, as this time I used the designer and the changes would have been anyway extensive. -- Enrico
diff --git a/src/frontends/qt4/ui/PrefConvertersUi.ui b/src/frontends/qt4/ui/PrefConvertersUi.ui index f9c02a8..3497644 100644 --- a/src/frontends/qt4/ui/PrefConvertersUi.ui +++ b/src/frontends/qt4/ui/PrefConvertersUi.ui @@ -1,7 +1,7 @@ -<ui version="4.0" > +<ui version="4.0"> <class>PrefConvertersUi</class> - <widget class="QWidget" name="PrefConvertersUi" > - <property name="geometry" > + <widget class="QWidget" name="PrefConvertersUi"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,88 +9,89 @@ <height>466</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string/> </property> - <layout class="QGridLayout" > - <property name="margin" > + <layout class="QGridLayout"> + <property name="margin"> <number>9</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="0" > - <widget class="QGroupBox" name="converterDefGB" > - <property name="title" > - <string>Converter Defi&nitions</string> + <item row="0" column="0"> + <widget class="QGroupBox" name="converterDefGB"> + <property name="styleSheet"> + <string notr="true">QGroupBox{border:1px solid gray;margin-top:0.5ex;}</string> </property> - <layout class="QGridLayout" > - <property name="margin" > + <property name="title"> + <string/> + </property> + <layout class="QGridLayout"> + <property name="margin"> <number>9</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="0" > - <widget class="QListWidget" name="convertersLW" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> + <item row="1" column="0"> + <widget class="QListWidget" name="convertersLW"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="2" column="0" colspan="2" > - <layout class="QGridLayout" > - <property name="margin" > + <item row="3" column="0" colspan="2"> + <layout class="QGridLayout"> + <property name="margin"> <number>0</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="1" > - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <item row="0" column="1"> + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QLineEdit" name="converterED" /> + <widget class="QLineEdit" name="converterED"/> </item> <item> - <widget class="QLineEdit" name="converterFlagED" /> + <widget class="QLineEdit" name="converterFlagED"/> </item> </layout> </item> - <item row="0" column="0" > - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <item row="0" column="0"> + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="converterLA" > - <property name="text" > + <widget class="QLabel" name="converterLA"> + <property name="text"> <string>C&onverter:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>converterED</cstring> </property> </widget> </item> <item> - <widget class="QLabel" name="converterFlagLA" > - <property name="text" > + <widget class="QLabel" name="converterFlagLA"> + <property name="text"> <string>E&xtra flag:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>converterFlagED</cstring> </property> </widget> @@ -99,38 +100,36 @@ </item> </layout> </item> - <item row="1" column="0" colspan="2" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <item row="2" column="0" colspan="2"> + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="converterFromLA" > - <property name="text" > + <widget class="QLabel" name="converterFromLA"> + <property name="text"> <string>&From format:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>converterFromCO</cstring> </property> </widget> </item> <item> - <widget class="QComboBox" name="converterFromCO" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> + <widget class="QComboBox" name="converterFromCO"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -140,29 +139,27 @@ </layout> </item> <item> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="converterToLA" > - <property name="text" > + <widget class="QLabel" name="converterToLA"> + <property name="text"> <string>&To format:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>converterToCO</cstring> </property> </widget> </item> <item> - <widget class="QComboBox" name="converterToCO" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> + <widget class="QComboBox" name="converterToCO"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -173,49 +170,47 @@ </item> </layout> </item> - <item row="0" column="1" > - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <item row="1" column="1"> + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QPushButton" name="converterNewPB" > - <property name="text" > + <widget class="QPushButton" name="converterNewPB"> + <property name="text"> <string>A&dd</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="converterModifyPB" > - <property name="text" > + <widget class="QPushButton" name="converterModifyPB"> + <property name="text"> <string>&Modify</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="converterRemovePB" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> + <widget class="QPushButton" name="converterRemovePB"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>Remo&ve</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>75</width> <height>16</height> @@ -225,109 +220,178 @@ </item> </layout> </item> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="labeldef"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true">font-weight: bold;</string> + </property> + <property name="text"> + <string>Converter Defi&nitions</string> + </property> + <property name="buddy"> + <cstring>convertersLW</cstring> + </property> + </widget> + </item> </layout> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="cacheGB" > - <property name="title" > - <string>Converter File Cache</string> + <item row="1" column="0"> + <widget class="QGroupBox" name="globalGB"> + <property name="styleSheet"> + <string notr="true">QGroupBox{border:1px solid gray;margin-top:0.5ex;}</string> + </property> + <property name="title"> + <string/> </property> - <layout class="QGridLayout" > - <property name="margin" > + <layout class="QGridLayout"> + <property name="margin"> <number>9</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="0" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="1" column="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="spacing" > + </widget> + </item> + <item row="1" column="0"> + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QCheckBox" name="cacheCB" > - <property name="text" > + <widget class="QCheckBox" name="cacheCB"> + <property name="text"> <string>&Enabled</string> </property> </widget> </item> <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="maxAgeLA" > - <property name="text" > - <string>Maximum a&ge (in days):</string> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> </property> - <property name="buddy" > - <cstring>maxAgeLE</cstring> + <property name="margin"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="maxAgeLE" /> + <item> + <widget class="QLabel" name="maxAgeLA"> + <property name="text"> + <string>Maximum a&ge (in days):</string> + </property> + <property name="buddy"> + <cstring>maxAgeLE</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="maxAgeLE"/> + </item> + </layout> </item> </layout> </item> - </layout> - </widget> - </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="securityGB" > - <property name="title" > - <string>Security</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="0" column="4"> + <widget class="QLabel" name="labelsec"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true">font-weight: bold;</string> + </property> + <property name="text"> + <string>Security</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="labelcache"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true">font-weight: bold;</string> + </property> + <property name="text"> + <string>Converter File Cache</string> </property> - <property name="spacing" > + </widget> + </item> + <item row="1" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="4"> + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="QCheckBox" name="needauthForbiddenCB" > - <property name="text" > - <string>&Forbid use of needauth converters</string> - </property> + <widget class="QCheckBox" name="needauthForbiddenCB"> <property name="toolTip"> <string>When enabled, use of converters with the 'needauth' option is forbidden.</string> </property> + <property name="text"> + <string>&Forbid use of needauth converters</string> + </property> </widget> </item> <item> - <widget class="QCheckBox" name="needauthCB" > - <property name="text" > - <string>Use need&auth option</string> - </property> + <widget class="QCheckBox" name="needauthCB"> <property name="toolTip"> <string>When enabled, ask user before launching any external converter with the 'needauth' option.</string> </property> + <property name="text"> + <string>Use need&auth option</string> + </property> </widget> </item> </layout> </item> + <item row="1" column="3"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </widget> </item> @@ -344,7 +408,7 @@ <tabstop>converterRemovePB</tabstop> </tabstops> <includes> - <include location="local" >qt_i18n.h</include> + <include location="local">qt_i18n.h</include> </includes> <resources/> <connections/>