Rename KWalletPasswords plugin to KDESupport

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)

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

src/plugins/KDESupport/data/icon.svg

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kdeapp.svg">
+  <metadata
+     id="metadata49">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1360"
+     inkscape:window-height="717"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4252">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4252"
+       id="linearGradient4260"
+       x1="17"
+       y1="10"
+       x2="35.942"
+       y2="28.942"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,1)" />
+    <linearGradient
+       id="c-5"
+       y1="-.883"
+       x1="-41.26"
+       y2="37.956"
+       x2="-2.994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0454421,0,0,1.0298842,46.076843,3.856842)">
+      <stop
+         stop-color="#21c9fb"
+         id="stop13" />
+      <stop
+         offset="1"
+         stop-color="#1a86f2"
+         id="stop15" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4252"
+       id="linearGradient4225"
+       x1="31.021"
+       y1="-9.896"
+       x2="43.104"
+       y2="-9.896"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+    <linearGradient
+       xlink:href="#linearGradient4252"
+       id="linearGradient4236"
+       x1="23.716"
+       y1="13.219"
+       x2="26.348"
+       y2="15.851"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     style="fill:url(#c-5);stroke-width:2;stroke-linejoin:bevel"
+     d="M 9.4610528,4 C 6.4357896,4 4.0915791,6.401053 4.0000001,9.38 l 0,29.356842 C 4.0000001,41.652631 6.383158,44 9.3431576,44 L 38.538948,44 C 41.564211,44 44,41.6 44,38.62 L 44,9.263158 C 44,6.347369 41.616843,4 38.656843,4 Z"
+     id="path19" />
+  <path
+     style="opacity:0.2;fill:url(#linearGradient4260);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 22.162109,18.726562 -2.193359,-2.193359 -2.304688,1.455078 -0.867187,1.992188 -6.75,6.75 4.607422,4.607422 -1.964844,1.748047 L 22.603516,43 36.8125,43 C 39.686565,43 42,40.719679 42,37.888672 33.503716,27.406591 24,16 22.162109,18.726562 Z"
+     id="path35" />
+  <path
+     style="fill:#000000;stroke-width:2;stroke-linejoin:bevel;fill-opacity:1;opacity:0.15"
+     d="M 44 37.619141 C 44 40.599141 41.564326 43 38.539062 43 L 9.34375 43 C 6.3837504 43 4 40.652117 4 37.736328 L 4 38.736328 C 4 41.652117 6.3837504 44 9.34375 44 L 38.539062 44 C 41.564326 44 44 41.599141 44 38.619141 L 44 37.619141 z"
+     id="path37" />
+  <path
+     style="opacity:0.2;fill:url(#linearGradient4225);fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 36.970703 10.988281 L 32.601562 12.166016 L 28.082031 21.666016 L 32 29.994141 L 43.285156 41.279297 C 43.737436 40.495097 44 39.58891 44 38.619141 L 44 18.017578 L 36.970703 10.988281 z"
+     id="path39" />
+  <path
+     d="m 26.000804,9.9953918 4.531314,4.5313142 -3.142254,6.655326 -6.28785,-6.28785 z"
+     style="opacity:0.2;fill:url(#linearGradient4236);fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path41" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 15.208984,14.617188 c -0.123062,-0.0059 -0.241909,0.03097 -0.339843,0.128906 l -2.123047,2.123047 c -0.195869,0.195869 -0.195869,0.511162 0,0.707031 l 2.193359,3.445312 c -0.175549,0.354193 -0.327571,0.719568 -0.455078,1.09375 L 10.5,23 C 10.223,23 10,23.223 10,23.5 l 0,3 c 0,0.277 0.229596,0.43991 0.5,0.5 l 3.986328,0.886719 c 0.12346,0.370523 0.270907,0.732616 0.441406,1.083984 l -2.197265,3.453125 c -0.148715,0.233695 -0.195869,0.511162 0,0.707031 l 2.121093,2.123047 c 0.19587,0.195869 0.511163,0.195869 0.707032,0 l 3.453125,-2.199218 c 0.357212,0.177942 0.725864,0.331927 1.103515,0.460937 L 21,37.5 c 0,0.277 0.223,0.5 0.5,0.5 l 3,0 c 0.277,0 0.43991,-0.229596 0.5,-0.5 l 0.886719,-3.986328 c 0.376029,-0.125362 0.743365,-0.275428 1.099609,-0.449219 l 3.4375,2.189453 c 0.195869,0.195869 0.511162,0.195869 0.707031,0 l 2.123047,-2.123047 c 0.195869,-0.195869 0.148715,-0.473336 0,-0.707031 l -0.9375,-1.472656 -0.699218,0.279297 -2.240235,-3.359375 C 28.247974,30.381473 25.752561,31.997186 23,32 c -3.865993,0 -7,-3.134007 -7,-7 0.0031,-2.700827 1.559779,-5.15891 4,-6.316406 l 0,-2.152344 c -0.336475,0.11516 -0.665829,0.250162 -0.986328,0.404297 l -3.4375,-2.189453 c -0.116848,-0.07436 -0.244125,-0.123012 -0.367188,-0.128906 z"
+     id="path43" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 26,10 21,10.462891 21,30 l 5,-1 0,-8 6,9 5,-2 L 30.5,19.585938 37.003906,11 31.767578,10 26,18.5 Z"
+     id="path45" />
+</svg>

src/plugins/KDESupport/kdesupport.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/kdesupport">
+        <file>metadata.desktop</file>
+        <file>data/icon.svg</file>
+    </qresource>
+</RCC>

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 <nowrep@gmail.com>
 *
 * 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 <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#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));

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 <nowrep@gmail.com>
 *
 * 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 <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#ifndef KWALLETPLUGIN_H
+#ifndef KDESUPPORTPLUGIN_H
-#define KWALLETPLUGIN_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

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 <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #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<PasswordEntry> KWalletPasswordBackend::getEntries(const QUrl &url)

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 <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify

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

src/plugins/KWalletPasswords/CMakeLists.txt

@@ -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)
-

src/plugins/KWalletPasswords/kwalletpasswords.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/kwp">
-        <file>metadata.desktop</file>
-        <file>data/icon.png</file>
-    </qresource>
-</RCC>

src/plugins/KWalletPasswords/metadata.desktop

@@ -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