Qt4 - Slight string change and code cosmetic.

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 844e5d3bc6b49d7e96b4fd7240dd680b99206be8..76482c8bc43337f0eda1c67ea7ff0dcd03e0401c 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -159,7 +159,7 @@ void OpenDialog::setMenuAction()
             playButton->setText( qtr("&Convert / Save") );
             BUTTONACT( playButton, transcode() );
             break;
-        case ENQUEUE:
+        case OPEN_AND_ENQUEUE:
             playButton->setText( qtr("&Enqueue") );
             BUTTONACT( playButton, enqueue() );
             break;

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 362189537445b11aa73f7772473f636d866c924b..d9067f30d26ac8af8645a26745ac165e11c360b5 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -230,7 +230,8 @@ void DialogsProvider::openCaptureDialog()
 /* Same as the open one, but force the enqueue */
 void DialogsProvider::PLAppendDialog()
 {
-    OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, ENQUEUE)->showTab(0);
+    OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE)
+                            ->showTab( OPEN_FILE_TAB );
 }
 
 /* Unimplemmented yet - Usefull ? */

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index a0f5e085f31d7391e318229525e7340fdf42770c..47f4645334e11bb1e268c644359c9552ec67c7aa 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -81,7 +81,7 @@ enum {
     OPEN_AND_PLAY,
     OPEN_AND_STREAM,
     OPEN_AND_SAVE,
-    ENQUEUE
+    OPEN_AND_ENQUEUE
 };
 
 class QEvent;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index db283d03777bdc817259718cd74a324acba75ef5..2bef09d35c6dc191f999853d4b320dd5aad13c55 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -563,7 +563,7 @@ void MainInterface::togglePlaylist()
     {
         msg_Dbg( p_intf, "Creating a new playlist" );
         playlistWidget = new PlaylistWidget( p_intf );
-        if(bgWidget)
+        if( bgWidget )
             CONNECT( playlistWidget, artSet( QString ), bgWidget, setArt(QString) );
 
         //FIXME
@@ -578,10 +578,10 @@ void MainInterface::togglePlaylist()
         msg_Dbg( p_intf, "Creating a new playlist" );
 
         /* Make the playlist floating is requested. Default is not. */
-        if( !settings->value( "playlist-embedded", true ).toBool() );
+        if( !(settings->value( "playlist-embedded", true )).toBool() );
         {
             msg_Dbg( p_intf, "we don't want it inside");
-            dockPL->setFloating( true );
+            //dockPL->setFloating( true );
         }
 
     }

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 3e35be4afee8d0a1ae8df452f5b1e9c866efb923..dcfcec5ee783ace0e6224abb8d66378838a22ba9 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -26,7 +26,7 @@
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>_("Skins")</string>
+      <string>_("Native or Skins")</string>
      </property>
      <layout class="QGridLayout" >
       <item row="2" column="0" colspan="3" >
@@ -103,7 +103,7 @@
       <item row="0" column="0" >
        <widget class="QRadioButton" name="qt4" >
         <property name="text" >
-         <string>_("Default")</string>
+         <string>_("Native")</string>
         </property>
        </widget>
       </item>