Moved defaults to central location in KPsionConfig

5 files changed, 130 insertions, 119 deletions

diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index c7fdc1d..e0c81a4 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -186,8 +186,8 @@ setupActions() {
 			    actionCollection());
     KStdAction::showStatusbar(this, SLOT(slotToggleStatusbar()),
 			      actionCollection());
-    KStdAction::saveOptions(this, SLOT(slotSaveOptions()),
-			    actionCollection());
+//    KStdAction::saveOptions(this, SLOT(slotSaveOptions()),
+//			    actionCollection());
     KStdAction::preferences(this, SLOT(slotPreferences()),
 			    actionCollection());
     new KAction(i18n("Start &Format"), 0L, 0, this,
diff --git a/kde2/kpsion/kpsionconfig.cpp b/kde2/kpsion/kpsionconfig.cpp
index 7748862..9d9b89e 100644
--- a/kde2/kpsion/kpsionconfig.cpp
+++ b/kde2/kpsion/kpsionconfig.cpp
@@ -24,6 +24,7 @@
 #include "kpsionconfig.h"
 
 #include <klocale.h>
+#include <kstddirs.h>
 
 #include <iostream.h>
 
@@ -38,12 +39,33 @@ KPsionConfig::KPsionConfig() {
     optionNames.insert(OPT_UIDS, QString("Psion/MachineUIDs"));
     optionNames.insert(OPT_MACHNAME, QString("Psion/Name_%1"));
     optionNames.insert(OPT_BACKUPDRIVES, QString("Psion/BackupDrives_%1"));
+
+    defaults.insert(DEF_INCINTERVAL, QString("1"));
+    defaults.insert(DEF_FULLINTERVAL, QString("7"));
+    defaults.insert(DEF_CONNRETRY, QString("30"));
+    defaults.insert(DEF_SERIALDEV, QString("0"));
+    defaults.insert(DEF_SERIALSPEED, QString("4"));
+    defaults.insert(DEF_BACKUPGEN, QString("3"));
 }
 
 const QString KPsionConfig::
-getOptionName(int optIdx) {
+getStrDefault(int optIdx) {
+    if (optIdx != DEF_BACKUPDIR)
+	return QString::null;
+    return locateLocal("data", "kpsion/backups");
+}
 
-    optMap::Iterator it = optionNames.find(optIdx);
+int KPsionConfig::
+getIntDefault(int optIdx) {
+    cfgMap::Iterator it = defaults.find(optIdx);
+    if (it == defaults.end())
+	return 0;
+    return (*it).toInt();
+}
+
+const QString KPsionConfig::
+getOptionName(int optIdx) {
+    cfgMap::Iterator it = optionNames.find(optIdx);
     if (it == optionNames.end())
 	return QString::null;
     int slash = (*it).find('/');
@@ -52,7 +74,7 @@ getOptionName(int optIdx) {
 
 const QString KPsionConfig::
 getSectionName(int optIdx) {
-    optMap::Iterator it = optionNames.find(optIdx);
+    cfgMap::Iterator it = optionNames.find(optIdx);
     if (it == optionNames.end())
 	return QString::null;
     int slash = (*it).find('/');
@@ -64,14 +86,14 @@ getConfigDevices() {
     QStringList l;
 
     l += i18n("off");
-    l += i18n("/dev/ttyS0");
-    l += i18n("/dev/ttyS1");
-    l += i18n("/dev/ttyS2");
-    l += i18n("/dev/ttyS3");
-    l += i18n("/dev/ircomm0");
-    l += i18n("/dev/ircomm1");
-    l += i18n("/dev/ircomm2");
-    l += i18n("/dev/ircomm3");
+    l += QString("/dev/ttyS0");
+    l += QString("/dev/ttyS1");
+    l += QString("/dev/ttyS2");
+    l += QString("/dev/ttyS3");
+    l += QString("/dev/ircomm0");
+    l += QString("/dev/ircomm1");
+    l += QString("/dev/ircomm2");
+    l += QString("/dev/ircomm3");
 
     return l;
 }
@@ -89,6 +111,25 @@ getConfigSpeeds() {
     return l;
 }
 
+QStringList KPsionConfig::
+getConfigBackupInterval() {
+    QStringList l;
+
+    l += i18n("none");
+    l += i18n("daily");
+    l += i18n("every 2 days");
+    l += i18n("every 3 days");
+    l += i18n("every 4 days");
+    l += i18n("every 5 days");
+    l += i18n("every 6 days");
+    l += i18n("weekly");
+    l += i18n("every 2 weeks");
+    l += i18n("every 3 weeks");
+    l += i18n("monthly");
+
+    return l;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
diff --git a/kde2/kpsion/kpsionconfig.h b/kde2/kpsion/kpsionconfig.h
index 95cbb50..0403f67 100644
--- a/kde2/kpsion/kpsionconfig.h
+++ b/kde2/kpsion/kpsionconfig.h
@@ -26,7 +26,7 @@
 #include <qstringlist.h>
 #include <qmap.h>
 
-typedef QMap<int,QString> optMap;
+typedef QMap<int,QString> cfgMap;
 
 class KPsionConfig {
 public:
@@ -44,15 +44,29 @@ public:
 	OPT_BACKUPDRIVES = 9,
     };
 
+    enum cfgDefaults {
+	DEF_BACKUPDIR = 0,
+	DEF_INCINTERVAL = 1,
+	DEF_FULLINTERVAL = 2,
+	DEF_CONNRETRY = 3,
+	DEF_SERIALDEV = 4,
+	DEF_SERIALSPEED = 5,
+	DEF_BACKUPGEN = 6,
+    };
+
     KPsionConfig();
 
     QStringList getConfigDevices();
     QStringList getConfigSpeeds();
+    QStringList getConfigBackupInterval();
     const QString getOptionName(int);
     const QString getSectionName(int);
+    const QString getStrDefault(int);
+    int getIntDefault(int);
 
 private:
-    optMap optionNames;
+    cfgMap optionNames;
+    cfgMap defaults;
 
 };
 #endif
diff --git a/kde2/kpsion/setupdialog.cpp b/kde2/kpsion/setupdialog.cpp
index 03eea8c..fa5959c 100644
--- a/kde2/kpsion/setupdialog.cpp
+++ b/kde2/kpsion/setupdialog.cpp
@@ -48,8 +48,6 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
     QStringList::Iterator sli;
     KPsionConfig pcfg;
 
-    enableLinkedHelp(false);
-
     KConfig *config = kapp->config();
 
     // Page 1
@@ -69,96 +67,64 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
 		    i18n("Click here, for opening a dialog which lets you easily select the backup folder."));
     grid->addWidget(bdirLabel, 0, 1);
     grid->addWidget(bdirButton, 0, 2);
-
-    grid->setColStretch(1, 1);
-
+    grid->setColStretch(0, 1);
     connect(bdirButton, SIGNAL(clicked()), SLOT(slotBdirBrowse()));
 
 
     // Page 2
     page2 = addPage(i18n("Backup &policy"));
-    grid = new QGridLayout(page2);
+    grid = new QGridLayout(page2, 1, 1, marginHint() * 2, spacingHint() * 2);
 
-    QLabel *l = new QLabel(i18n("&Incremental backup reminder"), page2,
+    QLabel *l = new QLabel(i18n("&Incremental backup interval"), page2,
 		   "iBackupIntLabel");
-    grid->addWidget(l, 3, 1);
+    grid->addWidget(l, 0, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_INCINTERVAL));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_INCINTERVAL));
     iIntCombo = new KComboBox(false, page2, "iIntCombo");
-    iIntCombo->insertItem(i18n("none"));
-    iIntCombo->insertItem(i18n("daily"));
-    iIntCombo->insertItem(i18n("every 2 days"));
-    iIntCombo->insertItem(i18n("every 3 days"));
-    iIntCombo->insertItem(i18n("every 4 days"));
-    iIntCombo->insertItem(i18n("every 5 days"));
-    iIntCombo->insertItem(i18n("every 6 days"));
-    iIntCombo->insertItem(i18n("weekly"));
-    iIntCombo->insertItem(i18n("every 2 weeks"));
-    iIntCombo->insertItem(i18n("every 3 weeks"));
-    iIntCombo->insertItem(i18n("monthly"));
+    iIntCombo->insertStringList(pcfg.getConfigBackupInterval());
     iIntCombo->setCurrentItem(i);
-    grid->addWidget(iIntCombo, 3, 2);
+    grid->addWidget(iIntCombo, 0, 1);
     l->setBuddy(iIntCombo);
 
-    l = new QLabel(i18n("&Full backup reminder"), page2, "fBackupIntLabel");
-    grid->addWidget(l, 5, 1);
+    l = new QLabel(i18n("&Full backup interval"), page2, "fBackupIntLabel");
+    grid->addWidget(l, 1, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_FULLINTERVAL));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_FULLINTERVAL));
     fIntCombo = new KComboBox(false, page2, "fIntCombo");
