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

List:       kde-pim
Subject:    [Kde-pim]
From:       Tim Jansen <ml () tjansen ! de>
Date:       2003-07-27 15:56:27
[Download RAW message or body]

Hi...

The first patch for libkdepim adds support for QWhatsThis texts to the 
KPrefsDialog widgets. The changes are source compatible, but not binary 
compatible. I hope that is ok?

The second patch changes the personals section of the KOrganizer 
configuration:
- shuffled options around, so mail-related options are at the top and 
creating/saving/deleting is at the bottom
- I out-commented the 'Export to HTML' option, since AFAICS it does not work 
at all: it lacks a way for specifing the path of the HTML file. Thus 
selecting it had no effect, nothing happened. (And I guess having the html 
export function in File/Export would be more obvious anyway)
- 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)
- what's this texts and shortcuts added, some texts changed (e.g. resource -> 
calendar)

bye...


["libkdepim-whatsthis.patch" (text/x-diff)]

Index: kprefsdialog.cpp
===================================================================
RCS file: /home/kde/kdepim/libkdepim/kprefsdialog.cpp,v
retrieving revision 1.10
diff -u -3 -p -r1.10 kprefsdialog.cpp
--- kprefsdialog.cpp	25 Jul 2003 15:45:40 -0000	1.10
+++ kprefsdialog.cpp	27 Jul 2003 13:55:13 -0000
@@ -30,6 +30,7 @@
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
+#include <qwhatsthis.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
@@ -43,10 +44,13 @@
 #include "kprefsdialog.moc"
 
 KPrefsWidBool::KPrefsWidBool(const QString &text,bool &reference,
-                             QWidget *parent)
+                             QWidget *parent, const QString &whatsThis)
   : mReference( reference )
 {
   mCheck = new QCheckBox(text,parent);
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(mCheck, whatsThis);
+  }
 }
 
 void KPrefsWidBool::readConfig()
@@ -66,11 +70,14 @@ QCheckBox *KPrefsWidBool::checkBox()
 
 
 KPrefsWidColor::KPrefsWidColor(const QString &text,QColor &reference,
-                               QWidget *parent)
+                               QWidget *parent, const QString &whatsThis)
   : mReference( reference )
 {
   mButton = new KColorButton(parent);
   mLabel = new QLabel(mButton, text, parent);
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(mButton, whatsThis);
+  }
 }
 
 KPrefsWidColor::~KPrefsWidColor()
@@ -99,7 +106,8 @@ KColorButton *KPrefsWidColor::button()
 }
 
 KPrefsWidFont::KPrefsWidFont(const QString &sampleText,const QString &labelText,
-                             QFont &reference,QWidget *parent)
+                             QFont &reference,QWidget *parent,
+			     const QString &whatsThis)
   : mReference( reference )
 {
   mLabel = new QLabel(labelText, parent);
@@ -109,6 +117,10 @@ KPrefsWidFont::KPrefsWidFont(const QStri
 
   mButton = new QPushButton(i18n("Choose..."), parent);
   connect(mButton,SIGNAL(clicked()),SLOT(selectFont()));
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(mPreview, whatsThis);
+    QWhatsThis::add(mButton, whatsThis);
+  }
 }
 
 KPrefsWidFont::~KPrefsWidFont()
@@ -151,12 +163,15 @@ void KPrefsWidFont::selectFont()
 
 
 KPrefsWidTime::KPrefsWidTime(const QString &text,int &reference,
-                             QWidget *parent)
+                             QWidget *parent, const QString &whatsThis)
   : mReference( reference )
 {
   mLabel = new QLabel(text,parent);
   mSpin = new QSpinBox(0,23,1,parent);
   mSpin->setSuffix(":00");
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(mSpin, whatsThis);
+  }
 }
 
 void KPrefsWidTime::readConfig()
@@ -192,9 +207,12 @@ KPrefsWidRadios::~KPrefsWidRadios()
 {
 }
 
-void KPrefsWidRadios::addRadio(const QString &text)
+void KPrefsWidRadios::addRadio(const QString &text, const QString &whatsThis)
 {
-  new QRadioButton(text,mBox);
+  QRadioButton *r = new QRadioButton(text,mBox);
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(r, whatsThis);
+  }
 }
 
 QButtonGroup *KPrefsWidRadios::groupBox()
