[vlc-commits] Qt: OpenFile: Use QGroupBox for subs.

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jun 11 19:49:17 2013 +0200| [55e27bb1b27c7d16a895687210a1ff23e257341d] | committer: Francois Cartegnie

Qt: OpenFile: Use QGroupBox for subs.

And don't make use of confusing raised QFrame panels.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55e27bb1b27c7d16a895687210a1ff23e257341d
---

 modules/gui/qt4/components/open_panels.cpp |   17 ++---
 modules/gui/qt4/components/open_panels.hpp |    1 -
 modules/gui/qt4/ui/open_file.ui            |   94 ++++++++++++----------------
 3 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 0acf518..4c516cd 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -107,14 +107,14 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* Subtitles */
     /* Deactivate the subtitles control by default. */
-    ui.subFrame->setEnabled( false );
+    ui.subGroupBox->setEnabled( false );
 
     /* Connects  */
     BUTTONACT( ui.fileBrowseButton, browseFile() );
     BUTTONACT( ui.removeFileButton, removeFile() );
 
     BUTTONACT( ui.subBrowseButton, browseFileSub() );
-    CONNECT( ui.subCheckBox, toggled( bool ), this, toggleSubtitleFrame( bool ) );
+    CONNECT( ui.subGroupBox, toggled( bool ), this, updateMRL() );
 
     CONNECT( ui.fileListWidg, itemChanged( QListWidgetItem * ), this, updateMRL() );
     CONNECT( ui.subInput, textChanged( const QString& ), this, updateMRL() );
@@ -257,15 +257,6 @@ void FileOpenPanel::browseFileSub()
     updateMRL();
 }
 
-void FileOpenPanel::toggleSubtitleFrame( bool b )
-{
-    ui.subFrame->setEnabled( b );
-
-    /* Update the MRL */
-    updateMRL();
-}
-
-
 /* Update the current MRL */
 void FileOpenPanel::updateMRL()
 {
@@ -287,7 +278,7 @@ void FileOpenPanel::updateMRL()
     }
 
     /* Options */
-    if( ui.subCheckBox->isChecked() &&  !ui.subInput->text().isEmpty() ) {
+    if( ui.subGroupBox->isChecked() &&  !ui.subInput->text().isEmpty() ) {
         mrl.append( " :sub-file=" + colon_escape( ui.subInput->text() ) );
     }
 
@@ -315,7 +306,7 @@ void FileOpenPanel::updateButtons()
 {
     bool b_has_files = ( ui.fileListWidg->count() > 0 );
     ui.removeFileButton->setEnabled( b_has_files );
-    ui.subCheckBox->setEnabled( b_has_files );
+    ui.subGroupBox->setEnabled( b_has_files );
 }
 
 /**************************************************************************
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 48eeb6e..70082ba 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -130,7 +130,6 @@ private slots:
     void browseFile();
     void removeFile();
     void updateButtons();
-    void toggleSubtitleFrame( bool );
 };
 
 class NetOpenPanel: public OpenPanel
diff --git a/modules/gui/qt4/ui/open_file.ui b/modules/gui/qt4/ui/open_file.ui
index df7147d..56a0715 100644
--- a/modules/gui/qt4/ui/open_file.ui
+++ b/modules/gui/qt4/ui/open_file.ui
@@ -21,6 +21,46 @@
    <string>Open File</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="subGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Use a sub&title file</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLineEdit" name="subInput"/>
+      </item>
+      <item>
+       <widget class="QPushButton" name="subBrowseButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the subtitle file</string>
+        </property>
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="tempWidget">
      <property name="toolTip">
@@ -96,60 +136,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="subCheckBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="toolTip">
-      <string>Add a subtitle file</string>
-     </property>
-     <property name="text">
-      <string>Use a sub&title file</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0">
-    <widget class="QFrame" name="subFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QWidget" name="widget" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLineEdit" name="subInput"/>
-         </item>
-         <item>
-          <widget class="QPushButton" name="subBrowseButton">
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>Select the subtitle file</string>
-           </property>
-           <property name="text">
-            <string>Browse...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -171,7 +158,6 @@
   <tabstop>fileListWidg</tabstop>
   <tabstop>fileBrowseButton</tabstop>
   <tabstop>removeFileButton</tabstop>
-  <tabstop>subCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>