Commit 6587627f authored by Lukáš Tinkl's avatar Lukáš Tinkl
Browse files

fix catalog loading for VPN plugins

parent 88727447
......@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
app.setApplicationVersion(PLASMA_NM_VERSION_STRING);
#warning "Translations for kde-nm-connection-editor disabled"
//KGlobal::insertCatalog("libplasmanetworkmanagement-editor"); // setting widgets
//KGlobal::insertCatalog("plasma_applet_org.kde.plasma.networkmanagement"); // mobile wizard, UiUtils, ...
KGlobal::locale()->insertCatalog("libplasmanetworkmanagement-editor"); // setting widgets
KGlobal::locale()->insertCatalog("plasma_applet_org.kde.plasma.networkmanagement"); // mobile wizard, UiUtils, ...
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if(args->count()) {
......
......@@ -18,17 +18,18 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "l2tp.h"
#include <KPluginFactory>
#include <KLocale>
#include "nm-l2tp-service.h"
#include <NetworkManagerQt/VpnSetting>
#include "nm-l2tp-service.h"
#include "l2tp.h"
#include "l2tpwidget.h"
#include "l2tpauth.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_l2tpui"
#include <KLocalizedString>
K_PLUGIN_FACTORY_WITH_JSON(L2tpUiPluginFactory, "plasmanetworkmanagement_l2tpui.json", registerPlugin<L2tpUiPlugin>();)
L2tpUiPlugin::L2tpUiPlugin(QObject * parent, const QVariantList &):
......@@ -76,4 +77,4 @@ bool L2tpUiPlugin::exportConnectionSettings(const NetworkManager::ConnectionSett
return false;
}
#include "l2tp.moc"
\ No newline at end of file
#include "l2tp.moc"
......@@ -26,16 +26,17 @@
#include "openconnectwidget.h"
#include "openconnectauth.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_openconnectui"
#include <KLocalizedString>
K_PLUGIN_FACTORY(OpenconnectUiPluginFactory, registerPlugin<OpenconnectUiPlugin>();)
OpenconnectUiPlugin::OpenconnectUiPlugin(QObject * parent, const QVariantList &) : VpnUiPlugin(parent)
{
}
OpenconnectUiPlugin::~OpenconnectUiPlugin()
{
}
SettingWidget * OpenconnectUiPlugin::widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * parent)
......
......@@ -25,6 +25,8 @@
#include "openswanwidget.h"
#include "openswanauth.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_openswanui"
#include <KLocalizedString>
K_PLUGIN_FACTORY_WITH_JSON(OpenswanUiPluginFactory, "plasmanetworkmanagement_openswanui.json", registerPlugin<OpenswanUiPlugin>(); )
......@@ -77,4 +79,4 @@ bool OpenswanUiPlugin::exportConnectionSettings(const NetworkManager::Connection
return false;
}
#include "openswan.moc"
\ No newline at end of file
#include "openswan.moc"
......@@ -35,6 +35,9 @@
#include "nm-openvpn-service.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_openvpnui"
#include <KLocalizedString>
K_PLUGIN_FACTORY_WITH_JSON(OpenVpnUiPluginFactory, "plasmanetworkmanagement_openvpnui.json", registerPlugin<OpenVpnUiPlugin>();)
#define AUTH_TAG "auth"
......
......@@ -26,6 +26,9 @@
#include "pptpwidget.h"
#include "pptpauth.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_pptpui"
#include <KLocalizedString>
K_PLUGIN_FACTORY_WITH_JSON(PptpUiPluginFactory, "plasmanetworkmanagement_pptpui.json", registerPlugin<PptpUiPlugin>();)
PptpUiPlugin::PptpUiPlugin(QObject * parent, const QVariantList &) : VpnUiPlugin(parent)
......
......@@ -26,6 +26,9 @@
#include <KPluginFactory>
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_strongswanui"
#include <KLocalizedString>
K_PLUGIN_FACTORY_WITH_JSON(StrongswanUiPluginFactory, "plasmanetworkmanagement_strongswanui.json", registerPlugin<StrongswanUiPlugin>();)
StrongswanUiPlugin::StrongswanUiPlugin(QObject * parent, const QVariantList &)
......
......@@ -38,6 +38,9 @@
#include "vpncwidget.h"
#include "vpncauth.h"
#define TRANSLATION_DOMAIN "plasmanetworkmanagement_vpncui"
#include <KLocalizedString>
VpncUiPluginPrivate::VpncUiPluginPrivate()
{
decryptedPasswd.clear();
......
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