[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE
From:       Roberto Raggi <roberto () kdevelop ! org>
Date:       2007-02-20 16:29:21
Message-ID: 1171988961.681713.23195.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 635678 by raggi:

compile (actuall, I should say please compile because I can't try it)


 M  +14 -14    kdebase/workspace/kcontrol/access/kcmaccess.cpp  
 M  +9 -0      kdelibs/kdeui/widgets/knuminput.cpp  
 M  +18 -1     kdelibs/kdeui/widgets/knuminput.h  


--- trunk/KDE/kdebase/workspace/kcontrol/access/kcmaccess.cpp #635677:635678
@@ -63,28 +63,28 @@
 	KIntNumInput::setRange (min,max,step, slider);
 
 	if (slider) {
-		disconnect(m_slider, SIGNAL(valueChanged(int)),
-					  m_spin, SLOT(setValue(int)));
-		disconnect(m_spin, SIGNAL(valueChanged(int)),
+		disconnect(slider(), SIGNAL(valueChanged(int)),
+					  spinBox(), SLOT(setValue(int)));
+		disconnect(spinBox(), SIGNAL(valueChanged(int)),
 					  this, SLOT(spinValueChanged(int)));
 
 		this->min = min;
 		this->max = max;
 		sliderMax = (int)floor (0.5
 				+ 2*(log(max)-log(min)) / (log(max)-log(max-1)));
-		m_slider->setRange(0, sliderMax);
-		m_slider->setSingleStep(step);
-		m_slider->setPageStep(sliderMax/10);
-		m_slider->setTickInterval(sliderMax/10);
+		slider()->setRange(0, sliderMax);
+		slider()->setSingleStep(step);
+		slider()->setPageStep(sliderMax/10);
+		slider()->setTickInterval(sliderMax/10);
 
 		double alpha  = sliderMax / (log(max) - log(min));
 		double logVal = alpha * (log(value())-log(min));
-		m_slider->setValue ((int)floor (0.5 + logVal));
+		slider()->setValue ((int)floor (0.5 + logVal));
 
-		connect(m_slider, SIGNAL(valueChanged(int)),
+		connect(slider(), SIGNAL(valueChanged(int)),
 				  this, SLOT(slotSliderValueChanged(int)));
-		connect(m_spin, SIGNAL(valueChanged(int)),
-				  this, SLOT(slotSpinValueChanged(int)));
+		connect(spinBox(), SIGNAL(valueChanged(int)),
+				   this, SLOT(slotSpinValueChanged(int)));
 	}
 }
 
@@ -94,10 +94,10 @@
 void ExtendedIntNumInput::slotSpinValueChanged(int val)
 {
 
-	if(m_slider) {
+	if(slider()) {
 		double alpha  = sliderMax / (log(max) - log(min));
 		double logVal = alpha * (log(val)-log(min));
-		m_slider->setValue ((int)floor (0.5 + logVal));
+		slider()->setValue ((int)floor (0.5 + logVal));
 	}
 
 	emit valueChanged(val);
@@ -107,7 +107,7 @@
 {
 	double alpha  = sliderMax / (log(max) - log(min));
 	double linearVal = exp (val/alpha + log(min));
-	m_spin->setValue ((int)floor(0.5 + linearVal));
+	spinBox()->setValue ((int)floor(0.5 + linearVal));
 }
 
 static bool needToRunKAccessDaemon( KConfig *config )
--- trunk/KDE/kdelibs/kdeui/widgets/knuminput.cpp #635677:635678
@@ -113,6 +113,11 @@
     delete d;
 }
 
+QSlider *KNumInput::slider() const
+{
+  return d->m_slider;
+}
+
 bool KNumInput::showSlider() const
 {
     return d->m_slider;
@@ -319,7 +324,11 @@
     : KNumInput(parent)
 {
     init(val, _base);
+}
 
+QSpinBox *KIntNumInput::spinBox() const
+{
+    return d->m_spin;
 }
 
 void KIntNumInput::init(int val, int _base)
--- trunk/KDE/kdelibs/kdeui/widgets/knuminput.h #635677:635678
@@ -29,6 +29,7 @@
 
 class QLabel;
 class QSlider;
+class QSpinBox;
 class QValidator;
 
 class KIntSpinBox;
@@ -57,6 +58,10 @@
      * @param parent parent widget
      */
     KNumInput(QWidget *parent, KNumInput* below);
+    
+    /**
+     * Destructor
+     */
     ~KNumInput();
 
     /**
@@ -111,6 +116,12 @@
 
 protected:
     /**
+     * @return the slider widget.
+     * @internal
+     */
+    QSlider *slider() const;
+      
+    /**
      * Call this function whenever you change something in the geometry
      * of your KNumInput child.
      *
@@ -290,7 +301,7 @@
      * @return the minimum size necessary to show the control
      */
     virtual QSize minimumSizeHint() const;
-
+    
 public Q_SLOTS:
     /**
      * Sets the value of the control.
@@ -351,6 +362,12 @@
     void slotEmitRelativeValueChanged(int);
 
 protected:
+    /**
+     * @return the spin box widget.
+     * @internal
+     */
+    QSpinBox *spinBox() const;
+      
     virtual void doLayout();
     void resizeEvent ( QResizeEvent * );
 
[prev in list] [next in list] [prev in thread] [next in thread]