author | zautrix <zautrix> | 2005-02-08 23:15:22 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-08 23:15:22 (UTC) |
commit | d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a (patch) (unidiff) | |
tree | 751d52e216392132e8ad36ba9e8a23ae64083951 | |
parent | 2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6 (diff) | |
download | kdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.zip kdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.tar.gz kdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.tar.bz2 |
fff
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 7 | ||||
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 11 | ||||
-rw-r--r-- | microkde/kdatetbl.cpp | 2 | ||||
-rw-r--r-- | version | 2 |
5 files changed, 14 insertions, 10 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 4c53aac..b7f00ed 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,9 +1,9 @@ | |||
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.5 | 3 | Version: 2.0.6 |
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 |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 02d2585..da81586 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -914,25 +914,32 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
914 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 914 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
915 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 915 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
916 | } | 916 | } |
917 | 917 | ||
918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
919 | 919 | ||
920 | #if 0 | ||
920 | if ( mShowWeekView ) | 921 | if ( mShowWeekView ) |
921 | mWidStack->raiseWidget( mWeekView ); | 922 | mWidStack->raiseWidget( mWeekView ); |
922 | else | 923 | else |
923 | mWidStack->raiseWidget( mMonthView ); | 924 | mWidStack->raiseWidget( mMonthView ); |
925 | #endif | ||
924 | 926 | ||
925 | emit incidenceSelected( 0 ); | 927 | emit incidenceSelected( 0 ); |
926 | #ifndef DESKTOP_VERSION | 928 | #ifndef DESKTOP_VERSION |
927 | resize( QApplication::desktop()->size() ); | 929 | resize( QApplication::desktop()->size() ); |
928 | #else | 930 | #else |
929 | resize(640, 480 ); | 931 | resize(640, 480 ); |
932 | updatePossible = true; | ||
930 | #endif | 933 | #endif |
931 | computeLayout(); | 934 | computeLayout(); |
932 | 935 | ||
936 | if ( mShowWeekView ) | ||
937 | mWidStack->raiseWidget( mWeekView ); | ||
938 | else | ||
939 | mWidStack->raiseWidget( mMonthView ); | ||
933 | } | 940 | } |
934 | 941 | ||
935 | KOMonthView::~KOMonthView() | 942 | KOMonthView::~KOMonthView() |
936 | { | 943 | { |
937 | delete mContextMenu; | 944 | delete mContextMenu; |
938 | } | 945 | } |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 78d4027..44db209 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -263,13 +263,13 @@ void KOTodoViewItem::stateChange(bool state) | |||
263 | setMyPixmap(); | 263 | setMyPixmap(); |
264 | mTodoView->setTodoModified( mTodo ); | 264 | mTodoView->setTodoModified( mTodo ); |
265 | } | 265 | } |
266 | 266 | ||
267 | bool KOTodoViewItem::isAlternate() | 267 | bool KOTodoViewItem::isAlternate() |
268 | { | 268 | { |
269 | #ifndef KORG_NOLVALTERNATION | 269 | |
270 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | 270 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); |
271 | if (lv && lv->alternateBackground().isValid()) | 271 | if (lv && lv->alternateBackground().isValid()) |
272 | { | 272 | { |
273 | KOTodoViewItem *above = 0; | 273 | KOTodoViewItem *above = 0; |
274 | above = dynamic_cast<KOTodoViewItem *>(itemAbove()); | 274 | above = dynamic_cast<KOTodoViewItem *>(itemAbove()); |
275 | m_known = above ? above->m_known : true; | 275 | m_known = above ? above->m_known : true; |
@@ -300,28 +300,25 @@ bool KOTodoViewItem::isAlternate() | |||
300 | item = dynamic_cast<KOTodoViewItem *>(item->nextSibling()); | 300 | item = dynamic_cast<KOTodoViewItem *>(item->nextSibling()); |
301 | } | 301 | } |
302 | } | 302 | } |
303 | return m_odd; | 303 | return m_odd; |
304 | } | 304 | } |
305 | return false; | 305 | return false; |
306 | #else | ||
307 | return false; | ||
308 | #endif | ||
309 | } | 306 | } |
310 | 307 | ||
311 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 308 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
312 | { | 309 | { |
313 | QColorGroup _cg = cg; | 310 | QColorGroup _cg = cg; |
314 | QColorGroup::ColorRole role; | 311 | QColorGroup::ColorRole role; |
315 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) | 312 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) |
316 | role = QColorGroup::Text; | 313 | role = QColorGroup::Text; |
317 | else | 314 | else |
318 | role = QColorGroup::Base; | 315 | role = QColorGroup::Base; |
319 | //#ifndef KORG_NOLVALTERNATION | 316 | //#ifndef KORG_NOLVALTERNATION |
320 | // if (isAlternate()) | 317 | if (isAlternate()) |
321 | // _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); | 318 | _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); |
322 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; | 319 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; |
323 | QColor colorToSet; | 320 | QColor colorToSet; |
324 | if ( setColor ) { | 321 | if ( setColor ) { |
325 | QStringList categories = mTodo->categories(); | 322 | QStringList categories = mTodo->categories(); |
326 | QString cat = categories.first(); | 323 | QString cat = categories.first(); |
327 | if ( !cat.isEmpty()) { | 324 | if ( !cat.isEmpty()) { |
@@ -373,13 +370,13 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i | |||
373 | } | 370 | } |
374 | 371 | ||
375 | int align = alignment; | 372 | int align = alignment; |
376 | 373 | ||
377 | if ( !p ) | 374 | if ( !p ) |
378 | return; | 375 | return; |
379 | 376 | ||
380 | p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) ); | 377 | p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) ); |
381 | 378 | ||
382 | QListView *lv = listView(); | 379 | QListView *lv = listView(); |
383 | if ( !lv ) | 380 | if ( !lv ) |
384 | return; | 381 | return; |
385 | int marg = 2;//lv->itemMargin(); | 382 | int marg = 2;//lv->itemMargin(); |
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index 1024796..d182279 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp | |||
@@ -455,13 +455,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker | |||
455 | font=KGlobalSettings::generalFont(); | 455 | font=KGlobalSettings::generalFont(); |
456 | int fontsize = 10; | 456 | int fontsize = 10; |
457 | int add = 2; | 457 | int add = 2; |
458 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 458 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
459 | add += 8; | 459 | add += 8; |
460 | if ( QApplication::desktop()->width() > 640 ) | 460 | if ( QApplication::desktop()->width() > 640 ) |
461 | add += 4; | 461 | add += 6; |
462 | font.setPointSize(fontsize+add); | 462 | font.setPointSize(fontsize+add); |
463 | setFont(font); | 463 | setFont(font); |
464 | setHScrollBarMode(AlwaysOff); | 464 | setHScrollBarMode(AlwaysOff); |
465 | setVScrollBarMode(AlwaysOff); | 465 | setVScrollBarMode(AlwaysOff); |
466 | setFrameStyle(QFrame::NoFrame); | 466 | setFrameStyle(QFrame::NoFrame); |
467 | setNumRows(4); | 467 | setNumRows(4); |
@@ -1 +1 @@ | |||
version = "2.0.5"; | version = "2.0.6"; | ||