Put some classes in separate files.

Started setup dialog
Use a QMap for Optionnames in config file. (prevents typos).

1 files changed, 283 insertions, 261 deletions

diff --git a/kde2/kpsion/wizards.cpp b/kde2/kpsion/wizards.cpp
index 62734b5..eb878c4 100644
--- a/kde2/kpsion/wizards.cpp
+++ b/kde2/kpsion/wizards.cpp
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <pwd.h>
 
+#include "kpsionconfig.h"
 #include "wizards.h"
 
 #include <kapp.h>
@@ -44,253 +45,249 @@
 #include <qheader.h>
 
 FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name)
-    : KWizard(parent, name, true) {
-
-	setCaption(i18n("KPsion Setup"));
-	QWhatsThis::add(nextButton(),
-			i18n("Click this button to continue with the next page."));
-	QWhatsThis::add(backButton(),
-			i18n("Click this button, to go to a previous page."));
-	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");
-	bdirCreated = "";
-
-	// Page 1
-	page1 = new QWidget(this, "welcome");
-	QGridLayout *grid = new QGridLayout(page1);
-
-	QLabel *l = new QLabel(page1, "welcome message");
-	l->setText(i18n(
-	    "<QT>"
-	    "<H2>Welcome to KPsion!</H2>"
-	    "It looks like you started <B>KPsion</B> the first time. "
-	    "At least, i could not find any valid configuration.</BR>"
-	    "On the following pages, we will gather some information, "
-	    "which is needed for working with <B>KPsion</B>.</BR>"
-	    " </BR>"
-	    "Have fun."
-	    "</QT>"
-	    ));
-	grid->addWidget(l, 1, 1, Qt::AlignTop);
-	grid->setColStretch(1, 1);
-	grid->setRowStretch(1, 1);
-	grid->addRowSpacing(0, KDialog::marginHint());
-	grid->addRowSpacing(2, KDialog::marginHint());
-	grid->addColSpacing(0, KDialog::marginHint());
-	grid->addColSpacing(2, KDialog::marginHint());
-	addPage(page1, i18n("<QT><BIG><B>Welcome<B></BIG></QT>"));
-
-	// Page 2
-	page2 = new QWidget(this, "step1");
-	grid = new QGridLayout(page2);
-
-	l = new QLabel(page2, "step1");
-	l->setText(i18n(
-	    "<QT>"
-	    "First, we need a folder for storing backups of "
-	    "your Psion. You probably don't want others to "
-	    "have access to it, so it's best to choose a "
-	    "location somewhere in your home directory. "
-	    "Please browse through existing folders and select a suitable "
-	    "location or simply accept the default shown below."
-	    "</QT>"
-	    ));
-	grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
-
-	bdirLabel = new QLabel(page2, "bdirLabel");
-	bdirLabel->setText(bdirDefault);
-	bdirButton = new QPushButton(i18n("Browse"), page2);
-
-	QWhatsThis::add(bdirLabel,
-			i18n("This is the name of the backup folder."));
-	QWhatsThis::add(bdirButton,
-			i18n("Click here, for opening a dialog which lets you easily select the backup folder."));
-	grid->addWidget(bdirLabel, 3, 1);
-	grid->addWidget(bdirButton, 3, 2);
-
-	grid->setRowStretch(1, 1);
-	grid->setColStretch(1, 1);
-
-	grid->addRowSpacing(2, KDialog::spacingHint());
-
-	grid->addRowSpacing(0, KDialog::marginHint());
-	grid->addRowSpacing(4, KDialog::marginHint());
-	grid->addColSpacing(0, KDialog::marginHint());
-	grid->addColSpacing(3, KDialog::marginHint());
-
-	connect(bdirButton, SIGNAL(clicked()), SLOT(slotBdirBrowse()));
-	addPage(page2, i18n("<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"));
-	// Page 3
-	page3 = new QWidget(this, "step2");
-	grid = new QGridLayout(page3);
-
-	l = new QLabel(page3, "step2");
-	l->setText(i18n(
-	    "<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 "
-	    "backups?</LI><LI>If yes, in what intervals do you want "
-	    "to happen backups?</LI></UL>"
-	    "</QT>"
-	    ));
-	grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
-
-	l = new QLabel(i18n("&Incremental backup reminder"), 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);
-	grid->addWidget(iIntCombo, 3, 2);
-	l->setBuddy(iIntCombo);
-
-	l = new QLabel(i18n("&Full backup reminder"), 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);
-	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");
-	grid->addWidget(genSpin, 7, 2);
-	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());
-
-	addPage(page3, i18n("<QT><BIG><B>Step 2</B></BIG> - Backup policy</QT>"));
-
-	// Page 4
-	page4 = new QWidget(this, "step3");
-	grid = new QGridLayout(page4);
-
-	l = new QLabel(page4, "step2");
-	l->setText(i18n(
-	    "<QT>"
-	    "If no connection could be established on startup, "
-	    "<B>KPsion</B> will attempt to connect in regular "
-	    "intervals. Please specify the interval after which "
-	    "a connection attempt should happen. If you don't want "
-	    "automatic retry, set the interval to zero. Furthermore, "
-	    "<B>KPsion</B> can try to start ncpd if it is not already "
-	    "running. For that to work correctly, you need to"
-	    "<UL><LI>specify the serial port to use.</LI>"
-	    "<LI>specify the baud rate</LI>"
-	    "<LI>have permission to use the specified port</LI></UL>"
-	    "</QT>"
-	    ));
-	grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
-
-	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");
-	grid->addWidget(rconSpin, 3, 2);
-	l->setBuddy(rconSpin);
-
-	l = new QLabel(i18n("Serial &device"), page4, "devLabel");
-	grid->addWidget(l, 5, 1);
-	devCombo = new KComboBox(false, page4, "devCombo");
-	devCombo->insertItem(i18n("off"));
-	devCombo->insertItem(i18n("/dev/ttyS0"));
-	devCombo->insertItem(i18n("/dev/ttyS1"));
-	devCombo->insertItem(i18n("/dev/ttyS2"));
-	devCombo->insertItem(i18n("/dev/ttyS3"));
-	devCombo->insertItem(i18n("/dev/ircomm0"));
-	devCombo->insertItem(i18n("/dev/ircomm1"));
-	devCombo->insertItem(i18n("/dev/ircomm2"));
-	devCombo->insertItem(i18n("/dev/ircomm3"));
-	devCombo->setCurrentItem(0);
-	grid->addWidget(devCombo, 5, 2);
-	l->setBuddy(devCombo);
-
-	l = new QLabel(i18n("Serial &speed"), page4, "speedLabel");
-	grid->addWidget(l, 7, 1);
-	speedCombo = new KComboBox(false, page4, "speedCombo");
-	speedCombo->insertItem("9600");
-	speedCombo->insertItem("19200");
-	speedCombo->insertItem("38400");
-	speedCombo->insertItem("57600");
-	speedCombo->insertItem("115200");
-	speedCombo->setCurrentItem(4);
-	grid->addWidget(speedCombo, 7, 2);
-	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());
-
-	addPage(page4, i18n("<QT><BIG><B>Step 3</B></BIG> - Connection parameters</QT>"));
-
-	// Page 5
-	page5 = new QWidget(this, "step3");
-	grid = new QGridLayout(page5);
-
-	l = new QLabel(page5, "step2");
-	l->setText(i18n(
-	    "<QT>"
-	    "That's it!<BR/>"
-	    "Next, i will start <B>KPsion</B> and if your Psion is already "
-	    "connected and it's communication turned on (use "
-	    "<B>Ctrl-T</B> at system level), then <B>KPsion</B> will "
-	    "bring up a similar Dialog like this which lets you assing a "
-	    "Name for it. After that, i suggest performing a full "
-	    "Backup.<BR/>Please click <B>Finish</B> now.</QT>"
-	    ));
-	grid->addWidget(l, 1, 1, Qt::AlignTop);
-
-	grid->setRowStretch(1, 1);
-	grid->setColStretch(1, 1);
-
-	grid->addRowSpacing(0, KDialog::marginHint());
-	grid->addRowSpacing(2, KDialog::marginHint());
-	grid->addColSpacing(0, KDialog::marginHint());
-	grid->addColSpacing(2, KDialog::marginHint());
-
-	addPage(page5, i18n("<QT><BIG><B>Finished</B></BIG></QT>"));
-
-	setFinishEnabled(page5, true);
+    : KWizard(parent, name, true)
+{
+    QStringList sl;
+    KPsionConfig pcfg;
+
+    setCaption(i18n("KPsion Setup"));
+    QWhatsThis::add(nextButton(),
+		    i18n("Click this button to continue with the next page."));
+    QWhatsThis::add(backButton(),
+		    i18n("Click this button, to go to a previous page."));
+    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");
+    bdirCreated = "";
+
+    // Page 1
+    page1 = new QWidget(this, "welcome");
+    QGridLayout *grid = new QGridLayout(page1);
+
+    QLabel *l = new QLabel(page1, "welcome message");
+    l->setText(i18n(
+	"<QT>"
+	"<H2>Welcome to KPsion!</H2>"
+	"It looks like you started <B>KPsion</B> the first time. "
+	"At least, i could not find any valid configuration.</BR>"
+	"On the following pages, we will gather some information, "
+	"which is needed for working with <B>KPsion</B>.</BR>"
+	" </BR>"
+	"Have fun."
+	"</QT>"
+	));
+    grid->addWidget(l, 1, 1, Qt::AlignTop);
+    grid->setColStretch(1, 1);
+    grid->setRowStretch(1, 1);
+    grid->addRowSpacing(0, KDialog::marginHint());
+    grid->addRowSpacing(2, KDialog::marginHint());
+    grid->addColSpacing(0, KDialog::marginHint());
+    grid->addColSpacing(2, KDialog::marginHint());
+    addPage(page1, i18n("<QT><BIG><B>Welcome<B></BIG></QT>"));
+
+    // Page 2
+    page2 = new QWidget(this, "step1");
+    grid = new QGridLayout(page2);
+
+    l = new QLabel(page2, "step1");
+    l->setText(i18n(
+	"<QT>"
+	"First, we need a folder for storing backups of "
+	"your Psion. You probably don't want others to "
+	"have access to it, so it's best to choose a "
+	"location somewhere in your home directory. "
+	"Please browse through existing folders and select a suitable "
+	"location or simply accept the default shown below."
+	"</QT>"
+	));
+    grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
+
+    bdirLabel = new QLabel(page2, "bdirLabel");
+    bdirLabel->setText(bdirDefault);
+    bdirButton = new QPushButton(i18n("Browse"), page2);
+
+    QWhatsThis::add(bdirLabel,
+		    i18n("This is the name of the backup folder."));
+    QWhatsThis::add(bdirButton,
+		    i18n("Click here, for opening a dialog which lets you easily select the backup folder."));
+    grid->addWidget(bdirLabel, 3, 1);
+    grid->addWidget(bdirButton, 3, 2);
+
+    grid->setRowStretch(1, 1);
+    grid->setColStretch(1, 1);
+
+    grid->addRowSpacing(2, KDialog::spacingHint());
+
+    grid->addRowSpacing(0, KDialog::marginHint());
+    grid->addRowSpacing(4, KDialog::marginHint());
+    grid->addColSpacing(0, KDialog::marginHint());
+    grid->addColSpacing(3, KDialog::marginHint());
+
+    connect(bdirButton, SIGNAL(clicked()), SLOT(slotBdirBrowse()));
+    addPage(page2, i18n("<QT><BIG><B>Step 1</B></BIG> - Specify backup directory</QT>"));
+    // Page 3
+    page3 = new QWidget(this, "step2");
+    grid = new QGridLayout(page3);
+
+    l = new QLabel(page3, "step2");
+    l->setText(i18n(
+	"<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 "
+	"backups?</LI><LI>If yes, in what intervals do you want "
+	"to happen backups?</LI></UL>"
+	"</QT>"
+	));
+    grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
+
+    l = new QLabel(
+	i18n("&Incremental backup reminder"), 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);
+    grid->addWidget(iIntCombo, 3, 2);
+    l->setBuddy(iIntCombo);
+
+    l = new QLabel(i18n("&Full backup reminder"), 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);
+    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");
+    grid->addWidget(genSpin, 7, 2);
+    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());
+
+    addPage(page3, i18n("<QT><BIG><B>Step 2</B></BIG> - Backup policy</QT>"));
+
+    // Page 4
+    page4 = new QWidget(this, "step3");
+    grid = new QGridLayout(page4);
+
+    l = new QLabel(page4, "step2");
+    l->setText(i18n(
+	"<QT>"
+	"If no connection could be established on startup, "
+	"<B>KPsion</B> will attempt to connect in regular "
+	"intervals. Please specify the interval after which "
+	"a connection attempt should happen. If you don't want "
+	"automatic retry, set the interval to zero. Furthermore, "
+	"<B>KPsion</B> can try to start ncpd if it is not already "
+	"running. For that to work correctly, you need to"
+	"<UL><LI>specify the serial port to use.</LI>"
+	"<LI>specify the baud rate</LI>"
+	"<LI>have permission to use the specified port</LI></UL>"
+	"</QT>"
+	));
+    grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop);
+
+    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");
+    grid->addWidget(rconSpin, 3, 2);
+    l->setBuddy(rconSpin);
+
+    l = new QLabel(i18n("Serial &device"), page4, "devLabel");
+    grid->addWidget(l, 5, 1);
+    devCombo = new KComboBox(false, page4, "devCombo");
+    sl = pcfg.getConfigDevices();
+    devCombo->insertStringList(sl);
+    devCombo->setCurrentItem(0);
+    grid->addWidget(devCombo, 5, 2);
+    l->setBuddy(devCombo);
+
+    l = new QLabel(i18n("Serial &speed"), page4, "speedLabel");
+    grid->addWidget(l, 7, 1);
+    speedCombo = new KComboBox(false, page4, "speedCombo");
+    sl = pcfg.getConfigSpeeds();
+    speedCombo->insertStringList(sl);
+    speedCombo->setCurrentItem(4);
+    grid->addWidget(speedCombo, 7, 2);
+    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());
+
+    addPage(page4,
+	    i18n("<QT><BIG><B>Step 3</B></BIG> - Connection parameters</QT>"));
+
+    // Page 5
+    page5 = new QWidget(this, "step3");
+    grid = new QGridLayout(page5);
+
+    l = new QLabel(page5, "step2");
+    l->setText(i18n(
+	"<QT>"
+	"That's it!<BR/>"
+	"Next, i will start <B>KPsion</B> and if your Psion is already "
+	"connected and it's communication turned on (use "
+	"<B>Ctrl-T</B> at system level), then <B>KPsion</B> will "
+	"bring up a similar Dialog like this which lets you assing a "
+	"Name for it. After that, i suggest performing a full "
+	"Backup.<BR/>Please click <B>Finish</B> now.</QT>"
+	));
+    grid->addWidget(l, 1, 1, Qt::AlignTop);
+
+    grid->setRowStretch(1, 1);
+    grid->setColStretch(1, 1);
+
+    grid->addRowSpacing(0, KDialog::marginHint());
+    grid->addRowSpacing(2, KDialog::marginHint());
+    grid->addColSpacing(0, KDialog::marginHint());
+    grid->addColSpacing(2, KDialog::marginHint());
+
+    addPage(page5, i18n("<QT><BIG><B>Finished</B></BIG></QT>"));
+
+    setFinishEnabled(page5, true);
 }
 
 void FirstTimeWizard::
