-rw-r--r-- | korganizer/koprefs.cpp | 3 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 10 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 79 |
4 files changed, 54 insertions, 39 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 8dca3ae..1cdb2fb 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -228,9 +228,10 @@ KOPrefs::KOPrefs() : addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); - addItemBool("WNViewShowsParents",&mWNViewShowsParents,true); + addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; + addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 0656644..f2fe77a 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -231,8 +231,9 @@ class KOPrefs : public KPimPrefs bool mHighlightCurrentDay; bool mUseHighlightLightColor; bool mListViewMonthTimespan; bool mWNViewShowsParents; + bool mWNViewShowsPast; bool mWNViewShowLocation; bool mTodoViewShowsPercentage; bool mTodoViewUsesCatColors; bool mTodoViewUsesSmallFont; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 393e6e6..578c0e9 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -797,8 +797,13 @@ void KOPrefsDialog::setupViewsTab() topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); ii = 0; KPrefsDialogWidBool *passwdk = + + addWidBool(i18n("Show events, that are done in \nWhat's Next view"), + &(KOPrefs::instance()->mWNViewShowsPast),topFrame); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + passwdk = addWidBool(i18n("Show parent To-Do's in What's Next view"), &(KOPrefs::instance()->mWNViewShowsParents),topFrame); topLayout->addWidget(passwdk->checkBox(), ii++,0); @@ -813,9 +818,12 @@ void KOPrefsDialog::setupViewsTab() topLayout->addWidget(passwdk->checkBox(), ii++,0); passwdk = addWidBool(i18n("Use short date in \nWhat's Next/Event view"), &(KOPrefs::instance()->mShortDateInViewer),topFrame); - topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + + + // *********************** Todo View topFrame = addPage(i18n("Todo View"),0,0); diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 0f0bf11..aa33588 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -356,9 +356,9 @@ void KOWhatsNextView::updateView() // test->resize( 300, 400 ); // test->show(); // mView->setBackgroundMode(FixedPixmap ); // mView->setBackgroundPixmap ( bPix ); - qDebug("%s ",mText.latin1()); + // qDebug("%s ",mText.latin1()); } void KOWhatsNextView::appendDay( int i, QDate eventDate ) { @@ -435,21 +435,22 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) return; QDateTime cdt = QDateTime::currentDateTime(); QDateTime noc; + QString tempText; bool ok = true; if ( reply ) { noc = ev->getNextOccurence( cdt, &ok ); if (! ok && ev->type() == "Event") return; } - mText += "<tr><td><b>"; + tempText += "<tr><td><b>"; if (ev->type()=="Event") { if (reply) { if (!ev->doesFloat()) - mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; + tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; else - mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; + tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; } else { if (!ev->doesFloat()) { Event *event = static_cast<Event *>(ev); @@ -480,97 +481,101 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) dateText += "++:++"; else dateText += event->dtEndTimeStr(); if ( notRed ) - mText += dateText; + tempText += dateText; else { - if ( end < cdt ) - mText += "<font color=\"#F00000\">" + dateText + "</font>"; + if ( end < cdt ) { + if ( !KOPrefs::instance()->mWNViewShowsPast ) + return; + tempText += "<font color=\"#F00000\">" + dateText + "</font>"; + } else if ( st < cdt ) - mText += "<font color=\"#008000\">" + dateText + "</font>"; + tempText += "<font color=\"#008000\">" + dateText + "</font>"; else - mText += dateText; + tempText += dateText; } } else { - mText += i18n("Allday:"); + tempText += i18n("Allday:"); } } } else { mTodos.append( ev ); - mText += i18n("ToDo:"); + tempText += i18n("ToDo:"); if (reply) { - mText += " "; + tempText += " "; if ( noc != cdt ) { - mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; + tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; } } else { if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { - // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; + // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; QString dfs = KGlobal::locale()->dateFormatShort(); KGlobal::locale()->setDateFormatShort("%d.%b"); - mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; + tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; KGlobal::locale()->setDateFormatShort(dfs); } else { if (!ev->doesFloat() ) if( ( (Todo*)ev)->dtDue() < cdt ) { - mText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; + tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; } else - mText +=((Todo*)ev)->dtDueTimeStr(); + tempText +=((Todo*)ev)->dtDueTimeStr(); mTodos.append( ev ); } } } - mText += "</b></td><td>"; + tempText += "</b></td><td>"; bool needClose = false; if ( ev->cancelled() ) { - mText += "<font color=\"#F00000\">[c"; + tempText += "<font color=\"#F00000\">[c"; needClose =true; } if ( ev->isAlarmEnabled() ) { if ( !needClose) - mText +="["; - mText += "a"; + tempText +="["; + tempText += "a"; needClose =true; } if ( ev->description().length() > 0 ) { if ( !needClose) - mText +="["; - mText += "i"; + tempText +="["; + tempText += "i"; needClose =true; } if ( ev->recurrence()->doesRecur() ) { if ( !needClose) - mText +="["; - mText += "r"; + tempText +="["; + tempText += "r"; needClose =true; } if ( needClose ) { - mText += "] "; + tempText += "] "; } if ( ev->cancelled() ) - mText += "</font>"; - mText += "<a "; - if (ev->type()=="Event") mText += "href=\"event:"; - if (ev->type()=="Todo") mText += "href=\"todo:"; - mText += ev->uid() + "\">"; + tempText += "</font>"; + tempText += "<a "; + if (ev->type()=="Event") tempText += "href=\"event:"; + if (ev->type()=="Todo") tempText += "href=\"todo:"; + tempText += ev->uid() + "\">"; if ( ev->summary().length() > 0 ) - mText += ev->summary(); + tempText += ev->summary(); else - mText += i18n("-no summary-"); - mText += "</a>"; + tempText += i18n("-no summary-"); + tempText += "</a>"; if ( KOPrefs::instance()->mWNViewShowLocation ) if ( !ev->location().isEmpty() ) - mText += " ("+ev->location() +")"; + tempText += " ("+ev->location() +")"; if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) - mText += " ["+ev->relatedTo()->summary() +"]"; - mText += "</td></tr>\n"; + tempText += " ["+ev->relatedTo()->summary() +"]"; + tempText += "</td></tr>\n"; + mText += tempText; } bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) { |