text

2 files changed, 41 insertions, 9 deletions

diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt
index ab6b224..052680e 100644
--- a/bin/kdepim/korganizer/featuresKOPI.txt
+++ b/bin/kdepim/korganizer/featuresKOPI.txt
@@ -145,2 +145,4 @@ B) Useful features, that are not straighforward to see
 6) Navigation in agenda view
+7) Monthview as week view
+8) Switching display mode in date edit
 
@@ -156,5 +158,6 @@ That bevaviour is not a bug, it is caused by the the behaviour of the
 single left click on the item.
+
 2)
 Moving of items in the agenda view:
-In the aganda view you can move an item by clicking on it and holding
+In the agenda view you can move an item by clicking on it and holding
 the mouse down.
@@ -164,2 +167,3 @@ you to make unwanted moves of the item when you click on it(and moving the
 mouse only a small distance with this click)
+
 3)
@@ -170,4 +174,5 @@ This recurrence is automatically added to the list
 of recurrence exceptions and a non-recurring clone is created.
-To cancel a recurrence, create an exception by moving it
+To cancel a single recurrence, create an exception by moving it
 and then move it back and cancel it.
+
 4)
@@ -176,2 +181,3 @@ In the month view there are on the left week numbers displayed.
 Click on a week number to see this week in the agenda view.
+
 5) 
@@ -189,2 +195,3 @@ then the (month-)navigation keys will select automatically the
 complete next month as date range.
+
 6)
@@ -203,3 +210,29 @@ The agenda view has "time labels" on the left, which displays the hours from 0-2
 If you press the mouse on the timelabels and move it up/down you can 
-increase/decrease the agenda size quickly.  
+increase/decrease the agenda size quickly. 
+    In the agenda view you can click on the day labels (e.g. Mon 14)
+to see the selected date in single day mode. 
+If you click in single day mode the day label you will switch back to
+the previously selected date range.
+Right of the day labels is a ">" button.
+If you click this button, you will go one day ahead.
+Left of the day labels is the month name displayed.
+If you click this button, the month view is shown. 
+
+7) 
+Monthview as week view:
+On the left side of the monthview are the week number labels displayed.
+On top of these labels is a "W" displayed.
+If you click on this button the month view mode will switch to week view mode.
+To switch back, please click the button, which now displays a "M".
+
+8) 
+Switching display mode in date edit:
+On several places is a date edit used.
+You can scroll the dates by selecting the part of the date (month, day, year)
+in the lineedit and pressing the key up/key down key.
+The display mode of a date edit is initially short date mode.
+(I.e. weekday names are not displayed)
+If you doubleclick in the lineedit the mode switches to long date mode.
+Now the weekday names are displayed for better overview.
+To switch back simply doubleclick again in the line edit.
  
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9888566..6294b98 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -692,7 +692,3 @@ void MonthViewCell::resizeEvent ( QResizeEvent * )
         return;
-#ifndef DESKTOP_VERSION
-    if ( !isVisible() ){
-        return;
-    }
-#endif
+
     int size = height() - mLabel->height() - 2;
@@ -843,2 +839,4 @@ void KOMonthView::switchView()
 {
+    if ( selectedCell( ) )
+        selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
@@ -1161,2 +1159,3 @@ void KOMonthView::computeLayoutWeek()
             x = 0;
+            w =  colWid;
         }
@@ -1165,3 +1164,3 @@ void KOMonthView::computeLayoutWeek()
         if ( i >=  5 ) {
-            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
+            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h);
             x -= w/2 ;