]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/simple_preferences.cpp
Qt4 - New Simple Preferences look'n feel. Should work without too many segfaults...
[vlc] / modules / gui / qt4 / components / simple_preferences.cpp
index 7bbf48eff5ff0abbed7aaba7539492fd2fea8e75..4272970bed17db5c959f5119f3dce2ab6f489d5c 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QString>
 #include <QFont>
+#include <QToolButton>
+#include <QButtonGroup>
 
 #include "components/simple_preferences.hpp"
 #include "components/preferences_widgets.hpp"
 #include "qt4.hpp"
 
 #include <vlc_config_cat.h>
-#include <assert.h>
-
-#include "pixmaps/hotkeys_50x50.xpm"
-#include "pixmaps/audio_50x50.xpm"
-#include "pixmaps/input_and_codecs_50x50.xpm"
-#include "pixmaps/interface_50x50.xpm"
-#include "pixmaps/subtitles_50x50.xpm"
-#include "pixmaps/video_50x50.xpm"
 
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_hotkeys.h"
 #include "ui/sprefs_interface.h"
 
-#define ITEM_HEIGHT 50
+#define ICON_HEIGHT 64
+#define BUTTON_HEIGHT 76
 
 /*********************************************************************
  * The List of categories
  *********************************************************************/
 SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
-                                  QListWidget( _parent ), p_intf( _p_intf )
+                                  QWidget( _parent ), p_intf( _p_intf )
 {
-    setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
-    setAlternatingRowColors( true );
-    setViewMode(QListView::IconMode);
-    setMaximumWidth(200);
-
-#define ADD_CATEGORY( id, label, icon )                                 \
-    addItem( label );                                                   \
-    item( id )->setIcon( QIcon( QPixmap( icon ) ) );                    \
-    item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) );  \
-    item( id )->setTextAlignment(Qt::AlignHCenter);                     \
-    item( id )->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
-    ADD_CATEGORY( SPrefsVideo, qtr("Video"), video_50x50_xpm );
-    ADD_CATEGORY( SPrefsAudio, qtr("Audio"), audio_50x50_xpm );
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    QButtonGroup *buttonGroup = new QButtonGroup( this );
+    buttonGroup->setExclusive ( true );
+    CONNECT( buttonGroup, buttonClicked ( int ),
+            this, switchPanel( int ) );
+
+#define ADD_CATEGORY( button, label, icon, numb )                           \
+    QToolButton * button = new QToolButton( this );                         \
+    button->setIcon( QIcon( ":/pixmaps/" #icon ) );                         \
+    button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) );              \
+    button->setText( label );                                               \
+    button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );              \
+    button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT);                         \
+    button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ;  \
+    button->setAutoRaise( true );                                           \
+    button->setCheckable( true );                                           \
+    buttonGroup->addButton( button, numb );                                 \
+    layout->addWidget( button );
+
+    ADD_CATEGORY( SPrefsInterface, qtr("Interface"),
+                  spref_cone_Interface_64.png, 0 );
+    ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 );
+    ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 );
+    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"),
+                  spref_cone_Subtitles_64.png, 3 );
     ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
-                  input_and_codecs_50x50_xpm );
-    ADD_CATEGORY( SPrefsInterface, qtr("Interface"), interface_50x50_xpm );
-    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), subtitles_50x50_xpm );
-    ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), hotkeys_50x50_xpm );
+                  spref_cone_Input_64.png, 4 );
+    ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
 
-    setCurrentRow( SPrefsInterface );
+    this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
+    setLayout( layout );
+}
+
+void SPrefsCatList::switchPanel( int i )
+{
+    emit currentItemChanged( i );
 }
 
 /*********************************************************************
@@ -117,8 +126,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     controls.append( control );                               \
                 }
 
-
-
 #define START_SPREFS_CAT( name , label )    \
         case SPrefs ## name:                \
         {                                   \
@@ -136,8 +143,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     // Title Label
     QLabel *panel_label = new QLabel;
     QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
-    labelFont.setPointSize( labelFont.pointSize() + 4 );
-    labelFont.setBold( true );
+    labelFont.setPointSize( labelFont.pointSize() + 6 );
+    labelFont.setFamily( "Verdana" );
     panel_label->setFont( labelFont );
 
     // Title <hr>
@@ -193,7 +200,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL, 
                  defaultVolume );
          CONFIG_GENERIC( "audio-language" , StringList , NULL, 
-                    preferredAudioLanguage );
+                    preferredAudioLanguage ); //FIXME
+
          CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
          CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, 
                     detectionDolby );
@@ -210,7 +218,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                  fileBrowseButton );
 
          CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
-//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer 
+//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
          CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, 
                  volNormalizer );
          CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
@@ -219,13 +227,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         /* Input and Codecs Panel Implementation */
         START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );
           /* Disk Devices */
-/*          CONFIG_GENERIC( );*/
+/*          CONFIG_GENERIC( );*/ //FIXME
 
           CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
           CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
 
           /* Caching */
-/*          CONFIG_GENERIC( );*/
+/*          CONFIG_GENERIC( );*/ //FIXME
 
           CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
           CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
@@ -238,8 +246,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
         /* Interface Panel */
         START_SPREFS_CAT( Interface, "Interfaces settings" );
-
-            CONFIG_GENERIC( "language", StringList, NULL, language );
+            
+            CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
 #if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
             ui.OneInterfaceBox->hide();
 #endif
@@ -264,8 +272,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
-            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
-
+            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME
             CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, 
                     fontBrowse ); 
             CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
@@ -276,6 +283,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         END_SPREFS_CAT;
 
         START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
+        //FIMXE
         END_SPREFS_CAT;
         }
 
@@ -299,3 +307,4 @@ void SPrefsPanel::apply()
 
 void SPrefsPanel::clean()
 {}
+