-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 8 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 01d9e27..3c757a1 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,26 +1,30 @@ | |||
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 2.0.9 ************ | ||
4 | |||
5 | Made month view icons for multiday events a bit nicer. | ||
6 | |||
3 | ********** VERSION 2.0.8 ************ | 7 | ********** VERSION 2.0.8 ************ |
4 | 8 | ||
5 | Fixed a problem in dependency info in the ipk files for the Zaurus. | 9 | Fixed a problem in dependency info in the ipk files for the Zaurus. |
6 | 10 | ||
7 | 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. | 11 | 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. |
8 | 12 | ||
9 | Added a "go today" button to the datepicker. | 13 | Added a "go today" button to the datepicker. |
10 | 14 | ||
11 | Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) | 15 | Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) |
12 | and made it configureable to show these values. | 16 | and made it configureable to show these values. |
13 | 17 | ||
14 | Fixed a problem for events (from external iCal files) that do have a duration but no end date. | 18 | Fixed a problem for events (from external iCal files) that do have a duration but no end date. |
15 | 19 | ||
16 | 20 | ||
17 | ********** VERSION 2.0.7 ************ | 21 | ********** VERSION 2.0.7 ************ |
18 | 22 | ||
19 | Added global application font settings | 23 | Added global application font settings |
20 | (for all KDE-Pim/Pi apps) to the general settings. | 24 | (for all KDE-Pim/Pi apps) to the general settings. |
21 | 25 | ||
22 | Fixed a problem in OM/Pi when trying to login to some IMAP servers | 26 | Fixed a problem in OM/Pi when trying to login to some IMAP servers |
23 | (like the IMAP server of Apple: mail.mac.com ) | 27 | (like the IMAP server of Apple: mail.mac.com ) |
24 | 28 | ||
25 | Added recurring todos to KO/Pi. | 29 | Added recurring todos to KO/Pi. |
26 | 30 | ||
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 4d81192..05f61c4 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,27 +1,27 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.8 | 3 | Version: 2.0.9 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.net, compiled for SuSE 9.2: | 13 | www.pi-sync.net, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index f558084..ddac6e4 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -227,69 +227,71 @@ void MonthViewItem::paint(QPainter *p) | |||
227 | int y = (height( listBox () ) - size -1 ) /2; | 227 | int y = (height( listBox () ) - size -1 ) /2; |
228 | 228 | ||
229 | if ( KOPrefs::instance()->mMonthShowIcons ) { | 229 | if ( KOPrefs::instance()->mMonthShowIcons ) { |
230 | if ( mInfo ) { | 230 | if ( mInfo ) { |
231 | p->fillRect ( x, y,size,size, Qt::darkGreen ); | 231 | p->fillRect ( x, y,size,size, Qt::darkGreen ); |
232 | x += size + 1; | 232 | x += size + 1; |
233 | } | 233 | } |
234 | if ( mRecur ) { | 234 | if ( mRecur ) { |
235 | p->fillRect ( x, y,size,size, Qt::blue ); | 235 | p->fillRect ( x, y,size,size, Qt::blue ); |
236 | x += size + 1; | 236 | x += size + 1; |
237 | } | 237 | } |
238 | if ( mAlarm ) { | 238 | if ( mAlarm ) { |
239 | p->fillRect ( x, y,size,size, Qt::red ); | 239 | p->fillRect ( x, y,size,size, Qt::red ); |
240 | x += size + 1; | 240 | x += size + 1; |
241 | } | 241 | } |
242 | if ( mReply ) { | 242 | if ( mReply ) { |
243 | p->fillRect ( x, y,size,size, Qt::yellow ); | 243 | p->fillRect ( x, y,size,size, Qt::yellow ); |
244 | x += size + 1; | 244 | x += size + 1; |
245 | } | 245 | } |
246 | } | 246 | } |
247 | if ( mMultiday ) { | 247 | if ( mMultiday ) { |
248 | int yyy = y+(size/2); | 248 | int yyy = y+(size/2); |
249 | int sizeM = size+2; | 249 | int sizeM = size+2; |
250 | p->setBrush( QBrush::SolidPattern ); | 250 | p->setBrush( QBrush::SolidPattern ); |
251 | p->drawLine ( x+sizeM/2, yyy, x +sizeM +sizeM/2-2, yyy ) ; | 251 | p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ; |
252 | if ( mMultiday == 2 || mMultiday == 3 ) { | 252 | if ( mMultiday == 2 || mMultiday == 3 ) { |
253 | QPointArray pa ( 3 ); | 253 | QPointArray pa ( 3 ); |
254 | pa.setPoint (0, x, yyy ); | 254 | pa.setPoint (0, x, yyy ); |
255 | pa.setPoint (1, x+sizeM/2, yyy+sizeM/2 ); | 255 | pa.setPoint (1, x+sizeM/2, yyy+sizeM/2 ); |
256 | pa.setPoint (2, x+sizeM/2, yyy-sizeM/2 ); | 256 | pa.setPoint (2, x+sizeM/2, yyy-sizeM/2 ); |
257 | p->drawPolygon( pa ); | 257 | p->drawPolygon( pa ); |
258 | } | 258 | } |
259 | if ( mMultiday == 2 || mMultiday == 1 ) { | 259 | if ( mMultiday == 2 || mMultiday == 1 ) { |
260 | QPointArray pa ( 3 ); | 260 | QPointArray pa ( 3 ); |
261 | pa.setPoint (0, x+sizeM +sizeM/2, yyy ); | 261 | pa.setPoint (0, x+sizeM +sizeM/2, yyy ); |
262 | pa.setPoint (1, x+sizeM, yyy+sizeM/2 ); | 262 | pa.setPoint (1, x+sizeM, yyy+sizeM/2 ); |
263 | pa.setPoint (2, x+sizeM, yyy-sizeM/2 ); | 263 | pa.setPoint (2, x+sizeM, yyy-sizeM/2 ); |
264 | p->drawPolygon( pa ); | 264 | p->drawPolygon( pa ); |
265 | } | 265 | } |
266 | if ( mMultiday == 1 ) { | 266 | if ( mMultiday == 1 ) { |
267 | p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); | 267 | // p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); |
268 | 268 | ||
269 | p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 ); | ||
269 | } | 270 | } |
270 | if ( mMultiday == 3 ) { | 271 | if ( mMultiday == 3 ) { |
271 | p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); | 272 | // p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); |
273 | p->drawLine ( x+sizeM +sizeM/2-1, yyy-sizeM/2, x+sizeM +sizeM/2-1, yyy+sizeM/2 ); | ||
272 | 274 | ||
273 | } | 275 | } |
274 | x += sizeM/2 + 1; | 276 | x += sizeM/2 + 1; |
275 | x += sizeM + 1; | 277 | x += sizeM + 1; |
276 | } | 278 | } |
277 | QFontMetrics fm = p->fontMetrics(); | 279 | QFontMetrics fm = p->fontMetrics(); |
278 | int yPos; | 280 | int yPos; |
279 | int pmheight = size; | 281 | int pmheight = size; |
280 | if( pmheight < fm.height() ) | 282 | if( pmheight < fm.height() ) |
281 | yPos = fm.ascent() + fm.leading()/2; | 283 | yPos = fm.ascent() + fm.leading()/2; |
282 | else | 284 | else |
283 | yPos = pmheight/2 - fm.height()/2 + fm.ascent(); | 285 | yPos = pmheight/2 - fm.height()/2 + fm.ascent(); |
284 | p->setPen( palette().color( QPalette::Normal, sel ? \ | 286 | p->setPen( palette().color( QPalette::Normal, sel ? \ |
285 | QColorGroup::HighlightedText : QColorGroup::Foreground ) ); | 287 | QColorGroup::HighlightedText : QColorGroup::Foreground ) ); |
286 | p->drawText( x, yPos, text() ); | 288 | p->drawText( x, yPos, text() ); |
287 | if ( mIncidence->cancelled() ) { | 289 | if ( mIncidence->cancelled() ) { |
288 | int wid = fm.width( text() ); | 290 | int wid = fm.width( text() ); |
289 | p->drawLine( x, yPos- fm.height()/2+3,x+wid, yPos- fm.height()/2 +3); | 291 | p->drawLine( x, yPos- fm.height()/2+3,x+wid, yPos- fm.height()/2 +3); |
290 | } | 292 | } |
291 | 293 | ||
292 | } | 294 | } |
293 | 295 | ||
294 | int MonthViewItem::height(const QListBox *lb) const | 296 | int MonthViewItem::height(const QListBox *lb) const |
295 | { | 297 | { |
@@ -1 +1 @@ | |||
version = "2.0.8"; | version = "2.0.9"; | ||