3 files changed, 74 insertions, 69 deletions

diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a9ac52f..33eda60 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -98,8 +98,4 @@ class KOPrefs : public KPimPrefs
     QString mTimeZone;
-    QString mTimeZoneId;
     //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
     //int     mTimeZoneOffset; // e.g. -240 min
-    bool    mUseDaylightsaving;
-    int     mDaylightsavingStart;
-    int     mDaylightsavingEnd;
     int     mStartTime;
@@ -272,10 +268,4 @@ class KOPrefs : public KPimPrefs
     bool mHightlightDateTimeEdit;
-    int mPreferredLanguage;
     bool mUseQuicksave;
-    int mPreferredTime;
-    int mPreferredDate;
-    bool mWeekStartsOnSunday;
     bool mShortDateInViewer;
-    QString mUserDateFormatLong;
-    QString mUserDateFormatShort;
 
@@ -291,2 +281,17 @@ class KOPrefs : public KPimPrefs
 
+
+    //US I copied the following settings into KPimGlobalPrefs
+    // that allows us later to easily remove the settings from here.
+    int mPreferredDate;
+    QString mUserDateFormatLong;
+    QString mUserDateFormatShort;
+    int mPreferredLanguage;
+    int mPreferredTime;
+    bool mWeekStartsOnSunday;
+    QString mTimeZoneId;
+    bool mUseDaylightsaving;
+    int mDaylightsavingStart;
+    int mDaylightsavingEnd;
+
+
   private:
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 5ba4817..1c30faa 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -109,3 +109,3 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    
-   KPrefsWidRadios *syncPrefsGroup =
+   KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
@@ -161,3 +161,3 @@ void  KOPrefsDialog::setupLocaleTab()
    int iii = 0;
- KPrefsWidRadios *syncPrefsGroup =
+ KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
@@ -181,3 +181,3 @@ void  KOPrefsDialog::setupLocaleTab()
    ++iii;   
-   KPrefsWidBool *sb;
+   KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
@@ -207,3 +207,3 @@ void  KOPrefsDialog::setupLocaleTab()
    }
-  //#ifndef DESKTOP_VERSION
+  //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
@@ -232,3 +232,3 @@ void KOPrefsDialog::setupSyncAlgTab()
    
-   KPrefsWidBool *sb =
+   KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
@@ -239,3 +239,3 @@ void KOPrefsDialog::setupSyncAlgTab()
 
-   KPrefsWidRadios *syncPrefsGroup =
+   KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
@@ -299,3 +299,3 @@ void KOPrefsDialog::setupSyncTab()
  
