Adds an option to qt4 intf to set opacity for main interface, playlist, and extended...

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 832a5505dd7dbf24fed5b18ecd4a132708731c31..c554cb4c030901f647f18e052fffea4e4b52702a 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <QApplication>
@@ -43,6 +43,12 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+#define ALWAYS_VIDEO_TEXT N_("Always show a video screen, with a cone " \
+                                "when there is audio only.")
+#define ALWAYS_VIDEO_LONGTEXT N_("Start VLC with a cone image, and display it" \
+                                   " when there is no video track. " \
+                                    "Visualisations are enabled." )
+
 #define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple")
 #define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple" \
                                    "preferences when opening the preferences " \
@@ -62,12 +68,26 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define TITLE_LONGTEXT N_("Show the name of the song or video in the " \
                           "controler window title")
 
-#define FILEDIALOG_PATH_TEXT N_("path to use in file dialog")
-#define FILEDIALOG_PATH_LONGTEXT N_("path to use in file dialog")
+#define FILEDIALOG_PATH_TEXT N_("Path to use in file dialog")
+#define FILEDIALOG_PATH_LONGTEXT N_("Path to use in file dialog")
+
+#define NOTIFICATION_TEXT N_("Show notification popup on track change")
+#define NOTIFICATION_LONGTEXT N_( \
+    "Show a notification popup with the artist and track name when " \
+    "the current playlist item changes." )
 
 #define ADVANCED_OPTIONS_TEXT N_("Advanced options")
 #define ADVANCED_OPTIONS_LONGTEXT N_("Activate by default all the" \
-                                     "Advanced options for geeks")
+                                     "advanced options for geeks")
+
+#define OPACITY_TEXT N_("Windows opacity between 0.1 and 1.")
+#define OPACITY_LONGTEXT N_("Sets the windows opacity between 0.1 and 1 " \
+                            "for main interface, playlist and extended panel.")
+
+#define SHOWFLAGS_TEXT N_("Define what columns to show in playlist window")
+#define SHOWFLAGS_LONGTEXT N_("Enter the sum of the options that you want: \n" \
+            "Title: 1; Duration: 2; Artist: 4; Genre: 8; " \
+            "Copyright: 16; Collection/album: 32; Rating: 256." )
 
 vlc_module_begin();
     set_shortname( (char *)"Qt" );
@@ -83,22 +103,31 @@ vlc_module_begin();
     add_submodule();
         set_description( "Dialogs provider" );
         set_capability( "dialogs provider", 51 );
-        add_bool( "qt-always-video", VLC_FALSE, NULL, "FIXME", "FIXME",
-                VLC_TRUE );
+        add_bool( "qt-always-video", VLC_FALSE, NULL, ALWAYS_VIDEO_TEXT,
+                ALWAYS_VIDEO_LONGTEXT, VLC_TRUE );
         add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT,
                 ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
         add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT,
                 SYSTRAY_LONGTEXT, VLC_FALSE);
-        add_bool( "qt-start-mininimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
+        add_bool( "qt-start-minimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
                 MINIMIZED_LONGTEXT, VLC_TRUE);
-        add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT, 
+        add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT,
                   TITLE_LONGTEXT, VLC_FALSE );
         add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
                 FILEDIALOG_PATH_LONGTEXT, VLC_TRUE);
             change_autosave();
             change_internal();
+        add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT,
+                  NOTIFICATION_LONGTEXT, VLC_FALSE );
+        add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
+                  OPACITY_LONGTEXT, VLC_FALSE );
         add_bool( "qt-adv-options", VLC_FALSE, NULL, ADVANCED_OPTIONS_TEXT,
                   ADVANCED_OPTIONS_LONGTEXT, VLC_TRUE );
+        add_integer( "qt-pl-showflags",
+                VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE|
+                VLC_META_ENGINE_DURATION|VLC_META_ENGINE_COLLECTION,
+                NULL, SHOWFLAGS_TEXT,
+                SHOWFLAGS_LONGTEXT, VLC_TRUE );
         set_callbacks( OpenDialogs, Close );
 vlc_module_end();
 
@@ -136,7 +165,10 @@ static int Open( vlc_object_t *p_this )
 static int OpenDialogs( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
-    Open( p_this );
+    int val = Open( p_this );
+    if( val )
+        return val;
+
     p_intf->pf_show_dialog = ShowDialog;
     return VLC_SUCCESS;
 }
@@ -173,11 +205,19 @@ static void Init( intf_thread_t *p_intf )
     char dummy[] = "";
     char *argv[] = { dummy };
     int argc = 1;
+
     Q_INIT_RESOURCE( vlc );
     QApplication *app = new QApplication( argc, argv , true );
     app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
     p_intf->p_sys->p_app = app;
 
+#ifndef WIN32
+    /* kludge:
+     * forces plastique style as cleanlooks bugs on gnome */
+    QPlastiqueStyle *plastique = new QPlastiqueStyle;
+    app->setStyle( plastique );
+#endif
+
     // Initialize timers
     DialogsProvider::getInstance( p_intf );