Commit 2152eabc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: extended panels, remove last tab and simplify code

parent ebb2d8d1
...@@ -73,7 +73,7 @@ private: ...@@ -73,7 +73,7 @@ private:
}; };
#endif #endif
QString ModuleFromWidgetName( QObject *obj ) const QString ModuleFromWidgetName( QObject *obj )
{ {
return obj->objectName().replace( "Enable","" ); return obj->objectName().replace( "Enable","" );
} }
...@@ -240,10 +240,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ...@@ -240,10 +240,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
ui.cropRightPx, setDisabled( bool ) ); ui.cropRightPx, setDisabled( bool ) );
} }
ExtVideo::~ExtVideo()
{
}
void ExtVideo::cropChange() void ExtVideo::cropChange()
{ {
if( ui.topBotCropSync->isChecked() ) if( ui.topBotCropSync->isChecked() )
...@@ -362,12 +358,6 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) ...@@ -362,12 +358,6 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
} }
/* Vout is not kept, so put that in the config */ /* Vout is not kept, so put that in the config */
config_PutPsz( p_intf, psz_filter_type, psz_string ); config_PutPsz( p_intf, psz_filter_type, psz_string );
if( !strcmp( psz_filter_type, "video-filter" ) )
ui.videoFilterText->setText( psz_string );
else if( !strcmp( psz_filter_type, "vout-filter" ) )
ui.voutFilterText->setText( psz_string );
else if( !strcmp( psz_filter_type, "sub-filter" ) )
ui.subpictureFilterText->setText( psz_string );
/* Try to set on the fly */ /* Try to set on the fly */
p_vout = THEMIM->getVout(); p_vout = THEMIM->getVout();
...@@ -646,11 +636,6 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent ) ...@@ -646,11 +636,6 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
box = NULL; box = NULL;
} }
ExtV4l2::~ExtV4l2()
{
delete box;
}
void ExtV4l2::showEvent( QShowEvent *event ) void ExtV4l2::showEvent( QShowEvent *event )
{ {
QWidget::showEvent( event ); QWidget::showEvent( event );
......
...@@ -49,7 +49,6 @@ class ExtVideo: public QObject ...@@ -49,7 +49,6 @@ class ExtVideo: public QObject
friend class ExtendedDialog; friend class ExtendedDialog;
public: public:
ExtVideo( struct intf_thread_t *, QTabWidget * ); ExtVideo( struct intf_thread_t *, QTabWidget * );
virtual ~ExtVideo();
/*void gotoConf( QObject* );*/ /*void gotoConf( QObject* );*/
private: private:
Ui::ExtVideoWidget ui; Ui::ExtVideoWidget ui;
...@@ -71,7 +70,6 @@ class ExtV4l2 : public QWidget ...@@ -71,7 +70,6 @@ class ExtV4l2 : public QWidget
Q_OBJECT Q_OBJECT
public: public:
ExtV4l2( intf_thread_t *, QWidget * ); ExtV4l2( intf_thread_t *, QWidget * );
virtual ~ExtV4l2();
virtual void showEvent( QShowEvent *event ); virtual void showEvent( QShowEvent *event );
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>619</width> <width>619</width>
<height>280</height> <height>308</height>
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
...@@ -1324,57 +1324,6 @@ ...@@ -1324,57 +1324,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_6">
<attribute name="title">
<string>Advanced video filter controls</string>
</attribute>
<layout class="QGridLayout">
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="subpictureFilterText"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Subpicture filters</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="videoFilterText"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>Video filters</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Vout filters</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="filtersResetButton">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="filtersUpdateButton">
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="voutFilterText"/>
</item>
</layout>
</widget>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>logoEnable</tabstop> <tabstop>logoEnable</tabstop>
...@@ -1442,11 +1391,6 @@ ...@@ -1442,11 +1391,6 @@
<tabstop>brightnessSlider</tabstop> <tabstop>brightnessSlider</tabstop>
<tabstop>contrastSlider</tabstop> <tabstop>contrastSlider</tabstop>
<tabstop>hueSlider</tabstop> <tabstop>hueSlider</tabstop>
<tabstop>filtersResetButton</tabstop>
<tabstop>videoFilterText</tabstop>
<tabstop>filtersUpdateButton</tabstop>
<tabstop>subpictureFilterText</tabstop>
<tabstop>voutFilterText</tabstop>
<tabstop>adjustEnable</tabstop> <tabstop>adjustEnable</tabstop>
<tabstop>transformEnable</tabstop> <tabstop>transformEnable</tabstop>
<tabstop>brightnessThresholdCheck</tabstop> <tabstop>brightnessThresholdCheck</tabstop>
......
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