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
@@ -280,2 +280,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
    bool shortDate = KOPrefs::instance()->mShortDateInViewer;
+    bool wideScreen = ( QApplication::desktop()->width() >= 640 );
    topLevelWidget()->setCaption(i18n("Event Viewer"));
@@ -333,4 +334,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
    if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
+        addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
-        mText.append(deTag(event->location())+"<br>");
        mMailSubject += i18n(" at ") + event->location();
@@ -346,4 +346,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
        if ( ok ) {
-            addTag("p",i18n("<b>Next recurrence is on:</b>")  );
+            if ( wideScreen ){
-            addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
+                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 );
@@ -355,4 +359,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
            if ( last ) {
-                addTag("p",i18n("<b>Last recurrence was on:</b>")  );
+                if ( wideScreen ){
-                addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
+                    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 ));
+                }
            }
@@ -369,4 +377,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
-        addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+        if(wideScreen ){
-        addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+            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);
@@ -374,7 +386,4 @@ void KOEventViewer::appendEvent(Event *event, int mode )
-    addTag("b",i18n("Access: "));
+    addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
-    mText.append(event->secrecyStr()+"<br>");
  
- 
    formatCategories(event);
@@ -385,8 +394,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
    if ( KOPrefs::instance()->mEVshowCreated ) {
-#ifdef DESKTOP_VERSION
+        if(wideScreen ){
-        addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+            addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
-#else
+        }else{
-        addTag("p",i18n("<b>Created: ")  +" </b>");
+            addTag("p",i18n("<b>Created: ")  +" </b>");
-        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+            addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
-#endif
+        }
        
@@ -394,8 +404,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
    if ( KOPrefs::instance()->mEVshowChanged ) {
-#ifdef DESKTOP_VERSION
+        if(wideScreen ){
-        addTag("p",i18n("<b>Last modified: ")  +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
+            addTag("p",i18n("<b>Last modified: ")  +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
-#else
+        }else{
-        addTag("p",i18n("<b>Last modified: ")  +" </b>");
+            addTag("p",i18n("<b>Last modified: ")  +" </b>");
-        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+            addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
-#endif
+        }
        
@@ -419,2 +429,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
    bool shortDate = KOPrefs::instance()->mShortDateInViewer;
+    bool wideScreen = ( QApplication::desktop()->width() >= 640 );
    if (mode == 0 )
@@ -471,5 +482,4 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
    }
-    if (!event->location().isEmpty()) {
+    if (!event->location().isEmpty()) { 
-        addTag("b",i18n("Location: "));
+        addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
-        mText.append(deTag(event->location())+"<br>");
        mMailSubject += i18n(" at ") + event->location();
@@ -482,10 +492,12 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
        QDateTime t = alarm->time();
-        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
-        addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+        if ( wideScreen ) {
-        addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+            addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
-        //addTag("p",s);
+        } else {
+            addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+            addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+        }
    }
-    addTag("b",i18n("Access: "));
+    addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
-    mText.append(event->secrecyStr()+"<br>");
@@ -497,18 +509,19 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
    if ( KOPrefs::instance()->mEVshowCreated ) {
-#ifdef DESKTOP_VERSION
+        if(wideScreen ){
-        addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
-#else
+            addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
-        addTag("p",i18n("<b>Created: ")  +" </b>");
-        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+        } else {
-#endif
+            addTag("p",i18n("<b>Created: ")  +" </b>");
-        
+            addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+        }  
    }
    if ( KOPrefs::instance()->mEVshowChanged ) {
-#ifdef DESKTOP_VERSION
+        if(wideScreen ){
-        addTag("p",i18n("<b>Last modified: ")  +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
+            addTag("p",i18n("<b>Last modified: ")  +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
-#else
-        addTag("p",i18n("<b>Last modified: ")  +" </b>");
+        } else {
-        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+            addTag("p",i18n("<b>Last modified: ")  +" </b>");
-#endif
+            addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
-        
+        }
    } 
@@ -540,7 +553,6 @@ void KOEventViewer::formatCategories(Incidence *event)
        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());
    }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 0a608dc..25be63a 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -466,3 +466,6 @@ 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,
@@ -482,7 +485,6 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  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,

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index f39b5e1..c8c2f28 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp
@@ -280,2 +280,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
280	bool shortDate = KOPrefs::instance()->mShortDateInViewer;	280	bool shortDate = KOPrefs::instance()->mShortDateInViewer;
		281	bool wideScreen = ( QApplication::desktop()->width() >= 640 );
281	topLevelWidget()->setCaption(i18n("Event Viewer"));	282	topLevelWidget()->setCaption(i18n("Event Viewer"));
@@ -333,4 +334,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
333	if (!event->location().isEmpty()) {	334	if (!event->location().isEmpty()) {
334	addTag("b",i18n("Location: "));	335	addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) );
335	mText.append(deTag(event->location())+"<br>");
336	mMailSubject += i18n(" at ") + event->location();	336	mMailSubject += i18n(" at ") + event->location();
@@ -346,4 +346,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
346	if ( ok ) {	346	if ( ok ) {
347	addTag("p",i18n("<b>Next recurrence is on:</b>") );	347	if ( wideScreen ){
348	addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));	348	addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) );
		349	} else {
		350	addTag("p",i18n("<b>Next recurrence is on:</b>") );
		351	addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
		352	}
349	mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );	353	mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
@@ -355,4 +359,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
355	if ( last ) {	359	if ( last ) {
356	addTag("p",i18n("<b>Last recurrence was on:</b>") );	360	if ( wideScreen ){
357	addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));	361	addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate ));
		362	} else{
		363	addTag("p",i18n("<b>Last recurrence was on:</b>") );
		364	addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
		365	}
