summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/featuresKOPI.txt39
-rw-r--r--korganizer/komonthview.cpp11
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
@@ -140,43 +140,49 @@ B) Useful features, that are not straighforward to see
1401) Right mouse click on Zaurus 1401) Right mouse click on Zaurus
1412) Moving of items in the agenda view 1412) Moving of items in the agenda view
1423) Creating exceptions for recurring events 1423) Creating exceptions for recurring events
1434) Accessing the week in agenda view from the Month view 1434) Accessing the week in agenda view from the Month view
1445) Navigation in month view 1445) Navigation in month view
1456) Navigation in agenda view 1456) Navigation in agenda view
1467) Monthview as week view
1478) Switching display mode in date edit
146 148
1471) 1491)
148Right mouse click on Zaurus: 150Right mouse click on Zaurus:
149In KO/Pi on the desktop a right mouse click will popup an menu on some items. 151In KO/Pi on the desktop a right mouse click will popup an menu on some items.
150On the Zaurus there can only the stylus be used. 152On the Zaurus there can only the stylus be used.
151To simulte a right mouse click with the stylus press is and hold it down 153To simulte a right mouse click with the stylus press is and hold it down
152for 1-2 seconds. If you release it then, a menu pops up, if there is 154for 1-2 seconds. If you release it then, a menu pops up, if there is
153a menu available for this particular item. 155a menu available for this particular item.
154On some places the menu pops up without releasing the stylus. 156On some places the menu pops up without releasing the stylus.
155That bevaviour is not a bug, it is caused by the the behaviour of the 157That bevaviour is not a bug, it is caused by the the behaviour of the
156single left click on the item. 158single left click on the item.
159
1572) 1602)
158Moving of items in the agenda view: 161Moving of items in the agenda view:
159In the aganda view you can move an item by clicking on it and holding 162In the agenda view you can move an item by clicking on it and holding
160the mouse down. 163the mouse down.
161You have to move the mouse some distance before the items actually 164You have to move the mouse some distance before the items actually
162starts to move. That is not abug, that is a feature to prevent 165starts to move. That is not abug, that is a feature to prevent
163you to make unwanted moves of the item when you click on it(and moving the 166you to make unwanted moves of the item when you click on it(and moving the
164mouse only a small distance with this click) 167mouse only a small distance with this click)
168
1653) 1693)
166Creating exceptions for recurring events: 170Creating exceptions for recurring events:
167To create an exception for a recurring event, 171To create an exception for a recurring event,
168move this event in the agenda view. 172move this event in the agenda view.
169This recurrence is automatically added to the list 173This recurrence is automatically added to the list
170of recurrence exceptions and a non-recurring clone is created. 174of recurrence exceptions and a non-recurring clone is created.
171To cancel a recurrence, create an exception by moving it 175To cancel a single recurrence, create an exception by moving it
172and then move it back and cancel it. 176and then move it back and cancel it.
177
1734) 1784)
174Accessing the week in agenda view from the month view: 179Accessing the week in agenda view from the month view:
175In the month view there are on the left week numbers displayed. 180In the month view there are on the left week numbers displayed.
176Click on a week number to see this week in the agenda view. 181Click on a week number to see this week in the agenda view.
182
1775) 1835)
178Navigation in month view: 184Navigation in month view:
179If you select the month view with the icon in the toolbar, 185If you select the month view with the icon in the toolbar,
180the selected data range in the date navigator 186the selected data range in the date navigator
181is set automatically to the complete month. 187is set automatically to the complete month.
182(Click on month view and then the space bar to see the 188(Click on month view and then the space bar to see the
@@ -184,12 +190,13 @@ selected data range in the date navigator).
184If you select in the data navigator 190If you select in the data navigator
185(automatically by clicking on the month view or manually) 191(automatically by clicking on the month view or manually)
186a date range from the first of the month to the 192a date range from the first of the month to the
18728.-31. of the month (the 28.-31. is valid for every month!) 19328.-31. of the month (the 28.-31. is valid for every month!)
188then the (month-)navigation keys will select automatically the 194then the (month-)navigation keys will select automatically the
189complete next month as date range. 195complete next month as date range.
196
1906) 1976)
191Navigation in agenda view: 198Navigation in agenda view:
192If you select (as an example) 4 days in the date navigator 199If you select (as an example) 4 days in the date navigator
193the (week-) navigation key will select the same 4 days in the next week. 200the (week-) navigation key will select the same 4 days in the next week.
194If you want to get the next 4 days after the selected 4 days selected, 201If you want to get the next 4 days after the selected 4 days selected,
195you have to switch the navigation mode to "next days mode" 202you have to switch the navigation mode to "next days mode"
@@ -198,13 +205,39 @@ Now the next days from today are selected, but after selecting
1984 days in the day navigator the (week-) navigation key 2054 days in the day navigator the (week-) navigation key
199will select the next 4 days. 206will select the next 4 days.
200The "next days mode" is turned off by clicking on the 207The "next days mode" is turned off by clicking on the
201week view, work week view or day view button. 208week view, work week view or day view button.
202The agenda view has "time labels" on the left, which displays the hours from 0-24. 209The agenda view has "time labels" on the left, which displays the hours from 0-24.
203If you press the mouse on the timelabels and move it up/down you can 210If you press the mouse on the timelabels and move it up/down you can
204increase/decrease the agenda size quickly. 211increase/decrease the agenda size quickly.
212 In the agenda view you can click on the day labels (e.g. Mon 14)
213to see the selected date in single day mode.
214If you click in single day mode the day label you will switch back to
215the previously selected date range.
216Right of the day labels is a ">" button.
217If you click this button, you will go one day ahead.
218Left of the day labels is the month name displayed.
219If you click this button, the month view is shown.
220
2217)
222Monthview as week view:
223On the left side of the monthview are the week number labels displayed.
224On top of these labels is a "W" displayed.
225If you click on this button the month view mode will switch to week view mode.
226To switch back, please click the button, which now displays a "M".
227
2288)
229Switching display mode in date edit:
230On several places is a date edit used.
231You can scroll the dates by selecting the part of the date (month, day, year)
232in the lineedit and pressing the key up/key down key.
233The display mode of a date edit is initially short date mode.
234(I.e. weekday names are not displayed)
235If you doubleclick in the lineedit the mode switches to long date mode.
236Now the weekday names are displayed for better overview.
237To switch back simply doubleclick again in the line edit.
205 238
206 239
207 240
208 241
209 242
210 243
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9888566..6294b98 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -687,17 +687,13 @@ void MonthViewCell::select()
687} 687}
688 688
689void MonthViewCell::resizeEvent ( QResizeEvent * ) 689void MonthViewCell::resizeEvent ( QResizeEvent * )
690{ 690{
691 if ( !mMonthView->isUpdatePossible() ) 691 if ( !mMonthView->isUpdatePossible() )
692 return; 692 return;
693#ifndef DESKTOP_VERSION 693
694 if ( !isVisible() ){
695 return;
696 }
697#endif
698 int size = height() - mLabel->height() - 2; 694 int size = height() - mLabel->height() - 2;
699 if ( size > 0 ) 695 if ( size > 0 )
700 mItemList->verticalScrollBar()->setMaximumHeight( size ); 696 mItemList->verticalScrollBar()->setMaximumHeight( size );
701 size = width() - mLabel->width() -2; 697 size = width() - mLabel->width() -2;
702 if ( size > 0 ) 698 if ( size > 0 )
703 mItemList->horizontalScrollBar()->setMaximumWidth( size ); 699 mItemList->horizontalScrollBar()->setMaximumWidth( size );
@@ -838,12 +834,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
838KOMonthView::~KOMonthView() 834KOMonthView::~KOMonthView()
839{ 835{
840 delete mContextMenu; 836 delete mContextMenu;
841} 837}
842void KOMonthView::switchView() 838void KOMonthView::switchView()
843{ 839{
840 if ( selectedCell( ) )
841 selectedCell()->deselect();
844 mShowWeekView = !mShowWeekView; 842 mShowWeekView = !mShowWeekView;
845 KOPrefs::instance()->mMonthViewWeek = mShowWeekView; 843 KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
846 emit showNavigator( !mShowWeekView ); 844 emit showNavigator( !mShowWeekView );
847 computeLayout(); 845 computeLayout();
848 updateConfig(); 846 updateConfig();
849} 847}
@@ -1156,17 +1154,18 @@ void KOMonthView::computeLayoutWeek()
1156 w = colWid; 1154 w = colWid;
1157 h = dayLabelHei ; 1155 h = dayLabelHei ;
1158 for ( i = 0; i < 7; i++) { 1156 for ( i = 0; i < 7; i++) {
1159 if ( i && !( i % daysToShow) && i < 6) { 1157 if ( i && !( i % daysToShow) && i < 6) {
1160 y += hei/(5-daysToShow); 1158 y += hei/(5-daysToShow);
1161 x = 0; 1159 x = 0;
1160 w = colWid;
1162 } 1161 }
1163 if ( i == daysToShow-colModulo ) 1162 if ( i == daysToShow-colModulo )
1164 ++w; 1163 ++w;
1165 if ( i >= 5 ) { 1164 if ( i >= 5 ) {
1166 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h); 1165 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h);
1167 x -= w/2 ; 1166 x -= w/2 ;
1168 } 1167 }
1169 else 1168 else
1170 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); 1169 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
1171 x += w; 1170 x += w;
1172 } 1171 }