| -rw-r--r-- | korganizer/koeventviewer.cpp | 112 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 10 |
2 files changed, 68 insertions, 54 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index f39b5e1..c8c2f28 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -278,6 +278,7 @@ void KOEventViewer::appendEvent(Event *event, int mode ) mMailSubject = ""; mCurrentIncidence = event; bool shortDate = KOPrefs::instance()->mShortDateInViewer; + bool wideScreen = ( QApplication::desktop()->width() >= 640 ); topLevelWidget()->setCaption(i18n("Event Viewer")); if ( mode == 0 ) { addTag("h2",deTag(event->summary())); @@ -331,8 +332,7 @@ void KOEventViewer::appendEvent(Event *event, int mode ) } } if (!event->location().isEmpty()) { - addTag("b",i18n("Location: ")); - mText.append(deTag(event->location())+"<br>"); + addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); mMailSubject += i18n(" at ") + event->location(); } if (event->recurrence()->doesRecur()) { @@ -344,8 +344,12 @@ void KOEventViewer::appendEvent(Event *event, int mode ) QDateTime next; next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); if ( ok ) { - addTag("p",i18n("<b>Next recurrence is on:</b>") ); - addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); + if ( wideScreen ){ + addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) ); + } else { + addTag("p",i18n("<b>Next recurrence is on:</b>") ); + addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); + } mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true ); } else { @@ -353,8 +357,12 @@ void KOEventViewer::appendEvent(Event *event, int mode ) QDate nextd; nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); if ( last ) { - addTag("p",i18n("<b>Last recurrence was on:</b>") ); - addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); + if ( wideScreen ){ + addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate )); + } else{ + addTag("p",i18n("<b>Last recurrence was on:</b>") ); + addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); + } } } } else { @@ -367,37 +375,39 @@ void KOEventViewer::appendEvent(Event *event, int mode ) Alarm *alarm =event->alarms().first() ; QDateTime t = alarm->time(); QString s =i18n("( %1 before )").arg( alarm->offsetText() ); - addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); + if(wideScreen ){ + addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); + }else{ + addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); + } //addTag("p",s); } - addTag("b",i18n("Access: ")); - mText.append(event->secrecyStr()+"<br>"); + addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); - - formatCategories(event); formatReadOnly(event); formatAttendees(event); if ( KOPrefs::instance()->mEVshowCreated ) { -#ifdef DESKTOP_VERSION - addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); -#else - addTag("p",i18n("<b>Created: ") +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); -#endif + if(wideScreen ){ + addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); + }else{ + addTag("p",i18n("<b>Created: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); + } + } if ( KOPrefs::instance()->mEVshowChanged ) { -#ifdef DESKTOP_VERSION - addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); -#else - addTag("p",i18n("<b>Last modified: ") +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); -#endif + if(wideScreen ){ + addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); + }else{ + addTag("p",i18n("<b>Last modified: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); + } } if ( KOPrefs::instance()->mEVshowDetails ) { @@ -417,6 +427,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) mCurrentIncidence = event; topLevelWidget()->setCaption(i18n("Todo Viewer")); bool shortDate = KOPrefs::instance()->mShortDateInViewer; + bool wideScreen = ( QApplication::desktop()->width() >= 640 ); if (mode == 0 ) addTag("h2",deTag(event->summary())); else { @@ -469,9 +480,8 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); mMailSubject += i18n(" - " )+event->dtDueStr( true ); } - if (!event->location().isEmpty()) { - addTag("b",i18n("Location: ")); - mText.append(deTag(event->location())+"<br>"); + if (!event->location().isEmpty()) { + addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); mMailSubject += i18n(" at ") + event->location(); } mText.append(i18n("<p><b>Priority:</b> %2</p>") @@ -480,14 +490,16 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) if (event->isAlarmEnabled()) { Alarm *alarm =event->alarms().first() ; QDateTime t = alarm->time(); - QString s =i18n("( %1 before )").arg( alarm->offsetText() ); - addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); - //addTag("p",s); + QString s =i18n("( %1 before )").arg( alarm->offsetText() ); + if ( wideScreen ) { + addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); + } else { + addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); + } } - addTag("b",i18n("Access: ")); - mText.append(event->secrecyStr()+"<br>"); + addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); formatCategories(event); @@ -495,22 +507,23 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) formatAttendees(event); if ( KOPrefs::instance()->mEVshowCreated ) { -#ifdef DESKTOP_VERSION - addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); -#else - addTag("p",i18n("<b>Created: ") +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); -#endif - + if(wideScreen ){ + + addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); + + } else { + addTag("p",i18n("<b>Created: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); + } } if ( KOPrefs::instance()->mEVshowChanged ) { -#ifdef DESKTOP_VERSION - addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); -#else - addTag("p",i18n("<b>Last modified: ") +" </b>"); - addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); -#endif - + if(wideScreen ){ + addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); + + } else { + addTag("p",i18n("<b>Last modified: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); + } } if ( event->relatedTo() ) { addTag("b",i18n("Parent todo:<br>")); @@ -538,11 +551,10 @@ void KOEventViewer::formatCategories(Incidence *event) { if (!event->categoriesStr().isEmpty()) { if (event->categories().count() == 1) { - addTag("h3",i18n("Category")); + addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace()); } else { - addTag("h3",i18n("Categories")); + addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ; } - addTag("p",event->categoriesStr()); } } void KOEventViewer::formatAttendees(Incidence *event) diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 0a608dc..25be63a 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -464,7 +464,10 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : - mItemPopupMenu = new QPopupMenu(this); + mItemPopupMenu = new QPopupMenu(this); + mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, + SLOT (toggleRunningItem())); + mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(i18n("Show..."), this, SLOT (showTodo())); mItemPopupMenu->insertItem(i18n("Edit..."), this, @@ -480,11 +483,10 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, SLOT (cancelTodo())); mItemPopupMenu->insertSeparator(); - - mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this, - SLOT (toggleRunningItem())); + /* mItemPopupMenu->insertItem( i18n("New Todo..."), this, SLOT (newTodo())); + */ mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, SLOT (newSubTodo())); mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, |