@@ -316,15 +313,36 @@ reject() {
 void FirstTimeWizard::
 accept() {
     KConfig *config = kapp->config();
-    config->setGroup("Settings");
-    config->writeEntry("BackupDir", bdirLabel->text());
-    config->writeEntry("BackupGenerations", genSpin->value());
-    config->writeEntry("IncrementalInterval", iIntCombo->currentItem());
-    config->writeEntry("FullInterval", fIntCombo->currentItem());
-    config->setGroup("Connection");
-    config->writeEntry("Retry", rconSpin->value());
-    config->writeEntry("Device", devCombo->currentText());
-    config->writeEntry("Speed", speedCombo->currentText());
+    KPsionConfig pcfg;
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_BACKUPDIR));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_BACKUPDIR),
+		       bdirLabel->text());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_BACKUPGEN));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_BACKUPGEN),
+		       genSpin->value());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_INCINTERVAL));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_INCINTERVAL),
+		       iIntCombo->currentItem());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_FULLINTERVAL));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_FULLINTERVAL),
+		       fIntCombo->currentItem());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_CONNRETRY));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_CONNRETRY),
+		       rconSpin->value());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALDEV));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALDEV),
+		       devCombo->currentText());
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_SERIALSPEED));
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_SERIALSPEED),
+		       speedCombo->currentText());
+
     hide();
     setResult(Accepted);
 }
