vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Dec 29 11:32:47 2016 +0100| [7d5370679e7c2af711d2e7a2431770a5e9bde569] | committer: Hugo Beauzée-Luyssen
qt: preferences: Always use a combobox for resume playback Using a checkbox would force the value back to 0/1 when saving the simple preferences, while it can be set to 2 from advanced preferences. This also moves this setting out of the Privacy/Network interactions category, as it doesn't belong there Fix #17061 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d5370679e7c2af711d2e7a2431770a5e9bde569 --- modules/gui/qt/components/simple_preferences.cpp | 2 +- modules/gui/qt/ui/sprefs_interface.ui | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 49c6aa9..1c758cb 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -849,7 +849,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.recentlyPlayedFilters, setEnabled( bool ) ); ui.recentlyPlayedFilters->setEnabled( false ); CONFIG_BOOL( "qt-recentplay", saveRecentlyPlayed ); - CONFIG_BOOL( "qt-continue", continueBox ); + CONFIG_GENERIC( "qt-continue", IntegerList, ui.continuePlaybackLabel, continuePlaybackComboBox ); CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel, recentlyPlayedFilters ); diff --git a/modules/gui/qt/ui/sprefs_interface.ui b/modules/gui/qt/ui/sprefs_interface.ui index 4d06fdb..e9dd718 100644 --- a/modules/gui/qt/ui/sprefs_interface.ui +++ b/modules/gui/qt/ui/sprefs_interface.ui @@ -271,6 +271,20 @@ </property> </widget> </item> + <item row="10" column="0"> + <widget class="QLabel" name="continuePlaybackLabel"> + <property name="text"> + <string>Continue playback?</string> + </property> + </widget> + </item> + <item row="10" column="2" colspan="2"> + <widget class="QComboBox" name="continuePlaybackComboBox"> + <property name="enabled"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> </item> @@ -560,13 +574,6 @@ </property> </widget> </item> - <item row="3" column="0" colspan="4"> - <widget class="QCheckBox" name="continueBox"> - <property name="text"> - <string>Continue playback?</string> - </property> - </widget> - </item> </layout> </widget> </item> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
