Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* patch by Clemens Zeidler

Browse Source 
keep the current century and and don't jump to the first
  of the month etc. in case of invalid input, thanks Clemens



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28740 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich 2008-11-27 21:17:22 +00:00
parent d8de43897a
commit c995fd0823
2 changed files with 85 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/preferences/time/DateTimeEdit.cpp
View File

@ -18,6 +18,9 @@
#include <Window.h>
#include <stdlib.h>
using BPrivate::B_LOCAL_TIME;
@ -40,20 +43,20 @@ TTimeEdit::KeyDown(const char* bytes, int32 numBytes)
{
TSectionEdit::KeyDown(bytes, numBytes);
BMessage* keyDownMsg = Window()->CurrentMessage();
int32 number;
keyDownMsg->FindInt32("raw_char", &number);
// only accept int
if (number < 48 || number > 57)
// only accept valid input
int32 number = atoi(bytes);
if (number - 1 < 0)
return;
number -= 48;
int32 section = FocusIndex();
if (section < 0 || section > 2)
return;
bigtime_t currentTime = system_time();
if (currentTime - fLastKeyDownTime < 1000000) {
number += fLastKeyDownInt * 10;
int32 doubleDigi = number + fLastKeyDownInt * 10;
if (_IsValidDoubleDigi(doubleDigi))
number = doubleDigi;
fLastKeyDownTime = 0;
}
else {
@ -339,6 +342,37 @@ TTimeEdit::_CheckRange()
}
bool
TTimeEdit::_IsValidDoubleDigi(int32 value)
{
bool isInRange = false;
switch (fFocus) {
case 0:
{ // hour
if (value <= 23)
isInRange = true;
} break;
case 1:
{ // minute
if (value <= 59)
isInRange = true;
} break;
case 2:
{ // second
if (value <= 59)
isInRange = true;
} break;
default:
return isInRange;
}
return isInRange;
}
int32
TTimeEdit::_SectionValue(int32 index) const
{
@ -386,20 +420,20 @@ TDateEdit::KeyDown(const char* bytes, int32 numBytes)
{
TSectionEdit::KeyDown(bytes, numBytes);
BMessage* keyDownMsg = Window()->CurrentMessage();
int32 number;
keyDownMsg->FindInt32("raw_char", &number);
// only accept int
if (number < 48 || number > 57)
// only accept valid input
int32 number = atoi(bytes);
if (number - 1 < 0)
return;
number -= 48;
int32 section = FocusIndex();
if (section < 1 || section > 2)
return;
bigtime_t currentTime = system_time();
if (currentTime - fLastKeyDownTime < 1000000) {
number += fLastKeyDownInt * 10;
int32 doubleDigi = number + fLastKeyDownInt * 10;
if (_IsValidDoubleDigi(doubleDigi))
number = doubleDigi;
fLastKeyDownTime = 0;
}
else {
@ -408,8 +442,12 @@ TDateEdit::KeyDown(const char* bytes, int32 numBytes)
}
// if year add 2000
if (section == 2)
number += 2000;
if (section == 2) {
int32 oldCentury = int32(fHoldValue / 100) * 100;
if (number < 10 && oldCentury == 1900)
number += 70;
number += oldCentury;
}
// update display value
fHoldValue = number;
@ -649,6 +687,35 @@ TDateEdit::_CheckRange()
}
bool
TDateEdit::_IsValidDoubleDigi(int32 value)
{
bool isInRange = false;
int32 year = 0;
switch (fFocus) {
case 1:
{ // day
//day
int32 days = fDate.DaysInMonth();
if (value <= days)
isInRange = true;
} break;
case 2:
{ //year
year = int32(fHoldValue / 100) * 100 + value;
if (year <= 2037 && year >= 1970)
isInRange = true;
} break;
default:
return isInRange;
}
return isInRange;
}
int32
TDateEdit::_SectionValue(int32 index) const
{

2
src/preferences/time/DateTimeEdit.h
View File

@ -45,6 +45,7 @@ class TTimeEdit : public TSectionEdit {
private:
void _CheckRange();
bool _IsValidDoubleDigi(int32 value);
int32 _SectionValue(int32 index) const;
private:
@ -77,6 +78,7 @@ class TDateEdit : public TSectionEdit {
private:
void _CheckRange();
bool _IsValidDoubleDigi(int32 value);
int32 _SectionValue(int32 index) const;
private: