From 3955bf3ab55455b9d0884f690f087a0bf3690674 Mon Sep 17 00:00:00 2001 From: Krzysztof Nowicki Date: Sat, 30 Apr 2016 22:21:14 +0200 Subject: [PATCH] Add about tab in configuration dialog --- CMakeLists.txt | 2 + config.h.cmake | 2 + configdialog.cpp | 9 +++++ configdialog.ui | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee4ecb7..de65dec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,8 @@ option(HAVE_SEPARATE_MTA_RESOURCE "Build a separate resource for sending e-mail. option(HAVE_INBOX_FILTERING_WORKAROUND "Include inbox filtering workaround." TRUE) option(ENABLE_TESTS "Build the test suite." FALSE) +set(AKONADI_EWS_VERSION "0.8.0") + add_subdirectory(ewsclient) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/config.h.cmake b/config.h.cmake index d199871..8794132 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -5,4 +5,6 @@ #cmakedefine HAVE_INBOX_FILTERING_WORKAROUND +#cmakedefine AKONADI_EWS_VERSION "@AKONADI_EWS_VERSION@" + #endif diff --git a/configdialog.cpp b/configdialog.cpp index 9ee849c..f591be9 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -91,6 +91,15 @@ ConfigDialog::ConfigDialog(EwsResource *parentResource, EwsClient &client, WId w mParentResource->requestPassword(password, false); mUi->passwordEdit->setText(password); + QIcon ewsIcon = QIcon::fromTheme(QStringLiteral("akonadi-ews")); + qDebug() << ewsIcon.availableSizes(); + mUi->aboutIconLabel->setPixmap(ewsIcon.pixmap(96, 96, QIcon::Normal, QIcon::On)); + mUi->aboutTextLabel->setText(i18nc("@info", "Akonadi Resource for Microsoft Exchange Web Services (EWS)")); + mUi->aboutCopyrightLabel->setText(i18nc("@info", "Copyright (c) Krzysztof Nowicki 2015-2016")); + mUi->aboutVersionLabel->setText(i18nc("@info", "Version %1").arg(AKONADI_EWS_VERSION)); + mUi->aboutLicenseLabel->setText(i18nc("@info", "Distributed under the GNU Library General Public License version 2.0 or later.")); + mUi->aboutUrlLabel->setText(QStringLiteral("https://github.com/KrissN/akonadi-ews")); + connect(okButton, &QPushButton::clicked, this, &ConfigDialog::save); connect(mUi->autodiscoverButton, &QPushButton::clicked, this, &ConfigDialog::performAutoDiscovery); connect(mUi->kcfg_Username, SIGNAL(textChanged(const QString&)), this, SLOT(setAutoDiscoveryNeeded())); diff --git a/configdialog.ui b/configdialog.ui index a6597bd..b6490d7 100644 --- a/configdialog.ui +++ b/configdialog.ui @@ -388,6 +388,106 @@ + + + About + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + ../../../../../usr/share/icons/hicolor/128x128/apps/akonadi-ews.png + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 0 + 0 + + + + + + + true + + + + + + + + + + + + + + + + true + + + + + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + +