Qt4 - Preferences : Reset preferences.

[vlc] / modules / gui / qt4 / components / simple_preferences.cpp

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index dce0a13c5f335f14a687d12fb1b9a9094d588e2b..59f5211edb00d6f57ba4ae5515b22a84690171c4 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -48,7 +48,7 @@
 #include "ui/sprefs_hotkeys.h"
 #include "ui/sprefs_interface.h"
 
-#define ITEM_HEIGHT 50
+#define ITEM_HEIGHT 64
 
 /*********************************************************************
  * The List of categories
@@ -56,25 +56,32 @@
 SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
                                   QListWidget( _parent ), p_intf( _p_intf )
 {
-    setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
-    setAlternatingRowColors( true );
-    setViewMode(QListView::IconMode);
+    setIconSize( QSize( ITEM_HEIGHT, ITEM_HEIGHT ) );
+    setViewMode(QListView::ListMode);
+    setMovement(QListView::Static);
     setMaximumWidth(200);
+    setSpacing(0);
+    setWordWrap(true);
+    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setAlternatingRowColors( true );
 
-#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 );
+#define ADD_CATEGORY( id, label, icon )                                  \
+    addItem( label );                                                    \
+    item( id )->setIcon( QIcon( ":/pixmaps/" #icon ) )  ;   \
+    item( id )->setTextAlignment( Qt::AlignLeft | Qt::AlignVCenter );      \
+    item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) );   \
+    item( id )->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
+
+    ADD_CATEGORY( SPrefsInterface, qtr("Interface"),
+                  spref_cone_Interface_64.png );
+    ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png );
+    ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png );
+    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"),
+                  spref_cone_Subtitles_64.png );
     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 );
+    ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png );
 
     setCurrentRow( SPrefsInterface );
 }
@@ -135,8 +142,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>