kopi confif layout reordered

2 files changed, 102 insertions, 81 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index e8ac960..b976f1b 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1302,4 +1302,4 @@
 { "Journal/Details...","Journale/Details..." },
-{ "","" },
-{ "","" },
+{ "Agenda View","Agenda Ansicht" },
+{ "Show current time","Zeige aktuelle Zeit" },
 { "","" },
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 443508d..40e8a99 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -338,3 +338,3 @@ void KOPrefsDialog::setupMainTab()
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   topLayout->setSpacing(spacingHint());
@@ -359,27 +359,23 @@ void KOPrefsDialog::setupMainTab()
   KPrefsDialogWidBool *wb;
-  QHBox *dummy;
-  if ( QApplication::desktop()->width() >  480 ) {
-      dummy = new QHBox(topFrame);
-  } else {
-      dummy = new QVBox(topFrame);
-  }
+  
 
-  topLayout->addMultiCellWidget(dummy, 2,2,0,1); 
-  addWidBool(i18n("Full menu bar(nr)"),
-             &(KOPrefs::instance()->mShowFullMenu),dummy);
   
+  KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
+             &(KOPrefs::instance()->mShowFullMenu),topFrame);
+  topLayout->addMultiCellWidget(  widbool->checkBox(), 2,2,0,1); 
   
-  addWidBool(i18n("Mini icons in toolbar(nr)"),
-             &(KOPrefs::instance()->mToolBarMiniIcons),dummy);
-
+  
+  widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
+             &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
+  topLayout->addMultiCellWidget(  widbool->checkBox(), 3,3,0,1); 
 
-  dummy = new QHBox(topFrame);
-  new QLabel(i18n("Days in What's Next:"),dummy);
-  mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
- 
-  topLayout->addMultiCellWidget(dummy,3,3,0,1);
 
+ KPrefsDialogWidBool *verticalScreen =
+      addWidBool(i18n("Show vertical screen (Needs restart)"),
+                 &(KOPrefs::instance()->mVerticalScreen),topFrame);
+  //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
+  topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
 
 
-  dummy = new QHBox(topFrame);
+  QHBox *dummy = new QHBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
@@ -387,15 +383,5 @@ void KOPrefsDialog::setupMainTab()
  
-  topLayout->addMultiCellWidget(dummy,4,4,0,1);
+  topLayout->addMultiCellWidget(dummy,5,5,0,1);
 
-  QHBox *prioBox = new QHBox(topFrame);
-  // intervalBox->setSpacing(spacingHint());
-  topLayout->addMultiCellWidget(prioBox,5,5,0,1);
-  QString messa = i18n("Show topmost todo prios in What's Next:");
-
-  if ( QApplication::desktop()->width() <  300 )
-      messa = i18n("Show topmost todo prios in What's N.:");
-  QLabel *prioLabel = new QLabel(messa, prioBox);
-  mPrioSpin = new QSpinBox(0,5,1,prioBox);
-  if ( QApplication::desktop()->width() <  300 )
-      mPrioSpin->setFixedWidth( 40 );
+ 
 
@@ -428,7 +414,3 @@ void KOPrefsDialog::setupMainTab()
   */
-  KPrefsDialogWidBool *verticalScreen =
-      addWidBool(i18n("Show vertical screen (Needs restart)"),
-                 &(KOPrefs::instance()->mVerticalScreen),topFrame);
-  //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
-  topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
+  
 
@@ -437,3 +419,3 @@ void KOPrefsDialog::setupMainTab()
                &(KOPrefs::instance()->mAskForQuit),topFrame);
-  topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
+  topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1);
  
@@ -608,26 +590,4 @@ void KOPrefsDialog::setupViewsTab()
   
