vlc/vlc-3.0 | branch: master | Pierre Lamot <[email protected]> | Wed Dec 20 17:58:12 2017 +0100| [81118894e18289b788b182babd29d8d550f1a8e6] | committer: Hugo Beauzée-Luyssen
Qt: spref, add fast seek option Ref #19305 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 679ec991edab1974e08463c155e9e1b524f8a970) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=81118894e18289b788b182babd29d8d550f1a8e6 --- modules/gui/qt/components/simple_preferences.cpp | 1 + modules/gui/qt/ui/sprefs_input.ui | 107 ++++++++++++----------- 2 files changed, 59 insertions(+), 49 deletions(-) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 74b1903aeb..cc530e22cf 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -627,6 +627,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, else FreeLibrary( hdxva2_dll ); #endif + CONFIG_BOOL( "input-fast-seek", fastSeekBox ); optionWidgets["inputLE"] = ui.DVDDeviceComboBox; optionWidgets["cachingCoB"] = ui.cachingCombo; CONFIG_GENERIC( "avcodec-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox ); diff --git a/modules/gui/qt/ui/sprefs_input.ui b/modules/gui/qt/ui/sprefs_input.ui index 6725982713..e16df6dd37 100644 --- a/modules/gui/qt/ui/sprefs_input.ui +++ b/modules/gui/qt/ui/sprefs_input.ui @@ -8,7 +8,7 @@ <x>0</x> <y>0</y> <width>737</width> - <height>601</height> + <height>631</height> </rect> </property> <property name="windowTitle"> @@ -21,10 +21,7 @@ <string>Codecs</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="8" column="1" colspan="2"> - <widget class="QComboBox" name="loopFilterBox"/> - </item> - <item row="12" column="0"> + <item row="14" column="0"> <widget class="QLabel" name="x264Label"> <property name="minimumSize"> <size> @@ -40,59 +37,66 @@ </property> </widget> </item> - <item row="11" column="0"> - <widget class="QLabel" name="x264profileLabel"> - <property name="minimumSize"> + <item row="6" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>250</width> - <height>0</height> + <width>40</width> + <height>20</height> </size> </property> + </spacer> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="hwAccelLabel"> <property name="text"> - <string>x264 preset and tuning selection</string> + <string>Hardware-accelerated decoding</string> </property> <property name="buddy"> - <cstring>tuneBox</cstring> - </property> - </widget> - </item> - <item row="11" column="1"> - <widget class="QComboBox" name="presetBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <cstring>hwAccelModule</cstring> </property> </widget> </item> - <item row="11" column="2"> - <widget class="QComboBox" name="tuneBox"/> - </item> <item row="4" column="1" colspan="2"> <widget class="QComboBox" name="hwAccelModule"/> </item> - <item row="4" column="0"> - <widget class="QLabel" name="hwAccelLabel"> + <item row="6" column="0"> + <widget class="QLabel" name="ppLabel"> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> <property name="text"> - <string>Hardware-accelerated decoding</string> + <string>Video quality post-processing level</string> </property> <property name="buddy"> - <cstring>hwAccelModule</cstring> + <cstring>PostProcLevel</cstring> </property> </widget> </item> - <item row="10" column="0" colspan="3"> + <item row="12" column="0" colspan="3"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="12" column="2"> - <widget class="QLineEdit" name="levelBox"/> + <item row="13" column="1"> + <widget class="QComboBox" name="presetBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> - <item row="12" column="1"> + <item row="14" column="1"> <widget class="QComboBox" name="profileBox"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> @@ -102,7 +106,10 @@ </property> </widget> </item> - <item row="8" column="0"> + <item row="10" column="1" colspan="2"> + <widget class="QComboBox" name="loopFilterBox"/> + </item> + <item row="10" column="0"> <widget class="QLabel" name="filterLabel"> <property name="minimumSize"> <size> @@ -118,8 +125,8 @@ </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="ppLabel"> + <item row="13" column="0"> + <widget class="QLabel" name="x264profileLabel"> <property name="minimumSize"> <size> <width>250</width> @@ -130,11 +137,14 @@ <string>Video quality post-processing level</string> </property> <property name="buddy"> - <cstring>PostProcLevel</cstring> + <cstring>tuneBox</cstring> </property> </widget> </item> - <item row="5" column="1"> + <item row="13" column="2"> + <widget class="QComboBox" name="tuneBox"/> + </item> + <item row="6" column="1"> <widget class="QSpinBox" name="PostProcLevel"> <property name="maximumSize"> <size> @@ -159,18 +169,15 @@ </property> </widget> </item> - <item row="5" 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> + <item row="14" column="2"> + <widget class="QLineEdit" name="levelBox"/> + </item> + <item row="5" column="0"> + <widget class="QCheckBox" name="fastSeekBox"> + <property name="text"> + <string>Fast seek</string> </property> - </spacer> + </widget> </item> </layout> </widget> @@ -383,6 +390,7 @@ </widget> <tabstops> <tabstop>hwAccelModule</tabstop> + <tabstop>fastSeekBox</tabstop> <tabstop>PostProcLevel</tabstop> <tabstop>loopFilterBox</tabstop> <tabstop>presetBox</tabstop> @@ -392,6 +400,7 @@ <tabstop>DVDDeviceComboBox</tabstop> <tabstop>recordPath</tabstop> <tabstop>recordBrowse</tabstop> + <tabstop>mkvPreloadBox</tabstop> <tabstop>AviRepair</tabstop> <tabstop>cachingCombo</tabstop> <tabstop>proxy</tabstop> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
