Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 1153 insertions, 0 deletions

diff --git a/kwallet/konfigurator/Makefile.am b/kwallet/konfigurator/Makefile.am
new file mode 100644
index 0000000..fab7551
--- /dev/null
+++ b/kwallet/konfigurator/Makefile.am
@@ -0,0 +1,15 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = kcm_kwallet.la
+kcm_kwallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
+kcm_kwallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+kcm_kwallet_la_LIBADD = $(LIB_KDEUI) -lkwalletclient
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmkwallet.pot
+
+xdg_apps_DATA = kwalletconfig.desktop
+
+kde_services_DATA = kwallet_config.desktop kwalletmanager_show.desktop
+
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
new file mode 100644
index 0000000..a5fc336
--- /dev/null
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -0,0 +1,323 @@
+/*
+   Copyright (C) 2003 George Staikos <staikos@kde.org>
+
+   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 the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program 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
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+ */
+
+#include "konfigurator.h"
+#include "walletconfigwidget.h"
+#include <dcopclient.h>
+#include <dcopref.h>
+#include <kaboutdata.h>
+#include <kapplication.h>
+#include <kconfig.h>
+#include <kdialog.h>
+#include <kgenericfactory.h>
+#include <kinputdialog.h>
+#include <kpopupmenu.h>
+#include <kwallet.h>
+
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qlayout.h>
+#include <qlistview.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
+
+typedef KGenericFactory<KWalletConfig, QWidget> KWalletFactory;
+K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
+
+KWalletConfig::KWalletConfig(QWidget *parent, const char *name, const QStringList&)
+: KCModule(KWalletFactory::instance(), parent, name) {
+
+	KAboutData *about =
+		new KAboutData(I18N_NOOP("kcmkwallet"),
+				I18N_NOOP("KDE Wallet Control Module"),
+				0, 0, KAboutData::License_GPL,
+				I18N_NOOP("(c) 2003 George Staikos"));
+		about->addAuthor("George Staikos", 0, "staikos@kde.org");
+	setAboutData( about );
+
+	_cfg = new KConfig("kwalletrc", false, false);
+
+	QVBoxLayout *vbox = new QVBoxLayout(this, 0, KDialog::spacingHint());
+	vbox->add(_wcw = new WalletConfigWidget(this));
+
+	connect(_wcw->_enabled, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_launchManager, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_autocloseManager, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_autoclose, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_closeIdle, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_openPrompt, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_screensaverLock, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_localWalletSelected, SIGNAL(clicked()), this, SLOT(configChanged()));
+	connect(_wcw->_idleTime, SIGNAL(valueChanged(int)), this, SLOT(configChanged()));
+	connect(_wcw->_launch, SIGNAL(clicked()), this, SLOT(launchManager()));
+	connect(_wcw->_newWallet, SIGNAL(clicked()), this, SLOT(newNetworkWallet()));
+	connect(_wcw->_newLocalWallet, SIGNAL(clicked()), this, SLOT(newLocalWallet()));
+	connect(_wcw->_localWallet, SIGNAL(activated(int)), this, SLOT(configChanged()));
+	connect(_wcw->_defaultWallet, SIGNAL(activated(int)), this, SLOT(configChanged()));
+	connect(_wcw->_accessList, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), this, SLOT(contextMenuRequested(QListViewItem*, const QPoint&, int)));
+
+	_wcw->_accessList->setAllColumnsShowFocus(true);
+	updateWalletLists();
+	load();
+
+	if (DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
+		_wcw->_launch->hide();
+	}
+
+}
+
+
+KWalletConfig::~KWalletConfig() {
+	delete _cfg;
+	_cfg = 0L;
+}
+
+
+void KWalletConfig::updateWalletLists() {
+	QString p1, p2;
+	p1 = _wcw->_localWallet->currentText();
+	p2 = _wcw->_defaultWallet->currentText();
+
+	_wcw->_localWallet->clear();
+	_wcw->_defaultWallet->clear();
+
+	QStringList wl = KWallet::Wallet::walletList();
+	_wcw->_localWallet->insertStringList(wl);
+	_wcw->_defaultWallet->insertStringList(wl);
+
+	if (wl.contains(p1)) {
+		_wcw->_localWallet->setCurrentText(p1);
+	}
+
+	if (wl.contains(p2)) {
+		_wcw->_defaultWallet->setCurrentText(p2);
+	}
+}
+
+
+QString KWalletConfig::newWallet() {
+	bool ok;
+
+	QString n = KInputDialog::getText(i18n("New Wallet"),
+			i18n("Please choose a name for the new wallet:"),
+			QString::null,
+			&ok,
+			this);
+
+	if (!ok) {
+		return QString::null;
+	}
+
+	KWallet::Wallet *w = KWallet::Wallet::openWallet(n);
+	if (!w) {
+		return QString::null;
+	}
+
+	delete w;
+	return n;
+}
+
+
+void KWalletConfig::newLocalWallet() {
+	QString n = newWallet();
+	if (n.isEmpty()) {
+		return;
+	}
+
+	updateWalletLists();
+
+	_wcw->_localWallet->setCurrentText(n);
+
+	emit changed(true);
+}
+
+
+void KWalletConfig::newNetworkWallet() {
+	QString n = newWallet();
+	if (n.isEmpty()) {
+		return;
+	}
+
+	updateWalletLists();
+
+	_wcw->_defaultWallet->setCurrentText(n);
+
+	emit changed(true);
+}
+
+
+void KWalletConfig::launchManager() {
+	if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
+		KApplication::startServiceByDesktopName("kwalletmanager_show");
+	} else {
+		DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
+		r.send("show");
+		r.send("raise");
+	}
+}
+
+
+void KWalletConfig::configChanged() {
+	emit changed(true);
+}
+
+void KWalletConfig::load() {
+	load( false );
+}
+
+void KWalletConfig::load(bool useDefaults) {
+	KConfigGroup config(_cfg, "Wallet");
+	config.setReadDefaults( useDefaults );
+	_wcw->_enabled->setChecked(config.readBoolEntry("Enabled", true));
+	_wcw->_openPrompt->setChecked(config.readBoolEntry("Prompt on Open", true));
+	_wcw->_launchManager->setChecked(config.readBoolEntry("Launch Manager", true));
+	_wcw->_autocloseManager->setChecked(! config.readBoolEntry("Leave Manager Open", false));
+	_wcw->_screensaverLock->setChecked(config.readBoolEntry("Close on Screensaver", false));
+	_wcw->_autoclose->setChecked(!config.readBoolEntry("Leave Open", false));
+	_wcw->_closeIdle->setChecked(config.readBoolEntry("Close When Idle", false));
+	_wcw->_idleTime->setValue(config.readNumEntry("Idle Timeout", 10));
+	if (config.hasKey("Default Wallet")) {
+		_wcw->_defaultWallet->setCurrentText(config.readEntry("Default Wallet"));
+	} else {
+		_wcw->_defaultWallet->setCurrentItem(0);
+	}
+	if (config.hasKey("Local Wallet")) {
+		_wcw->_localWalletSelected->setChecked( !config.readBoolEntry("Use One Wallet") );
+		_wcw->_localWallet->setCurrentText(config.readEntry("Local Wallet"));
+	} else {
+		_wcw->_localWalletSelected->setChecked(false);
+	}
+	_wcw->_accessList->clear();
+	_cfg->setGroup("Auto Deny");
+	QStringList denykeys = _cfg->entryMap("Auto Deny").keys();
+	_cfg->setGroup("Auto Allow");
+	QStringList keys = _cfg->entryMap("Auto Allow").keys();
+	for (QStringList::Iterator i = keys.begin(); i != keys.end(); ++i) {
+		_cfg->setGroup("Auto Allow");
+		QStringList apps = _cfg->readListEntry(*i);
+		_cfg->setGroup("Auto Deny");
+		QStringList denyapps = _cfg->readListEntry(*i);
+		denykeys.remove(*i);
+		QListViewItem *lvi = new QListViewItem(_wcw->_accessList, *i);
+		for (QStringList::Iterator j = apps.begin(); j != apps.end(); ++j) {
+			new QListViewItem(lvi, QString::null, *j, i18n("Always Allow"));
+		}
+		for (QStringList::Iterator j = denyapps.begin(); j != denyapps.end(); ++j) {
+			new QListViewItem(lvi, QString::null, *j, i18n("Always Deny"));
+		}
+	}
+	_cfg->setGroup("Auto Deny");
+	for (QStringList::Iterator i = denykeys.begin(); i != denykeys.end(); ++i) {
+		QStringList denyapps = _cfg->readListEntry(*i);
+		QListViewItem *lvi = new QListViewItem(_wcw->_accessList, *i);
+		for (QStringList::Iterator j = denyapps.begin(); j != denyapps.end(); ++j) {
+			new QListViewItem(lvi, QString::null, *j, i18n("Always Deny"));
+		}
+	}
+	emit changed(useDefaults);
+}
+
+
+void KWalletConfig::save() {
+	KConfigGroup config(_cfg, "Wallet");
+	config.writeEntry("Enabled", _wcw->_enabled->isChecked());
+	config.writeEntry("Launch Manager", _wcw->_launchManager->isChecked());
+	config.writeEntry("Leave Manager Open", !_wcw->_autocloseManager->isChecked());
+	config.writeEntry("Leave Open", !_wcw->_autoclose->isChecked());
+	config.writeEntry("Close When Idle", _wcw->_closeIdle->isChecked());
+	config.writeEntry("Idle Timeout", _wcw->_idleTime->value());
+	config.writeEntry("Prompt on Open", _wcw->_openPrompt->isChecked());
+	config.writeEntry("Close on Screensaver", _wcw->_screensaverLock->isChecked());
+
+	config.writeEntry("Use One Wallet", !_wcw->_localWalletSelected->isChecked());
+	if (_wcw->_localWalletSelected->isChecked()) {
+		config.writeEntry("Local Wallet", _wcw->_localWallet->currentText());
+	} else {
+		config.deleteEntry("Local Wallet");
+	}
+
+	if (_wcw->_defaultWallet->currentItem() != -1) {
+		config.writeEntry("Default Wallet", _wcw->_defaultWallet->currentText());
+	} else {
+		config.deleteEntry("Default Wallet");
+	}
+
+	// FIXME: won't survive a language change
+	_cfg->deleteGroup("Auto Allow");
+	_cfg->deleteGroup("Auto Deny");
+	_cfg->setGroup("Auto Allow");
+	for (QListViewItem *i = _wcw->_accessList->firstChild(); i; i = i->nextSibling()) {
+		QStringList al;
+		for (QListViewItem *j = i->firstChild(); j; j = j->nextSibling()) {
+			if (j->text(2) == i18n("Always Allow")) {
+				al << j->text(1);
+			}
+		}
+		_cfg->writeEntry(i->text(0), al);
+	}
+
+	_cfg->setGroup("Auto Deny");
+	for (QListViewItem *i = _wcw->_accessList->firstChild(); i; i = i->nextSibling()) {
+		QStringList al;
+		for (QListViewItem *j = i->firstChild(); j; j = j->nextSibling()) {
+			if (j->text(2) == i18n("Always Deny")) {
+				al << j->text(1);
+			}
+		}
+		_cfg->writeEntry(i->text(0), al);
+	}
+
+	_cfg->sync();
+	DCOPRef("kded", "kwalletd").call("reconfigure()");
+
+	emit changed(false);
+}
+
+
+void KWalletConfig::defaults() {
+	load( true );
+}
+
+
+QString KWalletConfig::quickHelp() const {
+	return i18n("This configuration module allows you to configure the KDE wallet system.");
+}
+
+
+void KWalletConfig::contextMenuRequested(QListViewItem *item, const QPoint& pos, int col) {
+	Q_UNUSED(col)
+	if (item && item->parent()) {
+		KPopupMenu *m = new KPopupMenu(this);
+		m->insertTitle(item->parent()->text(0));
+		m->insertItem(i18n("&Delete"), this, SLOT(deleteEntry()), Key_Delete);
+		m->popup(pos);
+	}
+}
+
+
+void KWalletConfig::deleteEntry() {
+	QListViewItem *item = _wcw->_accessList->selectedItem();
+	if (item) {
+		delete item;
+		emit changed(true);
+	}
+}
+
+#include "konfigurator.moc"
+
diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h
new file mode 100644
index 0000000..e12ebfc
--- /dev/null
+++ b/kwallet/konfigurator/konfigurator.h
@@ -0,0 +1,57 @@
+/*
+   Copyright (C) 2003 George Staikos <staikos@kde.org>
+
+   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 the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program 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
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _KWALLETKONFIGURATOR_H
+#define _KWALLETKONFIGURATOR_H
+
+#include <kcmodule.h>
+
+class KConfig;
+class WalletConfigWidget;
+class QListViewItem;
+
+class KWalletConfig : public KCModule {
+	Q_OBJECT
+	public:
+		KWalletConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList& = QStringList());
+		virtual ~KWalletConfig();
+
+		void load();
+		void load( bool useDefaults );
+		void save();
+		void defaults();
+
+		QString quickHelp() const;
+
+	public slots:
+		void configChanged();
+		void launchManager();
+		void newLocalWallet();
+		void newNetworkWallet();
+		void updateWalletLists();
+		QString newWallet();
+		void deleteEntry();
+		void contextMenuRequested(QListViewItem *item, const QPoint& pos, int col);
+
+	private:
+		WalletConfigWidget *_wcw;
+		KConfig *_cfg;
+};
+
+#endif
diff --git a/kwallet/konfigurator/kwallet_config.desktop b/kwallet/konfigurator/kwallet_config.desktop
new file mode 100644
index 0000000..d8c59ba
--- /dev/null
+++ b/kwallet/konfigurator/kwallet_config.desktop
@@ -0,0 +1,47 @@
+[Desktop Entry]
+Type=Service
+Exec=kcmshell --caption %c kwalletconfig
+Icon=kwalletmanager
+DocPath=kwallet/index.html
+Name=KDE Wallet
+Name[ar]=محفظة كدى
+Name[bg]=Портфейл
+Name[br]=Doug-paperoù KDE
+Name[bs]=KDE novčanik
+Name[cs]=Úschovna KDE
+Name[cy]=Waled KDE
+Name[da]=KDE's tegnebog
+Name[de]=Digitale Brieftasche
+Name[el]=Πορτοφόλι του KDE
+Name[es]=Cartera de KDE
+Name[et]=KDE turvalaegas
+Name[eu]=KDE Kartera
+Name[fi]=Lompakko
+Name[fr]=Gestionnaire de comptes de KDE
+Name[hi]=केडीई वॉलेट
+Name[hu]=Digitális noteszek
+Name[is]=KDE veskið
+Name[it]=Portafogli di KDE
+Name[ja]=KDE ウォレット
+Name[kk]=KDE әмияні
+Name[km]=កាបូប KDE
+Name[lt]=KDE slaptažodinės
+Name[mk]=KDE Паричник
+Name[nds]=KDE-Knipp
+Name[ne]=KDE वालेट
+Name[pa]=KDE ਵਾਲਿਟ
+Name[pl]=Portfel KDE
+Name[pt]=Carteira KDE
+Name[pt_BR]=Carteira do KDE
+Name[ro]=Portofel KDE
+Name[ru]=Бумажник
+Name[sl]=Listnica za KDE
+Name[sv]=KDE-plånbok
+Name[ta]= கேடிஇ வாலட்
+Name[tg]=KDE Ҳамён
+Name[tr]=KDE Cüzdan
+Name[uk]=Торбинки KDE
+Name[uz]=KDE qopchiq
+Name[uz@cyrillic]=KDE қопчиқ
+Name[zh_CN]=KDE 钱包
+Name[zh_TW]=KDE 錢包
diff --git a/kwallet/konfigurator/kwalletconfig.desktop b/kwallet/konfigurator/kwalletconfig.desktop
new file mode 100644
index 0000000..0c60eef
--- /dev/null
+++ b/kwallet/konfigurator/kwalletconfig.desktop
@@ -0,0 +1,152 @@
+[Desktop Entry]
+Icon=kwalletmanager
+Type=Application
+Exec=kcmshell kwalletconfig
+DocPath=kwallet/index.html
+X-KDE-ModuleType=Library
+X-KDE-Library=kwallet
+X-KDE-ParentApp=kcontrol
+
+Name=KDE Wallet
+Name[ar]=محفظة كدى
+Name[bg]=Портфейл
+Name[br]=Doug-paperoù KDE
+Name[bs]=KDE novčanik
+Name[cs]=Úschovna KDE
+Name[cy]=Waled KDE
+Name[da]=KDE's tegnebog
+Name[de]=Digitale Brieftasche
+Name[el]=Πορτοφόλι του KDE
+Name[es]=Cartera de KDE
+Name[et]=KDE turvalaegas
+Name[eu]=KDE Kartera
+Name[fi]=Lompakko
+Name[fr]=Gestionnaire de comptes de KDE
+Name[hi]=केडीई वॉलेट
+Name[hu]=Digitális noteszek
+Name[is]=KDE veskið
+Name[it]=Portafogli di KDE
+Name[ja]=KDE ウォレット
+Name[kk]=KDE әмияні
+Name[km]=កាបូប KDE
+Name[lt]=KDE slaptažodinės
+Name[mk]=KDE Паричник
+Name[nds]=KDE-Knipp
+Name[ne]=KDE वालेट
+Name[pa]=KDE ਵਾਲਿਟ
+Name[pl]=Portfel KDE
+Name[pt]=Carteira KDE
+Name[pt_BR]=Carteira do KDE
+Name[ro]=Portofel KDE
+Name[ru]=Бумажник
+Name[sl]=Listnica za KDE
+Name[sv]=KDE-plånbok
+Name[ta]= கேடிஇ வாலட்
+Name[tg]=KDE Ҳамён
+Name[tr]=KDE Cüzdan
+Name[uk]=Торбинки KDE
+Name[uz]=KDE qopchiq
+Name[uz@cyrillic]=KDE қопчиқ
+Name[zh_CN]=KDE 钱包
+Name[zh_TW]=KDE 錢包
+Comment=KDE Wallet Configuration
+Comment[ar]=إعداد محفظة كدى
+Comment[bg]=Настройване на системата Портфейл
+Comment[br]=Kefluniadur Doug-paperoù KDE
+Comment[bs]=Podešavanje KDE novčanika
+Comment[ca]=Configuració de carteres KDE
+Comment[cs]=Nastavení úschovny KDE
+Comment[cy]=Ffurfweddiad Waled KDE
+Comment[da]=KDE's indstilling af tegnebog
+Comment[de]=Einrichten der "digitalen Brieftasche" (KWallet)
+Comment[el]=Ρύθμιση του πορτοφολιού του KDE
+Comment[es]=Configuración de la cartera de KDE
+Comment[et]=KDE turvalaeka seadistamine
+Comment[eu]=KDE Karteraren Konfigurazioa
+Comment[fa]=KDE Wallet پیکربندی
+Comment[fi]=KDE-lompakon asetukset
+Comment[fr]=Configuration du gestionnaire de comptes de KDE
+Comment[ga]=Cumraíocht KDE Wallet
+Comment[he]=KDE Wallet הגדרות
+Comment[hi]=केडीई वॉलेट कॉन्फ़िगरेशन
+Comment[hu]=A KDE digitális noteszeinek beállításai
+Comment[is]=Stillingar veskisins
+Comment[it]=Configurazione portafogli di KDE
+Comment[ja]=KDE ウォレットの設定
+Comment[ka]=KDE Wallet-ის კონფიგურაცია
+Comment[kk]=KDE әмияннің баптауы
+Comment[km]=ការកំណត់​រចនា​សម្ព័ន្ធ​កាបូប KDE
+Comment[lt]=KDE slaptažodinių konfigūravimas
+Comment[mk]=Конфигурација на паричник во KDE
+Comment[nb]=Oppsett av KDE Wallet
+Comment[nds]=KDE-Knipp instellen
+Comment[ne]=KDE वालेट कन्फिगरेसन
+Comment[nl]=KDE portefeuille-instellingen
+Comment[nn]=Oppsett av KDE Wallet
+Comment[pa]=KDE ਵਾਲਿਟ ਸੰਰਚਨਾ
+Comment[pl]=Konfiguracja Portfela KDE
+Comment[pt]=Configuração da Carteira do KDE
+Comment[pt_BR]=Configuração da Carteira do KDE
+Comment[ro]=Configurează portofelul KDE
+Comment[ru]=Параметры бумажника
+Comment[sk]=Konfigurácia KDE Wallet
+Comment[sl]=Nastavitve Listnice za KDE
+Comment[sr]=Подешавање KDE Wallet-а
+Comment[sr@Latn]=Podešavanje KDE Wallet-a
+Comment[sv]=Inställning av KDE-plånbok
+Comment[ta]=கேடிஇ வாலட் வடிவமைப்பு
+Comment[tg]=KDE Танзими Ҳамён
+Comment[tr]=KDE Cüzdan Ayarı
+Comment[uk]=Налаштування KWallet
+Comment[uz]=KDE qopchiq xizmatini moslash
+Comment[uz@cyrillic]=KDE қопчиқ хизматини мослаш
+Comment[zh_CN]=KDE 钱包配置
+Comment[zh_TW]=KDE 錢包設定
+Keywords=Wallet,Form Fill,Passwords,Form Data
+Keywords[ar]=محفظة،ملأ نموذج،كلمات السرّ،بيانات نموذج
+Keywords[bg]=портфейл, форми, форма, попълване, данни, парола, пароли, Wallet, Form Fill, Passwords, Form Data
+Keywords[bs]=Wallet,Form Fill,Passwords,Form Data,novčanik,formulari,popunjavanje formulara,šifre
+Keywords[ca]=Cartera,Ompliment de formularis,Contrasentes,Dades de formularis
+Keywords[cs]=úschovna,vyplnění formuláře,hesla,data formuláře
+Keywords[cy]=Waled,Llenwi Ffurflen,Cyfrineiriau,Data Ffurflenni
+Keywords[da]=Tegnebog,Formularudfyldning,Kodeord,Formular-data
+Keywords[de]=Geheimfach,Formular,Passwort,Brieftasche,digitale Brieftasche
+Keywords[el]=Πορτοφόλι,Συμπλήρωση φόρμας,Κωδικοί πρόσβασης,Δεδομένα φόρμας
+Keywords[es]=Cartera,Rellenar formulario,Contraseña,Datos de formulario
+Keywords[et]=Turvalaegas,Vormi täitmine,Paroolid,Vormiandmed
+Keywords[eu]=Kartera,Formularioa Bete,Pasahitzak,Formulario Datuak
+Keywords[fa]=Wallet، پر کردن برگه، اسم رمزها، دادۀ برگه
+Keywords[fi]=Lompakko,Lomakkeen täyttö,Salasanat,Lomaketiedot
+Keywords[fr]=gestionnaire de comptes,remplissage de formulaire,Mots de passe,Données de formulaire
+Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
+Keywords[hi]=बटुआ,फ़ॉर्म फिल,पासवर्ड,फ़ॉर्म डाटा
+Keywords[hu]=digitális notesz,űrlapkitöltés,jelszavak,űrlapadatok
+Keywords[it]=portafogli,wallet,riempimento moduli,moduli,form,password,dati moduli
+Keywords[ja]=ウォレット,フォームフィル,パスワード,フォームデータ
+Keywords[ka]=Wallet,ფორმის შევსება,პაროლები,ფორმათა მონაცემები
+Keywords[km]=កាបូប,ការបំពេញ​សំណុំ​បែបបទ,ពាក្យ​សម្ងាត់,ទិន្នន័យ​សំណុំ​បែបបទ
+Keywords[lt]=Wallet, slaptažodinė,Form Fill,Passwords,Form Data,formų pildymas,slaptažodžiai,formų duomenys
+Keywords[mk]=Wallet,Form Fill,Passwords,Form Data, Паричник, формулар, лозинки
+Keywords[nb]=Wallet,Skjemautfylling,Passord,Skjema
+Keywords[nds]=Knipp,Formulor,Passwöör,Formulordaten
+Keywords[ne]=वालेट,फारम भराइ,पासवर्ड,फारम डेटा
+Keywords[nl]=Wallet,gegevens,portefeuille,wachtwoorden,veilig bewaren van wachtwoorden,invulgegevens,formulieren
+Keywords[nn]=wallet,skjemautfylling,passord,skjema
+Keywords[pa]=Wallet,Form Fill,ਗੁਪਤ-ਕੋਡ,ਫਾਰਮ ਡਾਟਾ
+Keywords[pl]=portfel,wypełnianie formularzy,uzupełnianie formularzy, hasła, hasło,dane formularzy, formularze
+Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados do Formulário
+Keywords[pt_BR]=carteira,preenchimento de formulário,senhas,dados de formulário
+Keywords[ro]=portofel,completare formulare,parole,date formular,formular
+Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,Бумажник,Пароли,Формы
+Keywords[sk]=wallet,formuláre,heslá,dáta z formulárov,schránka,peňaženka
+Keywords[sl]=waller,denarnica,gesla,obrazec,podatki,geslo,listnica
+Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,лозинке,новчаник
+Keywords[sr@Latn]=Wallet,Form Fill,Passwords,Form Data,lozinke,novčanik
+Keywords[sv]=Plånbok,fyll i formulär,lösenord,formulärdata
+Keywords[ta]=வாலட், படிவ நிரப்பு, கடவுச் சொற்கள், படிவ தகவல்
+Keywords[tg]=Ҳамён,Пуркунии Варақа,Гузарвожаҳо,Варақаи Додаҳо
+Keywords[tr]=Cüzdan,Form Doldur,Şifreler,Form Verisi
+Keywords[uk]=Торбинка,Заповнення форм,Паролі,Дані форм
+Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,填充表单,密码,表单数据
+
+Categories=Qt;KDE;X-KDE-settings-security;
diff --git a/kwallet/konfigurator/kwalletmanager_show.desktop b/kwallet/konfigurator/kwalletmanager_show.desktop
new file mode 100644
index 0000000..91b7368
--- /dev/null
+++ b/kwallet/konfigurator/kwalletmanager_show.desktop
@@ -0,0 +1,60 @@
+[Desktop Entry]
+Name=Wallet Management Tool
+Name[ar]=أداة إدارة المحفظة
+Name[bg]=Портфейл
+Name[br]=Merour an doug-paperoù
+Name[bs]=Alat za upravljanje novčanikom
+Name[ca]=Eina de gestió de carteres
+Name[cs]=Nástroj pro správu úschovny
+Name[cy]=Erfyn Rheoli Waled
+Name[da]=Håndteringsværktøj for tegnebog
+Name[de]=Verwaltung für digitale Brieftasche
+Name[el]=Εργαλείο διαχείρισης πορτοφολιού
+Name[es]=Herramienta de gestión de cartera
+Name[et]=Turvalaeka haldur
+Name[eu]=Kartera Kudeatzeko Tresna
+Name[fa]=ابزار مدیریت  Wallet
+Name[fi]=Lompakon hallintatyökalu
+Name[fr]=Outil de gestion de comptes
+Name[ga]=Uirlis Bhainisteoireachta Wallet
+Name[he]=כלי לניהול הארנק של KDE
+Name[hi]= बटुआ प्रबंधन औज़ार
+Name[hu]=Kezelőprogram a KDE digitális noteszeihez
+Name[is]=Tól til að stýra eiginleikum veskisins
+Name[it]=Strumento per la gestione dei portafogli
+Name[ja]=ウォレット管理ツール
+Name[ka]=Wallet-ის მმართველი მოწყობილობა
+Name[kk]=Әмиянін басқару құралы
+Name[km]=ឧបករណ៍​គ្រប់គ្រង​កាបូប
+Name[lt]=Spatažodinių tvarkymo įrankis
+Name[mk]=Алатка за менаџирање на паричници
+Name[nb]=Wallet administrasjonsverktøy
+Name[nds]=Knipp-Pleger
+Name[ne]=वालेट व्यवस्थापन उपकरण
+Name[nl]=Portefeuillebeheer
+Name[nn]=Wallet-administrasjonsverktøy
+Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਸੰਦ
+Name[pl]=Narzędzie do zarządzania Portfelem
+Name[pt]=Ferramenta de Gestão da Carteira
+Name[pt_BR]=Ferramenta de Gerenciamento da Carteira
+Name[ro]=Administrare portofel
+Name[ru]=Управление паролями
+Name[sk]=Nástroj na správu KWallet
+Name[sl]=Orodje za upravljanje z listnicami
+Name[sr]=Алат за управљање новчаником
+Name[sr@Latn]=Alat za upravljanje novčanikom
+Name[sv]=Hanteringsverktyg för plånbok
+Name[ta]=வாலட் மேலாண்மை கருவி  
+Name[tg]=Асбоби Идоракунии Ҳамён
+Name[tr]=Cüzdan Yönetim Aracı
+Name[uk]=Засіб керування торбинками
+Name[uz]=Qopchiq boshqarish vositasi
+Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
+Name[zh_CN]=钱包管理工具
+Name[zh_TW]=錢包管理工具
+Exec=kwalletmanager --show %u
+MimeType=application/x-kde-wallet
+InitialPreference=6
+Icon=kwalletmanager
+Type=Service
+X-KDE-StartupNotify=true
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui
new file mode 100644
index 0000000..797d569
--- /dev/null
+++ b/kwallet/konfigurator/walletconfigwidget.ui
@@ -0,0 +1,499 @@
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<class>WalletConfigWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>WalletConfigWidget</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>585</width>
+            <height>450</height>
+        </rect>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>tabWidget2</cstring>
+            </property>
+            <widget class="QWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Wallet Preferences</string>
+                </attribute>
+                <vbox>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <widget class="QCheckBox">
+                        <property name="name">
+                            <cstring>_enabled</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Enable the KDE wallet subsystem</string>
+                        </property>
+                        <property name="checked">
+                            <bool>true</bool>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>&lt;p&gt;The wallet subsytem allows a convenient and secure way to manage all your passwords. You can decide if you want to use this system with this option.&lt;/p&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QGroupBox">
+                        <property name="name">
+                            <cstring>groupBox2</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Close Wallet</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>It is best to close your wallets when you are not using them to prevent others from viewing or using them.</string>
+                        </property>
+                        <vbox>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QLayoutWidget">
+                                <property name="name">
+                                    <cstring>layout1</cstring>
+                                </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="QCheckBox">
+                                        <property name="name">
+                                            <cstring>_closeIdle</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>2</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>Close when unused for:</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>&lt;p&gt;&lt;b&gt;Close wallet after a period of inactivity&lt;/b&gt;&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="QSpinBox">
+                                        <property name="name">
+                                            <cstring>_idleTime</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="suffix">
+                                            <string> min</string>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>999</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>1</number>
+                                        </property>
+                                        <property name="lineStep">
+                                            <number>5</number>
+                                        </property>
+                                        <property name="value">
+                                            <number>10</number>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>&lt;p&gt;&lt;b&gt;Close wallet after a period of inactivity&lt;/b&gt;&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
+                                        </property>
+                                    </widget>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer12</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                </hbox>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>_screensaverLock</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Close when screensaver starts</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>&lt;p&gt;&lt;b&gt;Close wallet as soon as the screensaver starts.&lt;/b&gt;&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox">
+                                <property name="name">
+                                    <cstring>_autoclose</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Close when last application stops using it</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>&lt;p&gt;&lt;b&gt;Close wallet as soon as applications that use it have stopped.&lt;/b&gt;&lt;br&gt;Note that your wallets will only be closed when all applications that use it have stopped.&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <widget class="QGroupBox">
+                        <property name="name">
+                            <cstring>groupBox4</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Automatic Wallet Selection</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <spacer row="0" column="1" rowspan="2" colspan="1">
+                                <property name="name">
+                                    <cstring>spacer7</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="QLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1_2</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Select wallet to use as default:</string>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox" row="1" column="0">
+                                <property name="name">
+                                    <cstring>_localWalletSelected</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Different wallet for local passwords:</string>
+                                </property>
+                            </widget>
+                            <widget class="QComboBox" row="0" column="2">
+                                <property name="name">
+                                    <cstring>_defaultWallet</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>1</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>1</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="QComboBox" row="1" column="2">
+                                <property name="name">
+                                    <cstring>_localWallet</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>1</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>1</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="QPushButton" row="1" column="3">
+                                <property name="name">
+                                    <cstring>_newLocalWallet</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="text">
+                                    <string>New...</string>
+                                </property>
+                            </widget>
+                            <widget class="QPushButton" row="0" column="3">
+                                <property name="name">
+                                    <cstring>_newWallet</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>New...</string>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="QGroupBox">
+                        <property name="name">
+                            <cstring>groupBox3</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Wallet Manager</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer6</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                                <property name="name">
+                                    <cstring>_launchManager</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show manager in system tray</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="QCheckBox" row="1" column="1">
+                                <property name="name">
+                                    <cstring>_autocloseManager</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Hide system tray icon when last wallet closes</string>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer4</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>31</width>
+                                <height>16</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
+            <widget class="QWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Access Control</string>
+                </attribute>
+                <grid>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <widget class="QCheckBox" row="0" column="0">
+                        <property name="name">
+                            <cstring>_openPrompt</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Prompt when an application accesses an open wallet</string>
+                        </property>
+                        <property name="checked">
+                            <bool>true</bool>
+                        </property>
+                    </widget>
+                    <widget class="QListView" row="1" column="0">
+                        <column>
+                            <property name="text">
+                                <string>Wallet</string>
+                            </property>
+                            <property name="clickable">
+                                <bool>true</bool>
+                            </property>
+                            <property name="resizable">
+                                <bool>true</bool>
+                            </property>
+                            <property name="allColumnsShowFocus">
+                                <bool>true</bool>
+                            </property>
+                        </column>
+                        <column>
+                            <property name="text">
+                                <string>Application</string>
+                            </property>
+                            <property name="clickable">
+                                <bool>true</bool>
+                            </property>
+                            <property name="resizable">
+                                <bool>true</bool>
+                            </property>
+                        </column>
+                        <column>
+                            <property name="text">
+                                <string>Policy</string>
+                            </property>
+                            <property name="clickable">
+                                <bool>true</bool>
+                            </property>
+                            <property name="resizable">
+                                <bool>true</bool>
+                            </property>
+                        </column>
+                        <property name="name">
+                            <cstring>_accessList</cstring>
+                        </property>
+                        <property name="rootIsDecorated">
+                            <bool>true</bool>
+                        </property>
+                    </widget>
+                </grid>
+            </widget>
+        </widget>
+        <widget class="QPushButton" row="1" column="1">
+            <property name="name">
+                <cstring>_launch</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Launch Wallet Manager</string>
+            </property>
+        </widget>
+        <spacer row="1" column="0">
+            <property name="name">
+                <cstring>spacer2</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>369</width>
+                    <height>21</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
+</widget>
+<connections>
+    <connection>
+        <sender>_localWalletSelected</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_newLocalWallet</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_localWalletSelected</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_localWallet</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_closeIdle</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_idleTime</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_enabled</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>groupBox2</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_enabled</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>groupBox4</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_enabled</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>groupBox3</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_closeIdle</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_idleTime</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_launchManager</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_autocloseManager</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+</connections>
+<tabstops>
+    <tabstop>_enabled</tabstop>
+    <tabstop>_closeIdle</tabstop>
+    <tabstop>_idleTime</tabstop>
+    <tabstop>_screensaverLock</tabstop>
+    <tabstop>_autoclose</tabstop>
+    <tabstop>_defaultWallet</tabstop>
+    <tabstop>_newWallet</tabstop>
+    <tabstop>_localWalletSelected</tabstop>
+    <tabstop>_localWallet</tabstop>
+    <tabstop>_newLocalWallet</tabstop>
+    <tabstop>_launchManager</tabstop>
+    <tabstop>_autocloseManager</tabstop>
+    <tabstop>tabWidget2</tabstop>
+    <tabstop>_openPrompt</tabstop>
+    <tabstop>_accessList</tabstop>
+    <tabstop>_launch</tabstop>
+</tabstops>
+<slots>
+    <slot>_storeTogether_toggled(bool)</slot>
+</slots>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>