Changeset 06970296ddc77ca6e23e1e669e6d110672f21d74

Timestamp:

25/06/08 01:59:37 (4 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1214351977 -0700

git-parent:

[6ec764aec733dacb654ce11d2f0566c54e3b0c15]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1214351977 -0700

Message:

Cosmetics

Files:

• modules/gui/qt4/qt4.cpp (modified) (8 diffs)

modules/gui/qt4/qt4.cpp

@@ -92 +92 @@
-#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
-#define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
- 
+
-                             " This option only works with Windows and " \
-                             "X11 with composite extensions." )
@@ -229 +229 @@
-#endif
-
+    /* Allocations */
-    p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
-    if( !p_intf->p_sys )
@@ -236 +237 @@
-    p_intf->pf_run = Run;
-
+    /* Access to the playlist */
-    p_intf->p_sys->p_playlist = pl_Yield( p_intf );
+    /* Listen to the messages */
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-
@@ -310 +313 @@
-    /* Start the QApplication here */
-    QApplication *app = new QApplication( argc, argv , true );
+    p_intf->p_sys->p_app = app;
+
+    /* Icon setting
+       FIXME: use a bigger icon ? */
-    if( QDate::currentDate().dayOfYear() >= 354 )
-        app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
-    else
-        app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
-
-
-
+
+
-    DialogsProvider::getInstance( p_intf );
-
-/ Create the normal interface
+* Create the normal interface in non-DP mode */
-    if( !p_intf->pf_show_dialog )
-    {
-
-
+
-        /* We don't show it because it is done in the MainInterface constructor
-        p_mi->show(); */
@@ -334 +339 @@
-    }
-
+    /* Explain to the core how to show a dialog :D */
+    p_intf->pf_show_dialog = ShowDialog;
-
-#ifdef ENABLE_NLS
@@ -354 +361 @@
-#endif  //ENABLE_NLS
-
-    /* Explain to the core how to show a dialog :D */
-    p_intf->pf_show_dialog = ShowDialog;
-
-    /* Last settings */
-    app->setQuitOnLastWindowClosed( false );
-
-       r
+R
-    char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
-    p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
-
+                             
-
-#ifdef UPDATE_CHECK
@@ -397 +401 @@
-    MainInputManager::killInstance();
-
+    /* Delete the application */
-    delete app;
-
+    /* Save the path */
-    config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
-    free( psz_path );
@@ -487 +493 @@
-    vlc_object_release (intf);
-}
+