connected global config

1 files changed, 61 insertions, 45 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 7dafcd8..b4b3b27 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -72,28 +72,28 @@
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
 
   setupGlobalTab();
   setupMainTab();
-  setupLocaleTab();
-  setupTimeZoneTab();
+  // setupLocaleTab();
+  //setupTimeZoneTab();
   setupTimeTab();
-  setupLocaleDateTab();
+  //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 }
 
 
 KOPrefsDialog::~KOPrefsDialog()
@@ -101,24 +101,25 @@ KOPrefsDialog::~KOPrefsDialog()
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
+#if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
@@ -150,29 +151,31 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatShort,iii,1);
    ++iii;
    lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
    lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;  
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
+#endif
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
+#if 0
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
  KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
@@ -214,24 +217,25 @@ void  KOPrefsDialog::setupLocaleTab()
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
+#endif
 }
 void KOPrefsDialog::showSyncPage()
 {
     showPage ( 2 ) ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
@@ -614,40 +618,25 @@ void KOPrefsDialog::setupViewsTab()
   KPrefsDialogWidBool *weeklyRecur =
     addWidBool(i18n("Show ev. that recur weekly in date nav."),
                &(KOPrefs::instance()->mWeeklyRecur),topFrame);
   topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
   if ( QApplication::desktop()->width() > 640 ) {
       
       KPrefsDialogWidBool *enableToolTips =
           addWidBool(i18n("Enable tooltips displaying summary of ev."),
                      &(KOPrefs::instance()->mEnableToolTips),topFrame);
       topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
   
   }
-  KPrefsDialogWidBool *passwdk =
-    addWidBool(i18n("Show parent To-Do's in What's Next view"),
-               &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
-  
-  passwdk =
-    addWidBool(i18n("Show location in What's Next view"),
-               &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
-  
-  passwdk =
-    addWidBool(i18n("Show Sync Events in WN/Agenda view"),
-               &(KOPrefs::instance()->mShowSyncEvents),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
-  
-   
+ 
   KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show Marcus Bains line"),
                  &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
   topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
   
  
   // topLayout->addWidget(hourSizeGroup,ii++,0);
   // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
   //topLayout->setRowStretch(11,1);
 
 
 
@@ -790,25 +779,51 @@ void KOPrefsDialog::setupViewsTab()
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
  holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
-
+  // *********************** What'sNext View
+  topFrame = addPage(i18n("What's Next View"),0,0);
+  //  DesktopIcon("viewmag",KIcon::SizeMedium));
+  
+  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout->setSpacing(spacingHint());
+  topLayout->setMargin(marginHint());
+  ii = 0;
+   KPrefsDialogWidBool *passwdk =
+    addWidBool(i18n("Show parent To-Do's in What's Next view"),
+               &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
+   topLayout->addWidget(passwdk->checkBox(), ii++,0);
+  
+  passwdk =
+    addWidBool(i18n("Show location in What's Next view"),
+               &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
+   topLayout->addWidget(passwdk->checkBox(), ii++,0);
+  
+  passwdk =
+    addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
+               &(KOPrefs::instance()->mShowSyncEvents),topFrame);
+   topLayout->addWidget(passwdk->checkBox(), ii++,0);
+    passwdk =
+           addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
+                      &(KOPrefs::instance()->mShortDateInViewer),topFrame);
+       topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1);
+   
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
@@ -1327,28 +1342,28 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
       }
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
   kdelibcfg->readConfig();
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
-  QDate current ( 2001, 1,1);
-  mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
-  mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
-  setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
+  // QDate current ( 2001, 1,1);
+  //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
+  //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
+  //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
   //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
   mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
   // if  (KOPrefs::instance()->mAllDaySize > 47  )
   //   KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2;
   //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize);
 
   mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
   mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
   mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
   // mAMails->clear();
@@ -1357,68 +1372,68 @@ void KOPrefsDialog::usrReadConfig()
 //     QListViewItem *item = new QListViewItem(mAMails);
 //     item->setText(0,*it);
 //     mAMails->insertItem(item);
 //   }
 
   // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP);
   //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser);
   //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd);
   //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile);
 
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
-  QString dummy = KOPrefs::instance()->mUserDateFormatLong;
-  mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
-  dummy = KOPrefs::instance()->mUserDateFormatShort;
-  mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
+  //QString dummy = KOPrefs::instance()->mUserDateFormatLong;
+  //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
+  //dummy = KOPrefs::instance()->mUserDateFormatShort;
+  //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
   updateCategories();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
 
   kdelibcfg->writeConfig();
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
     //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
     //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
     //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
 
-    KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
-    KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
+    //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
+    //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
     KOPrefs::instance()->setFullName(mNameEdit->text());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
     
-    KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
-    QDate date;
-    date = mStartDateSavingEdit->date();
-    int sub = 0;
-    if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
-        sub = 1;
-    KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
-    date = mEndDateSavingEdit->date();
-    if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
-        sub = 1;
-    else 
-        sub = 0;
-    KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub;
-    // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value();
+    // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
+    //QDate date;
+    //date = mStartDateSavingEdit->date();
+    //int sub = 0;
+    //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
+    //     sub = 1;
+//     KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
+//     date = mEndDateSavingEdit->date();
+//     if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
+//         sub = 1;
+//     else 
+//         sub = 0;
+//     KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub;
+//     // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value();
     
     KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
     KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
     
     //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
     
     QDictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
@@ -1548,24 +1563,25 @@ void KOPrefsDialog::updateTimezoneOffset( int index )
             mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
             
         } else {
             mTimezoneOffsetSpin->setEnabled ( false );
             mTimezoneOffsetSpin->setValue( 0 );
         }
     }
     */
 }
 
 void KOPrefsDialog::setupTimeZoneTab()
 {
+#if 0
     QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   QHBox *timeZoneBox = new QHBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
@@ -1606,16 +1622,16 @@ void KOPrefsDialog::setupTimeZoneTab()
   mStartDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mStartDateSavingEdit, iii,1);
   ++iii;
 
   lab = new QLabel(  i18n("Daylight end:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mEndDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mEndDateSavingEdit, iii,1);
   ++iii;
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
   mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
-
+#endif
  
 }