@@ -214,12 +232,16 @@ void KPrefsWidRadios::writeConfig()
 
 
 KPrefsWidString::KPrefsWidString(const QString &text,QString &reference,
-                                 QWidget *parent, QLineEdit::EchoMode echomode)
+                                 QWidget *parent, QLineEdit::EchoMode echomode,
+				 const QString &whatsThis)
   : mReference( reference )
 {
   mLabel = new QLabel(text,parent);
   mEdit = new QLineEdit(parent);
   mEdit->setEchoMode( echomode );
+  if (!whatsThis.isNull()) {
+    QWhatsThis::add(mEdit, whatsThis);
+  }
 }
 
 KPrefsWidString::~KPrefsWidString()
@@ -261,23 +283,26 @@ void KPrefsWidManager::addWid(KPrefsWid 
   mPrefsWids.append(wid);
 }
 
-KPrefsWidBool *KPrefsWidManager::addWidBool(const QString &text,bool \
&reference,QWidget *parent) +KPrefsWidBool *KPrefsWidManager::addWidBool(const \
QString &text,bool &reference,QWidget *parent, +                                      \
const QString &whatsThis)  {
-  KPrefsWidBool *w = new KPrefsWidBool(text,reference,parent);
+  KPrefsWidBool *w = new KPrefsWidBool(text,reference,parent, whatsThis);
   addWid(w);
   return w;
 }
 
-KPrefsWidTime *KPrefsWidManager::addWidTime(const QString &text,int \
&reference,QWidget *parent) +KPrefsWidTime *KPrefsWidManager::addWidTime(const \
QString &text,int &reference,QWidget *parent, +                                       \
const QString &whatsThis)  {
-  KPrefsWidTime *w = new KPrefsWidTime(text,reference,parent);
+  KPrefsWidTime *w = new KPrefsWidTime(text,reference,parent, whatsThis);
   addWid(w);
   return w;
 }
 
-KPrefsWidColor *KPrefsWidManager::addWidColor(const QString &text,QColor \
&reference,QWidget *parent) +KPrefsWidColor *KPrefsWidManager::addWidColor(const \
QString &text,QColor &reference, +                                              \
QWidget *parent, const QString &whatsThis)  {
-  KPrefsWidColor *w = new KPrefsWidColor(text,reference,parent);
+  KPrefsWidColor *w = new KPrefsWidColor(text,reference,parent, whatsThis);
   addWid(w);
   return w;
 }
@@ -289,24 +314,30 @@ KPrefsWidRadios *KPrefsWidManager::addWi
   return w;
 }
 
-KPrefsWidString *KPrefsWidManager::addWidString(const QString &text,QString \
&reference,QWidget *parent) +KPrefsWidString *KPrefsWidManager::addWidString(const \
QString &text,QString &reference, +                                                \
QWidget *parent, const QString &whatsThis)  {
-  KPrefsWidString *w = new KPrefsWidString(text,reference,parent);
+  KPrefsWidString *w = new KPrefsWidString(text,reference,parent,
+                                           QLineEdit::Normal, whatsThis);
   addWid(w);
   return w;
 }
 
-KPrefsWidString *KPrefsWidManager::addWidPassword(const QString &text,QString \
&reference,QWidget *parent) +KPrefsWidString *KPrefsWidManager::addWidPassword(const \
QString &text,QString &reference, +                                                  \
QWidget *parent, const QString &whatsThis)  {
-  KPrefsWidString *w = new \
KPrefsWidString(text,reference,parent,QLineEdit::Password); +  KPrefsWidString *w = \
new KPrefsWidString(text,reference,parent,QLineEdit::Password, +                      \
whatsThis);  addWid(w);
   return w;
 }
 
 KPrefsWidFont *KPrefsWidManager::addWidFont(const QString &sampleText,const QString \
                &buttonText,
-                                            QFont &reference,QWidget *parent)
+                                            QFont &reference,QWidget *parent,
+					    const QString &whatsThis)
 {
-  KPrefsWidFont *w = new KPrefsWidFont(sampleText,buttonText,reference,parent);
+  KPrefsWidFont *w = new KPrefsWidFont(sampleText,buttonText,reference,parent,
+                                       whatsThis);
   addWid(w);
   return w;
 }
Index: kprefsdialog.h
===================================================================
RCS file: /home/kde/kdepim/libkdepim/kprefsdialog.h,v
retrieving revision 1.7
diff -u -3 -p -r1.7 kprefsdialog.h
--- kprefsdialog.h	10 Jun 2003 11:30:57 -0000	1.7
+++ kprefsdialog.h	27 Jul 2003 13:55:13 -0000
@@ -68,7 +68,7 @@ class KPrefsWid : public QObject
 
 /**
   @short Widget for bool settings in @ref KPrefsDialog.
-  
+
   This class provides a widget for configuring bool values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
@@ -77,30 +77,32 @@ class KPrefsWidBool : public KPrefsWid
   public:
     /**
       Create a bool widget consisting of a QCheckbox.
-      
+
       @param text      Text of QCheckBox.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidBool(const QString &text,bool &reference,QWidget *parent);
-    
+    KPrefsWidBool(const QString &text,bool &reference,QWidget *parent,
+                  const QString &whatsThis = QString::null);
+
     /**
       Return the QCheckbox used by this widget.
     */
     QCheckBox *checkBox();