-    fIntCombo->insertItem(i18n("none"));
-    fIntCombo->insertItem(i18n("daily"));
-    fIntCombo->insertItem(i18n("every 2 days"));
-    fIntCombo->insertItem(i18n("every 3 days"));
-    fIntCombo->insertItem(i18n("every 4 days"));
-    fIntCombo->insertItem(i18n("every 5 days"));
-    fIntCombo->insertItem(i18n("every 6 days"));
-    fIntCombo->insertItem(i18n("weekly"));
-    fIntCombo->insertItem(i18n("every 2 weeks"));
-    fIntCombo->insertItem(i18n("every 3 weeks"));
-    fIntCombo->insertItem(i18n("monthly"));
+    fIntCombo->insertStringList(pcfg.getConfigBackupInterval());
     fIntCombo->setCurrentItem(i);
-    grid->addWidget(fIntCombo, 5, 2);
+    grid->addWidget(fIntCombo, 1, 1);
     l->setBuddy(fIntCombo);
 
     l = new QLabel(i18n("Backup &generations"), page2, "backupGenLabel");
-    grid->addWidget(l, 7, 1);
+    grid->addWidget(l, 2, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_BACKUPGEN));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_BACKUPGEN));
     genSpin = new KIntSpinBox(0, 10, 1, i, 10, page2, "backupGenSpin");
