[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. af30b38876d246c4fb994a7f356034ca5ac285c9

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 3efc5ed666040c47be4676a1b150b6284b6b3d81
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 17 22:32:36 2009 +0100

    add the progress dialog of diroperations

diff --git a/migrationpage.cpp b/migrationpage.cpp
index c74426a..15aec86 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -17,6 +17,7 @@
 #include "migrationpage.h"
 #include "choicepage.h"
 #include "migrationpage_p.h"
+#include "diroperations/diroperations.h"
 
 
 MigrationPagePrivate::MigrationPagePrivate(MigrationPage* parent)
@@ -25,6 +26,7 @@ MigrationPagePrivate::MigrationPagePrivate(MigrationPage* parent)
   complete=false;
   backup=true;
   selection=MigrationTool::Migrate;
+  progress=new ProgressWidget(q);
 }
 
 void MigrationPagePrivate::doMagic()
@@ -66,6 +68,7 @@ MigrationPage::MigrationPage(QWidget *parent) : QWizardPage(parent)
   
   QVBoxLayout *lay = new QVBoxLayout(this);
   lay->addWidget(text);
+  lay->addWidget(d->progress);
   lay->addWidget(start);
   setLayout(lay);
   
diff --git a/migrationpage_p.h b/migrationpage_p.h
index 718d0a2..dbd7ff4 100644
--- a/migrationpage_p.h
+++ b/migrationpage_p.h
@@ -20,6 +20,7 @@
 #include <QtCore>
 #include "migrationpage.h"
 #include "migrationtool.h"
+#include "diroperations/progresswidget.h"
 
 class MigrationPagePrivate : public QObject
 {
@@ -27,6 +28,7 @@ class MigrationPagePrivate : public QObject
   public:
     MigrationPagePrivate(MigrationPage *parent);
     MigrationTool::Selection selection;
+    ProgressWidget *progress;
     MigrationPage *q;
     bool backup;
     bool complete;

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