fixes

8 files changed, 229 insertions, 312 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 03895fd..ef0bd8b 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,279 +1,41 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
-********** VERSION 2.0.28 ************
+********** VERSION 2.1.0 ************
 
-KO/Pi:
-Fixed two problems in KO/Pi timetracking.
-Added context menu to month view for creating new events/todos.
-Fixed some other small bugs.
+Stable release 2.1.0!
 
+Summary of changes/fixes compared to version 2.0.6:
 
-********** VERSION 2.0.27 ************
+Many bugs of version 2.0.6 fixed.
+Most of them were small bugs, but some of them were important.
+It is recommended to use version 2.1.0 and not version 2.0.6.
 
-More bugfixes.
-Added possibility to clone in KO/Pi a todo with all its subtodos.
-Added config option for alternate background in list views.
-
-Added a timetracker funtionality in KO/Pi for todos in the todo view.
-If a todo is set to started and then to stopped it is saving information about the runtime in
-<yourhome>/kdepim/apps/timetrackerdir.
-To read, display, print this information an external program is needed which will be developed.
-It will display the data in a Gantt timetable view with one row for each todo.
-It will have many possibilities sorting the data after category, parent todos, attendees, ... and for creating/printing status reports/summaries.
-Merging of data from different computers/users will be quite easy because every run is stored in a single file.
-
-********** VERSION 2.0.26 ************
-
-Added two more fields to the KA/Pi view config:
-A "Mobile (home)" and a "Mobile (work)" field.
-Fixed utf8 import (e.g. for Japaneese text) in KA/Pi.
-
-Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes.
-And again fixed some more small bugs.
-
-********** VERSION 2.0.25 ************
-
-And again fixed some bugs.
-
-********** VERSION 2.0.24 ************
-
-Fixed again a lot of small bugs.
-Some performance optimizations in date navigator.
-Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row.
-
-********** VERSION 2.0.23 ************
-
-Fixed again a lot of small and strange  bugs, e.g. the missing toolbar of KA/Pi after a new installation.
-Fixed the (agenda) layout of KO/Pi on 5500er.
-Some usebility enhancements (e.g. reselection the current item of the todo view after some changes).
-
-********** VERSION 2.0.22 ************
-
-KO/Pi:
-Fix for creating events/todos via the abgenda context menu.
-Added option to split toolbar to 3 toolbars.
-(Toolbar moving s disabled for this option due to a bug in Qt somewhere). 
-Added option to show one small filter-view-toolbar.
-Added a print option to the desktop version:
-Now you can print out the view of the "Event Viewer".
-That means you can print all data of one particular event/todo.
-Added scaling options to printout of Event Viewer and What'sNext View.
-Fixed some problems in the month view in "week start sunday" mode.
-KA/Pi:
-Added two more config options.
-Fixed resizing problem of address request dialog when orientation was switched. 
-Cleaned up the menu structure.
-Fixed some more problems.
-
-Fixed the annoying problem that scrolling continued after the key was released in KO/Pi Monthview and the KA/Pi views.
-
-And, this is a really cool option (Ben did suggest it):
-Now KO/Pi and KA/Pi can be run from a USB stick:
-All data is read from and written to the stick.
-You can enable this in the global configure option TAB with:
-Save using LOCAL storage.
-Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well. I will put a memory stick version for teh next stable release online.
-
-********** VERSION 2.0.21 ************
-
-Fixed another SMTP problem in OM/Pi.
-Some small changed in the new datenavigator in KO/Pi.
-Changed default setting for new filter in KA/Pi to "exclude categories".
-Changed the default font size for 640x480 display .
-Changed popup menu behaviour in agenda and list view.
-Fixed some layout problems of the date label size in the month view.
-Made month view update faster.
-Made first datenavigator repainting faster.
-Changed the title of the event/todo edit dialogs.
-Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course).
-Many small usebility fixes in KO/Pi.
-Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi.
-The set of possible "next views" are the views you have toolbar buttons for.
-
-Made alarm sound working on Linux.
-
-KO/Pi alarm applet changed:
-Made buttons in alarm dialog much bigger.
-Made setting of timer more user friendly by showing the actual timer fire time and making the buttons in the timer settings much bigger.
-The goal was it to make it possible to use a finger tip  ( and not the stylus ) on the touchscreen to adjust the settings.
-
-And because this version is realeased at Easter, I added an Easter-egg:
-With a new undocumented command you can get a message box about the next alarm.
-Good luck to find it!
-
-
-
-********** VERSION 2.0.20 ************
-
-Two small fixes in OM/Pi.
-
-Better resizing of  the new datenavigator in KO/Pi.
-
-********** VERSION 2.0.19 ************
-KO/Pi:
-Enhancements and bugfixes in the new datenavigator.
-Bugfix in this changelog:
-The datenavigator was changed in version 2.0.18, not the datepicker.
-
-********** VERSION 2.0.18 ************
-KO/Pi:
-Fixed some minor problems.
-Cleaned up the KO/Pi config dialog.
-Fixed problem moving events in aganda view.
-Made datepicker scaleable, i.e. if the datenavigator shows now a 
-datenavigator matrix depending on its size.
-Birthdays are now displayed green in the datenavigator.
-What'sThis Help in datenavigator shows all events of the day. 
-
-OM/Pi:
-Updated the backend mail library to the latest version.
-Please backup your mail before using this version.
-
-********** VERSION 2.0.17 ************
-
-KO/Pi:
-Tooltips in month view were not sorted. Fixed.
-Daylabel in agenda view ( for display of one day ) was too short. Fixed.
-Conflict display dialog for syncing was not on top of other windows. Fixed.
-Fixed some minor problems.
-
-Fixed an endless loop when importing vcs file with RESOURCES entry.
-
-********** VERSION 2.0.16 ************
-OM/Pi:
-Fixed the SMTP account setting the option.
-Fixed something in mail sending.
-
-KO/Pi:
-Added possibility to export selected events/todos as vcal file.
-
-********** VERSION 2.0.15 ************
-
-PwM/Pi:
-Added keyboard shorcuts for 
-- toggling summary view (space bar)
-- delete item (delete + backspace key)
-- add new item ( i + n key)
-Fixed length of info in the title.
-
-KO/Pi-KA/Pi:
-Changed "ME" menu bar entry to an icon.
-
-KO/Pi:
-Fixed two minor bugs in displaying todos.
-If in month view a cell is selected, the key shortcut "d" shows now that date.
-Added complete info for a todo in month view as an icon left of the text.
-Fixed problems of displaying data when "<" or ">" are used in summary/location/description.
-Fixed problem of search dialog size when switching displays. 
-Cancel key now closes date picker.
-Rearranged KO/Pi file menu structure.
-
-OM/Pi:
-Added to the SMTP account setting the option
-"No secure connection".
-You have to configure your SMTP accounts again, sorry.
-
-KA/Pi:
-Added support for importing quoted-printable.
-Support was added by Peter P.. Thanks, Peter!
-
-
-********** VERSION 2.0.14 ************
-
-Made Passwordmanager PwM/Pi more userfriendly:
-Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
-Fixed bug in KO/Pi todo printing.
-Made Qtopia calendar import possible on desktop .
-
-********** VERSION 2.0.13 ************
-
-Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter.
-
-In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".  
-
-OM/Pi:
-Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails.
-Added missing German translation.
-Added warning if path is specified in local folder settings of account config.
-
-********** VERSION 2.0.12 ************
-
-KO/Pi:
-Fixed a bug in todo start/due date handling for non recurring todos with a start and due date.
-Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. 
-Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer.
-
-Fixed problem in pi-sync mode when wrong password was sent.
-
-OM/Pi:
-Fixed a crash when displaying mails with "Show mail as html" was checked in the config.
-Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled.
-
-********** VERSION 2.0.11 ************
-
-Fixed some problems in pi-sync mode
-(e.g. details of events were not synced properly)
-
-********** VERSION 2.0.10 ************
-
-KO/Pi:
-In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
-This is fixed.
-Changed the search dialog a bit to make it more user friendly.
-(E.g.: Removed message box about "no items found" and set key focus to search line edit after search).
-
-Added config option to hide the week number in KO/Pi toolbar.
-
-********** VERSION 2.0.9 ************
-
-Made month view icons for multiday events a bit nicer.
-Some minor fixes in KO/Pi
-(e.g. go to today did not work for new week view properly).
-
-
-********** VERSION 2.0.8 ************
-
-Fixed a problem in dependency info in the ipk files for the Zaurus.
-
-Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar.
-
-Added a "go today" button to the datepicker.
-
-Added "created" and "last modified" to event/todo viewer (and What'sThis viewer)
-and made it configureable to show these values.
-
-Fixed a problem for events (from external iCal files) that do have a duration but no end date.
-
-
-********** VERSION 2.0.7 ************
-
-Added global application font settings 
-(for all KDE-Pim/Pi apps) to the general settings.
-
-Fixed a problem in OM/Pi when trying to login to some IMAP servers
-(like the IMAP server of Apple: mail.mac.com )
+Important changes:
 
 Added recurring todos to KO/Pi.
 
+Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
+
+Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 
-********** VERSION 2.0.6 ************
+Datenavigator can now display many months. Very useful on the desktop.
 
-Stable release 2.0.6!
+KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
 
-Some bugfixes in the pi-sync mode.
-Added German translation for pi-sync mode.
+Made alarm sound working on Linux desktop.
 
-KO/Pi:
-Made the todolist using alternate background.
+Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
 
-Other minor fixes in KO/Pi.
+Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
 
+Many other usebility enhancements.
+Special thanks to Ben for his suggestions!
 
 You can find the complete changelog 
-from version 1.7.7 to  2.0.5 
+from version 1.7.7 to  2.1.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 
 
diff --git a/changelog.txt b/changelog.txt
index 99be167..45e0322 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,36 +1,172 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.0 ************
+
+Stable release 2.1.0!
+
+Summary of changes/fixes compared to version 2.0.6:
+
+Many bugs of version 2.0.6 fixed.
+Most of them were small bugs, but some of them were important.
+It is recommended to use version 2.1.0 and not version 2.0.6.
+
+Important changes:
+
+Added recurring todos to KO/Pi.
+
+Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
+
+Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
+
+Datenavigator can now display many months. Very useful on the desktop.
+
+KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
+
+Made alarm sound working on Linux desktop.
+
+Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
+
+Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
+
+Many other usebility enhancements.
+Special thanks to Ben for his suggestions!
+
+You can find the complete changelog 
+from version 1.7.7 to  2.1.0 
+in the source package or on 
+
+http://www.pi-sync.net/html/changelog.html
+
+********** VERSION 2.0.28 ************
+
+KO/Pi:
+Fixed two problems in KO/Pi timetracking.
+Added context menu to month view for creating new events/todos.
+Fixed some other small bugs.
+
+
+********** VERSION 2.0.27 ************
+
+More bugfixes.
+Added possibility to clone in KO/Pi a todo with all its subtodos.
+Added config option for alternate background in list views.
+
+Added a timetracker funtionality in KO/Pi for todos in the todo view.
+If a todo is set to started and then to stopped it is saving information about the runtime in
+<yourhome>/kdepim/apps/timetrackerdir.
+To read, display, print this information an external program is needed which will be developed.
+It will display the data in a Gantt timetable view with one row for each todo.
+It will have many possibilities sorting the data after category, parent todos, attendees, ... and for creating/printing status reports/summaries.
+Merging of data from different computers/users will be quite easy because every run is stored in a single file.
+
+********** VERSION 2.0.26 ************
+
+Added two more fields to the KA/Pi view config:
+A "Mobile (home)" and a "Mobile (work)" field.
+Fixed utf8 import (e.g. for Japaneese text) in KA/Pi.
+
+Some alarm applet enhancements, e.g. sound stops automatically if value of suspend spinbox changes.
+And again fixed some more small bugs.
+
+********** VERSION 2.0.25 ************
+
+And again fixed some bugs.
+
+********** VERSION 2.0.24 ************
+
+Fixed again a lot of small bugs.
+Some performance optimizations in date navigator.
+Month view displays now multi days events on top of each cell, such that it is more likely that all multi days items of one event are in the same row.
+
+********** VERSION 2.0.23 ************
+
+Fixed again a lot of small and strange  bugs, e.g. the missing toolbar of KA/Pi after a new installation.
+Fixed the (agenda) layout of KO/Pi on 5500er.
+Some usebility enhancements (e.g. reselection the current item of the todo view after some changes).
+
+********** VERSION 2.0.22 ************
+
+KO/Pi:
+Fix for creating events/todos via the abgenda context menu.
+Added option to split toolbar to 3 toolbars.
+(Toolbar moving s disabled for this option due to a bug in Qt somewhere). 
+Added option to show one small filter-view-toolbar.
+Added a print option to the desktop version:
+Now you can print out the view of the "Event Viewer".
+That means you can print all data of one particular event/todo.
+Added scaling options to printout of Event Viewer and What'sNext View.
+Fixed some problems in the month view in "week start sunday" mode.
+KA/Pi:
+Added two more config options.
+Fixed resizing problem of address request dialog when orientation was switched. 
+Cleaned up the menu structure.
+Fixed some more problems.
+
+Fixed the annoying problem that scrolling continued after the key was released in KO/Pi Monthview and the KA/Pi views.
+
+And, this is a really cool option (Ben did suggest it):
+Now KO/Pi and KA/Pi can be run from a USB stick:
+All data is read from and written to the stick.
+You can enable this in the global configure option TAB with:
+Save using LOCAL storage.
+Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well. I will put a memory stick version for teh next stable release online.
+
 ********** VERSION 2.0.21 ************
 
+Fixed another SMTP problem in OM/Pi.
+Some small changed in the new datenavigator in KO/Pi.
+Changed default setting for new filter in KA/Pi to "exclude categories".
+Changed the default font size for 640x480 display .
+Changed popup menu behaviour in agenda and list view.
+Fixed some layout problems of the date label size in the month view.
+Made month view update faster.
+Made first datenavigator repainting faster.
+Changed the title of the event/todo edit dialogs.
+Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course).
+Many small usebility fixes in KO/Pi.
+Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi.
+The set of possible "next views" are the views you have toolbar buttons for.
+
+Made alarm sound working on Linux.
+
+KO/Pi alarm applet changed:
+Made buttons in alarm dialog much bigger.
+Made setting of timer more user friendly by showing the actual timer fire time and making the buttons in the timer settings much bigger.
+The goal was it to make it possible to use a finger tip  ( and not the stylus ) on the touchscreen to adjust the settings.
+
+And because this version is realeased at Easter, I added an Easter-egg:
+With a new undocumented command you can get a message box about the next alarm.
+Good luck to find it!
+
 
 ********** VERSION 2.0.20 ************
 
 Two small fixes in OM/Pi.
 
 Better resizing of  the  new datenavigator in KO/Pi.
 
 ********** VERSION 2.0.19 ************
 KO/Pi:
 Enhancements and bugfixes in the new datenavigator.
 Bugfix in this changelog:
 The datenavigator was changed in version 2.0.18, not the datepicker.
 
 ********** VERSION 2.0.18 ************
 KO/Pi:
 Fixed some minor problems.
 Cleaned up the KO/Pi config dialog.
 Fixed problem moving events in aganda view.
 Made datepicker scaleable, i.e. if the datenavigator shows now a 
 datenavigator matrix depending on its size.
 Birthdays are now displayed green in the datenavigator.
 What'sThis Help in datenavigator shows all events of the day. 
 
 OM/Pi:
 Updated the backend mail library to the latest version.
 Please backup your mail before using this version.
 
 ********** VERSION 2.0.17 ************
 
 KO/Pi:
 Tooltips in month view were not sorted. Fixed.
 Daylabel in agenda view ( for display of one day ) was too short. Fixed.
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 3889b6f..3b6b52e 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,35 +1,35 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.28
+Version: 2.1.0
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index f39b5e1..c8c2f28 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -249,329 +249,341 @@ void KOEventViewer::addTag(const QString & tag,const QString & text)
     if(number !=-1) 
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 void KOEventViewer::setColorMode( int m )
 {
     mColorMode = m;
 }
 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()));
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         } 
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Meeting " )+ event->summary();
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
                          .arg(event->dtEndDateStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
         }
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
             mText.append(i18n("<p><b>On:</b> %1</p> ")
                          .arg(event->dtStartDateStr( shortDate )));
         }
     }
     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()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
         bool ok;
         QDate start = QDate::currentDate();
         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 {
             bool last;
             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 {
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
 
     }
 
 
     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 ));
