Don't clutter REGISTRY on windows...

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 6781f743b6cf5dbe0d2b42a8003523c8e9cf4145..b8adf662ff06d35ad7d11ef9a83c31673380c790 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -124,8 +124,6 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
             "Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n" \
             "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' ")
 
-#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
-
 #define QT_MODE_TEXT N_( "Selection of the starting mode and look " )
 #define QT_MODE_LONGTEXT N_( "Start VLC with:\n" \
                              " - normal mode\n"  \
@@ -137,6 +135,8 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" )
 #define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" )
 
+#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+
 static const int i_mode_list[] =
     { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
 static const char *const psz_mode_list_text[] =
@@ -174,6 +174,8 @@ vlc_module_begin();
                 MINIMIZED_LONGTEXT, true);
         add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
                   TITLE_LONGTEXT, false );
+        add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+                  QT_FULLSCREEN_TEXT, false );
 
         add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
                 COMPLETEVOL_LONGTEXT, true );
@@ -200,9 +202,6 @@ vlc_module_begin();
                 "255;255;255;20;226;20;255;176;15;235;30;20",
                 NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false );
 
-        add_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT,
-                VIEWDETAIL_TEXT, false );
-
         add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
                 false );
             change_internal();
@@ -245,6 +244,7 @@ static int Open( vlc_object_t *p_this )
     p_intf->p_sys->p_playlist = pl_Yield( p_intf );
     /* Listen to the messages */
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+    /* one settings to rule them all */
 
     var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
     return VLC_SUCCESS;
@@ -324,6 +324,14 @@ static void Init( intf_thread_t *p_intf )
     QApplication *app = new QApplication( argc, argv , true );
     p_intf->p_sys->p_app = app;
 
+    p_intf->p_sys->mainSettings = new QSettings(
+#ifdef WIN32
+            QSettings::IniFormat,
+#else
+            QSettings::NativeFormat,
+#endif
+            QSettings::UserScope, "vlc", "vlc-qt-interface" );
+
     /* Icon setting
        FIXME: use a bigger icon ? */
     if( QDate::currentDate().dayOfYear() >= 354 )
@@ -369,7 +377,7 @@ static void Init( intf_thread_t *p_intf )
     QString path =  QString( QT4LOCALEDIR );
 #else
     QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
-                            "locale" + DIR_SEP );
+                            "locale" + DIR_SEP + "qt4" + DIR_SEP );
 #endif
     // files depending on locale
     bool b_loaded = qtTranslator.load( path + "qt_" + ql.name());
@@ -391,13 +399,12 @@ static void Init( intf_thread_t *p_intf )
     if( config_GetInt( p_intf, "qt-updates-notif" ) )
     {
         int interval = config_GetInt( p_intf, "qt-updates-days" );
-        QSettings settings( "vlc", "vlc-qt-interface" );
         if( QDate::currentDate() >
-                settings.value( "updatedate" ).toDate().addDays( interval ) )
+             getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
         {
             /* The constructor of the update Dialog will do the 1st request */
             UpdateDialog::getInstance( p_intf );
-            settings.setValue( "updatedate", QDate::currentDate() );
+            getSettings()->setValue( "updatedate", QDate::currentDate() );
         }
     }
 #endif
@@ -426,6 +433,9 @@ static void Init( intf_thread_t *p_intf )
     /* Destroy the MainInputManager */
     MainInputManager::killInstance();
 
+    /* Delete the configuration */
+    delete p_intf->p_sys->mainSettings;
+
     /* Delete the application */
     delete app;