author | zautrix <zautrix> | 2005-01-05 14:55:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-05 14:55:14 (UTC) |
commit | 71017beb975666a0f654898ed6a40a5303d567dc (patch) (unidiff) | |
tree | 39f3c0e3c890ee90806e93d9ce9bd9024be11d55 | |
parent | df0200487afbfa59b80a79e548d70b5203019003 (diff) | |
download | kdepimpi-71017beb975666a0f654898ed6a40a5303d567dc.zip kdepimpi-71017beb975666a0f654898ed6a40a5303d567dc.tar.gz kdepimpi-71017beb975666a0f654898ed6a40a5303d567dc.tar.bz2 |
minor fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
-rw-r--r-- | korganizer/koagenda.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index bfe87f0..1a8b885 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,33 +1,34 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 1.9.16 ************ | 3 | ********** VERSION 1.9.16 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed search dialog size on Z 6000 (480x640 display). | 6 | Fixed search dialog size on Z 6000 (480x640 display). |
7 | Added setting to hide/show time in agenda items. | 7 | Added setting to hide/show time in agenda items. |
8 | Added setting to hide not running todos in todo view. | 8 | Added setting to hide not running todos in todo view. |
9 | Added columns for start date/time in todo view. | 9 | Added columns for start date/time in todo view. |
10 | Replaced the solid half-hour lines in agenda view by dot lines. | ||
10 | 11 | ||
11 | ********** VERSION 1.9.15 ************ | 12 | ********** VERSION 1.9.15 ************ |
12 | 13 | ||
13 | Usebilty enhancements in KO/Pi: | 14 | Usebilty enhancements in KO/Pi: |
14 | When clicking on the date in a month view cell, the day view is shown. | 15 | When clicking on the date in a month view cell, the day view is shown. |
15 | Old behaviour was, that the "new event" dialog popped up. | 16 | Old behaviour was, that the "new event" dialog popped up. |
16 | 17 | ||
17 | Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). | 18 | Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). |
18 | That means, you can restore the latest | 19 | That means, you can restore the latest |
19 | event/todo/journal you have deleted. | 20 | event/todo/journal you have deleted. |
20 | A journal is deleted, if you clear all the text of the journal. | 21 | A journal is deleted, if you clear all the text of the journal. |
21 | 22 | ||
22 | Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14. | 23 | Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14. |
23 | 24 | ||
24 | KA/Pi starting in 480x640 resolution: | 25 | KA/Pi starting in 480x640 resolution: |
25 | Hide the filter action in toolbar | 26 | Hide the filter action in toolbar |
26 | and added icons for undo/delete/redo in toolbar. | 27 | and added icons for undo/delete/redo in toolbar. |
27 | 28 | ||
28 | Change in OM/Pi ViewMail dialog: | 29 | Change in OM/Pi ViewMail dialog: |
29 | When clicking on the "delete" icon the mail is deleted after confirmation as usual. But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any). | 30 | When clicking on the "delete" icon the mail is deleted after confirmation as usual. But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any). |
30 | 31 | ||
31 | Fixed a crash when deleting mail-accounts in OM/Pi. | 32 | Fixed a crash when deleting mail-accounts in OM/Pi. |
32 | 33 | ||
33 | 34 | ||
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 6532705..eb3791e 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -1218,51 +1218,56 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
1218 | (mColumns - 1 - mSelectionCellX) * mGridSpacingX : | 1218 | (mColumns - 1 - mSelectionCellX) * mGridSpacingX : |
1219 | mSelectionCellX * mGridSpacingX; | 1219 | mSelectionCellX * mGridSpacingX; |
1220 | 1220 | ||
1221 | // Draw selection | 1221 | // Draw selection |
1222 | if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && | 1222 | if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && |
1223 | ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { | 1223 | ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { |
1224 | // TODO: paint only part within cx,cy,cw,ch | 1224 | // TODO: paint only part within cx,cy,cw,ch |
1225 | p->fillRect( selectionX, mSelectionYTop, mGridSpacingX, | 1225 | p->fillRect( selectionX, mSelectionYTop, mGridSpacingX, |
1226 | mSelectionHeight, KOPrefs::instance()->mHighlightColor ); | 1226 | mSelectionHeight, KOPrefs::instance()->mHighlightColor ); |
1227 | } | 1227 | } |
1228 | */ | 1228 | */ |
1229 | // Draw vertical lines of grid | 1229 | // Draw vertical lines of grid |
1230 | 1230 | ||
1231 | int x = ((int)(cx/mGridSpacingX))*mGridSpacingX; | 1231 | int x = ((int)(cx/mGridSpacingX))*mGridSpacingX; |
1232 | if ( mGridSpacingX > 0 ) { | 1232 | if ( mGridSpacingX > 0 ) { |
1233 | while (x < cx + cw) { | 1233 | while (x < cx + cw) { |
1234 | p->drawLine(x,cy,x,cy+ch); | 1234 | p->drawLine(x,cy,x,cy+ch); |
1235 | x+=mGridSpacingX; | 1235 | x+=mGridSpacingX; |
1236 | } | 1236 | } |
1237 | } | 1237 | } |
1238 | // Draw horizontal lines of grid | 1238 | // Draw horizontal lines of grid |
1239 | int y = ((int)(cy/lGridSpacingY))*lGridSpacingY; | 1239 | int y = ((int)(cy/lGridSpacingY))*lGridSpacingY; |
1240 | if ( lGridSpacingY > 0 ) { | 1240 | if ( lGridSpacingY > 0 ) { |
1241 | while (y < cy + ch) { | 1241 | while (y < cy + ch) { |
1242 | p->setPen( SolidLine ); | ||
1243 | p->drawLine(cx,y,cx+cw,y); | ||
1244 | y+=lGridSpacingY; | ||
1245 | p->setPen( DotLine ); | ||
1242 | p->drawLine(cx,y,cx+cw,y); | 1246 | p->drawLine(cx,y,cx+cw,y); |
1243 | y+=lGridSpacingY; | 1247 | y+=lGridSpacingY; |
1244 | } | 1248 | } |
1249 | p->setPen( SolidLine ); | ||
1245 | } | 1250 | } |
1246 | mPixPainter.end() ; | 1251 | mPixPainter.end() ; |
1247 | } | 1252 | } |
1248 | 1253 | ||
1249 | /* | 1254 | /* |
1250 | Convert srcollview contents coordinates to agenda grid coordinates. | 1255 | Convert srcollview contents coordinates to agenda grid coordinates. |
1251 | */ | 1256 | */ |
1252 | void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy) | 1257 | void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy) |
1253 | { | 1258 | { |
1254 | gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX : | 1259 | gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX : |
1255 | x/mGridSpacingX; | 1260 | x/mGridSpacingX; |
1256 | gy = y/mGridSpacingY; | 1261 | gy = y/mGridSpacingY; |
1257 | } | 1262 | } |
1258 | 1263 | ||
1259 | /* | 1264 | /* |
1260 | Convert agenda grid coordinates to scrollview contents coordinates. | 1265 | Convert agenda grid coordinates to scrollview contents coordinates. |
1261 | */ | 1266 | */ |
1262 | void KOAgenda::gridToContents (int gx, int gy, int& x, int& y) | 1267 | void KOAgenda::gridToContents (int gx, int gy, int& x, int& y) |
1263 | { | 1268 | { |
1264 | x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX: | 1269 | x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX: |
1265 | gx*mGridSpacingX; | 1270 | gx*mGridSpacingX; |
1266 | y = gy*mGridSpacingY; | 1271 | y = gy*mGridSpacingY; |
1267 | } | 1272 | } |
1268 | 1273 | ||