-    
+
     void readConfig();
     void writeConfig();
-    
+
   private:
     bool &mReference;
-    
+
     QCheckBox *mCheck;
 };
 
 /**
   @short Widget for time settings in @ref KPrefsDialog.
-  
+
   This class provides a widget for configuring time values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
@@ -109,13 +111,15 @@ class KPrefsWidTime : public KPrefsWid
   public:
     /**
       Create a time widget consisting of a label and a spinbox.
-      
+
       @param text      Text of Label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidTime(const QString &text,int &reference,QWidget *parent);
-    
+    KPrefsWidTime(const QString &text,int &reference,QWidget *parent,
+                  const QString &whatsThis = QString::null);
+
     /**
       Return QLabel used by this widget.
     */
@@ -148,17 +152,19 @@ class KPrefsWidColor : public KPrefsWid
     /**
       Create a color widget consisting of a test field and a button for opening
       a color dialog.
-      
+
       @param text      Text of button.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidColor(const QString &text,QColor &reference,QWidget *parent);
+    KPrefsWidColor(const QString &text,QColor &reference,QWidget *parent,
+                   const QString &whatsThis = QString::null);
     /**
       Destruct color setting widget.
     */
     ~KPrefsWidColor();
-    
+
     /**
       Return QLabel for the button
     */
@@ -191,18 +197,20 @@ class KPrefsWidFont : public KPrefsWid
     /**
       Create a font widget consisting of a test field and a button for opening
       a font dialog.
-      
+
       @param label     Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
     KPrefsWidFont(const QString &sampleText,const QString &labelText,
-                  QFont &reference,QWidget *parent);
+                  QFont &reference,QWidget *parent,
+		  const QString &whatsThis = QString::null);
     /**
       Destruct font setting widget.
     */
     ~KPrefsWidFont();
-    
+
     /**
       Return label.
     */
@@ -246,29 +254,30 @@ class KPrefsWidRadios : public KPrefsWid
     /**
       Create a widget for selection of an option. It consists of a box with
       several radio buttons.
-      
+
       @param text      Text of main box.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
-    KPrefsWidRadios(const QString &text,int &reference,QWidget *parent);
+    KPrefsWidRadios(const QString &text, int &reference,QWidget *parent);
     virtual ~KPrefsWidRadios();
 
     /**
       Add a radio button.
-      
+
       @param text Text of the button.
+      @param whatsThis What's This help for the button.
     */
-    void addRadio(const QString &text);
-    
+    void addRadio(const QString &text, const QString &whatsThis = QString::null);
+
     /**
       Return the box widget used by this widget.
     */
     QButtonGroup *groupBox();
-    
+
     void readConfig();
     void writeConfig();
-    
+
   private:
     int &mReference;
 
@@ -287,12 +296,13 @@ class KPrefsWidString : public KPrefsWid
   public:
     /**
       Create a string widget consisting of a test label and a line edit.
-      
+
       @param text      Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidString(const QString &text,QString &reference,QWidget \
*parent,QLineEdit::EchoMode echomode=QLineEdit::Normal); +    KPrefsWidString(const \
QString &text,QString &reference,QWidget *parent,QLineEdit::EchoMode \
echomode=QLineEdit::Normal, const QString &whatsThis = QString::null);  /**
       Destructor.
     */
