Qt4 - VLM improvements... Classing for the three kind of objects, more...

Qt4 - VLM improvements... Classing for the three kind of objects, more property editing and less segfaults (though there is one I have nooo clue ).

modules/gui/qt4/dialogs/vlm.hpp

@@ -47,10 +47,9 @@ class QToolButton;
 class QGroupBox;
 class QPushButton;
 class QHBoxLayout;
-class QDateEdit;
-class QTimeEdit;
+class QDateTimeEdit;
 class QSpinBox;
-class VLMObject;
+class VLMAWidget;
 
 class VLMDialog : public QVLCFrame
 {
@@ -69,20 +68,19 @@ private:
     static VLMDialog *instance;
     Ui::Vlm ui;
 
-    QList<VLMObject *> vlmItems;
+    QList<VLMAWidget *> vlmItems;
     int currentIndex;
 
     QVBoxLayout *vlmItemLayout;
     QWidget *vlmItemWidget;
   
     QComboBox *mediatype;
-    QTimeEdit *time;
-    QDateEdit *date;
-    QSpinBox *scherepeatnumber;
+    QDateTimeEdit *time, *date, *repeatTime;
+    QSpinBox *scherepeatnumber, *repeatDays;
     bool isNameGenuine( QString );
 public slots:
-    void removeVLMItem( VLMObject * );
-    void startModifyVLMItem( VLMObject * );
+    void removeVLMItem( VLMAWidget * );
+    void startModifyVLMItem( VLMAWidget * );
 private slots:
     void addVLMItem();
     void clearWidgets();
@@ -91,27 +89,52 @@ private slots:
     void selectVLMItem( int );
 };
 
-class VLMObject : public QGroupBox 
+class VLMAWidget : public QGroupBox 
 {
     Q_OBJECT
     friend class VLMDialog;
 public:
-    VLMObject( int type, QString name, QString input, QString output, bool _enable, VLMDialog *parent );
-private:
+    VLMAWidget( QString name, QString input, QString output, bool _enable, VLMDialog *parent );
+protected:
+    QLabel *nameLabel;
     QString name;
     QString input;
     QString output;
-    bool b_looped;
     bool b_enabled;
     VLMDialog *parent;
-protected:
     virtual void enterEvent( QEvent * );
+    QGridLayout *objLayout;
+private slots:
+    virtual void modify();
+    virtual void del();
+};
+
+class VLMBroadcast : public VLMAWidget
+{
+    Q_OBJECT
+public:
+    VLMBroadcast( QString name, QString input, QString output, bool _enable, VLMDialog *parent );
+private:
+    bool b_looped;
+
 private slots:
-    void modify();
     void stop();
-    void del();
     void togglePlayPause();
     void toggleLoop();
 };
 
+class VLMVod : public VLMAWidget
+{
+public:
+    VLMVod( QString name, QString input, QString output, bool _enable, VLMDialog *parent );
+private:
+    QString mux;
+};
+
+class VLMSchedule : public VLMAWidget
+{
+public:
+    VLMSchedule( QString name, QString input, QString output, bool _enable, VLMDialog *parent );
+};
+
 #endif

modules/gui/qt4/ui/vlm.ui

@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>738</width>
-    <height>598</height>
+    <height>693</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -112,6 +112,52 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="0" colspan="3" >
+       <widget class="QGroupBox" name="vodBox" >
+        <property name="title" >
+         <string>_("Mux Control")</string>
+        </property>
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="label" >
+           <property name="text" >
+            <string>Muxer:</string>
+           </property>
+           <property name="margin" >
+            <number>3</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="muxLedit" >
+           <property name="inputMask" >
+            <string>AAAA; </string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>411</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="2" >
+       <widget class="QCheckBox" name="loopBCast" >
+        <property name="text" >
+         <string>_("Loop")</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>