Qt: use LineEdits for width and height and state that you can have one of them empty.

diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp
index fc558f952ba1300fc0ca0da1c32b15c6113e48d1..e860bfb1792724cb5022b36d7663a3748b698692 100644 (file)
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -301,8 +301,8 @@ void VLCProfileEditor::fillProfile( QString qs )
     ui.vBitrateSpin->setValue( options[5].toInt() );
     ui.vScaleBox->setEditText( options[6] );
     ui.vFrameBox->setValue( options[7].toDouble() );
-    ui.widthBox->setValue( options[8].toInt() );
-    ui.heightBox->setValue( options[9].toInt() );
+    ui.widthBox->setText( options[8] );
+    ui.heightBox->setText( options[9] );
 
     ui.aCodecBox->setCurrentIndex( ui.aCodecBox->findData( options[10] ) );
     ui.aBitrateSpin->setValue( options[11].toInt() );
@@ -390,8 +390,8 @@ QString VLCProfileEditor::transcodeValue()
             << QString::number( ui.vBitrateSpin->value() )
             << ui.vScaleBox->currentText()
             << QString::number( ui.vFrameBox->value() )
-            << QString::number( ui.widthBox->value() )
-            << QString::number( ui.heightBox->value() )
+            << ui.widthBox->text()
+            << ui.heightBox->text()
 
             << currentData( ui.aCodecBox ).toString()
             << QString::number( ui.aBitrateSpin->value() )

diff --git a/modules/gui/qt4/ui/profiles.ui b/modules/gui/qt4/ui/profiles.ui
index a26c2b844c2b477bbf9b1f1626128af71e748d3e..d50e8f2b6bdef3a5caaa041a4b1c7f264dffd978 100644 (file)
--- a/modules/gui/qt4/ui/profiles.ui
+++ b/modules/gui/qt4/ui/profiles.ui
@@ -1,307 +1,294 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Profiles</class>
- <widget class="QWidget" name="Profiles" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Profiles">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>631</width>
-    <height>378</height>
+    <width>628</width>
+    <height>413</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label_5" >
-     <property name="text" >
-      <string>_("Profile Name")</string>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>_(&quot;Profile Name&quot;)</string>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>10</number>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>profileLine</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="profileLine" />
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="profileLine"/>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <item row="1" column="0" colspan="2">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="muxer" >
-      <attribute name="title" >
-       <string>_("Encapsulation")</string>
+     <widget class="QWidget" name="muxer">
+      <attribute name="title">
+       <string>_(&quot;Encapsulation&quot;)</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="2" column="0" >
-        <widget class="QRadioButton" name="TSMux" >
-         <property name="text" >
+      <layout class="QGridLayout">
+       <item row="2" column="0">
+        <widget class="QRadioButton" name="TSMux">
+         <property name="text">
           <string>MPEG-TS</string>
          </property>
-         <property name="checked" >
+         <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" >
-        <widget class="QRadioButton" name="PSMux" >
-         <property name="text" >
+       <item row="3" column="0">
+        <widget class="QRadioButton" name="PSMux">
+         <property name="text">
           <string>MPEG-PS</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="2" >
-        <widget class="QRadioButton" name="WAVMux" >
-         <property name="text" >
+       <item row="3" column="2">
+        <widget class="QRadioButton" name="WAVMux">
+         <property name="text">
           <string>WAV</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <widget class="QRadioButton" name="ASFMux" >
-         <property name="text" >
+       <item row="2" column="1">
+        <widget class="QRadioButton" name="ASFMux">
+         <property name="text">
           <string>ASF/WMV</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="2" >
-        <widget class="QRadioButton" name="OggMux" >
-         <property name="text" >
+       <item row="2" column="2">
+        <widget class="QRadioButton" name="OggMux">
+         <property name="text">
           <string>Ogg/Ogm</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="2" >