@@ -545,11 +563,14 @@ checkPsionName(QString &name) {
 void NewPsionWizard::
 accept() {
     KConfig *config = kapp->config();
-    config->setGroup("Psion");
-    QStringList machines = config->readListEntry("MachineUIDs");
+    KPsionConfig pcfg;
+
+    config->setGroup(pcfg.getSectionName(KPsionConfig::OPT_UIDS));
+    QStringList machines = config->readListEntry(
+	pcfg.getOptionName(KPsionConfig::OPT_UIDS));
     machines += uid;
-    config->writeEntry("MachineUIDs", machines);
-    QString tmp = QString::fromLatin1("Name_%1").arg(uid);
+    config->writeEntry(pcfg.getOptionName(KPsionConfig::OPT_UIDS), machines);
+    QString tmp = pcfg.getOptionName(KPsionConfig::OPT_MACHNAME).arg(uid);
     config->writeEntry(tmp, nameEdit->text());
     tmp = nameEdit->text();
     psion->setMachineName(tmp);
@@ -569,7 +590,8 @@ accept() {
 		}
 	}
     }
-    config->writeEntry("BackupDrives", bdrives);
+    config->writeEntry(
+	pcfg.getOptionName(KPsionConfig::OPT_BACKUPDRIVES).arg(uid), bdrives);
     hide();
     setResult(Accepted);
 }