358	}	366	}
@@ -369,4 +377,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
369	QString s =i18n("( %1 before )").arg( alarm->offsetText() );	377	QString s =i18n("( %1 before )").arg( alarm->offsetText() );
370	addTag("p",i18n("<b>Alarm on: ") + s +" </b>");	378	if(wideScreen ){
371	addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));	379	addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
		380	}else{
		381	addTag("p",i18n("<b>Alarm on: ") + s +" </b>");
		382	addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
		383	}
372	//addTag("p",s);	384	//addTag("p",s);
@@ -374,7 +386,4 @@ void KOEventViewer::appendEvent(Event *event, int mode )
374		386
375	addTag("b",i18n("Access: "));	387	addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
376	mText.append(event->secrecyStr()+"<br>");
377		388
378
379
380	formatCategories(event);	389	formatCategories(event);
@@ -385,8 +394,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
385	if ( KOPrefs::instance()->mEVshowCreated ) {	394	if ( KOPrefs::instance()->mEVshowCreated ) {
386	#ifdef DESKTOP_VERSION	395	if(wideScreen ){
387	addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));	396	addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
388	#else	397	}else{
389	addTag("p",i18n("<b>Created: ") +" </b>");	398	addTag("p",i18n("<b>Created: ") +" </b>");
390	addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));	399	addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
391	#endif	400	}
		401
392		402
@@ -394,8 +404,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
394	if ( KOPrefs::instance()->mEVshowChanged ) {	404	if ( KOPrefs::instance()->mEVshowChanged ) {
395	#ifdef DESKTOP_VERSION	405	if(wideScreen ){
396	addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );	406	addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
397	#else	407	}else{
398	addTag("p",i18n("<b>Last modified: ") +" </b>");	408	addTag("p",i18n("<b>Last modified: ") +" </b>");
399	addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));	409	addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
400	#endif	410	}
401		411
@@ -419,2 +429,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
419	bool shortDate = KOPrefs::instance()->mShortDateInViewer;	429	bool shortDate = KOPrefs::instance()->mShortDateInViewer;
		430	bool wideScreen = ( QApplication::desktop()->width() >= 640 );
