trustbridge/trustbridge: ui/mainwindow.cpp annotate

annotate ui/mainwindow.cpp @ 713:cdf8a924e480

(UI) Increase apply/quit button height. Updated translations.

author	Emanuel Schuetze <emanuel@intevation.de>
date	Wed, 02 Jul 2014 15:46:50 +0200
parents	8f110e6b8295
children	57bd73145e48

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>
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	24 #include <QGridLayout>
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	25 #include <QGroupBox>
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	26 #include <QSplitter>
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	27 #include <QLabel>
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	28 #include <QImage>
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	29 #include <QCheckBox>
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	30 #include <QButtonGroup>
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	31 #include <QToolButton>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	32
609 292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	33 #include "certificatelist.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	34 #include "downloader.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	35 #include "helpdialog.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	36 #include "aboutdialog.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	37 #include "certificateitemdelegate.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	38 #include "separatoritemdelegate.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	39 #include "installwrapper.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	40 #include "util.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	41 #include "logging.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	42 #include "binverify.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	43 #include "processhelp.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	44 #include "processwaitdialog.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	45
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	46 // 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	47 // something to say
548 c84dc8f6d017 Increase nag interval to 70 minutes Andre Heinecke <aheinecke@intevation.de> parents: 531 diff changeset	48 #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	49
409 09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	50 #ifndef APPNAME
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	51 #define APPNAME "TrustBridge"
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	52 #endif
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	53
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	54 #define SERVER_URL "https://files.intevation.de:443"
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	55
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	56 #ifdef RELEASE_BUILD
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	57 # define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt"
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	58 # ifdef Q_OS_WIN
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	59 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe"
664 911b94a475e0 Fix SW_Resource defines for linux Andre Heinecke <andre.heinecke@intevation.de> parents: 663 diff changeset	60 # define SW_RESOURCE "/users/aheinecke/TrustBridge.exe"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	61 # else
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	62 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.sh"
664 911b94a475e0 Fix SW_Resource defines for linux Andre Heinecke <andre.heinecke@intevation.de> parents: 663 diff changeset	63 # define SW_RESOURCE "/users/aheinecke/TrustBridge.sh"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	64 # endif
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	65 #else // RELEASE_BUILD
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	66 # define LIST_RESOURCE "/users/aheinecke/development/zertifikatsliste.txt"
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	67 # ifdef Q_OS_WIN
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	68 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.exe"
664 911b94a475e0 Fix SW_Resource defines for linux Andre Heinecke <andre.heinecke@intevation.de> parents: 663 diff changeset	69 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.exe"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	70 # else
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	71 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.sh"
664 911b94a475e0 Fix SW_Resource defines for linux Andre Heinecke <andre.heinecke@intevation.de> parents: 663 diff changeset	72 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.sh"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	73 # endif
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	74 #endif
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	75
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	76 MainWindow::MainWindow(bool trayMode):
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	77 mTrayMode(trayMode)
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	78 {
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	79 createActions();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	80 createTrayIcon();
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	81 createContent();
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	82 resize(1065, 600);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	83 setMinimumWidth(760);
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	84 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	85 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	86
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	87 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	88 this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	89
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	90 mMessageTimer = new QTimer(this);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	91 connect(mMessageTimer, SIGNAL(timeout()), this, SLOT(showMessage()));
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	92 mMessageTimer->setInterval(NAG_INTERVAL_MINUTES * 60 * 1000);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	93 mMessageTimer->start();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	94 checkUpdates();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	95 loadUnselectedCertificates();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	96 loadCertificateList();
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	97 if (!trayMode) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	98 show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	99 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	100 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	101
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	102 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	103 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	104 switch (reason) {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	105 case QSystemTrayIcon::Trigger:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	106 case QSystemTrayIcon::MiddleClick:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	107 showMessage();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	108 break;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	109 case QSystemTrayIcon::DoubleClick:
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	110 show();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	111 break;
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	112 default:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	113 ;
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	114 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	115 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	116
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	117 void MainWindow::messageClicked()
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	118 {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	119 if (mCurState == NewListAvailable) {
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	120 show();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	121 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	122
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	123 if (mCurState == NewSoftwareAvailable) {
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	124 verifySWData();
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	125 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	126 if (swFileName.isEmpty()) {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	127 checkUpdates(true);
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	128 mCurState = DownloadingSW;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	129 return;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	130 }
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	131 installNewSW(swFileName,
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	132 mSettings.value("Software/availableDate").toDateTime());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	133 }
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	134 }
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	135
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	136 void MainWindow::showMessage()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	137 {
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	138 if (mCurMessage.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	139 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	140 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	141 if (mCurState == NewSoftwareAvailable \|\| !isVisible()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	142 mTrayIcon->showMessage(QApplication::applicationName(), mCurMessage,
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	143 QSystemTrayIcon::Information, 10000);
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	144 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	145 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	146 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	147
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	148 void MainWindow::verifyListData()
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	149 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	150 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	151 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	152 if (!availableFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	153 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	154 if (!mListToInstall.isValid()) {
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	155 mCurState = TransferError;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	156 // 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	157 // 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	158 // 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	159 QFile::remove(availableFileName);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	160 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	161 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	162 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	163 } else {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	164 // 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	165 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	166 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	167 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	168
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	169 if (!installedFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	170 mInstalledList.readList(installedFileName.toLocal8Bit().constData());
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	171 if (!mInstalledList.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	172 // 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	173 // 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	174 // 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	175 QFile::remove(installedFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	176 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	177 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	178 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	179 } else {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	180 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	181 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	182 }
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	183 }
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	184
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	185 void MainWindow::verifySWData()
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	186 {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	187 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	188
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	189 if (swFileName.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	190 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	191 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	192 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	193
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	194 QFileInfo fi(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	195 if (!fi.exists()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	196 mSettings.remove("Software/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	197 mSettings.remove("Software/availableDate");
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	198 qDebug() << "Software does not yet exist.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	199 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	200 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	201 if (!fi.isExecutable()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	202 qWarning() << "Downloaded file: " << swFileName << " is not executable.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	203 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	204 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	205 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	206 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	207 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	208 bin_verify_result verifyResult = verify_binary(swFileName.toUtf8().constData(),
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	209 swFileName.toUtf8().size());
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	210 qDebug() << "Binary verify result: " << verifyResult;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	211 if (verifyResult != VerifyValid) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	212 qDebug() << "Failed to verify downloaded data.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	213 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	214 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	215 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	216 return;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	217 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	218 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	219
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	220 void MainWindow::handleNewList(const QString& fileName, const QDateTime& modDate) {
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	221 qDebug() << "new list available";
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	222 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	223 mSettings.setValue("List/availableDate", modDate);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	224
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	225 verifyListData();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	226 if (!mListToInstall.isValid()) {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	227 /* 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	228 /* 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	229 * 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	230
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	231 /* 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	232 QTimer::singleShot(600000 + (qrand() % 60000), this, SLOT(checkUpdates()));
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	233 } else {
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	234 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	235 setState(NewListAvailable);
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	236 showMessage();
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	237 loadCertificateList();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	238 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	239 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	240
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	241 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	242 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	243 "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	244 QApplication::applicationName());
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	245 setState(NewSoftwareAvailable);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	246 mSettings.setValue("Software/available", fileName);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	247 mSettings.setValue("Software/availableDate", modDate);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	248
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	249 mSettings.sync();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	250 showMessage();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	251 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	252
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	253 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	254 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	255 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	256
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	257 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	258 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	259 qDebug() << "Invalid software. Not installing";
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	260 return;
592 778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	261 }
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	262 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	263 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	264
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	265 #ifdef WIN32
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	266 QString parameters = QString::fromLatin1("/S /UPDATE=1 /D=") +
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	267 installDir.path().replace("/", "\\") + "";
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	268
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	269 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	270 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	271 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	272
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	273 shExecInfo.lpFile = reinterpret_cast<LPCWSTR> (filePath.utf16());
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	274 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	275
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	276 // shExecInfo.fMask = SEE_MASK_NOASYNC;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	277 shExecInfo.nShow = SW_SHOWDEFAULT;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	278
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	279 if (!is_admin()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	280 shExecInfo.lpVerb = L"open";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	281 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	282 shExecInfo.lpVerb = L"runas";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	283 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	284
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	285 qDebug() << "Starting process: " << filePath
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	286 << " with arguments: " << parameters;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	287
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	288 if (!ShellExecuteExW(&shExecInfo)) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	289 /* 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	290 char* errmsg = getLastErrorMsg();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	291 QString qerrmsg = QString::fromUtf8(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	292 free(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	293 qDebug() << "Failed to start process: " << qerrmsg;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	294 setState(NewSoftwareAvailable);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	295 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	296 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	297 #else /* WIN32 */
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	298 QStringList parameters;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	299 parameters << "/S" << "/UPDATE=1"
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	300 << QString::fromLatin1("/D=%1").arg(installDir.path());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	301
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	302 qDebug() << "Starting process " << filePath << " args: " << parameters;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	303
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	304 if (!QProcess::startDetached(filePath, parameters)) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	305 qDebug() << "Failed to start process.";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	306 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	307 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	308 #endif
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	309 /* Installer process should now be running. We exit */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	310
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	311 closeApp();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	312 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	313
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	314 void MainWindow::checkUpdates(bool downloadSW)
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	315 {
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	316 verifyListData();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	317
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	318 if (!mSettings.contains("Software/installedDate") \|\|
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	319 mSettings.value("Software/installedVersion").toString() != QApplication::applicationVersion()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	320 /* 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	321 * been installed */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	322 getLastModForCurrentVersion();
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	323 return;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	324 }
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	325 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	326 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	327
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	328 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	329 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	330
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	331 #ifndef RELEASE_BUILD
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	332 /* 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	333 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	334 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	335 #endif
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	336
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	337
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	338 Downloader* downloader = new Downloader(this,
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	339 QString::fromLatin1(SERVER_URL),
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	340 QByteArray(),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	341 swInstalledLastMod,
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	342 listInstalledLastMod,
437 4b486a14252f Acutally use the values that can be taken from the config Andre Heinecke <aheinecke@intevation.de> parents: 434 diff changeset	343 swResource,
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	344 listResource,
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	345 downloadSW);
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	346
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	347 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	348 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	349 if (!downloadSW) {
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	350 setState(BeforeDownload);
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	351 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	352 this, SLOT(handleNewSW(const QString&, const QDateTime&)));
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	353 } else {
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	354 setState(DownloadingSW);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	355 connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	356 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	357 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	358
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	359 connect(downloader, SIGNAL(finished()), downloader, SLOT(deleteLater()));
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	360 connect(downloader, SIGNAL(finished()), this, SLOT(updateCheckSuccess()));
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	361 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	362 this, SLOT(downloaderError(const QString &, SSLConnection::ErrorCode)));
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	363 downloader->start();
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	364 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	365
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	366 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	367 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	368 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	369 QApplication::applicationVersion());
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	370 qDebug() << softwareVersion;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	371 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	372 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	373 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	374 QByteArray(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	375 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	376 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	377 softwareVersion,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	378 listResource,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	379 false);
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	380 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	381 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	382 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	383 connect(downloader, SIGNAL(lastModifiedDate(const QDateTime&)),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	384 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	385
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	386 downloader->start();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	387 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	388
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	389 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	390 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	391 mSettings.beginGroup("Software");
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	392 mSettings.setValue("installedDate", date);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	393 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	394 mSettings.endGroup();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	395 checkUpdates();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	396 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	397
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	398 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	399 {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	400 /* TODO logging and handle error according to a plan */
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	401 syslog_error_printf ("Failed to check for updates: %s", message.toUtf8().constData());
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	402 mCurMessage = message;
27 62cd56cea09b Start on polarssl Downloader. Andre Heinecke <andre.heinecke@intevation.de> parents: 19 diff changeset	403 showMessage();
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	404 setState(TransferError);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	405 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	406
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	407 void MainWindow::createActions()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	408 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	409 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	410 connect(mCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdates()));
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	411 mQuitAction = new QAction(tr("Quit"), this);
cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	412 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	413 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	414
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	415 void MainWindow::createTrayIcon()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	416 {
11 7e2f14c7aba2 Split up downloader component and further implement it Andre Heinecke <aheinecke@intevation.de> parents: 10 diff changeset	417 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	418
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	419 mTrayMenu = new QMenu(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	420 mTrayMenu->addAction(mCheckUpdates);
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	421 mTrayMenu->addAction(mQuitAction);
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	422
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	423 mTrayIcon = new QSystemTrayIcon(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	424 mTrayIcon->setContextMenu(mTrayMenu);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	425
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	426 mTrayIcon->setIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	427 setWindowIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	428 mTrayIcon->show();
407 af53c40e74b1 Rename m13ui to TrustBridge Andre Heinecke <aheinecke@intevation.de> parents: 404 diff changeset	429 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	430
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	431 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	432 }
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	433
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	434 void MainWindow::createContent()
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	435 {
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	436 // Create a central widget containing the main layout.
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	437 QWidget *base = new QWidget;
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	438
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	439 // Layouts and Container
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	440 QVBoxLayout *mainLayout = 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;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	443 QHBoxLayout *centerLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	444 QVBoxLayout *buttonBarLayout = new QVBoxLayout;
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	445 QHBoxLayout *bottomLayout = new QHBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	446 QHBoxLayout *containerLayout = new QHBoxLayout;
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	447
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	448 // The header (icon, about text)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	449 QImage *logoImage = new QImage(":/img/logo.png");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	450 QLabel *logo = new QLabel;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	451 logo->setBackgroundRole(QPalette::Base);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	452 logo->setPixmap(QPixmap::fromImage(*logoImage));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	453 QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
689 6df31cb47d54 Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 687 diff changeset	454 QLabel *subTitle = new QLabel(tr("Trust in your digital communication"));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	455 headerTextLayout->addWidget(title);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	456 headerTextLayout->addWidget(subTitle);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	457 headerLayout->addWidget(logo);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	458 headerLayout->addLayout(headerTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	459 headerLayout->setStretch(0, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	460 headerLayout->setStretch(1, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	461
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	462 /***********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	463 * The Buttonbar on the left side.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	464 ***********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	465 mButtonGroup = new QButtonGroup;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	466
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	467 QToolButton *updatesButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	468 updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	469 updatesButton->setIcon(QIcon(":/img/view-refresh.png"));
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	470 updatesButton->setIconSize(QSize(40, 40));
713 cdf8a924e480 (UI) Increase apply/quit button height. Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 709 diff changeset	471 updatesButton->setText(tr("Updates"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	472 updatesButton->setFixedWidth(120);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	473 updatesButton->setFixedHeight(80);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	474 updatesButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	475 updatesButton->setChecked(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	476
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	477 QToolButton *allInstallButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	478 allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	479 allInstallButton->setIcon(QIcon(":/img/document-encrypt.png"));
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	480 allInstallButton->setIconSize(QSize(40, 40));
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	481 allInstallButton->setText(tr("Trusted\ncertificates"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	482 allInstallButton->setFixedWidth(120);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	483 allInstallButton->setFixedHeight(80);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	484 allInstallButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	485
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	486 QToolButton *allRemoveButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	487 allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	488 allRemoveButton->setIcon(QIcon(":/img/dialog-warning.png"));
e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	489 allRemoveButton->setIconSize(QSize(40, 40));
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	490 allRemoveButton->setText(tr("Revoked\ncertificates"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	491 allRemoveButton->setFixedWidth(120);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	492 allRemoveButton->setFixedHeight(80);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	493 allRemoveButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	494
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	495 QToolButton *infoButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	496 infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	497 infoButton->setIcon(QIcon(":/img/dialog-information.png"));
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	498 infoButton->setIconSize(QSize(40, 40));
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	499 infoButton->setText(tr("Information\nand help"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	500 infoButton->setFixedWidth(120);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	501 infoButton->setFixedHeight(80);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	502 infoButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	503
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	504 mButtonGroup->addButton(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	505 mButtonGroup->addButton(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	506 mButtonGroup->addButton(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	507 mButtonGroup->addButton(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	508 mButtonGroup->setId(updatesButton, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	509 mButtonGroup->setId(allInstallButton, 1);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	510 mButtonGroup->setId(allRemoveButton, 2);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	511 mButtonGroup->setId(infoButton, 3);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	512
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	513 connect(mButtonGroup, SIGNAL(buttonClicked(int)),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	514 this, SLOT(togglePages(int)));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	515 buttonBarLayout->addWidget(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	516 buttonBarLayout->addWidget(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	517 buttonBarLayout->addWidget(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	518 buttonBarLayout->insertStretch(3, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	519 buttonBarLayout->addWidget(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	520
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	521 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	522 * The main pages.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	523 ********************************/
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	524
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	525 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	526 * The updates page.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	527 ********************************/
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	528 QVBoxLayout *updatesMainLayout = new QVBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	529 mUpdatesPanel = new QScrollArea;
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	530 QScrollArea *updatesContent = new QScrollArea;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	531 mUpdatesWidget = new QWidget;
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	532
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	533 /* The header */
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	534 QGridLayout *updatesHeaderLayout = new QGridLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	535
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	536 /* Header 1: Update date and search button */
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	537 mUpdatesHeader =
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	538 new QLabel("<h2>" + tr("Certificates unchanged")+ "</h2>");
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	539 mLastCertUpdate =
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	540 new QLabel("");
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	541 mLastCertUpdate->hide();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	542 mSoftwareVersionLabel =
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	543 new QLabel(tr("TrustBridge Version: %1").arg(QApplication::applicationVersion()));
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	544 const QDateTime lastCheck = mSettings.value("lastUpdateCheck").toDateTime();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	545 if (lastCheck.isValid()) {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	546 const QString lastUpdateCheck = QLocale::system().toString(lastCheck);
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	547 mLastUpdateCheck =
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	548 new QLabel(tr("Last sucessful update check: %1").arg(lastUpdateCheck));
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	549 } else {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	550 mLastUpdateCheck = new QLabel("");
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	551 mLastUpdateCheck->hide();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	552 }
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	553 QPushButton *searchUpdates = new QPushButton(" " + tr("Check for updates"));
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	554 searchUpdates->setIcon(QIcon(":/img/edit-find.png"));
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	555 connect(searchUpdates, SIGNAL(clicked()), this, SLOT(checkUpdates()));
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	556
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	557 // addWidget(*Widget, row, column, rowspan, colspan, [Qt::Alignment])
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	558 updatesHeaderLayout->addWidget(mUpdatesHeader, 0, 0, 1, 2);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	559 updatesHeaderLayout->addWidget(mLastCertUpdate, 1, 0, 1, 1);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	560 updatesHeaderLayout->addWidget(mSoftwareVersionLabel, 2, 0, 1, 1);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	561 updatesHeaderLayout->addWidget(mLastUpdateCheck, 3, 0, 1, 1);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	562 updatesHeaderLayout->addWidget(searchUpdates, 1, 2, 2, 1, Qt::AlignRight);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	563 updatesHeaderLayout->setRowMinimumHeight(4, 15);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	564
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	565 /* Header 2: Action text and buttons */
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	566 QLabel *updatesTip =
713 cdf8a924e480 (UI) Increase apply/quit button height. Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 709 diff changeset	567 new QLabel(tr("You should apply the following, recommended changes to your certificate stores."));
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	568 updatesTip->setWordWrap(true);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	569 QHBoxLayout *updatesHeaderActionButtonLayout = new QHBoxLayout;
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	570 mQuitButton = new QPushButton(" " + tr("Quit without saving"));
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	571 mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
713 cdf8a924e480 (UI) Increase apply/quit button height. Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 709 diff changeset	572 mQuitButton->setFixedHeight(30);
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	573 QPushButton *installButton = new QPushButton(" " + tr("Apply changes"));
713 cdf8a924e480 (UI) Increase apply/quit button height. Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 709 diff changeset	574 installButton->setFixedHeight(30);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	575 #ifdef Q_OS_WIN
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	576 if (is_admin()) {
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	577 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	578 installButton->setIcon(uacShield);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	579 }
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	580 #else
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	581 installButton->setIcon(QIcon(":/img/view-refresh.png"));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	582 #endif
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	583 connect(mQuitButton, SIGNAL(clicked()), this, SLOT(closeApp()));
654 129e611eaf50 Merge branch trustbridge-refactor Andre Heinecke <andre.heinecke@intevation.de> parents: 609 653 diff changeset	584 connect(installButton, SIGNAL(clicked()), this, SLOT(checkAndInstallCerts()));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	585
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	586 // addWidget(*Widget, row, column, rowspan, colspan)
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	587 updatesHeaderLayout->addWidget(updatesTip, 5, 0, 1, 2);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	588 updatesHeaderActionButtonLayout->addWidget(installButton);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	589 updatesHeaderActionButtonLayout->addWidget(mQuitButton);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	590 updatesHeaderLayout->addLayout(updatesHeaderActionButtonLayout, 6, 0, 1, 1);
8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	591 updatesHeaderLayout->setRowMinimumHeight(7, 10);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	592
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	593 /* The central panels. */
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	594 QVBoxLayout *updatesCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	595 QHBoxLayout *updatesNewLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	596 QHBoxLayout *updatesRemoveLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	597 QHBoxLayout *updatesManualLayout = new QHBoxLayout;
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	598 mUpdatesNewCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	599 new QLabel("<h3>" +
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	600 tr("Install new trusted certificates (%1/%2)").arg(0).arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	601 "</h3>");
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	602 mUpdatesDetailsNew = new QPushButton(tr("Show details"));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	603 connect(mUpdatesDetailsNew,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	604 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	605 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	606 SLOT(toggleUpdatesNew()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	607 updatesNewLayout->addWidget(mUpdatesNewCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	608 updatesNewLayout->addWidget(mUpdatesDetailsNew);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	609 updatesNewLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	610 mUpdatesNew = new CertificateListWidget(this);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	611 connect(mUpdatesNew, SIGNAL(certListChanged(int)),
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	612 this, SLOT(listChanged(int)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	613 mUpdatesNew->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	614
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	615 mUpdatesRemoveCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	616 new QLabel("<h3>" +
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	617 tr("Remove revoked certificates (%1/%2)").arg(0).arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	618 "</h3>");
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	619 mUpdatesDetailsRemove = new QPushButton(tr("Show details"));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	620 connect(mUpdatesDetailsRemove,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	621 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	622 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	623 SLOT(toggleUpdatesRemove()));
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	624 updatesRemoveLayout->addWidget(mUpdatesRemoveCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	625 updatesRemoveLayout->addWidget(mUpdatesDetailsRemove);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	626 updatesRemoveLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	627 mUpdatesRemove = new CertificateListWidget(this);
642 dd738ef17715 Update the 'remove untrusted' header on list selection change. Raimund Renkert <rrenkert@intevation.de> parents: 641 diff changeset	628 connect(mUpdatesRemove, SIGNAL(certListChanged(int)),
dd738ef17715 Update the 'remove untrusted' header on list selection change. Raimund Renkert <rrenkert@intevation.de> parents: 641 diff changeset	629 this, SLOT(listChanged(int)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	630 mUpdatesRemove->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	631
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	632 mUpdatesManualCertificates =
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	633 new QLabel("<h3>" +
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	634 tr("Manually changed certificates (%1)").arg(0) +
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	635 "</h3>");
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	636 mUpdatesDetailsManual = new QPushButton(tr("Show details"));
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	637 connect(mUpdatesDetailsManual,
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	638 SIGNAL(clicked()),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	639 this,
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	640 SLOT(toggleUpdatesManual()));
703 2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	641 mUpdatesDetailsManual->hide();
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	642 mUpdatesManualCertificates->hide();
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	643 updatesManualLayout->addWidget(mUpdatesManualCertificates);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	644 updatesManualLayout->addWidget(mUpdatesDetailsManual);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	645 updatesManualLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	646 mUpdatesManual = new CertificateListWidget(this);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	647 mUpdatesManual->hide();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	648 connect(mUpdatesManual, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	649 this, SLOT(removeFromManual(bool, const Certificate&)));
692 3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	650 connect(mUpdatesManual, SIGNAL(certListChanged(int)),
3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	651 this, SLOT(listChanged(int)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	652
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	653 updatesNewLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	654 updatesRemoveLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	655 updatesManualLayout->setAlignment(Qt::AlignTop);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	656 updatesCenterLayout->addLayout(updatesNewLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	657 updatesCenterLayout->addWidget(mUpdatesNew);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	658 updatesCenterLayout->addLayout(updatesRemoveLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	659 updatesCenterLayout->addWidget(mUpdatesRemove);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	660 updatesCenterLayout->addLayout(updatesManualLayout);
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	661 updatesCenterLayout->addWidget(mUpdatesManual);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	662 updatesCenterLayout->addStretch(1);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	663
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	664 updatesCenterLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	665 mUpdatesWidget->setLayout(updatesCenterLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	666 updatesContent->setWidget(mUpdatesWidget);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	667
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	668 updatesMainLayout->addLayout(updatesHeaderLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	669 updatesMainLayout->addWidget(updatesContent);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	670 mUpdatesPanel->setLayout(updatesMainLayout);
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	671
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	672 /*********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	673 * Panel for trusted certificates.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	674 *********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	675 mInstallPanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	676
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	677 QVBoxLayout *installPanelLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	678 QVBoxLayout *installHeaderLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	679 QVBoxLayout *installCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	680
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	681 QLabel *installHeaderLabel =
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	682 new QLabel("<h2>" + tr("Trusted certificates") + "</h2>");
c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	683 QLabel *installHeaderText = new QLabel(tr("The following list of trusted root"
c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	684 " certificates is managed by the BSI. The BSI validates independently the"
c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	685 " authenticity, security and actuality of these certificates."));
694 25a73bfec359 (Issue 21) Activate wordWrap for long labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 693 diff changeset	686 installHeaderText->setWordWrap(true);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	687 installHeaderLayout->addWidget(installHeaderLabel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	688 installHeaderLayout->addWidget(installHeaderText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	689
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	690 QLabel *installCenterText = new QLabel(tr("Please choose the certificates"
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	691 " you want to trust or untrust. TrustBridge will install these certificates for your"
c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	692 " secure communication for email and internet."));
694 25a73bfec359 (Issue 21) Activate wordWrap for long labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 693 diff changeset	693 installCenterText->setWordWrap(true);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	694 installCenterLayout->addWidget(installCenterText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	695 mInstallList = new CertificateListWidget(this);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	696 connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	697 this, SLOT(toggleInManual(bool, const Certificate&)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	698
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	699 installPanelLayout->addLayout(installHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	700 installPanelLayout->addLayout(installCenterLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	701 installPanelLayout->addWidget(mInstallList);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	702 mInstallPanel->setLayout(installPanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	703
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	704 /**********************************
656 0ca15d937490 Avoid the word insecure. Andre Heinecke <andre.heinecke@intevation.de> parents: 654 diff changeset	705 * Panel for certificates to be removed.
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	706 **********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	707 mRemovePanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	708 QVBoxLayout *removePanelLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	709 QVBoxLayout *removeHeaderLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	710 QVBoxLayout *removeCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	711
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	712 QLabel *removeHeaderLabel =
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	713 new QLabel("<h2>" + tr("Revoked certificates") + "</h2>");
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	714 QLabel *removeHeaderText = new QLabel(tr("Certificates can be corrupted"
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	715 " or stolen and misused in many ways. Therefore the BSI recommends"
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	716 " to remove all revoked certificates from your system."));
694 25a73bfec359 (Issue 21) Activate wordWrap for long labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 693 diff changeset	717 removeHeaderText->setWordWrap(true);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	718 removeHeaderLayout->addWidget(removeHeaderLabel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	719 removeHeaderLayout->addWidget(removeHeaderText);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	720
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	721 QLabel *removeCenterText = new QLabel(tr("The follwing unsecure certificates were"
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	722 " revoked by the BSI. Already uninstalled certificates cannot be reinstalled."
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	723 " It is recommended that you select all certificates to uninstall if you still"
320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	724 " have revoked certificates installed."));
694 25a73bfec359 (Issue 21) Activate wordWrap for long labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 693 diff changeset	725 removeCenterText->setWordWrap(true);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	726 removeCenterLayout->addWidget(removeCenterText);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	727 mRemoveList = new CertificateListWidget(this);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	728 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	729 this, SLOT(toggleInManual(bool, const Certificate&)));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	730
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	731 removePanelLayout->addLayout(removeHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	732 removePanelLayout->addLayout(removeCenterLayout);
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	733 removePanelLayout->addWidget(mRemoveList);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	734 mRemovePanel->setLayout(removePanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	735
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	736 /**********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	737 * The info panel.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	738 **********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	739 mInfoPanel = new QScrollArea;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	740
643 f8be956c819b Fixed mainwindow layout warning. Raimund Renkert <rrenkert@intevation.de> parents: 642 diff changeset	741 QVBoxLayout *infoPanelLayout = new QVBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	742 QHBoxLayout *infoHeaderLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	743 QVBoxLayout *infoHeaderTextLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	744 QVBoxLayout *infoCenterLayout = new QVBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	745
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	746 QImage *infoLogoImage = new QImage(":/img/logo.png");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	747 QLabel *infoLogo = new QLabel;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	748 infoLogo->setBackgroundRole(QPalette::Base);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	749 infoLogo->setPixmap(QPixmap::fromImage(*infoLogoImage));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	750 QLabel *infoTitle = new QLabel("<h1>" + tr("TrustBridge") + "</h1>");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	751 QString infoVersion = tr("Version: ");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	752 infoVersion.append(QApplication::applicationVersion());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	753 QLabel *appVersion = new QLabel(infoVersion);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	754 appVersion->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	755 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	756 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	757
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	758 QFrame *infoHeaderSeparator = new QFrame();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	759 infoHeaderSeparator->setFrameShape(QFrame::HLine);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	760 infoHeaderSeparator->setFrameShadow(QFrame::Sunken);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	761
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	762 infoHeaderTextLayout->addWidget(infoTitle);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	763 infoHeaderTextLayout->addWidget(appVersion);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	764 infoHeaderLayout->addWidget(infoLogo);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	765 infoHeaderLayout->addLayout(infoHeaderTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	766 infoHeaderLayout->insertStretch(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	767
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	768 QLabel *textDesc = new QLabel(tr("TrustBridge is a root certificate"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	769 " installer for Windows and Linux."));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	770 textDesc->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	771 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	772 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	773 QLabel *textManage = new QLabel(tr("The root certificate lists are managed"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	774 " by the German <a href=\"https://www.bsi.bund.de\">"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	775 "Federal Office for Information Security (BSI)</a>.\n\n"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	776 textManage->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	777 Qt::TextBrowserInteraction \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	778 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	779 QLabel *textDevel = new QLabel(tr("The software was developed by the companies"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	780 " <a href=\"http://www.intevation.de\">Intevation GmbH</a> and "
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	781 " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	782 " contracted by the German Federal Office for Information Security (BSI).\n\n"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	783 textDevel->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	784 Qt::TextBrowserInteraction \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	785 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	786 QLabel *textLicense = new QLabel(tr("TrustBridge is Free Software licensed"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	787 " under GNU GPL v2+.\n\nCopyright (C) 2014 by Bundesamt für Sicherheit"
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	788 " in der Informationstechnik"));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	789 textLicense->setTextInteractionFlags(
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	790 Qt::TextSelectableByMouse \|
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	791 Qt::TextSelectableByKeyboard);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	792
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	793 infoCenterLayout->addWidget(infoHeaderSeparator);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	794 infoCenterLayout->addWidget(textDesc);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	795 infoCenterLayout->addWidget(textManage);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	796 infoCenterLayout->addWidget(textDevel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	797 infoCenterLayout->addWidget(textLicense);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	798 infoCenterLayout->insertSpacing(2, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	799 infoCenterLayout->insertSpacing(4, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	800 infoCenterLayout->insertSpacing(6, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	801 infoCenterLayout->insertStretch(8, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	802
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	803 infoPanelLayout->addLayout(infoHeaderLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	804 infoPanelLayout->addLayout(infoCenterLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	805 mInfoPanel->setLayout(infoPanelLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	806
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	807 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	808 * The main layout for pages.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	809 ********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	810 mInstallPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	811 mRemovePanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	812 mInfoPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	813 containerLayout->addWidget(mUpdatesPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	814 containerLayout->addWidget(mInstallPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	815 containerLayout->addWidget(mRemovePanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	816 containerLayout->addWidget(mInfoPanel);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	817
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	818 centerLayout->addLayout(buttonBarLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	819 centerLayout->addLayout(containerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	820
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	821 mainLayout->addLayout(headerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	822 mainLayout->addLayout(centerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	823 mainLayout->addLayout(bottomLayout);
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	824 base->setLayout(mainLayout);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	825 setCentralWidget(base);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	826 }
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	827
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	828 void MainWindow::listChanged(int selected)
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	829 {
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	830 int totalCount = mUpdatesRemove->selectedCertCount() +
55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	831 mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size();
55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	832
703 2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	833 if (mUpdatesManual->certificates().size()) {
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	834 mUpdatesDetailsManual->show();
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	835 mUpdatesManualCertificates->show();
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	836 } else {
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	837 mUpdatesDetailsManual->hide();
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	838 mUpdatesManualCertificates->hide();
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	839 }
2c63bb63de76 (Issue26) Only show manually changed certificates if there are manually changed certificates Andre Heinecke <andre.heinecke@intevation.de> parents: 702 diff changeset	840
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	841 if (!totalCount) {
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	842 /* No changes */
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	843 mQuitButton->setText(" " + tr("Quit"));
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	844 mUpdatesHeader->setText("<h2>" + tr("Certificates unchanged") +
55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	845 "</h2>");
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	846 } else {
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	847 mQuitButton->setText(" " + tr("Quit without saving"));
713 cdf8a924e480 (UI) Increase apply/quit button height. Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 709 diff changeset	848 mUpdatesHeader->setText("<h2>" + tr("Changes to certificate stores (%1)")
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	849 .arg(totalCount) +
55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	850 "</h2>");
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	851 }
0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	852
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	853 mUpdatesNewCertificates->setText("<h3>" +
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	854 tr("Install new trusted certificates (%1/%2)")
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	855 .arg(mUpdatesNew->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	856 .arg(mUpdatesNew->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	857 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	858 mUpdatesRemoveCertificates->setText("<h3>" +
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	859 tr("Remove revoked certificates (%1/%2)")
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	860 .arg(mUpdatesRemove->selectedCertCount())
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	861 .arg(mUpdatesRemove->certificates().size()) +
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	862 "</h3>");
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	863 }
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	864
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	865 void MainWindow::loadCertificateList()
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	866 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	867 /* 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	868 * indication */
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	869 mInstallList->clear();
684 69def231f5ac (issue28) clear manual updates after installation. Andre Heinecke <andre.heinecke@intevation.de> parents: 673 diff changeset	870 mRemoveList->clear();
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	871 mUpdatesNew->clear();
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	872 mUpdatesRemove->clear();
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	873 QList<Certificate> newInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	874 QList<Certificate> newRemoveCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	875 QList<Certificate> oldInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	876 QList<Certificate> oldRemoveCerts;
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	877
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	878 if (mListToInstall.getCertificates().isEmpty()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	879 // 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	880 foreach (const Certificate &cert, mInstalledList.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	881 bool state = !mPreviouslyUnselected.contains(cert.base64Line());
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	882 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	883 oldInstallCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	884 mInstallList->addCertificate(cert, state);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	885 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	886 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	887 oldRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	888 mRemoveList->addCertificate(cert, state, !state);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	889 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	890 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	891 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	892 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	893 // 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	894 foreach (const Certificate &cert, mListToInstall.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	895 bool state = !mPreviouslyUnselected.contains(cert.base64Line());
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	896 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	897 // Certificate with status "install".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	898 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	899 // 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	900 oldInstallCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	901 mInstallList->addCertificate(cert, state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	902 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	903 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	904 // 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	905 newInstallCerts.append(cert);
687 973a7ce19658 (issue24) Let the string for install / remove be set for each item individually Andre Heinecke <andre.heinecke@intevation.de> parents: 684 diff changeset	906 mUpdatesNew->addCertificate(cert, state, true,
973a7ce19658 (issue24) Let the string for install / remove be set for each item individually Andre Heinecke <andre.heinecke@intevation.de> parents: 684 diff changeset	907 tr("install"), tr("ignore"));
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	908 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	909 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	910 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	911 // Certificate with status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	912 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	913 // 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	914 oldRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	915 // Is removed, so set editable to false.
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	916 mRemoveList->addCertificate(cert, state, !state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	917 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	918 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	919 // 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	920 // status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	921 newRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	922 mUpdatesRemove->addCertificate(cert, state);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	923 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	924 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	925 }
691 315103410002 (Issue 32) Move updates header text generation out of update avialable block Andre Heinecke <andre.heinecke@intevation.de> parents: 690 diff changeset	926 }
692 3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	927
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	928 if (mInstalledList.date().isValid()) {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	929 mLastCertUpdate->setText(tr("Installed certificates from: %1")
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	930 .arg(QLocale::system().toString(mInstalledList.date())));
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	931 mLastCertUpdate->show();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	932 }
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	933 mUpdatesManualCertificates->setText("<h3>" +
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	934 tr("Manually changed certificates (%1)").arg(0) +
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	935 "</h3>");
692 3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	936 listChanged(0);
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	937 }
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	938
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	939 void MainWindow::installerError(const QString& errMsg) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	940 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	941 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	942
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	943 void MainWindow::installerSuccess() {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	944 if (mCurState == NewListAvailable) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	945 mCurState = NothingChanged;
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	946 mCurMessage = QString();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	947
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	948 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	949 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	950
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	951 mSettings.remove("List/available");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	952 mSettings.remove("List/availableDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	953
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	954 if (listFileName.isEmpty() \|\| !listFileDate.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	955 qWarning() << "Error accessing settings";
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	956 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	957 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	958
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	959 mSettings.setValue("List/installed", listFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	960 mSettings.setValue("List/installedDate", listFileDate);
480 242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	961 mInstalledList = mListToInstall;
242f2bf5417e Update the certificate list after installing certificates. Raimund Renkert <rrenkert@intevation.de> parents: 479 diff changeset	962 mListToInstall = CertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	963 }
684 69def231f5ac (issue28) clear manual updates after installation. Andre Heinecke <andre.heinecke@intevation.de> parents: 673 diff changeset	964 mUpdatesManual->clear();
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	965 loadCertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	966 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	967
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	968 void MainWindow::installCerts() {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	969 QStringList choices;
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	970 QStringList unselected;
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	971
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	972 choices << mUpdatesNew->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	973 choices << mUpdatesRemove->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	974
669 7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	975 choices << mUpdatesManual->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	976
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	977 /* Also include the old certificates */
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	978 choices << mInstallList->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	979 choices << mRemoveList->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	980
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	981 QStringList unselectedManuals = mUpdatesManual->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	982 for(int i = 0; i < unselectedManuals.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	983 if (unselectedManuals.at(i).startsWith("I:")) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	984 QString certLine = unselectedManuals.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	985 certLine[0] = 'R';
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	986 choices << certLine;
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	987 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	988 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	989
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	990 unselected << mUpdatesNew->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	991 unselected << mUpdatesRemove->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	992 unselected << mInstallList->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	993 unselected << mRemoveList->unselectedCertificates();
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	994
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	995 QProgressDialog *progress = new QProgressDialog(this);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	996 progress->setWindowModality(Qt::WindowModal);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	997 progress->setLabelText(tr("Installing certificates..."));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	998 progress->setCancelButton(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	999 progress->setRange(0,0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1000 progress->setMinimumDuration(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1001 progress->show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1002
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1003 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	1004 mListToInstall.isValid() ?
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	1005 mListToInstall.fileName() :
ae2ef965a41b Provide installer with old list in case there are no news Andre Heinecke <andre.heinecke@intevation.de> parents: 389 diff changeset	1006 mInstalledList.fileName(),
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1007 choices);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1008 /* Clean up object and progress dialog */
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1009 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	1010 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	1011 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	1012 connect(instWrap, SIGNAL(installationSuccessful()),
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1013 this, SLOT(installerSuccess()));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1014 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	1015 this, SLOT(installerError(const QString &)));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1016 instWrap->start();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1017
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1018 if (!saveUnselectedCertificates(unselected)) {
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1019 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	1020 }
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1021
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1022 }
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1023
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1024 void MainWindow::loadUnselectedCertificates()
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1025 {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1026 mPreviouslyUnselected.clear();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1027 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1028 QStringList keys = mSettings.allKeys();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1029 foreach (const QString &key, keys) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1030 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	1031 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1032 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1033 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1034
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1035 bool MainWindow::saveUnselectedCertificates(QStringList unselected)
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1036 {
479 a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	1037 mPreviouslyUnselected.clear();
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1038 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1039 mSettings.remove(""); /* Clears old choices */
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1040 for (int i = 0; i < unselected.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1041 QString key = QString::fromLatin1("cert%1").arg(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1042 QString value = unselected.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1043 mSettings.setValue(key, value);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1044 mPreviouslyUnselected << value;
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1045 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1046 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1047 mSettings.sync();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1048 return mSettings.status() == QSettings::NoError;
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1049 }
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1050
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1051 void MainWindow::toggleInManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1052 {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1053 if (!mUpdatesManual->contains(cert)) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1054 mUpdatesManual->addCertificate(cert, state);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1055 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1056 else {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1057 mUpdatesManual->removeCertificate(cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1058 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1059
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1060 mUpdatesManualCertificates->setText("<h3>" +
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	1061 tr("Manually changed certificates (%1)")
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1062 .arg(mUpdatesManual->certificates().size()) +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1063 "</h3>");
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1064 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1065
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1066 void MainWindow::removeFromManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1067 {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1068 mUpdatesManual->removeCertificate(cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1069
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1070 mUpdatesManualCertificates->setText("<h3>" +
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	1071 tr("Manually changed certificates (%1)")
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1072 .arg(mUpdatesManual->certificates().size()) +
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1073 "</h3>");
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1074
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1075 if (cert.isInstallCert()) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1076 mInstallList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1077 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1078 else {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1079 mRemoveList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1080 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1081 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1082
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1083 void MainWindow::closeApp()
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1084 {
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1085 qApp->quit();
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1086 }
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1087
609 292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1088 void MainWindow::checkAndInstallCerts()
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1089 {
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1090 /* Checking before opening the dialog should be cheaper */
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1091 QList<int> pids = ProcessHelp::getProcessesIdForName("firefox");
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1092 pids.append(ProcessHelp::getProcessesIdForName("thunderbird"));
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1093
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1094 if (pids.isEmpty()) {
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1095 installCerts();
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1096 return;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1097 }
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1098
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1099 QStringList pNames;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1100 pNames << "firefox" << "thunderbird";
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1101
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1102 ProcessWaitDialog *waitDialog = new ProcessWaitDialog(this, pNames);
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1103
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1104 connect(waitDialog, SIGNAL(accepted()), this, SLOT(installCerts()));
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1105 connect(waitDialog, SIGNAL(accepted()), waitDialog, SLOT(deleteLater()));
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1106
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1107 waitDialog->exec();
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1108 return;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1109 }
654 129e611eaf50 Merge branch trustbridge-refactor Andre Heinecke <andre.heinecke@intevation.de> parents: 609 653 diff changeset	1110
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1111 void MainWindow::togglePages(int button)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1112 {
657 37ffc8ddb698 Fix merge errors Andre Heinecke <andre.heinecke@intevation.de> parents: 656 diff changeset	1113 mUpdatesPanel->hide();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1114 mInstallPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1115 mRemovePanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1116 mInfoPanel->hide();
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1117 switch(button) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1118 case 0: mUpdatesPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1119 case 1: mInstallPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1120 case 2: mRemovePanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1121 case 3: mInfoPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1122 default: mUpdatesPanel->show(); break;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1123 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1124 return;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1125 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1126
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1127 void MainWindow::toggleUpdatesNew() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1128 if (!mUpdatesNew->isVisible()) {
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1129 mUpdatesDetailsNew->setText(tr("Hide details"));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1130 mUpdatesNew->show();
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1131 mUpdatesNew->setSelected(0);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1132 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1133 else {
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1134 mUpdatesNew->hide();
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1135 mUpdatesDetailsNew->setText(tr("Show details"));
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1136 QSize old = mUpdatesWidget->size();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1137 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesNew->height());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1138 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1139 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1140
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1141 void MainWindow::toggleUpdatesRemove() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1142 if (!mUpdatesRemove->isVisible()) {
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1143 mUpdatesDetailsRemove->setText(tr("Hide details"));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1144 mUpdatesRemove->show();
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1145 mUpdatesRemove->setSelected(0);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1146 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1147 else {
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1148 mUpdatesRemove->hide();
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1149 mUpdatesDetailsRemove->setText(tr("Show details"));
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1150 QSize old = mUpdatesWidget->size();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1151 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesRemove->height());
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1152 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1153 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1154
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1155 void MainWindow::toggleUpdatesManual() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1156 if (!mUpdatesManual->isVisible()) {
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1157 mUpdatesDetailsManual->setText(tr("Hide details"));
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1158 mUpdatesManual->show();
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1159 mUpdatesManual->setSelected(0);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1160 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1161 else {
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	1162 mUpdatesDetailsManual->setText(tr("Show details"));
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1163 mUpdatesManual->hide();
39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1164 QSize old = mUpdatesWidget->size();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1165 mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1166 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1167 }
690 e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1168
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1169 void MainWindow::closeEvent(QCloseEvent *event)
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1170 {
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1171 if (getState() == NewListAvailable) {
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1172 /* Only minimize to tray if there is a new list */
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1173 QMainWindow::closeEvent(event);
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1174 return;
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1175 }
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1176 return closeApp();
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1177 }
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1178
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1179 void MainWindow::updateCheckSuccess()
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1180 {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1181 if (getState() != TransferError) {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1182 const QDateTime now = QDateTime::currentDateTime();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1183 mSettings.setValue("lastUpdateCheck", now);
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1184 mLastUpdateCheck->setText(tr("Last sucessful update check: %1").arg(
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1185 QLocale::system().toString(now)));
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1186 mLastUpdateCheck->show();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1187 syslog_info_printf(tr("Sucessfully checked for updates.").toUtf8().constData());
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1188 }
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1189 }

Mercurial > trustbridge > trustbridge

annotate ui/mainwindow.cpp @ 713:cdf8a924e480