qt4: toggleAdvanced simplifications

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

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 773202e70080c6729b5ebc34f9c69270436050ed..b6807901fbdaf1a6a42b8c1c65b25b9335e7c289 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -30,17 +30,19 @@
 
 #include <vlc_common.h>
 #include <vlc_interface.h>
-#include <QWidget>
 
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_interface.h"
+
 #ifdef WIN32
-#include "util/registry.hpp"
+# include "util/registry.hpp"
 #endif
 
+#include <QWidget>
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,
@@ -73,9 +75,10 @@ enum {
        normalizerChB,
        volLW,
        headphoneB,
+       spdifChB,
 };
 enum { inputLE, cachingCoB };
-enum { skinRB, qtRB };
+enum { skinRB, qtRB, styleCB };
 
 class ConfigControl;
 class QComboBox;
@@ -90,9 +93,9 @@ class QTreeWidgetItem;
 
 class SPrefsCatList : public QWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
-    SPrefsCatList( intf_thread_t *, QWidget *);
+    SPrefsCatList( intf_thread_t *, QWidget *, bool );
     virtual ~SPrefsCatList() {};
 private:
     intf_thread_t *p_intf;
@@ -106,7 +109,7 @@ class SPrefsPanel : public QWidget
 {
     Q_OBJECT
 public:
-    SPrefsPanel( intf_thread_t *, QWidget *, int );
+    SPrefsPanel( intf_thread_t *, QWidget *, int, bool );
     virtual ~SPrefsPanel();
     void apply();
     void clean();
@@ -116,8 +119,9 @@ private:
 
     int number;
 
-    QList<QWidget *> optionWidgets;
+    QWidgetList optionWidgets;
     QStringList qs_filter;
+    QButtonGroup *radioGroup;
 
 #ifdef WIN32
     QList<QTreeWidgetItem *> listAsso;
@@ -129,10 +133,12 @@ private slots:
     void lastfm_Changed( int );
     void updateAudioOptions( int );
     void updateAudioVolume( int );
-#ifdef SYS_MINGW32
+#ifdef WIN32
     void assoDialog();
     void saveAsso();
 #endif
+    void configML();
+    void changeStyle( QString );
 };
 
 #endif