From 9d99a7ab7450ddb180d26f9677d7e95a748a361c Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Thu, 29 Jul 2010 19:27:12 +0200 Subject: [PATCH] Qt: simple_prefs pack UI --- .../gui/qt4/components/simple_preferences.cpp | 15 +- .../gui/qt4/components/simple_preferences.hpp | 1 + modules/gui/qt4/ui/sprefs_interface.ui | 676 +++++++++++------- 3 files changed, 422 insertions(+), 270 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 2613adc185..788a9860f7 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -564,12 +564,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.stylesCombo->hide(); optionWidgets.append( NULL ); #endif - - ui.skins_zone->setEnabled( ui.skins->isChecked() ); - CONNECT( ui.skins, toggled( bool ), ui.skins_zone, setEnabled( bool ) ); - - ui.native_zone->setEnabled( ui.qt4->isChecked() ); - CONNECT( ui.qt4, toggled( bool ), ui.native_zone, setEnabled( bool ) ); + radioGroup = new QButtonGroup(this); + radioGroup->addButton( ui.qt4, 0 ); + radioGroup->addButton( ui.skins, 1 ); + CONNECT( radioGroup, buttonClicked( int ), + ui.styleStackedWidget, setCurrentIndex( int ) ); + ui.styleStackedWidget->setCurrentIndex( radioGroup->checkedId() ); CONNECT( ui.minimalviewBox, toggled( bool ), ui.mainPreview, setNormalPreview( bool ) ); @@ -598,8 +598,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.updatesBox, toggled( bool ), ui.updatesDays, setEnabled( bool ) ); #else - ui.updatesBox->hide(); - ui.updatesDays->hide(); + ui.updateNotifierZone->hide(); #endif /* ONE INSTANCE options */ #if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__) diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp index 626de8279b..a709f74e5b 100644 --- a/modules/gui/qt4/components/simple_preferences.hpp +++ b/modules/gui/qt4/components/simple_preferences.hpp @@ -121,6 +121,7 @@ private: QList optionWidgets; QStringList qs_filter; + QButtonGroup *radioGroup; #ifdef WIN32 QList listAsso; diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index 5a967d074b..230254a04f 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -7,8 +7,8 @@ 0 0 - 793 - 625 + 664 + 555 @@ -21,12 +21,33 @@ Form + + 9 + + + 0 + + + 0 + Instances + + 0 + + + 9 + + + 9 + + + 9 + @@ -41,32 +62,6 @@ - - - - - 0 - 0 - - - - - 220 - 0 - - - - Set up associations... - - - - - - - File extensions association - - - @@ -95,56 +90,20 @@ - - - - Activate update notifier - - - - - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - days - - - Every - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - + + + - 200 - 27 + 220 + 0 - - - - Save recently played items - + Filter: @@ -160,7 +119,7 @@ - + @@ -173,6 +132,63 @@ + + + + + 0 + + + + + + 220 + 0 + + + + Activate update notifier + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 200 + 27 + + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + days + + + Every + + + + + + @@ -182,6 +198,9 @@ Language + + 0 + @@ -207,185 +226,322 @@ - - + + - Look and feel + Playlist - - - + + + 9 + + + - Use custom skin + Display playlist tree - - + + - + 0 0 - - QFrame::NoFrame - - -This is the skinsLabel place- - - - Qt::RichText - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 5 - - - true - - - - - - - Qt::Horizontal + File extensions association - - - - true - + + - + 0 0 - - - 0 - - - - - Skin resource file: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - fileSkin - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Choose... - - - - + + + 220 + 0 + + + + Set up associations... + - - - - - 10 - 0 - - - - - 0 - - - - - - - - Force window style: - - - stylesCombo - - - - - - - Show systray icon - - - - - - - Systray popup when minimized - - - - - - - Show controls in full screen mode - - - - - - - Start in minimal view mode - - - - - - - Integrate video in interface - - - - - - - Resize interface to video size - - - - + + + + + + + Look and feel + + + + + + 0 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 122 + 50 + + + + + 0 + 0 + + + + background-color: rgb(192, 192, 192); + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + 10 + 0 + + + + + 0 + + + + + Show systray icon + + + + + + + Systray popup when minimized + + + + + + + Show controls in full screen mode + + + + + + + Start in minimal view mode + + + + + + + Integrate video in interface + + + + + + + Resize interface to video size + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Force window style: + + + stylesCombo + + + + + + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 122 + 50 + + + + background-color: rgb(192, 192, 192); + + + Qt::AlignCenter + + + + + + + true + + + + 0 + 0 + + + + + 0 + + + + + Skin resource file: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + fileSkin + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Choose... + + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + -This is the skinsLabel place- + + + Qt::RichText + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 5 + + + true + + + + + + + + - + This is VLC's default interface, with a native look and feel. @@ -398,47 +554,25 @@ - - - - - 0 - 100 - - - - background-color: rgb(192, 192, 192); - - - Qt::AlignHCenter|Qt::AlignTop + + + + Use custom skin - - - - background-color: rgb(192, 192, 192); - - - Qt::AlignCenter + + + + Qt::Horizontal - - - - - - - - - Playlist - - - - - - Display playlist tree + + + 40 + 20 + - + @@ -453,9 +587,27 @@ + language + qt4 + skins + fsController + minimalviewBox + embedVideo + resizingBox + systrayBox + sysPop + stylesCombo OneInterfaceMode + EnqueueOneInterfaceMode artFetcher updatesBox + updatesDays + saveRecentlyPlayed + recentlyPlayedFilters + treePlaylist + assoButton + skinBrowse + fileSkin -- 2.39.2