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

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 #include <QStringListModel>
 #include <QGraphicsLinearLayout>
 #include <QModelIndex>
 #include <QDate>
 #include <QLocale>
+#include <QPointer>
+//#define HBDATETIMEPICKER_DEBUG
+#ifdef HBDATETIMEPICKER_DEBUG
 #include <QDebug>
-#include <QStringListModel>
+#endif
-#include <QPointer>
-#define HBDATETIMEPICKER_DEBUG
 //////////HbDateTimeParser - Implementaion may change in future.//////////////
 static inline int countRepeat(const QString &str, int index, int maxCount)
 {
 mLayout->setContentsMargins(0,0,0,0);
 mContent->setLayout(mLayout);
 q->style()->setItemName(mContent,"content");
 mDateTimeMode = dateTimeMode;
+mIntervals[QDateTimeEdit::MinuteSection]=1;
 //read the format from locale
 mFormat = localeDateTimeFormat(dateTimeMode);
 //parse the format and set the sections in order
 */
 void HbDateTimePickerPrivate::rearrangeTumbleViews()
 {
 Q_Q(HbDateTimePicker);
-deleteAndNull(mYearPicker);
+if(!(mParser.mDisplaySections & (HbDateTimeParser::YearSection|
-deleteAndNull(mMonthPicker);
+				     HbDateTimeParser::YearSection2Digits))) {
-deleteAndNull(mDayPicker);
+deleteAndNull(mYearPicker);
-deleteAndNull(mHourPicker);
+mYearModel = 0;
-deleteAndNull(mMinutePicker);
+}
-deleteAndNull(mSecondPicker);
+if(!(mParser.mDisplaySections & HbDateTimeParser::MonthSection)) {
-deleteAndNull(mAmPmPicker);
+deleteAndNull(mMonthPicker);
+mMonthModel = 0;
-deleteAndNull(mYearModel);
+}
-deleteAndNull(mDayModel);
+if(!(mParser.mDisplaySections & HbDateTimeParser::DaySection)) {
-deleteAndNull(mMonthModel);
+deleteAndNull(mDayPicker);
-deleteAndNull(mHourModel);
+mDayModel = 0;
-deleteAndNull(mMinuteModel);
+}
-deleteAndNull(mSecondModel);
+if(!(mParser.mDisplaySections & (HbDateTimeParser::Hour12Section|
-deleteAndNull(mAmPmModel);
+				     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;
-QPointer<HbTumbleView> lastAdded;
+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:
-mAmPmPicker = new HbTumbleView(q);
+if(!mAmPmPicker) {
-mAmPmModel = new QStringListModel(q);
+mAmPmPicker = new VIEWER(q);
-mAmPmPicker->setModel(mAmPmModel);
+mAmPmModel = static_cast<QStringListModel*>(mAmPmPicker->model());
-mAmPmPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mAmPmPicker);
-mAmPmPicker->primitive("highlight")->hide();
-mAmPmPicker->primitive("separator")->show();
 lastAdded = mAmPmPicker;
 break;
 case HbDateTimeParser::DaySection:
 case HbDateTimeParser::DayOfWeekSection:
-mDayPicker = new HbTumbleView(q);
+if(!mDayPicker) {
-mDayModel = new QStringListModel(q);
+mDayPicker = new VIEWER(q);
-mDayPicker->setModel(mDayModel);
+mDayModel = static_cast<QStringListModel*>(mDayPicker->model());
 mDayPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mDayPicker);
-mDayPicker->primitive("separator")->show();
 lastAdded = mDayPicker;
 break;
 case HbDateTimeParser::MonthSection:
-mMonthPicker = new HbTumbleView(q);
+if(!mMonthPicker) {
-mMonthModel = new QStringListModel(q);
+mMonthPicker = new VIEWER(q);
-mMonthPicker->setModel(mMonthModel);
+mMonthModel = static_cast<QStringListModel*>(mMonthPicker->model());
 mMonthPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mMonthPicker);
-mMonthPicker->primitive("separator")->show();
 lastAdded = mMonthPicker;
 break;
 case HbDateTimeParser::YearSection:
 case HbDateTimeParser::YearSection2Digits:
-mYearPicker = new HbTumbleView(q);
+if(!mYearPicker) {
-mYearModel = new QStringListModel(q);
+mYearPicker = new VIEWER(q);
-mYearPicker->setModel(mYearModel);
+mYearModel = static_cast<QStringListModel*>(mYearPicker->model());
 mYearPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mYearPicker);
-mYearPicker->primitive("separator")->show();
 lastAdded = mYearPicker;
 break;
 case HbDateTimeParser::SecondSection:
-mSecondPicker = new HbTumbleView(q);
+if(!mSecondPicker) {
-mSecondModel = new QStringListModel(q);
+mSecondPicker = new VIEWER(q);
-mSecondPicker->setModel(mSecondModel);
+mSecondModel = static_cast<QStringListModel*>(mSecondPicker->model());
 mSecondPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mSecondPicker);
-mSecondPicker->primitive("separator")->show();
 lastAdded = mSecondPicker;
 break;
 case HbDateTimeParser::MinuteSection:
-mMinutePicker = new HbTumbleView(q);
+if(!mMinutePicker) {
-mMinuteModel = new QStringListModel(q);
+mMinutePicker = new VIEWER(q);
-mMinutePicker->setModel(mMinuteModel);
+mMinuteModel = static_cast<QStringListModel*>(mMinutePicker->model());
 mMinutePicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mMinutePicker);
-mMinutePicker->primitive("separator")->show();
 lastAdded = mMinutePicker;
 break;
 case HbDateTimeParser::Hour12Section:
 case HbDateTimeParser::Hour24Section:
-mHourPicker = new HbTumbleView(q);
+if(!mHourPicker) {
-mHourModel = new QStringListModel(q);
+mHourPicker = new VIEWER(q);
-mHourPicker->setModel(mHourModel);
+mHourModel = static_cast<QStringListModel*>(mHourPicker->model());
 mHourPicker->setLoopingEnabled(true);
+}
 mLayout->addItem(mHourPicker);
-mHourPicker->primitive("separator")->show();
 lastAdded = mHourPicker;
 break;
 default:
 break;
 }
 void HbDateTimePickerPrivate::setRanges()
 {
+//clear all data before inserting
+if(mYearModel) mYearModel->removeRows(0,mYearModel->rowCount());
+//insert data
 if(mIsTwoDigitYearFormat) {
 mYearOffset = mMinimumDate.date().year()%100;
 setYearRange(mMinimumDate.date().year()%100,mMaximumDate.date().year()%100);
 } else {
 mYearOffset = mMinimumDate.date().year();
 setYearRange(mMinimumDate.date().year(),mMaximumDate.date().year());
 }
+if(mMonthModel) mMonthModel->removeRows(0,mMonthModel->rowCount());
 mMonthOffset = 1;
 setMonthRange(1,12);//default all months
+if(mDayModel) mDayModel->removeRows(0,mDayModel->rowCount());
 mDayOffset = 1;
 setDayRange(1,31);//default all days
+if(mHourModel) mHourModel->removeRows(0,mHourModel->rowCount());
 mHourOffset = 0;
 setHourRange(0,23);
+if(mMinuteModel) mMinuteModel->removeRows(0,mMinuteModel->rowCount());
 mMinuteOffset = 0;
 setMinuteRange(0,59);
+if(mSecondModel) mSecondModel->removeRows(0,mSecondModel->rowCount());
 mSecondOffset = 0;
 setSecondRange(0,59);
+if(mAmPmModel) mAmPmModel->removeRows(0,mAmPmModel->rowCount());
 setAmPm();
 }
 void HbDateTimePickerPrivate::syncVisualDate()
 {
 }
 }
 else{
 index = newDateTime.time().minute()-mMinuteOffset;
 }
+#ifdef HBDATETIMEPICKER_DEBUG
+qDebug() << "setMinuteRange:selecting= " << index;
+#endif
 mMinutePicker->setSelected(index);
 }
 if(mSecondPicker) {
 #ifdef HBDATETIMEPICKER_DEBUG
 if(!mMinutePicker) {
 return;
 }
 #ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "setMinuteRange: " << start << " ," << end;
+qDebug() << "setMinuteRange:interval=" << mIntervals[QDateTimeEdit::MinuteSection];
 #endif
 //calculate the index it should be after resize
 //the currentIndex gets reset after the resize and gets set to 0
 //to work around that issue this is added
-int newIndex = mMinutePicker->selected()-(start-mMinuteOffset);
+int newIndex = mMinuteModel->index(mMinutePicker->selected(),0).data().toInt();
 if(newIndex < 0) {
 newIndex = 0;
 }
 if(newIndex > (end-start)) {
 newIndex = end-start;
 }
-//Store the value before resizing the model.
+resizeModel(mMinuteModel,
-int value = mMinuteModel->index(mMinutePicker->selected()).data().toInt();
+		mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(),
+		start,end,
-if(mIntervals[QDateTimeEdit::MinuteSection] > 1){
+		&HbDateTimePickerPrivate::localeMinute,
-if((mIntervals[QDateTimeEdit::MinuteSection] <= mMinimumDate.time().minute()) &&
+		mIntervals[QDateTimeEdit::MinuteSection]);
-!isMinimumHour()){
-int i = 0;
-for(i = start; i > 0; i -= mIntervals[QDateTimeEdit::MinuteSection]){
-}
-start = i;
-}
-else{
-start = mMinimumDate.time().minute();
-}
-}
-resizeModel(mMinuteModel, mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt()/*mMinuteOffset+mMinuteModel->mMinuteModel->rowCount()-1*/,
-start,end,
-&HbDateTimePickerPrivate::localeMinute, mIntervals[QDateTimeEdit::MinuteSection]);
 mMinuteOffset = start;
 //Select the nearest value when the range is set.
-int index = newIndex;
+int index = 0;
-if(mIntervals[QDateTimeEdit::MinuteSection] > 1){
-for(int i = 0; i < mMinuteModel->rowCount(); i++){
+for(int i=start;i<newIndex;i+=mIntervals[QDateTimeEdit::MinuteSection]) {
+index++;
-if(mMinuteModel->index(i,0).data().toInt() <= value){
+}
-index = i;
+#ifdef HBDATETIMEPICKER_DEBUG
-}
+qDebug() << "initMinute:selecting= " << index;
-else{
+#endif
-break;
-}
-}
-}
 mMinutePicker->setSelected(index);
 mDateTime.setTime(QTime(mDateTime.time().hour(), localeMinute(mMinuteModel->index(index,0).data().toInt()).toInt(), mDateTime.time().second()));
 //check if minute is valid
 if(mIs24HourFormat) {
 return mLocale.toString(QTime(hour,0,0),mHourFormat);
 }
 QString hourStr=mLocale.toString(QTime(hour,0,0),QString("%1:%2").arg(mHourFormat).arg("ap"));
-QStringList hourAm=hourStr.split(":");
+QStringList hourAm=hourStr.split(':');
 if(hourAm.count() > 1) {
 return hourAm.at(0);
 }
 return QString("Format Err");
 }
 /* there are seven different models for seven pickers. insertion and removal
 to each of the models to resize them its the same logic. but to populate the
 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 fuction specialization.
+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)
 {
-if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
+class ConnectionRemover {
-//initialize condition
+public:
-int previous = newStart;
+ConnectionRemover(HbDateTimePickerPrivate *priv){
-for(int i=0;i<=newEnd-newStart;i++) {
+this->priv = priv;
-QString text;
+priv->removeConnections();
+}
-if(interval > 1){
+~ConnectionRemover() {
+priv->makeConnections();
-if(previous <= newEnd){
+}
-model->insertRow(i);
+HbDateTimePickerPrivate *priv;
-text = (this->*localeFunc)(previous);
+}Obj(this);
-}
-else{
+#ifdef HBDATETIMEPICKER_DEBUG
-break;
+qDebug() << "resizeModel: oldStart=" << oldStart
-}
+<< " oldEnd=" << oldEnd << " newStart="
+<< newStart << " newEnd=" << newEnd
-previous += interval;
+<< " 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;
+	        }
 }
-else{
-model->insertRow(i);
+if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
-text = (this->*localeFunc)(i+newStart);
+#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
+}
 }
-#endif
+return;
-QModelIndex index=model->index(i,0);
+}
-if(index.isValid()) {
-model->setData(index,text);//TODO:add a readable typedef
+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
+}
 }
+}
-}
-return;
+if(newEnd>oldEnd) {
-}
+int rowCount=model->rowCount();
+#ifdef HBDATETIMEPICKER_DEBUG
-if(newStart < oldStart) {
+qDebug() << "resizeModel:inserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
-int previous = newStart;
+#endif
+model->insertRows(rowCount,(newEnd-oldEnd)/interval);
-for(int i=0;i<oldStart-newStart;++i) {
+for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
-QString text;
+QModelIndex index=model->index(i+rowCount,0);
+if(index.isValid()) {
-if(interval > 1){
+model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
+#ifdef HBDATETIMEPICKER_DEBUG
-if(previous < oldStart){
+qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
-model->insertRow(i);
+#endif
-text = (this->*localeFunc)(previous);
+}
-}
-else{
-break;
-}
-previous += interval;
 }
-else{
+}
-model->insertRow(i);
+if(newStart>oldStart) {
-text = (this->*localeFunc)(i+newStart);
+#ifdef HBDATETIMEPICKER_DEBUG
-}
+qDebug() << "resizeModel:removing(0," << (newStart-oldStart)/interval << ")"
+<< " data=" << model->index((newStart-oldStart)/interval,0).data().toString();
-QModelIndex index=model->index(i,0);
+#endif
-if(index.isValid()) {
+model->removeRows(0,(newStart-oldStart)/interval);
-model->setData(index,text);
+}
-}
-}
+if(oldEnd>newEnd) {
-}
+//#ifdef HBDATETIMEPICKER_DEBUG
-if(newEnd > oldEnd) {
+//            qDebug() << "resizeModel:removing(" <<model->rowCount()-((oldEnd-newEnd)/interval)<<"," << (oldEnd-newEnd)/interval << ")";
+//#endif
-int rowCount = model->rowCount();
+//            model->removeRows((model->rowCount()-((oldEnd-newEnd)/interval)),(oldEnd-newEnd)/interval);
-int previous = oldEnd+interval;
+//if the start offset is preset more items can fit at end
-for(int i=0;i<newEnd-oldEnd;++i) {
+int stay=((newEnd-newStart)/interval)+1;
-QString text;
+int count=model->rowCount()-stay;
+#ifdef HBDATETIMEPICKER_DEBUG
-if(interval > 1){
+qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
+<< " data=" << model->index((model->rowCount()-count),0).data().toString();
-if(previous <= newEnd){
+#endif
-model->insertRows(rowCount+i,1);
+model->removeRows((model->rowCount()-count),count);
-text = (this->*localeFunc)(previous);
+}
 }
-else{
-break;
-}
-previous += interval;
-}
-else{
-model->insertRows(rowCount+i,1);
-text = (this->*localeFunc)(oldEnd+i+1);
-}
-QModelIndex index=model->index(rowCount+i,0);
-if(index.isValid()) {
-model->setData(index,text);
-}
-}
-}
-if(newStart > oldStart) {
-if(interval > 1){
-for(int i = oldStart; i < newStart; i += interval){
-model->removeRows(0, 1);
-}
-}
-else{
-model->removeRows(0,newStart-oldStart);
-}
-}
-if(oldEnd > newEnd) {
-if(interval > 1){
-for(int i = oldEnd; i > newEnd; i -= interval){
-model->removeRows(model->rowCount()-1, 1);
-}
-}
-else{
-model->removeRows((model->rowCount()-(oldEnd-newEnd)),oldEnd-newEnd);
-}
-}
-if(interval > 1){
-//Check if there's any mismatch between actual rows in the model and the supposed rows.
-int previous = newStart;
-int actualRowCount = 0;
-for(actualRowCount=0;actualRowCount<=newEnd-newStart;actualRowCount++) {
-if(previous <= newEnd){
-}
-else{
-break;
-}
-previous += interval;
-}
-if(actualRowCount > model->rowCount()){
-model->insertRows(model->rowCount(), actualRowCount - model->rowCount());
-}
-else if( actualRowCount < model->rowCount()){
-model->removeRows(model->rowCount()-1, model->rowCount() - actualRowCount);
-}
-//Populate the data in the model.
-previous = newStart;
-for(int i = 0; i < model->rowCount(); i++)
-{
-if(previous <= newEnd){
-model->setData(model->index(i), (this->*localeFunc)(previous));
-}
-else{
-break;
-}
-previous += interval;
-}
-}
-}
 void HbDateTimePickerPrivate::createPrimitives()
 {
 Q_Q(HbDateTimePicker);
 if(!mBackground) {
 emitDateChange();
 }
 void HbDateTimePickerPrivate::_q_yearChanged(int index)
 {
+#ifdef HBDATETIMEPICKER_DEBUG
 qDebug() << "_q_yearChanged:" << index;
+#endif
 //Q_Q(HbDateTimePicker);
 QDate newDate(mDateTime.date());
 if(mIsTwoDigitYearFormat) {
 newDate = newDate.addYears(index+mYearOffset-(newDate.year()%100));
 }
 //check if minute range changed
 int start=0,end=0;
 if(mMinutePicker) {
 start=mMinuteOffset;
 end=start+mMinuteModel->rowCount()-1;
-if(isMinimumHour())  {
+if(isMinimumHour() )  {
 start = mMinimumDate.time().minute();
 } else {
-start = 0;
+if(mIntervals[QDateTimeEdit::MinuteSection]!=1 && (mIntervals[QDateTimeEdit::MinuteSection]>0)) {
+start = mMinimumDate.time().minute()%mIntervals[QDateTimeEdit::MinuteSection];
+} else {
+start = 0;
+}
 }
 if(isMaximumHour()) {
 end = mMaximumDate.time().minute();
 } else {
 end = 59;

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55