Qt: try to fix the arrow on the open dialog.

Close #2508/

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 003700a3884fdb6ee8fe541448be9f9124dd5b3e..e8db45e02e6acb685c335506043fd8c2244d9b21 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -127,6 +127,7 @@ OpenDialog::OpenDialog( QWidget *parent,
                                     QKeySequence( "Alt+C" ) );
 
     ui.menuButton->setMenu( openButtonMenu );
+    ui.menuButton->setIcon( QIcon( ":/down_arrow" ) );
 
     /* Add the three Buttons */
     ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole );

diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index fd596aebe8c7151ce3c0b14e96b8ed284a6569e9..32c95656399b82b5a608a85582356eaa5c213fbb 100644 (file)
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -207,7 +207,7 @@
     </spacer>
    </item>
    <item row="3" column="1" >
-    <widget class="QPushButton" name="menuButton" >
+    <widget class="QToolButton" name="menuButton" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
        <horstretch>0</horstretch>
@@ -216,19 +216,22 @@
      </property>
      <property name="maximumSize" >
       <size>
-       <width>20</width>
+       <width>16</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="focusPolicy" >
       <enum>Qt::ClickFocus</enum>
      </property>
-     <property name="contextMenuPolicy" >
-      <enum>Qt::NoContextMenu</enum>
-     </property>
      <property name="toolTip" >
       <string>_("Select play mode")</string>
      </property>
+     <property name="popupMode" >
+      <enum>QToolButton::InstantPopup</enum>
+     </property>
+     <property name="arrowType" >
+      <enum>Qt::NoArrow</enum>
+     </property>
     </widget>
    </item>
    <item row="3" column="2" >

diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index b313a08fa792050225b85406f37f08b025bd5baa..ac42eaf6224f7329993c12884c5691bffef44d78 100644 (file)
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>311</height>
+    <height>319</height>
    </rect>
   </property>
   <property name="minimumSize" >
@@ -351,11 +351,6 @@
        </widget>
       </item>
      </layout>
-     <zorder>subtitlesLabel</zorder>
-     <zorder>subtitlesSpin</zorder>
-     <zorder>audioLabel</zorder>
-     <zorder>audioSpin</zorder>
-     <zorder>diskGroupBox</zorder>
     </widget>
    </item>
    <item>