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

Modestas Vainius modax-guest at alioth.debian.org
Tue Mar 31 01:29:16 UTC 2009


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

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

diff --git a/migrationtool.cpp b/migrationtool.cpp
index efa00e6..41bc8a0 100644
--- a/migrationtool.cpp
+++ b/migrationtool.cpp
@@ -33,11 +33,12 @@ MigrationTool::MigrationTool(QWidget *parent) : QWizard(parent)
   d->migration = new MigrationPage(this);
 
   setWindowTitle(tr("Kaboom - Debian KDE Settings Migration Wizard"));
-  setOptions(QWizard::NoBackButtonOnStartPage|QWizard::NoCancelButton|options());
+  setOptions(QWizard::NoBackButtonOnStartPage|options());
 
   setButtonText(QWizard::BackButton, tr("&Back"));
   setButtonText(QWizard::NextButton, tr("&Next"));
   setButtonText(QWizard::FinishButton,tr("&Finish"));
+  setButtonText(QWizard::CancelButton,tr("&Cancel"));
 
   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



More information about the pkg-kde-commits mailing list