From c45048df5ea0ac61f646433b99d7731cb4140792 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 13 Mar 2008 17:21:39 -0700
Subject: [PATCH] Change button layout and behaviour in the open dialog. This
 avoid the Windows issue and should close #1455

---
 modules/gui/qt4/dialogs/open.cpp |  24 +---
 modules/gui/qt4/dialogs/open.hpp |   5 +-
 modules/gui/qt4/ui/open.ui       | 184 +++++++++++++++++++++----------
 3 files changed, 131 insertions(+), 82 deletions(-)

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index db9fa45c87..1ff123b975 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -91,27 +91,14 @@ OpenDialog::OpenDialog( QWidget *parent,
     ui.slaveBrowseButton->hide();
 
     /* Buttons Creation */
-    QSizePolicy buttonSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
-    buttonSizePolicy.setHorizontalStretch( 0 );
-    buttonSizePolicy.setVerticalStretch( 0 );
-
     /* Play Button */
-    playButton = new QToolButton;
-    playButton->setText( qtr( "&Play" ) );
-    playButton->setSizePolicy( buttonSizePolicy );
-    playButton->setMinimumSize( QSize( 90, 0 ) );
-    playButton->setPopupMode( QToolButton::MenuButtonPopup );
-    playButton->setToolButtonStyle( Qt::ToolButtonTextOnly );
+    playButton = ui.playButton;
 
     /* Cancel Button */
-    cancelButton = new QToolButton;
-    cancelButton->setText( qtr( "&Cancel" ) );
-    cancelButton->setSizePolicy( buttonSizePolicy );
+    cancelButton = new QPushButton( qtr( "&Cancel" ) );
 
     /* Select Button */
-    selectButton = new QToolButton;
-    selectButton->setText( qtr( "Select" ) );
-    selectButton->setSizePolicy( buttonSizePolicy );
+    selectButton = new QPushButton( qtr( "Select" ) );
 
     /* Menu for the Play button */
     QMenu * openButtonMenu = new QMenu( "Open" );
@@ -124,10 +111,9 @@ OpenDialog::OpenDialog( QWidget *parent,
     openButtonMenu->addAction( qtr( "&Convert" ), this, SLOT( transcode() ) ,
                                     QKeySequence( "Alt+C" ) );
 
-    playButton->setMenu( openButtonMenu );
+    ui.menuButton->setMenu( openButtonMenu );
 
     /* Add the three Buttons */
-    ui.buttonsBox->addButton( playButton, QDialogButtonBox::ActionRole );
     ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole );
     ui.buttonsBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
 
@@ -183,6 +169,7 @@ void OpenDialog::setMenuAction()
     {
         playButton->hide();
         selectButton->show();
+        selectButton->setDefault( true );
     }
     else
     {
@@ -202,6 +189,7 @@ void OpenDialog::setMenuAction()
             playButton->setText( qtr( "&Play" ) );
         }
         playButton->show();
+        playButton->setDefault( true );
         selectButton->hide();
     }
 }
diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 6399068f47..3af33971fe 100644
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -36,7 +36,6 @@
 #include "components/open_panels.hpp"
 
 class QString;
-class QToolButton;
 class QTabWidget;
 
 class OpenDialog : public QVLCDialog
@@ -83,8 +82,8 @@ private:
     int i_action_flag;
     QStringList SeparateEntries( QString );
 
-    QToolButton *cancelButton, *selectButton;
-    QToolButton *playButton;
+    QPushButton *cancelButton, *selectButton;
+    QPushButton *playButton;
 
     void finish( bool );
 
diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index 3a445ee3e4..0acf4ea44c 100644
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
-    <height>285</height>
+    <width>518</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -23,7 +23,7 @@
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" >
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="Tab" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -36,7 +36,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
+   <item row="1" column="0" colspan="3" >
     <widget class="QCheckBox" name="advancedCheckBox" >
      <property name="toolTip" >
       <string>_("Show extended options")</string>
@@ -46,7 +46,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
+   <item row="2" column="0" colspan="3" >
     <widget class="QFrame" name="advancedFrame" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
@@ -58,73 +58,89 @@
       <enum>QFrame::StyledPanel</enum>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="2" >
-       <widget class="QLabel" name="label_3" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="cacheLabel" >
         <property name="text" >
-         <string>_("Start Time")</string>
+         <string>_("Caching")</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="3" colspan="2" >
-       <widget class="QSpinBox" name="startTimeSpinBox" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="cacheSpinBox" >
         <property name="toolTip" >
-         <string>_("Change the start time for the media")</string>
+         <string>_("Change the caching for the media")</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignRight</set>
         </property>
         <property name="suffix" >
-         <string> s</string>
+         <string> ms</string>
         </property>
         <property name="maximum" >
          <number>999999</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="cacheLabel" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="0" column="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeHint" >
+         <size>
+          <width>16</width>
+          <height>24</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>_("Caching")</string>
+         <string>_("Start Time")</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1" colspan="4" >
-       <widget class="QLineEdit" name="advancedLineInput" >
+      <item row="0" column="4" colspan="2" >
+       <widget class="QSpinBox" name="startTimeSpinBox" >
         <property name="toolTip" >
-         <string>_("Complete MRL for VLC internal")</string>
+         <string>_("Change the start time for the media")</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="suffix" >
+         <string> s</string>
+        </property>
+        <property name="maximum" >
+         <number>999999</number>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="5" >
-       <widget class="QCheckBox" name="slaveCheckbox" >
-        <property name="text" >
-         <string>_("Play another media synchronously (extra audio file, ...)")</string>
+      <item row="0" column="6" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="4" column="1" colspan="4" >
+      <item row="1" column="1" colspan="6" >
        <widget class="Line" name="line" >
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="advancedLabel" >
+      <item row="2" column="0" colspan="7" >
+       <widget class="QCheckBox" name="slaveCheckbox" >
         <property name="text" >
-         <string>_("Customize")</string>
+         <string>_("Play another media synchronously (extra audio file, ...)")</string>
         </property>
        </widget>
       </item>
@@ -135,11 +151,11 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="3" >
+      <item row="3" column="1" colspan="4" >
        <widget class="QLineEdit" name="slaveText" />
       </item>
-      <item row="3" column="4" >
-       <widget class="QToolButton" name="slaveBrowseButton" >
+      <item row="3" column="5" colspan="2" >
+       <widget class="QPushButton" name="slaveBrowseButton" >
         <property name="toolTip" >
          <string>_("Select the file")</string>
         </property>
@@ -148,32 +164,24 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="4" >
+      <item row="4" column="1" colspan="6" >
        <widget class="Line" name="line" >
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="cacheSpinBox" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="advancedLabel" >
+        <property name="text" >
+         <string>_("Customize")</string>
         </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="6" >
+       <widget class="QLineEdit" name="advancedLineInput" >
         <property name="toolTip" >
-         <string>_("Change the caching for the media")</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
-        </property>
-        <property name="suffix" >
-         <string> ms</string>
-        </property>
-        <property name="maximum" >
-         <number>999999</number>
+         <string>_("Complete MRL for VLC internal")</string>
         </property>
        </widget>
       </item>
@@ -186,18 +194,72 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType" >
-      <enum>QSizePolicy::Minimum</enum>
+      <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>240</width>
+       <width>151</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="3" column="1" >
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="menuButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>20</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::ClickFocus</enum>
+       </property>
+       <property name="contextMenuPolicy" >
+        <enum>Qt::NoContextMenu</enum>
+       </property>
+       <property name="autoDefault" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="playButton" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Play</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="2" >
     <widget class="QDialogButtonBox" name="buttonsBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-- 
GitLab