-        <widget class="QRadioButton" name="RAWMux" >
-         <property name="text" >
+       <item row="5" column="2">
+        <widget class="QRadioButton" name="RAWMux">
+         <property name="text">
           <string>RAW</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" >
-        <widget class="QRadioButton" name="MPEG1Mux" >
-         <property name="text" >
+       <item row="5" column="0">
+        <widget class="QRadioButton" name="MPEG1Mux">
+         <property name="text">
           <string>MPEG 1</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="3" >
-        <widget class="QRadioButton" name="FLVMux" >
-         <property name="text" >
+       <item row="3" column="3">
+        <widget class="QRadioButton" name="FLVMux">
+         <property name="text">
           <string>FLV</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="3" >
-        <widget class="QRadioButton" name="AVIMux" >
-         <property name="text" >
+       <item row="5" column="3">
+        <widget class="QRadioButton" name="AVIMux">
+         <property name="text">
           <string>AVI</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="3" >
-        <widget class="QRadioButton" name="MOVMux" >
-         <property name="text" >
+       <item row="2" column="3">
+        <widget class="QRadioButton" name="MOVMux">
+         <property name="text">
           <string>MP4/MOV</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" >
-        <widget class="QRadioButton" name="MJPEGMux" >
-         <property name="text" >
+       <item row="3" column="1">
+        <widget class="QRadioButton" name="MJPEGMux">
+         <property name="text">
           <string>MJPEG</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1" >
-        <widget class="QRadioButton" name="MKVMux" >
-         <property name="text" >
+       <item row="5" column="1">
+        <widget class="QRadioButton" name="MKVMux">
+         <property name="text">
           <string>MKV</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="videoCodec" >
-      <property name="enabled" >
+     <widget class="QWidget" name="videoCodec">
+      <property name="enabled">
        <bool>true</bool>
       </property>
