Skip to content

V
vlc-2-2
Commit ab7704a5 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - VLM dialog rework.

parent 34b5e985
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 204 deletions
modules/gui/qt4/dialogs/vlm.cpp
View file @ ab7704a5
This diff is collapsed.
modules/gui/qt4/dialogs/vlm.hpp
View file @ ab7704a5
...@@ -30,11 +30,16 @@ ...@@ -30,11 +30,16 @@
#include "ui/vlm.h" #include "ui/vlm.h"
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
enum{
QVLM_Broadcast,
QVLM_VOD,
QVLM_Schedule
};
class QComboBox; class QComboBox;
class QVBoxLayout; class QVBoxLayout;
class QStackedWidget; class QStackedWidget;
class QLabel; class QLabel;
class QWidget;
class QGridLayout; class QGridLayout;
class QLineEdit; class QLineEdit;
class QCheckBox; class QCheckBox;
...@@ -62,31 +67,28 @@ private: ...@@ -62,31 +67,28 @@ private:
VLMDialog( intf_thread_t * ); VLMDialog( intf_thread_t * );
static VLMDialog *instance; static VLMDialog *instance;
Ui::Vlm ui; Ui::Vlm ui;
void makeBcastPage(); QGridLayout *vlmItemLayout;
void makeVODPage();
void makeSchedulePage();
QComboBox *mediatype; QComboBox *mediatype;
QVBoxLayout *layout;
QHBoxLayout *bcastgbox, ;
QStackedWidget *slayout;
QWidget *pBcast, *pVod, *pSchedule;
QGridLayout *bcastlayout, *vodlayout, *schelayout, *schetimelayout;
QLabel *bcastname, *vodname, *schename,*bcastinput, *vodinput, *scheinput;
QLabel *bcastoutput, *vodoutput, *scheoutput;
QCheckBox *bcastenable, *vodenable, *scheenable; QCheckBox *bcastenable, *vodenable, *scheenable;
QLineEdit *bcastnameledit, *vodnameledit, *schenameledit, *bcastinputledit, *vodinputledit, *scheinputledit; QLineEdit *bcastnameledit, *vodnameledit, *schenameledit, *bcastinputledit, *vodinputledit, *scheinputledit;
QLineEdit *bcastoutputledit, *vodoutputledit, *scheoutputledit; QLineEdit *bcastoutputledit, *vodoutputledit, *scheoutputledit;
QTimeEdit *time;
QDateEdit *date;
QSpinBox *scherepeatnumber;
QToolButton *bcastinputtbutton, *vodinputtbutton, *scheinputtbutton; QToolButton *bcastinputtbutton, *vodinputtbutton, *scheinputtbutton;
QToolButton *bcastoutputtbutton, *vodoutputtbutton, *scheoutputtbutton; QToolButton *bcastoutputtbutton, *vodoutputtbutton, *scheoutputtbutton;
QGroupBox *bcastcontrol, *schecontrol;
QPushButton *bcastplay, *bcastpause, *bcaststop; QPushButton *bcastplay, *bcastpause, *bcaststop;
QPushButton *bcastadd, *vodadd, *scheadd, *bcastremove, *vodremove, *scheremove; QPushButton *bcastadd, *vodadd, *scheadd, *bcastremove, *vodremove, *scheremove;
QTimeEdit *time;
QDateEdit *date; private slots:
QLabel *schetimelabel, *schedatelabel, *schetimerepeat; void finish();
QSpinBox *scherepeatnumber; void cancel();
void addVLMItem();
void removeVLMItem();
void clearVLMItem();
}; };
#endif #endif
modules/gui/qt4/ui/vlm.ui
View file @ ab7704a5
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>588</width>
<height>640</height> <height>393</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -22,95 +22,90 @@ ...@@ -22,95 +22,90 @@
<string>_("VLM configurator")</string> <string>_("VLM configurator")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item rowspan="3" row="0" column="0" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="mediaConfBox" >
<property name="minimumSize" > <property name="sizePolicy" >
<size> <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<width>0</width> <horstretch>0</horstretch>
<height>300</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="title" > <property name="title" >
<string>Media configuration</string> <string>_("Media Creation")</string>
</property> </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QComboBox" name="mediaType" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="mediaStacked" >
<property name="currentIndex" >
<number>2</number>
</property>
<widget class="QWidget" name="pBcast" />
<widget class="QWidget" name="pVod" />
<widget class="QWidget" name="pSched" />
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="0" column="1" >
<widget class="QTableWidget" name="mediasDB" > <widget class="QPushButton" name="addButton" >
<property name="windowModality" > <property name="text" >
<enum>Qt::NonModal</enum> <string>_("Add")</string>
</property>
<property name="enabled" >
<bool>true</bool>
</property> </property>
<property name="sizePolicy" > </widget>
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > </item>
<horstretch>0</horstretch> <item row="1" column="1" >
<verstretch>0</verstretch> <widget class="QPushButton" name="clearButton" >
</sizepolicy> <property name="text" >
</property> <string>_("Clear")</string>
<property name="minimumSize" >
<size>
<width>0</width>
<height>220</height>
</size>
</property> </property>
<property name="sizeIncrement" > </widget>
<size> </item>
<width>0</width> <item row="2" column="1" >
<height>0</height> <spacer>
</size> <property name="orientation" >
<enum>Qt::Vertical</enum>
</property> </property>
<property name="baseSize" > <property name="sizeHint" >
<size> <size>
<width>0</width> <width>80</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
<property name="autoFillBackground" > </spacer>
<bool>false</bool> </item>
</property> <item row="3" column="0" colspan="2" >
<property name="horizontalScrollBarPolicy" > <widget class="QGroupBox" name="mediaBox" >
<enum>Qt::ScrollBarAlwaysOff</enum> <property name="sizePolicy" >
</property> <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
<property name="selectionMode" > <horstretch>0</horstretch>
<enum>QAbstractItemView::MultiSelection</enum> <verstretch>1</verstretch>
</property> </sizepolicy>
<property name="showGrid" >
<bool>true</bool>
</property> </property>
<property name="sortingEnabled" > <property name="title" >
<bool>true</bool> <string>_("Media Configuration")</string>
</property> </property>
<row/> <layout class="QHBoxLayout" />
<column>
<property name="text" >
<string>Type</string>
</property>
</column>
<column>
<property name="text" >
<string>Media Name</string>
</property>
</column>
<column>
<property name="text" >
<string>Input</string>
</property>
</column>
<column>
<property name="text" >
<string>Output</string>
</property>
</column>
<column>
<property name="text" >
<string>State</string>
</property>
</column>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="4" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" > <widget class="QDialogButtonBox" name="buttonBox" >
<property name="standardButtons" > <property name="standardButtons" >
<set>QDialogButtonBox::NoButton</set> <set>QDialogButtonBox::NoButton</set>
......
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