qt4 - Playlist: move the column selection to a submenu.

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

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index b0512a66d329de8333d4948d0ef205c11b25871f..f57f1c3809cc51ff4ab704177e85b3c0d2b98607 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -21,18 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "qt4.hpp"
+#include "util/qvlcframe.hpp"
+#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,6 +65,10 @@ 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();
@@ -278,18 +282,23 @@ void OpenDialog::toggleAdvancedPanel()
     //FIXME does not work under Windows
     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
     }
 }