-    grid->addWidget(genSpin, 7, 2);
+    grid->addWidget(genSpin, 2, 1);
     l->setBuddy(genSpin);
 
-    grid->setRowStretch(1, 1);
-    grid->setColStretch(1, 1);
-
-    grid->addRowSpacing(2, KDialog::spacingHint());
-    grid->addRowSpacing(4, KDialog::spacingHint());
-    grid->addRowSpacing(6, KDialog::spacingHint());
-
-    grid->addRowSpacing(0, KDialog::marginHint());
-    grid->addRowSpacing(8, KDialog::marginHint());
-    grid->addColSpacing(0, KDialog::marginHint());
-    grid->addColSpacing(3, KDialog::marginHint());
+    grid->setColStretch(0, 1);
 
     // Page 3
     page3 = addPage(i18n("&Connection"));
-    grid = new QGridLayout(page3);
+    grid = new QGridLayout(page3, 1, 1, marginHint() * 2, spacingHint() * 2);
 
     l = new QLabel(i18n("&Connection retry interval (sec.)"), page3,
 		   "rconLabel");
-    grid->addWidget(l, 3, 1);
+    grid->addWidget(l, 0, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_CONNRETRY));
     i = config->readNumEntry(pcfg.getOptionName(KPsionConfig::OPT_CONNRETRY));
     rconSpin = new KIntSpinBox(0, 600, 1, i, 10, page3, "rconSpin");
-    grid->addWidget(rconSpin, 3, 2);
+    grid->addWidget(rconSpin, 0, 1);
     l->setBuddy(rconSpin);
 
     l = new QLabel(i18n("Serial &device"), page3, "devLabel");
-    grid->addWidget(l, 5, 1);
+    grid->addWidget(l, 1, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALDEV));
     tmp = config->readEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV));
@@ -166,15 +132,18 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
     devCombo = new KComboBox(false, page3, "devCombo");
     sl = pcfg.getConfigDevices();
     devCombo->insertStringList(sl);
-    for (i = 0, sli = sl.begin(); sli != sl.end(); ++i, ++sli) {
-	if (*sli == tmp)
-	    devCombo->setCurrentItem(i);
-    }
-    grid->addWidget(devCombo, 5, 2);
+    if (tmp == "off")
+	devCombo->setCurrentItem(0);
+    else
+	for (i = 0, sli = sl.begin(); sli != sl.end(); ++i, ++sli) {
+	    if (*sli == tmp)
+		devCombo->setCurrentItem(i);
+	}
+    grid->addWidget(devCombo, 1, 1);
     l->setBuddy(devCombo);
 
     l = new QLabel(i18n("Serial &speed"), page3, "speedLabel");
