[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/korganizer
From:       Bram Schoenmakers <bramschoenmakers () kde ! nl>
Date:       2005-03-04 11:30:48
Message-ID: 20050304113048.0CE0F157B9 () office ! kde ! org
[Download RAW message or body]

CVS commit by bram: 

I reverted headers instead of source files. Bram, you're such a #########


  M +5 -11     koprefsdialog.cpp   1.125
  M +6 -6      koprefsdialog.h   1.33
  M +1 -7      kotodoviewitem.cpp   1.50
  M +1 -0      kotodoviewitem.h   1.20


--- kdepim/korganizer/kotodoviewitem.cpp  #1.49:1.50
@@ -239,10 +239,4 @@ void KOTodoViewItem::paintCell(QPainter 
       _cg.setColor(QColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor));
     }
-    if( mTodo->dtDue().date() == QDate::currentDate().addDays( 1 ) &&
-          !mTodo->isCompleted() )
-    {
-      _cg.setColor(QColorGroup::Base, KOPrefs::instance()->mTodoDueTomorrowColor);
-      _cg.setColor(QColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTomorrowColor));
-    }
   }
 #endif

--- kdepim/korganizer/kotodoviewitem.h  #1.19:1.20
@@ -3,4 +3,5 @@
 
     Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
 
     This program is free software; you can redistribute it and/or modify

--- kdepim/korganizer/koprefsdialog.cpp  #1.124:1.125
@@ -681,20 +681,14 @@ KOPrefsDialogColors::KOPrefsDialogColors
   topLayout->addWidget(todoDueTodayColor->button(),5,1);
 
-    // Todo due tomorrow color
-  KPrefsWidColor *todoDueTomorrowColor =
-      addWidColor( KOPrefs::instance()->todoDueTomorrowColorItem(), topFrame );
-  topLayout->addWidget(todoDueTomorrowColor->label(),6,0);
-  topLayout->addWidget(todoDueTomorrowColor->button(),6,1);
-
   // Todo overdue color
   KPrefsWidColor *todoOverdueColor =
       addWidColor( KOPrefs::instance()->todoOverdueColorItem(), topFrame );
-  topLayout->addWidget(todoOverdueColor->label(),7,0);
-  topLayout->addWidget(todoOverdueColor->button(),7,1);
+  topLayout->addWidget(todoOverdueColor->label(),6,0);
+  topLayout->addWidget(todoOverdueColor->button(),6,1);
 
   // categories colors
   QGroupBox *categoryGroup = new QGroupBox(1,Horizontal,i18n("Categories"),
                                            topFrame);
-  topLayout->addMultiCellWidget(categoryGroup,8,8,0,1);
+  topLayout->addMultiCellWidget(categoryGroup,7,7,0,1);
 
   mCategoryCombo = new QComboBox(categoryGroup);
@@ -709,5 +703,5 @@ KOPrefsDialogColors::KOPrefsDialogColors
   QGroupBox *resourceGroup = new QGroupBox(1,Horizontal,i18n("Resources"),
                                            topFrame);
-  topLayout->addMultiCellWidget(resourceGroup,9,9,0,1);
+  topLayout->addMultiCellWidget(resourceGroup,8,8,0,1);
 
   mResourceCombo = new QComboBox(resourceGroup);
@@ -719,5 +713,5 @@ KOPrefsDialogColors::KOPrefsDialogColors
   updateResources();
 
-  topLayout->setRowStretch(10,1);
+  topLayout->setRowStretch(9,1);
 
   load();

--- kdepim/korganizer/koprefsdialog.h  #1.32:1.33
@@ -39,5 +39,5 @@ class QColor;
 class QListView;
 
-class KOPrefsDialogMain : public KPrefsModule
+class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 {
     Q_OBJECT
@@ -60,5 +60,5 @@ class KOPrefsDialogMain : public KPrefsM
 };
 
-class KOPrefsDialogColors : public KPrefsModule
+class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
 {
     Q_OBJECT
@@ -90,5 +90,5 @@ class KOPrefsDialogColors : public KPref
 };
 
-class KOPrefsDialogGroupScheduling : public KPrefsModule
+class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule
 {
     Q_OBJECT
@@ -113,5 +113,5 @@ class KOPrefsDialogGroupScheduling : pub
 class KOGroupwarePrefsPage;
 
-class KOPrefsDialogGroupwareScheduling : public KPrefsModule
+class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
 {
     Q_OBJECT
@@ -127,5 +127,5 @@ class KOPrefsDialogGroupwareScheduling :
 };
 
-class KOPrefsDialogPlugins : public KPrefsModule
+class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
 {
     Q_OBJECT
@@ -146,5 +146,5 @@ class KOPrefsDialogPlugins : public KPre
 };
 
-class KOPrefsDesignerFields : public KPIM::KCMDesignerFields
+class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields
 {
   public:


[prev in list] [next in list] [prev in thread] [next in thread]