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

List:       kde-commits
Subject:    KDE/kdepim/kalarm/lib
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2008-03-10 23:24:49
Message-ID: 1205191489.604384.16640.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784341 by djarvie:

Prevent invalid negative values appearing in 'Time from now' edit field


 M  +2 -2      spinbox2.h  
 M  +5 -5      timespinbox.cpp  
 M  +1 -1      timespinbox.h  


--- trunk/KDE/kdepim/kalarm/lib/spinbox2.h #784340:784341
@@ -133,9 +133,9 @@
 		/** Returns the maximum value of the spin box. */
 		int              maximum() const             { return mMaxValue; }
 		/** Sets the minimum value of the spin box. */
-		void             setMinimum(int val);
+		virtual void     setMinimum(int val);
 		/** Sets the maximum value of the spin box. */
-		void             setMaximum(int val);
+		virtual void     setMaximum(int val);
 		/** Sets the minimum and maximum values of the spin box. */
 		void             setRange(int minValue, int maxValue)   { setMinimum(minValue);  \
setMaximum(maxValue); }  /** Returns the current value of the spin box. */
--- trunk/KDE/kdepim/kalarm/lib/timespinbox.cpp #784340:784341
@@ -177,12 +177,12 @@
 		if (value() < mMinimumValue)
 			SpinBox2::setValue(mMinimumValue);
 		setSpecialValueText(QString());
-		setMinimum(mMinimumValue);
+		SpinBox2::setMinimum(mMinimumValue);
 	}
 	else if (!valid  &&  !mInvalid)
 	{
 		mInvalid = true;
-		setMinimum(mMinimumValue - 1);
+		SpinBox2::setMinimum(mMinimumValue - 1);
 		setSpecialValueText(QLatin1String("**:**"));
 		SpinBox2::setValue(mMinimumValue - 1);
 	}
@@ -193,8 +193,8 @@
 */
 void TimeSpinBox::setMinimum(int minutes)
 {
-        mMinimumValue = minutes;
-        SpinBox2::setMinimum(mMinimumValue - (mInvalid ? 1 : 0));
+	mMinimumValue = minutes;
+	SpinBox2::setMinimum(mMinimumValue - (mInvalid ? 1 : 0));
 }
 
 /******************************************************************************
@@ -214,7 +214,7 @@
 			{
 				mInvalid = false;
 				setSpecialValueText(QString());
-				setMinimum(mMinimumValue);
+				SpinBox2::setMinimum(mMinimumValue);
 			}
 			SpinBox2::setValue(minutes);
 			mEnteredSetValue = false;
--- trunk/KDE/kdepim/kalarm/lib/timespinbox.h #784340:784341
@@ -111,7 +111,7 @@
 	private slots:
 		void            slotValueChanged(int value);
 	private:
-		int             mMinimumValue;
+		int             mMinimumValue;       // real minimum value, excluding special \
value for "**:**"  bool            m12Hour;             // use 12-hour clock
 		bool            mPm;                 // use PM for manually entered values (with \
12-hour clock)  bool            mInvalid;            // value is currently invalid \
(asterisks)


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