-    grid->addWidget(l, 7, 1);
+    grid->addWidget(l, 2, 0);
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALSPEED));
     tmp = config->readEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALSPEED));
@@ -186,27 +155,27 @@ SetupDialog::SetupDialog(QWidget *parent, rfsv *plpRfsv, rpcs *plpRpcs)
 	if (*sli == tmp)
 	    speedCombo->setCurrentItem(i);
     }
-    grid->addWidget(speedCombo, 7, 2);
+    grid->addWidget(speedCombo, 2, 1);
     l->setBuddy(speedCombo);
 
-    grid->setRowStretch(1, 1);
-    grid->setColStretch(1, 1);
-
-    grid->addRowSpacing(2, KDialog::spacingHint());
-    grid->addRowSpacing(4, KDialog::spacingHint());
-    grid->addRowSpacing(6, KDialog::spacingHint());
-
-    grid->addRowSpacing(0, KDialog::marginHint());
-    grid->addRowSpacing(8, KDialog::marginHint());
-    grid->addColSpacing(0, KDialog::marginHint());
-    grid->addColSpacing(3, KDialog::marginHint());
+    grid->setColStretch(0, 1);
 
+    connect(this, SIGNAL(defaultClicked()), SLOT(slotDefaultClicked()));
     connect(this, SIGNAL(okClicked()), SLOT(slotSaveSettings()));
     connect(this, SIGNAL(applyClicked()), SLOT(slotSaveSettings()));
 }
 
 void SetupDialog::
 slotDefaultClicked() {
+    KPsionConfig pcfg;
+
+    bdirLabel->setText(pcfg.getStrDefault(KPsionConfig::DEF_BACKUPDIR));
+    iIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_INCINTERVAL));
+    fIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_FULLINTERVAL));
+    genSpin->setValue(pcfg.getIntDefault(KPsionConfig::DEF_BACKUPGEN));
+    rconSpin->setValue(pcfg.getIntDefault(KPsionConfig::DEF_CONNRETRY));
+    devCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALDEV));
+    speedCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALSPEED));
 }
 
 void SetupDialog::
@@ -242,8 +211,12 @@ slotSaveSettings() {
 		       rconSpin->value());
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALDEV));
-    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
-		       devCombo->currentText());
+    if (devCombo->currentItem() == 0)
+	config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
+			   "off");
+    else
+	config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
+			   devCombo->currentText());
 
     config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALSPEED));
     config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALSPEED),
diff --git a/kde2/kpsion/wizards.cpp b/kde2/kpsion/wizards.cpp
index eb878c4..057d0cb 100644
--- a/kde2/kpsion/wizards.cpp
+++ b/kde2/kpsion/wizards.cpp
@@ -38,7 +38,6 @@
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
-#include <kstddirs.h>
 
 #include <qlayout.h>
 #include <qwhatsthis.h>
@@ -58,7 +57,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     QWhatsThis::add(cancelButton(),
 		    i18n("<QT>If you click this button, the setup of <B>KPSion</B> will be aborted and next time you start <B>KPsion</B>, it will run this setup again.</QT>"));
 
-    bdirDefault = locateLocal("data", "kpsion/backups");
+    bdirDefault = pcfg.getStrDefault(KPsionConfig::DEF_BACKUPDIR);
     bdirCreated = "";
 
     // Page 1
@@ -135,7 +134,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
 	"<QT>"
 	"Next, please specify some information regarding "
 	"backup policy:<UL><LI>How many generations of backups "
-	"do you want to keep?</LI><LI>Shall i remind you about "
+	"do you want to keep?</LI><LI>Shall i perform automatic "
 	"backups?</LI><LI>If yes, in what intervals do you want "
 	"to happen backups?</LI></UL>"
 	"</QT>"
@@ -143,45 +142,27 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
 
     l = new QLabel(
-	i18n("&Incremental backup reminder"), page3, "iBackupIntLabel");
+	i18n("&Incremental backup interval"), page3, "iBackupIntLabel");
     grid->addWidget(l, 3, 1);
     iIntCombo = new KComboBox(false, page3, "iIntCombo");
