trustbridge: ui/mainwindow.cpp annotate

annotate ui/mainwindow.cpp @ 1109:6594e8e63a25

(issue115) Add tooltips and fix manual changes handling

author	Andre Heinecke <andre.heinecke@intevation.de>
date	Mon, 15 Sep 2014 19:02:17 +0200
parents	51d3b361f17a
children	b6cb4fd7ee20

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 <QAction>
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	15 #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	16 #include <QDir>
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	17 #include <QMenu>
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	18 #include <QApplication>
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	19 #include <QFile>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	20 #include <QTimer>
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	21 #include <QHBoxLayout>
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	22 #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	23 #include <QGridLayout>
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	24 #include <QGroupBox>
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	25 #include <QSplitter>
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	26 #include <QLabel>
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	27 #include <QImage>
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	28 #include <QCheckBox>
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	29 #include <QButtonGroup>
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	30 #include <QToolButton>
857 9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	31 #include <QStandardPaths>
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	32 #include <QDesktopServices>
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	33
609 292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	34 #include "certificatelist.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	35 #include "downloader.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	36 #include "helpdialog.h"
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	37 #include "aboutdialog.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"
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	45 #include "trayicon.h"
956 879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	46 #include "proxysettingsdlg.h"
609 292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	47
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	48 // 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	49 // something to say
548 c84dc8f6d017 Increase nag interval to 70 minutes Andre Heinecke <aheinecke@intevation.de> parents: 531 diff changeset	50 #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	51
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	52 #define DATETIME_FORMAT "d. MMM yyyy HH:mm"
714 57bd73145e48 (Issue25) Fix typos change order and add better date formating Andre Heinecke <andre.heinecke@intevation.de> parents: 713 diff changeset	53
409 09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	54 #ifndef APPNAME
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	55 #define APPNAME "TrustBridge"
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	56 #endif
09bb19e5e369 Remove m13 mentions and change test certificate to intevation.de Andre Heinecke <aheinecke@intevation.de> parents: 407 diff changeset	57
994 8fb1b912fd8e Add test using the default download server used by the software Andre Heinecke <andre.heinecke@intevation.de> parents: 987 diff changeset	58 #ifndef SERVER_URL
8fb1b912fd8e Add test using the default download server used by the software Andre Heinecke <andre.heinecke@intevation.de> parents: 987 diff changeset	59 #error "DOWNLOAD_SERVER option not set or invalid."
8fb1b912fd8e Add test using the default download server used by the software Andre Heinecke <andre.heinecke@intevation.de> parents: 987 diff changeset	60 #endif
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	61
885 1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	62 #if defined(_X86_) \|\| defined(__i386__)
1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	63 #define TB_ARCH_STRING "-i386"
1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	64 #else
1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	65 #define TB_ARCH_STRING "-amd64"
1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	66 #endif
1cc85fd3daa5 (issue70) Handle i386 and amd64 packages Andre Heinecke <andre.heinecke@intevation.de> parents: 871 diff changeset	67
1093 153af47456d0 Add option "USE_REAL_RESOURCES" to avoid the if 1 dance for test/release builds. Andre Heinecke <andre.heinecke@intevation.de> parents: 1091 diff changeset	68 #ifdef USE_REAL_RESOURCES
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	69 # define LIST_RESOURCE "/zertifikatsliste.txt"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	70 # ifdef Q_OS_WIN
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	71 # define SW_RESOURCE_VERSION "/TrustBridge-%1.exe"
508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	72 # define SW_RESOURCE "/TrustBridge.exe"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	73 # else
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	74 # define SW_RESOURCE_VERSION "/TrustBridge-%1" TB_ARCH_STRING ".sh"
508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	75 # define SW_RESOURCE "/TrustBridge" TB_ARCH_STRING ".sh"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	76 # endif
e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	77 #else // RELEASE_BUILD
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	78 # define LIST_RESOURCE "/zertifikatsliste.txt"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	79 # ifdef Q_OS_WIN
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	80 # define SW_RESOURCE_VERSION "/development/TrustBridge-development.exe"
508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	81 # define SW_RESOURCE "/development/TrustBridge.exe"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	82 # else
1088 508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	83 # define SW_RESOURCE_VERSION "/development/TrustBridge-development" TB_ARCH_STRING ".sh"
508c96e72f62 (issue124) Switch server URL and remove some RELEASE_BUILD options Andre Heinecke <andre.heinecke@intevation.de> parents: 1082 diff changeset	84 # define SW_RESOURCE "/development/TrustBridge" TB_ARCH_STRING ".sh"
607 e83589f1fd7f Use different URI's for development Andre Heinecke <andre.heinecke@intevation.de> parents: 594 diff changeset	85 # endif
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	86 #endif
7 992c0ec57660 Add unit tests make CertificateList work. Andre Heinecke <aheinecke@intevation.de> parents: 2 diff changeset	87
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	88 /* Help installation path the path relative to the installation directory where
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	89 * the help is placed.*/
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	90 #ifdef WIN32
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	91 #define HELP_PATH "/doc/index.html"
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	92 #else
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	93 #define HELP_PATH "/../share/doc/trustbridge/index.html"
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	94 #endif
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	95
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	96 #define NEW_INSTALL_TT "Certificate will be installed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	97 #define NOT_INSTALL_TT "Certificate will not be installed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	98 #define NEW_REMOVE_TT "Certificate will be removed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	99 #define NOT_REMOVE_TT "Certificate will not be removed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	100 #define IS_INSTALLED_TT "Certificate is installed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	101 #define IS_NOT_INSTALLED_TT "Certifcate is not installed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	102 #define IS_REMOVED_TT "Certificate has been removed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	103 #define IS_NOT_REMOVED_TT "Certificate has not been removed."
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	104
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	105 static void activateDetailsButton(QPushButton *);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	106 static void deactivateDetailsButton(QPushButton *);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	107
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	108 MainWindow::MainWindow(bool trayMode):
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	109 mTrayMode(trayMode),
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	110 mManualDetailsShown(false)
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	111 {
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	112 createActions();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	113 createTrayIcon();
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	114 setupGUI();
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	115 resize(900, 600);
709 8f110e6b8295 (UI) Changed update header to GridLayout and moved action buttons to bottom left. Emanuel Schuetze <emanuel@intevation.de> parents: 708 diff changeset	116 setMinimumWidth(760);
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	117 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	118 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	119
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	120 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	121 this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	122
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	123 mMessageTimer = new QTimer(this);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	124 connect(mMessageTimer, SIGNAL(timeout()), this, SLOT(showMessage()));
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	125 mMessageTimer->setInterval(NAG_INTERVAL_MINUTES * 60 * 1000);
9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	126 mMessageTimer->start();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	127 checkUpdates();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	128 loadUnselectedCertificates();
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	129 loadCertificateList();
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	130 if (!trayMode) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	131 show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	132 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	133 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	134
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	135 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	136 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	137 switch (reason) {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	138 case QSystemTrayIcon::Trigger:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	139 case QSystemTrayIcon::MiddleClick:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	140 showMessage();
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	141 break;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	142 case QSystemTrayIcon::DoubleClick:
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	143 show();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	144 break;
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	145 default:
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	146 ;
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	147 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	148 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	149
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	150 void MainWindow::messageClicked()
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	151 {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	152 if (mCurState == NewSoftwareAvailable) {
893 b61d5a289d8f Hide after selecting to install the update Andre Heinecke <andre.heinecke@intevation.de> parents: 885 diff changeset	153 hide();
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	154 verifySWData();
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	155 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	156 if (swFileName.isEmpty()) {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	157 checkUpdates(true);
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	158 mCurState = DownloadingSW;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	159 return;
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	160 }
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	161 installNewSW(swFileName,
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	162 mSettings.value("Software/availableDate").toDateTime());
965 013ca910589a Open main window in case of error message. Andre Heinecke <andre.heinecke@intevation.de> parents: 964 diff changeset	163 } else {
013ca910589a Open main window in case of error message. Andre Heinecke <andre.heinecke@intevation.de> parents: 964 diff changeset	164 show();
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	165 }
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	166 }
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	167
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	168 void MainWindow::showMessage()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	169 {
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	170 if (mCurMessage.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	171 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	172 }
961 423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	173
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	174 if (!mTrayIcon->isVisible() && !mTrayIcon->isAlternative()) {
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	175 mTrayIcon->show();
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	176 /* When the message is shown before the tray icon is fully visble
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	177 * and becoming visible may be delayed on some desktop environments
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	178 * the message will pop up somehere on the screen and not over
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	179 * the trayicon. So we delay here.*/
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	180 QTimer::singleShot(2000, this, SLOT(showMessage()));
423e31ac656e Delay the tray icon after the download Andre Heinecke <andre.heinecke@intevation.de> parents: 956 diff changeset	181 } else if (mCurState == NewSoftwareAvailable \|\| !isVisible()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	182 mTrayIcon->showMessage(QApplication::applicationName(), mCurMessage,
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	183 QSystemTrayIcon::Information, 10000);
19 9af6198deb8e Add timed trigger for the message Andre Heinecke <aheinecke@intevation.de> parents: 17 diff changeset	184 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	185 }
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	186 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	187
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	188 void MainWindow::verifyListData()
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	189 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	190 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	191 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	192 if (!availableFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	193 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	194 if (!mListToInstall.isValid()) {
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	195 mCurState = TransferError;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	196 // 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	197 // 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	198 // 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	199 QFile::remove(availableFileName);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	200 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	201 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	202 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	203 } else {
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	204 // 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	205 mSettings.remove("List/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	206 mSettings.remove("List/availableDate");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	207 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	208
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	209 if (!installedFileName.isEmpty()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	210 mInstalledList.readList(installedFileName.toLocal8Bit().constData());
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	211 if (!mInstalledList.isValid()) {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	212 // 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	213 // 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	214 // 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	215 QFile::remove(installedFileName);
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	216 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	217 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	218 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	219 } else {
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	220 mSettings.remove("List/installed");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	221 mSettings.remove("List/installedDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	222 }
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	223 }
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	224
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	225 void MainWindow::verifySWData()
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	226 {
02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	227 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	228
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	229 if (swFileName.isEmpty()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	230 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	231 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	232 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	233
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	234 QFileInfo fi(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	235 if (!fi.exists()) {
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	236 mSettings.remove("Software/available");
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	237 mSettings.remove("Software/availableDate");
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	238 qDebug() << "Software does not yet exist.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	239 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	240 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	241 if (!fi.isExecutable()) {
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	242 qWarning() << "Downloaded file: " << swFileName << " is not executable.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	243 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	244 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	245 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	246 return;
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	247 }
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	248 bin_verify_result verifyResult = verify_binary(swFileName.toUtf8().constData(),
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	249 swFileName.toUtf8().size());
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	250 qDebug() << "Binary verify result: " << verifyResult.result;
edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	251 if (verifyResult.result != VerifyValid) {
591 26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	252 qDebug() << "Failed to verify downloaded data.";
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	253 QFile::remove(swFileName);
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	254 mSettings.remove("Software/available");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	255 mSettings.remove("Software/availableDate");
26a18e3c3db4 Cleanups and coding style. Andre Heinecke <aheinecke@intevation.de> parents: 587 diff changeset	256 return;
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	257 }
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	258 fclose(verifyResult.fptr);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	259 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	260
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	261 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	262 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	263 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	264 mSettings.setValue("List/availableDate", modDate);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	265
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	266 verifyListData();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	267 if (!mListToInstall.isValid()) {
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	268 /* 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	269 /* 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	270 * 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	271
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	272 /* 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	273 QTimer::singleShot(600000 + (qrand() % 60000), this, SLOT(checkUpdates()));
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	274 } else {
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	275 if (mTrayIcon->isAlternative()) {
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	276 mCurMessage = tr("An updated certificate list is available.");
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	277 } else {
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	278 mCurMessage = tr("An updated certificate list is available.") +" " + tr("Click here to install.");
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	279 }
82 1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	280 setState(NewListAvailable);
1f27d6db5ee3 Polarssl based certificate handling Andre Heinecke <aheinecke@intevation.de> parents: 72 diff changeset	281 showMessage();
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	282 loadCertificateList();
71 f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	283 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	284 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	285
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	286 void MainWindow::handleNewSW(const QString& fileName, const QDateTime& modDate) {
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	287 if (mTrayIcon->isAlternative()) {
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	288 mCurMessage = tr("An update for %1 is available.").arg(
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	289 QApplication::applicationName());
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	290 } else {
904 f89b41fa7048 Fix whitespace errors Andre Heinecke <andre.heinecke@intevation.de> parents: 900 diff changeset	291 mCurMessage = QString(tr("An update for %1 is available.") + "\n" +
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	292 tr("Click here to download and install the update.")).arg(
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	293 QApplication::applicationName());
4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	294 }
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	295 setState(NewSoftwareAvailable);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	296 mSettings.setValue("Software/available", fileName);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	297 mSettings.setValue("Software/availableDate", modDate);
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	298
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	299 mSettings.sync();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	300 showMessage();
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	301 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	302
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	303 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	304 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	305 QString filePath = QDir::toNativeSeparators(instProcInfo.absoluteFilePath());
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	306 bin_verify_result vres = verify_binary(filePath.toUtf8().constData(),
edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	307 filePath.toUtf8().size());
592 778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	308
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	309 if (vres.result != VerifyValid) {
592 778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	310 qDebug() << "Invalid software. Not installing";
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	311 return;
592 778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	312 }
778f74d0706f Verify the binary directly without relying on settings (which might differ) Andre Heinecke <aheinecke@intevation.de> parents: 591 diff changeset	313 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	314 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	315
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	316 #ifdef WIN32
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	317 QString parameters = QString::fromLatin1("/S /UPDATE=1 /D=") +
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	318 installDir.path().replace("/", "\\") + "";
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	319
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	320 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	321 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	322 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	323
aee3eb10bbba Add unit test for sw update execution and fix shell execute params Andre Heinecke <aheinecke@intevation.de> parents: 555 diff changeset	324 shExecInfo.lpFile = reinterpret_cast<LPCWSTR> (filePath.utf16());
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	325 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	326
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	327 // shExecInfo.fMask = SEE_MASK_NOASYNC;
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	328 shExecInfo.nShow = SW_SHOWDEFAULT;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	329
1003 db7e7156c824 (issue66) Only depend on is_system_install on windows to decide privilege raise Andre Heinecke <andre.heinecke@intevation.de> parents: 997 diff changeset	330 if (!is_system_install()) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	331 shExecInfo.lpVerb = L"open";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	332 } else {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	333 shExecInfo.lpVerb = L"runas";
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	334 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	335
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	336 qDebug() << "Starting process: " << filePath
c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	337 << " with arguments: " << parameters;
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	338
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	339 if (!ShellExecuteExW(&shExecInfo)) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	340 /* 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	341 char* errmsg = getLastErrorMsg();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	342 QString qerrmsg = QString::fromUtf8(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	343 free(errmsg);
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	344 qDebug() << "Failed to start process: " << qerrmsg;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	345 setState(NewSoftwareAvailable);
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	346 fclose(vres.fptr);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	347 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	348 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	349 #else /* WIN32 */
894 2e7fff9d195a Update in the real prefix Andre Heinecke <andre.heinecke@intevation.de> parents: 893 diff changeset	350 /* On linux installDir is <prefix>/bin */
594 c944de9900de Add installation parameters with correct quoting Andre Heinecke <aheinecke@intevation.de> parents: 592 diff changeset	351 QStringList parameters;
894 2e7fff9d195a Update in the real prefix Andre Heinecke <andre.heinecke@intevation.de> parents: 893 diff changeset	352 installDir.cdUp();
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	353 parameters << "--prefix" << installDir.path();
1067 51b97ebc5b06 (issue54) Launch depending on visibility either as tray or full after installation Andre Heinecke <andre.heinecke@intevation.de> parents: 1061 diff changeset	354 parameters << "--update";
51b97ebc5b06 (issue54) Launch depending on visibility either as tray or full after installation Andre Heinecke <andre.heinecke@intevation.de> parents: 1061 diff changeset	355 if (isVisible()) {
51b97ebc5b06 (issue54) Launch depending on visibility either as tray or full after installation Andre Heinecke <andre.heinecke@intevation.de> parents: 1061 diff changeset	356 parameters << "--show-after-update";
51b97ebc5b06 (issue54) Launch depending on visibility either as tray or full after installation Andre Heinecke <andre.heinecke@intevation.de> parents: 1061 diff changeset	357 }
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	358 bool sudo_started = false;
841 216a65d7fc4b (issue66) Implement is_system_install and use it Andre Heinecke <andre.heinecke@intevation.de> parents: 838 diff changeset	359 bool use_sudo = is_admin() && is_system_install();
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	360 if (use_sudo) {
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	361 QStringList sudoPrograms;
987 b8ae69bcc540 Use pkexec instead of gksudo. Andre Heinecke <andre.heinecke@intevation.de> parents: 970 diff changeset	362 sudoPrograms << "pkexec" << "kdesudo" << "sudo";
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	363 QStringList sudoParams;
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	364 sudoParams << filePath + " " + parameters.join(" ");
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	365
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	366 foreach (const QString &sProg, sudoPrograms) {
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	367 qDebug() << "Starting process " << sProg <<" params: " << sudoParams;
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	368 if (!QProcess::startDetached(sProg, sudoParams)) {
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	369 continue;
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	370 } else {
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	371 sudo_started = true;
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	372 break;
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	373 }
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	374 }
ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	375 }
894 2e7fff9d195a Update in the real prefix Andre Heinecke <andre.heinecke@intevation.de> parents: 893 diff changeset	376 qDebug() << "Starting process " << filePath <<" params: " << parameters;
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	377 if (!sudo_started && !QProcess::startDetached(filePath, parameters)) {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	378 qDebug() << "Failed to start process.";
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	379 fclose(vres.fptr);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	380 return;
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	381 }
810 ee75e236843c Use sudo to install software in case of is_admin Andre Heinecke <andre.heinecke@intevation.de> parents: 807 diff changeset	382
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	383 #endif
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	384
edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	385 syslog_info_printf ("Installing update: %s\n", fileName.toUtf8().constData());
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	386 /* Installer process should now be running. We exit */
1081 edbf5e5e88f4 (issue118) Extend verify_binary to carry an open file Andre Heinecke <andre.heinecke@intevation.de> parents: 1067 diff changeset	387 fclose(vres.fptr);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	388 closeApp();
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	389 }
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	390
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	391 void MainWindow::checkUpdates(bool downloadSW)
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	392 {
587 02a89710a7cd Split up list and software verification and use it Andre Heinecke <aheinecke@intevation.de> parents: 563 diff changeset	393 verifyListData();
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	394
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	395 if (!mSettings.contains("Software/installedDate") \|\|
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	396 mSettings.value("Software/installedVersion").toString() != QApplication::applicationVersion()) {
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	397 /* 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	398 * been installed */
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	399 getLastModForCurrentVersion();
486 fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	400 return;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	401 }
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	402 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	403 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	404
1056 c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	405 QDateTime swAvailableLastMod = mSettings.value("Software/availableDate").toDateTime();
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	406
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	407 if (swAvailableLastMod.isValid()) {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	408 qDebug() << "Installed an update: " << swInstalledLastMod <<
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	409 " available " << swAvailableLastMod;
1082 a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	410 syslog_info_printf ("Software has been updated to version: %s\n",
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	411 QApplication::applicationVersion().toUtf8().constData());
1056 c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	412 if (swInstalledLastMod == swAvailableLastMod) {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	413 QString fileName = mSettings.value("Software/available").toString();
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	414 if (fileName.isEmpty()) {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	415 qDebug() << "Software marked as available but no filename set.";
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	416 } else {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	417 if (QFile::remove(fileName)) {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	418 qDebug() << "Removed: " << fileName;
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	419 } else {
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	420 qDebug() << "Failed to remove: " << fileName;
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	421 }
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	422 }
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	423 /* Clear out available data. */
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	424 mSettings.remove("Software/available");
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	425 mSettings.remove("Software/availableDate");
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	426 }
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	427 }
c7db2cc97bad (issue44) Remove downloaded binaries after update Andre Heinecke <andre.heinecke@intevation.de> parents: 1055 diff changeset	428
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	429 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	430 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	431
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	432 #ifndef RELEASE_BUILD
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	433 /* 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	434 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	435 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	436 #endif
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	437
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	438 Downloader* downloader = new Downloader(this,
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	439 QString::fromLatin1(SERVER_URL),
7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	440 QByteArray(),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	441 swInstalledLastMod,
72 7e304573ebd1 Add some testing hacks for interactive testing Andre Heinecke <aheinecke@intevation.de> parents: 71 diff changeset	442 listInstalledLastMod,
437 4b486a14252f Acutally use the values that can be taken from the config Andre Heinecke <aheinecke@intevation.de> parents: 434 diff changeset	443 swResource,
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	444 listResource,
1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	445 downloadSW);
17 c12825a651ed Read out content-length and use this to skip existing files Andre Heinecke <aheinecke@intevation.de> parents: 16 diff changeset	446
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	447 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	448 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	449 if (!downloadSW) {
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	450 setState(BeforeDownload);
461 1ce835c40eb7 Ask the user if software updates should be installed. Raimund Renkert <rrenkert@intevation.de> parents: 456 diff changeset	451 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	452 this, SLOT(handleNewSW(const QString&, const QDateTime&)));
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	453 } else {
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	454 setState(DownloadingSW);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	455 connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),
15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	456 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	457 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	458
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	459 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	460 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	461 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	462 this, SLOT(downloaderError(const QString &, SSLConnection::ErrorCode)));
10 fe39d93f1261 Start on Downloader component Andre Heinecke <aheinecke@intevation.de> parents: 7 diff changeset	463 downloader->start();
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	464 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	465
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	466 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	467 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	468 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	469 QApplication::applicationVersion());
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	470 qDebug() << softwareVersion;
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	471 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	472 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	473 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	474 QByteArray(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	475 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	476 QDateTime::currentDateTime(),
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	477 softwareVersion,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	478 listResource,
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	479 false);
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	480 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	481 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	482 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	483 connect(downloader, SIGNAL(lastModifiedDate(const QDateTime&)),
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	484 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	485
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	486 downloader->start();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	487 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	488
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	489 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	490 {
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	491 mSettings.beginGroup("Software");
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	492 mSettings.setValue("installedDate", date);
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	493 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	494 mSettings.endGroup();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	495 checkUpdates();
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	496 }
fa56a9403939 Lookup the last modified date for software installer after first installation. Raimund Renkert <rrenkert@intevation.de> parents: 481 diff changeset	497
45 c6125d73faf4 Move SSLConnection into it's own class Andre Heinecke <aheinecke@intevation.de> parents: 31 diff changeset	498 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	499 {
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	500 /* 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	501 syslog_error_printf ("Failed to check for updates: %s", message.toUtf8().constData());
1061 db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	502 if (!isVisible()) {
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	503 mCurMessage = message;
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	504 mTrayIcon->show();
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	505 showMessage();
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	506 } else {
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	507 showErrorMessage(tr("Failed to check for updates:") + "\n" + message);
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	508 }
551 15121735805e Start implementation of software update installation Andre Heinecke <aheinecke@intevation.de> parents: 548 diff changeset	509 setState(TransferError);
16 225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	510 }
225a5ec20dad Use QSettings and manage downloader from mainwindow. Andre Heinecke <aheinecke@intevation.de> parents: 11 diff changeset	511
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	512 void MainWindow::createActions()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	513 {
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	514 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	515 connect(mCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdates()));
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	516 mQuitAction = new QAction(tr("Quit"), this);
cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	517 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	518 }
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	519
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	520 void MainWindow::createTrayIcon()
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	521 {
11 7e2f14c7aba2 Split up downloader component and further implement it Andre Heinecke <aheinecke@intevation.de> parents: 10 diff changeset	522 QIcon trayImg(":/img/tray_22.png");
970 c80777457133 (issue50) Add window icon and icon for 48x48px Andre Heinecke <andre.heinecke@intevation.de> parents: 966 diff changeset	523 trayImg.addFile(":/img/tray_48.png", QSize(48,48));
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	524
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	525 mTrayMenu = new QMenu(this);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	526 mTrayMenu->addAction(mCheckUpdates);
2 cf88cc432b9d Add quit action Andre Heinecke <aheinecke@intevation.de> parents: 0 diff changeset	527 mTrayMenu->addAction(mQuitAction);
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	528
871 4efd6378c001 (issue51) Add fallback in case systemtray is unavailable. Andre Heinecke <andre.heinecke@intevation.de> parents: 857 diff changeset	529 mTrayIcon = new TrayIcon(this);
0 cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	530 mTrayIcon->setContextMenu(mTrayMenu);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	531
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	532 mTrayIcon->setIcon(trayImg);
cb0cde2c5eb9 Initial commit. Basically a Hello World with a Tray Icon. Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	533 setWindowIcon(trayImg);
407 af53c40e74b1 Rename m13ui to TrustBridge Andre Heinecke <aheinecke@intevation.de> parents: 404 diff changeset	534 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	535
f22a99f7cb69 Add certificatelist to install as member. Look for updates on startup Andre Heinecke <aheinecke@intevation.de> parents: 45 diff changeset	536 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	537 }
155 c0fdb8d336cf Added menubar/menu and method stubs to mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 82 diff changeset	538
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	539 QWidget * MainWindow::createInfoWidget()
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	540 {
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	541 QWidget *theWidget = new QWidget;
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	542 QVBoxLayout *infoPanelLayout = new QVBoxLayout;
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	543 QHBoxLayout *infoHeaderLayout = new QHBoxLayout;
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	544 QVBoxLayout *infoHeaderTextLayout = new QVBoxLayout;
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	545 QVBoxLayout *infoCenterLayout = new QVBoxLayout;
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	546
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	547 QString infoVersion = tr("Version: ");
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	548 infoVersion.append(QApplication::applicationVersion());
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	549 QLabel *appVersion = new QLabel(infoVersion);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	550 appVersion->setTextInteractionFlags(
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	551 Qt::TextSelectableByMouse \|
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	552 Qt::TextSelectableByKeyboard);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	553
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	554 QFrame *infoHeaderSeparator = new QFrame();
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	555 infoHeaderSeparator->setFrameShape(QFrame::HLine);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	556 infoHeaderSeparator->setFrameShadow(QFrame::Sunken);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	557
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	558 infoHeaderTextLayout->addWidget(appVersion);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	559 infoHeaderLayout->addLayout(infoHeaderTextLayout);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	560 infoHeaderLayout->insertStretch(2, 10);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	561
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	562 QLabel *textDesc = new QLabel(tr("TrustBridge is a root certificate"
807 1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	563 " installer for Windows and GNU/Linux.<br/>") +
1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	564 tr("The root certificate lists are managed"
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	565 " by the German <a href=\"https://www.bsi.bund.de\">"
807 1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	566 "Federal Office for Information Security (BSI)</a>.<br/><br/>") +
1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	567 tr("The software was developed by the companies"
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	568 " <a href=\"http://www.intevation.de\">Intevation GmbH</a> and "
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	569 " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
807 1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	570 " contracted by the German Federal Office for Information Security (BSI).<br/><br/>") +
1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	571 tr("TrustBridge is Free Software licensed"
1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	572 " under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	573 " in der Informationstechnik"));
807 1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	574 textDesc->setTextFormat(Qt::RichText);
1e18d4c1932a Unify about dialog labels and Remove Trustbridge header Andre Heinecke <andre.heinecke@intevation.de> parents: 805 diff changeset	575 textDesc->setTextInteractionFlags(
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	576 Qt::TextSelectableByMouse \|
844 fa68e5aeeaac Make links clickable and also change the about info in mainwindow. Andre Heinecke <andre.heinecke@intevation.de> parents: 842 diff changeset	577 Qt::TextSelectableByKeyboard \|
fa68e5aeeaac Make links clickable and also change the about info in mainwindow. Andre Heinecke <andre.heinecke@intevation.de> parents: 842 diff changeset	578 Qt::LinksAccessibleByMouse);
fa68e5aeeaac Make links clickable and also change the about info in mainwindow. Andre Heinecke <andre.heinecke@intevation.de> parents: 842 diff changeset	579 textDesc->setOpenExternalLinks(true);
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	580
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	581 infoCenterLayout->addWidget(infoHeaderSeparator);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	582 infoCenterLayout->addWidget(textDesc);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	583 infoCenterLayout->insertSpacing(2, 10);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	584 infoCenterLayout->insertSpacing(4, 10);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	585 infoCenterLayout->insertSpacing(6, 10);
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	586
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	587 QHBoxLayout *helpButtonLayout = new QHBoxLayout();
996 29783ef4da62 (UI) Added space in QPushButton on about page. Emanuel Schuetze <emanuel@intevation.de> parents: 995 diff changeset	588 QPushButton *helpButton = new QPushButton(" " + tr("Show Help"));
964 706405a2f3e8 (issue89) Add help icon to help button Andre Heinecke <andre.heinecke@intevation.de> parents: 962 diff changeset	589 helpButton->setIcon(QIcon(":/img/show-help_16.png"));
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	590 connect(helpButton, SIGNAL(clicked()), this, SLOT(showHelp()));
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	591 helpButtonLayout->addWidget(helpButton);
956 879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	592 #ifdef USE_CURL
996 29783ef4da62 (UI) Added space in QPushButton on about page. Emanuel Schuetze <emanuel@intevation.de> parents: 995 diff changeset	593 QPushButton *proxySettingsButton = new QPushButton(" " + tr("Proxy settings"));
956 879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	594 proxySettingsButton->setIcon(QIcon(":/img/preferences-network_16.png"));
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	595 connect(proxySettingsButton, SIGNAL(clicked()), this, SLOT(showProxySettings()));
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	596 helpButtonLayout->addWidget(proxySettingsButton);
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	597 #endif
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	598 helpButtonLayout->addStretch();
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	599 infoCenterLayout->addLayout(helpButtonLayout);
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	600
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	601 infoCenterLayout->insertStretch(8, 10);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	602
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	603 infoPanelLayout->addLayout(infoHeaderLayout);
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	604 infoPanelLayout->addLayout(infoCenterLayout);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	605 theWidget->setLayout(infoPanelLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	606
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	607 return theWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	608 }
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	609
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	610 QWidget * MainWindow::createUpdatesWidget()
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	611 {
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	612 QWidget * theWidget = new QWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	613 QVBoxLayout *updatesMainLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	614
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	615 /* The header */
1096 10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	616 QVBoxLayout *updatesHeaderLayout = new QVBoxLayout;
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	617
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	618 QGridLayout *detailsLayout = new QGridLayout;
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	619
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	620 /* Header 1: Action buttons and summary*/
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	621 mUpdatesHeader =
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	622 new QLabel("<h2>" + tr("Certificates unchanged")+ "</h2>");
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	623 updatesHeaderLayout->addWidget(mUpdatesHeader);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	624
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	625 QHBoxLayout *updatesHeaderActionButtonLayout = new QHBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	626 mQuitButton = new QPushButton(" " + tr("Quit without saving"));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	627 mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	628 mQuitButton->setFixedHeight(30);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	629
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	630 mInstallButton = new QPushButton(" " + tr("Install certificates again"));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	631 mInstallButton->setFixedHeight(30);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	632 #ifdef Q_OS_WIN
1003 db7e7156c824 (issue66) Only depend on is_system_install on windows to decide privilege raise Andre Heinecke <andre.heinecke@intevation.de> parents: 997 diff changeset	633 if (is_system_install()) {
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	634 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	635 mInstallButton->setIcon(uacShield);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	636 }
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	637 #else
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	638 mInstallButton->setIcon(QIcon(":/img/view-refresh_16px.png"));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	639 #endif
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	640 connect(mQuitButton, SIGNAL(clicked()), this, SLOT(closeApp()));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	641 connect(mInstallButton, SIGNAL(clicked()), this, SLOT(checkAndInstallCerts()));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	642
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	643 updatesHeaderActionButtonLayout->addWidget(mInstallButton);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	644 updatesHeaderActionButtonLayout->addWidget(mQuitButton);
1096 10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	645 updatesHeaderActionButtonLayout->addStretch(-1);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	646
1096 10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	647 updatesHeaderLayout->addLayout(updatesHeaderActionButtonLayout);
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	648 updatesHeaderLayout->addSpacing(20);
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	649
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	650 /* The splitter line */
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	651 QFrame *line = new QFrame();
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	652 line->setFrameShape(QFrame::HLine);
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	653 line->setFrameShadow(QFrame::Sunken);
10f0efd197c7 (issue111) Rework header to be simpler and left bound. Andre Heinecke <andre.heinecke@intevation.de> parents: 1095 diff changeset	654 updatesHeaderLayout->addWidget(line);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	655
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	656 updatesMainLayout->addLayout(updatesHeaderLayout);
1103 c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	657
c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	658 /* Central Header Details and update button. Part of the scroll area */
c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	659 QScrollArea *centralScrollArea = new QScrollArea;
c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	660 QVBoxLayout *updatesCenterLayout = new QVBoxLayout;
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	661 mUpdatesDetailsHeader = new QLabel(QString());
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	662
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	663 QHBoxLayout *updateDateAndSearchButton = new QHBoxLayout;
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	664 mCertListVersion =
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	665 new QLabel(QString());
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	666 mCertListVersionContents = new QLabel(QString());
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	667 const QDateTime lastCheck = mSettings.value("lastUpdateCheck").toDateTime().toLocalTime();
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	668 mLastUpdateCheck = new QLabel(tr("Last update check:"));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	669 if (lastCheck.isValid()) {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	670 const QString lastUpdateCheck = QLocale::system().toString(lastCheck, DATETIME_FORMAT);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	671 mLastUpdateCheckContents = new QLabel(lastUpdateCheck);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	672 } else {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	673 mLastUpdateCheckContents = new QLabel(tr("No connection with the updateserver."));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	674 }
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	675 QPushButton *searchUpdates = new QPushButton(" " + tr("Update"));
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	676 searchUpdates->setFixedHeight(22);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	677 searchUpdates->setToolTip(tr("Check for Updates"));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	678 searchUpdates->setStyleSheet("font-size: 10px;");
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	679 searchUpdates->setIcon(QIcon(":/img/update-list.png"));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	680 connect(searchUpdates, SIGNAL(clicked()), this, SLOT(checkUpdates()));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	681 updateDateAndSearchButton->addWidget(mLastUpdateCheckContents);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	682 updateDateAndSearchButton->addWidget(searchUpdates);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	683
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	684 mUpdatesTip =
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	685 new QLabel(QString());
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	686 mUpdatesTip->setWordWrap(true);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	687
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	688 // addWidget(*Widget, row, column, rowspan, colspan)
1103 c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	689 updatesCenterLayout->addWidget(mUpdatesDetailsHeader);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	690 detailsLayout->addWidget(mLastUpdateCheck, 0, 0, 1, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	691 detailsLayout->addLayout(updateDateAndSearchButton, 0, 1, 1, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	692 detailsLayout->addWidget(mCertListVersion, 1, 0, 1, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	693 detailsLayout->addWidget(mCertListVersionContents, 1, 1, 1, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	694 detailsLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum), 2, 2, 1, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	695 detailsLayout->setColumnStretch(2, 1);
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	696
1103 c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	697 updatesCenterLayout->addLayout(detailsLayout);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	698
1103 c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	699 updatesCenterLayout->addItem(new QSpacerItem(100, 10));
c4e3498e716f (issue111) Move detailed header into the scrollarea Andre Heinecke <andre.heinecke@intevation.de> parents: 1102 diff changeset	700 updatesCenterLayout->addWidget(mUpdatesTip);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	701
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	702 /* The central panels. */
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	703 QHBoxLayout *updatesNewLayout = new QHBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	704 QHBoxLayout *updatesRemoveLayout = new QHBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	705 QHBoxLayout *updatesManualLayout = new QHBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	706 mUpdatesNewCertificates =
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	707 new QLabel("<h3>" +
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	708 tr("Install new trusted certificates (%1/%2)").arg(0).arg(0) +
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	709 "</h3>");
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	710 mUpdatesDetailsNew = new QPushButton();
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	711 mUpdatesDetailsNew->setText(" " + tr("Details"));
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	712 mUpdatesDetailsNew->setToolTip(tr("Show details"));
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	713 mUpdatesDetailsNew->setStyleSheet("font-size: 10px;");
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	714 mUpdatesDetailsNew->setFixedHeight(22);
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	715 mUpdatesDetailsNew->setIcon(QIcon(":/img/dialog-information_16px.png"));
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	716 connect(mUpdatesDetailsNew,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	717 SIGNAL(clicked()),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	718 this,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	719 SLOT(toggleUpdatesNew()));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	720 updatesNewLayout->addWidget(mUpdatesNewCertificates);
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	721 updatesNewLayout->addWidget(mUpdatesDetailsNew);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	722 updatesNewLayout->addStretch(1);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	723 mUpdatesNew = new CertificateListWidget(this);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	724 connect(mUpdatesNew, SIGNAL(certListChanged(int)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	725 this, SLOT(listChanged(int)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	726 mUpdatesNew->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	727
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	728 mUpdatesRemoveCertificates =
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	729 new QLabel("<h3>" +
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	730 tr("Remove revoked certificates (%1/%2)").arg(0).arg(0) +
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	731 "</h3>");
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	732 mUpdatesDetailsRemove = new QPushButton();
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	733 mUpdatesDetailsRemove->setText(" " + tr("Details"));
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	734 mUpdatesDetailsRemove->setToolTip(tr("Show details"));
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	735 mUpdatesDetailsRemove->setStyleSheet("font-size: 10px;");
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	736 mUpdatesDetailsRemove->setFixedHeight(22);
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	737 mUpdatesDetailsRemove->setIcon(QIcon(":/img/dialog-information_16px.png"));
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	738 connect(mUpdatesDetailsRemove,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	739 SIGNAL(clicked()),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	740 this,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	741 SLOT(toggleUpdatesRemove()));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	742 updatesRemoveLayout->addWidget(mUpdatesRemoveCertificates);
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	743 updatesRemoveLayout->addWidget(mUpdatesDetailsRemove);
746 d73f4e58d117 Add strecht also between remove button Andre Heinecke <andre.heinecke@intevation.de> parents: 743 diff changeset	744 updatesRemoveLayout->addStretch(1);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	745 mUpdatesRemove = new CertificateListWidget(this);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	746 connect(mUpdatesRemove, SIGNAL(certListChanged(int)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	747 this, SLOT(listChanged(int)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	748 mUpdatesRemove->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	749
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	750 mUpdatesManualCertificates = new QLabel(QString());
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	751 mUpdatesDetailsManual = new QPushButton();
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	752 mUpdatesDetailsManual->setText(" " + tr("Details"));
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	753 mUpdatesDetailsManual->setToolTip(tr("Show details"));
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	754 mUpdatesDetailsManual->setStyleSheet("font-size: 10px;");
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	755 mUpdatesDetailsManual->setFixedHeight(22);
d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	756 mUpdatesDetailsManual->setIcon(QIcon(":/img/dialog-information_16px.png"));
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	757 connect(mUpdatesDetailsManual,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	758 SIGNAL(clicked()),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	759 this,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	760 SLOT(toggleUpdatesManual()));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	761 mUpdatesDetailsManual->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	762 updatesManualLayout->addWidget(mUpdatesManualCertificates);
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	763 updatesManualLayout->addWidget(mUpdatesDetailsManual);
747 b959304d6ecf Also space away the manual details button Andre Heinecke <andre.heinecke@intevation.de> parents: 746 diff changeset	764 updatesManualLayout->addStretch(1);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	765 mUpdatesManual = new CertificateListWidget(this);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	766 mUpdatesManual->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	767 connect(mUpdatesManual, SIGNAL(certChanged(bool, const Certificate&)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	768 this, SLOT(removeFromManual(bool, const Certificate&)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	769 connect(mUpdatesManual, SIGNAL(certListChanged(int)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	770 this, SLOT(listChanged(int)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	771
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	772 updatesNewLayout->setAlignment(Qt::AlignTop);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	773 updatesRemoveLayout->setAlignment(Qt::AlignTop);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	774 updatesManualLayout->setAlignment(Qt::AlignTop);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	775 updatesCenterLayout->addLayout(updatesNewLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	776 updatesCenterLayout->addWidget(mUpdatesNew);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	777 updatesCenterLayout->addLayout(updatesRemoveLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	778 updatesCenterLayout->addWidget(mUpdatesRemove);
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	779 updatesCenterLayout->addSpacing(10);
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	780 updatesCenterLayout->addLayout(updatesManualLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	781 updatesCenterLayout->addWidget(mUpdatesManual);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	782
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	783 QWidget *dummyWidget = new QWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	784 dummyWidget->setLayout(updatesCenterLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	785 centralScrollArea->setWidgetResizable(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	786 centralScrollArea->setWidget(dummyWidget);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	787 centralScrollArea->setFrameShape(QFrame::NoFrame);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	788 centralScrollArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	789
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	790 updatesMainLayout->addWidget(centralScrollArea);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	791 updatesCenterLayout->addSpacerItem(new QSpacerItem(0, 0,
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	792 QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	793 theWidget->setLayout(updatesMainLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	794 return theWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	795 }
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	796
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	797
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	798 QWidget *MainWindow::createInstallWidget()
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	799 {
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	800 QWidget *theWidget = new QWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	801 QScrollArea *scrollArea = new QScrollArea;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	802 QVBoxLayout *installPanelLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	803 QVBoxLayout *installHeaderLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	804 QVBoxLayout *installCenterLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	805
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	806 QLabel *installHeaderLabel =
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	807 new QLabel("<h2>" + tr("Trusted certificates") + "</h2>");
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	808 QLabel *installHeaderText = new QLabel(tr("The following list of trusted root"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	809 " certificates is managed by the BSI. The BSI validates independently the"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	810 " authenticity, security and actuality of these certificates."));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	811 installHeaderText->setWordWrap(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	812 installHeaderLayout->addWidget(installHeaderLabel);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	813 installHeaderLayout->addWidget(installHeaderText);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	814
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	815 QLabel *installCenterText = new QLabel(tr("Please choose the certificates"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	816 " you want to trust or untrust. TrustBridge will install these certificates for your"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	817 " secure communication for email and internet."));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	818 installCenterText->setWordWrap(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	819 installCenterLayout->addWidget(installCenterText);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	820
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	821 installPanelLayout->addLayout(installHeaderLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	822 installPanelLayout->addLayout(installCenterLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	823
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	824 mInstallList = new CertificateListWidget(this);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	825 connect(mInstallList, SIGNAL(certChanged(bool, const Certificate&)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	826 this, SLOT(toggleInManual(bool, const Certificate&)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	827
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	828 scrollArea->setWidgetResizable(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	829 scrollArea->setWidget(mInstallList);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	830 scrollArea->setFrameShape(QFrame::NoFrame);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	831
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	832 installPanelLayout->addWidget(scrollArea);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	833
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	834 theWidget->setLayout(installPanelLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	835
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	836 return theWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	837 }
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	838
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	839 QWidget *MainWindow::createRemoveWidget()
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	840 {
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	841 QWidget * theWidget = new QWidget;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	842 QScrollArea *scrollArea = new QScrollArea;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	843 QVBoxLayout *removePanelLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	844 QVBoxLayout *removeHeaderLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	845 QVBoxLayout *removeCenterLayout = new QVBoxLayout;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	846
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	847 QLabel *removeHeaderLabel =
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	848 new QLabel("<h2>" + tr("Revoked certificates") + "</h2>");
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	849 QLabel *removeHeaderText = new QLabel(tr("Certificates can be corrupted"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	850 " or stolen and misused in many ways. Therefore the BSI recommends"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	851 " to remove all revoked certificates from your system."));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	852 removeHeaderText->setWordWrap(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	853 removeHeaderLayout->addWidget(removeHeaderLabel);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	854 removeHeaderLayout->addWidget(removeHeaderText);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	855
805 e04c57e9bf2e Mainwindow: Typo. Bernhard Reiter <bernhard@intevation.de> parents: 802 diff changeset	856 QLabel *removeCenterText = new QLabel(tr("The following unsecure certificates were"
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	857 " revoked by the BSI. Already uninstalled certificates cannot be reinstalled."
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	858 " It is recommended that you select all certificates to uninstall if you still"
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	859 " have revoked certificates installed."));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	860 removeCenterText->setWordWrap(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	861 removeCenterLayout->addWidget(removeCenterText);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	862 mRemoveList = new CertificateListWidget(this);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	863 connect(mRemoveList, SIGNAL(certChanged(bool, const Certificate&)),
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	864 this, SLOT(toggleInManual(bool, const Certificate&)));
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	865
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	866 removePanelLayout->addLayout(removeHeaderLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	867 removePanelLayout->addLayout(removeCenterLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	868
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	869 scrollArea->setWidgetResizable(true);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	870 scrollArea->setWidget(mRemoveList);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	871 scrollArea->setFrameShape(QFrame::NoFrame);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	872 removePanelLayout->addWidget(scrollArea);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	873 theWidget->setLayout(removePanelLayout);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	874
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	875 return theWidget;
739 5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	876 }
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	877
5f0fca113ff4 Factor out Info Panel creation. Andre Heinecke <andre.heinecke@intevation.de> parents: 732 diff changeset	878 void MainWindow::setupGUI()
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	879 {
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	880 // Create a central widget containing the main layout.
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	881 QWidget *base = new QWidget;
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	882
250 1e112cf41e92 Updated the mainwindow layout. Raimund Renkert <rrenkert@intevation.de> parents: 249 diff changeset	883 // Layouts and Container
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	884 QVBoxLayout *mainLayout = new QVBoxLayout;
205 a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	885 QHBoxLayout *headerLayout = new QHBoxLayout;
a3f542bf38f7 Added header for mainwindow. Raimund Renkert <rrenkert@intevation.de> parents: 200 diff changeset	886 QVBoxLayout *headerTextLayout = new QVBoxLayout;
1094 03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	887 QHBoxLayout *headerSubtitleLayout = new QHBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	888 QHBoxLayout *centerLayout = new QHBoxLayout;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	889 QVBoxLayout *buttonBarLayout = new QVBoxLayout;
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	890 QHBoxLayout *bottomLayout = new QHBoxLayout;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	891 QHBoxLayout *containerLayout = new QHBoxLayout;
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	892
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	893 // The header (icon, about text)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	894 QImage *logoImage = new QImage(":/img/logo.png");
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	895 QLabel *logo = new QLabel;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	896 logo->setBackgroundRole(QPalette::Base);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	897 logo->setPixmap(QPixmap::fromImage(*logoImage));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	898 QLabel *title = new QLabel("<h1>" + QString::fromLatin1(APPNAME) + "</h1>");
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	899 QLabel *subTitle = new QLabel(tr("Trust in your digital communication"));
1094 03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	900 QLabel *swVersion = new QLabel(QString::fromLatin1("<i>") +
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	901 tr("Version") + " " + QApplication::applicationVersion() +
1095 a0fb21625cf3 (issue111) Avoid clipping the last charcter in italic font. Andre Heinecke <andre.heinecke@intevation.de> parents: 1094 diff changeset	902 QString::fromLatin1(" </i>"));
1094 03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	903
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	904 swVersion->setTextInteractionFlags(Qt::TextSelectableByKeyboard \| Qt::TextSelectableByMouse);
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	905 swVersion->setTextFormat(Qt::RichText);
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	906
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	907 headerSubtitleLayout->addWidget(subTitle);
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	908 headerSubtitleLayout->addStretch(-1);
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	909 headerSubtitleLayout->addWidget(swVersion);
03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	910
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	911 headerTextLayout->addWidget(title);
1094 03a1f3761f45 (issue111) Move Version label into header. Andre Heinecke <andre.heinecke@intevation.de> parents: 1093 diff changeset	912 headerTextLayout->addLayout(headerSubtitleLayout);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	913 headerLayout->addWidget(logo);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	914 headerLayout->addLayout(headerTextLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	915 headerLayout->setStretch(0, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	916 headerLayout->setStretch(1, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	917
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	918 /***********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	919 * The Buttonbar on the left side.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	920 ***********************************/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	921 mButtonGroup = new QButtonGroup;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	922
722 b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	923 TextOverlayButton *updatesButton = new TextOverlayButton;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	924 updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
932 57371f2e8dae (issue72) Set background image as pixmap in textoverlayicon Andre Heinecke <andre.heinecke@intevation.de> parents: 926 diff changeset	925 updatesButton->setBackgroundIcon(":/img/red-circle.png");
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	926 updatesButton->setIcon(QIcon(":/img/view-refresh.png"));
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	927 updatesButton->setIconSize(QSize(48, 48));
1099 3d4a81eff3fd (issue111) Rename updates button to pending changes Andre Heinecke <andre.heinecke@intevation.de> parents: 1098 diff changeset	928 updatesButton->setText(tr("Pending\nchanges"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	929 updatesButton->setFixedWidth(120);
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	930 updatesButton->setFixedHeight(90);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	931 updatesButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	932 updatesButton->setChecked(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	933
722 b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	934 connect(this, SIGNAL(changesChanged(const QString&)),
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	935 updatesButton, SLOT(setOverlay(const QString&)));
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	936
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	937 QToolButton *allInstallButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	938 allInstallButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	939 allInstallButton->setIcon(QIcon(":/img/document-encrypt.png"));
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	940 allInstallButton->setIconSize(QSize(48, 48));
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	941 allInstallButton->setText(tr("Trusted\ncertificates"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	942 allInstallButton->setFixedWidth(120);
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	943 allInstallButton->setFixedHeight(90);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	944 allInstallButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	945
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	946 QToolButton *allRemoveButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	947 allRemoveButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
673 e8bc1215904e (UI) Changed some icons. Emanuel Schuetze <emanuel@intevation.de> parents: 669 diff changeset	948 allRemoveButton->setIcon(QIcon(":/img/dialog-warning.png"));
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	949 allRemoveButton->setIconSize(QSize(48, 48));
661 320a64d58e62 (UI) Updated English strings. Removed Issuer fields. Emanuel Schuetze <emanuel@intevation.de> parents: 659 diff changeset	950 allRemoveButton->setText(tr("Revoked\ncertificates"));
663 b00c26fbc695 (UI) linebreak and bigger buttons for German translations. Emanuel Schuetze <emanuel@intevation.de> parents: 661 diff changeset	951 allRemoveButton->setFixedWidth(120);
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	952 allRemoveButton->setFixedHeight(90);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	953 allRemoveButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	954
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	955 QToolButton *infoButton = new QToolButton;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	956 infoButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	957 infoButton->setIcon(QIcon(":/img/dialog-information.png"));
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	958 infoButton->setIconSize(QSize(48, 48));
659 c7405d526ead (UI) Updated English strings. Emanuel Schuetze <emanuel@intevation.de> parents: 657 diff changeset	959 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	960 infoButton->setFixedWidth(120);
732 d39b5b65366e (UI) Updated png icons in correct sizes. Emanuel Schuetze <emanuel@intevation.de> parents: 722 diff changeset	961 infoButton->setFixedHeight(90);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	962 infoButton->setCheckable(true);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	963
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	964 mButtonGroup->addButton(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	965 mButtonGroup->addButton(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	966 mButtonGroup->addButton(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	967 mButtonGroup->addButton(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	968 mButtonGroup->setId(updatesButton, 0);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	969 mButtonGroup->setId(allInstallButton, 1);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	970 mButtonGroup->setId(allRemoveButton, 2);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	971 mButtonGroup->setId(infoButton, 3);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	972
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	973 connect(mButtonGroup, SIGNAL(buttonClicked(int)),
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	974 this, SLOT(togglePages(int)));
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	975 buttonBarLayout->addWidget(updatesButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	976 buttonBarLayout->addWidget(allInstallButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	977 buttonBarLayout->addWidget(allRemoveButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	978 buttonBarLayout->insertStretch(3, 10);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	979 buttonBarLayout->addWidget(infoButton);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	980
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	981 /* The main pages.*/
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	982
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	983 /* The updates page. */
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	984 mUpdatesWidget = createUpdatesWidget();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	985
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	986 /* Install (trusted certs) Page */
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	987 mInstallWidget = createInstallWidget();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	988
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	989 /**********************************
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	990 * Page for certificates to be removed.
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	991 **********************************/
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	992 mRemoveWidget = createRemoveWidget();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	993
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	994 /**********************************
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	995 * The info page.
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	996 **********************************/
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	997 mInfoWidget = createInfoWidget();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	998
652 f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	999 /********************************
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	1000 * The main layout for pages.
f65503c1833b Updated mainwindow layout and removed obsolete code. Raimund Renkert <rrenkert@intevation.de> parents: 643 diff changeset	1001 ********************************/
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1002 mInstallWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1003 mRemoveWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1004 mInfoWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1005 containerLayout->addWidget(mUpdatesWidget);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1006 containerLayout->addWidget(mInstallWidget);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1007 containerLayout->addWidget(mRemoveWidget);
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1008 containerLayout->addWidget(mInfoWidget);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1009
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1010 centerLayout->addLayout(buttonBarLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1011 centerLayout->addLayout(containerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1012
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1013 mainLayout->addLayout(headerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1014 mainLayout->addLayout(centerLayout);
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1015 mainLayout->addLayout(bottomLayout);
187 0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	1016 base->setLayout(mainLayout);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	1017 setCentralWidget(base);
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	1018 }
0c06a608e15f Create the mainwindow content. Raimund Renkert <rrenkert@intevation.de> parents: 155 diff changeset	1019
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	1020 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	1021 {
716 929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1022 Q_UNUSED (selected);
722 b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1023 setChangeCount(mUpdatesRemove->selectedCertCount() +
1107 51d3b361f17a Revert commit 1102 Andre Heinecke <andre.heinecke@intevation.de> parents: 1106 diff changeset	1024 mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size());
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	1025
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1026 /* Show a different tip in case of manual changes, updates aviailable, updates and manual
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1027 * changes available */
1107 51d3b361f17a Revert commit 1102 Andre Heinecke <andre.heinecke@intevation.de> parents: 1106 diff changeset	1028 if (changeCount() && !mUpdatesManual->certificates().size()) {
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1029 mUpdatesTip->setText(
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1030 tr("You should apply the following, recommended changes to your certificate stores:"));
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1031 } else if (changeCount()) {
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1032 mUpdatesTip->setText(
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1033 tr("You can apply the following, changes to your certificate stores:"));
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1034 } else {
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1035 mUpdatesTip->setText(
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1036 tr("There are currently no changes for your certificate stores."));
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1037 }
e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1038
716 929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1039 if (!changeCount()) {
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	1040 /* No changes */
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	1041 mQuitButton->setText(" " + tr("Quit"));
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	1042 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	1043 "</h2>");
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1044 mInstallButton->setText(" " + tr("Install certificates again"));
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	1045 } else {
702 9dea3d895f53 (Issue22) Add a space between button icon and text. Andre Heinecke <andre.heinecke@intevation.de> parents: 696 diff changeset	1046 mQuitButton->setText(" " + tr("Quit without saving"));
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1047 mUpdatesHeader->setText("<h2>" + tr("Pending changes (%1)")
716 929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1048 .arg(changeCount()) +
696 55f78c4166fb (Issue32) Change Updates to Changes and track changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 694 diff changeset	1049 "</h2>");
718 e7a070e64b80 (Issue26) Make updates tip and install button depend on changes Andre Heinecke <andre.heinecke@intevation.de> parents: 717 diff changeset	1050 mInstallButton->setText(" " + tr("Apply changes"));
693 0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	1051 }
0fc1a20adaff (Issue 27) Change Quit button text depending on changes or no changes. Andre Heinecke <andre.heinecke@intevation.de> parents: 692 diff changeset	1052
719 49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1053 if (mUpdatesManual->certificates().size()) {
49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1054 mUpdatesDetailsManual->show();
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1055 if (mManualDetailsShown) {
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1056 mUpdatesManual->show();
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1057 deactivateDetailsButton(mUpdatesDetailsManual);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1058 } else {
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1059 activateDetailsButton(mUpdatesDetailsManual);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1060 }
719 49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1061 } else {
49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1062 mUpdatesDetailsManual->hide();
49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1063 mUpdatesManual->hide();
49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1064 }
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1065 mUpdatesManualCertificates->setText("<h2>" +
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1066 tr("Manual changes (%1)").arg(mUpdatesManual->certificates().size()) +
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1067 "</h2>");
719 49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1068
717 77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1069 if (mUpdatesNew->certificates().size()) {
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1070 mUpdatesNewCertificates->setText("<h3>" +
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1071 tr("Install new trusted certificates (%1/%2)")
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1072 .arg(mUpdatesNew->selectedCertCount())
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1073 .arg(mUpdatesNew->certificates().size()) +
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1074 "</h3>");
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1075 mUpdatesDetailsNew->show();
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	1076 mUpdatesDetailsNew->setIcon(QIcon(":/img/dialog-information_16px.png"));
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	1077 mUpdatesDetailsNew->setToolTip(tr("Show details"));
717 77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1078 mUpdatesNewCertificates->show();
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1079 } else {
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1080 mUpdatesDetailsNew->hide();
719 49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1081 mUpdatesNew->hide();
717 77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1082 mUpdatesNewCertificates->hide();
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1083 }
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1084
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1085 if (mUpdatesRemove->certificates().size()) {
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1086 mUpdatesRemoveCertificates->setText("<h3>" +
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1087 tr("Remove revoked certificates (%1/%2)")
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1088 .arg(mUpdatesRemove->selectedCertCount())
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1089 .arg(mUpdatesRemove->certificates().size()) +
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1090 "</h3>");
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1091 mUpdatesRemoveCertificates->show();
845 d33834129d2a (issue59) Improve details button. Emanuel Schuetze <emanuel@intevation.de> parents: 844 diff changeset	1092 mUpdatesDetailsRemove->setIcon(QIcon(":/img/dialog-information_16px.png"));
790 399bc0df073d (issue60) Make windows smaller and change details buttons to icon only Andre Heinecke <andre.heinecke@intevation.de> parents: 787 diff changeset	1093 mUpdatesDetailsRemove->setToolTip(tr("Show details"));
717 77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1094 mUpdatesDetailsRemove->show();
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1095 } else {
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1096 mUpdatesRemoveCertificates->hide();
77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1097 mUpdatesDetailsRemove->hide();
719 49bf73b5c7de (Issue34) Show / hide details area depending on available changes Andre Heinecke <andre.heinecke@intevation.de> parents: 718 diff changeset	1098 mUpdatesRemove->hide();
717 77c9c2dfc8ac (Issue26) Hide update lists if no updates are available Andre Heinecke <andre.heinecke@intevation.de> parents: 716 diff changeset	1099 }
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1100
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1101 /* Update the details header */
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1102 if (mUpdatesRemove->certificates().size() \|\|
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1103 mUpdatesNew->certificates().size()) {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1104 mUpdatesDetailsHeader->setText("<h2>" +
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1105 tr("New, recommended changes (%1/%2)")
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1106 .arg(mUpdatesRemove->selectedCertCount() +
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1107 mUpdatesNew->selectedCertCount())
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1108 .arg(mUpdatesRemove->certificates().size() +
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1109 mUpdatesNew->certificates().size()) +
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1110 "</h2>");
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1111 } else {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1112 mUpdatesDetailsHeader->setText(QString::fromLatin1("<h2>") +
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1113 tr("No new recommendations") + QString::fromLatin1("</h2>"));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1114 }
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1115
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1116 if (mListToInstall.isValid()) {
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1117 mCertListVersion->setText(tr("Certificate list from:"));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1118 mCertListVersionContents->setText(QLocale::system().toString(
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1119 mListToInstall.date().toLocalTime(), DATETIME_FORMAT));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1120 } else {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1121 if (mInstalledList.isValid()) {
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1122 mCertListVersion->setText(tr("Currently installed certificate list:"));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1123 mCertListVersionContents->setText(QLocale::system().toString(
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1124 mInstalledList.date().toLocalTime(), DATETIME_FORMAT));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1125 } else {
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1126 mCertListVersion->setText(tr("No certificate list installed."));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1127 mCertListVersionContents->setText("");
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1128 }
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1129 }
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	1130 }
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	1131
189 5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	1132 void MainWindow::loadCertificateList()
5f0d45ca9de4 Show certificates in the list view and details in the textfield. Raimund Renkert <rrenkert@intevation.de> parents: 187 diff changeset	1133 {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1134 /* 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	1135 * indication */
628 3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	1136 mInstallList->clear();
684 69def231f5ac (issue28) clear manual updates after installation. Andre Heinecke <andre.heinecke@intevation.de> parents: 673 diff changeset	1137 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	1138 mUpdatesNew->clear();
3a9c0f38bbad Made certificate lists member of mainwindow and added some temporary debug msgs. Raimund Renkert <rrenkert@intevation.de> parents: 584 diff changeset	1139 mUpdatesRemove->clear();
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1140 QList<Certificate> newInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1141 QList<Certificate> newRemoveCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1142 QList<Certificate> oldInstallCerts;
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1143 QList<Certificate> oldRemoveCerts;
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1144
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1145 if (mListToInstall.getCertificates().isEmpty()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1146 // 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	1147 foreach (const Certificate &cert, mInstalledList.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1148 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	1149 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1150 oldInstallCerts.append(cert);
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1151 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1152 QIcon btnIcon;
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1153 if (!state) {
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1154 btnIcon.addFile(":/img/write-into-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1155 btnIcon.addFile(":/img/security-low.png", QSize(48, 48), QIcon::Normal, QIcon::On);
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1156 actionBtn->setProperty("ToolTip_Off", tr(NEW_INSTALL_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1157 actionBtn->setProperty("ToolTip_On", tr(IS_NOT_INSTALLED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1158 } else {
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1159 actionBtn->setProperty("ToolTip_Off", tr(IS_INSTALLED_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1160 actionBtn->setProperty("ToolTip_On", tr(NEW_REMOVE_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1161 btnIcon.addFile(":/img/security-high.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1162 btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1163 }
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1164 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1165 mInstallList->addCertificate(cert, state, actionBtn);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1166 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1167 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1168 oldRemoveCerts.append(cert);
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1169 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1170 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1171 actionBtn->setProperty("ToolTip_Off", tr(NEW_REMOVE_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1172 actionBtn->setProperty("ToolTip_On", tr(IS_NOT_REMOVED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1173 btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1174 btnIcon.addFile(":/img/security-medium.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1175 btnIcon.addFile(":/img/trash-empty.png", QSize(48, 48), QIcon::Disabled, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1176 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1177 if (state) {
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1178 actionBtn->setEnabled(false);
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1179 actionBtn->setToolTip(tr(IS_REMOVED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1180 }
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1181 mRemoveList->addCertificate(cert, state, actionBtn);
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1182 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1183 }
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1184 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1185 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1186 // 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	1187 foreach (const Certificate &cert, mListToInstall.getCertificates()) {
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1188 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	1189 if (cert.isInstallCert()) {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1190 // Certificate with status "install".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1191 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	1192 // 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	1193 oldInstallCerts.append(cert);
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1194 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1195 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1196 actionBtn->setProperty("ToolTip_Off", tr(IS_INSTALLED_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1197 actionBtn->setProperty("ToolTip_On", tr(IS_NOT_INSTALLED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1198 btnIcon.addFile(":/img/security-high.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1199 btnIcon.addFile(":/img/security-low.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1200 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1201 mInstallList->addCertificate(cert, state, actionBtn);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1202 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1203 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1204 // 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	1205 newInstallCerts.append(cert);
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1206 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1207 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1208 actionBtn->setProperty("ToolTip_Off", tr(NEW_INSTALL_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1209 actionBtn->setProperty("ToolTip_On", tr(NOT_INSTALL_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1210 btnIcon.addFile(":/img/write-into-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1211 btnIcon.addFile(":/img/security-low.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1212 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1213 mUpdatesNew->addCertificate(cert, state, actionBtn);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1214 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1215 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1216 else {
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1217 // Certificate with status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1218 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	1219 // 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	1220 oldRemoveCerts.append(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1221 // Is removed, so set editable to false.
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1222 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1223 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1224 actionBtn->setProperty("ToolTip_Off", tr(NEW_REMOVE_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1225 actionBtn->setProperty("ToolTip_On", tr(IS_NOT_REMOVED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1226 btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1227 btnIcon.addFile(":/img/security-medium.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1228 btnIcon.addFile(":/img/trash-empty.png", QSize(48, 48), QIcon::Disabled, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1229 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1230 if (state) {
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1231 actionBtn->setEnabled(false);
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1232 actionBtn->setToolTip(tr(IS_REMOVED_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1233 }
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1234 mRemoveList->addCertificate(cert, state, actionBtn);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1235 }
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1236 else {
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1237 // 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	1238 // status "remove".
b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1239 newRemoveCerts.append(cert);
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1240 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1241 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1242 actionBtn->setProperty("ToolTip_Off", tr(NEW_REMOVE_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1243 actionBtn->setProperty("ToolTip_On", tr(NOT_REMOVE_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1244 btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1245 btnIcon.addFile(":/img/security-medium.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1246 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1247 mUpdatesRemove->addCertificate(cert, state, actionBtn);
445 b3721ded6f5b Sort and filter the certificate list, changed certificate item roles. Raimund Renkert <rrenkert@intevation.de> parents: 437 diff changeset	1248 }
267 89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1249 }
89e8783866f8 Use the certificate item delegate in the mainwind list view. Raimund Renkert <rrenkert@intevation.de> parents: 265 diff changeset	1250 }
691 315103410002 (Issue 32) Move updates header text generation out of update avialable block Andre Heinecke <andre.heinecke@intevation.de> parents: 690 diff changeset	1251 }
692 3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	1252
3791a277f00b Remove code duplication and calculate headers only in listchanged Andre Heinecke <andre.heinecke@intevation.de> parents: 691 diff changeset	1253 listChanged(0);
271 1ae15ea73850 Some GUI desing and layout changes. Raimund Renkert <rrenkert@intevation.de> parents: 267 diff changeset	1254 }
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1255
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1256 void MainWindow::installerError(const QString& errMsg) {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1257 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	1258 }
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1259
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1260 void MainWindow::installerSuccess() {
997 405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1261 if (mCurState == NewListAvailable ) {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1262 mCurState = NothingChanged;
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1263 mCurMessage = QString();
997 405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1264 }
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1265
997 405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1266 QString listFileName = mSettings.value("List/available").toString();
405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1267 QDateTime listFileDate = mSettings.value("List/availableDate").toDateTime();
405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1268 if (!listFileName.isEmpty() && listFileDate.isValid()) {
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1269 mSettings.remove("List/available");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1270 mSettings.remove("List/availableDate");
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1271
857 9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1272 /* Rename the installed list to list-installed.txt so that external
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1273 * programs (like the uninstaller can easily recognize it). */
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1274 QString dataLoc =
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1275 QStandardPaths::writableLocation(QStandardPaths::DataLocation);
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1276 QDir dataDir(dataLoc);
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1277 if (!dataDir.exists()) {
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1278 /* Should not happen */
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1279 qWarning() << "Data dir removed.";
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1280 return;
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1281 }
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1282
857 9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1283 QFileInfo oldList (dataDir.absoluteFilePath("list-installed.txt"));
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1284 if (oldList.exists()) {
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1285 qDebug() << "Removing old list: " << oldList.filePath();
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1286 if (!QFile::remove(oldList.filePath())) {
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1287 qWarning() << "Removal of old list failed.";
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1288 return;
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1289 }
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1290 }
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1291 QFile newList(listFileName);
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1292 if (!newList.rename(oldList.filePath())) {
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1293 qWarning() << "Failed to rename new list.";
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1294 return;
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1295 }
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1296
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1297 mSettings.setValue("List/installed", oldList.filePath());
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1298 mSettings.setValue("List/installedDate", listFileDate);
857 9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1299 mInstalledList = CertificateList(oldList.filePath().toUtf8().constData());
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1300 if (!mInstalledList.isValid()) {
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1301 /* Something went wrong. Go back to square one. */
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1302 qWarning () << "List corrupted after installation";
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1303 mInstalledList = CertificateList();
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1304 QFile::remove(oldList.filePath());
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1305 mSettings.remove("List/installed");
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1306 mSettings.remove("List/installedDate");
9bab4fc3a1fe Delete old lists and rename the currently installed list to list-installed.txt Andre Heinecke <andre.heinecke@intevation.de> parents: 845 diff changeset	1307 }
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1308 }
997 405c97ca4ab0 Save installation success independet of state. Andre Heinecke <andre.heinecke@intevation.de> parents: 996 diff changeset	1309 mListToInstall = CertificateList();
684 69def231f5ac (issue28) clear manual updates after installation. Andre Heinecke <andre.heinecke@intevation.de> parents: 673 diff changeset	1310 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	1311 loadCertificateList();
389 3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1312 }
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1313
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1314 void MainWindow::installCerts() {
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1315 QStringList choices;
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1316 QStringList unselected;
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1317
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1318 choices << mUpdatesNew->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1319 choices << mUpdatesRemove->selectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1320
669 7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	1321 choices << mUpdatesManual->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	1322
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	1323 /* 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	1324 choices << mInstallList->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	1325 choices << mRemoveList->selectedCertificates();
7147550ee15d Always include previous certificates in choices for the installer Andre Heinecke <andre.heinecke@intevation.de> parents: 664 diff changeset	1326
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1327 QStringList unselectedManuals = mUpdatesManual->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1328 for(int i = 0; i < unselectedManuals.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1329 if (unselectedManuals.at(i).startsWith("I:")) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1330 QString certLine = unselectedManuals.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1331 certLine[0] = 'R';
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1332 choices << certLine;
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1333 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1334 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1335
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1336 unselected << mUpdatesNew->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1337 unselected << mUpdatesRemove->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1338 unselected << mInstallList->unselectedCertificates();
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1339 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	1340
918 e5fd2d0cf42f (issue63) Add warning message when installation is not as admin Andre Heinecke <andre.heinecke@intevation.de> parents: 904 diff changeset	1341 #ifdef Q_OS_WIN
1003 db7e7156c824 (issue66) Only depend on is_system_install on windows to decide privilege raise Andre Heinecke <andre.heinecke@intevation.de> parents: 997 diff changeset	1342 if (!is_system_install()) {
db7e7156c824 (issue66) Only depend on is_system_install on windows to decide privilege raise Andre Heinecke <andre.heinecke@intevation.de> parents: 997 diff changeset	1343 QMessageBox::warning(this,
926 ca997bc0f790 (issue63) Updated message box text for normal user. Emanuel Schuetze <emanuel@intevation.de> parents: 918 diff changeset	1344 tr("Installation with standard user account"),
1006 6aa115b206df Updated translations. Emanuel Schuetze <emanuel@intevation.de> parents: 1003 diff changeset	1345 tr("Windows will now ask you to confirm each root certificate modification "
926 ca997bc0f790 (issue63) Updated message box text for normal user. Emanuel Schuetze <emanuel@intevation.de> parents: 918 diff changeset	1346 "because TrustBridge does not have the necessary privileges to install "
ca997bc0f790 (issue63) Updated message box text for normal user. Emanuel Schuetze <emanuel@intevation.de> parents: 918 diff changeset	1347 "root certificates into the Windows certificate store silently."));
918 e5fd2d0cf42f (issue63) Add warning message when installation is not as admin Andre Heinecke <andre.heinecke@intevation.de> parents: 904 diff changeset	1348 }
e5fd2d0cf42f (issue63) Add warning message when installation is not as admin Andre Heinecke <andre.heinecke@intevation.de> parents: 904 diff changeset	1349 #endif
e5fd2d0cf42f (issue63) Add warning message when installation is not as admin Andre Heinecke <andre.heinecke@intevation.de> parents: 904 diff changeset	1350
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1351 QProgressDialog *progress = new QProgressDialog(this);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1352 progress->setWindowModality(Qt::WindowModal);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1353 progress->setLabelText(tr("Installing certificates..."));
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1354 progress->setCancelButton(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1355 progress->setRange(0,0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1356 progress->setMinimumDuration(0);
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1357 progress->show();
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1358
1082 a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1359 CertificateList *instList = mListToInstall.isValid() ?
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1360 &mListToInstall :
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1361 &mInstalledList;
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1362
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1363 InstallWrapper *instWrap = new InstallWrapper(this,
1082 a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1364 instList->fileName(),
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1365 choices);
1082 a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1366
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1367 syslog_info_printf ("Installing certificate list: '%s' Version '%s'\n",
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1368 instList->fileName().toUtf8().constData(),
a12e6172d82c Extend logging to all choices and SW updates. Andre Heinecke <andre.heinecke@intevation.de> parents: 1081 diff changeset	1369 instList->date().toString().toUtf8().constData());
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1370 /* Clean up object and progress dialog */
75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1371 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	1372 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	1373 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	1374 connect(instWrap, SIGNAL(installationSuccessful()),
3be838c3e4d8 Handle installation success. Save / load last installed list. Andre Heinecke <andre.heinecke@intevation.de> parents: 375 diff changeset	1375 this, SLOT(installerSuccess()));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1376 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	1377 this, SLOT(installerError(const QString &)));
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1378 instWrap->start();
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1379
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1380 if (!saveUnselectedCertificates(unselected)) {
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1381 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	1382 }
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1383
365 75f7288ad67b Switch from listupdatedialog to installwrapper. Minor UI improvements Andre Heinecke <aheinecke@intevation.de> parents: 274 diff changeset	1384 }
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1385
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1386 void MainWindow::loadUnselectedCertificates()
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1387 {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1388 mPreviouslyUnselected.clear();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1389 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1390 QStringList keys = mSettings.allKeys();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1391 foreach (const QString &key, keys) {
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1392 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	1393 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1394 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1395 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1396
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1397 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	1398 {
479 a8d56a2846a8 Fill the internal list of previously unselcted certificates when saving in settings. Raimund Renkert <rrenkert@intevation.de> parents: 461 diff changeset	1399 mPreviouslyUnselected.clear();
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1400 mSettings.beginGroup("unselected");
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1401 mSettings.remove(""); /* Clears old choices */
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1402 for (int i = 0; i < unselected.size(); i++) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1403 QString key = QString::fromLatin1("cert%1").arg(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1404 QString value = unselected.at(i);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1405 mSettings.setValue(key, value);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1406 mPreviouslyUnselected << value;
372 6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1407 }
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1408 mSettings.endGroup();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1409 mSettings.sync();
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1410 return mSettings.status() == QSettings::NoError;
6cc124e79066 Add save/load unselected and add role enumerator Andre Heinecke <andre.heinecke@intevation.de> parents: 365 diff changeset	1411 }
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1412
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1413 void MainWindow::toggleInManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1414 {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1415 if (!mUpdatesManual->contains(cert)) {
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1416 QToolButton* actionBtn = new QToolButton();
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1417 QIcon btnIcon;
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1418 btnIcon.addFile(":/img/write-into-48.png", QSize(48, 48), QIcon::Normal, QIcon::On);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1419 btnIcon.addFile(":/img/write-remove-48.png", QSize(48, 48), QIcon::Normal, QIcon::Off);
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1420 actionBtn->setProperty("ToolTip_On", tr(NEW_INSTALL_TT));
6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1421 actionBtn->setProperty("ToolTip_Off", tr(NEW_REMOVE_TT));
1106 6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1422 actionBtn->setIcon(btnIcon);
6f7b7d88f048 (issue115) Rework CertificateListWidgets to have a ToolButton instead of a combobox Andre Heinecke <andre.heinecke@intevation.de> parents: 1104 diff changeset	1423 mUpdatesManual->addCertificate(cert, state, actionBtn);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1424 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1425 else {
1107 51d3b361f17a Revert commit 1102 Andre Heinecke <andre.heinecke@intevation.de> parents: 1106 diff changeset	1426 mUpdatesManual->removeCertificate(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1427 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1428 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1429
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1430 void MainWindow::removeFromManual(bool state, const Certificate &cert)
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1431 {
1107 51d3b361f17a Revert commit 1102 Andre Heinecke <andre.heinecke@intevation.de> parents: 1106 diff changeset	1432 mUpdatesManual->removeCertificate(cert);
640 626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1433
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1434 if (cert.isInstallCert()) {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1435 mInstallList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1436 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1437 else {
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1438 mRemoveList->setCertState(state, cert);
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1439 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1440 }
626507197360 Updated mainwindow and handle certificate lists. Raimund Renkert <rrenkert@intevation.de> parents: 628 diff changeset	1441
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1442 void MainWindow::closeApp()
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1443 {
782 20ca94680003 Implemented detection of running instance on linux using a lock file. Sascha Wilde <wilde@intevation.de> parents: 754 diff changeset	1444 ProcessHelp::cleanUp();
447 b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1445 qApp->quit();
b1b14daf2116 Save the select state of certificate items when closing the app. Raimund Renkert <rrenkert@intevation.de> parents: 446 diff changeset	1446 }
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1447
609 292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1448 void MainWindow::checkAndInstallCerts()
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1449 {
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1450 /* 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	1451 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	1452 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	1453
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1454 if (pids.isEmpty()) {
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1455 installCerts();
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1456 return;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1457 }
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1458
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1459 QStringList pNames;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1460 pNames << "firefox" << "thunderbird";
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1461
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1462 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	1463
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1464 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	1465 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	1466
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1467 waitDialog->exec();
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1468 return;
292c590ba9cb Add warning dialog for running firefox and tunderbird processes Andre Heinecke <andre.heinecke@intevation.de> parents: 607 diff changeset	1469 }
654 129e611eaf50 Merge branch trustbridge-refactor Andre Heinecke <andre.heinecke@intevation.de> parents: 609 653 diff changeset	1470
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1471 void MainWindow::togglePages(int button)
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1472 {
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1473 mUpdatesWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1474 mInstallWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1475 mRemoveWidget->hide();
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1476 mInfoWidget->hide();
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1477 switch(button) {
743 a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1478 case 0: mUpdatesWidget->show(); break;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1479 case 1: mInstallWidget->show(); break;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1480 case 2: mRemoveWidget->show(); break;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1481 case 3: mInfoWidget->show(); break;
a467204a35f5 Rework User Interface. Andre Heinecke <andre.heinecke@intevation.de> parents: 740 diff changeset	1482 default: mUpdatesWidget->show(); break;
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1483 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1484 return;
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1485 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1486
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1487 static void deactivateDetailsButton(QPushButton *btn) {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1488 btn->setToolTip(QObject::tr("Hide details"));
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1489 btn->setText(" " + QObject::tr("Less"));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1490 btn->setIcon(QIcon(":/img/dialog-information_grey_16px.png"));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1491 }
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1492
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1493 static void activateDetailsButton(QPushButton *btn) {
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1494 btn->setToolTip(QObject::tr("Show details"));
1104 a7a72353d6d2 (issue111) Wording and German translation. Emanuel Schuetze <emanuel@intevation.de> parents: 1103 diff changeset	1495 btn->setText(" " + QObject::tr("Details"));
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1496 btn->setIcon(QIcon(":/img/dialog-information_16px.png"));
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1497 }
75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1498
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1499 void MainWindow::toggleUpdatesNew() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1500 if (!mUpdatesNew->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1501 mUpdatesNew->show();
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1502 deactivateDetailsButton(mUpdatesDetailsNew);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1503 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1504 else {
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1505 mUpdatesNew->hide();
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1506 activateDetailsButton(mUpdatesDetailsNew);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1507 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1508 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1509
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1510 void MainWindow::toggleUpdatesRemove() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1511 if (!mUpdatesRemove->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1512 mUpdatesRemove->show();
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1513 deactivateDetailsButton(mUpdatesDetailsRemove);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1514 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1515 else {
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1516 mUpdatesRemove->hide();
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1517 activateDetailsButton(mUpdatesDetailsRemove);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1518 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1519 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1520
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1521 void MainWindow::toggleUpdatesManual() {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1522 if (!mUpdatesManual->isVisible()) {
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1523 mUpdatesManual->show();
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1524 mManualDetailsShown = true;
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1525 deactivateDetailsButton(mUpdatesDetailsManual);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1526 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1527 else {
653 39f03316f675 Change button text when toggling details and select the first list item. Raimund Renkert <rrenkert@intevation.de> parents: 652 diff changeset	1528 mUpdatesManual->hide();
1109 6594e8e63a25 (issue115) Add tooltips and fix manual changes handling Andre Heinecke <andre.heinecke@intevation.de> parents: 1107 diff changeset	1529 mManualDetailsShown = false;
1098 75a5bfe0525e (issue111) Rework Updates ui Andre Heinecke <andre.heinecke@intevation.de> parents: 1097 diff changeset	1530 activateDetailsButton(mUpdatesDetailsManual);
584 ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1531 }
ebfe1128ee97 Started trustbridge mainwindow refactoring. Raimund Renkert <rrenkert@intevation.de> parents: 563 diff changeset	1532 }
690 e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1533
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1534 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	1535 {
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1536 if (getState() == NewListAvailable) {
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1537 /* 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	1538 QMainWindow::closeEvent(event);
965 013ca910589a Open main window in case of error message. Andre Heinecke <andre.heinecke@intevation.de> parents: 964 diff changeset	1539 mTrayIcon->show();
690 e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1540 return;
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1541 }
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1542 return closeApp();
e4abb41484a0 (issue 27)Only close if no new list is available Andre Heinecke <andre.heinecke@intevation.de> parents: 689 diff changeset	1543 }
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1544
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1545 void MainWindow::updateCheckSuccess()
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1546 {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1547 if (getState() != TransferError) {
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1548 const QDateTime now = QDateTime::currentDateTime();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1549 mSettings.setValue("lastUpdateCheck", now);
754 27043d74dc90 (Issue25) Align header contents in their own column. Andre Heinecke <andre.heinecke@intevation.de> parents: 748 diff changeset	1550 mLastUpdateCheckContents->setText(QLocale::system().toString(now, DATETIME_FORMAT));
27043d74dc90 (Issue25) Align header contents in their own column. Andre Heinecke <andre.heinecke@intevation.de> parents: 748 diff changeset	1551 mLastUpdateCheckContents->show();
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1552 mLastUpdateCheck->show();
bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1553 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	1554 }
1042 74951e389cb1 (issue103) Only shut down if the mainwidow is not visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1034 diff changeset	1555 if ((getState() != NewSoftwareAvailable && getState() != NewListAvailable && mTrayMode)
74951e389cb1 (issue103) Only shut down if the mainwidow is not visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1034 diff changeset	1556 && !isVisible()) {
962 0a4f7235e759 Close the application if nothing new is available and in tray mode. Andre Heinecke <andre.heinecke@intevation.de> parents: 961 diff changeset	1557 qDebug() << "Shutting down as no list or Software is available.";
0a4f7235e759 Close the application if nothing new is available and in tray mode. Andre Heinecke <andre.heinecke@intevation.de> parents: 961 diff changeset	1558 closeApp();
0a4f7235e759 Close the application if nothing new is available and in tray mode. Andre Heinecke <andre.heinecke@intevation.de> parents: 961 diff changeset	1559 } else {
0a4f7235e759 Close the application if nothing new is available and in tray mode. Andre Heinecke <andre.heinecke@intevation.de> parents: 961 diff changeset	1560 mTrayIcon->show();
0a4f7235e759 Close the application if nothing new is available and in tray mode. Andre Heinecke <andre.heinecke@intevation.de> parents: 961 diff changeset	1561 }
708 bd48fae793b6 (Issue25) Log update check success, change header labels. Andre Heinecke <andre.heinecke@intevation.de> parents: 703 diff changeset	1562 }
716 929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1563
929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1564 int MainWindow::changeCount()
929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1565 {
929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1566 return mChangeCount;
929c3db85eb7 Add central place to obtain current change count. Andre Heinecke <andre.heinecke@intevation.de> parents: 714 diff changeset	1567 }
722 b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1568
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1569 void MainWindow::setChangeCount(int cnt)
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1570 {
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1571 if (mChangeCount != cnt) {
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1572 mChangeCount = cnt;
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1573 emit changesChanged(QString("%1").arg(cnt));
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1574 }
b0929968562a (Issue31) Add textoverlaybutton to show a text in the button. Andre Heinecke <andre.heinecke@intevation.de> parents: 719 diff changeset	1575 }
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1576
956 879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1577 void MainWindow::showProxySettings()
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1578 {
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1579 ProxySettingsDlg *dlg = new ProxySettingsDlg(this);
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1580 dlg->exec();
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1581 }
879a634d0a40 (issue41) Add proxy support Andre Heinecke <andre.heinecke@intevation.de> parents: 940 diff changeset	1582
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1583 void MainWindow::showHelp()
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1584 {
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1585 char *inst_dir = get_install_dir();
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1586 if (!inst_dir) {
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1587 qDebug() << "Failed to find install dir";
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1588 return;
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1589 }
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1590 QString helpPath = QString::fromUtf8(inst_dir);
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1591 helpPath += HELP_PATH;
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1592 QFileInfo fiHelp(helpPath);
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1593 qDebug() << "Opening help: " << fiHelp.absoluteFilePath();
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1594 if (!fiHelp.exists()) {
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1595 QMessageBox::warning(this, tr("Error!"), tr ("Failed to find the manual"));
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1596 return;
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1597 }
966 9783e32e215f (issue89) Use platform specific help url. Andre Heinecke <andre.heinecke@intevation.de> parents: 965 diff changeset	1598 #ifdef Q_OS_WIN
9783e32e215f (issue89) Use platform specific help url. Andre Heinecke <andre.heinecke@intevation.de> parents: 965 diff changeset	1599 QDesktopServices::openUrl(QUrl("file:///" + fiHelp.absoluteFilePath()));
9783e32e215f (issue89) Use platform specific help url. Andre Heinecke <andre.heinecke@intevation.de> parents: 965 diff changeset	1600 #else
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1601 QDesktopServices::openUrl(QUrl(fiHelp.absoluteFilePath()));
966 9783e32e215f (issue89) Use platform specific help url. Andre Heinecke <andre.heinecke@intevation.de> parents: 965 diff changeset	1602 #endif
940 7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1603 free (inst_dir);
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1604 return;
7c89c5dc2200 (issue89) Add ui to open help in browser Andre Heinecke <andre.heinecke@intevation.de> parents: 932 diff changeset	1605 }
1061 db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	1606
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	1607 void MainWindow::showErrorMessage(const QString &msg)
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	1608 {
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	1609 QMessageBox::warning(this, tr("TrustBridge error"), msg);
db831a204a6b (issue38) Show error message as messagebox if the window is visible Andre Heinecke <andre.heinecke@intevation.de> parents: 1056 diff changeset	1610 }

Mercurial > trustbridge

annotate ui/mainwindow.cpp @ 1109:6594e8e63a25