[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. af30b38876d246c4fb994a7f356034ca5ac285c9
Sune Vuorela
pusling-guest at alioth.debian.org
Tue Feb 17 21:44:06 UTC 2009
The following commit has been merged in the master branch:
commit af30b38876d246c4fb994a7f356034ca5ac285c9
Author: Sune Vuorela <sune at vuorela.dk>
Date: Tue Feb 17 22:44:01 2009 +0100
do a bit more magic with the start and back buttons and actually dummy use the progress bar
diff --git a/migrationpage.cpp b/migrationpage.cpp
index 15aec86..f5ffe2e 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -27,10 +27,13 @@ MigrationPagePrivate::MigrationPagePrivate(MigrationPage* parent)
backup=true;
selection=MigrationTool::Migrate;
progress=new ProgressWidget(q);
+ start = new QPushButton("Start",q);
}
void MigrationPagePrivate::doMagic()
{
+ start->setEnabled(false);
+ q->wizard()->setOptions(q->wizard()->options()|QWizard::DisabledBackButtonOnLastPage);
q->setTitle("Migration running");
if(backup)
{
@@ -39,6 +42,8 @@ void MigrationPagePrivate::doMagic()
switch(selection)
{
case MigrationTool::Migrate:
+ //dummyy
+ DirOperations::calculateDirSize(QDir::homePath()+"/git",progress);
qDebug() << "do nothing, let kconf_update do magic";
break;
case MigrationTool::Merge:
@@ -60,16 +65,15 @@ MigrationPage::MigrationPage(QWidget *parent) : QWizardPage(parent)
{
d=new MigrationPagePrivate(this);
QLabel *text = new QLabel("When you click \"start\", migration will start",this);
- QPushButton *start = new QPushButton("Start",this);
setTitle("Start Migration");
- connect(start,SIGNAL(clicked()),d,SLOT(doMagic()));
+ connect(d->start,SIGNAL(clicked()),d,SLOT(doMagic()));
QVBoxLayout *lay = new QVBoxLayout(this);
lay->addWidget(text);
lay->addWidget(d->progress);
- lay->addWidget(start);
+ lay->addWidget(d->start);
setLayout(lay);
}
diff --git a/migrationpage_p.h b/migrationpage_p.h
index dbd7ff4..ff1cd82 100644
--- a/migrationpage_p.h
+++ b/migrationpage_p.h
@@ -29,6 +29,7 @@ class MigrationPagePrivate : public QObject
MigrationPagePrivate(MigrationPage *parent);
MigrationTool::Selection selection;
ProgressWidget *progress;
+ QPushButton *start;
MigrationPage *q;
bool backup;
bool complete;
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list