diff options
| -rw-r--r-- | debian/acritoxinstaller-kanotix.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | kanotix/html/welcome.html | 22 | ||||
| -rw-r--r-- | wizard/welcome.cpp | 2 | ||||
| -rw-r--r-- | wizard/welcome.ui | 15 |
5 files changed, 41 insertions, 3 deletions
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 @@ +<table> +<tr> +<td> +<img src="/usr/share/kde4/apps/ksplash/Themes/kanotix-starrise/1600x1200/icon5.png" /> +</td> +<td style="padding: 20px 10px;"> +<h1>Install Kanotix</h1> +<h3>acritoxinstaller @VERSION@</h3> +<p>written by Andreas Loibl <<a href="mailto:andreas@andreas-loibl.de">andreas@andreas-loibl.de</a>></p> +<hr /> +<p>Welcome and thank you for choosing Kanotix. The installer will now guide you through the configuration and installation.</p> +<p>If you need any help check out the Kanotix website or visit the Kanotix chat room.</p> +<ul> +<li><a href="http://kanotix.com">http://kanotix.com</a></li> +<li><a href="http://kanotix.acritox.com">http://kanotix.acritox.com</a></li> +<li><a href="irc://irc.freenode.net/kanotix">irc: irc.freenode.net #kanotix</a></li> +</ul> +<p>Click Next to continue, or Cancel to exit the installer.</p> +</td> +</tr> +</table> + 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 <QtGui> #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 @@ <property name="windowTitle"> <string>WizardPage</string> </property> - <property name="title"> - <string>Installer</string> - </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QTextBrowser" name="textBrowser"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> <resources/> <connections/> |