Float, Float with range and Integer with range widgets.

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 56150501fbda5e63436dabc7d9834589811f8a84..836582817cce8a379dbf6f24bd473eb8137dca92 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -79,7 +79,8 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
             p_control = new IntegerListConfigControl( p_this, p_item,
                                             parent, false, l, line );
         else if( p_item->i_min || p_item->i_max )
-            fprintf( stderr, "Todo\n" );
+            p_control = new IntegerRangeConfigControl( p_this, p_item, parent,
+                                                       l, line );
         else
             p_control = new IntegerConfigControl( p_this, p_item, parent,
                                                   l, line );
@@ -92,9 +93,11 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
         break;
     case CONFIG_ITEM_FLOAT:
         if( p_item->f_min || p_item->f_max )
-            fprintf( stderr, "Todo\n" );
+            p_control = new FloatRangeConfigControl( p_this, p_item, parent,
+                                                     l, line );
         else
-            fprintf( stderr, "Todo\n" );
+            p_control = new FloatConfigControl( p_this, p_item, parent,
+                                                  l, line );
         break;
     default:
         break;
@@ -323,6 +326,7 @@ IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this,
 void IntegerConfigControl::finish()
 {
     spin->setMaximum( 2000000000 );
+    spin->setMinimum( -2000000000 );
     spin->setValue( p_item->i_value );
     spin->setToolTip( qfu(p_item->psz_longtext) );
     if( label )
@@ -334,6 +338,30 @@ int IntegerConfigControl::getValue()
     return spin->value();
 }
 
+/********* Integer range **********/
+IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this,
+                                            module_config_t *_p_item,
+                                            QWidget *_parent, QGridLayout *l,
+                                            int line ) :
+            IntegerConfigControl( _p_this, _p_item, _parent, l, line )
+{
+    finish();
+}
+
+IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this,
+                                            module_config_t *_p_item,
+                                            QLabel *_label, QSpinBox *_spin ) :
+            IntegerConfigControl( _p_this, _p_item, _label, _spin )
+{
+    finish();
+}
+
+void IntegerRangeConfigControl::finish()
+{
+    spin->setMaximum( p_item->i_max );
+    spin->setMinimum( p_item->i_min );
+}
+
 /********* Integer / choice list **********/
 IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
                module_config_t *_p_item, QWidget *_parent, bool bycat,
@@ -428,3 +456,84 @@ int BoolConfigControl::getValue()
 {
     return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE;
 }
+
+/**************************************************************************
+ * Float-based controls
+ *************************************************************************/
+
+/*********** Float **************/
+FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
+                                        module_config_t *_p_item,
+                                        QWidget *_parent, QGridLayout *l,
+                                        int line ) :
+                    VFloatConfigControl( _p_this, _p_item, _parent )
+{
+    label = new QLabel( qfu(p_item->psz_text) );
+    spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 );
+    spin->setMaximumWidth( 90 );
+    finish();
+
+    if( !l )
+    {
+        QHBoxLayout *layout = new QHBoxLayout();
+        layout->addWidget( label, 0 ); layout->addWidget( spin, 1 );
+        widget->setLayout( layout );
+    }
+    else
+    {
+        l->addWidget( label, line, 0 );
+        l->addWidget( spin, line, 1, Qt::AlignRight );
+    }
+}
+
+FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
+                                        module_config_t *_p_item,
+                                        QLabel *_label,
+                                        QDoubleSpinBox *_spin ) :
+                    VFloatConfigControl( _p_this, _p_item )
+{
+    spin = _spin;
+    label = _label;
+    finish();
+}
+
+void FloatConfigControl::finish()
+{
+    spin->setMaximum( 2000000000. );
+    spin->setMinimum( -2000000000. );
+    spin->setSingleStep( 0.1 );
+    spin->setValue( (double)p_item->f_value );
+    spin->setToolTip( qfu(p_item->psz_longtext) );
+    if( label )
+        label->setToolTip( qfu(p_item->psz_longtext) );
+}
+
+float FloatConfigControl::getValue()
+{
+    return (float)spin->value();
+}
+
+/*********** Float with range **************/
+FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this,
+                                        module_config_t *_p_item,
+                                        QWidget *_parent, QGridLayout *l,
+                                        int line ) :
+                FloatConfigControl( _p_this, _p_item, _parent, l, line )
+{
+    finish();
+}
+
+FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this,
+                                        module_config_t *_p_item,
+                                        QLabel *_label,
+                                        QDoubleSpinBox *_spin ) :
+                FloatConfigControl( _p_this, _p_item, _label, _spin )
+{
+    finish();
+}
+
+void FloatRangeConfigControl::finish()
+{
+    spin->setMaximum( (double)p_item->f_max );
+    spin->setMinimum( (double)p_item->f_min );
+}

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 047da15a5ee4b7a5dcf4c69774a33169a883760b..46cdab5a54872b35fb655ec0ee1ea80a5516858d 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -28,6 +28,7 @@
 #include <QWidget>
 #include <QLineEdit>
 #include <QSpinBox>
+#include <QDoubleSpinBox>
 #include <QComboBox>
 #include <QCheckBox>
 #include "ui/input_stats.h"
@@ -95,12 +96,26 @@ public:
     virtual int getValue();
     virtual void show() { spin->show(); label->show(); }
     virtual void hide() { spin->hide(); label->hide(); }
-private:
+
+protected:
     QSpinBox *spin;
+
+private:
     QLabel *label;
     void finish();
 };
 
+class IntegerRangeConfigControl : public IntegerConfigControl
+{
+public:
+    IntegerRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
+                               QGridLayout *, int );
+    IntegerRangeConfigControl( vlc_object_t *, module_config_t *,
+                               QLabel*, QSpinBox* );
+private:
+    void finish();
+};
+
 class IntegerListConfigControl : public VIntConfigControl
 {
 public:
@@ -148,6 +163,36 @@ public:
     virtual float getValue() = 0;
 };
 
+class FloatConfigControl : public VFloatConfigControl
+{
+public:
+    FloatConfigControl( vlc_object_t *, module_config_t *, QWidget *,
+                        QGridLayout *, int );
+    FloatConfigControl( vlc_object_t *, module_config_t *,
+                        QLabel*, QDoubleSpinBox* );
+    virtual ~FloatConfigControl() {};
+    virtual float getValue();
+    virtual void show() { spin->show(); label->show(); }
+    virtual void hide() { spin->hide(); label->hide(); }
+
+protected:
+    QDoubleSpinBox *spin;
+
+private:
+    QLabel *label;
+    void finish();
+};
+
+class FloatRangeConfigControl : public FloatConfigControl
+{
+public:
+    FloatRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
+                             QGridLayout *, int );
+    FloatRangeConfigControl( vlc_object_t *, module_config_t *,
+                             QLabel*, QDoubleSpinBox* );
+private:
+    void finish();
+};
 #if 0
 class FloatConfigControl : public VFloatConfigControl
 {