diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -7,7 +7,7 @@ Copyright (C) 2004 Reinhold Kainhofer Copyright (c) 2005 Rafal Rzepecki Copyright (c) 2010-2019 Laurent Montel - Copyright (c) 2012 Allen Winter + Copyright (c) 2012-2019 Allen Winter This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,6 +42,7 @@ #include "kocheckableproxymodel.h" #include #include "KdepimDBusInterfaces/ReminderClient" +#include "korganizer-version.h" #include #include @@ -1184,6 +1185,18 @@ void ActionManager::downloadNewStuff() { + // we may be a part and not an app. just in case, save settings so we can restore later + QString saveAppName = QCoreApplication::applicationName(); + QString saveAppVers = QCoreApplication::applicationVersion(); + QString saveOrgDomain = QCoreApplication::organizationDomain(); + QString saveAppDisplay = QApplication::applicationDisplayName(); + + // set values for this part + QCoreApplication::setApplicationName(QStringLiteral("korganizer")); + QCoreApplication::setApplicationVersion(QStringLiteral(KORGANIZER_VERSION)); + QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); + QApplication::setApplicationDisplayName(i18n("KOrganizer")); + QPointer dialog = new KNS3::DownloadDialog(mCalendarView); dialog->exec(); const auto installedEntries = dialog->installedEntries(); @@ -1229,6 +1242,12 @@ } } delete dialog; + + // restore application settings + QCoreApplication::setApplicationName(saveAppName); + QCoreApplication::setApplicationVersion(saveAppVers); + QCoreApplication::setOrganizationDomain(saveOrgDomain); + QApplication::setApplicationDisplayName(saveAppDisplay); } QString ActionManager::localFileName() diff --git a/src/data/korganizer.knsrc b/src/data/korganizer.knsrc --- a/src/data/korganizer.knsrc +++ b/src/data/korganizer.knsrc @@ -21,6 +21,6 @@ Name[uk]=Календар KOrganizer Name[x-test]=xxKOrganizer Calendarxx Name[zh_TW]=KOrganizer 行事曆 -ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=KOrganizer Calendar TargetDir=korganizer +Uncompress=archive