trustbridge/trustbridge: ui/mainwindow.cpp annotate

annotate ui/mainwindow.cpp @ 594:c944de9900de

Add installation parameters with correct quoting

author	Andre Heinecke <aheinecke@intevation.de>
date	Wed, 28 May 2014 08:55:53 +0000
parents	778f74d0706f
children	e83589f1fd7f

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>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	29
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	30 // 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	31 // something to say
548 c84dc8f6d017 Increase nag interval to 70 minutes Andre Heinecke <aheinecke@intevation.de> parents: 531 diff changeset	32 #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	33
409 09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	34 #ifndef APPNAME
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	35 #define APPNAME "TrustBridge"
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	36 #endif
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	37
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	38 #define SERVER_URL "https://files.intevation.de:443"
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	39 #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	40 #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	41 #ifdef Q_OS_WIN
554 d512d8eef8f6 Use case sensitive file name for SW-Updates Andre Heinecke <aheinecke@intevation.de> parents: 551 diff changeset	42 #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	43 #else
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.sh"
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	45 #endif
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	46
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	47 #include "certificatelist.h"
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	48 #include "downloader.h"
191 246c21b1727f Show the help dialog. Raimund Renkert <rrenkert@intevation.de> parents: 189 diff changeset	49 #include "helpdialog.h"
200 fe424c5fc875 Show the about dialog. Raimund Renkert <rrenkert@intevation.de> parents: 191 diff changeset	50 #include "aboutdialog.h"
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	51 #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	52 #include "separatoritemdelegate.h"
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	53 #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	54 #include "util.h"
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	55 #include "logging.h"
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	56 #include "binverify.h"
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	57
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	58 MainWindow::MainWindow(bool trayMode):
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	59 mTrayMode(trayMode)
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	60 {
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	61 createActions();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	62 createTrayIcon();
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	63 createMenuBar();
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) {
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	106 verifySWData();
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	107 QString swFileName = mSettings.value("Software/available").toString();
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	108 if (swFileName.isEmpty()) {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	109 checkUpdates(true);
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	110 mCurState = DownloadingSW;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	111 return;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	112 }
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	113 installNewSW(swFileName,
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	114 mSettings.value("Software/availableDate").toDateTime());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	115 }
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	116 }
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	117
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	118 void MainWindow::showMessage()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	119 {
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	120 if (mCurMessage.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	121 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	122 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	123 if (mCurState == NewSoftwareAvailable \|\| !isVisible()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	124 mTrayIcon->showMessage(QApplication::applicationName(), mCurMessage,
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	125 QSystemTrayIcon::Information, 10000);
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	126 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	127 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	128 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	129
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	130 void MainWindow::verifyListData()
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	131 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	132 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	133 QString installedFileName = mSettings.value("List/installed").toString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	134 if (!availableFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	135 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	136 if (!mListToInstall.isValid()) {
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	137 mCurState = TransferError;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	138 // 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	139 // 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	140 // 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	141 QFile::remove(availableFileName);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	142 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	143 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	144 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	145 } else {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	146 // 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	147 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	148 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	149 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	150
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	151 if (!installedFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	152 mInstalledList.readList(installedFileName.toLocal8Bit().constData());
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	153 if (!mInstalledList.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	154 // 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	155 // 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	156 // 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	157 QFile::remove(installedFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	158 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	159 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	160 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	161 } else {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	162 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	163 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	164 }
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	165 }
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	166
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	167 void MainWindow::verifySWData()
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	168 {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	169 QString swFileName = mSettings.value("Software/available").toString();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	170
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	171 if (swFileName.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	172 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	173 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	174 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	175
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	176 QFileInfo fi(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	177 if (!fi.exists()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	178 mSettings.remove("Software/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	179 mSettings.remove("Software/availableDate");
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	180 qDebug() << "Software does not yet exist.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	181 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	182 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	183 if (!fi.isExecutable()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	184 qWarning() << "Downloaded file: " << swFileName << " is not executable.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	185 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	186 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	187 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	188 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	189 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	190 bin_verify_result verifyResult = verify_binary(swFileName.toUtf8().constData(),
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	191 swFileName.toUtf8().size());
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	192 qDebug() << "Binary verify result: " << verifyResult;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	193 if (verifyResult != VerifyValid) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	194 qDebug() << "Failed to verify downloaded data.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	195 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	196 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	197 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	198 return;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	199 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	200 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	201
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	202 void MainWindow::handleNewList(const QString& fileName, const QDateTime& modDate) {
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	203 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	204 mSettings.setValue("List/availableDate", modDate);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	205
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	206 verifyListData();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	207 if (!mListToInstall.isValid()) {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	208 /* 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	209 /* 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	210 * 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	211
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	212 /* 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	213 QTimer::singleShot(600000 + (qrand() % 60000), this, SLOT(checkUpdates()));
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	214 } else {
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	215 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	216 setState(NewListAvailable);
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	217 showMessage();
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	218 loadCertificateList();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	219 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	220 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	221
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	222 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	223 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	224 "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	225 QApplication::applicationName());
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	226 setState(NewSoftwareAvailable);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	227 mSettings.setValue("Software/available", fileName);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	228 mSettings.setValue("Software/availableDate", modDate);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	229
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	230 mSettings.sync();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	231 showMessage();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	232 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	233
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	234 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	235 QFileInfo instProcInfo = QFileInfo(fileName);
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	236 QString filePath = QDir::toNativeSeparators(instProcInfo.absoluteFilePath());
592 778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	237
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	238 if (verify_binary(filePath.toUtf8().constData(),
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	239 filePath.toUtf8().size()) != VerifyValid) {
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	240 qDebug() << "Invalid software. Not installing";
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	241 return;
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	242 }
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	243 QFileInfo fi(QCoreApplication::applicationFilePath());
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	244 QDir installDir = fi.absoluteDir();
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	245
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	246 #ifdef WIN32
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	247 QString parameters = QString::fromLatin1("/S /UPDATE=1 /D=") +
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	248 installDir.path().replace("/", "\\") + "";
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	249
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	250 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	251 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	252 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	253
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	254 shExecInfo.lpFile = reinterpret_cast<LPCWSTR> (filePath.utf16());
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	255 shExecInfo.lpParameters = reinterpret_cast<LPCWSTR> (parameters.utf16());
563 aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	256
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	257 // shExecInfo.fMask = SEE_MASK_NOASYNC;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	258 shExecInfo.nShow = SW_SHOWDEFAULT;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	259
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	260 if (!is_admin()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	261 shExecInfo.lpVerb = L"open";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	262 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	263 shExecInfo.lpVerb = L"runas";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	264 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	265
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	266 qDebug() << "Starting process: " << filePath
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	267 << " with arguments: " << parameters;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	268
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	269 if (!ShellExecuteExW(&shExecInfo)) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	270 /* 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	271 char* errmsg = getLastErrorMsg();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	272 QString qerrmsg = QString::fromUtf8(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	273 free(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	274 qDebug() << "Failed to start process: " << qerrmsg;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	275 setState(NewSoftwareAvailable);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	276 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	277 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	278 #else /* WIN32 */
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	279 QStringList parameters;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	280 parameters << "/S" << "/UPDATE=1"
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	281 << QString::fromLatin1("/D=%1").arg(installDir.path());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	282
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	283 qDebug() << "Starting process " << filePath << " args: " << parameters;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	284
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	285 if (!QProcess::startDetached(filePath, parameters)) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	286 qDebug() << "Failed to start process.";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	287 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	288 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	289 #endif
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	290 /* Installer process should now be running. We exit */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	291
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	292 closeApp();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	293 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	294
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	295 void MainWindow::checkUpdates(bool downloadSW)
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	296 {
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	297 verifyListData();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	298
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	299 if (!mSettings.contains("Software/installedDate") \|\|
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	300 mSettings.value("Software/installedVersion").toString() != QApplication::applicationVersion()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	301 /* 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	302 * been installed */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	303 getLastModForCurrentVersion();
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	304 return;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	305 }
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	306 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	307 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	308
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	309 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	310 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	311
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	312 #ifndef RELEASE_BUILD
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	313 /* 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	314 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	315 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	316 #endif
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	317
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	318
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	319 Downloader* downloader = new Downloader(this,
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	320 QString::fromLatin1(SERVER_URL),
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	321 QByteArray(),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	322 swInstalledLastMod,
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	323 listInstalledLastMod,
437 4b486a14252f Acutally use the values that can be taken from the config Andre Heinecke <aheinecke@intevation.de> parents: 434 diff changeset	324 swResource,
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	325 listResource,
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	326 downloadSW);
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	327
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	328 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	329 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	330 if (!downloadSW) {
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	331 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	332 this, SLOT(handleNewSW(const QString&, const QDateTime&)));
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	333 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	334 connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	335 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	336 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	337
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	338 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	339 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	340 this, SLOT(downloaderError(const QString &, SSLConnection::ErrorCode)));
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	341 downloader->start();
0 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
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	344 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	345 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	346 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	347 QApplication::applicationVersion());
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	348 qDebug() << softwareVersion;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	349 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	350 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	351 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	352 QByteArray(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	353 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	354 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	355 softwareVersion,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	356 listResource,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	357 false);
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	358 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	359 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	360 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	361 connect(downloader, SIGNAL(lastModifiedDate(const QDateTime&)),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	362 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	363
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	364 downloader->start();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	365 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	366
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	367 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	368 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	369 mSettings.beginGroup("Software");
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	370 mSettings.setValue("installedDate", date);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	371 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	372 mSettings.endGroup();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	373 checkUpdates();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	374 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	375
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	376 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	377 {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	378 /* 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	379 mCurMessage = message;
27 62cd56cea09b Start on polarssl Downloader. Andre Heinecke <andre.heinecke@intevation.de> parents: 19 diff changeset	380 showMessage();
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	381 setState(TransferError);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	382 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	383
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	384 void MainWindow::createActions()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	385 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	386 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	387 connect(mCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdates()));
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	388 mQuitAction = new QAction(tr("Quit"), this);
cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	389 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	390 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	391
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	392 void MainWindow::createTrayIcon()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	393 {
11 7e2f14c7aba2 Split up downloader component and further implement it Andre Heinecke <aheinecke@intevation.de> parents: 10 diff changeset	394 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	395
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	396 mTrayMenu = new QMenu(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	397 mTrayMenu->addAction(mCheckUpdates);
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	398 mTrayMenu->addAction(mQuitAction);
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	399
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	400 mTrayIcon = new QSystemTrayIcon(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	401 mTrayIcon->setContextMenu(mTrayMenu);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	402
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	403 mTrayIcon->setIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	404 setWindowIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	405 mTrayIcon->show();
407 af53c40e74b1 Rename m13ui to TrustBridge Andre Heinecke <aheinecke@intevation.de> parents: 404 diff changeset	406 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	407
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	408 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	409 }
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	410
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	411 void MainWindow::createMenuBar()
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	412 {
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	413 mMenuBar = new QMenuBar(this);
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	414 QMenu *mMenu = new QMenu(tr("Menu"), mMenuBar);
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	415 mMenuBar->addMenu(mMenu);
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	416 QAction *update = mMenu->addAction(tr("Force Update"));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	417 mMenu->addSeparator();
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	418 QAction *help = mMenu->addAction(tr("Help"));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	419 QAction *about = mMenu->addAction(tr("About"));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	420 mMenu->addSeparator();
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	421 QAction *quit = mMenu->addAction(tr("Quit"));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	422 connect(update, SIGNAL(triggered()), this, SLOT(checkUpdates()));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	423 connect(help, SIGNAL(triggered()), this, SLOT(showHelp()));
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	424 connect(about, SIGNAL(triggered()), this, SLOT(showAbout()));
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	425 connect(quit, SIGNAL(triggered()), this, SLOT(closeApp()));
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	426 setMenuBar(mMenuBar);
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	427 }
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	428
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	429 void MainWindow::createContent()
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	430 {
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	431 // Create a central widget containing the main layout.
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	432 QWidget *base = new QWidget;
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	433
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	434 // Layouts and Container
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	435 QHBoxLayout *mainLayout = new QHBoxLayout;
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	436 QVBoxLayout *infoLayout = new QVBoxLayout;
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	437 QVBoxLayout *certLayout = new QVBoxLayout;
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	438 QHBoxLayout *detailLayout = new QHBoxLayout;
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	439 QVBoxLayout *detailLabelLayout = new QVBoxLayout;
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	440 QVBoxLayout *detailContentLayout = new QVBoxLayout;
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	441 QHBoxLayout *headerLayout = new QHBoxLayout;
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	442 QVBoxLayout *headerTextLayout = new QVBoxLayout;
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	443 QHBoxLayout *bottomLayout = new QHBoxLayout;
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	444 QVBoxLayout *settingsLayout = new QVBoxLayout;
456 37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	445 QVBoxLayout *listInfoLayout = new QVBoxLayout;
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	446
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	447 // The certificate list
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	448 QGroupBox *certBox = new QGroupBox(tr("Managed Certificates"));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	449 mCertListWidget = new QListWidget;
449 023b565a02fc Update certificate details on item selection change. Raimund Renkert <rrenkert@intevation.de> parents: 447 diff changeset	450 connect(mCertListWidget, SIGNAL(currentItemChanged(QListWidgetItem, QListWidgetItem)),
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	451 this, SLOT(showDetails(QListWidgetItem*)));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	452 certLayout->addWidget(mCertListWidget);
456 37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	453
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	454 mCurrentListDate = new QLabel(tr("Current List Date: %1").arg(""));
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	455 mNewListDate = new QLabel("");
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	456 listInfoLayout->addWidget(mCurrentListDate);
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	457 listInfoLayout->addWidget(mNewListDate);
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	458 certLayout->addLayout(listInfoLayout);
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	459
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	460 certBox->setLayout(certLayout);
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	461
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	462 // The header (icon, about text)
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	463 QImage *logoImage = new QImage(":/img/logo.png");
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	464 QLabel *logo = new QLabel;
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	465 logo->setBackgroundRole(QPalette::Base);
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	466 logo->setPixmap(QPixmap::fromImage(*logoImage));
409 09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	467 QLabel *title = new QLabel("<h2>" + QString::fromLatin1(APPNAME) + "</h2>");
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	468 QLabel *subTitle = new QLabel("This Software installs and removes Certificates");
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	469 headerTextLayout->addWidget(title);
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	470 headerTextLayout->addWidget(subTitle);
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	471 headerLayout->addWidget(logo);
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	472 headerLayout->addLayout(headerTextLayout);
210 9c51c472e596 Some mainwindow layout improvements and new icons for certificate list. Raimund Renkert <rrenkert@intevation.de> parents: 205 diff changeset	473 headerLayout->setStretch(0, 0);
9c51c472e596 Some mainwindow layout improvements and new icons for certificate list. Raimund Renkert <rrenkert@intevation.de> parents: 205 diff changeset	474 headerLayout->setStretch(1, 10);
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	475
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	476 // The settings.
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	477 QGroupBox *settingsBox = new QGroupBox(tr("Settings"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	478 mAutoUpdateOption = new QCheckBox(tr("Autoupdate"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	479 mAutoStartOption = new QCheckBox(tr("Autostart"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	480 settingsLayout->addWidget(mAutoUpdateOption);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	481 settingsLayout->addWidget(mAutoStartOption);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	482 settingsBox->setLayout(settingsLayout);
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	483 connect(mAutoUpdateOption, SIGNAL(stateChanged(int)),
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	484 this, SLOT(saveAutoUpdate(int)));
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	485 connect(mAutoStartOption, SIGNAL(stateChanged(int)),
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	486 this, SLOT(saveAutoStart(int)));
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	487 mSettings.beginGroup("settings");
499 077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	488 bool autoUpdate = mSettings.value("autoupdate", false).toBool();
077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	489 bool autoStart = mSettings.value("autostart", true).toBool();
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	490 mSettings.endGroup();
499 077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	491 mAutoUpdateOption->setCheckState(autoUpdate ? Qt::Checked : Qt::Unchecked);
077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	492 mAutoStartOption->setCheckState(autoStart ? Qt::Checked : Qt::Unchecked);
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	493
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	494
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	495 // The buttons.
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	496 bottomLayout->setAlignment(Qt::AlignBottom);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	497 installButton = new QPushButton(tr("Install selected"));
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	498 installButton->setFixedHeight(80);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	499 connect(installButton, SIGNAL(clicked()), this, SLOT(resizeButtons()));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	500 connect(installButton, SIGNAL(clicked()), this, SLOT(installCerts()));
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	501 quitButton = new QPushButton(tr("Quit"));
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	502 quitButton->setFixedHeight(20);
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	503 connect(quitButton, SIGNAL(clicked()), this, SLOT(closeApp()));
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	504 bottomLayout->insertStretch(0, 10);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	505 bottomLayout->addWidget(installButton);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	506 bottomLayout->setAlignment(installButton, Qt::AlignBottom);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	507 bottomLayout->addWidget(quitButton);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	508 bottomLayout->setAlignment(quitButton, Qt::AlignBottom);
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	509
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	510 #ifdef Q_OS_WIN
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	511 if (is_admin()) {
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	512 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	513 installButton->setIcon(uacShield);
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	514 }
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	515 #endif
20973a56d5ec Use is_admin to determine if UAC icon should be painted on the button Andre Heinecke <aheinecke@intevation.de> parents: 499 diff changeset	516
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	517 // The certificate details
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	518 QGroupBox *detailBox = new QGroupBox(tr("Details"));
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	519 QLabel *subjectCN = new QLabel(tr("Subject Common Name:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	520 QLabel *subjectOU = new QLabel(tr("Subject Organisation:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	521 QLabel *issuerCN = new QLabel(tr("Issuer Common Name:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	522 QLabel *issuerOU = new QLabel(tr("Issuer Organisation:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	523 QLabel *validFrom = new QLabel(tr("Valid from:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	524 QLabel *validTo = new QLabel(tr("Valid to:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	525 QLabel *fingerprint = new QLabel(tr("Fingerprint:"));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	526 detailLabelLayout->addWidget(subjectCN);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	527 detailLabelLayout->addWidget(subjectOU);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	528 detailLabelLayout->addWidget(issuerCN);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	529 detailLabelLayout->addWidget(issuerOU);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	530 detailLabelLayout->addWidget(validFrom);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	531 detailLabelLayout->addWidget(validTo);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	532 detailLabelLayout->addWidget(fingerprint);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	533 mSubjectCN = new QLabel(tr(""));
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	534 mSubjectO = new QLabel(tr(""));
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	535 mIssuerCN = new QLabel(tr(""));
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	536 mIssuerO = new QLabel(tr(""));
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	537 mValidFrom = new QLabel(tr(""));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	538 mValidTo = new QLabel(tr(""));
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	539 mFingerprint = new QLabel(tr(""));
451 94613c91a3d4 Set mono space font for fingerprint. Raimund Renkert <rrenkert@intevation.de> parents: 450 diff changeset	540 mFingerprint->setFont(QFont("DejaVu Sans Mono"));
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	541 detailContentLayout->addWidget(mSubjectCN);
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	542 detailContentLayout->addWidget(mSubjectO);
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	543 detailContentLayout->addWidget(mIssuerCN);
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	544 detailContentLayout->addWidget(mIssuerO);
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	545 detailContentLayout->addWidget(mValidFrom);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	546 detailContentLayout->addWidget(mValidTo);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	547 detailContentLayout->addWidget(mFingerprint);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	548 detailLayout->addLayout(detailLabelLayout);
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	549 detailLayout->addLayout(detailContentLayout);
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	550 detailBox->setLayout(detailLayout);
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	551
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	552 infoLayout->addSpacing(20);
1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	553 infoLayout->addLayout(headerLayout);
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	554 infoLayout->addWidget(detailBox);
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	555 infoLayout->addWidget(settingsBox);
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	556 infoLayout->addLayout(bottomLayout);
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	557
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	558 mainLayout->addWidget(certBox);
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	559 mainLayout->addLayout(infoLayout);
450 4932fc33ee82 Updated window and main layout size. Raimund Renkert <rrenkert@intevation.de> parents: 449 diff changeset	560 mainLayout->setStretchFactor(certBox, 37);
4932fc33ee82 Updated window and main layout size. Raimund Renkert <rrenkert@intevation.de> parents: 449 diff changeset	561 mainLayout->setStretchFactor(infoLayout, 63);
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	562
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	563 // QMainWindow allready has a layout. All child layouts and widgets are
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	564 // managed in the central widget.
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	565 base->setLayout(mainLayout);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	566 setCentralWidget(base);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	567 }
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	568
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	569 void MainWindow::loadCertificateList()
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	570 {
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	571 mCertListWidget->clear();
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	572 int i = 0;
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	573
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	574 /* 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	575 * indication */
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	576 QList<Certificate> newInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	577 QList<Certificate> newRemoveCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	578 QList<Certificate> oldInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	579 QList<Certificate> oldRemoveCerts;
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	580
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	581 if (mListToInstall.getCertificates().isEmpty()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	582 // 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	583 foreach (const Certificate &cert, mInstalledList.getCertificates()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	584 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	585 oldInstallCerts.append(cert);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	586 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	587 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	588 oldRemoveCerts.append(cert);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	589 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	590 }
456 37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	591 // Set the date of the old list.
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	592 mCurrentListDate->setText(tr("Current List Date: %1")
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	593 .arg(mInstalledList.date().toString()));
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	594 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	595 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	596 // 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	597 foreach (const Certificate &cert, mListToInstall.getCertificates()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	598 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	599 // Certificate with status "install".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	600 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	601 // 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	602 oldInstallCerts.append(cert);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	603 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	604 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	605 // 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	606 newInstallCerts.append(cert);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	607 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	608 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	609 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	610 // Certificate with status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	611 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	612 // 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	613 oldRemoveCerts.append(cert);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	614 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	615 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	616 // 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	617 // status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	618 newRemoveCerts.append(cert);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	619 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	620 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	621 }
456 37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	622 mCurrentListDate->setText(tr("Current List Date: %1")
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	623 .arg(mInstalledList.date().toString()));
37a97621b466 Added label for current and updated list date. Raimund Renkert <rrenkert@intevation.de> parents: 451 diff changeset	624 mNewListDate->setText(tr("New List Date: %1").arg(mListToInstall.date().toString()));
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	625 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	626
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	627 // Add separators and certificates to list widget.
512 d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	628 if (!newInstallCerts.isEmpty()) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	629 mCertListWidget->addItem(createSeparator(tr("New certificates to install"), i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	630 foreach (const Certificate &cert, newInstallCerts) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	631 mCertListWidget->addItem(createListItem(cert, Certificate::InstallNew, i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	632 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	633 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	634
512 d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	635 if (!newRemoveCerts.isEmpty()) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	636 mCertListWidget->addItem(createSeparator(tr("New certificates to remove"), i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	637 foreach (const Certificate &cert, newRemoveCerts) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	638 mCertListWidget->addItem(createListItem(cert, Certificate::RemoveNew, i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	639 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	640 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	641
512 d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	642 if (!oldInstallCerts.isEmpty()) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	643 mCertListWidget->addItem(createSeparator(tr("Old certificates to install"), i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	644 foreach (const Certificate &cert, oldInstallCerts) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	645 mCertListWidget->addItem(createListItem(cert, Certificate::InstallOld, i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	646 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	647 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	648
512 d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	649 if (!oldRemoveCerts.isEmpty()) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	650 mCertListWidget->addItem(createSeparator(tr("Old certificates to remove"), i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	651 foreach (const Certificate &cert, oldRemoveCerts) {
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	652 mCertListWidget->addItem(createListItem(cert, Certificate::RemoveOld, i++));
d1812e171d0c Hide empty seperators in list ui Andre Heinecke <aheinecke@intevation.de> parents: 507 diff changeset	653 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	654 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	655 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	656
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	657 QListWidgetItem* MainWindow::createSeparator(const QString &text, int index)
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	658 {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	659 SeparatorItemDelegate *separatorDelegate = new SeparatorItemDelegate();
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	660 QListWidgetItem *separator = new QListWidgetItem(text);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	661 mCertListWidget->setItemDelegateForRow(index, separatorDelegate);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	662 separator->setFlags(separator->flags() ^ Qt::ItemIsUserCheckable);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	663 return separator;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	664 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	665
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	666 QListWidgetItem* MainWindow::createListItem(const Certificate &certificate,
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	667 Certificate::Status status, int index)
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	668 {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	669 CertificateItemDelegate *certDelegate = new CertificateItemDelegate();
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	670 QListWidgetItem* item = new QListWidgetItem(certificate.shortDescription());
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	671 item->setData(CertificateItemDelegate::DataRole,
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	672 QVariant::fromValue(certificate));
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	673 item->setData(CertificateItemDelegate::StatusRole, status);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	674 if (!mPreviouslyUnselected.contains(certificate.base64Line()) &&
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	675 status == Certificate::RemoveOld) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	676 item->setFlags(item->flags() ^ Qt::ItemIsUserCheckable);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	677 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	678 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	679 Qt::CheckState checkedState =
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	680 mPreviouslyUnselected.contains(certificate.base64Line()) ?
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	681 Qt::Unchecked : Qt::Checked;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	682 item->setFlags(item->flags() \| Qt::ItemIsUserCheckable);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	683 item->setCheckState(checkedState);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	684 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	685 mCertListWidget->setItemDelegateForRow(index, certDelegate);
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	686 return item;
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	687 }
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	688
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	689 void MainWindow::showHelp()
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	690 {
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	691 qDebug() << "show helpdialog";
191 246c21b1727f Show the help dialog. Raimund Renkert <rrenkert@intevation.de> parents: 189 diff changeset	692 HelpDialog *help = new HelpDialog(this);
246c21b1727f Show the help dialog. Raimund Renkert <rrenkert@intevation.de> parents: 189 diff changeset	693 help->show();
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	694 }
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	695
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	696 void MainWindow::showAbout()
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	697 {
c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	698 qDebug() << "show aboutdialog";
200 fe424c5fc875 Show the about dialog. Raimund Renkert <rrenkert@intevation.de> parents: 191 diff changeset	699 AboutDialog *about = new AboutDialog(this);
fe424c5fc875 Show the about dialog. Raimund Renkert <rrenkert@intevation.de> parents: 191 diff changeset	700 about->show();
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	701 }
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	702
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	703 void MainWindow::showDetails(QListWidgetItem *item)
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	704 {
449 023b565a02fc Update certificate details on item selection change. Raimund Renkert <rrenkert@intevation.de> parents: 447 diff changeset	705 if (item == NULL) {
023b565a02fc Update certificate details on item selection change. Raimund Renkert <rrenkert@intevation.de> parents: 447 diff changeset	706 return;
023b565a02fc Update certificate details on item selection change. Raimund Renkert <rrenkert@intevation.de> parents: 447 diff changeset	707 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	708 Certificate cert = item->data(CertificateItemDelegate::DataRole).value<Certificate>();
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	709 mSubjectCN->setText(cert.subjectCN());
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	710 mSubjectO->setText(cert.subjectO());
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	711 mIssuerCN->setText(cert.issuerCN());
531 dec797c7230c Fix usage of OU / O Andre Heinecke <aheinecke@intevation.de> parents: 525 diff changeset	712 mIssuerO->setText(cert.issuerO());
432 16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	713 mValidFrom->setText(cert.validFrom().toString());
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	714 mValidTo->setText(cert.validTo().toString());
16b5cd858571 Updated layout and certificate details in trustbridge installer. Raimund Renkert <rrenkert@intevation.de> parents: 409 diff changeset	715 mFingerprint->setText(cert.fingerprint());
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	716 }
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	717
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	718 void MainWindow::resizeButtons()
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	719 {
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	720 installButton->setFixedHeight(20);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	721 quitButton->setFixedHeight(80);
1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	722 }
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	723
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	724 void MainWindow::installerError(const QString& errMsg) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	725 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	726 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	727
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	728 void MainWindow::installerSuccess() {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	729 if (mCurState == NewListAvailable) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	730 mCurState = NothingChanged;
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	731 mCurMessage = QString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	732
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	733 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	734 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	735
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	736 mSettings.remove("List/available");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	737 mSettings.remove("List/availableDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	738
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	739 if (listFileName.isEmpty() \|\| !listFileDate.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	740 qWarning() << "Error accessing settings";
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	741 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	742 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	743
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	744 mSettings.setValue("List/installed", listFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	745 mSettings.setValue("List/installedDate", listFileDate);
480 242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	746 mInstalledList = mListToInstall;
242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	747 mListToInstall = CertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	748 }
480 242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	749 loadCertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	750 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	751
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	752 void MainWindow::installCerts() {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	753 QStringList choices;
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	754
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	755 for (int i = 0; i < mCertListWidget->count(); i++) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	756 QListWidgetItem *item = mCertListWidget->item(i);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	757 if (item->checkState() == Qt::Checked) {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	758 choices << item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	759 continue;
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	760 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	761 QString certLine = item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	762 if (certLine.startsWith("I:")) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	763 certLine[0] = 'R';
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	764 choices << certLine;
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	765 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	766 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	767
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	768 QProgressDialog *progress = new QProgressDialog(this);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	769 progress->setWindowModality(Qt::WindowModal);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	770 progress->setLabelText(tr("Installing certificates..."));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	771 progress->setCancelButton(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	772 progress->setRange(0,0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	773 progress->setMinimumDuration(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	774 progress->show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	775
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	776 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	777 mListToInstall.isValid() ?
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	778 mListToInstall.fileName() :
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	779 mInstalledList.fileName(),
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	780 choices);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	781 /* Clean up object and progress dialog */
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	782 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	783 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	784 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	785 connect(instWrap, SIGNAL(installationSuccessful()),
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	786 this, SLOT(installerSuccess()));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	787 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	788 this, SLOT(installerError(const QString &)));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	789 instWrap->start();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	790
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	791 if (!saveUnselectedCertificates()) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	792 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	793 }
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	794 }
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	795
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	796 void MainWindow::loadUnselectedCertificates()
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	797 {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	798 mPreviouslyUnselected.clear();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	799 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	800 QStringList keys = mSettings.allKeys();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	801 foreach (const QString &key, keys) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	802 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	803 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	804 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	805 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	806
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	807 bool MainWindow::saveUnselectedCertificates()
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	808 {
479 a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	809 mPreviouslyUnselected.clear();
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	810 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	811 mSettings.remove(""); /* Clears old choices */
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	812 for (int i = 0; i < mCertListWidget->count(); i++) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	813 QListWidgetItem *item = mCertListWidget->item(i);
446 43090637d6ae Check if list item is checkable before adding the item to unselected list. Raimund Renkert <rrenkert@intevation.de> parents: 445 diff changeset	814 if (item->checkState() != Qt::Checked &&
43090637d6ae Check if list item is checkable before adding the item to unselected list. Raimund Renkert <rrenkert@intevation.de> parents: 445 diff changeset	815 (item->flags() & Qt::ItemIsUserCheckable)) {
479 a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	816 QString key = QString::fromLatin1("cert%1").arg(i);
a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	817 QString value =
a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	818 item->data(CertificateItemDelegate::DataRole).value<Certificate>().base64Line();
a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	819 mSettings.setValue(key, value);
a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	820 mPreviouslyUnselected << value;
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	821 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	822 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	823 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	824 mSettings.sync();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	825 return mSettings.status() == QSettings::NoError;
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	826 }
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	827
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	828 void MainWindow::saveAutoUpdate(int state)
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	829 {
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	830 mSettings.beginGroup("settings");
499 077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	831 mSettings.setValue("autoupdate", state != Qt::Unchecked);
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	832 mSettings.endGroup();
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	833 }
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	834
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	835 void MainWindow::saveAutoStart(int state)
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	836 {
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	837 mSettings.beginGroup("settings");
499 077b4342d69b Default autostart to true and change setting to bool Andre Heinecke <aheinecke@intevation.de> parents: 486 diff changeset	838 mSettings.setValue("autostart", state != Qt::Unchecked);
481 9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	839 mSettings.endGroup();
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	840 }
9be337ea1e3c Save the autostart and autoupdate settings. Raimund Renkert <rrenkert@intevation.de> parents: 480 diff changeset	841
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	842 void MainWindow::closeApp()
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	843 {
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	844 saveUnselectedCertificates();
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	845 qApp->quit();
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	846 }

Mercurial > trustbridge > trustbridge

annotate ui/mainwindow.cpp @ 594:c944de9900de