1 files changed, 2 insertions, 1 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b4b3b27..393e6e6 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -169,129 +169,130 @@ 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   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
        ++iii;   
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        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 ) ;
+    showPage ( 0 ) ;
+    kdelibcfg->showTimeZoneTab() ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
                   &(KOPrefs::instance()->mAskForPreferences),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 
    KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
                    topFrame);
    syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Force take local entry always"));
    syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
   sb =
        addWidBool(i18n("Show summary after syncing"),
                   &(KOPrefs::instance()->mShowSyncSummary),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 #endif
 
 
 
 }
 
 
 void KOPrefsDialog::setupSyncTab()
 {
 #if 0
     QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());
    lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
    int iii = 0;
    topLayout->addMultiCellWidget(lab , iii,iii,0,1);
    ++iii;
 
    mRemoteIPEdit = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteIPEdit,iii,1);
    ++iii;
    mRemoteUser = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);