From 72b7bf65dee1b1c42afdca33a37635affc088596 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 16 Mar 2018 16:00:25 +0100 Subject: [PATCH] Rename KWalletPasswords plugin to KDESupport --- src/plugins/KDESupport/CMakeLists.txt | 15 ++ .../Messages.sh | 2 +- src/plugins/KDESupport/data/icon.svg | 132 ++++++++++++++++++ src/plugins/KDESupport/kdesupport.qrc | 6 + .../kdesupportplugin.cpp} | 16 +-- .../kdesupportplugin.h} | 14 +- .../kwalletpasswordbackend.cpp | 6 +- .../kwalletpasswordbackend.h | 2 +- src/plugins/KDESupport/metadata.desktop | 11 ++ src/plugins/KWalletPasswords/CMakeLists.txt | 16 --- src/plugins/KWalletPasswords/data/icon.png | Bin 1804 -> 0 bytes .../KWalletPasswords/kwalletpasswords.qrc | 6 - src/plugins/KWalletPasswords/metadata.desktop | 31 ---- 13 files changed, 184 insertions(+), 73 deletions(-) create mode 100644 src/plugins/KDESupport/CMakeLists.txt rename src/plugins/{KWalletPasswords => KDESupport}/Messages.sh (59%) create mode 100644 src/plugins/KDESupport/data/icon.svg create mode 100644 src/plugins/KDESupport/kdesupport.qrc rename src/plugins/{KWalletPasswords/kwalletplugin.cpp => KDESupport/kdesupportplugin.cpp} (80%) rename src/plugins/{KWalletPasswords/kwalletplugin.h => KDESupport/kdesupportplugin.h} (80%) rename src/plugins/{KWalletPasswords => KDESupport}/kwalletpasswordbackend.cpp (97%) rename src/plugins/{KWalletPasswords => KDESupport}/kwalletpasswordbackend.h (96%) create mode 100644 src/plugins/KDESupport/metadata.desktop delete mode 100644 src/plugins/KWalletPasswords/CMakeLists.txt delete mode 100644 src/plugins/KWalletPasswords/data/icon.png delete mode 100644 src/plugins/KWalletPasswords/kwalletpasswords.qrc delete mode 100644 src/plugins/KWalletPasswords/metadata.desktop diff --git a/src/plugins/KDESupport/CMakeLists.txt b/src/plugins/KDESupport/CMakeLists.txt new file mode 100644 index 000000000..04b7bf258 --- /dev/null +++ b/src/plugins/KDESupport/CMakeLists.txt @@ -0,0 +1,15 @@ +set(KDESupport_SRCS + kdesupportplugin.cpp + kwalletpasswordbackend.cpp +) + +ecm_create_qm_loader(KDESupport_SRCS falkon_kdesupport_qt) + +set(KDESupport_RSCS + kdesupport.qrc +) +qt5_add_resources(RSCS ${KDESupport_RSCS}) + +add_library(KDESupport MODULE ${KDESupport_SRCS} ${RSCS}) +install(TARGETS KDESupport DESTINATION ${FALKON_INSTALL_PLUGINDIR}) +target_link_libraries(KDESupport FalkonPrivate KF5::Wallet) diff --git a/src/plugins/KWalletPasswords/Messages.sh b/src/plugins/KDESupport/Messages.sh similarity index 59% rename from src/plugins/KWalletPasswords/Messages.sh rename to src/plugins/KDESupport/Messages.sh index 512d732f1..8f66bdb5d 100644 --- a/src/plugins/KWalletPasswords/Messages.sh +++ b/src/plugins/KDESupport/Messages.sh @@ -1,2 +1,2 @@ #! /bin/sh -$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_kwalletpasswords_qt.pot +$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_kdesupport_qt.pot diff --git a/src/plugins/KDESupport/data/icon.svg b/src/plugins/KDESupport/data/icon.svg new file mode 100644 index 000000000..b61d41163 --- /dev/null +++ b/src/plugins/KDESupport/data/icon.svg @@ -0,0 +1,132 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/plugins/KDESupport/kdesupport.qrc b/src/plugins/KDESupport/kdesupport.qrc new file mode 100644 index 000000000..05b7a8c44 --- /dev/null +++ b/src/plugins/KDESupport/kdesupport.qrc @@ -0,0 +1,6 @@ + + + metadata.desktop + data/icon.svg + + diff --git a/src/plugins/KWalletPasswords/kwalletplugin.cpp b/src/plugins/KDESupport/kdesupportplugin.cpp similarity index 80% rename from src/plugins/KWalletPasswords/kwalletplugin.cpp rename to src/plugins/KDESupport/kdesupportplugin.cpp index cc37ff882..d47e3fd60 100644 --- a/src/plugins/KWalletPasswords/kwalletplugin.cpp +++ b/src/plugins/KDESupport/kdesupportplugin.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* KWalletPasswords - KWallet support plugin for Falkon +* KDESupport - KDE support plugin for Falkon * Copyright (C) 2013-2018 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#include "kwalletplugin.h" +#include "kdesupportplugin.h" #include "kwalletpasswordbackend.h" #include "pluginproxy.h" #include "browserwindow.h" @@ -25,18 +25,18 @@ #include "passwordmanager.h" #include "desktopfile.h" -KWalletPlugin::KWalletPlugin() +KDESupportPlugin::KDESupportPlugin() : QObject() , m_backend(0) { } -DesktopFile KWalletPlugin::metaData() const +DesktopFile KDESupportPlugin::metaData() const { - return DesktopFile(QSL(":kwp/metadata.desktop")); + return DesktopFile(QSL(":kdesupport/metadata.desktop")); } -void KWalletPlugin::init(InitState state, const QString &settingsPath) +void KDESupportPlugin::init(InitState state, const QString &settingsPath) { Q_UNUSED(state); Q_UNUSED(settingsPath); @@ -45,13 +45,13 @@ void KWalletPlugin::init(InitState state, const QString &settingsPath) mApp->autoFill()->passwordManager()->registerBackend(QSL("KWallet"), m_backend); } -void KWalletPlugin::unload() +void KDESupportPlugin::unload() { mApp->autoFill()->passwordManager()->unregisterBackend(m_backend); delete m_backend; } -bool KWalletPlugin::testPlugin() +bool KDESupportPlugin::testPlugin() { // Require the version that the plugin was built with return (Qz::VERSION == QLatin1String(FALKON_VERSION)); diff --git a/src/plugins/KWalletPasswords/kwalletplugin.h b/src/plugins/KDESupport/kdesupportplugin.h similarity index 80% rename from src/plugins/KWalletPasswords/kwalletplugin.h rename to src/plugins/KDESupport/kdesupportplugin.h index e358623e5..e8631bb58 100644 --- a/src/plugins/KWalletPasswords/kwalletplugin.h +++ b/src/plugins/KDESupport/kdesupportplugin.h @@ -1,5 +1,5 @@ /* ============================================================ -* KWalletPasswords - KWallet support plugin for Falkon +* KDESupport - KDE support plugin for Falkon * Copyright (C) 2013-2018 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#ifndef KWALLETPLUGIN_H -#define KWALLETPLUGIN_H +#ifndef KDESUPPORTPLUGIN_H +#define KDESUPPORTPLUGIN_H #include "plugininterface.h" class KWalletPasswordBackend; -class KWalletPlugin : public QObject, public PluginInterface +class KDESupportPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.KWalletPasswords") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.KDESupport") public: - explicit KWalletPlugin(); + explicit KDESupportPlugin(); DesktopFile metaData() const override; void init(InitState state, const QString &settingsPath) override; @@ -41,4 +41,4 @@ private: }; -#endif // KWALLETPLUGIN_H +#endif // KDESUPPORTPLUGIN_H diff --git a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp b/src/plugins/KDESupport/kwalletpasswordbackend.cpp similarity index 97% rename from src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp rename to src/plugins/KDESupport/kwalletpasswordbackend.cpp index fe4caeb04..ba903bf21 100644 --- a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp +++ b/src/plugins/KDESupport/kwalletpasswordbackend.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* KWalletPasswords - KWallet support plugin for Falkon +* KDESupport - KDE support plugin for Falkon * Copyright (C) 2013-2018 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ * along with this program. If not, see . * ============================================================ */ #include "kwalletpasswordbackend.h" -#include "kwalletplugin.h" +#include "kdesupportplugin.h" #include "mainapplication.h" #include "browserwindow.h" @@ -48,7 +48,7 @@ KWalletPasswordBackend::KWalletPasswordBackend() QString KWalletPasswordBackend::name() const { - return KWalletPlugin::tr("KWallet"); + return KDESupportPlugin::tr("KWallet"); } QVector KWalletPasswordBackend::getEntries(const QUrl &url) diff --git a/src/plugins/KWalletPasswords/kwalletpasswordbackend.h b/src/plugins/KDESupport/kwalletpasswordbackend.h similarity index 96% rename from src/plugins/KWalletPasswords/kwalletpasswordbackend.h rename to src/plugins/KDESupport/kwalletpasswordbackend.h index 2752f0f5a..a0a58f91f 100644 --- a/src/plugins/KWalletPasswords/kwalletpasswordbackend.h +++ b/src/plugins/KDESupport/kwalletpasswordbackend.h @@ -1,5 +1,5 @@ /* ============================================================ -* KWalletPasswords - KWallet support plugin for Falkon +* KDESupport - KDE support plugin for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/KDESupport/metadata.desktop b/src/plugins/KDESupport/metadata.desktop new file mode 100644 index 000000000..4be6e4025 --- /dev/null +++ b/src/plugins/KDESupport/metadata.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=KDE Support +Comment=Provides support for storing passwords in KWallet + +Icon=:kdesupport/data/icon.svg +Type=Service + +X-Falkon-Author=David Rosca +X-Falkon-Email=nowrep@gmail.com +X-Falkon-Version=0.2.0 +X-Falkon-Settings=false diff --git a/src/plugins/KWalletPasswords/CMakeLists.txt b/src/plugins/KWalletPasswords/CMakeLists.txt deleted file mode 100644 index 6b3bba20f..000000000 --- a/src/plugins/KWalletPasswords/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set( KWalletPasswords_SRCS - kwalletplugin.cpp - kwalletpasswordbackend.cpp - ) - -ecm_create_qm_loader( KWalletPasswords_SRCS falkon_kwalletpasswords_qt ) - -set( KWalletPasswords_RSCS - kwalletpasswords.qrc - ) -qt5_add_resources(RSCS ${KWalletPasswords_RSCS}) - -add_library(KWalletPasswords MODULE ${KWalletPasswords_SRCS} ${RSCS}) -install(TARGETS KWalletPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR}) -target_link_libraries(KWalletPasswords FalkonPrivate KF5::Wallet) - diff --git a/src/plugins/KWalletPasswords/data/icon.png b/src/plugins/KWalletPasswords/data/icon.png deleted file mode 100644 index cc1f458d77c51940c464a1e262bf86c64733fa41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1804 zcmV+n2lM!eP)D)oM#+P0S^Id|L+C@9J=`IBYfk9 zzxZ$Od4CvzYk&Cel$@E@iWP;DK^1pH)e$$u4K<}!BVq`SJ4{6hC@DtFoNP`P0ti%f zUVi0Ge*M?0JbM;ixa9JQ5%8L4!)jn0me^{buJ)ORfhkuyoIoW{l~pP97~)DTmHky_ z9`wMNz+$Rw^oeT9s=#72&TPxkDR2ihC%BXPb&~Wgey?B%DjSbFx?inP^8B1YnJrKf^Tz~H!Zoc&nYY&`YQb+w55on({W==6D z;y8{WR03U4#GInWSe%XdoReqI^YcHy!K+uV-LvSqhqn0A31is(fT}R+|281pF+dy~ z)SW0sz)*9>taQOhK`;}h3Vm`?7eErPUcE+)k?;TTM|}A!U*!ic{+M@n7mU?e-+B;r znBOM{;T{Y)L>zHP&B)YR9_r{HuQiqeL z&k}+VK&^K0ykg3R8ty0P{?(6*FhKzt3-e^-KKFTY-PS_b%qn z(_YX)FziMzQm=AF9Gn6zrD<<%|r}F zn)T$>cwY?M#RE=N1*-^(n^O(?BnXZwWP@2~T;T}I#fLoixUqYpBdc-PRw70*Z&7rcp zl(wh{#xZyx03iq>P^vSFpw+0=sV1x?0XIrDrfkfjlR}`nvm7!TeFBB$l$oj!1HAs) z<>p*i1M2-j*gQ9?LKj;!92m1TUN~?lSC~Z_W0t~@l|DKlG}0;-Ndo4EdHZLrJ4O{W zI&S%Mt&~z2CuN?5PJ~*OsW@FQVt^1LqYBB5K1GbcsyclHkw#iiTzHBQ0$4rT05u11 z?bqGO)k&h@h3d*!lqmH81I}`)%)|)dsDqK{BOr~gi#aJKg1|84qYVfGL8NV7j82>` zfT}Z$l|Dfigj$VBVXX^vp+#+#ooEG6ki@91x4ixKo2VKtv*QpEm^-C9DKu8BYK+;K zCrBcV7YzDfU==kXdtergn7}=-%toN~l+`%m&?0%10p^aW6Qwa=HDfg?v((hkp)nmw z5XT7=7dB=>z{%O!&ka9nU?!Y7`zR@dgYrHS0|qD&!GThoJ{r*t)5Z&Za=H|#Ras4y zgyO2G!hUJ0D7%nNCIhJOv^n|kmL1&D4-%h^DJ5>n@~+yO-4$>Fga5;mbuCELy0!l10XkHMG)cK zxpQ2-a+_+$0AUP)+1e)NFj?Z{xeIKZzQE1>%#B51`^n`umsJ zUkv05F2+AEUuiPTnohX=*1MSh3qQcl&AmNt-P*fTaJ5!;Z|u-_!p1xTg`Fke1J*=j zbZz%zy{C*-CZNyHR53hKNxbCta6}{N*fs{zzEz1c7a>&UhgsB uV>yzKoiDl1{C<~z!rc9?P36-*p8p5&0ax4DZzvc50000 - - metadata.desktop - data/icon.png - - diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop deleted file mode 100644 index bdc122876..000000000 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ /dev/null @@ -1,31 +0,0 @@ -[Desktop Entry] -Name=KWallet Passwords -Name[ca]=Contrasenyes del KWallet -Name[ca@valencia]=Contrasenyes del KWallet -Name[en_GB]=KWallet Passwords -Name[fi]=KWallet-salasanat -Name[it]=Password di KWallet -Name[nl]=Wachtwoorden in KWallet -Name[pt]=Senhas do KWallet -Name[sv]=Plånbokens lösenord -Name[uk]=Паролі KWallet -Name[x-test]=xxKWallet Passwordsxx -Comment=Provides support for storing passwords in KWallet -Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet -Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet -Comment[en_GB]=Provides support for storing passwords in KWallet -Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi KWalletiin -Comment[it]=Fornisce un supporto all'immagazzinamento di password in KWallet -Comment[nl]=Biedt ondersteuning voor opslaan wachtwoorden in KWallet -Comment[pt]=Oferece o suporte para guardar as senhas no KWallet -Comment[sv]=Tillhandahåller stöd för att lagra lösenord i plånboken -Comment[uk]=Забезпечує підтримку зберігання паролів у KWallet -Comment[x-test]=xxProvides support for storing passwords in KWalletxx - -Icon=:kwp/data/icon.png -Type=Service - -X-Falkon-Author=David Rosca -X-Falkon-Email=nowrep@gmail.com -X-Falkon-Version=0.1.2 -X-Falkon-Settings=false