[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-15-gbfdccff

[Modestas Vainius]

The following commit has been merged in the master branch:
commit ee357bfbfb63bd4125cb3a0bb8f74dc444a94547
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 31 00:43:24 2009 +0300

    Add more information about Cancel button.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/intropage.cpp b/intropage.cpp
index 14e9bde..6583132 100644
--- a/intropage.cpp
+++ b/intropage.cpp
@@ -42,6 +42,10 @@ IntroPage::IntroPage(QWidget *parent) : QWizardPage(parent)
     "settings and data in the next step to avoid data loss in hopefully rare "
     "cases when some KDE&nbsp;4 applications fail to migrate your important user "
     "settings and/or data properly.</p>"
+
+    "<p align='justify'>If you need to make manual adjustments, you can cancel the "
+    "wizard. KDE will not start and the current session will be terminated. You will "
+    "see this wizard when you try to start KDE session again.</p>"
     ).arg(KaboomSettings::instance().kdehomePrettyPath())
      .arg(KaboomSettings::instance().kde4homePrettyPath()), this);
   text->setWordWrap(true);
diff --git a/migrationtool.cpp b/migrationtool.cpp
index 41bc8a0..e33bb7c 100644
--- a/migrationtool.cpp
+++ b/migrationtool.cpp
@@ -39,6 +39,7 @@ MigrationTool::MigrationTool(QWidget *parent) : QWizard(parent)
   setButtonText(QWizard::NextButton, tr("&Next"));
   setButtonText(QWizard::FinishButton,tr("&Finish"));
   setButtonText(QWizard::CancelButton,tr("&Cancel"));
+  button(QWizard::CancelButton)->setToolTip(tr("Cancel the wizard and terminate this session"));
 
   setPixmap(QWizard::WatermarkPixmap,QPixmap(":/watermark.png"));
   //setPixmap(QWizard::LogoPixmap,QPixmap("logo.png"));  - we don't use subtitles, so this is never shown.

-- 
Kaboom - Debian KDE 3->4 migration tool