changeset 207:e35983a322d6

merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 26 Mar 2014 15:22:50 +0100
parents d587d075eddc (diff) 825b42da1855 (current diff)
children 135eae057491
files ui/tests/data/garbage_2MB ui/tests/data/garbage_500KB
diffstat 2 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
Binary file ui/img/logo.png has changed
--- a/ui/mainwindow.cpp	Wed Mar 26 13:32:47 2014 +0100
+++ b/ui/mainwindow.cpp	Wed Mar 26 15:22:50 2014 +0100
@@ -14,6 +14,8 @@
 #include <QGroupBox>
 #include <QPushButton>
 #include <QSplitter>
+#include <QLabel>
+#include <QImage>
 
 // The amount of time in minutes stay silent if we have
 // something to say
@@ -228,9 +230,23 @@
     QWidget *base = new QWidget;
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
+    QHBoxLayout *headerLayout = new QHBoxLayout;
+    QVBoxLayout *headerTextLayout = new QVBoxLayout;
     QHBoxLayout *certLayout = new QHBoxLayout;
     QHBoxLayout *bottomLayout = new QHBoxLayout;
 
+    QImage *logoImage = new QImage(":/img/logo.png");
+    QLabel *logo = new QLabel;
+    logo->setBackgroundRole(QPalette::Base);
+    logo->setScaledContents(true);
+    logo->setPixmap(QPixmap::fromImage(*logoImage));
+    QLabel *title = new QLabel("<h3>" + tr("Certificate Installer") + "</h3>");
+    QLabel *subTitle = new QLabel("This Software installs and removes Certificates");
+    headerTextLayout->addWidget(title);
+    headerTextLayout->addWidget(subTitle);
+    headerLayout->addWidget(logo);
+    headerLayout->addLayout(headerTextLayout);
+
     QGroupBox *certBox = new QGroupBox(tr("Managed Certificates"));
     certificateList = new QListWidget;
     connect(certificateList, SIGNAL(itemClicked(QListWidgetItem*)),
@@ -247,6 +263,7 @@
     connect(update, SIGNAL(clicked()), this, SLOT(checkUpdates()));
     bottomLayout->insertStretch(0, 10);
     bottomLayout->addWidget(update);
+    mainLayout->addLayout(headerLayout);
     mainLayout->addWidget(certBox);
     mainLayout->addLayout(bottomLayout);
 

http://wald.intevation.org/projects/trustbridge/