X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fopen.cpp;h=76482c8bc43337f0eda1c67ea7ff0dcd03e0401c;hb=78510eda324d3113f4764be2b8708d1131e8980a;hp=7857869c6ed4d407ae33280400c1c238e4f0cf10;hpb=9f9dda51e1f5c5eb4565b883acdcb6955fefc985;p=vlc

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 7857869c6e..76482c8bc4 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : Advanced open dialog
  *****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
- * $Id: streaminfo.cpp 16816 2006-09-23 20:56:52Z jb $
+ * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb@videolan.org>
  *
@@ -21,18 +21,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "input_manager.hpp"
+
+#include "dialogs/open.hpp"
+#include "components/open.hpp"
+
 #include <QTabWidget>
 #include <QGridLayout>
 #include <QFileDialog>
 #include <QRegExp>
 #include <QMenu>
-#include "dialogs/open.hpp"
-#include "components/open.hpp"
-
-#include "qt4.hpp"
-#include "util/qvlcframe.hpp"
-
-#include "input_manager.hpp"
 
 OpenDialog *OpenDialog::instance = NULL;
 
@@ -65,10 +63,17 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
     {
         ui.advancedFrame->hide();
     }
+    else
+    {
+        ui.advancedCheckBox->setCheckState( Qt::Checked );
+    }
+
+    ui.slaveLabel->hide();
+    ui.slaveText->hide();
+    ui.slaveBrowseButton->hide();
 
     /* Buttons Creation */
-    QSizePolicy buttonSizePolicy( static_cast<QSizePolicy::Policy>(7),
-                                  static_cast<QSizePolicy::Policy>(1) );
+    QSizePolicy buttonSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
     buttonSizePolicy.setHorizontalStretch(0);
     buttonSizePolicy.setVerticalStretch(0);
 
@@ -90,7 +95,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
                                     QKeySequence( "Alt+P" ) );
     openButtonMenu->addAction( qtr("&Stream"), this, SLOT( stream() ) ,
                                     QKeySequence( "Alt+S" ) );
-    openButtonMenu->addAction( qtr("&Convert"), this, SLOT( transcode( ) ) ,
+    openButtonMenu->addAction( qtr("&Convert"), this, SLOT( transcode() ) ,
                                     QKeySequence( "Alt+C" ) );
 
     playButton->setMenu( openButtonMenu );
@@ -152,9 +157,9 @@ void OpenDialog::setMenuAction()
             break;
         case OPEN_AND_SAVE:
             playButton->setText( qtr("&Convert / Save") );
-            BUTTONACT( playButton, stream( true ) );
+            BUTTONACT( playButton, transcode() );
             break;
-        case ENQUEUE:
+        case OPEN_AND_ENQUEUE:
             playButton->setText( qtr("&Enqueue") );
             BUTTONACT( playButton, enqueue() );
             break;
@@ -272,20 +277,25 @@ void OpenDialog::finish( bool b_enqueue = false )
 void OpenDialog::toggleAdvancedPanel()
 {
     //FIXME does not work under Windows
-    if (ui.advancedFrame->isVisible()) {
+    if( ui.advancedFrame->isVisible() ) {
         ui.advancedFrame->hide();
+#ifndef WIN32
         setMinimumHeight(1);
         resize( width(), mainHeight );
-
+#endif
     } else {
+#ifndef WIN32
         if( mainHeight == 0 )
             mainHeight = height();
+#endif
 
         ui.advancedFrame->show();
+#ifndef WIN32
         if( advHeight == 0 ) {
             advHeight = height() - mainHeight;
         }
         resize( width(), mainHeight + advHeight );
+#endif
     }
 }