-   KPrefsWidBool *wb =
+   KPrefsDialogWidBool *wb =
        addWidBool(i18n("Write back synced file"),
@@ -322,3 +322,3 @@ void KOPrefsDialog::setupMainTab()
 
- //  KPrefsWidBool *emailControlCenter =
+ //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
@@ -338,3 +338,3 @@ void KOPrefsDialog::setupMainTab()
   topLayout->addWidget(mEmailEdit,1,1);
-  KPrefsWidBool *wb;
+  KPrefsDialogWidBool *wb;
   QHBox *dummy;
@@ -381,3 +381,3 @@ void KOPrefsDialog::setupMainTab()
 
-  // KPrefsWidBool *bcc =
+  // KPrefsDialogWidBool *bcc =
 //       addWidBool(i18n("Send copy to owner when mailing events"),
@@ -408,3 +408,3 @@ void KOPrefsDialog::setupMainTab()
   */
-  KPrefsWidBool *verticalScreen =
+  KPrefsDialogWidBool *verticalScreen =
       addWidBool(i18n("Show vertical screen (Needs restart)"),
@@ -414,3 +414,3 @@ void KOPrefsDialog::setupMainTab()
 
-  KPrefsWidBool *ask =
+  KPrefsDialogWidBool *ask =
     addWidBool(i18n("Ask for quit when closing KO/Pi"),
@@ -421,3 +421,3 @@ void KOPrefsDialog::setupMainTab()
   /*
-  KPrefsWidBool *confirmCheck =
+  KPrefsDialogWidBool *confirmCheck =
       addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
@@ -447,3 +447,3 @@ void KOPrefsDialog::setupMainTab()
 
-  KPrefsWidRadios *defaultFormatGroup =
+  KPrefsDialogWidRadios *defaultFormatGroup =
       addWidRadios(i18n("Default Calendar Format"),
@@ -458,3 +458,3 @@ void KOPrefsDialog::setupMainTab()
 
-  KPrefsWidRadios *mailClientGroup =
+  KPrefsDialogWidRadios *mailClientGroup =
       addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
@@ -465,3 +465,3 @@ void KOPrefsDialog::setupMainTab()
 
-  KPrefsWidBool *htmlsave =
+  KPrefsDialogWidBool *htmlsave =
       addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
@@ -470,3 +470,3 @@ void KOPrefsDialog::setupMainTab()
 
-  KPrefsWidRadios *destinationGroup =
+  KPrefsDialogWidRadios *destinationGroup =
       addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
@@ -492,3 +492,3 @@ void KOPrefsDialog::setupTimeTab()
   QHBox *dummy = new QHBox(topFrame);
-  KPrefsWidTime *dayBegins =
+  KPrefsDialogWidTime *dayBegins =
       addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
@@ -545,3 +545,3 @@ void KOPrefsDialog::setupTimeTab()
 
-//   KPrefsWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
+//   KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
         //      &(KOPrefs::instance()->mMarcusBainsShowSeconds),
@@ -567,3 +567,3 @@ void KOPrefsDialog::setupViewsTab()
 
-//   KPrefsWidTime *dayBegins =
+//   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
@@ -583,3 +583,3 @@ void KOPrefsDialog::setupViewsTab()
   int ii = 0; 
-  KPrefsWidBool *dummy =
+  KPrefsDialogWidBool *dummy =
     addWidBool(i18n("Edit item on doubleclick (if not, show)"),
@@ -598,3 +598,3 @@ void KOPrefsDialog::setupViewsTab()
 
-  KPrefsWidBool *dailyRecur =
+  KPrefsDialogWidBool *dailyRecur =
     addWidBool(i18n("Show events that recur daily in date nav."),
@@ -603,3 +603,3 @@ void KOPrefsDialog::setupViewsTab()
 
-  KPrefsWidBool *weeklyRecur =
+  KPrefsDialogWidBool *weeklyRecur =
     addWidBool(i18n("Show ev. that recur weekly in date nav."),
@@ -609,3 +609,3 @@ void KOPrefsDialog::setupViewsTab()
       
-      KPrefsWidBool *enableToolTips =
+      KPrefsDialogWidBool *enableToolTips =
           addWidBool(i18n("Enable tooltips displaying summary of ev."),
@@ -615,3 +615,3 @@ void KOPrefsDialog::setupViewsTab()
   }
-  KPrefsWidBool *passwdk =
+  KPrefsDialogWidBool *passwdk =
     addWidBool(i18n("Show parent To-Do's in What's Next view"),
@@ -631,3 +631,3 @@ void KOPrefsDialog::setupViewsTab()
    
-  KPrefsWidBool *marcusBainsEnabled =
+  KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show Marcus Bains line"),
@@ -666,3 +666,3 @@ void KOPrefsDialog::setupViewsTab()
 
- KPrefsWidBool *fullViewTodo =
+ KPrefsDialogWidBool *fullViewTodo =
       addWidBool(i18n("Event list view uses full window"),
@@ -671,3 +671,3 @@ void KOPrefsDialog::setupViewsTab()
 
-  KPrefsWidBool *fullViewMonth =
+  KPrefsDialogWidBool *fullViewMonth =
       addWidBool(i18n("Next days view uses full window"),
@@ -748,3 +748,3 @@ void KOPrefsDialog::setupViewsTab()
 #ifdef DESKTOP_VERSION
- KPrefsWidBool *enableMonthScroll =
+ KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
@@ -759,3 +759,3 @@ void KOPrefsDialog::setupViewsTab()
 
- KPrefsWidBool *coloredCategoriesInMonthView =
+ KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
@@ -773,3 +773,3 @@ void KOPrefsDialog::setupViewsTab()
 
- KPrefsWidColor *holidayColor =
+ KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
@@ -802,3 +802,3 @@ void KOPrefsDialog::setupViewsTab()
 
- KPrefsWidBool *showCompletedTodo =
+ KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
@@ -826,3 +826,3 @@ void KOPrefsDialog::setupViewsTab()
   // Todo due today color
-  KPrefsWidColor *todoDueTodayColor =
+  KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
@@ -838,3 +838,3 @@ void KOPrefsDialog::setupViewsTab()
   widLayout = new QHBoxLayout(wid);
-  KPrefsWidColor *todoOverdueColor =
+  KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
@@ -952,5 +952,5 @@ void KOPrefsDialog::setupFontsTab()
   topLayout->setMargin(3);
-  KPrefsWidFont * tVFont;
+  KPrefsDialogWidFont * tVFont;
   int i = 0;
-  KPrefsWidFont *timeLabelsFont =
+  KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
@@ -971,3 +971,3 @@ void KOPrefsDialog::setupFontsTab()
 
-  KPrefsWidFont *timeBarFont =
+  KPrefsDialogWidFont *timeBarFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
@@ -980,3 +980,3 @@ void KOPrefsDialog::setupFontsTab()
 
-  KPrefsWidFont *marcusBainsFont =
+  KPrefsDialogWidFont *marcusBainsFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
@@ -1027,3 +1027,3 @@ void KOPrefsDialog::setupFontsTab()
   ++i;
-  KPrefsWidFont *agendaViewFont =
+  KPrefsDialogWidFont *agendaViewFont =
       addWidFont(i18n("Event text"),i18n("Agenda view:"),
@@ -1036,3 +1036,3 @@ void KOPrefsDialog::setupFontsTab()
 
-  KPrefsWidFont *monthViewFont =
+  KPrefsDialogWidFont *monthViewFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
@@ -1045,3 +1045,3 @@ void KOPrefsDialog::setupFontsTab()
 
- KPrefsWidFont *lVFont =
+ KPrefsDialogWidFont *lVFont =
       addWidFont(i18n("Event"),i18n("List View:"),
@@ -1112,3 +1112,3 @@ void KOPrefsDialog::setupColorsTab()
 
-  KPrefsWidColor *holidayColor =
+  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Holiday color:"),
@@ -1119,3 +1119,3 @@ void KOPrefsDialog::setupColorsTab()
   // Highlight Color
-  KPrefsWidColor *highlightColor =
+  KPrefsDialogWidColor *highlightColor =
       addWidColor(i18n("Highlight color:"),
@@ -1126,3 +1126,3 @@ void KOPrefsDialog::setupColorsTab()
   // Event color
-  KPrefsWidColor *eventColor =
+  KPrefsDialogWidColor *eventColor =
       addWidColor(i18n("Default event color:"),
@@ -1133,3 +1133,3 @@ void KOPrefsDialog::setupColorsTab()
   // agenda view background color
-  KPrefsWidColor *agendaBgColor =
+  KPrefsDialogWidColor *agendaBgColor =
       addWidColor(i18n("Agenda view background color:"),
@@ -1140,3 +1140,3 @@ void KOPrefsDialog::setupColorsTab()
   // working hours color
-  KPrefsWidColor *workingHoursColor =
+  KPrefsDialogWidColor *workingHoursColor =
       addWidColor(i18n("Working hours color:"),
@@ -1146,3 +1146,3 @@ void KOPrefsDialog::setupColorsTab()
 
-  KPrefsWidBool *sb =
+  KPrefsDialogWidBool *sb =
            addWidBool(i18n("Use colors for application:"),
@@ -1152,3 +1152,3 @@ void KOPrefsDialog::setupColorsTab()
        ii++;
-    KPrefsWidColor *   workingHoursColor1 =
+    KPrefsDialogWidColor *   workingHoursColor1 =
            addWidColor(i18n("Buttons, menus, etc.:"),
@@ -1158,3 +1158,3 @@ void KOPrefsDialog::setupColorsTab()
        
-      KPrefsWidColor *   workingHoursColor2 =
+      KPrefsDialogWidColor *   workingHoursColor2 =
            addWidColor(i18n("Frames, labels, etc.:"),
@@ -1208,3 +1208,3 @@ void KOPrefsDialog::setupGroupSchedulingTab()
 #if 0
-  KPrefsWidRadios *schedulerGroup =
+  KPrefsDialogWidRadios *schedulerGroup =
       addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
@@ -1217,3 +1217,3 @@ void KOPrefsDialog::setupGroupSchedulingTab()
 
-  KPrefsWidRadios *sendGroup =
+  KPrefsDialogWidRadios *sendGroup =
       addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
@@ -1258,3 +1258,3 @@ void KOPrefsDialog::setupGroupAutomationTab()
 
-  KPrefsWidRadios *autoRefreshGroup =
+  KPrefsDialogWidRadios *autoRefreshGroup =
       addWidRadios(i18n("Auto Send Refresh"),
@@ -1266,3 +1266,3 @@ void KOPrefsDialog::setupGroupAutomationTab()
 
-  KPrefsWidRadios *autoInsertGroup =
+  KPrefsDialogWidRadios *autoInsertGroup =
       addWidRadios(i18n("Auto Insert IMIP Replies"),
@@ -1274,3 +1274,3 @@ void KOPrefsDialog::setupGroupAutomationTab()
 
-  KPrefsWidRadios *autoRequestGroup =
+  KPrefsDialogWidRadios *autoRequestGroup =
       addWidRadios(i18n("Auto Insert IMIP Requests"),
@@ -1282,3 +1282,3 @@ void KOPrefsDialog::setupGroupAutomationTab()
 
-  KPrefsWidRadios *autoFreeBusyGroup =
+  KPrefsDialogWidRadios *autoFreeBusyGroup =
       addWidRadios(i18n("Auto Send FreeBusy Information"),
@@ -1290,3 +1290,3 @@ void KOPrefsDialog::setupGroupAutomationTab()
 
-  KPrefsWidRadios *autoFreeBusyReplyGroup =
+  KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
       addWidRadios(i18n("Auto Save FreeBusy Replies"),
@@ -1580,3 +1580,3 @@ void KOPrefsDialog::setupTimeZoneTab()
   int iii = 1;
-  KPrefsWidBool *sb =
+  KPrefsDialogWidBool *sb =
       addWidBool(i18n("Timezone has daylight saving"),
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index fd651d0..83dc1eb 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -101,4 +101,4 @@ class KOPrefsDialog : public KPrefsDialog
   private:
-    KPrefsWidBool *mEnableGroupScheduling;
-    KPrefsWidBool *mEnableProjectView;
+    KPrefsDialogWidBool *mEnableGroupScheduling;
+    KPrefsDialogWidBool *mEnableProjectView;