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

List:       kde-pim
Subject:    Re: [Kde-pim]  [PATCH] What's This support for KPrefsDialog and
From:       Tim Jansen <ml () tjansen ! de>
Date:       2003-07-27 17:04:38
[Download RAW message or body]

On Sunday 27 July 2003 18:48, Cornelius Schumacher wrote:
> I think Reinhold is right. The mail-related options aren't that
> important, so they should probably go to the bottom. It's certainly a
> good idea to group them together.

Yes, the attached patch uses Reinhold's order (and also disables the auto-save 
interval when the checkbox is not selected).

> > - I out-commented the 'Export to HTML' option, since AFAICS it does
> This option uses the last file name the user entered in the html export
> dialog. If you have exported a file once, this option will work. Please
> don't remove it.

Ok, now I've found it: it's in a plugin (webexport). Wouldn't it make more 
sense to move the option into the plugin's configuration dialog instead of 
configuring the plugin in the main configuration dialog?

> > - I removed old configuration elements that were not used
> > anymore and hidden. (I hope there was no good reason for hiding them,
> > but I can't see any negative effect by removing them)
> Which ones are that? I just also removed some obsolete code from the
> preferences dialog.

"Enable group scheduling", "Enable project view" and "Default Calendar 
Format". Those that were added to the dialog and then were hidden using 
hide().

bye...



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

Index: koprefsdialog.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koprefsdialog.cpp,v
retrieving revision 1.70
diff -u -3 -p -r1.70 koprefsdialog.cpp
--- koprefsdialog.cpp	10 Jun 2003 11:30:57 -0000	1.70
+++ koprefsdialog.cpp	27 Jul 2003 16:50:52 -0000
@@ -34,6 +34,7 @@
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
+#include <qwhatsthis.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
@@ -84,103 +85,119 @@ void KOPrefsDialog::setupMainTab()
   QFrame *topFrame = addPage(i18n("Personal"),0,
       DesktopIcon("identity",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
   topLayout->setSpacing(spacingHint());
 
-  KPrefsWidBool *emailControlCenter =
-      addWidBool(i18n("&Use email settings from Control Center"),
-                 KOPrefs::instance()->mEmailControlCenter,topFrame);
-  topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
-  connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
-          SLOT(toggleEmailSettings(bool)));
-
-  mNameEdit = new QLineEdit(topFrame);
-  mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
-  topLayout->addWidget(mNameLabel,1,0);
-  topLayout->addWidget(mNameEdit,1,1);
-
-  mEmailEdit = new QLineEdit(topFrame);
-  mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
-  topLayout->addWidget(mEmailLabel,2,0);
-  topLayout->addWidget(mEmailEdit,2,1);
-
-  KPrefsWidBool *bcc =
-      addWidBool(i18n("Send copy to owner when mailing events"),
-                 KOPrefs::instance()->mBcc,topFrame);
-  topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
-
-
   QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),
                                            topFrame);
-  topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
-
-  addWidBool(i18n("Enable automatic saving of calendar"),
-             KOPrefs::instance()->mAutoSave,autoSaveGroup);
+  topLayout->addWidget(autoSaveGroup);
+  KPrefsWidBool *autoSaveCheck = addWidBool(i18n("&Enable automatic saving of calendar"),
+             KOPrefs::instance()->mAutoSave,autoSaveGroup,
+             i18n("Activate this options to save your calendar "
+                  "automatically in the given interval."));
 
   QHBox *intervalBox = new QHBox(autoSaveGroup);
   intervalBox->setSpacing(spacingHint());
 
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Save &interval in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
+  mAutoSaveIntervalSpin->setEnabled(KOPrefs::instance()->mAutoSave);
+  QWhatsThis::add(mAutoSaveIntervalSpin,
+                  i18n("This is the interval for automatic saving, "
+                       "e.g. if you enter '10 minutes' your calendar will be "
+                       "saved every 10 minutes."));
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
+  connect(autoSaveCheck->checkBox(),SIGNAL(toggled(bool)),
+          mAutoSaveIntervalSpin, SLOT(setEnabled(bool)));
 
