diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp index bb9915e83..985f9ea02 100644 --- a/attica-kde/kdeplugin/kdeplatformdependent.cpp +++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp @@ -1,264 +1,264 @@ /* This file is part of KDE. Copyright (c) 2009 Eckhart Wörner Copyright (c) 2010 Frederik Gladhorn This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "kdeplatformdependent.h" #include "attica_plugin_debug.h" #include #include "attica_plugin_debug.h" #include #include #include #include #include #include #include using namespace Attica; KdePlatformDependent::KdePlatformDependent() : m_config(KSharedConfig::openConfig("atticarc")), m_accessManager(0), m_wallet(0) { // FIXME: Investigate how to not leak this instance witohut crashing. m_accessManager = new QNetworkAccessManager(0); const QString cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/attica"); QNetworkDiskCache *cache = new QNetworkDiskCache(m_accessManager); QStorageInfo storageInfo(cacheDir); cache->setCacheDirectory(cacheDir); cache->setMaximumCacheSize(storageInfo.bytesTotal() / 1000); m_accessManager->setCache(cache); } KdePlatformDependent::~KdePlatformDependent() { delete m_wallet; } bool KdePlatformDependent::openWallet(bool force) { if (m_wallet) { return true; } QString networkWallet = KWallet::Wallet::NetworkWallet(); // if not forced, or the folder doesn't exist, don't try to open the wallet if (force || (!KWallet::Wallet::folderDoesNotExist(networkWallet, "Attica"))) { m_wallet = KWallet::Wallet::openWallet(networkWallet, 0); } if (m_wallet) { m_wallet->createFolder("Attica"); m_wallet->setFolder("Attica"); return true; } return false; } QNetworkReply* KdePlatformDependent::post(const QNetworkRequest& request, const QByteArray& data) { return m_accessManager->post(removeAuthFromRequest(request), data); } QNetworkReply* KdePlatformDependent::post(const QNetworkRequest& request, QIODevice* data) { return m_accessManager->post(removeAuthFromRequest(request), data); } QNetworkReply* KdePlatformDependent::get(const QNetworkRequest& request) { return m_accessManager->get(removeAuthFromRequest(request)); } QNetworkRequest KdePlatformDependent::removeAuthFromRequest(const QNetworkRequest& request) { const QStringList noauth = { "no-auth-prompt", "true" }; QNetworkRequest notConstReq = const_cast(request); notConstReq.setAttribute(QNetworkRequest::User, noauth); return notConstReq; } bool KdePlatformDependent::saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password) { m_passwords[baseUrl.toString()] = qMakePair(user, password); if (!m_wallet && !openWallet(true)) { if (KMessageBox::warningContinueCancel(0, i18n("Should the password be stored in the configuration file? This is unsafe.") , i18n("Social Desktop Configuration")) == KMessageBox::Cancel) { return false; } // use kconfig KConfigGroup group(m_config, baseUrl.toString()); group.writeEntry("user", user); group.writeEntry("password", KStringHandler::obscure(password)); qCDebug(ATTICA_PLUGIN_LOG) << "Saved credentials in KConfig"; return true; } // Remove the entry when user name is empty if (user.isEmpty()) { m_wallet->removeEntry(baseUrl.toString()); return true; } const QMap entries = { { "user", user }, { "password", password } }; qCDebug(ATTICA_PLUGIN_LOG) << "Saved credentials in KWallet"; return !m_wallet->writeMap(baseUrl.toString(), entries); } bool KdePlatformDependent::hasCredentials(const QUrl& baseUrl) const { if (m_passwords.contains(baseUrl.toString())) { return true; } QString networkWallet = KWallet::Wallet::NetworkWallet(); if (!KWallet::Wallet::folderDoesNotExist(networkWallet, "Attica") && !KWallet::Wallet::keyDoesNotExist(networkWallet, "Attica", baseUrl.toString())) { qCDebug(ATTICA_PLUGIN_LOG) << "Found credentials in KWallet"; return true; } KConfigGroup group(m_config, baseUrl.toString()); const QString user = group.readEntry("user", QString()); qCDebug(ATTICA_PLUGIN_LOG) << "Credentials found:" << !user.isEmpty(); return !user.isEmpty(); } bool KdePlatformDependent::loadCredentials(const QUrl& baseUrl, QString& user, QString& password) { QString networkWallet = KWallet::Wallet::NetworkWallet(); if (KWallet::Wallet::folderDoesNotExist(networkWallet, "Attica") && KWallet::Wallet::keyDoesNotExist(networkWallet, "Attica", baseUrl.toString())) { // use KConfig KConfigGroup group(m_config, baseUrl.toString()); user = group.readEntry("user", QString()); password = KStringHandler::obscure(group.readEntry("password", QString())); if (!user.isEmpty()) { qCDebug(ATTICA_PLUGIN_LOG) << "Successfully loaded credentials from kconfig"; m_passwords[baseUrl.toString()] = qMakePair(user, password); return true; } return false; } if (!m_wallet && !openWallet(true)) { return false; } QMap entries; if (m_wallet->readMap(baseUrl.toString(), entries) != 0) { return false; } user = entries.value("user"); password = entries.value("password"); qCDebug(ATTICA_PLUGIN_LOG) << "Successfully loaded credentials."; m_passwords[baseUrl.toString()] = qMakePair(user, password); return true; } bool Attica::KdePlatformDependent::askForCredentials(const QUrl& baseUrl, QString& user, QString& password) { Q_UNUSED(baseUrl); Q_UNUSED(user); Q_UNUSED(password); return false; } QList KdePlatformDependent::getDefaultProviderFiles() const { KConfigGroup group(m_config, "General"); - QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("http://download.kde.org/ocs/providers.xml")); + QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("https://autoconfig.kde.org/ocs/providers.xml")); QList paths; foreach (const QString& pathString, pathStrings) { paths.append(QUrl(pathString)); } qCDebug(ATTICA_PLUGIN_LOG) << "Loaded paths from config:" << paths; return paths; } void KdePlatformDependent::addDefaultProviderFile(const QUrl& url) { KConfigGroup group(m_config, "General"); - QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("http://download.kde.org/ocs/providers.xml")); + QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("https://autoconfig.kde.org/ocs/providers.xml")); QString urlString = url.toString(); if(!pathStrings.contains(urlString)) { pathStrings.append(urlString); group.writeEntry("providerFiles", pathStrings); group.sync(); qCDebug(ATTICA_PLUGIN_LOG) << "wrote providers: " << pathStrings; } } void KdePlatformDependent::removeDefaultProviderFile(const QUrl& url) { KConfigGroup group(m_config, "General"); - QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("http://download.kde.org/ocs/providers.xml")); + QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("https://autoconfig.kde.org/ocs/providers.xml")); pathStrings.removeAll(url.toString()); group.writeEntry("providerFiles", pathStrings); } void KdePlatformDependent::enableProvider(const QUrl& baseUrl, bool enabled) const { KConfigGroup group(m_config, "General"); QStringList pathStrings = group.readPathEntry("disabledProviders", QStringList()); if (enabled) { pathStrings.removeAll(baseUrl.toString()); } else { if (!pathStrings.contains(baseUrl.toString())) { pathStrings.append(baseUrl.toString()); } } group.writeEntry("disabledProviders", pathStrings); group.sync(); } bool KdePlatformDependent::isEnabled(const QUrl& baseUrl) const { KConfigGroup group(m_config, "General"); return !group.readPathEntry("disabledProviders", QStringList()).contains(baseUrl.toString()); } QNetworkAccessManager* Attica::KdePlatformDependent::nam() { return m_accessManager; } // TODO: re-enable, see http://community.kde.org/Frameworks/Porting_Notes // Q_EXPORT_PLUGIN2(attica_kde, Attica::KdePlatformDependent) diff --git a/kcms/colors/colorschemes.knsrc b/kcms/colors/colorschemes.knsrc index ddb778c4d..b412e1ed8 100644 --- a/kcms/colors/colorschemes.knsrc +++ b/kcms/colors/colorschemes.knsrc @@ -1,46 +1,46 @@ [KNewStuff3] Name=Color Schemes Name[ar]=مخطّطات الألوان Name[ca]=Esquemes de color Name[ca@valencia]=Esquemes de color Name[cs]=Barevná schémata Name[da]=Farvetemaer Name[de]=Farbschemata Name[el]=Θέματα χρωμάτων Name[en_GB]=Colour Schemes Name[es]=Esquemas de color Name[eu]=Kolore-eskemak Name[fi]=Väriteemat Name[fr]=Schémas de couleurs Name[gl]=Esquemas de cores Name[he]=ערכות צבעים Name[hu]=Színsémák Name[id]=Skema Warna Name[it]=Schemi di colore Name[ko]=색 배열 Name[lt]=Spalvų deriniai Name[nl]=Kleurenschema's Name[nn]=Fargeoppsett Name[pa]=ਰੰਗ ਸਕੀਮ Name[pl]=Zestawy kolorów Name[pt]=Esquemas de Cores Name[pt_BR]=Esquemas de cores Name[ru]=Цветовые схемы Name[sk]=Farebné schémy Name[sl]=Barvne sheme Name[sr]=Шеме боја Name[sr@ijekavian]=Шеме боја Name[sr@ijekavianlatin]=Šeme boja Name[sr@latin]=Šeme boja Name[sv]=Färgscheman Name[tr]=Renk Şemaları Name[uk]=Схеми кольорів Name[x-test]=xxColor Schemesxx Name[zh_CN]=配色方案 Name[zh_TW]=顏色機制 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml TargetDir=color-schemes Uncompress=archive Categories=KDE Color Scheme KDE4 UploadCategories=KDE Color Scheme KDE4 diff --git a/kcms/cursortheme/xcursor/xcursor.knsrc b/kcms/cursortheme/xcursor/xcursor.knsrc index 9ced90fb5..626179b1a 100644 --- a/kcms/cursortheme/xcursor/xcursor.knsrc +++ b/kcms/cursortheme/xcursor/xcursor.knsrc @@ -1,46 +1,46 @@ [KNewStuff3] Name=Cursors Name[ar]=المؤشّرات Name[ca]=Cursors Name[ca@valencia]=Cursors Name[cs]=Kurzory Name[da]=Markører Name[de]=Zeiger Name[el]=Δρομείς Name[en_GB]=Cursors Name[es]=Cursores Name[eu]=Kurtsoreak Name[fi]=Osoittimet Name[fr]=Pointeurs Name[gl]=Cursores Name[he]=מצביעים Name[hu]=Kurzorok Name[id]=Kursor Name[it]=Puntatori Name[ja]=カーソル Name[ko]=커서 Name[lt]=Žymekliai Name[nl]=Cursors Name[nn]=Peikarar Name[pa]=ਕਰਸਰਾਂ Name[pl]=Wskaźniki Name[pt]=Cursores Name[pt_BR]=Cursores Name[ru]=Курсоры мыши Name[sk]=Kurzory Name[sl]=Kazalke Name[sr]=Показивачи Name[sr@ijekavian]=Показивачи Name[sr@ijekavianlatin]=Pokazivači Name[sr@latin]=Pokazivači Name[sv]=Pekare Name[tr]=İmleçler Name[uk]=Вказівники Name[x-test]=xxCursorsxx Name[zh_CN]=光标 Name[zh_TW]=游標 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=X11 Mouse Theme InstallPath=.icons Uncompress=always diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 945bfa15d..ce47c239d 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -1,46 +1,46 @@ [KNewStuff3] Name=Plasma Themes Name[ar]=سمات بلازما Name[ca]=Temes del Plasma Name[ca@valencia]=Temes del Plasma Name[cs]=Motivy Plasmy Name[da]=Plasma-temaer Name[de]=Plasma-Designs Name[el]=Θέματα Plasma Name[en_GB]=Plasma Themes Name[es]=Temas de Plasma Name[eu]=Plasmaren gaiak Name[fi]=Plasma-teemat Name[fr]=Thèmes Plasma Name[gl]=Temas de Plasma Name[he]=ערכות נושא של Plasma Name[hu]=Plasma témák Name[id]=Tema Plasma Name[it]=Temi di Plasma Name[ko]=Plasma 테마 Name[lt]=Plasma apipavidalinimai Name[nl]=Plasma-thema's Name[nn]=Plasma-tema Name[pa]=ਪਲਾਜ਼ਮਾ ਥੀਮ Name[pl]=Wyglądy Plazmy Name[pt]=Temas do Plasma Name[pt_BR]=Temas do Plasma Name[ru]=Тема рабочего стола Plasma Name[sk]=Témy Plasma Name[sl]=Teme Plasma Name[sr]=Плазма теме Name[sr@ijekavian]=Плазма теме Name[sr@ijekavianlatin]=Plasma teme Name[sr@latin]=Plasma teme Name[sv]=Plasmateman Name[tr]=Plasma Temaları Name[uk]=Теми Плазми Name[x-test]=xxPlasma Themesxx Name[zh_CN]=Plasma 主题 Name[zh_TW]=Plasma 主題 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Plasma Theme StandardResource=tmp InstallationCommand=kpackagetool5 -t Plasma/Theme -i %f UninstallCommand=kpackagetool5 -t Plasma/Theme -r %f diff --git a/kcms/emoticons/emoticons.knsrc b/kcms/emoticons/emoticons.knsrc index 645b8cee6..154efaf9d 100644 --- a/kcms/emoticons/emoticons.knsrc +++ b/kcms/emoticons/emoticons.knsrc @@ -1,89 +1,89 @@ [KNewStuff3] Name=Emoticons Name[af]=Emotikons Name[ar]=الوجوه التّعبيرية Name[as]=ভাব-প্ৰতীক Name[be@latin]=Smajliki Name[bg]=Емотикони Name[bn]=ইমোট-আইকন Name[bn_IN]=ইমোআইকন Name[bs]=Emotikoni Name[ca]=Emoticones Name[ca@valencia]=Emoticones Name[cs]=Emotikony Name[csb]=Emòtikónczi Name[da]=Emotikoner Name[de]=Emoticons Name[el]=Εικονίδια διάθεσης Name[en_GB]=Emoticons Name[eo]=Miensimboloj Name[es]=Emoticonos Name[et]=Emotikonid Name[eu]=Aurpegierak Name[fa]=صورتک Name[fi]=Hymiöt Name[fr]=Émoticônes Name[fy]=Emobyldkaikes Name[ga]=Straoiseoga Name[gl]=Emoticonas Name[gu]=લાગણીઓ Name[he]=רגשונים Name[hi]=हँसमुख Name[hne]=चेहराचिनहा Name[hr]=Emoticons Name[hsb]=Emotikony Name[hu]=Emotikonok Name[ia]=Emoticones Name[id]=Emoticon Name[is]=Tjáningartákn Name[it]=Faccine Name[ja]=感情アイコン Name[kk]=Көңіл күйі белгілері Name[km]=សញ្ញា​អារម្មណ៍ Name[kn]=ಭಾವನಾಚಿಹ್ನೆಗಳು (ಎಮೋಟಿಕಾನ್) Name[ko]=이모티콘 Name[ku]=Emotîkon Name[lt]=Jaustukai Name[lv]=Emocijzīmes Name[mai]=भाव-प्रतीक Name[mk]=Емотикони Name[ml]=വികാരചിഹ്നങ്ങള്‍ Name[mr]=भावप्रतिमा Name[nb]=Humørfjes Name[nds]=Snuten Name[nl]=Emoticons Name[nn]=Fjesingar Name[or]=Emoticons Name[pa]=ਈਮੋਸ਼ਨ Name[pl]=Emotikony Name[pt]=Ícones Emotivos Name[pt_BR]=Emoticons Name[ro]=Emoticoni Name[ru]=Смайлики Name[si]=ඉමොටිකොන Name[sk]=Emotikony Name[sl]=Izrazne ikone Name[sr]=Емотикони Name[sr@ijekavian]=Емотикони Name[sr@ijekavianlatin]=Emotikoni Name[sr@latin]=Emotikoni Name[sv]=Smilisar Name[ta]=உணர்வோயியங்கள் Name[te]=ఎమొటికాన్లు Name[tg]=Тасвирчаҳо Name[th]=ไอคอนสื่ออารมณ์ Name[tr]=Duygu Simgeleri Name[ug]=چىراي ئىپادىلىرى Name[uk]=Емоційки Name[uz]=His-tuygʻular Name[uz@cyrillic]=Ҳис-туйғулар Name[vi]=Hình biểu cảm Name[wa]=Xhinêyes Name[x-test]=xxEmoticonsxx Name[zh_CN]=表情 Name[zh_TW]=表情圖示 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Emoticon Theme TargetDir=emoticons Uncompress=always diff --git a/kcms/icons/icons.knsrc b/kcms/icons/icons.knsrc index c9cf16202..8e8b78c4d 100644 --- a/kcms/icons/icons.knsrc +++ b/kcms/icons/icons.knsrc @@ -1,99 +1,99 @@ [KNewStuff3] Name=Icons Name[af]=Ikone Name[ar]=الأيقونات Name[as]=আইকন Name[be]=Значкі Name[be@latin]=Ikony Name[bg]=Икони Name[bn]=আইকন Name[bn_IN]=আইকন Name[br]=Arlunioù Name[bs]=Ikone Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony Name[csb]=Ikònë Name[cy]=Eicon Name[da]=Ikoner Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons Name[eo]=Piktogramoj Name[es]=Iconos Name[et]=Ikoonid Name[eu]=Ikonoak Name[fa]=شمایلها Name[fi]=Kuvakkeet Name[fr]=Icônes Name[fy]=Byldkaikes Name[ga]=Deilbhíní Name[gl]=Iconas Name[gu]=ચિહ્નો Name[he]=סמלים Name[hi]=प्रतीक Name[hne]=चिनहा Name[hr]=Ikone Name[hsb]=Piktogramy Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon Name[is]=Táknmyndir Name[it]=Icone Name[ja]=アイコン Name[ka]=ხატულები Name[kk]=Таңбашалар Name[km]=រូប​តំណាង Name[kn]=ಚಿಹ್ನೆಗಳು Name[ko]=아이콘 Name[ku]=Îkon Name[lt]=Ženkliukai Name[lv]=Ikonas Name[mai]=प्रतीक Name[mk]=Икони Name[ml]=ചിഹ്നങ്ങള്‍ Name[mr]=चिन्ह Name[ms]=Ikon Name[nb]=Ikoner Name[nds]=Lüttbiller Name[ne]=प्रतिमा Name[nl]=Pictogrammen Name[nn]=Ikon Name[oc]=Icònas Name[or]=ଚିତ୍ର ସଂକେତଗୁଡ଼ିକ Name[pa]=ਆਈਕਾਨ Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones Name[ro]=Pictograme Name[ru]=Значки Name[si]=අයිකන Name[sk]=Ikony Name[sl]=Ikone Name[sr]=Иконице Name[sr@ijekavian]=Иконице Name[sr@ijekavianlatin]=Ikonice Name[sr@latin]=Ikonice Name[sv]=Ikoner Name[ta]=சின்னங்கள் Name[te]=ప్రతిమలు Name[tg]=Нишонаҳо Name[th]=ไอคอน Name[tr]=Simgeler Name[ug]=سىنبەلگىلەر Name[uk]=Піктограми Name[uz]=Nishonchalar Name[uz@cyrillic]=Нишончалар Name[vi]=Biểu tượng Name[wa]=Imådjetes Name[xh]=Imphawu zemmifanekiso Name[x-test]=xxIconsxx Name[zh_CN]=图标 Name[zh_TW]=圖示 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=KDE Icon Theme TargetDir=icons Uncompress=true AdoptionCommand=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-changeicons %d