[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdepim/kalarm
From: David Jarvie <software () astrojar ! org ! uk>
Date: 2008-03-10 23:27:41
Message-ID: 1205191661.666732.16846.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 784342 by djarvie:
Prevent invalid negative values appearing in 'Time from now' edit field
M +3 -0 Changelog
M +1 -1 kalarm.h
M +2 -2 lib/spinbox2.h
M +5 -5 lib/timespinbox.cpp
M +1 -1 lib/timespinbox.h
--- branches/KDE/3.5/kdepim/kalarm/Changelog #784341:784342
@@ -1,5 +1,8 @@
KAlarm Change Log
+=== Version 1.5.3 --- 10 March 2008 ===
+- Prevent invalid negative values appearing in 'Time from now' edit field.
+
=== Version 1.5.2 --- 13 February 2008 ===
- Prevent repetition duration error message when saving alarm which never recurs.
--- branches/KDE/3.5/kdepim/kalarm/kalarm.h #784341:784342
@@ -26,7 +26,7 @@
#include <config.h>
#endif
-#define KALARM_VERSION "1.5.2"
+#define KALARM_VERSION "1.5.3"
#define KALARM_NAME "KAlarm"
#include <kdeversion.h>
--- branches/KDE/3.5/kdepim/kalarm/lib/spinbox2.h #784341:784342
@@ -138,9 +138,9 @@
/** Returns the maximum value of the spin box. */
int maxValue() const { return mMaxValue; }
/** Sets the minimum value of the spin box. */
- void setMinValue(int val);
+ virtual void setMinValue(int val);
/** Sets the maximum value of the spin box. */
- void setMaxValue(int val);
+ virtual void setMaxValue(int val);
/** Sets the minimum and maximum values of the spin box. */
void setRange(int minValue, int maxValue) { \
setMinValue(minValue); setMaxValue(maxValue); } /** Returns the current value of \
the spin box. */
--- branches/KDE/3.5/kdepim/kalarm/lib/timespinbox.cpp #784341:784342
@@ -205,12 +205,12 @@
if (value() < mMinimumValue)
SpinBox2::setValue(mMinimumValue);
setSpecialValueText(QString());
- setMinValue(mMinimumValue);
+ SpinBox2::setMinValue(mMinimumValue);
}
else if (!valid && !mInvalid)
{
mInvalid = true;
- setMinValue(mMinimumValue - 1);
+ SpinBox2::setMinValue(mMinimumValue - 1);
setSpecialValueText(QString::fromLatin1("**:**"));
SpinBox2::setValue(mMinimumValue - 1);
}
@@ -221,8 +221,8 @@
*/
void TimeSpinBox::setMinValue(int minutes)
{
- mMinimumValue = minutes;
- SpinBox2::setMinValue(mMinimumValue - (mInvalid ? 1 : 0));
+ mMinimumValue = minutes;
+ SpinBox2::setMinValue(mMinimumValue - (mInvalid ? 1 : 0));
}
/******************************************************************************
@@ -242,7 +242,7 @@
{
mInvalid = false;
setSpecialValueText(QString());
- setMinValue(mMinimumValue);
+ SpinBox2::setMinValue(mMinimumValue);
}
SpinBox2::setValue(minutes);
mEnteredSetValue = false;
--- branches/KDE/3.5/kdepim/kalarm/lib/timespinbox.h #784341:784342
@@ -117,7 +117,7 @@
private:
class TimeValidator;
TimeValidator* mValidator;
- 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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic