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

equal deleted inserted replaced

-:e6ad4ef83b23
+:b7da29130b0e
 return false; // error in format
 }
 newDisplay |= AmPmSection;
 if (i + 1 < format.size()
 && format.at(i+1) == (cap ? QLatin1Char('P') : QLatin1Char('p'))) {
 ++i;
 }
 index = i + 1;
 }
 break;
 case 'y':
 {
 const int repeat = countRepeat(format, i, 4);
 if (repeat >= 2) {
 const SectionNode sn = { repeat == 4 ? YearSection : YearSection2Digits,
 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) {
 }
 if (sectionIndex == mSectionNodes.size() - 1) {
 return mDisplayFormat.size() - sectionPos(sectionIndex) - mSeparators.last().size();
 } else {
 return sectionPos(sectionIndex + 1) - sectionPos(sectionIndex)
 - mSeparators.at(sectionIndex + 1).size();
 }
 }
 int HbDateTimeParser::sectionPos(int sectionIndex) const
 {
 }
 /////////////////////////////////////////////////
 HbDateTimePickerPrivate::HbDateTimePickerPrivate()
 :HbWidgetPrivate()
 ,mDayPicker(0)
 ,mMonthPicker(0)
 ,mYearPicker(0)
 ,mHourPicker(0)
 ,mMinutePicker(0)
 ,mSecondOffset(-1)
 ,mDateTime(QDateTime::currentDateTime())
 ,mDateTimeMode(QVariant::Date) //default is date mode
 ,mLayout(0)
 //,mFormat() //set the format again in init()
+,mFormatEventType(-1)
 //,mDisplaySecions() //is blank by default
 ,mParser()
 ,mYearFormat()
 ,mMonthFormat()
 ,mDayFormat()
 ,mHourFormat()
 ,mMinuteFormat()
 ,mSecondFormat()
 ,mIs24HourFormat(false)
 ,mIsTwoDigitYearFormat(false)
+,mContent(0)
+,mIntervals()
 ,mBackground(0)
 ,mFrame(0)
-,mContent(0)
-,mIntervals()
 ,mHighlight(0)
 {
 mMinimumDate = HBDATETIMEPICKER_DATETIME_MIN;
 mMaximumDate = HBDATETIMEPICKER_DATETIME_MAX;
 mDateTime = mMinimumDate;
 mContent->setLayout(mLayout);
 HbStyle::setItemName(mContent,"content");
 mDateTimeMode = dateTimeMode;
 mIntervals[QDateTimeEdit::MinuteSection]=1;
+mFormatEventType = QEvent::registerEventType(QEvent::User+1);
 //read the format from locale
 QString newFormat = localeDateTimeFormat(dateTimeMode);
+if(isFormatValid(newFormat)){
-//parse the format and set the sections in order
+mFormat = newFormat;
-if(isFormatValid(newFormat)) {
+postFormatEvent();
-mFormat=newFormat;
+}
-processDisplaySections();
-}
 //create primitives
 createPrimitives();
-//recreate and rearrange depending on the format
-rearrangeTumbleViews();
 }
 /*!
 \internal
 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::processDisplaySections()
 {
 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');
 break;
 case HbDateTimeParser::MonthSection:
 mMonthFormat = QString(mParser.mSectionNodes[i].count,'M');
 break;
 case HbDateTimeParser::YearSection:
 mIsTwoDigitYearFormat = false;
 mYearFormat = QString(mParser.mSectionNodes[i].count,'y');
 break;
 case HbDateTimeParser::YearSection2Digits:
 mIsTwoDigitYearFormat = true;
 mYearFormat = QString(mParser.mSectionNodes[i].count,'y');
 break;
 case HbDateTimeParser::SecondSection:
 mSecondFormat = QString(mParser.mSectionNodes[i].count,'s');
 break;
 case HbDateTimeParser::MinuteSection:
 mMinuteFormat = QString(mParser.mSectionNodes[i].count,'m');
 break;
 case HbDateTimeParser::Hour12Section:
 mIs24HourFormat = false;
 mHourFormat = QString(mParser.mSectionNodes[i].count,'h');
 break;
 case HbDateTimeParser::Hour24Section:
 mIs24HourFormat = true;
 mHourFormat = QString(mParser.mSectionNodes[i].count,'h');
 break;
 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))) {
 deleteAndNull(mYearPicker);
 mYearModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::MonthSection)) {
 deleteAndNull(mMonthPicker);
 mMonthModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::DaySection)) {
 deleteAndNull(mDayPicker);
 mDayModel = 0;
 }
 if(!(mParser.mDisplaySections & (HbDateTimeParser::Hour12Section|
 HbDateTimeParser::Hour24Section))) {
 deleteAndNull(mHourPicker);
 mHourModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::MinuteSection)) {
 deleteAndNull(mMinutePicker);
 mMinuteModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::SecondSection)) {
 deleteAndNull(mSecondPicker);
 mSecondModel = 0;
 }
 if(!(mParser.mDisplaySections & HbDateTimeParser::AmPmSection)) {
 deleteAndNull(mAmPmPicker);
 mAmPmModel = 0;
 }
 mYearOffset = -1;
 mMonthOffset = -1;
 mDayOffset = -1;
 mHourOffset = -1;
 mMinuteOffset = -1;
 mSecondOffset = -1;
 while(mLayout->count()) {
 mLayout->removeAt(0);
 }
 QPointer<VIEWER> lastAdded;
 for(int i=0;i<mParser.mSectionNodes.count();i++) {
 switch(mParser.mSectionNodes[i].type) {
 case HbDateTimeParser::AmPmSection:
 if(!mAmPmPicker) {
 mAmPmPicker = new VIEWER(q);
 mAmPmModel = static_cast<QStringListModel*>(mAmPmPicker->model());
 }
 mLayout->addItem(mAmPmPicker);
 lastAdded = mAmPmPicker;
 break;
 case HbDateTimeParser::DaySection:
 case HbDateTimeParser::DayOfWeekSection:
 if(!mDayPicker) {
 mDayPicker = new VIEWER(q);
 mDayModel = static_cast<QStringListModel*>(mDayPicker->model());
 mDayPicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mDayPicker);
 lastAdded = mDayPicker;
 break;
 case HbDateTimeParser::MonthSection:
 if(!mMonthPicker) {
 mMonthPicker = new VIEWER(q);
 mMonthModel = static_cast<QStringListModel*>(mMonthPicker->model());
 mMonthPicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mMonthPicker);
 lastAdded = mMonthPicker;
 break;
 case HbDateTimeParser::YearSection:
 case HbDateTimeParser::YearSection2Digits:
 if(!mYearPicker) {
 mYearPicker = new VIEWER(q);
 mYearModel = static_cast<QStringListModel*>(mYearPicker->model());
 mYearPicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mYearPicker);
 lastAdded = mYearPicker;
 break;
 case HbDateTimeParser::SecondSection:
 if(!mSecondPicker) {
 mSecondPicker = new VIEWER(q);
 mSecondModel = static_cast<QStringListModel*>(mSecondPicker->model());
 mSecondPicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mSecondPicker);
 lastAdded = mSecondPicker;
 break;
 case HbDateTimeParser::MinuteSection:
 if(!mMinutePicker) {
 mMinutePicker = new VIEWER(q);
 mMinuteModel = static_cast<QStringListModel*>(mMinutePicker->model());
 mMinutePicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mMinutePicker);
 lastAdded = mMinutePicker;
 break;
 case HbDateTimeParser::Hour12Section:
 case HbDateTimeParser::Hour24Section:
 if(!mHourPicker) {
 mHourPicker = new VIEWER(q);
 mHourModel = static_cast<QStringListModel*>(mHourPicker->model());
 mHourPicker->setLoopingEnabled(true);
 }
 mLayout->addItem(mHourPicker);
 lastAdded = mHourPicker;
 break;
 default:
 break;
 }
 if(lastAdded){
 lastAdded->primitive("highlight")->hide();
 lastAdded->primitive("separator")->show();
 }
 void HbDateTimePickerPrivate::setDateTimeRange(const QDateTime &startdt,
 const QDateTime &enddt)
 {
 Q_Q(HbDateTimePicker);
 QDateTime start(startdt);
 QDateTime end(enddt);
 if(start.isValid() && end.isValid()) {
 }
 else{
 index = newDateTime.time().minute()-mMinuteOffset;
 }
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "setMinuteRange:selecting= " << index;
 #endif
 mMinutePicker->setSelected(index);
 }
 if(mSecondPicker) {
 #endif
 resizeModel(mYearModel, mYearOffset,
 mYearOffset+mYearModel->rowCount()-1, start,
 end, &HbDateTimePickerPrivate::localeYear);
 mYearOffset = start;
 mYearPicker->setSelected(newIndex);
 }
 }
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mMonthModel,
 mMonthOffset,mMonthOffset+mMonthModel->rowCount()-1,
 start,end,
 &HbDateTimePickerPrivate::localeMonth);
 mMonthOffset = start;
 mMonthPicker->setSelected(newIndex);
 //check if current month is valid
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mDayModel,
 mDayOffset,mDayOffset+mDayModel->rowCount()-1,
 start,end,
 &HbDateTimePickerPrivate::localeDay);
 mDayOffset = start;
 mDayPicker->setSelected(newIndex);
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mHourModel,
 mHourOffset,mHourOffset+mHourModel->rowCount()-1,
 start,end,
 &HbDateTimePickerPrivate::localeHour);
 mHourOffset = start;
 mHourPicker->setSelected(newIndex);
 //check if hour is valid
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mMinuteModel,
 mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(),
 start,end,
 &HbDateTimePickerPrivate::localeMinute,
 mIntervals[QDateTimeEdit::MinuteSection]);
 mMinuteOffset = start;
 //Select the nearest value when the range is set.
 int index = 0;
 for(int i=start;i<newIndex;i+=mIntervals[QDateTimeEdit::MinuteSection]) {
 index++;
 }
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "initMinute:selecting= " << index;
 #endif
 mMinutePicker->setSelected(index);
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
 resizeModel(mSecondModel,
 mSecondOffset,mSecondOffset+mSecondModel->rowCount()-1,
 start,end,
 &HbDateTimePickerPrivate::localeSecond);
 mSecondOffset = start;
 mSecondPicker->setSelected(newIndex);
 //check if second is valid
 data need the appropriate locale and format converted data. which is passed
 as a function pointer instead of creating seven different QStringListModel derived
 model classes with one interface/virtual function specialization.
 */
 void HbDateTimePickerPrivate::resizeModel(QStringListModel *model,
 int oldStart, int oldEnd,
 int newStart, int newEnd,
 QString (HbDateTimePickerPrivate::*localeFunc)(int), int interval)
 {
 class ConnectionRemover {
 public:
 ConnectionRemover(HbDateTimePickerPrivate *priv){
 this->priv = priv;
 }
 HbDateTimePickerPrivate *priv;
 }Obj(this);
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "resizeModel: oldStart=" << oldStart
 << " oldEnd=" << oldEnd << " newStart="
 << newStart << " newEnd=" << newEnd
 << " interval=" << interval;
 #endif
 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)) {
-if(newEnd>oldEnd) {
-int rowCount=model->rowCount();
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:sameinserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
-#endif
-model->insertRows(rowCount,(newEnd-oldEnd)/interval);
-for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
-QModelIndex index=model->index(i+rowCount,0);
-if(index.isValid()) {
-model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:samesetData(" << ((i+1)*interval)+oldEnd << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
-#endif
-}
-}
-}
-if(oldEnd>newEnd) {
-//if the start offset is preset more items can fit at end
-int stay=((newEnd-newStart)/interval)+1;
-int count=model->rowCount()-stay;
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
-<< " data=" << model->index((model->rowCount()-count),0).data().toString();
-#endif
-model->removeRows((model->rowCount()-count),count);
-}
-return;//optimizing inserts when interval is set
-} else {
-if(b1 && b2) {
-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 << ")";
-#endif
-model->insertRows(0,((newEnd-newStart)/interval)+1);
-for(int i=0;i<=((newEnd-newStart)/interval);++i) {
-QString text=(this->*localeFunc)((i*interval)+newStart);
-#ifdef HB_TEXT_MEASUREMENT_UTILITY
-if ( localeFunc == &HbDateTimePickerPrivate::localeMonth &&
-HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
-text.append(QChar(LOC_TEST_START));
-text.append("qtl_datetimepicker_popup_month_sec");
-text.append(QChar(LOC_TEST_END));
-}
-#endif
-QModelIndex index=model->index(i,0);
-if(index.isValid()) {
-model->setData(index,text);
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:setData(" << i << "," << text << ")";
-#endif
-}
-}
-return;
-}
-if(newStart<oldStart) {
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:inserting(0," << (oldStart-newStart)/interval << ")";
-#endif
-model->insertRows(0,(oldStart-newStart)/interval);
-for(int i=0;i<((oldStart-newStart)/interval);++i) {
-QModelIndex index=model->index(i,0);
-if(index.isValid()) {
-model->setData(index,(this->*localeFunc)((i*interval)+newStart));
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i*interval)+newStart) << ")";
-#endif
-}
-}
-}
 if(newEnd>oldEnd) {
 int rowCount=model->rowCount();
 #ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:inserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
+qDebug() << "resizeModel:sameinserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
 #endif
 model->insertRows(rowCount,(newEnd-oldEnd)/interval);
 for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
 QModelIndex index=model->index(i+rowCount,0);
 if(index.isValid()) {
 model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
 #ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
+qDebug() << "resizeModel:samesetData(" << ((i+1)*interval)+oldEnd << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
 #endif
 }
 }
 }
-if(newStart>oldStart) {
-#ifdef HBDATETIMEPICKER_DEBUG
-qDebug() << "resizeModel:removing(0," << (newStart-oldStart)/interval << ")"
-<< " data=" << model->index((newStart-oldStart)/interval,0).data().toString();
-#endif
-model->removeRows(0,(newStart-oldStart)/interval);
-}
 if(oldEnd>newEnd) {
-//#ifdef HBDATETIMEPICKER_DEBUG
+//if the start offset is preset more items can fit at end
-//            qDebug() << "resizeModel:removing(" <<model->rowCount()-((oldEnd-newEnd)/interval)<<"," << (oldEnd-newEnd)/interval << ")";
+int stay=((newEnd-newStart)/interval)+1;
-//#endif
+int count=model->rowCount()-stay;
-//            model->removeRows((model->rowCount()-((oldEnd-newEnd)/interval)),(oldEnd-newEnd)/interval);
+#ifdef HBDATETIMEPICKER_DEBUG
-//if the start offset is preset more items can fit at end
+qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
-int stay=((newEnd-newStart)/interval)+1;
+<< " data=" << model->index((model->rowCount()-count),0).data().toString();
-int count=model->rowCount()-stay;
+#endif
-#ifdef HBDATETIMEPICKER_DEBUG
+model->removeRows((model->rowCount()-count),count);
-qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
+}
-<< " data=" << model->index((model->rowCount()-count),0).data().toString();
+return;//optimizing inserts when interval is set
-#endif
+} else {
-model->removeRows((model->rowCount()-count),count);
+if(b1 && b2) {
-}
+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 << ")";
+#endif
+model->insertRows(0,((newEnd-newStart)/interval)+1);
+for(int i=0;i<=((newEnd-newStart)/interval);++i) {
+QString text=(this->*localeFunc)((i*interval)+newStart);
+#ifdef HB_TEXT_MEASUREMENT_UTILITY
+if ( localeFunc == &HbDateTimePickerPrivate::localeMonth &&
+HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
+text.append(QChar(LOC_TEST_START));
+text.append("qtl_datetimepicker_popup_month_sec");
+text.append(QChar(LOC_TEST_END));
+}
+#endif
+QModelIndex index=model->index(i,0);
+if(index.isValid()) {
+model->setData(index,text);
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:setData(" << i << "," << text << ")";
+#endif
+}
+}
+return;
+}
+if(newStart<oldStart) {
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:inserting(0," << (oldStart-newStart)/interval << ")";
+#endif
+model->insertRows(0,(oldStart-newStart)/interval);
+for(int i=0;i<((oldStart-newStart)/interval);++i) {
+QModelIndex index=model->index(i,0);
+if(index.isValid()) {
+model->setData(index,(this->*localeFunc)((i*interval)+newStart));
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i*interval)+newStart) << ")";
+#endif
+}
+}
+}
+if(newEnd>oldEnd) {
+int rowCount=model->rowCount();
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:inserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
+#endif
+model->insertRows(rowCount,(newEnd-oldEnd)/interval);
+for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
+QModelIndex index=model->index(i+rowCount,0);
+if(index.isValid()) {
+model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
+#endif
+}
+}
+}
+if(newStart>oldStart) {
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:removing(0," << (newStart-oldStart)/interval << ")"
+<< " data=" << model->index((newStart-oldStart)/interval,0).data().toString();
+#endif
+model->removeRows(0,(newStart-oldStart)/interval);
+}
+if(oldEnd>newEnd) {
+//#ifdef HBDATETIMEPICKER_DEBUG
+//            qDebug() << "resizeModel:removing(" <<model->rowCount()-((oldEnd-newEnd)/interval)<<"," << (oldEnd-newEnd)/interval << ")";
+//#endif
+//            model->removeRows((model->rowCount()-((oldEnd-newEnd)/interval)),(oldEnd-newEnd)/interval);
+//if the start offset is preset more items can fit at end
+int stay=((newEnd-newStart)/interval)+1;
+int count=model->rowCount()-stay;
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
+<< " data=" << model->index((model->rowCount()-count),0).data().toString();
+#endif
+model->removeRows((model->rowCount()-count),count);
+}
 }
 void HbDateTimePickerPrivate::createPrimitives()
 {
 Q_Q(HbDateTimePicker);
-if(!mBackground) {
+if (!mBackground) {
-mBackground = HbStylePrivate::createPrimitive(HbStylePrivate::P_DateTimePicker_background,q);
+mBackground = q->style()->createPrimitive(HbStyle::PT_FrameItem,"background",q);
-HbStyle::setItemName(mBackground,"background");
 }
 if(!mFrame) {
-mFrame = HbStylePrivate::createPrimitive(HbStylePrivate::P_DateTimePicker_frame,q);
+mFrame = q->style()->createPrimitive(HbStyle::PT_FrameItem,"frame",q);
-HbStyle::setItemName(mFrame,"frame");
+}
-}
+if(!mHighlight) {
-if(!mHighlight){
+mHighlight = q->style()->createPrimitive(HbStyle::PT_FrameItem,"highlight",q);
-mHighlight = HbStylePrivate::createPrimitive(HbStylePrivate::P_TumbleView_highlight,q);
-HbStyle::setItemName(mHighlight,"highlight");
 }
 }
 void HbDateTimePickerPrivate::_q_dayChanged(int index)
 {
 end = mDateTime.date().daysInMonth();
 }
 //set if dayrange changed
 if((start != mDayOffset)
 ||(end !=mDayOffset+mDayModel->rowCount()-1)) {
 setDayRange(start,end);
 }
 }
 emitDateChange();
 end = 12;
 }
 //set if range changed
 if((start != mMonthOffset)
 || (end != mMonthModel->rowCount()-1)) {
 setMonthRange(start,end);
 }
 }
 end = mDateTime.date().daysInMonth();
 }
 //set if dayrange changed
 if((start != mDayOffset)
 ||(end !=mDayOffset+mDayModel->rowCount()-1)) {
 setDayRange(start,end);
 }
 }
 emitDateChange();
 end = 59;
 }
 //set if range changed
 if((start != mMinuteOffset)
 || (end != start+mMinuteModel->rowCount()-1)) {
 setMinuteRange(start,end);
 }
 }
 end = 59;
 }
 //set if seconds range changed
 if((start != mSecondOffset)
 ||(end !=mSecondOffset+mSecondModel->rowCount()-1)) {
 setSecondRange(start,end);
 }
 }
 //check if am or pm and scroll to respective time
 end = 59;
 }
 //set if seconds range changed
 if((start != mSecondOffset)
 ||(end !=mSecondOffset+mSecondModel->rowCount()-1)) {
 setSecondRange(start,end);
 }
 }
 emitTimeChange();
 mAmPmPicker->setSelected(0);//invalid so scrollback
 }
 }
 }
 }
+void HbDateTimePickerPrivate::processFormatEvent()
+{
+QDateTime tempDate=mDateTime;
+processDisplaySections();
+//recreate and rearrange depending on the format
+rearrangeTumbleViews();
+setDateTime(tempDate);
+emitDateTimeChange();
+}
+void HbDateTimePickerPrivate::postFormatEvent()
+{
+Q_Q(HbDateTimePicker);
+QCoreApplication::removePostedEvents(q,QEvent::Type(mFormatEventType));
+QCoreApplication::postEvent(q,new QEvent(QEvent::Type(mFormatEventType)));
+}

changeset 28	b7da29130b0e
parent 23	e6ad4ef83b23