trustbridge: ui/mainwindow.cpp annotate

annotate ui/mainwindow.cpp @ 652:f65503c1833b trustbridge-refactor

Updated mainwindow layout and removed obsolete code.

author	Raimund Renkert <rrenkert@intevation.de>
date	Wed, 25 Jun 2014 14:54:45 +0200
parents	f8be956c819b
children	39f03316f675

rev	line source
404 17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	1 /* Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	2 * Software engineering by Intevation GmbH
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	3 *
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	4 * This file is Free Software under the GNU GPL (v>=2)
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	5 * and comes with ABSOLUTELY NO WARRANTY!
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	6 * See LICENSE.txt for details.
17e1c8f37d72 Add License Andre Heinecke <aheinecke@intevation.de> parents: 393 diff changeset	7 */
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	8 #include "mainwindow.h"
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	9
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	10 #include <QDebug>
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	11 #include <QProcess>
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	12 #include <QProgressDialog>
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	13 #include <QMessageBox>
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	14 #include <QSystemTrayIcon>
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	15 #include <QAction>
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	16 #include <QDialog>
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	17 #include <QDir>
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	18 #include <QMenu>
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	19 #include <QApplication>
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	20 #include <QFile>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	21 #include <QTimer>
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	22 #include <QHBoxLayout>
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	23 #include <QVBoxLayout>
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	24 #include <QGroupBox>
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	25 #include <QSplitter>
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	26 #include <QLabel>
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	27 #include <QImage>
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	28 #include <QCheckBox>
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	29 #include <QButtonGroup>
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	30 #include <QToolButton>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	31
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	32 // The amount of time in minutes stay silent if we have
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	33 // something to say
548 c84dc8f6d017 Increase nag interval to 70 minutes Andre Heinecke <aheinecke@intevation.de> parents: 531 diff changeset	34 #define NAG_INTERVAL_MINUTES 70
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	35
409 09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	36 #ifndef APPNAME
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	37 #define APPNAME "TrustBridge"
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	38 #endif
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	39
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	40 #define SERVER_URL "https://files.intevation.de:443"
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	41 #define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt"
554 d512d8eef8f6 Use case sensitive file name for SW-Updates Andre Heinecke <aheinecke@intevation.de> parents: 551 diff changeset	42 #define SW_RESOURCE "/users/aheinecke/TrustBridge.exe"
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	43 #ifdef Q_OS_WIN
554 d512d8eef8f6 Use case sensitive file name for SW-Updates Andre Heinecke <aheinecke@intevation.de> parents: 551 diff changeset	44 #define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe"
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	45 #else
554 d512d8eef8f6 Use case sensitive file name for SW-Updates Andre Heinecke <aheinecke@intevation.de> parents: 551 diff changeset	46 #define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.sh"
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	47 #endif
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	48
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	49 #include "certificatelist.h"
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	50 #include "downloader.h"
191 246c21b1727f Show the help dialog. Raimund Renkert <rrenkert@intevation.de> parents: 189 diff changeset	51 #include "helpdialog.h"
200 fe424c5fc875 Show the about dialog. Raimund Renkert <rrenkert@intevation.de> parents: 191 diff changeset	52 #include "aboutdialog.h"
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	53 #include "certificateitemdelegate.h"
274 90432cb1f374 Added a separator to certificate list to demonstrate how it works. Raimund Renkert <rrenkert@intevation.de> parents: 271 diff changeset	54 #include "separatoritemdelegate.h"
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	55 #include "installwrapper.h"
507 20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	56 #include "util.h"
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	57 #include "logging.h"
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	58
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	59 MainWindow::MainWindow(bool trayMode):
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	60 mTrayMode(trayMode)
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	61 {
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	62 createActions();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	63 createTrayIcon();
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	64 createContent();
450 4932fc33ee82 Updated window and main layout size. Raimund Renkert <rrenkert@intevation.de> parents: 449 diff changeset	65 resize(950, 540);
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	66 qRegisterMetaType<SSLConnection::ErrorCode>("SSLConnection::ErrorCode");
265 ffd47b045d19 Added certificate status enum and register it as metatype. Raimund Renkert <rrenkert@intevation.de> parents: 250 diff changeset	67 qRegisterMetaType<Certificate::Status>("Certificate::Status");
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	68
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	69 connect(mTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	70 this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	71
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	72 mMessageTimer = new QTimer(this);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	73 connect(mMessageTimer, SIGNAL(timeout()), this, SLOT(showMessage()));
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	74 mMessageTimer->setInterval(NAG_INTERVAL_MINUTES * 60 * 1000);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	75 mMessageTimer->start();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	76 checkUpdates();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	77 loadUnselectedCertificates();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	78 loadCertificateList();
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	79 if (!trayMode) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	80 show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	81 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	82 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	83
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	84 void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	85 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	86 switch (reason) {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	87 case QSystemTrayIcon::Trigger:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	88 case QSystemTrayIcon::MiddleClick:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	89 showMessage();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	90 break;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	91 case QSystemTrayIcon::DoubleClick:
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	92 show();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	93 break;
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	94 default:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	95 ;
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	96 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	97 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	98
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	99 void MainWindow::messageClicked()
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	100 {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	101 if (mCurState == NewListAvailable) {
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	102 show();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	103 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	104
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	105 if (mCurState == NewSoftwareAvailable) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	106 checkUpdates(true);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	107 mCurState = DownloadingSW;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	108 }
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	109 }
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	110
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	111 void MainWindow::showMessage()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	112 {
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	113 if (!isVisible() && !mCurMessage.isEmpty()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	114 mTrayIcon->showMessage(QApplication::applicationName(), mCurMessage,
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	115 QSystemTrayIcon::Information, 5000);
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	116 mMessageTimer->start(); // Restart the timer so that we don't spam
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	117 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	118 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	119
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	120 void MainWindow::verifyAvailableData()
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	121 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	122 QString availableFileName = mSettings.value("List/available").toString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	123 QString installedFileName = mSettings.value("List/installed").toString();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	124 QString swFileName = mSettings.value("Software/available").toString();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	125
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	126 if (!availableFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	127 mListToInstall.readList(availableFileName.toLocal8Bit().constData());
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	128 if (!mListToInstall.isValid()) {
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	129 mCurState = TransferError;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	130 // Probably a bug when Qt fileName is encoded and cFileName
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	131 // fails because of this. This needs a unit test!
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	132 // Maybe check that the file is in our data directory
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	133 QFile::remove(availableFileName);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	134 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	135 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	136 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	137 } else {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	138 // Make sure the available notation is also removed
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	139 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	140 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	141 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	142
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	143 if (!installedFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	144 mInstalledList.readList(installedFileName.toLocal8Bit().constData());
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	145 if (!mInstalledList.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	146 // Probably a bug when Qt fileName is encoded and cFileName
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	147 // fails because of this. This needs a unit test!
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	148 // Maybe check that the file is in our data directory
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	149 QFile::remove(installedFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	150 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	151 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	152 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	153 } else {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	154 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	155 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	156 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	157
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	158 if (!swFileName.isEmpty()) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	159 // TODO Verify integrity of the software
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	160 } else {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	161 mSettings.remove("Software/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	162 mSettings.remove("Software/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	163 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	164 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	165
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	166 void MainWindow::handleNewList(const QString& fileName, const QDateTime& modDate) {
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	167 qDebug() << "new list available";
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	168 mSettings.setValue("List/available", fileName);
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	169 mSettings.setValue("List/availableDate", modDate);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	170
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	171 verifyAvailableData();
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	172 if (!mListToInstall.isValid()) {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	173 /* Downloader provided invalid files */
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	174 /* TODO: Error count. Error handling. Otherwise
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	175 * we can go into an endless loop here */
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	176
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	177 /* Retry the download again in 10 - 20 minutes */
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	178 QTimer::singleShot(600000 + (qrand() % 60000), this, SLOT(checkUpdates()));
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	179 } else {
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	180 mCurMessage = tr("An updated certificate list is available. Click here to install.");
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	181 setState(NewListAvailable);
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	182 showMessage();
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	183 loadCertificateList();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	184 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	185 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	186
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	187 void MainWindow::handleNewSW(const QString& fileName, const QDateTime& modDate) {
555 4cc378f335f5 Use native path to execute software update on windows Andre Heinecke <aheinecke@intevation.de> parents: 554 diff changeset	188 mCurMessage = tr("An update for %1 is available.\n"
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	189 "Click here to download and install the update.").arg(
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	190 QApplication::applicationName());
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	191 setState(NewSoftwareAvailable);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	192 mSettings.setValue("Software/available", fileName);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	193 mSettings.setValue("Software/availableDate", modDate);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	194
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	195 mSettings.sync();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	196 showMessage();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	197 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	198
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	199 void MainWindow::installNewSW(const QString& fileName, const QDateTime& modDate) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	200 QFileInfo instProcInfo = QFileInfo(fileName);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	201 if (!instProcInfo.isExecutable()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	202 qWarning() << "Downloaded file: " << fileName << " is not executable.";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	203 setState(TransferError);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	204 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	205 }
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	206 QString filePath = QDir::toNativeSeparators(instProcInfo.absoluteFilePath());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	207 #ifdef WIN32
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	208 SHELLEXECUTEINFOW shExecInfo;
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	209 memset (&shExecInfo, 0, sizeof(SHELLEXECUTEINFOW));
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	210 shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOW);
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	211
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	212 shExecInfo.lpFile = reinterpret_cast<LPCWSTR> (filePath.utf16());
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	213
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	214 shExecInfo.fMask = SEE_MASK_NOASYNC;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	215
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	216 if (!is_admin()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	217 shExecInfo.lpVerb = L"open";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	218 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	219 shExecInfo.lpVerb = L"runas";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	220 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	221
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	222 qDebug() << "Starting process: " << filePath;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	223
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	224 if (!ShellExecuteExW(&shExecInfo)) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	225 /* Execution failed, maybe the user aborted the UAC check? */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	226 char* errmsg = getLastErrorMsg();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	227 QString qerrmsg = QString::fromUtf8(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	228 free(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	229 qDebug() << "Failed to start process: " << qerrmsg;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	230 setState(NewSoftwareAvailable);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	231 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	232 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	233 #else /* WIN32 */
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	234 qDebug() << "Starting process " << filePath;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	235
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	236 if (!QProcess::startDetached(filePath)) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	237 qDebug() << "Failed to start process.";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	238 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	239 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	240 #endif
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	241 /* Installer process should now be running. We exit */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	242
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	243 closeApp();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	244 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	245
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	246 void MainWindow::checkUpdates(bool downloadSW)
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	247 {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	248 verifyAvailableData();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	249
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	250 if (!mSettings.contains("Software/installedDate") \|\|
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	251 mSettings.value("Software/installedVersion").toString() != QApplication::applicationVersion()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	252 /* This should only happen on initial startup and after an update has
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	253 * been installed */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	254 getLastModForCurrentVersion();
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	255 return;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	256 }
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	257 QDateTime listInstalledLastMod = mSettings.value("List/installedDate").toDateTime();
c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	258 QDateTime swInstalledLastMod = mSettings.value("Software/installedDate").toDateTime();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	259
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	260 QString listResource = QString::fromLatin1(LIST_RESOURCE);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	261 QString swResource = QString::fromLatin1(SW_RESOURCE);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	262
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	263 #ifndef RELEASE_BUILD
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	264 /* Use this for testing to specify another file name for updates */
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	265 listResource = mSettings.value("List/resource", listResource).toString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	266 swResource = mSettings.value("Software/resource", swResource).toString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	267 #endif
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	268
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	269
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	270 Downloader* downloader = new Downloader(this,
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	271 QString::fromLatin1(SERVER_URL),
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	272 QByteArray(),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	273 swInstalledLastMod,
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	274 listInstalledLastMod,
437 4b486a14252f Acutally use the values that can be taken from the config Andre Heinecke <aheinecke@intevation.de> parents: 434 diff changeset	275 swResource,
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	276 listResource,
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	277 downloadSW);
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	278
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	279 connect(downloader, SIGNAL(newListAvailable(const QString&, const QDateTime&)),
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	280 this, SLOT(handleNewList(const QString&, const QDateTime&)));
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	281 if (!downloadSW) {
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	282 connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	283 this, SLOT(handleNewSW(const QString&, const QDateTime&)));
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	284 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	285 connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	286 this, SLOT(installNewSW(const QString&, const QDateTime&)));
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	287 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	288
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	289 connect(downloader, SIGNAL(finished()), downloader, SLOT(deleteLater()));
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	290 connect(downloader, SIGNAL(error(const QString &, SSLConnection::ErrorCode)),
c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	291 this, SLOT(downloaderError(const QString &, SSLConnection::ErrorCode)));
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	292 downloader->start();
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	293 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	294
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	295 void MainWindow::getLastModForCurrentVersion()
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	296 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	297 QString softwareVersion = QString::fromLatin1(SW_RESOURCE_VERSION).arg(
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	298 QApplication::applicationVersion());
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	299 qDebug() << softwareVersion;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	300 QString listResource = QString::fromLatin1(LIST_RESOURCE);
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	301 Downloader* downloader = new Downloader(this,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	302 QString::fromLatin1(SERVER_URL),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	303 QByteArray(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	304 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	305 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	306 softwareVersion,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	307 listResource,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	308 false);
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	309 connect(downloader, SIGNAL(finished()), downloader, SLOT(deleteLater()));
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	310 connect(downloader, SIGNAL(error(const QString &, SSLConnection::ErrorCode)),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	311 this, SLOT(downloaderError(const QString &, SSLConnection::ErrorCode)));
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	312 connect(downloader, SIGNAL(lastModifiedDate(const QDateTime&)),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	313 this, SLOT(setLastModifiedSWDate(const QDateTime&)));
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	314
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	315 downloader->start();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	316 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	317
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	318 void MainWindow::setLastModifiedSWDate(const QDateTime &date)
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	319 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	320 mSettings.beginGroup("Software");
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	321 mSettings.setValue("installedDate", date);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	322 mSettings.setValue("installedVersion", QApplication::applicationVersion());
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	323 mSettings.endGroup();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	324 checkUpdates();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	325 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	326
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	327 void MainWindow::downloaderError(const QString &message, SSLConnection::ErrorCode error)
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	328 {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	329 /* TODO logging and handle error according to a plan */
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	330 mCurMessage = message;
27 62cd56cea09b Start on polarssl Downloader. Andre Heinecke <andre.heinecke@intevation.de> parents: 19 diff changeset	331 showMessage();
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	332 setState(TransferError);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	333 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	334
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	335 void MainWindow::createActions()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	336 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	337 mCheckUpdates = new QAction(tr("Check for Updates"), this);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	338 connect(mCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdates()));
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	339 mQuitAction = new QAction(tr("Quit"), this);
cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	340 connect(mQuitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	341 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	342
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	343 void MainWindow::createTrayIcon()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	344 {
11 7e2f14c7aba2 Split up downloader component and further implement it Andre Heinecke <aheinecke@intevation.de> parents: 10 diff changeset	345 QIcon trayImg(":/img/tray_22.png");
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	346
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	347 mTrayMenu = new QMenu(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	348 mTrayMenu->addAction(mCheckUpdates);
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	349 mTrayMenu->addAction(mQuitAction);
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	350
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	351 mTrayIcon = new QSystemTrayIcon(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	352 mTrayIcon->setContextMenu(mTrayMenu);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	353
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	354 mTrayIcon->setIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	355 setWindowIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	356 mTrayIcon->show();
407 af53c40e74b1 Rename m13ui to TrustBridge Andre Heinecke <aheinecke@intevation.de> parents: 404 diff changeset	357 mTrayIcon->setToolTip(tr("TrustBridge"));
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	358
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	359 connect(mTrayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	360 }
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	361
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	362 void MainWindow::createContent()
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	363 {
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	364 // Create a central widget containing the main layout.
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	365 QWidget *base = new QWidget;
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	366
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	367 // Layouts and Container
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	368 QVBoxLayout *mainLayout = new QVBoxLayout;
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	369 QHBoxLayout *headerLayout = new QHBoxLayout;
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	370 QVBoxLayout *headerTextLayout = new QVBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	371 QHBoxLayout *centerLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	372 QVBoxLayout *buttonBarLayout = new QVBoxLayout;
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	373 QHBoxLayout *bottomLayout = new QHBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	374 QHBoxLayout *containerLayout = new QHBoxLayout;
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	375
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	376 // The header (icon, about text)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	377 QImage *logoImage = new QImage(":/img/logo.png");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	378 QLabel *logo = new QLabel;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	379 logo->setBackgroundRole(QPalette::Base);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	380 logo->setPixmap(QPixmap::fromImage(*logoImage));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	381 QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	382 QLabel *subTitle = new QLabel("This Software installs and removes Certificates");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	383 headerTextLayout->addWidget(title);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	384 headerTextLayout->addWidget(subTitle);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	385 headerLayout->addWidget(logo);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	386 headerLayout->addLayout(headerTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	387 headerLayout->setStretch(0, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	388 headerLayout->setStretch(1, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	389
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	390 /***********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	391 * The Buttonbar on the left side.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	392 ***********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	393 mButtonGroup = new QButtonGroup;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	394
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	395 QToolButton *updatesButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	396 updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	397 updatesButton->setIcon(QIcon(":/img/view-refresh.png"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	398 updatesButton->setIconSize(QSize(32, 32));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	399 updatesButton->setText(tr("Updates"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	400 updatesButton->setFixedWidth(90);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	401 updatesButton->setFixedHeight(70);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	402 updatesButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	403 updatesButton->setChecked(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	404
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	405 QToolButton *allInstallButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	406 allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	407 allInstallButton->setIcon(QIcon(":/img/document-encrypt.png"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	408 allInstallButton->setIconSize(QSize(32, 32));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	409 allInstallButton->setText(tr("Trusted\nCertificates"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	410 allInstallButton->setFixedWidth(90);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	411 allInstallButton->setFixedHeight(70);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	412 allInstallButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	413
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	414 QToolButton *allRemoveButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	415 allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	416 allRemoveButton->setIcon(QIcon(":/img/task-attempt.png"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	417 allRemoveButton->setIconSize(QSize(32, 32));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	418 allRemoveButton->setText(tr("Insecure\nCertificates"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	419 allRemoveButton->setFixedWidth(90);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	420 allRemoveButton->setFixedHeight(70);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	421 allRemoveButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	422
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	423 QToolButton *infoButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	424 infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	425 infoButton->setIcon(QIcon(":/img/dialog-information.png"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	426 infoButton->setIconSize(QSize(32, 32));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	427 infoButton->setText(tr("Information"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	428 infoButton->setFixedWidth(90);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	429 infoButton->setFixedHeight(70);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	430 infoButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	431
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	432 mButtonGroup->addButton(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	433 mButtonGroup->addButton(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	434 mButtonGroup->addButton(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	435 mButtonGroup->addButton(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	436 mButtonGroup->setId(updatesButton, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	437 mButtonGroup->setId(allInstallButton, 1);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	438 mButtonGroup->setId(allRemoveButton, 2);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	439 mButtonGroup->setId(infoButton, 3);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	440
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	441 connect(mButtonGroup, SIGNAL(buttonClicked(int)),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	442 this, SLOT(togglePages(int)));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	443 buttonBarLayout->addWidget(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	444 buttonBarLayout->addWidget(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	445 buttonBarLayout->addWidget(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	446 buttonBarLayout->insertStretch(3, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	447 buttonBarLayout->addWidget(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	448
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	449 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	450 * The main pages.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	451 ********************************/
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	452
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	453 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	454 * The updates page.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	455 ********************************/
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	456 QVBoxLayout *updatesMainLayout = new QVBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	457 mUpdatesPanel = new QScrollArea;
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	458 QScrollArea *updatesContent = new QScrollArea;
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	459 // updatesContent->setFrameShape(QFrame::NoFrame);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	460 mUpdatesWidget = new QWidget;
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	461
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	462 /* The updates header */
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	463 QHBoxLayout *updatesHeaderLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	464 QVBoxLayout *updatesHeaderTextLayout = new QVBoxLayout;
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	465 QVBoxLayout *updatesHeaderButtonLayout = new QVBoxLayout;
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	466 QHBoxLayout *updatesHeaderActionLayout = new QHBoxLayout;
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	467 QHBoxLayout *updatesHeaderSearchLayout = new QHBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	468
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	469 mUpdatesHeader =
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	470 new QLabel("<h2>" + tr("Updates (%1/%2)").arg(0).arg(0)+ "</h2>");
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	471 mLastCertUpdate =
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	472 new QLabel(tr("Last certificate update: %1").arg(""));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	473 mLastSWupdate =
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	474 new QLabel(tr("Last Software update: %1").arg(""));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	475 QLabel *updatesTip =
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	476 new QLabel("<h4>" + tr("The following certificate changes are recommended.") + "</h4>");
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	477
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	478 updatesHeaderTextLayout->addWidget(mUpdatesHeader);
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	479 updatesHeaderTextLayout->addWidget(mLastCertUpdate);
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	480 updatesHeaderTextLayout->addWidget(mLastSWupdate);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	481 updatesHeaderTextLayout->addSpacing(10);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	482 updatesHeaderTextLayout->addWidget(updatesTip);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	483
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	484 QPushButton *searchUpdates = new QPushButton(tr("Search for Updates"));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	485 searchUpdates->setIcon(QIcon(":/img/system-search.png"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	486 QPushButton *quitButton = new QPushButton(tr("Quit without saving"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	487 quitButton->setIcon(QIcon(":/img/system-shutdown.png"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	488 QPushButton *installButton = new QPushButton(tr("Update"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	489 #ifdef Q_OS_WIN
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	490 if (is_admin()) {
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	491 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	492 installButton->setIcon(uacShield);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	493 }
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	494 #else
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	495 installButton->setIcon(QIcon(":/img/edit-redo.png"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	496 #endif
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	497 connect(quitButton, SIGNAL(clicked()), this, SLOT(closeApp()));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	498 connect(installButton, SIGNAL(clicked()), this, SLOT(installCerts()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	499 connect(searchUpdates, SIGNAL(clicked()), this, SLOT(checkUpdates()));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	500
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	501 updatesHeaderActionLayout->addWidget(installButton);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	502 updatesHeaderActionLayout->addWidget(quitButton);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	503 updatesHeaderSearchLayout->insertStretch(0, 1);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	504 updatesHeaderSearchLayout->addWidget(searchUpdates);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	505
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	506 updatesHeaderButtonLayout->addLayout(updatesHeaderSearchLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	507 updatesHeaderButtonLayout->addLayout(updatesHeaderActionLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	508
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	509 updatesHeaderLayout->addLayout(updatesHeaderTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	510 updatesHeaderLayout->insertStretch(1, 10);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	511 updatesHeaderLayout->addLayout(updatesHeaderButtonLayout);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	512
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	513 /* The central panels. */
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	514 QVBoxLayout *updatesCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	515 QHBoxLayout *updatesNewLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	516 QHBoxLayout *updatesRemoveLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	517 QHBoxLayout *updatesManualLayout = new QHBoxLayout;
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	518 mUpdatesNewCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	519 new QLabel("<h3>" +
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	520 tr("Install new Certificates (%1/%2)").arg(0).arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	521 "</h3>");
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	522 mUpdatesDetailsNew = new QPushButton(tr("Show Details"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	523 connect(mUpdatesDetailsNew,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	524 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	525 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	526 SLOT(toggleUpdatesNew()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	527 updatesNewLayout->addWidget(mUpdatesNewCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	528 updatesNewLayout->addWidget(mUpdatesDetailsNew);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	529 updatesNewLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	530 mUpdatesNew = new CertificateListWidget(this);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	531 connect(mUpdatesNew, SIGNAL(certListChanged(int)),
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	532 this, SLOT(listChanged(int)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	533 mUpdatesNew->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	534
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	535 mUpdatesRemoveCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	536 new QLabel("<h3>" +
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	537 tr("Remove insecure Certificates (%1/%2)").arg(0).arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	538 "</h3>");
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	539 mUpdatesDetailsRemove = new QPushButton(tr("Show Details"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	540 connect(mUpdatesDetailsRemove,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	541 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	542 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	543 SLOT(toggleUpdatesRemove()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	544 updatesRemoveLayout->addWidget(mUpdatesRemoveCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	545 updatesRemoveLayout->addWidget(mUpdatesDetailsRemove);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	546 updatesRemoveLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	547 mUpdatesRemove = new CertificateListWidget(this);
642 dd738ef17715 Update the 'remove untrusted' header on list selection change. Raimund Renkert <rrenkert@intevation.de> parents: 641 diff changeset	548 connect(mUpdatesRemove, SIGNAL(certListChanged(int)),
dd738ef17715 Update the 'remove untrusted' header on list selection change. Raimund Renkert <rrenkert@intevation.de> parents: 641 diff changeset	549 this, SLOT(listChanged(int)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	550 mUpdatesRemove->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	551
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	552 mUpdatesManualCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	553 new QLabel("<h3>" +
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	554 tr("Manualy changed Certificates (%1)").arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	555 "</h3>");
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	556 mUpdatesDetailsManual = new QPushButton(tr("Show Details"));
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	557 connect(mUpdatesDetailsManual,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	558 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	559 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	560 SLOT(toggleUpdatesManual()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	561 updatesManualLayout->addWidget(mUpdatesManualCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	562 updatesManualLayout->addWidget(mUpdatesDetailsManual);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	563 updatesManualLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	564 mUpdatesManual = new CertificateListWidget(this);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	565 mUpdatesManual->hide();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	566 connect(mUpdatesManual, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	567 this, SLOT(removeFromManual(bool, const Certificate&)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	568
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	569 updatesNewLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	570 updatesRemoveLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	571 updatesManualLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	572 updatesCenterLayout->addLayout(updatesNewLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	573 updatesCenterLayout->addWidget(mUpdatesNew);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	574 updatesCenterLayout->addLayout(updatesRemoveLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	575 updatesCenterLayout->addWidget(mUpdatesRemove);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	576 updatesCenterLayout->addLayout(updatesManualLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	577 updatesCenterLayout->addWidget(mUpdatesManual);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	578 updatesCenterLayout->addStretch(1);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	579
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	580 updatesCenterLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	581 mUpdatesWidget->setLayout(updatesCenterLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	582 updatesContent->setWidget(mUpdatesWidget);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	583
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	584 updatesMainLayout->addLayout(updatesHeaderLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	585 updatesMainLayout->addWidget(updatesContent);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	586 mUpdatesPanel->setLayout(updatesMainLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	587
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	588 /*********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	589 * Panel for trusted certificates.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	590 *********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	591 mInstallPanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	592
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	593 QVBoxLayout *installPanelLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	594 QVBoxLayout *installHeaderLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	595 QVBoxLayout *installCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	596
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	597 QLabel *installHeaderLabel =
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	598 new QLabel("<h2>" + tr("Trusted Certificates") + "</h2>");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	599 QLabel *installHeaderText = new QLabel(tr("The following list of root"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	600 " certificates was created by the BSI. The BSI vaidates authenticity,"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	601 " security and actuality of these certificates"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	602 installHeaderLayout->addWidget(installHeaderLabel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	603 installHeaderLayout->addWidget(installHeaderText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	604
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	605 QLabel *installCenterText = new QLabel(tr("Please choose the certificates"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	606 " you want to trust. TrustBridge will install these certificates for"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	607 " secure communication via email or the internet (e.g. IE, Firefox,"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	608 " Thunderbird)"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	609 installCenterLayout->addWidget(installCenterText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	610 mInstallList = new CertificateListWidget(this);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	611 connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	612 this, SLOT(toggleInManual(bool, const Certificate&)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	613
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	614 installPanelLayout->addLayout(installHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	615 installPanelLayout->addLayout(installCenterLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	616 installPanelLayout->addWidget(mInstallList);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	617 mInstallPanel->setLayout(installPanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	618
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	619 /**********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	620 * Panel for insecure certificates.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	621 **********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	622 mRemovePanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	623 QVBoxLayout *removePanelLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	624 QVBoxLayout *removeHeaderLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	625 QVBoxLayout *removeCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	626
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	627 QLabel *removeHeaderLabel =
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	628 new QLabel("<h2>" + tr("Insecure Certificates") + "</h2>");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	629 QLabel *removeHeaderText = new QLabel(tr("The following list of root"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	630 " certificates was created by the BSI. The BSI validates authenticity,"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	631 " security and actuality of these certificates"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	632 removeHeaderLayout->addWidget(removeHeaderLabel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	633 removeHeaderLayout->addWidget(removeHeaderText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	634
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	635 QLabel *removeCenterText = new QLabel(tr("Please choose the certificates"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	636 " you want to remove. TrustBridge will remove these certificates."));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	637 removeCenterLayout->addWidget(removeCenterText);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	638 mRemoveList = new CertificateListWidget(this);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	639 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	640 this, SLOT(toggleInManual(bool, const Certificate&)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	641
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	642 removePanelLayout->addLayout(removeHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	643 removePanelLayout->addLayout(removeCenterLayout);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	644 removePanelLayout->addWidget(mRemoveList);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	645 mRemovePanel->setLayout(removePanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	646
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	647 /**********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	648 * The info panel.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	649 **********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	650 mInfoPanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	651
643 f8be956c819b Fixed mainwindow layout warning. Raimund Renkert <rrenkert@intevation.de> parents: 642 diff changeset	652 QVBoxLayout *infoPanelLayout = new QVBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	653 QHBoxLayout *infoHeaderLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	654 QVBoxLayout *infoHeaderTextLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	655 QVBoxLayout *infoCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	656
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	657 QImage *infoLogoImage = new QImage(":/img/logo.png");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	658 QLabel *infoLogo = new QLabel;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	659 infoLogo->setBackgroundRole(QPalette::Base);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	660 infoLogo->setPixmap(QPixmap::fromImage(*infoLogoImage));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	661 QLabel *infoTitle = new QLabel("<h1>" + tr("TrustBridge") + "</h1>");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	662 QString infoVersion = tr("Version: ");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	663 infoVersion.append(QApplication::applicationVersion());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	664 QLabel *appVersion = new QLabel(infoVersion);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	665 appVersion->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	666 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	667 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	668
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	669 QFrame *infoHeaderSeparator = new QFrame();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	670 infoHeaderSeparator->setFrameShape(QFrame::HLine);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	671 infoHeaderSeparator->setFrameShadow(QFrame::Sunken);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	672
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	673 infoHeaderTextLayout->addWidget(infoTitle);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	674 infoHeaderTextLayout->addWidget(appVersion);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	675 infoHeaderLayout->addWidget(infoLogo);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	676 infoHeaderLayout->addLayout(infoHeaderTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	677 infoHeaderLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	678
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	679 QLabel *textDesc = new QLabel(tr("TrustBridge is a root certificate"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	680 " installer for Windows and Linux."));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	681 textDesc->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	682 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	683 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	684 QLabel *textManage = new QLabel(tr("The root certificate lists are managed"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	685 " by the German <a href=\"https://www.bsi.bund.de\">"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	686 "Federal Office for Information Security (BSI)</a>.\n\n"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	687 textManage->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	688 Qt::TextBrowserInteraction \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	689 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	690 QLabel *textDevel = new QLabel(tr("The software was developed by the companies"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	691 " <a href=\"http://www.intevation.de\">Intevation GmbH</a> and "
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	692 " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	693 " contracted by the German Federal Office for Information Security (BSI).\n\n"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	694 textDevel->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	695 Qt::TextBrowserInteraction \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	696 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	697 QLabel *textLicense = new QLabel(tr("TrustBridge is Free Software licensed"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	698 " under GNU GPL v2+.\n\nCopyright (C) 2014 by Bundesamt für Sicherheit"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	699 " in der Informationstechnik"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	700 textLicense->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	701 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	702 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	703
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	704 infoCenterLayout->addWidget(infoHeaderSeparator);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	705 infoCenterLayout->addWidget(textDesc);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	706 infoCenterLayout->addWidget(textManage);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	707 infoCenterLayout->addWidget(textDevel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	708 infoCenterLayout->addWidget(textLicense);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	709 infoCenterLayout->insertSpacing(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	710 infoCenterLayout->insertSpacing(4, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	711 infoCenterLayout->insertSpacing(6, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	712 infoCenterLayout->insertStretch(8, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	713
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	714 infoPanelLayout->addLayout(infoHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	715 infoPanelLayout->addLayout(infoCenterLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	716 mInfoPanel->setLayout(infoPanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	717
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	718 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	719 * The main layout for pages.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	720 ********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	721 mInstallPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	722 mRemovePanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	723 mInfoPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	724 containerLayout->addWidget(mUpdatesPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	725 containerLayout->addWidget(mInstallPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	726 containerLayout->addWidget(mRemovePanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	727 containerLayout->addWidget(mInfoPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	728
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	729 centerLayout->addLayout(buttonBarLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	730 centerLayout->addLayout(containerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	731
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	732 mainLayout->addLayout(headerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	733 mainLayout->addLayout(centerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	734 mainLayout->addLayout(bottomLayout);
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	735 base->setLayout(mainLayout);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	736 setCentralWidget(base);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	737 }
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	738
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	739 void MainWindow::listChanged(int selected)
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	740 {
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	741 mUpdatesHeader->setText("<h2>" + tr("Updates (%1/%2)")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	742 .arg(mUpdatesRemove->selectedCertCount() + mUpdatesNew->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	743 .arg(mUpdatesRemove->certificates().size() + mUpdatesNew->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	744 "</h2>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	745 mUpdatesNewCertificates->setText("<h3>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	746 tr("Install new Certificates (%1/%2)")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	747 .arg(mUpdatesNew->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	748 .arg(mUpdatesNew->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	749 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	750 mUpdatesRemoveCertificates->setText("<h3>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	751 tr("Remove insecure Certificates (%1/%2)")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	752 .arg(mUpdatesRemove->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	753 .arg(mUpdatesRemove->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	754 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	755 }
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	756
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	757 void MainWindow::loadCertificateList()
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	758 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	759 /* TODO: if nothing is available (neither old nor new) add some progress
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	760 * indication */
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	761 mInstallList->clear();
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	762 mUpdatesNew->clear();
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	763 mRemoveList->clear();
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	764 mUpdatesRemove->clear();
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	765 QList<Certificate> newInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	766 QList<Certificate> newRemoveCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	767 QList<Certificate> oldInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	768 QList<Certificate> oldRemoveCerts;
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	769
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	770 if (mListToInstall.getCertificates().isEmpty()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	771 // No new list available, add old certificates.
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	772 foreach (const Certificate &cert, mInstalledList.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	773 bool state = !mPreviouslyUnselected.contains(cert.base64Line());
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	774 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	775 oldInstallCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	776 mInstallList->addCertificate(cert, state);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	777 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	778 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	779 oldRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	780 mRemoveList->addCertificate(cert, state, !state);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	781 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	782 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	783 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	784 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	785 // Sort and filter both lists.
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	786 foreach (const Certificate &cert, mListToInstall.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	787 bool state = !mPreviouslyUnselected.contains(cert.base64Line());
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	788 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	789 // Certificate with status "install".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	790 if (mInstalledList.getCertificates().contains(cert)) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	791 // Was in the old list.
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	792 oldInstallCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	793 mInstallList->addCertificate(cert, state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	794 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	795 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	796 // Is a brand new certificate
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	797 newInstallCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	798 mUpdatesNew->addCertificate(cert, state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	799 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	800 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	801 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	802 // Certificate with status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	803 if (mInstalledList.getCertificates().contains(cert)) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	804 // Was in the old list.
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	805 oldRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	806 // Is removed, so set editable to false.
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	807 mRemoveList->addCertificate(cert, state, !state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	808 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	809 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	810 // Was in the old list with status "install" and now has the
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	811 // status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	812 newRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	813 mUpdatesRemove->addCertificate(cert, state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	814 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	815 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	816 }
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	817 mUpdatesHeader->setText("<h2>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	818 tr("Updates (%1/%2)")
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	819 .arg(mUpdatesNew->selectedCertCount() + mUpdatesRemove->selectedCertCount())
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	820 .arg(newRemoveCerts.size() + newInstallCerts.size()) + "</h2>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	821 mLastCertUpdate->setText(tr("Last certificate update: %1")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	822 .arg(mInstalledList.date().toString()));
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	823 }
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	824 mUpdatesNewCertificates->setText("<h3>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	825 tr("Install new Certificates (%1/%2)")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	826 .arg(mUpdatesNew->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	827 .arg(mUpdatesNew->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	828 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	829
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	830 mUpdatesRemoveCertificates->setText("<h3>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	831 tr("Remove insecure Certificates (%1/%2)")
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	832 .arg(mUpdatesRemove->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	833 .arg(mUpdatesRemove->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	834 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	835 mUpdatesManualCertificates->setText("<h3>" +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	836 tr("Manualy changed Certificates (%1)").arg(0) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	837 "</h3>");
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	838 }
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	839
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	840 void MainWindow::installerError(const QString& errMsg) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	841 QMessageBox::warning(this, tr("Error executing update"), errMsg);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	842 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	843
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	844 void MainWindow::installerSuccess() {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	845 if (mCurState == NewListAvailable) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	846 mCurState = NothingChanged;
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	847 mCurMessage = QString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	848
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	849 QString listFileName = mSettings.value("List/available").toString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	850 QDateTime listFileDate = mSettings.value("List/availableDate").toDateTime();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	851
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	852 mSettings.remove("List/available");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	853 mSettings.remove("List/availableDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	854
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	855 if (listFileName.isEmpty() \|\| !listFileDate.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	856 qWarning() << "Error accessing settings";
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	857 return; /* Try again with next check */
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	858 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	859
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	860 mSettings.setValue("List/installed", listFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	861 mSettings.setValue("List/installedDate", listFileDate);
480 242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	862 mInstalledList = mListToInstall;
242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	863 mListToInstall = CertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	864 }
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	865 loadCertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	866 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	867
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	868 void MainWindow::installCerts() {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	869 QStringList choices;
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	870 QStringList unselected;
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	871
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	872 choices << mUpdatesNew->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	873 choices << mUpdatesRemove->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	874
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	875 choices << mUpdatesManual->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	876 QStringList unselectedManuals = mUpdatesManual->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	877 for(int i = 0; i < unselectedManuals.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	878 if (unselectedManuals.at(i).startsWith("I:")) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	879 QString certLine = unselectedManuals.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	880 certLine[0] = 'R';
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	881 choices << certLine;
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	882 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	883 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	884
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	885 unselected << mUpdatesNew->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	886 unselected << mUpdatesRemove->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	887 unselected << mInstallList->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	888 unselected << mRemoveList->unselectedCertificates();
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	889
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	890 QProgressDialog *progress = new QProgressDialog(this);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	891 progress->setWindowModality(Qt::WindowModal);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	892 progress->setLabelText(tr("Installing certificates..."));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	893 progress->setCancelButton(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	894 progress->setRange(0,0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	895 progress->setMinimumDuration(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	896 progress->show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	897
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	898 InstallWrapper *instWrap = new InstallWrapper(this,
393 ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	899 mListToInstall.isValid() ?
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	900 mListToInstall.fileName() :
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	901 mInstalledList.fileName(),
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	902 choices);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	903 /* Clean up object and progress dialog */
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	904 connect(instWrap, SIGNAL(finished()), instWrap, SLOT(deleteLater()));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	905 connect(instWrap, SIGNAL(finished()), progress, SLOT(deleteLater()));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	906 connect(instWrap, SIGNAL(finished()), progress, SLOT(cancel()));
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	907 connect(instWrap, SIGNAL(installationSuccessful()),
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	908 this, SLOT(installerSuccess()));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	909 connect(instWrap, SIGNAL(error(const QString &)),
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	910 this, SLOT(installerError(const QString &)));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	911 instWrap->start();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	912
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	913 if (!saveUnselectedCertificates(unselected)) {
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	914 qWarning() << "Failed to save previosly unselected certificates.";
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	915 }
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	916
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	917 }
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	918
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	919 void MainWindow::loadUnselectedCertificates()
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	920 {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	921 mPreviouslyUnselected.clear();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	922 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	923 QStringList keys = mSettings.allKeys();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	924 foreach (const QString &key, keys) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	925 mPreviouslyUnselected << mSettings.value(key, QString()).toString();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	926 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	927 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	928 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	929
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	930 bool MainWindow::saveUnselectedCertificates(QStringList unselected)
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	931 {
479 a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	932 mPreviouslyUnselected.clear();
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	933 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	934 mSettings.remove(""); /* Clears old choices */
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	935 for (int i = 0; i < unselected.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	936 QString key = QString::fromLatin1("cert%1").arg(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	937 QString value = unselected.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	938 mSettings.setValue(key, value);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	939 mPreviouslyUnselected << value;
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	940 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	941 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	942 mSettings.sync();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	943 return mSettings.status() == QSettings::NoError;
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	944 }
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	945
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	946 void MainWindow::toggleInManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	947 {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	948 if (!mUpdatesManual->contains(cert)) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	949 mUpdatesManual->addCertificate(cert, state);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	950 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	951 else {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	952 mUpdatesManual->removeCertificate(cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	953 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	954
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	955 mUpdatesManualCertificates->setText("<h3>" +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	956 tr("Manualy changed Certificates (%1)")
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	957 .arg(mUpdatesManual->certificates().size()) +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	958 "</h3>");
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	959 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	960
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	961 void MainWindow::removeFromManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	962 {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	963 mUpdatesManual->removeCertificate(cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	964
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	965 mUpdatesManualCertificates->setText("<h3>" +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	966 tr("Manualy changed Certificates (%1)")
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	967 .arg(mUpdatesManual->certificates().size()) +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	968 "</h3>");
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	969
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	970 if (cert.isInstallCert()) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	971 mInstallList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	972 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	973 else {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	974 mRemoveList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	975 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	976 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	977
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	978 void MainWindow::closeApp()
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	979 {
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	980 qApp->quit();
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	981 }
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	982
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	983 void MainWindow::togglePages(int button)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	984 {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	985 mUpdatesPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	986 mInstallPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	987 mRemovePanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	988 mInfoPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	989 switch(button) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	990 case 0: mUpdatesPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	991 case 1: mInstallPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	992 case 2: mRemovePanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	993 case 3: mInfoPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	994 default: mUpdatesPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	995 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	996 return;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	997 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	998
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	999 void MainWindow::toggleUpdatesNew() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1000 if (!mUpdatesNew->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1001 mUpdatesNew->show();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1002 if (mUpdatesNewSize == 0) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1003 mUpdatesNewSize = mUpdatesNew->height();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1004 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1005 mUpdatesWidget->resize(old.width(), old.height() + mUpdatesNewSize);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1006 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1007 else {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1008 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1009 mUpdatesNew->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1010 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1011 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1012
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1013 void MainWindow::toggleUpdatesRemove() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1014 QSize old = mUpdatesWidget->size();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1015 if (!mUpdatesRemove->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1016 mUpdatesRemove->show();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1017 if (mUpdatesRemoveSize == 0) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1018 mUpdatesRemoveSize = mUpdatesRemove->height();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1019 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1020 mUpdatesWidget->resize(old.width(), old.height() + mUpdatesRemoveSize);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1021 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1022 else {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1023 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1024 mUpdatesRemove->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1025 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1026 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1027
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1028 void MainWindow::toggleUpdatesManual() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1029 QSize old = mUpdatesWidget->size();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1030 if (!mUpdatesManual->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1031 mUpdatesManual->show();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1032 if (mUpdatesManualSize == 0) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1033 mUpdatesManualSize = mUpdatesManual->height();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1034 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1035 mUpdatesWidget->resize(old.width(), old.height() + mUpdatesManualSize);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1036 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1037 else {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1038 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1039 mUpdatesManual->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1040 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1041 }

Mercurial > trustbridge

annotate ui/mainwindow.cpp @ 652:f65503c1833b trustbridge-refactor