420	if (mode == 0 )	431	if (mode == 0 )
@@ -471,5 +482,4 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
471	}	482	}
472	if (!event->location().isEmpty()) {	483	if (!event->location().isEmpty()) {
473	addTag("b",i18n("Location: "));	484	addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) );
474	mText.append(deTag(event->location())+"<br>");
475	mMailSubject += i18n(" at ") + event->location();	485	mMailSubject += i18n(" at ") + event->location();
@@ -482,10 +492,12 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
482	QDateTime t = alarm->time();	492	QDateTime t = alarm->time();
483	QString s =i18n("( %1 before )").arg( alarm->offsetText() );	493	QString s =i18n("( %1 before )").arg( alarm->offsetText() );
484	addTag("p",i18n("<b>Alarm on: ") + s +" </b>");	494	if ( wideScreen ) {
485	addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));	495	addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
486	//addTag("p",s);	496	} else {
		497	addTag("p",i18n("<b>Alarm on: ") + s +" </b>");
		498	addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
		499	}
487	}	500	}
488		501
489	addTag("b",i18n("Access: "));	502	addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
490	mText.append(event->secrecyStr()+"<br>");
491		503
@@ -497,18 +509,19 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
497	if ( KOPrefs::instance()->mEVshowCreated ) {	509	if ( KOPrefs::instance()->mEVshowCreated ) {
498	#ifdef DESKTOP_VERSION	510	if(wideScreen ){
499	addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));	511
500	#else	512	addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
501	addTag("p",i18n("<b>Created: ") +" </b>");	513
502	addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));	514	} else {
503	#endif	515	addTag("p",i18n("<b>Created: ") +" </b>");
504		516	addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
		517	}
505	}	518	}
506	if ( KOPrefs::instance()->mEVshowChanged ) {	519	if ( KOPrefs::instance()->mEVshowChanged ) {
507	#ifdef DESKTOP_VERSION	520	if(wideScreen ){
508	addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );	521	addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
509	#else	522
510	addTag("p",i18n("<b>Last modified: ") +" </b>");	523	} else {
511	addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));	524	addTag("p",i18n("<b>Last modified: ") +" </b>");
512	#endif	525	addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
513		526	}
514	}	527	}
@@ -540,7 +553,6 @@ void KOEventViewer::formatCategories(Incidence *event)
540	if (event->categories().count() == 1) {	553	if (event->categories().count() == 1) {
541	addTag("h3",i18n("Category"));	554	addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace());
542	} else {	555	} else {
543	addTag("h3",i18n("Categories"));	556	addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ;
544	}	557	}
545	addTag("p",event->categoriesStr());
546	}	558	}


diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 0a608dc..25be63a 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp
@@ -466,3 +466,6 @@ KOTodoView::KOTodoView(Calendar calendar,QWidget parent,const char* name) :
466		466
467	mItemPopupMenu = new QPopupMenu(this);	467	mItemPopupMenu = new QPopupMenu(this);
		468	mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
		469	SLOT (toggleRunningItem()));
		470	mItemPopupMenu->insertSeparator();
468	mItemPopupMenu->insertItem(i18n("Show..."), this,	471	mItemPopupMenu->insertItem(i18n("Show..."), this,
@@ -482,7 +485,6 @@ KOTodoView::KOTodoView(Calendar calendar,QWidget parent,const char* name) :
482	mItemPopupMenu->insertSeparator();	485	mItemPopupMenu->insertSeparator();
483		486	/*
484	mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
485	SLOT (toggleRunningItem()));
486	mItemPopupMenu->insertItem( i18n("New Todo..."), this,	487	mItemPopupMenu->insertItem( i18n("New Todo..."), this,
487	SLOT (newTodo()));	488	SLOT (newTodo()));
		489	*/
488	mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,	490	mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,