-    iIntCombo->insertItem(i18n("none"));
-    iIntCombo->insertItem(i18n("daily"));
-    iIntCombo->insertItem(i18n("every 2 days"));
-    iIntCombo->insertItem(i18n("every 3 days"));
-    iIntCombo->insertItem(i18n("every 4 days"));
-    iIntCombo->insertItem(i18n("every 5 days"));
-    iIntCombo->insertItem(i18n("every 6 days"));
-    iIntCombo->insertItem(i18n("weekly"));
-    iIntCombo->insertItem(i18n("every 2 weeks"));
-    iIntCombo->insertItem(i18n("every 3 weeks"));
-    iIntCombo->insertItem(i18n("monthly"));
-    iIntCombo->setCurrentItem(1);
+    iIntCombo->insertStringList(pcfg.getConfigBackupInterval());
+    iIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_INCINTERVAL));
     grid->addWidget(iIntCombo, 3, 2);
     l->setBuddy(iIntCombo);
 
-    l = new QLabel(i18n("&Full backup reminder"), page3, "fBackupIntLabel");
+    l = new QLabel(i18n("&Full backup interval"), page3, "fBackupIntLabel");
     grid->addWidget(l, 5, 1);
     fIntCombo = new KComboBox(false, page3, "fIntCombo");
-    fIntCombo->insertItem(i18n("none"));
-    fIntCombo->insertItem(i18n("daily"));
-    fIntCombo->insertItem(i18n("every 2 days"));
-    fIntCombo->insertItem(i18n("every 3 days"));
-    fIntCombo->insertItem(i18n("every 4 days"));
-    fIntCombo->insertItem(i18n("every 5 days"));
-    fIntCombo->insertItem(i18n("every 6 days"));
-    fIntCombo->insertItem(i18n("weekly"));
-    fIntCombo->insertItem(i18n("every 2 weeks"));
-    fIntCombo->insertItem(i18n("every 3 weeks"));
-    fIntCombo->insertItem(i18n("monthly"));
-    fIntCombo->setCurrentItem(7);
+    fIntCombo->insertStringList(pcfg.getConfigBackupInterval());
+    fIntCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_FULLINTERVAL));
     grid->addWidget(fIntCombo, 5, 2);
     l->setBuddy(fIntCombo);
 
     l = new QLabel(i18n("Backup &generations"), page3, "backupGenLabel");
     grid->addWidget(l, 7, 1);
-    genSpin = new KIntSpinBox(0, 10, 1, 3, 10, page3, "backupGenSpin");
+    genSpin = new KIntSpinBox(0, 10, 1,
+			      pcfg.getIntDefault(KPsionConfig::DEF_BACKUPGEN),
+			      10, page3, "backupGenSpin");
     grid->addWidget(genSpin, 7, 2);
     l->setBuddy(genSpin);
 
@@ -223,7 +204,9 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     l = new QLabel(
 	i18n("&Connection retry interval (sec.)"), page4, "rconLabel");
     grid->addWidget(l, 3, 1);
-    rconSpin = new KIntSpinBox(0, 600, 1, 30, 10, page4, "rconSpin");
+    rconSpin = new KIntSpinBox(0, 600, 1,
+			       pcfg.getIntDefault(KPsionConfig::DEF_CONNRETRY),
+			       10, page4, "rconSpin");
     grid->addWidget(rconSpin, 3, 2);
     l->setBuddy(rconSpin);
 
@@ -232,7 +215,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     devCombo = new KComboBox(false, page4, "devCombo");
     sl = pcfg.getConfigDevices();
     devCombo->insertStringList(sl);
-    devCombo->setCurrentItem(0);
+    devCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALDEV));
     grid->addWidget(devCombo, 5, 2);
     l->setBuddy(devCombo);
 
@@ -241,7 +224,7 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
     speedCombo = new KComboBox(false, page4, "speedCombo");
     sl = pcfg.getConfigSpeeds();
     speedCombo->insertStringList(sl);
-    speedCombo->setCurrentItem(4);
+    speedCombo->setCurrentItem(pcfg.getIntDefault(KPsionConfig::DEF_SERIALSPEED));
     grid->addWidget(speedCombo, 7, 2);
     l->setBuddy(speedCombo);