Commit 91273f89 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: change a bit the ui from sout to use the SoutInputBox and etter Sout...

Qt4: change a bit the ui from sout to use the SoutInputBox and etter Sout integration and panel changing.
parent 066390d3
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
SoutInputBox::SoutInputBox( QWidget *_parent ) : QWidget( _parent ) SoutInputBox::SoutInputBox( QWidget *_parent ) : QGroupBox( _parent )
{ {
/** /**
* Source Block * Source Block
**/ **/
QGroupBox *sourceBox = new QGroupBox( qtr( "Source" ) ); setTitle( qtr( "Source" ) );
QGridLayout *sourceLayout = new QGridLayout( sourceBox ); QGridLayout *sourceLayout = new QGridLayout( this );
QLabel *sourceLabel = new QLabel( qtr( "Source:" ) ); QLabel *sourceLabel = new QLabel( qtr( "Source:" ) );
sourceLayout->addWidget( sourceLabel, 0, 0 ); sourceLayout->addWidget( sourceLabel, 0, 0 );
......
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include "qt4.hpp" #include "qt4.hpp"
#include <QWidget> #include <QGroupBox>
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
class SoutInputBox : public QWidget class SoutInputBox : public QGroupBox
{ {
public: public:
SoutInputBox( QWidget *); SoutInputBox( QWidget *);
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "dialogs/sout.hpp" #include "dialogs/sout.hpp"
#include "util/qt_dirs.hpp" #include "util/qt_dirs.hpp"
#include "components/sout/sout_widgets.hpp"
#include <QString> #include <QString>
#include <QFileDialog> #include <QFileDialog>
...@@ -150,6 +151,13 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) ...@@ -150,6 +151,13 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf )
CONNECT( ui.UDPOutput, toggled( bool ), this, changeUDPandRTPmess( bool ) ); CONNECT( ui.UDPOutput, toggled( bool ), this, changeUDPandRTPmess( bool ) );
CONNECT( ui.RTPOutput, clicked(bool), this, RTPtoggled( bool ) ); CONNECT( ui.RTPOutput, clicked(bool), this, RTPtoggled( bool ) );
BUTTONACT( ui.nextButton, next() );
BUTTONACT( ui.nextButton2, next() );
}
void SoutDialog::next()
{
ui.toolBox->setCurrentIndex( ui.toolBox->currentIndex() + 1 );
} }
void SoutDialog::fileBrowse() void SoutDialog::fileBrowse()
......
...@@ -146,6 +146,7 @@ private slots: ...@@ -146,6 +146,7 @@ private slots:
void setRawOptions( bool ); void setRawOptions( bool );
void changeUDPandRTPmess( bool ); void changeUDPandRTPmess( bool );
void RTPtoggled( bool ); void RTPtoggled( bool );
void next();
}; };
#endif #endif
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>711</width> <width>715</width>
<height>470</height> <height>507</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -18,27 +18,77 @@ ...@@ -18,27 +18,77 @@
<item> <item>
<widget class="QToolBox" name="toolBox"> <widget class="QToolBox" name="toolBox">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>697</width>
<height>389</height>
</rect>
</property>
<attribute name="label"> <attribute name="label">
<string>_(&quot;Source&quot;)</string> <string>_(&quot;Source&quot;)</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>581</width>
<height>321</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>581</width>
<height>26</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="nextButton">
<property name="text">
<string>_(&quot;Next&quot;)</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="SoutInputBox" name="groupBox">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="page_3"> <widget class="QWidget" name="page_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>708</width> <width>697</width>
<height>308</height> <height>389</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
<string notr="true">_(&quot;Destination&quot;)</string> <string>_(&quot;Destination&quot;)</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="_3"> <layout class="QGridLayout" name="_3">
<item row="0" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="QCheckBox" name="localOutput"> <widget class="QCheckBox" name="localOutput">
...@@ -435,6 +485,26 @@ ...@@ -435,6 +485,26 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>581</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="nextButton2">
<property name="text">
<string>_(&quot;Next&quot;)</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_4"> <widget class="QWidget" name="page_4">
...@@ -442,8 +512,8 @@ ...@@ -442,8 +512,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>693</width> <width>697</width>
<height>330</height> <height>389</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
...@@ -555,28 +625,11 @@ ...@@ -555,28 +625,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout"> <widget class="QDialogButtonBox" name="acceptButtonBox">
<item> <property name="standardButtons">
<spacer> <set>QDialogButtonBox::NoButton</set>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> </widget>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="acceptButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
...@@ -587,6 +640,12 @@ ...@@ -587,6 +640,12 @@
<header>components/sout/profile_selector.hpp</header> <header>components/sout/profile_selector.hpp</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>SoutInputBox</class>
<extends>QGroupBox</extends>
<header>components/sout/sout_widgets.hpp</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>
......
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