From 4a6deb34121aee9122745189a2d8dee976e76946 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Mon, 3 Oct 2011 01:25:43 +0200 Subject: added HTML welcome page --- debian/acritoxinstaller-kanotix.install | 1 + debian/rules | 4 ++++ kanotix/html/welcome.html | 22 ++++++++++++++++++++++ wizard/welcome.cpp | 2 ++ wizard/welcome.ui | 15 ++++++++++++--- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 kanotix/html/welcome.html diff --git a/debian/acritoxinstaller-kanotix.install b/debian/acritoxinstaller-kanotix.install index 9feb853..1376b12 100644 --- a/debian/acritoxinstaller-kanotix.install +++ b/debian/acritoxinstaller-kanotix.install @@ -1,2 +1,3 @@ kanotix/acritoxinstaller.desktop /usr/share/applnk/Kanotix/ kanotix/icons/* /usr/share/icons/hicolor/ +kanotix/html /usr/share/acritoxinstaller/ diff --git a/debian/rules b/debian/rules index fca5ea9..c4dbd4c 100755 --- a/debian/rules +++ b/debian/rules @@ -5,3 +5,7 @@ include /usr/share/cdbs/1/class/cmake.mk # Add here any variable or target overrides you need. + +binary-post-install/acritoxinstaller-kanotix:: + perl -pi -e 's/\@VERSION\@/$(DEB_VERSION)/g' debian/$(@:binary-post-install/%=%)/usr/share/acritoxinstaller/html/*.html + diff --git a/kanotix/html/welcome.html b/kanotix/html/welcome.html new file mode 100644 index 0000000..fe15c78 --- /dev/null +++ b/kanotix/html/welcome.html @@ -0,0 +1,22 @@ + + + + + +
+ + +

Install Kanotix

+

acritoxinstaller @VERSION@

+

written by Andreas Loibl <andreas@andreas-loibl.de>

+
+

Welcome and thank you for choosing Kanotix. The installer will now guide you through the configuration and installation.

+

If you need any help check out the Kanotix website or visit the Kanotix chat room.

+ +

Click Next to continue, or Cancel to exit the installer.

+
+ diff --git a/wizard/welcome.cpp b/wizard/welcome.cpp index 56210e0..7cbb0d0 100644 --- a/wizard/welcome.cpp +++ b/wizard/welcome.cpp @@ -1,5 +1,6 @@ #include #include "welcome.h" +#include "config.h" #include "../listdelegate.h" #include "../listitem.h" @@ -9,6 +10,7 @@ wpWelcome::wpWelcome(QWidget *parent) : QWizardPage(parent) backend = Backend::instance(); connect(backend, SIGNAL(finishedCommand(QString)), this, SLOT(backendFinishedCommand(QString))); setComplete(false); + textBrowser->setSource(QString("%1/html/%2.html").arg(BACKEND_DIR).arg(tr("welcome"))); backend->exec("init_installer"); } diff --git a/wizard/welcome.ui b/wizard/welcome.ui index 6fbc95f..a8f6363 100644 --- a/wizard/welcome.ui +++ b/wizard/welcome.ui @@ -13,9 +13,18 @@ WizardPage - - Installer - + + + + + QFrame::NoFrame + + + true + + + + -- cgit v1.0