Skip to content

V
vlc
Commit 5097081b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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.
parent 340bf4eb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 104 deletions
modules/gui/qt4/components/open.cpp
View file @ 5097081b
This diff is collapsed.
modules/gui/qt4/components/open.hpp
View file @ 5097081b
...@@ -128,8 +128,15 @@ public: ...@@ -128,8 +128,15 @@ public:
virtual void clear() ; virtual void clear() ;
private: private:
Ui::OpenCapture ui; Ui::OpenCapture ui;
QRadioButton *dvbs;
QRadioButton *dvbt;
QRadioButton *dvbc;
QSpinBox *dvbFreq;
public slots: public slots:
virtual void updateMRL(); virtual void updateMRL();
private slots:
void updateButtons();
}; };
#endif #endif
modules/gui/qt4/dialogs/open.cpp
View file @ 5097081b
...@@ -74,7 +74,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal, ...@@ -74,7 +74,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
playButton->setPopupMode( QToolButton::MenuButtonPopup ); playButton->setPopupMode( QToolButton::MenuButtonPopup );
playButton->setToolButtonStyle( Qt::ToolButtonTextOnly ); playButton->setToolButtonStyle( Qt::ToolButtonTextOnly );
cancelButton = new QToolButton(); cancelButton = new QPushButton();
cancelButton->setText( qtr( "&Cancel" ) ); cancelButton->setText( qtr( "&Cancel" ) );
cancelButton->setSizePolicy( buttonSizePolicy ); cancelButton->setSizePolicy( buttonSizePolicy );
......
modules/gui/qt4/dialogs/open.hpp
View file @ 5097081b
...@@ -84,7 +84,7 @@ private: ...@@ -84,7 +84,7 @@ private:
int i_action_flag; int i_action_flag;
QStringList SeparateEntries( QString ); QStringList SeparateEntries( QString );
QToolButton *cancelButton; QPushButton *cancelButton;
QToolButton *playButton; QToolButton *playButton;
void finish( bool ); void finish( bool );
......
modules/gui/qt4/ui/open_capture.ui
View file @ 5097081b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>314</width> <width>314</width>
<height>140</height> <height>147</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -20,60 +20,32 @@ ...@@ -20,60 +20,32 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" > <item row="4" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" > <spacer>
<property name="sizePolicy" > <property name="orientation" >
<sizepolicy> <enum>Qt::Vertical</enum>
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Card Selection</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> </property>
<layout class="QGridLayout" > <property name="sizeType" >
<property name="margin" > <enum>QSizePolicy::MinimumExpanding</enum>
<number>0</number>
</property> </property>
<property name="spacing" > <property name="sizeHint" >
<number>6</number> <size>
<width>20</width>
<height>10</height>
</size>
</property> </property>
</layout> </spacer>
</widget>
</widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="0" column="1" >
<widget class="QGroupBox" name="Options" > <widget class="QComboBox" name="deviceCombo" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>5</hsizetype> <hsizetype>1</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<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> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -83,33 +55,42 @@ ...@@ -83,33 +55,42 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="2" column="0" colspan="2" >
<widget class="QComboBox" name="protocolCombo" > <widget class="QGroupBox" name="optionsBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>5</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title" >
<string>Options</string>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<spacer> <widget class="QGroupBox" name="cardBox" >
<property name="orientation" > <property name="sizePolicy" >
<enum>Qt::Vertical</enum> <sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeType" > <property name="title" >
<enum>QSizePolicy::MinimumExpanding</enum> <string>Card Selection</string>
</property> </property>
<property name="sizeHint" > </widget>
<size> </item>
<width>20</width> <item row="3" column="0" >
<height>10</height> <widget class="QPushButton" name="advancedButton" >
</size> <property name="text" >
<string>Advanced options...</string>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment