FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hbdatetimepicker

equal deleted inserted replaced

-:4633027730f5
+:e6ad4ef83b23
 const SectionNode sn = { hour, i - add, countRepeat(format, i, 2) };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & hour) {
+return false; // error in format
+}
 newDisplay |= hour;
 }
 break;
 case 'm':
 {
 const SectionNode sn = { MinuteSection, i - add, countRepeat(format, i, 2) };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & MinuteSection) {
+return false; // error in format
+}
 newDisplay |= MinuteSection;
 }
 break;
 case 's':
 {
 const SectionNode sn = { SecondSection, i - add, countRepeat(format, i, 2) };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & SecondSection) {
+return false; // error in format
+}
 newDisplay |= SecondSection;
 }
 break;
 case 'z':
 const SectionNode sn = { MSecSection, i - add, countRepeat(format, i, 3) < 3 ? 1 : 3 };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & MSecSection) {
+return false; // error in format
+}
 newDisplay |= MSecSection;
 }
 break;
 case 'A':
 case 'a':
 {
 const bool cap = (sect == 'A');
 const SectionNode sn = { AmPmSection, i - add, (cap ? 1 : 0) };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
+if(newDisplay & AmPmSection) {
+return false; // error in format
+}
 newDisplay |= AmPmSection;
 if (i + 1 < format.size()
 && format.at(i+1) == (cap ? QLatin1Char('P') : QLatin1Char('p'))) {
 ++i;
 }
 i - add, repeat == 4 ? 4 : 2 };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & sn.type) {
+return false; //error in format
+}
 newDisplay |= sn.type;
 }
 }
 break;
 case 'M':
 const SectionNode sn = { MonthSection, i - add, countRepeat(format, i, 4) };
 newSectionNodes.append(sn);
 newSeparators.append(unquote(format.mid(index, i - index)));
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & MonthSection) {
+return false; // error in format
+}
 newDisplay |= MonthSection;
 }
 break;
 case 'd':
 {
 const SectionNode sn = { repeat >= 3 ? DayOfWeekSection : DaySection, i - add, repeat };
 newSectionNodes.append(sn);
 appendSeparator(&newSeparators, format, index, i - index, lastQuote);
 i += sn.count - 1;
 index = i + 1;
+if(newDisplay & (DayOfWeekSection | DaySection)) {
+return false; // error in format, dd and ddd not yet supported in same format
+}
 newDisplay |= sn.type;
 }
 break;
 default:
 mDateTimeMode = dateTimeMode;
 mIntervals[QDateTimeEdit::MinuteSection]=1;
 //read the format from locale
-mFormat = localeDateTimeFormat(dateTimeMode);
+QString newFormat = localeDateTimeFormat(dateTimeMode);
 //parse the format and set the sections in order
-parseDisplayFormat(mFormat);
+if(isFormatValid(newFormat)) {
+mFormat=newFormat;
+processDisplaySections();
+}
 //create primitives
 createPrimitives();
 //recreate and rearrange depending on the format
 bool HbDateTimePickerPrivate::isFormatValid(const QString &newDisplayFormat)
 {
 if(newDisplayFormat == mFormat) {
 return false;
 }
-return true;
+return mParser.parseFormat(newDisplayFormat);
 }
 /*
 this will reset the display sections and re add them in order
 mentioned in the display format passed. this also sets the mIs24HourFormat var.
 */
-void HbDateTimePickerPrivate::parseDisplayFormat(const QString &format)
+void HbDateTimePickerPrivate::processDisplaySections()
 {
-if(mParser.parseFormat(format)) {
 for(int i=0;i<mParser.mSectionNodes.count();++i) {
 switch(mParser.mSectionNodes[i].type) {
 case HbDateTimeParser::DaySection:
 case HbDateTimeParser::DayOfWeekSection:
 mDayFormat = QString(mParser.mSectionNodes[i].count,'d');
 default:
 break;
 /*case HbDateTimeParser::DayOfWeekSection: not supported */
 }
 }
-}
 }
 /*
 this is called whenever the setDisplayFormat changes.
 function deletes all tumbleviews which currently exist and
 void HbDateTimePickerPrivate::rearrangeTumbleViews()
 {
 Q_Q(HbDateTimePicker);
 if(!(mParser.mDisplaySections & (HbDateTimeParser::YearSection|
-				     HbDateTimeParser::YearSection2Digits))) {
+HbDateTimeParser::YearSection2Digits))) {
 deleteAndNull(mYearPicker);
 mYearModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::MonthSection)) {
 deleteAndNull(mMonthPicker);
 if(!(mParser.mDisplaySections & HbDateTimeParser::DaySection)) {
 deleteAndNull(mDayPicker);
 mDayModel = 0;
 }
 if(!(mParser.mDisplaySections & (HbDateTimeParser::Hour12Section|
-				     HbDateTimeParser::Hour24Section))) {
+HbDateTimeParser::Hour24Section))) {
 deleteAndNull(mHourPicker);
 mHourModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::MinuteSection)) {
 deleteAndNull(mMinutePicker);
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mMinuteModel,
-		mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(),
+mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(),
-		start,end,
+start,end,
-		&HbDateTimePickerPrivate::localeMinute,
+&HbDateTimePickerPrivate::localeMinute,
-		mIntervals[QDateTimeEdit::MinuteSection]);
+mIntervals[QDateTimeEdit::MinuteSection]);
 mMinuteOffset = start;
 //Select the nearest value when the range is set.
 int index = 0;
 qDebug() << "resizeModel: oldStart=" << oldStart
 << " oldEnd=" << oldEnd << " newStart="
 << newStart << " newEnd=" << newEnd
 << " interval=" << interval;
 #endif
-	    bool b1=false,b2=false;
+bool b1=false,b2=false;
 int oldinterval=model->rowCount()>1 ? (model->index(1,0).data().toInt(&b1)-model->index(0,0).data().toInt(&b2)):0;
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "resizeModel:sameoldInterval=" << oldinterval;
 #endif
 if(b1 && b2 && (oldinterval == interval) && (newStart == oldStart)) {
 #endif
 model->removeRows((model->rowCount()-count),count);
 }
 return;//optimizing inserts when interval is set
 } else {
-	        if(b1 && b2) {
+if(b1 && b2) {
-		    model->removeRows(0,model->rowCount());
+model->removeRows(0,model->rowCount());
 oldStart = oldEnd = 0;
-	        }
+}
 }
 if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "resizeModel:default addition inserting(0," << (newEnd-newStart+1)/interval << ")";
 bool *bOk = false;
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "_q_minutesChanged:" << index;
 qDebug() << mLocale.toInt(mMinuteModel->index(mMinuteOffset+index,0).data().toString(),bOk, 10);
 #endif
-	QTime newTime(mDateTime.time().hour(),mLocale.toInt(mMinuteModel->index(index,0).data().toString(),bOk, 10),mDateTime.time().second());
+QTime newTime(mDateTime.time().hour(),mLocale.toInt(mMinuteModel->index(index,0).data().toString(),bOk, 10),mDateTime.time().second());
 if(newTime.isValid()) {
 mDateTime.setTime(newTime);
 }
 else {
 #ifdef HBDATETIMEPICKER_DEBUG

changeset 23	e6ad4ef83b23
parent 21	4633027730f5
child 28	b7da29130b0e