-      <attribute name="title" >
-       <string>_("Video codec")</string>
+      <attribute name="title">
+       <string>_(&quot;Video codec&quot;)</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
-       <property name="spacing" >
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="0" column="0" colspan="2" >
-        <widget class="QCheckBox" name="transcodeVideo" >
-         <property name="text" >
-          <string>_("Video")</string>
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="transcodeVideo">
+         <property name="text">
+          <string>_(&quot;Video&quot;)</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="vCodecLabel" >
-         <property name="enabled" >
+       <item row="1" column="0">
+        <widget class="QLabel" name="vCodecLabel">
+         <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="text" >
-          <string>_("Codec")</string>
+         <property name="text">
+          <string>_(&quot;Codec&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>vCodecBox</cstring>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2" >
-        <widget class="QComboBox" name="vCodecBox" >
-         <property name="editable" >
+       <item row="1" column="1" colspan="2">
+        <widget class="QComboBox" name="vCodecBox">
+         <property name="editable">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QLabel" name="vBitrateLabel" >
-         <property name="text" >
-          <string>_("Bitrate")</string>
+       <item row="2" column="0" colspan="2">
+        <widget class="QLabel" name="vBitrateLabel">
+         <property name="text">
+          <string>_(&quot;Bitrate&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>vBitrateSpin</cstring>
          </property>
         </widget>
        </item>
-       <item row="2" column="2" >
-        <widget class="QSpinBox" name="vBitrateSpin" >
-         <property name="alignment" >
+       <item row="2" column="2">
+        <widget class="QSpinBox" name="vBitrateSpin">
+         <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-         <property name="accelerated" >
+         <property name="accelerated">
           <bool>true</bool>
          </property>
-         <property name="suffix" >
+         <property name="suffix">
           <string> kb/s</string>
          </property>
-         <property name="minimum" >
+         <property name="minimum">
           <number>8</number>
          </property>
-         <property name="maximum" >
+         <property name="maximum">
           <number>8192</number>
          </property>
-         <property name="value" >
+         <property name="value">
           <number>800</number>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="2" >
-        <widget class="QLabel" name="vFrameLabel" >
-         <property name="text" >
-          <string>_("Frame Rate")</string>
+       <item row="3" column="0" colspan="2">
+        <widget class="QLabel" name="vFrameLabel">
+         <property name="text">
+          <string>_(&quot;Frame Rate&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>vFrameBox</cstring>
          </property>
         </widget>
        </item>
-       <item row="3" column="2" >
-        <widget class="QDoubleSpinBox" name="vFrameBox" >
-         <property name="alignment" >
+       <item row="3" column="2">
+        <widget class="QDoubleSpinBox" name="vFrameBox">
+         <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-         <property name="prefix" >
+         <property name="prefix">
           <string/>
          </property>
-         <property name="suffix" >
+         <property name="suffix">
           <string> fps</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="3" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
+       <item row="4" column="0" colspan="3">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
           <string>Resolution</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="0" column="0" colspan="2" >
-           <widget class="QLabel" name="vScaleLabel" >
-            <property name="text" >
-             <string>_("Scale")</string>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="1" column="0">
+           <widget class="QLabel" name="vScaleLabel">
+            <property name="text">
+             <string>_(&quot;Scale&quot;)</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>vScaleBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="4" >
-           <widget class="QComboBox" name="vScaleBox" >
-            <property name="editable" >
+          <item row="1" column="3" colspan="2">
+           <widget class="QComboBox" name="vScaleBox">
+            <property name="editable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="heightLabel" >
-            <property name="text" >
-             <string>_("Height")</string>
+          <item row="2" column="0">
+           <widget class="QLabel" name="heightLabel">
+            <property name="text">
+             <string>_(&quot;Height&quot;)</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>heightBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QSpinBox" name="heightBox" >
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="heightBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="maximum" >
-             <number>8000</number>
+            <property name="inputMask">
+             <string>00000; </string>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="3" >
-           <widget class="QLabel" name="widthLabel" >
-            <property name="text" >
-             <string>_("Width")</string>
+            <property name="text">
+             <string/>
             </property>
-            <property name="buddy" >
-             <cstring>widthBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="4" >
-           <widget class="QSpinBox" name="widthBox" >
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
-            <property name="maximum" >
-             <number>8000</number>
-            </property>
            </widget>
           </item>
-          <item row="1" column="2" >
-           <spacer name="horizontalSpacer" >
-            <property name="orientation" >
+          <item row="2" column="2">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType" >
+            <property name="sizeType">
              <enum>QSizePolicy::Fixed</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
@@ -309,110 +296,155 @@
             </property>
            </spacer>
           </item>
+          <item row="2" column="3">
+           <widget class="QLabel" name="widthLabel">
+            <property name="text">
+             <string>_(&quot;Width&quot;)</string>
+            </property>
+            <property name="buddy">
+             <cstring>widthBox</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="4">
+           <widget class="QLineEdit" name="widthBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="inputMask">
+             <string>00000; </string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="5">
+           <widget class="QLabel" name="label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>_(&quot;You just need to fill one of the three following parameters, VLC will autodetect the other using the original aspect ratio&quot;)</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="audioCodec" >
-      <attribute name="title" >
-       <string>_("Audio codec")</string>
+     <widget class="QWidget" name="audioCodec">
+      <attribute name="title">
+       <string>_(&quot;Audio codec&quot;)</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3" >
-       <item row="0" column="0" colspan="2" >
-        <widget class="QCheckBox" name="transcodeAudio" >
-         <property name="text" >
-          <string>_("Audio")</string>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="transcodeAudio">
+         <property name="text">
+          <string>_(&quot;Audio&quot;)</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="aCodecLabel" >
-         <property name="text" >
-          <string>_("Codec")</string>
+       <item row="1" column="0">
+        <widget class="QLabel" name="aCodecLabel">
+         <property name="text">
+          <string>_(&quot;Codec&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>aCodecBox</cstring>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2" >
-        <widget class="QComboBox" name="aCodecBox" />
+       <item row="1" column="1" colspan="2">
+        <widget class="QComboBox" name="aCodecBox"/>
        </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QLabel" name="aBitrateLabel" >
-         <property name="text" >
-          <string>_("Bitrate")</string>
+       <item row="2" column="0" colspan="2">
+        <widget class="QLabel" name="aBitrateLabel">
+         <property name="text">
+          <string>_(&quot;Bitrate&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>aBitrateSpin</cstring>
          </property>
         </widget>
        </item>
-       <item row="2" column="2" >
-        <widget class="QSpinBox" name="aBitrateSpin" >
-         <property name="alignment" >
+       <item row="2" column="2">
+        <widget class="QSpinBox" name="aBitrateSpin">
+         <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-         <property name="suffix" >
+         <property name="suffix">
           <string> kb/s</string>
          </property>
-         <property name="minimum" >
+         <property name="minimum">
           <number>8</number>
          </property>
-         <property name="maximum" >
+         <property name="maximum">
           <number>512</number>
          </property>
-         <property name="value" >
+         <property name="value">
           <number>128</number>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="2" >
-        <widget class="QLabel" name="aChannelsLabel" >
-         <property name="text" >
-          <string>_("Channels")</string>
+       <item row="3" column="0" colspan="2">
+        <widget class="QLabel" name="aChannelsLabel">
+         <property name="text">
+          <string>_(&quot;Channels&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>aChannelsSpin</cstring>
          </property>
         </widget>
        </item>
-       <item row="3" column="2" >
-        <widget class="QSpinBox" name="aChannelsSpin" >
-         <property name="alignment" >
+       <item row="3" column="2">
+        <widget class="QSpinBox" name="aChannelsSpin">
+         <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-         <property name="minimum" >
+         <property name="minimum">
           <number>1</number>
          </property>
-         <property name="maximum" >
+         <property name="maximum">
           <number>10</number>
          </property>
-         <property name="value" >
+         <property name="value">
           <number>2</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2" >
-        <widget class="QLabel" name="aSampleLabel" >
-         <property name="text" >
-          <string>_("Sample Rate")</string>
+       <item row="4" column="0" colspan="2">
+        <widget class="QLabel" name="aSampleLabel">
+         <property name="text">
+          <string>_(&quot;Sample Rate&quot;)</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>aSampleBox</cstring>
          </property>
         </widget>
        </item>
-       <item row="4" column="2" >
-        <widget class="QComboBox" name="aSampleBox" />
+       <item row="4" column="2">
+        <widget class="QComboBox" name="aSampleBox"/>
        </item>
-       <item row="5" column="2" >
-        <spacer name="verticalSpacer" >
-         <property name="orientation" >
+       <item row="5" column="2">
+        <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>40</height>
@@ -422,25 +454,25 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="subtitles" >
-      <attribute name="title" >
-       <string>_("Subtitles")</string>
+     <widget class="QWidget" name="subtitles">
+      <attribute name="title">
+       <string>_(&quot;Subtitles&quot;)</string>
       </attribute>
-      <layout class="QGridLayout" name="_4" >
-       <item row="0" column="0" >
-        <widget class="QCheckBox" name="transcodeSubs" >
-         <property name="text" >
-          <string>_("Subtitles")</string>
+      <layout class="QGridLayout" name="_4">
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="transcodeSubs">
+         <property name="text">
+          <string>_(&quot;Subtitles&quot;)</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QComboBox" name="subsCodecBox" />
+       <item row="0" column="1">
+        <widget class="QComboBox" name="subsCodecBox"/>
        </item>
-       <item row="1" column="1" >
-        <widget class="QCheckBox" name="subsOverlay" >
-         <property name="text" >
-          <string>_("Overlay subtitles on the video")</string>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="subsOverlay">
+         <property name="text">
+          <string>_(&quot;Overlay subtitles on the video&quot;)</string>
          </property>
         </widget>
        </item>
@@ -448,8 +480,8 @@
      </widget>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" />
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox"/>
    </item>
   </layout>
  </widget>