-  dummy =
-    addWidBool(i18n("Show time in agenda items"),
-               &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
-  topLayout->addWidget(dummy->checkBox(),ii++,0);
-
-  dummy =
-    addWidBool(i18n("Highlight current day in agenda"),
-               &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
-  topLayout->addWidget(dummy->checkBox(),ii++,0);
-
-  dummy =
-    addWidBool(i18n("Use light color for highlight current day"),
-               &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
-  topLayout->addWidget(dummy->checkBox(),ii++,0);
-
-  KPrefsDialogWidBool *dailyRecur =
-    addWidBool(i18n("Show events that recur daily in date nav."),
-               &(KOPrefs::instance()->mDailyRecur),topFrame);
-  topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
+ 
 
-  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 ) {
@@ -641,7 +601,3 @@ void KOPrefsDialog::setupViewsTab()
  
-  KPrefsDialogWidBool *marcusBainsEnabled =
-      addWidBool(i18n("Show Marcus Bains line"),
-                 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
-  topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
-  
+ 
  
@@ -654,3 +610,3 @@ void KOPrefsDialog::setupViewsTab()
 
-
+#if 0
 
@@ -663,3 +619,4 @@ void KOPrefsDialog::setupViewsTab()
   ii = 0;
- 
+
+#endif
 
@@ -676,6 +633,2 @@ void KOPrefsDialog::setupViewsTab()
 
- KPrefsDialogWidBool *fullViewTodo =
-      addWidBool(i18n("Event list view uses full window"),
-                 &(KOPrefs::instance()->mFullViewTodo),topFrame);
-  topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
 
@@ -686,2 +639,57 @@ void KOPrefsDialog::setupViewsTab()
 
+
+ KPrefsDialogWidBool *fullViewTodo =
+      addWidBool(i18n("Event list view uses full window"),
+                 &(KOPrefs::instance()->mFullViewTodo),topFrame);
+  topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
+  dummy =
+    addWidBool(i18n("Listview uses monthly timespan"),
+               &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
+  topLayout->addWidget(dummy->checkBox(),ii++,0);
+ dummy  =
+    addWidBool(i18n("Highlight selection in Time Edit"),
+               &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
+   topLayout->addWidget( dummy->checkBox(), ii++,0);
+
+  KPrefsDialogWidBool *dailyRecur =
+    addWidBool(i18n("Show events that recur daily in date nav."),
+               &(KOPrefs::instance()->mDailyRecur),topFrame);
+  topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
+
+  KPrefsDialogWidBool *weeklyRecur =
+    addWidBool(i18n("Show ev. that recur weekly in date nav."),
+               &(KOPrefs::instance()->mWeeklyRecur),topFrame);
+  topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
+
+  topFrame = addPage(i18n("Agenda View"),0,0);
+    //  DesktopIcon("viewmag",KIcon::SizeMedium));
+
+  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout->setSpacing(spacingHint());
+  topLayout->setMargin(marginHint());
+  ii = 0;
+
+
+ dummy =
+    addWidBool(i18n("Show time in agenda items"),
+               &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
+  topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+  dummy =
+    addWidBool(i18n("Highlight current day in agenda"),
+               &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
+  topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+  dummy =
+    addWidBool(i18n("Use light color for highlight current day"),
+               &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
+  topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+
+ KPrefsDialogWidBool *marcusBainsEnabled =
+      addWidBool(i18n("Show current time"),
+                 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
+  topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
+  
+
  dummy =
@@ -696,10 +704,3 @@ void KOPrefsDialog::setupViewsTab()
 
-  dummy =
-    addWidBool(i18n("Listview uses monthly timespan"),
-               &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
-  topLayout->addWidget(dummy->checkBox(),ii++,0);
- dummy  =
-    addWidBool(i18n("Highlight selection in Time Edit"),
-               &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
-   topLayout->addWidget( dummy->checkBox(), ii++,0);
+
 
@@ -810,2 +811,22 @@ void KOPrefsDialog::setupViewsTab()
   ii = 0;
+
+
+  QHBox* hdummy = new QHBox(topFrame);
+  new QLabel(i18n("Days in What's Next:"),hdummy);
+  mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
+  
+  topLayout->addWidget(hdummy,ii++,0);
+
+  QHBox *prioBox = new QHBox(topFrame);
+  // intervalBox->setSpacing(spacingHint());
+  topLayout->addWidget(prioBox,ii++,0);
+  QString messa = i18n("Show topmost todo prios in What's Next:");
+  
+  if ( QApplication::desktop()->width() <  300 )
+      messa = i18n("Show topmost todo prios in What's N.:");
+  QLabel *prioLabel = new QLabel(messa, prioBox);
+  mPrioSpin = new QSpinBox(0,5,1,prioBox);
+  if ( QApplication::desktop()->width() <  300 )
+      mPrioSpin->setFixedWidth( 40 );
+
   KPrefsDialogWidBool *passwdk =