]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/simple_preferences.cpp
Qt4 - SPrefs: New icons from Tombigel.
[vlc] / modules / gui / qt4 / components / simple_preferences.cpp
index cb0bf57a9fc420861f38f9f6c4bf6c6f07c7ebb1..ae2dde3fbfa1d1ab25c27c47d4b2eeed00b58cf6 100644 (file)
@@ -6,6 +6,7 @@
  *
  * Authors: ClĂ©ment Stenac <zorglub@videolan.org>
  *          Antoine Cellerier <dionoea@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "components/simple_preferences.hpp"
-#include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
-#include <vlc_config_cat.h>
-#include <assert.h>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QString>
 #include <QFont>
 
-#include "pixmaps/audio.xpm"
-#include "pixmaps/video.xpm"
-#include "ui/sprefs_trivial.h"
+#include "components/simple_preferences.hpp"
+#include "components/preferences_widgets.hpp"
+#include "qt4.hpp"
+
+#include <vlc_config_cat.h>
 
-#define ITEM_HEIGHT 25
+#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_video.h"
+#include "ui/sprefs_subtitles.h"
+#include "ui/sprefs_hotkeys.h"
+#include "ui/sprefs_interface.h"
+
+#define ITEM_HEIGHT 64
 
 /*********************************************************************
  * The List of categories
 SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
                                   QListWidget( _parent ), p_intf( _p_intf )
 {
-    setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
-    setAlternatingRowColors( true );
-
-#ifndef WIN32
-    // Fixme - A bit UGLY
-    QFont f = font();
-    int pSize = f.pointSize();
-    if( pSize > 0 )
-        f.setPointSize( pSize + 1 );
-    else
-        f.setPixelSize( f.pixelSize() + 1 );
-    setFont( f );
-#endif
-
-    addItem( "Very trivial" );
-    item(0)->setIcon( QIcon( QPixmap( audio_xpm ) ) );
-    item(0)->setData( Qt::UserRole, qVariantFromValue( 0 ) );
-    addItem( "Video" );
-    item(1)->setIcon( QIcon( QPixmap( video_xpm ) ) );
-    item(1)->setData( Qt::UserRole, qVariantFromValue( 1 ) );
-}
+    setIconSize( QSize( ITEM_HEIGHT * 2 ,ITEM_HEIGHT  ) );
+    setViewMode(QListView::IconMode);
+    setMovement(QListView::Static);
+    setMaximumWidth(200);
+    setSpacing(0);
+//    setAlternatingRowColors( true );
 
-void SPrefsCatList::ApplyAll()
-{
-    DoAll( false );
-}
+#define ADD_CATEGORY( id, label, icon )                                  \
+    addItem( label );                                                    \
+    item( id )->setIcon( QIcon( ":/pixmaps/" #icon ) )  ;   \
+    item( id )->setTextAlignment( Qt::AlignHCenter );                    \
+    item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) );   \
+    item( id )->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
 
-void SPrefsCatList::CleanAll()
-{
-    DoAll( true );
-}
+    ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png );
+    ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png );
+    ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
+                  spref_cone_Input_64.png );
+    ADD_CATEGORY( SPrefsInterface, qtr("Interface"),
+                  spref_cone_Interface_64.png );
+    ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"),
+                  spref_cone_Subtitles_64.png );
+    ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png );
 
-/// \todo When cleaning, we should remove the panel ?
-void SPrefsCatList::DoAll( bool doclean )
-{
-    /* Todo */
+    setCurrentRow( SPrefsInterface );
 }
 
 /*********************************************************************
@@ -88,51 +89,216 @@ void SPrefsCatList::DoAll( bool doclean )
 SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                           int number ) : QWidget( _parent ), p_intf( _p_intf )
 {
-    if( number == 0 )
-    {
-        Ui::SPrefsTrivial ui;
-        ui.setupUi( this );
-        module_config_t *p_config = config_FindConfig( VLC_OBJECT(p_intf),
-                                                        "memcpy" );
-        ConfigControl *control = new ModuleConfigControl( VLC_OBJECT(p_intf),
-                        p_config, ui.memcpyLabel, ui.memcpyCombo, false );
-        controls.append( control );
-    }
-    else
+    module_config_t *p_config;
+    ConfigControl *control;
+
+#define CONFIG_GENERIC( option, type, label, qcontrol )                   \
+            p_config =  config_FindConfig( VLC_OBJECT(p_intf), option );  \
+            if( p_config )                                                \
+            {                                                             \
+                control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
+                           p_config, label, ui.qcontrol, false );         \
+                controls.append( control );                               \
+            }
+
+#define CONFIG_GENERIC_NO_BOOL( option, type, label, qcontrol )           \
+            p_config =  config_FindConfig( VLC_OBJECT(p_intf), option );  \
+            if( p_config )                                                \
+            {                                                             \
+                control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
+                           p_config, label, ui.qcontrol );                \
+                controls.append( control );                               \
+            }
+
+#define CONFIG_GENERIC_FILE( option, type, label, qcontrol, qbutton )         \
+                p_config =  config_FindConfig( VLC_OBJECT(p_intf), option );  \
+                if( p_config )                                                \
+                {                                                             \
+                    control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
+                               p_config, label, ui.qcontrol, ui.qbutton,      \
+                            false );                                          \
+                    controls.append( control );                               \
+                }
+
+
+
+#define START_SPREFS_CAT( name , label )    \
+        case SPrefs ## name:                \
+        {                                   \
+            Ui::SPrefs ## name ui;          \
+            ui.setupUi( panel );            \
+            panel_label->setText( qtr( label ) );
+
+#define END_SPREFS_CAT      \
+            break;          \
+        }
+
+    QVBoxLayout *panel_layout = new QVBoxLayout();
+    QWidget *panel = new QWidget();
+
+    // Title Label
+    QLabel *panel_label = new QLabel;
+    QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
+    labelFont.setPointSize( labelFont.pointSize() + 4 );
+    labelFont.setBold( true );
+    panel_label->setFont( labelFont );
+
+    // Title <hr>
+    QFrame *title_line = new QFrame;
+    title_line->setFrameShape(QFrame::HLine);
+    title_line->setFrameShadow(QFrame::Sunken);
+
+    switch( number )
     {
-        int *p = NULL;
-        fprintf( stderr, "Ha ha ca te fait bien la bite\n" );
-        *p=42;
-    }
+        /* Video Panel Implementation */
+        START_SPREFS_CAT( Video , "General video settings" );
+         #ifndef WIN32
+            ui.directXBox->setVisible( false );
+         #endif
+            CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
+
+            CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
+            CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
+            CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
+            CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
+            CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames);
+            CONFIG_GENERIC( "vout", Module, NULL, outputModule );
+
+#ifdef WIN32
+            CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
+            CONFIG_GENERIC( "directx-device", StringList, NULL, 
+                    dXdisplayDevice );
+#endif
+
+            CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
+                    snapshotsDirectory, snapshotsDirectoryBrowse );
+            CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
+            CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
+                            snapshotsSequentialNumbering );
+            CONFIG_GENERIC( "snapshot-format", StringList, NULL,
+                            snapshotsFormat );
+         END_SPREFS_CAT;
+
+         /* Audio Panel Implementation */
+        START_SPREFS_CAT( Audio,  "General audio settings" );
+#ifdef WIN32
+            ui.OSSBrowse->hide();
+            ui.OSSDevice->hide();
+            ui.OSSLabel->hide();
+            ui.alsaDevice->hide();
+            ui.alsaLabel->hide();
+#else
+            ui.DirectXLabel->setVisible( false );
+            ui.DirectXDevice->setVisible( false );
+#endif
+         CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+
+         CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL, 
+                 defaultVolume );
+         CONFIG_GENERIC( "audio-language" , StringList , NULL, 
+                    preferredAudioLanguage );
+         CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
+         CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, 
+                    detectionDolby );
+
+         CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
+#ifndef WIN32
+         CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
+         CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse );
+#else
+         CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, 
+                 DirectXDevice );
+#endif
+         CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName, 
+                 fileBrowseButton );
+
+         CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
+//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer 
+         CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, 
+                 volNormalizer );
+         CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
+        END_SPREFS_CAT;
+
+        /* Input and Codecs Panel Implementation */
+        START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );
+          /* Disk Devices */
+/*          CONFIG_GENERIC( );*/
+
+          CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
+          CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
+
+          /* Caching */
+/*          CONFIG_GENERIC( );*/
+
+          CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
+          CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
+          CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
+
+          CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox );
+          CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox );
+//        CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record 
+        END_SPREFS_CAT;
+
+        /* Interface Panel */
+        START_SPREFS_CAT( Interface, "Interfaces settings" );
+
+            CONFIG_GENERIC( "language", StringList, NULL, language );
+#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
+            ui.OneInterfaceBox->hide();
+#endif
+            /* interface */
+/*            p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
+            if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
+                    ui.qt4->setChecked( true );
+            if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
+                    ui.skins->setChecked( true );*/
+/*            CONFIG_GENERIC( "intf", Module, NULL, ??? ); */ //FIXME interface choice
+            CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
+            CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, 
+                    skinBrowse );
+#if defined( WIN32 ) || defined(HAVE_DBUS_3)
+            CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
+            CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, 
+                    EnqueueOneInterfaceMode );
+#endif
+        END_SPREFS_CAT;
+
+        START_SPREFS_CAT( Subtitles, "Subtitles & OSD settings" );
+            CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
+
+            CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
+            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
+
+            CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, 
+                    fontBrowse ); 
+            CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
+            CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
+                            fontSize );
+            CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect );
+
+        END_SPREFS_CAT;
+
+        START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
+        END_SPREFS_CAT;
+        }
+
+    panel_layout->addWidget(panel_label);
+    panel_layout->addWidget(title_line);
+    panel_layout->addWidget( panel );
+    panel_layout->addStretch( 2 );
+
+    this->setLayout(panel_layout);
 }
 
-void SPrefsPanel::Apply()
+void SPrefsPanel::apply()
 {
-    /* todo: factorize with PrefsPanel  */
     QList<ConfigControl *>::Iterator i;
     for( i = controls.begin() ; i != controls.end() ; i++ )
     {
-        VIntConfigControl *vicc = qobject_cast<VIntConfigControl *>(*i);
-        if( !vicc )
-        {
-            VFloatConfigControl *vfcc = qobject_cast<VFloatConfigControl *>(*i);
-            if( !vfcc)
-            {
-                VStringConfigControl *vscc =
-                               qobject_cast<VStringConfigControl *>(*i);
-                assert( vscc );
-                config_PutPsz( p_intf, vscc->getName().toAscii().data(),
-                                       vscc->getValue().toAscii().data() );
-                continue;
-            }
-            config_PutFloat( p_intf, vfcc->getName().toAscii().data(),
-                                     vfcc->getValue() );
-            continue;
-        }
-        config_PutInt( p_intf, vicc->getName().toAscii().data(),
-                               vicc->getValue() );
+        ConfigControl *c = qobject_cast<ConfigControl *>(*i);
+        c->doApply( p_intf );
     }
 }
 
-void SPrefsPanel::Clean()
+void SPrefsPanel::clean()
 {}