Qt4 - open dialogs: Capture tab, DVB, PVR and V4L. main design is done. NEeds...

Qt4 - open dialogs: Capture tab, DVB, PVR and V4L. main design is done. NEeds to be checked by people who actually use that kind of device.

modules/gui/qt4/components/open.hpp

@@ -128,8 +128,15 @@ public:
     virtual void clear() ;
 private:
     Ui::OpenCapture ui;
+    QRadioButton *dvbs;
+    QRadioButton *dvbt;
+    QRadioButton *dvbc;
+    QSpinBox *dvbFreq;
+
 public slots:
     virtual void updateMRL();
+private slots:
+    void updateButtons();
 };
 
 #endif

modules/gui/qt4/dialogs/open.cpp

@@ -74,7 +74,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
     playButton->setPopupMode( QToolButton::MenuButtonPopup );
     playButton->setToolButtonStyle( Qt::ToolButtonTextOnly );
 
-    cancelButton = new QToolButton();
+    cancelButton = new QPushButton();
     cancelButton->setText( qtr( "&Cancel" ) );
     cancelButton->setSizePolicy( buttonSizePolicy );
 

modules/gui/qt4/dialogs/open.hpp

@@ -84,7 +84,7 @@ private:
     int i_action_flag;
     QStringList SeparateEntries( QString );
 
-    QToolButton *cancelButton;
+    QPushButton *cancelButton;
     QToolButton *playButton;
     void finish( bool );
 

modules/gui/qt4/ui/open_capture.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>314</width>
-    <height>140</height>
+    <height>147</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,41 +20,43 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
+   <item row="4" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="deviceCombo" >
      <property name="sizePolicy" >
       <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>5</vsizetype>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
-      <string>Card Selection</string>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Capture Mode</string>
      </property>
-     <widget class="QWidget" name="gridLayout" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>10</y>
-        <width>531</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-      </layout>
-     </widget>
     </widget>
    </item>
    <item row="2" column="0" colspan="2" >
-    <widget class="QGroupBox" name="Options" >
+    <widget class="QGroupBox" name="optionsBox" >
      <property name="sizePolicy" >
       <sizepolicy>
        <hsizetype>5</hsizetype>
@@ -66,50 +68,29 @@
      <property name="title" >
       <string>Options</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Capture Mode</string>
-     </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="protocolCombo" >
+   <item row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="cardBox" >
      <property name="sizePolicy" >
       <sizepolicy>
-       <hsizetype>1</hsizetype>
-       <vsizetype>0</vsizetype>
+       <hsizetype>3</hsizetype>
+       <vsizetype>5</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="title" >
+      <string>Card Selection</string>
+     </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>10</height>
-      </size>
+   <item row="3" column="0" >
+    <widget class="QPushButton" name="advancedButton" >
+     <property name="text" >
+      <string>Advanced options...</string>
      </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>