+        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 ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
     setText(mText);
     //QWhatsThis::add(this,mText);
 
 }
 
 void KOEventViewer::appendTodo(Todo *event, int mode )
 {
     mMailSubject = "";
     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 { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         }
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
 
      if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) );
         mText += "</font>";
     } else {
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
 
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
    
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
             
     }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
     }
     if (event->hasDueDate()) {
         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>")
                  .arg(QString::number(event->priority())));
 
     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);
 
     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 ( event->relatedTo() ) {
         addTag("b",i18n("Parent todo:<br>"));
         mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
     }
     QPtrList<Incidence> Relations = event->relations();
     Incidence *to;
     if ( Relations.first() )
         addTag("b",i18n("Sub todos:<br>"));
     for (to=Relations.first();to;to=Relations.next()) {
         mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
         
     }  
 
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
     setText(mText);
 }
 
 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)
 {
     QPtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         
   
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
         QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small);
         addTag("h3",i18n("Organizer"));
         mText.append("<ul><li>");
 #ifndef KORG_NOKABC
        
 #ifdef DESKTOP_VERSION
         KABC::AddressBook *add_book = KABC::StdAddressBook::self();
         KABC::Addressee::List addressList;
         addressList = add_book->findByEmail(event->organizer());
         KABC::Addressee o = addressList.first();
         if (!o.isEmpty() && addressList.size()<2) {
             mText += "<a href=\"uid:" + o.uid() + "\">";
             mText += o.formattedName();
             mText += "</a>\n";
         } else {
             mText.append(event->organizer());
         }
 #else //DESKTOP_VERSION
                     mText += "<a href=\"uid:organizer\">";
                     mText += event->organizer();
                     mText += "</a>\n";
 #endif //DESKTOP_VERSION
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 0a608dc..25be63a 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -435,85 +435,87 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->setItemsRenameable( true );
   mTodoListView->setRenameable( 0 );
   mTodoListView->setColumnWidth( 0, 120 );
   mTodoListView->setColumnWidthMode(0, QListView::Manual);
   mTodoListView->setColumnWidthMode(1, QListView::Manual);
   mTodoListView->setColumnWidthMode(2, QListView::Manual);
   mTodoListView->setColumnWidthMode(3, QListView::Manual);
   mTodoListView->setColumnWidthMode(4, QListView::Manual);
   mTodoListView->setColumnWidthMode(5, QListView::Manual);
   mTodoListView->setColumnWidthMode(6, QListView::Manual);
   mTodoListView->setColumnWidthMode(7, QListView::Manual);
   mTodoListView->setColumnWidthMode(8, QListView::Manual);
  
 
   mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
 
   mPriorityPopupMenu = new QPopupMenu(this);
   for (int i = 1; i <= 5; i++) {
     QString label = QString ("%1").arg (i);
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
   connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
 
   mPercentageCompletedPopupMenu = new QPopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
     QString label = QString ("%1 %").arg (i);
     mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
   
-  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,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete"), this,
                              SLOT (deleteTodo()));
   mItemPopupMenu->insertItem( i18n("Clone..."), this,
                              SLOT (cloneTodo()));
   mItemPopupMenu->insertItem( i18n("Move..."), this,
                              SLOT (moveTodo()));
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
   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,
                              SLOT (unparentTodo()),0,21);
   mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
                              SLOT (reparentTodo()),0,22);
   mItemPopupMenu->insertSeparator();
 #if 0
   mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"),
                              this, SLOT( purgeCompleted() ) );
   mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
                              this, SLOT( toggleCompleted() ),0, 33 );
   mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                              this, SLOT( toggleQuickTodo() ),0, 34 );
   mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0, 35 );
   
 #endif
   mPopupMenu = new QPopupMenu(this);
   mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                          SLOT (newTodo()),0,1);
   mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"),
                          this, SLOT(purgeCompleted()),0,2);
   mPopupMenu->insertItem(i18n("Show Completed"),
                              this, SLOT( toggleCompleted() ),0,3 );
   mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                              this, SLOT( toggleQuickTodo() ),0,4 );
   mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0,5 );
   mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
                              this, SLOT( setAllOpen() ),0,6 );
   mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 78fa24f..9c35b1d 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -351,64 +351,68 @@ void Incidence::setCategories(const QStringList &categories)
   mCategories = categories;
   checkCategories();
   updated();
 }
 
 // TODO: remove setCategories(QString) function
 void Incidence::setCategories(const QString &catStr)
 {
   if (mReadOnly) return;
   mCategories.clear();
 
   if (catStr.isEmpty()) return;
 
   mCategories = QStringList::split(",",catStr);
 
   QStringList::Iterator it;
   for(it = mCategories.begin();it != mCategories.end(); ++it) {
     *it = (*it).stripWhiteSpace();
   }
   checkCategories();
   updated();
 }
 
 QStringList Incidence::categories() const
 {
   return mCategories;
 }
 
 QString Incidence::categoriesStr()
 {
   return mCategories.join(",");
 }