-  KPrefsWidBool *confirmCheck =
-      addWidBool(i18n("Confirm &deletes"),KOPrefs::instance()->mConfirm,
+/* There is no way to configure the path, so this option does nothing
+    KPrefsWidBool *htmlsave =
+      addWidBool(i18n("Export to HTML with every save"),KOPrefs::instance()->mHtmlWithSave,
                  topFrame);
-  topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
+   topLayout->addWidget(htmlsave->checkBox());
+*/
 
+  QGroupBox *deleteGroup = new QGroupBox(1, Vertical, i18n("Confirmations"),
+                                                topFrame);
+  KPrefsWidBool *confirmCheck =
+      addWidBool(i18n("Ask for con&firmation before deleting"),
+                 KOPrefs::instance()->mConfirm, deleteGroup,
+                 i18n("If this option is activated you will be asked for "
+                      "confirmation when you delete an event. Otherwise "
+                      "the event will be deleted immediately."));
+  topLayout->addWidget(deleteGroup);
 
-  mEnableGroupScheduling =
-      addWidBool(i18n("Enable group scheduling"),
-                 KOPrefs::instance()->mEnableGroupScheduling,topFrame);
-  topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
-  connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
-          SLOT(warningGroupScheduling()));
-
-  mEnableProjectView =
-      addWidBool(i18n("Enable project view"),
-                 KOPrefs::instance()->mEnableProjectView,topFrame);
-  topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
-  connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
-          SLOT(warningProjectView()));
-
-  // Can't be disabled anymore
-  mEnableGroupScheduling->checkBox()->hide();
-
-  // Disable setting, because this feature now becomes stable
-  mEnableProjectView->checkBox()->hide();
-
-  KPrefsWidRadios *defaultFormatGroup =
-      addWidRadios(i18n("Default Calendar Format"),
-                   KOPrefs::instance()->mDefaultFormat,topFrame);
-  defaultFormatGroup->addRadio(i18n("vCalendar"));
-  defaultFormatGroup->addRadio(i18n("iCalendar"));
+  KPrefsWidRadios *destinationGroup =
+      addWidRadios(i18n("New Events and Todos"),KOPrefs::instance()->mDestination,
+                   topFrame);
+  destinationGroup->addRadio(i18n("Add &to the standard calendar automatically"),
+                             i18n("Select this option to add all new events to "
+			          "your standard caldendar automatically."));
+  destinationGroup->addRadio(i18n("Let use&r chose a calendar"),
+                             i18n("Select this option to be asked for the calendar "
+			          "that the new event should be added to."));
+  topLayout->addWidget(destinationGroup->groupBox());
+
+  QGroupBox *emailSettingsGroup = new QGroupBox(0, Qt::Vertical,
+                                                i18n("Email Settings"), topFrame);
+  QGridLayout *emailSettingsLayout = new QGridLayout(emailSettingsGroup->layout(), 4, 2);
+  emailSettingsLayout->setSpacing(spacingHint());
 
-  topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
+  KPrefsWidBool *bcc =
+      addWidBool(i18n("Send cop&y to owner when mailing events"),
+                 KOPrefs::instance()->mBcc,emailSettingsGroup,
+                 i18n("If you activate this option the owner of an event "
+                      "will also receive a copy when you mail an event to "
+                      "its participants."));
+  emailSettingsLayout->addMultiCellWidget(bcc->checkBox(),
+                                          0, 0, 0, 1);
 
-  // Default format unconditionally is iCalendar
-  defaultFormatGroup->groupBox()->hide();
+  KPrefsWidBool *emailControlCenter =
+      addWidBool(i18n("&Use user configuration from Control Center"),
+                 KOPrefs::instance()->mEmailControlCenter,emailSettingsGroup,
+                 i18n("Select this option to get your email configuration from "
+                      "the control center, instead of entering it below. "
+                      "The user configuration is used to publish and request "
+                      "appointments."));
+  connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
+          SLOT(toggleEmailSettings(bool)));
+  emailSettingsLayout->addMultiCellWidget(emailControlCenter->checkBox(),
+                                          1, 1, 0, 1);
 
-  KPrefsWidRadios *mailClientGroup =
-      addWidRadios(i18n("Mail Client"),KOPrefs::instance()->mMailClient,
-                   topFrame);
-  mailClientGroup->addRadio(i18n("KMail"));
-  mailClientGroup->addRadio(i18n("Sendmail"));
-  topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
+  mNameEdit = new QLineEdit(emailSettingsGroup);
+  mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), emailSettingsGroup);
+  QWhatsThis::add(mNameEdit, i18n("Your full name, used for sending emails. "
+                      "The user configuration is used to publish and request "
+                      "appointments."));
+  emailSettingsLayout->addWidget(mNameLabel, 2, 0);
+  emailSettingsLayout->addWidget(mNameEdit, 2, 1);
+
+  mEmailEdit = new QLineEdit(emailSettingsGroup);
+  mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),emailSettingsGroup);
+  QWhatsThis::add(mEmailEdit, i18n("Your email name, used for sending emails. "
+                      "The user configuration is used to publish and request "
+                      "appointments."));
+  emailSettingsLayout->addWidget(mEmailLabel, 3, 0);
+  emailSettingsLayout->addWidget(mEmailEdit, 3, 1);
 
-  KPrefsWidBool *htmlsave =
-      addWidBool(i18n("Export to HTML with every save"),KOPrefs::instance()->mHtmlWithSave,
-                 topFrame);
-  topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
+  topLayout->addWidget(emailSettingsGroup);
 
-  KPrefsWidRadios *destinationGroup =
-      addWidRadios(i18n("New Events/Todos should"),KOPrefs::instance()->mDestination,
+
+  KPrefsWidRadios *mailClientGroup =
+      addWidRadios(i18n("Mail Client"),KOPrefs::instance()->mMailClient,
                    topFrame);
-  destinationGroup->addRadio(i18n("be added to the standard resource"));
-  destinationGroup->addRadio(i18n("be asked which resource to use"));
-  topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
+  mailClientGroup->addRadio(i18n("&KMail"),
+                            i18n("Select this option to send emails using KMail. "
+			         "This is the recommended option for most users."));
+  mailClientGroup->addRadio(i18n("&Sendmail"),
+                            i18n("Select this option to send emails using Sendmail. "
+			         "This requires that you have set up Sendmail correctly, "
+				 "otherwise your emails may never arrive. "
+				 "In case of doubt, use KMail for sending emails."));
+  topLayout->addWidget(mailClientGroup->groupBox());
 
-  topLayout->setRowStretch(14,1);
+  QSpacerItem* spacer = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+  topLayout->addItem(spacer);
 }
 
 


_______________________________________________
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] 

Configure | About | News | Add a list | Sponsored by KoreLogic