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

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit bfbe81d8ddc4e6a90579e81509f7c429f43ab5ae
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Sat Feb 28 14:02:21 2009 +0200

    Use Qt's resource system for the watermark.

diff --git a/kaboom.pro b/kaboom.pro
index 428725a..a7121fb 100644
--- a/kaboom.pro
+++ b/kaboom.pro
@@ -14,7 +14,7 @@ TRANSLATIONS += \
       kaboom_es.ts \
       kaboom_it.ts \
       kaboom_template.ts \
-      
+
 # Input
 HEADERS += \
       choicepage.h \
@@ -27,8 +27,8 @@ HEADERS += \
       diroperations/diroperations.h \
       diroperations/progresswidget.h \
       richradiobutton.h
-      
-      
+
+
 SOURCES += \
       choicepage.cpp \
       intropage.cpp \
@@ -39,4 +39,5 @@ SOURCES += \
       diroperations/diroperations.cpp \
       diroperations/progresswidget.cpp \
       richradiobutton.cpp
-      
+
+RESOURCES += resources.qrc
diff --git a/migrationtool.cpp b/migrationtool.cpp
index fcdb8ff..9db1a19 100644
--- a/migrationtool.cpp
+++ b/migrationtool.cpp
@@ -31,21 +31,21 @@ MigrationTool::MigrationTool(QWidget *parent) : QWizard(parent)
   d->choice = new ChoicePage(this);
   d->warning = new WarningPage(this);
   d->migration = new MigrationPage(this);
-  
+
   setWindowTitle(tr("Kaboom - Debian KDE Settings Migration Wizard"));
-  setOptions(QWizard::NoBackButtonOnStartPage|QWizard::NoCancelButton|options());  
-  
+  setOptions(QWizard::NoBackButtonOnStartPage|QWizard::NoCancelButton|options());
+
   setButtonText(QWizard::BackButton, tr("&Back"));
   setButtonText(QWizard::NextButton, tr("&Next"));
   setButtonText(QWizard::FinishButton,tr("&Finish"));
-  
-  setPixmap(QWizard::WatermarkPixmap,QPixmap("watermark.png"));
+
+  setPixmap(QWizard::WatermarkPixmap,QPixmap(":/watermark.png"));
   //setPixmap(QWizard::LogoPixmap,QPixmap("logo.png"));  - we don't use subtitles, so this is never shown.
   setWizardStyle(QWizard::ModernStyle);
-  
+
   setPage(Intro,d->intro);
   setPage(Choice, d->choice);
-  setPage(Warning, d->warning); 
+  setPage(Warning, d->warning);
   setPage(Migration,d->migration);
 
   setStartId(MigrationTool::Intro);
diff --git a/resources.qrc b/resources.qrc
new file mode 100644
index 0000000..7719768
--- /dev/null
+++ b/resources.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+     <file>watermark.png</file>
+</qresource>
+</RCC>

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