[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 9046da66f7862841119b95fb16d0df9a4ca3a4aa
Modestas Vainius
modax-guest at alioth.debian.org
Sun Mar 1 11:08:04 UTC 2009
The following commit has been merged in the master branch:
commit 9046da66f7862841119b95fb16d0df9a4ca3a4aa
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun Mar 1 13:03:30 2009 +0200
Inform user about current configuration in choicepage.
Signed-off-by: Modestas Vainius <modestas at vainius.eu>
diff --git a/choicepage.cpp b/choicepage.cpp
index cd6791f..23fb144 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -24,7 +24,8 @@ class ChoicePagePrivate
{
public:
ChoicePagePrivate() : backup(NULL) {}
- QLabel *text;
+ QLabel *configInfoLabel, *configLabel, *onceDoneLabel;
+ QLabel *scenariosLabel;
RichRadioButton *clean;
RichRadioButton *migrate;
RichRadioButton *move;
@@ -45,9 +46,40 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
setTitle(tr("Setting migration options"));
d->buttons = new QButtonGroup(this);
- d->text = new QLabel(tr("Please choose one of the following migration scenarios:"),this);
- d->text->setWordWrap(true);
- lay->addWidget(d->text);
+
+ d->configInfoLabel = new QLabel(tr("Current configuration:"));
+ d->configInfoLabel->setWordWrap(true);
+
+ d->configLabel = new QLabel(tr("%1%2")
+ .arg((s.kdehomeDir().exists()) ?
+ tr("<strong>KDE 3</strong> settings and data are at <u>%1</u><br/>").arg(s.kdehomePrettyPath()) : "")
+ .arg((s.kde4homeDir().exists()) ?
+ tr("<strong>KDE 4</strong> settings and data are at <u>%1</u><br/>").arg(s.kde4homePrettyPath()) : ""),
+ this);
+ d->configLabel->setWordWrap(true);
+ d->configLabel->setIndent(20);
+
+ d->onceDoneLabel = new QLabel(
+ tr("Once you finish with this wizard, <strong>KDE 4</strong> will use <u>%1</u> "
+ "to store user settings and data. Optionally, <strong>KDE 3</strong> "
+ "settings and data may be backed up to <u>%2</u>.")
+ .arg(s.kdehomePrettyPath())
+ .arg(s.kdehomePrettyPath(KaboomSettings::Kde3Backup)),
+ this);
+ d->onceDoneLabel->setWordWrap(true);
+
+ d->scenariosLabel = new QLabel(tr("Please choose one of the following migration scenarios:"),this);
+ QFont font;
+ font.setBold(true);
+ d->scenariosLabel->setFont(font);
+ d->scenariosLabel->setWordWrap(true);
+
+ lay->addWidget(d->configInfoLabel);
+ lay->addWidget(d->configLabel);
+ lay->addWidget(d->onceDoneLabel);
+ lay->addSpacing(10);
+ lay->addWidget(d->scenariosLabel);
+
if(s.kdehomeDir().exists())
{
d->migrate = new RichRadioButton(tr("Migrate settings from KDE3 to KDE4 (standard)"),this);
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list