vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Sep 17 13:01:27 2012 +0200| [eccedd53b2dd0a7a0ad7bc7651e1c602a152054b] | committer: Francois Cartegnie
Qt: profile_selector: better width/height selection widgets > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eccedd53b2dd0a7a0ad7bc7651e1c602a152054b --- .../gui/qt4/components/sout/profile_selector.cpp | 8 +-- modules/gui/qt4/ui/profiles.ui | 64 ++++++++++---------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp index de01d77..2f40341 100644 --- a/modules/gui/qt4/components/sout/profile_selector.cpp +++ b/modules/gui/qt4/components/sout/profile_selector.cpp @@ -349,8 +349,8 @@ void VLCProfileEditor::fillProfile( const QString& qs ) ui.vBitrateSpin->setValue( options[5].toInt() ); ui.vScaleBox->setEditText( options[6] ); ui.vFrameBox->setValue( options[7].toDouble() ); - ui.widthBox->setText( options[8] ); - ui.heightBox->setText( options[9] ); + ui.widthBox->setValue( options[8].toInt() ); + ui.heightBox->setValue( options[9].toInt() ); ui.aCodecBox->setCurrentIndex( ui.aCodecBox->findData( options[10] ) ); ui.aBitrateSpin->setValue( options[11].toInt() ); @@ -448,8 +448,8 @@ QString VLCProfileEditor::transcodeValue() << QString::number( ui.vBitrateSpin->value() ) << ui.vScaleBox->currentText() << QString::number( ui.vFrameBox->value() ) - << ui.widthBox->text() - << ui.heightBox->text() + << QString::number( ui.widthBox->value() ) + << QString::number( ui.heightBox->value() ) << qs_acodec << QString::number( ui.aBitrateSpin->value() ) diff --git a/modules/gui/qt4/ui/profiles.ui b/modules/gui/qt4/ui/profiles.ui index 2fc8a87..51712c3 100644 --- a/modules/gui/qt4/ui/profiles.ui +++ b/modules/gui/qt4/ui/profiles.ui @@ -230,6 +230,9 @@ <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> + <property name="specialValueText"> + <string>Same as source</string> + </property> <property name="prefix"> <string/> </property> @@ -287,25 +290,6 @@ </property> </widget> </item> - <item row="2" column="1"> - <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="2" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> @@ -332,22 +316,35 @@ </property> </widget> </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="widthBox"> + <property name="specialValueText"> + <string>Auto</string> + </property> + <property name="suffix"> + <string>px</string> + </property> + <property name="maximum"> + <number>9999</number> + </property> + <property name="singleStep"> + <number>8</number> + </property> + </widget> + </item> <item row="2" column="4"> - <widget class="QLineEdit" name="heightBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSpinBox" name="heightBox"> + <property name="specialValueText"> + <string>Auto</string> </property> - <property name="inputMask"> - <string>00000; </string> + <property name="suffix"> + <string>px</string> </property> - <property name="text"> - <string/> + <property name="maximum"> + <number>9999</number> </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <property name="singleStep"> + <number>8</number> </property> </widget> </item> @@ -510,7 +507,7 @@ <tabstop>profileLine</tabstop> <tabstop>tabWidget</tabstop> <tabstop>TSMux</tabstop> - <tabstop>ASFMux</tabstop> + <tabstop>WEBMux</tabstop> <tabstop>OggMux</tabstop> <tabstop>MOVMux</tabstop> <tabstop>PSMux</tabstop> @@ -521,7 +518,7 @@ <tabstop>MKVMux</tabstop> <tabstop>RAWMux</tabstop> <tabstop>AVIMux</tabstop> - <tabstop>buttonBox</tabstop> + <tabstop>ASFMux</tabstop> <tabstop>transcodeVideo</tabstop> <tabstop>keepVideo</tabstop> <tabstop>vCodecBox</tabstop> @@ -539,6 +536,7 @@ <tabstop>transcodeSubs</tabstop> <tabstop>subsCodecBox</tabstop> <tabstop>subsOverlay</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