+QString Incidence::categoriesStrWithSpace()
+{
+  return mCategories.join(", ");
+}
 
 void Incidence::setRelatedToUid(const QString &relatedToUid)
 {
   if (mReadOnly) return;
   mRelatedToUid = relatedToUid;
 }
 
 QString Incidence::relatedToUid() const
 {
   return mRelatedToUid;
 }
 
 void Incidence::setRelatedTo(Incidence *relatedTo)
 {
     //qDebug("Incidence::setRelatedTo %d ", relatedTo);
     //qDebug("setRelatedTo(Incidence *relatedTo) %s %s", summary().latin1(), relatedTo->summary().latin1() );
   if (mReadOnly || mRelatedTo == relatedTo) return;
   if(mRelatedTo) {
       // updated();
     mRelatedTo->removeRelation(this);
   }
   mRelatedTo = relatedTo;
   if (mRelatedTo)  {
       mRelatedTo->addRelation(this);
       mRelatedToUid = mRelatedTo->uid();
   } else {
       mRelatedToUid = "";
   }
 }
 
 Incidence *Incidence::relatedTo() const
 {
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 60070a2..327e7dd 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -129,64 +129,65 @@ class Incidence : public IncidenceBase
     void setCreated(QDateTime);
     /** return time and date of creation. */
     QDateTime created() const;
 
     /** set the number of revisions this event has seen */
     void setRevision(int rev);
     /** return the number of revisions this event has seen */
     int revision() const;
 
     /** Set starting date/time. */
     virtual void setDtStart(const QDateTime &dtStart);
     /** Return the incidence's ending date/time as a QDateTime. */
     virtual QDateTime dtEnd() const  { return QDateTime(); }
 
     /** sets the event's lengthy description. */
     void setDescription(const QString &description);
     /** returns a reference to the event's description. */
     QString description() const;
 
     /** sets the event's short summary. */
     void setSummary(const QString &summary);
     /** returns a reference to the event's summary. */
     QString summary() const;
 
     /** set event's applicable categories */
     void setCategories(const QStringList &categories);
     /** set event's categories based on a comma delimited string */
     void setCategories(const QString &catStr);
     /** return categories in a list */
     QStringList categories() const;
     /** return categories as a comma separated string */
     QString categoriesStr();
+    QString categoriesStrWithSpace();
 
     /** point at some other event to which the event relates. This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     void setRelatedToUid(const QString &);
     /** what event does this one relate to? This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     QString relatedToUid() const;
     /** point at some other event to which the event relates */
     void setRelatedTo(Incidence *relatedTo);
     /** what event does this one relate to? */
     Incidence *relatedTo() const;
     /** All events that are related to this event */
     QPtrList<Incidence> relations() const;
     /** Add an event which is related to this event */
     void addRelation(Incidence *);
     /** Remove event that is related to this event */
     void removeRelation(Incidence *);
 
     /** returns the list of dates which are exceptions to the recurrence rule */
     DateList exDates() const;
     /** sets the list of dates which are exceptions to the recurrence rule */
     void setExDates(const DateList &_exDates);
     void setExDates(const char *dates);
     /** Add a date to the list of exceptions of the recurrence rule. */
     void addExDate(const QDate &date);
 
     /** returns true if there is an exception for this date in the recurrence
      rule set, or false otherwise. */
     bool isException(const QDate &qd) const;
 
diff --git a/version b/version
index a87e533..da7dcfc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.28";
+version = "2.1.0";