Draw settings check and radio buttons and workaround background image…

… issues (#856)

IB-6572

Signed-off-by: Raul Metsma <raul@metsma.ee>

CMakeLists.txt

@@ -15,7 +15,7 @@ include( VersionInfo )
 find_package( PKCS11 )
 find_package( LibDigiDocpp 3.14.4 REQUIRED )
 find_package( LDAP REQUIRED )
-find_package( Qt5 COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools REQUIRED )
+find_package( Qt5 5.9.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools )
 
 set_env( TSL_URL "https://ec.europa.eu/tools/lotl/eu-lotl.xml" CACHE STRING "TSL trust list primary URL" )
 set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list include in binary" )

client/CMakeLists.txt

@@ -99,6 +99,7 @@ add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE
 	widgets/AddressItem.cpp
 	widgets/CardWidget.cpp
 	widgets/CardPopup.cpp
+	widgets/CheckBox.cpp
 	widgets/ContainerPage.cpp
 	widgets/ComboBox.cpp
 	widgets/DropdownButton.cpp
@@ -113,6 +114,7 @@ add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE
 	widgets/NoCardInfo.cpp
 	widgets/OtherData.cpp
 	widgets/PageIcon.cpp
+	widgets/RadioButton.cpp
 	widgets/SignatureItem.cpp
 	widgets/StyledWidget.cpp
 	widgets/VerifyCert.cpp

client/dialogs/FirstRun.cpp

@@ -65,7 +65,7 @@ FirstRun::FirstRun(QWidget *parent)
 	else
 		ui->lang->setCurrentIndex(0);
 
-	connect( ui->lang, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this](int index) {
+	connect(ui->lang, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
 		switch(index)
 		{
 		case 1: emit langChanged(QStringLiteral("en")); break;

client/dialogs/FirstRun.ui

@@ -99,16 +99,15 @@ QComboBox QWidget#content {
 /* rows */
 QComboBox QPushButton {
     margin: 3px;
-    padding: 0px 4px 0px 8px;
+    padding: 0px 8px 0px 4px;
     border: 0px;
     color: #353739;
     text-align: left;
+    qproperty-iconSize: 14px 9px;
+    qproperty-layoutDirection: RightToLeft;
 }
 QComboBox QPushButton#selected {
-    background-image: url(:/images/arrow_up.svg);
-    background-position: right center;
-    background-repeat: none;
-    background-origin: content;
+    qproperty-icon: url(:/images/arrow_up.svg);
 }
 
 /* hover row */
@@ -117,7 +116,7 @@ QComboBox QPushButton:hover {
     color: #FFFFFF;
 }
 QComboBox QPushButton:hover#selected {
-    background-image: url(:/images/arrow_up_white.svg);
+    qproperty-icon: url(:/images/arrow_up_white.svg);
 }
 
 /* drop-down button*/

client/dialogs/SettingsDialog.cpp

@@ -49,12 +49,12 @@
 #include <QtCore/QIODevice>
 #include <QtCore/QJsonObject>
 #include <QtCore/QProcess>
+#include <QtCore/QSettings>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QThread>
 #include <QtCore/QThreadPool>
 #include <QtCore/QUrl>
 #include <QtGui/QDesktopServices>
-#include <QtCore/QSettings>
 #include <QtNetwork/QNetworkProxy>
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QTextBrowser>
@@ -245,7 +245,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 	ui->pageGroup->setId(ui->btnMenuProxy, NetworkSettings);
 	ui->pageGroup->setId(ui->btnMenuDiagnostics, DiagnosticsSettings);
 	ui->pageGroup->setId(ui->btnMenuInfo, LicenseSettings);
-	connect(ui->pageGroup, static_cast<void (QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked), this, &SettingsDialog::changePage);
+	connect(ui->pageGroup, QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked), this, &SettingsDialog::changePage);
 
 	initFunctionality();
 	updateVersion();
@@ -258,7 +258,6 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	showPage(page);
 }
 
-
 SettingsDialog::~SettingsDialog()
 {
 	QApplication::restoreOverrideCursor();
@@ -359,7 +358,7 @@ void SettingsDialog::initFunctionality()
 		if(!dir.isEmpty())
 		{
 			ui->rdGeneralSpecifyDirectory->setChecked(true);
-			setValueEx(QStringLiteral("DefaultDir"), dir, QString());
+			setValueEx(QStringLiteral("DefaultDir"), dir);
 			ui->txtGeneralDirectory->setText(dir);
 		}
 	});
@@ -373,7 +372,7 @@ void SettingsDialog::initFunctionality()
 	if(ui->txtGeneralDirectory->text().isEmpty())
 		ui->rdGeneralSameDirectory->setChecked(true);
 	connect(ui->txtGeneralDirectory, &QLineEdit::textChanged, this, [](const QString &text) {
-		setValueEx(QStringLiteral("DefaultDir"), text, QString());
+		setValueEx(QStringLiteral("DefaultDir"), text);
 	});
 #endif
 
@@ -444,8 +443,8 @@ void SettingsDialog::initFunctionality()
 	ui->rdMIDUUIDCustom->setChecked(s.value(QStringLiteral("MIDUUID-CUSTOM"), s.contains(QStringLiteral("MIDUUID"))).toBool());
 	ui->txtMIDUUID->setText(s.value(QStringLiteral("MIDUUID")).toString());
 	connect(ui->txtMIDUUID, &QLineEdit::textChanged, this, [](const QString &text) {
-		setValueEx(QStringLiteral("MIDUUID"), text, QString());
-		setValueEx(QStringLiteral("SIDUUID"), text, QString());
+		setValueEx(QStringLiteral("MIDUUID"), text);
+		setValueEx(QStringLiteral("SIDUUID"), text);
 	});
 	connect(ui->helpRevocation, &QToolButton::clicked, this, []{
 		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/access-certificate-what-is-it/"));
@@ -531,7 +530,7 @@ void SettingsDialog::saveProxy()
 
 void SettingsDialog::setValueEx(const QString &key, const QVariant &value, const QVariant &def)
 {
-	if(value == def)
+	if(value == def || (def.isNull() && value.isNull()))
 		QSettings().remove(key);
 	else
 		QSettings().setValue(key, value);

client/dialogs/SettingsDialog.h

@@ -21,6 +21,8 @@
 
 #include <QDialog>
 
+#include <QVariant>
+
 namespace digidoc { class Conf; }
 
 namespace Ui {
@@ -29,7 +31,7 @@ class SettingsDialog;
 
 class QAbstractButton;
 
-class SettingsDialog : public QDialog
+class SettingsDialog final: public QDialog
 {
 	Q_OBJECT
 
@@ -48,7 +50,7 @@ class SettingsDialog : public QDialog
 
 	void showPage(int page);
 	static void loadProxy( const digidoc::Conf *conf );
-	static void setValueEx( const QString &key, const QVariant &value, const QVariant &def );
+	static void setValueEx(const QString &key, const QVariant &value, const QVariant &def = {});
 
 signals:
 	void langChanged(const QString& lang);