@@ -346,31 +356,37 @@ class KPrefsWidManager
     virtual void addWid(KPrefsWid *);
     /**
       Register a @ref KPrefsWidBool object.
-      
+
       @param text      Text of bool widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidBool *addWidBool(const QString &text,bool &reference,QWidget *parent);
+    KPrefsWidBool *addWidBool(const QString &text,bool &reference,QWidget *parent,
+                              const QString &whatsThis = QString::null);
     /**
       Register a @ref KPrefsWidTime object.
-      
+
       @param text      Text of time widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidTime *addWidTime(const QString &text,int &reference,QWidget *parent);
+    KPrefsWidTime *addWidTime(const QString &text,int &reference,QWidget *parent,
+                              const QString &whatsThis = QString::null);
     /**
       Register a @ref KPrefsWidColor object.
-      
+
       @param text      Text of color widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidColor *addWidColor(const QString &text,QColor &reference,QWidget \
*parent); +    KPrefsWidColor *addWidColor(const QString &text,QColor \
&reference,QWidget *parent, +                                const QString &whatsThis \
= QString::null);  /**
       Register a @ref KPrefsWidRadios object.
-      
+
       @param text      Text of radio button box widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
@@ -378,34 +394,40 @@ class KPrefsWidManager
     KPrefsWidRadios *addWidRadios(const QString &text,int &reference,QWidget \
*parent);  /**
       Register a @ref KPrefsWidString object.
-      
+
       @param text      Text of string widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidString *addWidString(const QString &text,QString &reference,QWidget \
*parent); +    KPrefsWidString *addWidString(const QString &text,QString \
&reference,QWidget *parent, +                                  const QString \
&whatsThis = QString::null);  /**
       Register a password @ref KPrefsWidString object, with echomode set to \
                QLineEdit::Password.
-      
+
       @param text      Text of string widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
+      @param whatsThis What's This help for the widget.
     */
-    KPrefsWidString *addWidPassword (const QString &text,QString &reference,QWidget \
*parent); +    KPrefsWidString *addWidPassword (const QString &text,QString \
&reference,QWidget *parent, +                                     const QString \
&whatsThis = QString::null);  /**
       Register a @ref KPrefsWidFont object.
-      
+
       @param sampleText Sample text of font widget.
       @param buttonText Button text of font widget.
       @param reference  Reference to variable storing the setting.
       @param parent     Parent widget.
+      @param whatsThis What's This help for the widget.
     */
     KPrefsWidFont *addWidFont(const QString &sampleText,const QString &buttonText,
-                              QFont &reference,QWidget *parent);
+                              QFont &reference,QWidget *parent,
+			      const QString &whatsThis = QString::null);
 
     /** Set all widgets to default values. */
     void setWidDefaults();
-  
+
     /** Read preferences from config file. */
     void readWidConfig();
 


["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 15:53:24 -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,118 @@ 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());
 
+  QGroupBox *emailSettingsGroup = new QGroupBox(0, Qt::Vertical,
+                                                i18n("Email Settings"), topFrame);
+  QGridLayout *emailSettingsLayout = new QGridLayout(emailSettingsGroup->layout(), 4, 2);
+  emailSettingsLayout->setSpacing(spacingHint());
+
+  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);
+
   KPrefsWidBool *emailControlCenter =
-      addWidBool(i18n("&Use email settings from Control Center"),
-                 KOPrefs::instance()->mEmailControlCenter,topFrame);
-  topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
+      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);
 
-  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);
+  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);
+
+  topLayout->addWidget(emailSettingsGroup);
 
-  KPrefsWidBool *bcc =
-      addWidBool(i18n("Send copy to owner when mailing events"),
-                 KOPrefs::instance()->mBcc,topFrame);
-  topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
 
+  KPrefsWidRadios *mailClientGroup =
+      addWidRadios(i18n("Mail Client"),KOPrefs::instance()->mMailClient,
+                   topFrame);
+  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());
 
   QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),
                                            topFrame);
-  topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
+  topLayout->addWidget(autoSaveGroup);
 
-  addWidBool(i18n("Enable automatic saving of calendar"),
-             KOPrefs::instance()->mAutoSave,autoSaveGroup);
+  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);
+  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);
 
-  KPrefsWidBool *confirmCheck =
-      addWidBool(i18n("Confirm &deletes"),KOPrefs::instance()->mConfirm,
-                 topFrame);
-  topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
-
-
-  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"));
-
-  topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
-
-  // Default format unconditionally is iCalendar
-  defaultFormatGroup->groupBox()->hide();
-
-  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);
 
-  KPrefsWidBool *htmlsave =
+/* 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(htmlsave->checkBox(),12,12,0,1);
+   topLayout->addWidget(htmlsave->checkBox());
+*/
 
   KPrefsWidRadios *destinationGroup =
-      addWidRadios(i18n("New Events/Todos should"),KOPrefs::instance()->mDestination,
+      addWidRadios(i18n("New Events and Todos"),KOPrefs::instance()->mDestination,
                    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);
+  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 *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);
 
-  topLayout->setRowStretch(14,1);
+  QSpacerItem* spacer = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+  topLayout->addItem(spacer);
 }
 
 

["prefspers.png" (image/png)]

_______________________________________________
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