From ed59d3377f7546df2d89133f374ae971d4aa93c8 Mon Sep 17 00:00:00 2001 From: ubbo Date: Wed, 18 Jan 2012 23:14:02 +0000 Subject: wizard styling git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@757 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- wizard.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'wizard.cpp') diff --git a/wizard.cpp b/wizard.cpp index 4c76dc1..de428de 100644 --- a/wizard.cpp +++ b/wizard.cpp @@ -27,6 +27,7 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent) { mCtx=ctx; mKeyMgmt=keyMgmt; + setPage(Page_Intro,new IntroPage(this)); setPage(Page_ImportFromGpg4usb,new ImportFromGpg4usbPage(mCtx, mKeyMgmt, this)); setPage(Page_ImportFromGnupg,new ImportFromGnupgPage(mCtx, mKeyMgmt, this)); @@ -38,6 +39,11 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent) #endif setWindowTitle(tr("First Start Wizard")); + // http://www.flickr.com/photos/laureenp/6141822934/ + setPixmap(QWizard::WatermarkPixmap, QPixmap(":/keys2.jpg")); + setPixmap(QWizard::LogoPixmap, QPixmap(":/logo_small.png")); + setPixmap(QWizard::BannerPixmap, QPixmap(":/banner.png")); + QSettings settings; setStartId(settings.value("wizard/page", -1).toInt()); settings.remove("wizard/page"); @@ -56,7 +62,7 @@ IntroPage::IntroPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Introduction")); - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); + setSubTitle("bla"); topLabel = new QLabel(tr("This wizard will help you getting started by importing settings and keys" "from an older version of gpg4usb, import keys from a locally installed Gnupg or to " @@ -106,10 +112,11 @@ int IntroPage::nextId() const ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent) : QWizardPage(parent) { - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); + //setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); mCtx=ctx; mKeyMgmt=keyMgmt; setTitle(tr("Keyring Import")); + setSubTitle("bla"); QLabel *topLabel = new QLabel(tr("Import keys and/or settings from older gpg4usb. Just check, what you want to " "import, click the import button and choose the directory " @@ -187,10 +194,11 @@ int ImportFromGpg4usbPage::nextId() const ImportFromGnupgPage::ImportFromGnupgPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent) : QWizardPage(parent) { - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); + //setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); mCtx=ctx; mKeyMgmt=keyMgmt; setTitle(tr("Keyring Import")); + setSubTitle("bla"); QGroupBox *gnupgBox = new QGroupBox(tr("Import from GnuPG"), this); QGridLayout *gnupgLayout = new QGridLayout(); @@ -276,9 +284,10 @@ KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent) : QWizardPage(parent) { - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); + //setPixmap(QWizard::WatermarkPixmap, QPixmap(":/logo-flipped.png")); mCtx=ctx; setTitle(tr("Key-Generating")); + setSubTitle("bla"); topLabel = new QLabel(tr("First you've got to create an own keypair.
" "The pair contains a public and a private key.
" "Other users can use the public key to encrypt texts for you
" @@ -325,6 +334,7 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Finish Start Wizard")); + setSubTitle("bla"); bottomLabel = new QLabel(tr("You're ready to encrypt and decrpt now.")); bottomLabel->setWordWrap(true); -- cgit v1.2.3