Unverified Commit 1855df20 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Use aboutdata from libkleo / Gpg4win on Windows

On Windows we distribute Kleopatra as part of a package
and we take the about data from the filesystem to have it
match the Package Version.

GnuPG-Bug-Id: T5011
parent e5ef3192
......@@ -12,6 +12,8 @@
#include "aboutdata.h"
#include <Libkleo/GnuPG>
#include <KLocalizedString>
static const char kleopatra_version[] = KLEOPATRA_VERSION_STRING;
......@@ -66,12 +68,19 @@ static const about_data credits[] = {
AboutData::AboutData()
: KAboutData(QStringLiteral("kleopatra"), i18n("Kleopatra"),
QLatin1String(kleopatra_version), i18n(description), KAboutLicense::GPL,
#ifdef Q_OS_WIN
Kleo::gpg4winVersion(),
Kleo::gpg4winDescription(),
#else
QLatin1String(kleopatra_version),
i18n(description),
#endif
KAboutLicense::GPL,
i18n("(c) 2002 Steffen\u00A0Hansen, Matthias\u00A0Kalle\u00A0" "Dalheimer, Klar\u00E4lvdalens\u00A0" "Datakonsult\u00A0" "AB\n"
"(c) 2004, 2007, 2008, 2009 Marc\u00A0Mutz, Klar\u00E4lvdalens\u00A0" "Datakonsult\u00A0" "AB") +
QLatin1Char('\n') + i18n("(c) 2010-2019 The Kleopatra developers")
#ifdef Q_OS_WIN
, i18n("<a href=https://www.gpg4win.org>Visit the Gpg4win homepage</a>")
, Kleo::gpg4winLongDescription()
#endif
)
{
......
......@@ -10,6 +10,7 @@
#include "welcomewidget.h"
#include <version-kleopatra.h>
#include <Libkleo/GnuPG>
#include <QVBoxLayout>
#include <QHBoxLayout>
......@@ -40,7 +41,11 @@ public:
auto hLay = new QHBoxLayout;
const QString welcome = i18nc("%1 is version", "Welcome to Kleopatra %1",
#ifdef Q_OS_WIN
Kleo::gpg4winVersion());
#else
QStringLiteral(KLEOPATRA_VERSION_STRING));
#endif
const QString introduction = i18n("Kleopatra is a front-end for the crypto software <a href=\"https://gnupg.org\">GnuPG</a>.");
const QString keyExplanation = i18n("For most actions you need either a public key (certificate) or your own private key.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment