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

List:       kde-pim
Subject:    [Kde-pim] KOrganizer: Recurring events in date navigator
From:       Olaf Hartig <OleBowle () gmx ! de>(by way of Olaf Hartig <OleBowle () gmx ! de>)
Date:       2002-02-28 22:38:31
[Download RAW message or body]

Hello KOrganizer developers,

I've attached a patch for KOrganizer. It adds the possibility to "show"
events, that recur monthly and/or yearly, in the date navigator.
I've been missing this since I started using KO and would really like to see
it in KDE 3.0, but it introduces new strings.

--
Bye,
Ole


["korganizer.diff" (text/x-diff)]

Index: kodaymatrix.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/kodaymatrix.cpp,v
retrieving revision 1.7
diff -u -3 -p -u -r1.7 kodaymatrix.cpp
--- kodaymatrix.cpp	2002/01/22 12:33:56	1.7
+++ kodaymatrix.cpp	2002/02/28 21:49:26
@@ -238,7 +238,9 @@ void KODayMatrix::updateView(QDate actda
 
       if ((recurType == Recurrence::rNone) ||
           (recurType == Recurrence::rDaily && KOPrefs::instance()->mDailyRecur) ||
-          (recurType == Recurrence::rWeekly && KOPrefs::instance()->mWeeklyRecur)) {
+          (recurType == Recurrence::rWeekly && KOPrefs::instance()->mWeeklyRecur) ||
+          ((recurType == Recurrence::rMonthlyPos || recurType == \
Recurrence::rMonthlyDay) && KOPrefs::instance()->mMonthlyRecur) || +          \
((recurType == Recurrence::rYearlyMonth || recurType == Recurrence::rYearlyDay) && \
KOPrefs::instance()->mYearlyRecur)) {  numEvents++;
         break;
       }
Index: koprefs.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koprefs.cpp,v
retrieving revision 1.45
diff -u -3 -p -u -r1.45 koprefs.cpp
--- koprefs.cpp	2002/02/26 16:40:12	1.45
+++ koprefs.cpp	2002/02/28 21:49:41
@@ -107,6 +107,8 @@ KOPrefs::KOPrefs() :
   addItemInt("Hour Size",&mHourSize,10);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
+  addItemBool("Show Monthly Recurrences",&mMonthlyRecur,true);
+  addItemBool("Show Yearly Recurrences",&mYearlyRecur,true);
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
Index: koprefs.h
===================================================================
RCS file: /home/kde/kdepim/korganizer/koprefs.h,v
retrieving revision 1.34
diff -u -3 -p -u -r1.34 koprefs.h
--- koprefs.h	2002/02/26 16:40:12	1.34
+++ koprefs.h	2002/02/28 21:49:41
@@ -42,7 +42,7 @@ class KOPrefs : public KPrefs
     enum { IMIPOutbox, IMIPdirectsend };
   
     virtual ~KOPrefs();
-  
+
     /** Get instance of KOPrefs. It is made sure that there is only one
     instance. */
     static KOPrefs *instance();
@@ -86,10 +86,10 @@ class KOPrefs : public KPrefs
     bool    mAutoSave;
     int     mAutoSaveInterval;
     bool    mConfirm;
-  
+
     bool    mEnableGroupScheduling;
     bool    mEnableProjectView;
-  
+
     int     mDefaultFormat;
     int     mMailClient;
 
@@ -121,12 +121,14 @@ class KOPrefs : public KPrefs
     int     mHourSize;
     bool    mDailyRecur;
     bool    mWeeklyRecur;
+    bool    mMonthlyRecur;
+    bool    mYearlyRecur;
     bool    mEnableToolTips;
     bool    mEnableMonthScroll;
     bool    mFullViewMonth;
     bool    mFullViewTodo;
     bool    mMarcusBainsEnabled;
-   
+
     bool    mCompactDialogs;
     bool    mVerticalScreen;
 
Index: koprefsdialog.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koprefsdialog.cpp,v
retrieving revision 1.35
diff -u -3 -p -u -r1.35 koprefsdialog.cpp
--- koprefsdialog.cpp	2002/02/26 16:40:12	1.35
+++ koprefsdialog.cpp	2002/02/28 21:49:43
@@ -319,15 +319,25 @@ void KOPrefsDialog::setupViewsTab()
                &(KOPrefs::instance()->mWeeklyRecur),topFrame);
   topLayout->addWidget(weeklyRecur->checkBox(),3,0);
 
+  KPrefsWidBool *monthlyRecur =
+    addWidBool(i18n("Show events that recur monthly in Date Navigator"),
+               &(KOPrefs::instance()->mMonthlyRecur),topFrame);
+  topLayout->addWidget(monthlyRecur->checkBox(),4,0);
+
+  KPrefsWidBool *yearlyRecur =
+    addWidBool(i18n("Show events that recur yearly in Date Navigator"),
+               &(KOPrefs::instance()->mYearlyRecur),topFrame);
+  topLayout->addWidget(yearlyRecur->checkBox(),5,0);
+
   KPrefsWidBool *enableToolTips =
       addWidBool(i18n("Enable ToolTips displaying summary of events"),
                  &(KOPrefs::instance()->mEnableToolTips),topFrame);
-  topLayout->addWidget(enableToolTips->checkBox(),4,0);
+  topLayout->addWidget(enableToolTips->checkBox(),6,0);
 
   KPrefsWidBool *enableMonthScroll =
       addWidBool(i18n("Enable Scrollbars in Month View cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
-  topLayout->addWidget(enableMonthScroll->checkBox(),5,0);
+  topLayout->addWidget(enableMonthScroll->checkBox(),7,0);
 
   KPrefsWidBool *fullViewMonth =
       addWidBool(i18n("Month View uses full window"),


_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

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