Hello community,
here is the log from the commit of package kwalletmanager for openSUSE:Factory checked in at 2013-12-19 13:17:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwalletmanager (Old)
and /work/SRC/openSUSE:Factory/.kwalletmanager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwalletmanager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwalletmanager/kwalletmanager.changes 2013-10-03 16:03:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kwalletmanager.new/kwalletmanager.changes 2013-12-19 13:17:50.000000000 +0100
@@ -1,0 +2,42 @@
+Sat Dec 14 18:11:12 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.12.0
+ * KDE 4.12.0 release
+ * See http://www.kde.org/announcements/4.12.php
+
+-------------------------------------------------------------------
+Fri Nov 29 07:15:39 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.97
+ * KDE 4.12 RC 1 release
+ * See http://www.kde.org/announcements/announce-4.12-rc.php
+
+-------------------------------------------------------------------
+Sat Nov 23 22:29:23 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.95
+ * KDE 4.12 Beta 3 release
+ * See http://www.kde.org/announcements/announce-4.12-beta3.php
+
+-------------------------------------------------------------------
+Sat Nov 16 18:02:18 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.90
+ * KDE 4.12 Beta 2 release
+ * See http://www.kde.org/announcements/announce-4.12-beta2.php
+
+-------------------------------------------------------------------
+Sat Nov 9 23:03:34 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.80
+ * KDE 4.12 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.12-beta1.php
+
+-------------------------------------------------------------------
+Sat Nov 2 15:16:51 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.3
+ * KDE 4.11.3 bugfix release
+ * See http://www.kde.org/announcements/announce-4.11.3.php
+
+-------------------------------------------------------------------
Old:
----
kwallet-4.11.2.tar.xz
New:
----
kwallet-4.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwalletmanager.spec ++++++
--- /var/tmp/diff_new_pack.8KVkNJ/_old 2013-12-19 13:17:50.000000000 +0100
+++ /var/tmp/diff_new_pack.8KVkNJ/_new 2013-12-19 13:17:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: kwalletmanager
-Version: 4.11.2
+Version: 4.12.0
Release: 0
Summary: Wallet Management Tool
License: GPL-2.0+
@@ -45,6 +45,7 @@
cd build
%make_install
%suse_update_desktop_file kwalletmanager Applet
+
%kde_post_install
%post -p /sbin/ldconfig
@@ -61,5 +62,9 @@
%_kde4_htmldir/en/kwallet/
%_kde4_servicesdir/*.desktop
%_kde4_iconsdir/hicolor/*/apps/%{name}*.png
+%config %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf
+%{_kde4_modulesdir}/libexec/kcm_kwallet_helper
+%{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkwallet.service
+%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmkwallet.policy
%changelog
++++++ kwallet-4.11.2.tar.xz -> kwallet-4.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/TODO new/kwallet-4.12.0/TODO
--- old/kwallet-4.11.2/TODO 2013-06-28 19:39:19.000000000 +0200
+++ new/kwallet-4.12.0/TODO 2013-12-09 07:23:12.000000000 +0100
@@ -1,13 +1,14 @@
Things left:
Backend:
-- test 64 bit, zSeries
+- test zSeries
- refactor the hashes to make it efficient
Integration:
- Cookie jar
-- KMail
Future ideas:
- Make it a kpart
+GPG
+- Provide a backend conversion tool to help switching from blowfish to GPG or viceversa
Files old/kwallet-4.11.2/doc/error-nokey.png and new/kwallet-4.12.0/doc/error-nokey.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/doc/index.docbook new/kwallet-4.12.0/doc/index.docbook
--- old/kwallet-4.11.2/doc/index.docbook 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/doc/index.docbook 2013-12-09 07:23:12.000000000 +0100
@@ -29,8 +29,8 @@
<legalnotice>&FDLNotice;</legalnotice>
-<date>2013-06-06</date>
-<releaseinfo>1.10 (&kde; 4.11)</releaseinfo>
+<date>2013-11-19</date>
+<releaseinfo>2.0 (&kde; 4.12)</releaseinfo>
<abstract>
<para>
@@ -54,22 +54,129 @@
<para>Computer users have a very large amount of data to manage, some of
which is sensitive. In particular, you will typically have many passwords
-to manage. Remembering them is difficult, writing them down on paper or in
-a text file is insecure, and using tools such at PGP is tedious and
-inconvenient.</para>
+to manage. Remembering them is difficult and writing them down on paper or in
+a text file is insecure.</para>
+<para>&kwallet; provides a secure way to store passwords and other secret information,
+allowing the user to remember only a single password instead of numerous different passwords and credentials.
+</para>
+
+<sect1 id="kwallet-create">
+
+<title>Create a Wallet</title>
+
+<para>There are three ways to create a new wallet:</para>
+
+<itemizedlist>
+<listitem><para>Use the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>New
+Wallet</guimenuitem></menuchoice> in the &kwalletmanager;</para></listitem>
+
+<listitem><para>Use the <guibutton>New</guibutton> button in the &systemsettings; module
+<guilabel>KDE Wallet</guilabel></para></listitem>
+
+<listitem><para>On the first attempt to store login information in a wallet when you did
+not create a wallet so far, see section <link linkend="kwallet-using">Using &kwallet;</link>.
+</para></listitem>
+</itemizedlist>
+
+<para>&kwallet; offers two different ways to store your data:</para>
+
+<screenshot>
+<screeninfo>Select encryption</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="wallet-encryption-selection.png" format="PNG"/></imageobject>
+<textobject><phrase>Select encryption</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<variablelist>
+
+<varlistentry>
+<term>Blowfish encryption</term>
+<listitem>
<para>&kwallet; saves this sensitive data for you in a strongly encrypted
-<footnote><para>
-The data is encrypted with the
+file, accessible by all applications, and protected with a master
+password that you define.</para>
+
+<screenshot>
+<screeninfo>Create a blowfish encrypted wallet</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="first-open-request.png" format="PNG"/></imageobject>
+<textobject><phrase>Create a blowfish encrypted wallet</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<para>The data is encrypted with the
<ulink url="http://www.schneier.com/blowfish.html">Blowfish symmetric block cipher algorithm</ulink>,
the algorithm key is derived from the
<ulink url="http://www.ietf.org/rfc/rfc3174.txt">SHA-1 hash</ulink>
of the password, with a key length of 156 bits (20 bytes).
The data into the wallet file is also hashed with SHA-1 and checked
before the data is deciphered and accessible by the applications.
-</para></footnote>
-file, accessible by all applications, and protected with a master
-password that you define.</para>
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GPG encryption</term>
+<listitem>
+<para>GnuPG offers some very strong encryption algorithms and uses passphrase protected long keys.</para>
+
+<screenshot>
+<screeninfo>No GPG key found</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="error-nokey.png" format="PNG"/></imageobject>
+<textobject><phrase>No GPG key found</phrase></textobject>
+</mediaobject>
+</screenshot>
+<para>The screenshots above show the case where an encryption capable GPG key was not
+found on the system. Please use applications like &kgpg; or &kleopatra; to create a key an try again.</para>
+
+<para>If a GPG key was found you will get the next dialog where you can select a key to use for your new wallet.
+</para>
+<screenshot>
+<screeninfo>Select an encryption key</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="key-selection.png" format="PNG"/></imageobject>
+<textobject><phrase>Select an encryption key</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<para>&kwallet; will now use GPG when storing wallets and when opening them.
+The passphrase dialog only shows once. Even if the wallet is closed after initial open,
+subsequent opening will occur silently during the same &kde; session.
+</para>
+
+<para>
+The same &kde; session can handle simultaneously both file formats. &kwallet; will transparently detect
+the file format and load the correct backend to handle it.</para>
+
+<para>
+To use your sensitive data from your classic wallet with the new backend follow these steps:</para>
+
+<itemizedlist>
+<listitem><para>Create a new GPG based wallet</para></listitem>
+<listitem><para>Launch &kwalletmanager; and select your old wallet then choose <menuchoice><guimenu>File</guimenu>
+<guimenuitem>Export as XML</guimenuitem></menuchoice> to create an &XML; file with your sensitive data.
+</para></listitem>
+<listitem><para>Select the new GPG based wallet then choose <menuchoice><guimenu>File</guimenu>
+<guimenuitem>Import XML</guimenuitem></menuchoice> and select the file you just saved.</para>
+<para>Encrypt the &XML; file to keep a backup.</para>
+</listitem>
+<listitem><para><menuchoice><guimenu>File</guimenu><guimenuitem>Import Wallet</guimenuitem></menuchoice>
+but in that case you have to select the <filename class="extension">.kwl</filename> file corresponding
+to your old wallet, located in <filename class="directory">$<envar>KDEHOME</envar>/.kde/share/apps/kwallet</filename>.
+</para></listitem>
+<listitem><para>Go to &systemsettings; <menuchoice><guimenu>Account Details</guimenu> <guimenuitem>KDE
+Wallet</guimenuitem></menuchoice> and select the newly created GPG based wallet from the <guilabel>Select
+wallet to use as default</guilabel> combobox.
+</para></listitem>
+</itemizedlist>
+
+</listitem>
+</varlistentry>
+
+</variablelist>
<tip>
<para>&kwallet; supports multiple wallets, so
@@ -82,6 +189,7 @@
<para>A wallet is by default closed, which means that you must supply
a password to open it. Once the wallet is opened, the contents can
be accessed.</para>
+</sect1>
<sect1 id="kwallet-using">
<title>Using &kwallet;</title>
@@ -100,17 +208,9 @@
<para>If you want to store this information, select <guibutton>Store</guibutton>
to proceed. In case you did not create a wallet so far, the next dialog asks for
-the wallet password and creates a wallet named kdewallet.
+the encryption backend and creates a wallet named kdewallet.
</para>
-<screenshot>
-<screeninfo>Create a wallet</screeninfo>
-<mediaobject>
-<imageobject><imagedata fileref="first-open-request.png" format="PNG"/></imageobject>
-<textobject><phrase>Create a wallet</phrase></textobject>
-</mediaobject>
-</screenshot>
-
<para>Next time you visit the same website again, the application requests to open the wallet.
Enter the wallet password and click the <guibutton>Open</guibutton> button.</para>
@@ -266,8 +366,8 @@
<guilabel>Passwords</guilabel> in the <guilabel>Folder</guilabel> tree view.
Select <guimenuitem>New</guimenuitem> and choose a name for the new entry.</para>
<para>In the folder contents pane select <guilabel>New Entry</guilabel> from
-the context menu. For passwords click the <guilabel>Show Contents</guilabel>
-button, enter the new password.
+the context menu of <quote>Form Data</quote> or <quote>Passwords</quote>.
+For passwords click the <guilabel>Show Contents</guilabel> button, enter the new password.
For Maps you have to add a <guilabel>Key</guilabel> and a <guilabel>Value</guilabel>.
Click the <guilabel>Save</guilabel> button to store the new entries in the encrypted
wallet file.
Files old/kwallet-4.11.2/doc/key-selection.png and new/kwallet-4.12.0/doc/key-selection.png differ
Files old/kwallet-4.11.2/doc/wallet-encryption-selection.png and new/kwallet-4.12.0/doc/wallet-encryption-selection.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/kwalletmanager-kwalletd.desktop new/kwallet-4.12.0/kwalletmanager-kwalletd.desktop
--- old/kwallet-4.11.2/kwalletmanager-kwalletd.desktop 2013-06-28 19:39:19.000000000 +0200
+++ new/kwallet-4.12.0/kwalletmanager-kwalletd.desktop 2013-12-09 07:23:12.000000000 +0100
@@ -10,7 +10,7 @@
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[de]=Passwortverwaltung
Name[el]=Εργαλείο διαχείρισης πορτοφολιού
Name[en_GB]=Wallet Management Tool
Name[eo]=Paperuja administrilo
@@ -25,7 +25,7 @@
Name[he]=כלי לניהול הארנק של KDE
Name[hne]=बटुआ प्रबंधन औजार
Name[hr]=Alat za upravljanje novčanikom
-Name[hu]=Kezelőprogram a KDE digitális noteszeihez
+Name[hu]=Jelszókezelő eszköz
Name[ia]=Instrumento de gestion de portafolio
Name[id]=Perkakas Manajemen Dompet
Name[is]=Tól til að stýra eiginleikum veskisins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/kwalletmanager.desktop new/kwallet-4.12.0/kwalletmanager.desktop
--- old/kwallet-4.11.2/kwalletmanager.desktop 2013-06-28 19:39:19.000000000 +0200
+++ new/kwallet-4.12.0/kwalletmanager.desktop 2013-12-09 07:23:12.000000000 +0100
@@ -65,7 +65,7 @@
GenericName[ca@valencia]=Eina de gestió de carteres
GenericName[cs]=Nástroj pro správu úschovny
GenericName[da]=Værktøj til håndtering af tegnebog
-GenericName[de]=Verwaltungswerkzeug für digitale Brieftasche
+GenericName[de]=Passwortverwaltung
GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
GenericName[en_GB]=Wallet Management Tool
GenericName[es]=Herramienta de gestión de carteras
@@ -77,7 +77,7 @@
GenericName[gl]=Utilidade de xestión de carteiras
GenericName[hne]=बटुआ प्रबंधन औजार
GenericName[hr]=Alat za upravljanje novčanikom
-GenericName[hu]=Jelszókezelő
+GenericName[hu]=Jelszókezelő eszköz
GenericName[ia]=Instrumento de gestion de portafolio
GenericName[id]=Perkakas Manajemen Dompet
GenericName[it]=Strumento per la gestione dei portafogli
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/CMakeLists.txt new/kwallet-4.12.0/src/konfigurator/CMakeLists.txt
--- old/kwallet-4.11.2/src/konfigurator/CMakeLists.txt 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/konfigurator/CMakeLists.txt 2013-12-09 07:23:12.000000000 +0100
@@ -15,6 +15,16 @@
install(TARGETS kcm_kwallet DESTINATION ${PLUGIN_INSTALL_DIR})
+########### kauth helper ################
+set(kcm_kwallet_helper_SRCS savehelper.cpp)
+
+kde4_add_executable(kcm_kwallet_helper ${kcm_kwallet_helper_SRCS})
+target_link_libraries(kcm_kwallet_helper ${KDE4_KDECORE_LIBS})
+
+install(TARGETS kcm_kwallet_helper DESTINATION ${LIBEXEC_INSTALL_DIR})
+
+kde4_install_auth_helper_files(kcm_kwallet_helper org.kde.kcontrol.kcmkwallet root)
+kde4_install_auth_actions(org.kde.kcontrol.kcmkwallet kwallet.actions)
########### install files ###############
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/konfigurator.cpp new/kwallet-4.12.0/src/konfigurator/konfigurator.cpp
--- old/kwallet-4.11.2/src/konfigurator/konfigurator.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/konfigurator/konfigurator.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -28,12 +28,16 @@
#include
#include
#include
+#include
+#include
#include <QCheckBox>
#include <QPushButton>
#include <QVBoxLayout>
#include
#include
+#include
+#include
#define KWALLETMANAGERINTERFACE "org.kde.KWallet"
K_PLUGIN_FACTORY(KWalletFactory, registerPlugin<KWalletConfig>();)
@@ -52,6 +56,8 @@
about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "staikos@kde.org");
setAboutData( about );
+ setNeedsAuthorization(true);
+
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setSpacing(KDialog::spacingHint());
vbox->setMargin(0);
@@ -215,10 +221,24 @@
QStringList denykeys = ad.entryMap().keys();
const QStringList keys = aa.entryMap().keys();
for (QStringList::const_iterator i = keys.begin(); i != keys.end(); ++i) {
+ QString walletName = *i;
+ // perform cleanup in the kwalletrc file, by removing entries that correspond to non-existent
+ // (previously deleted, for example) wallets
+ QString path = KGlobal::dirs()->locateLocal("data", QString("kwallet/%1.kwl").arg(walletName));
+ if (!QFile::exists(path)) {
+ // if the wallet no longer exists, delete the entries from the configuration file and skip to next entry
+ KConfigGroup cfgAllow = KSharedConfig::openConfig("kwalletrc")->group("Auto Allow");
+ cfgAllow.deleteEntry(walletName);
+
+ KConfigGroup cfgDeny = KSharedConfig::openConfig("kwalletrc")->group("Auto Deny");
+ cfgDeny.deleteEntry(walletName);
+ continue;
+ }
+
const QStringList apps = aa.readEntry(*i,QStringList());
const QStringList denyapps = ad.readEntry(*i, QStringList());
- denykeys.removeAll(*i);
- QTreeWidgetItem *twi = new QTreeWidgetItem(_wcw->_accessList, QStringList() << *i);
+ denykeys.removeAll(walletName);
+ QTreeWidgetItem *twi = new QTreeWidgetItem(_wcw->_accessList, QStringList() << walletName);
for (QStringList::const_iterator j = apps.begin(); j != apps.end(); ++j) {
new QTreeWidgetItem(twi, QStringList() << QString() << *j << i18n("Always Allow"));
}
@@ -239,6 +259,28 @@
void KWalletConfig::save() {
+ QVariantMap args;
+ KAuth::Action *action = authAction();
+ if (0 == action) {
+ kDebug() << "There's no authAction, not saving settings";
+ return;
+ }
+ action->setArguments(args);
+
+ KAuth::ActionReply reply = action->execute();
+
+ if (reply.failed()) {
+ if (reply.type() == KAuth::ActionReply::KAuthError){
+ kDebug() << "Save action was not authorized!";
+ KMessageBox::error(this, i18n("Sorry, the system security policy didn't allow you to save the changes."), i18n("KDE Wallet Control Module"));
+ } else {
+ KMessageBox::error(this, reply.errorDescription(), i18n("KDE Wallet Control Module"));
+ kDebug() << "Save action failed. Not saving the settings.";
+ }
+ load();
+ return;
+ }
+
KConfigGroup config(_cfg, "Wallet");
config.writeEntry("Enabled", _wcw->_enabled->isChecked());
config.writeEntry("Launch Manager", _wcw->_launchManager->isChecked());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/kwallet.actions new/kwallet-4.12.0/src/konfigurator/kwallet.actions
--- old/kwallet-4.11.2/src/konfigurator/kwallet.actions 1970-01-01 01:00:00.000000000 +0100
+++ new/kwallet-4.12.0/src/konfigurator/kwallet.actions 2013-12-09 07:23:12.000000000 +0100
@@ -0,0 +1,108 @@
+[Domain]
+Name=KDE Wallet system
+Name[bs]=KDE sistem novčanika
+Name[ca]=Sistema de cartera del KDE
+Name[ca@valencia]=Sistema de cartera del KDE
+Name[cs]=Systém úschovny pro KDE
+Name[da]=KDE's tegnebogssystem
+Name[de]=Passwortspeicher für KDE
+Name[el]=Σύστημα πορτοφολιού του KDE
+Name[es]=Sistema de carteras de KDE
+Name[fi]=KDE:n lompakkojärjestelmä
+Name[fr]=Systèmes de portefeuilles de KDE
+Name[gl]=Sistema de carteiras de KDE
+Name[hu]=KDE jelszókezelő rendszer
+Name[ia]=KDE Wallet System (Systema de portafolio de KDE)
+Name[it]=Il sistema di portafogli di KDE
+Name[kk]=KDE әмиян жүйесі
+Name[nb]=KDEs Lommebok-system
+Name[nl]=KDE-portefeuillesysteem
+Name[pa]=KDE ਵਾਲਿਟ ਸਿਸਟਮ
+Name[pt]=Sistema da Carteira do KDE
+Name[pt_BR]=Sistema de carteiras do KDE
+Name[ro]=Sistemul de portofele KDE
+Name[sk]=Systém KDE peňaženky
+Name[sl]=Sistem listnic za KDE
+Name[sr]=КДЕ систем новчаника
+Name[sr@ijekavian]=КДЕ систем новчаника
+Name[sr@ijekavianlatin]=KDE sistem novčanika
+Name[sr@latin]=KDE sistem novčanika
+Name[sv]=KDE:s plånbokssystem
+Name[tr]=KDE Cüzdan Sistemi
+Name[uk]=Система роботи з буферами даних KDE
+Name[x-test]=xxKDE Wallet systemxx
+Name[zh_CN]=KDE 钱包系统
+Name[zh_TW]=KDE 錢包系統
+Icon=kwalletmanager
+
+[org.kde.kcontrol.kcmkwallet.save]
+Name=Save wallet configuration
+Name[bs]=Snimi podešavanje novčanika
+Name[ca]=Desa la configuració de la cartera
+Name[ca@valencia]=Guarda la configuració de la cartera
+Name[cs]=Uložit nastavení úschovny
+Name[da]=Gem konfiguration af tegnebog
+Name[de]=Einstellungen des Passwortspeichers speichern
+Name[el]=Αποθήκευση διαμόρφωσης πορτοφολιού KDE
+Name[es]=Guardar la configuración de la cartera
+Name[fi]=Tallenna lompakon asetukset
+Name[fr]=Enregistrer la configuration du portefeuille
+Name[gl]=Gardar a configuración da carteira
+Name[hu]=Jelszóbeállítások mentése
+Name[ia]=Salveguarda configuration de portafolio
+Name[it]=Salva la configurazione del portafogli
+Name[kk]=Әмиянның баптауын сақтау
+Name[nb]=Lagre lommebok-oppsett
+Name[nl]=Portefeuille-instellingen opslaan
+Name[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੰਭਾਲੋ
+Name[pt]=Gravar a configuração da carteira
+Name[pt_BR]=Salvar a configuração da carteira
+Name[ro]=Salvează configurarea portofelului
+Name[sk]=Uložiť nastavenie peňaženky
+Name[sl]=Shrani nastavitev listnice
+Name[sr]=Сачувај поставу новчаника
+Name[sr@ijekavian]=Сачувај поставу новчаника
+Name[sr@ijekavianlatin]=Sačuvaj postavu novčanika
+Name[sr@latin]=Sačuvaj postavu novčanika
+Name[sv]=Spara plånboksinställning
+Name[tr]=Cüzdan yapılandırmasını kaydet
+Name[uk]=Збереження налаштувань KWallet
+Name[x-test]=xxSave wallet configurationxx
+Name[zh_CN]=保存钱包配置
+Name[zh_TW]=儲存錢包設定
+Description=Allow saving wallet configuration settings
+Description[bs]=Dopusti snimanje konfiguracijskih postavki novčanika
+Description[ca]=Permet desar els paràmetres de configuració de la cartera
+Description[ca@valencia]=Permet guardar els paràmetres de configuració de la cartera
+Description[cs]=Povolit uložení nastavení úschovny
+Description[da]=Tillad gemning af tegnebogsindstillinger
+Description[de]=Ermöglicht es, die Einstellungen des Passwortspeichers zu speichern
+Description[el]=Να επιτρέπεται η αποθήκευση της διαμόρφωσης πορτοφολιού
+Description[es]=Permitir que se guarde la configuración de la cartera
+Description[fi]=Salli lompakon asetusten tallentaminen
+Description[fr]=Autoriser l'enregistrement les paramètres de la configuration du portefeuille
+Description[gl]=Permite gardar a configuración da carteira
+Description[hu]=Lehetővé teszi a jelszóbeállítások mentését
+Description[ia]=Il permitte salveguardar preferentias de configuration de portafolio
+Description[it]=Permette il salvataggio della configurazione del portafogli
+Description[kk]=Әмиян баптау параметрлерін сақтауын рұқсат ету
+Description[nb]=Kan lagre oppsettsinnstillingene for lommeboka
+Description[nl]=Opslaan van instellingen van de portefeuille toestaan
+Description[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੈਟਿੰਗ ਸੰਭਾਲਣ ਦੀ ਮਨਜ਼ੂਰੀ
+Description[pt]=Permitir a gravação das definições da carteira
+Description[pt_BR]=Permite salvar as configurações da carteira
+Description[ro]=Permite salvarea parametrilor de configurare ai portofelului
+Description[sk]=Umožniť ukladanie nastavenia peňaženky
+Description[sl]=Dovoli shranjevanje nastavitev listnice
+Description[sr]=Дозволи уписивање поставки новчаника
+Description[sr@ijekavian]=Дозволи уписивање поставки новчаника
+Description[sr@ijekavianlatin]=Dozvoli upisivanje postavki novčanika
+Description[sr@latin]=Dozvoli upisivanje postavki novčanika
+Description[sv]=Tillåt att plånboksinställningar sparas
+Description[tr]=Cüzdan yapılandırma ayarlarının kaydedilmesine izin ver
+Description[uk]=Дозволити зберігання параметрів налаштування KWallet
+Description[x-test]=xxAllow saving wallet configuration settingsxx
+Description[zh_CN]=允许保存钱包配置设定
+Description[zh_TW]=允許儲存錢包設定
+Policy=auth_self
+Persistence=session
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/kwalletconfig.desktop new/kwallet-4.12.0/src/konfigurator/kwalletconfig.desktop
--- old/kwallet-4.11.2/src/konfigurator/kwalletconfig.desktop 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/konfigurator/kwalletconfig.desktop 2013-12-09 07:23:12.000000000 +0100
@@ -21,7 +21,7 @@
Name[cs]=Úschovna KDE
Name[cy]=Waled KDE
Name[da]=KDE's tegnebog
-Name[de]=Digitale Brieftasche
+Name[de]=KDE-Passwortspeicher
Name[el]=Πορτοφόλι του KDE
Name[en_GB]=KDE Wallet
Name[eo]=KDE paperujo
@@ -91,7 +91,7 @@
Comment[cs]=Nastavení úschovny KDE
Comment[cy]=Ffurfweddiad Waled KDE
Comment[da]=Konfiguration af KDE's tegnebog
-Comment[de]=Einrichten der „digitalen Brieftasche“ (KWallet)
+Comment[de]=Einrichten des Passwortspeicher (KWallet)
Comment[el]=Διαμόρφωση του πορτοφολιού του KDE
Comment[en_GB]=KDE Wallet Configuration
Comment[eo]=KDE paperuja agordo
@@ -106,7 +106,7 @@
Comment[he]=KDE Wallet הגדרות
Comment[hne]=केडीई वालेट कान्फिगरेसन
Comment[hr]=Konfiguracija KDE-ovog novčanika
-Comment[hu]=A KDE digitális noteszeinek beállításai
+Comment[hu]=KDE jelszókezelő beállítások
Comment[ia]=Configuration de portafolio de KDE
Comment[id]=Konfigurasi Dompet KDE
Comment[is]=Stillingar veskisins
@@ -155,12 +155,12 @@
X-KDE-Keywords[ca@valencia]=Cartera,Omplir formulari,Contrasenyes,Dades de formulari
X-KDE-Keywords[cs]=Úschovna,Vyplnění formuláře,Hesla,Data formuláře
X-KDE-Keywords[da]=tegnebog,formularudfyldning,adgangskoder,formulardata
-X-KDE-Keywords[de]=Geheimfach,Formular,Passwort,Brieftasche,digitale Brieftasche
+X-KDE-Keywords[de]=Geheimfach,Formular,Passwort,Passwortspeicher,Formulardaten
X-KDE-Keywords[el]=Πορτοφόλι,συμπλήρωση φόρμας,κωδικοί πρόσβασης,δεδομένα φόρμας
X-KDE-Keywords[es]=Cartera,Rellenar formulario,Contraseñas,Datos de formulario
X-KDE-Keywords[et]=turvalaegas,vormide täitmine,paroolid,vormiandmed
X-KDE-Keywords[fi]=Lompakko,Lomakkeen täydennys,Lomakkeen täydentäminen,Salasanat,Lomaketiedot,Lomakkeiden tiedot
-X-KDE-Keywords[fr]=Portefeuille, remplissage de formulaires, mots de passe, données de formulaires
+X-KDE-Keywords[fr]=Portefeuille,remplissage de formulaires,mots de passe,données de formulaires
X-KDE-Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
X-KDE-Keywords[gl]=Wallet,Form Fill,Passwords,Form Data,carteira,formulario,contrasinais
X-KDE-Keywords[hu]=Jelszótároló,űrlapkitöltés,jelszavak,űrlapadat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/kwalletmanager_show.desktop new/kwallet-4.12.0/src/konfigurator/kwalletmanager_show.desktop
--- old/kwallet-4.11.2/src/konfigurator/kwalletmanager_show.desktop 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/konfigurator/kwalletmanager_show.desktop 2013-12-09 07:23:12.000000000 +0100
@@ -10,7 +10,7 @@
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[de]=Passwortverwaltung
Name[el]=Εργαλείο διαχείρισης πορτοφολιού
Name[en_GB]=Wallet Management Tool
Name[eo]=Paperuja administrilo
@@ -25,7 +25,7 @@
Name[he]=כלי לניהול הארנק של KDE
Name[hne]=बटुआ प्रबंधन औजार
Name[hr]=Alat za upravljanje novčanikom
-Name[hu]=Kezelőprogram a KDE digitális noteszeihez
+Name[hu]=Jelszókezelő eszköz
Name[ia]=Instrumento de gestion de portafolio
Name[id]=Perkakas Manajemen Dompet
Name[is]=Tól til að stýra eiginleikum veskisins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/savehelper.cpp new/kwallet-4.12.0/src/konfigurator/savehelper.cpp
--- old/kwallet-4.11.2/src/konfigurator/savehelper.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kwallet-4.12.0/src/konfigurator/savehelper.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2013 Valentin Rusu
+
+ 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 "savehelper.h"
+
+#include
+#include
+
+#if defined(Q_CC_MSVC)
+// TODO: or rather use uid_t in the getuid() call below?
+#define __uid_t uid_t
+#endif
+
+ActionReply SaveHelper::save(QVariantMap args)
+{
+ __uid_t uid = getuid();
+ kDebug() << "executing uid=" << uid;
+
+ return ActionReply::SuccessReply;
+}
+
+KDE4_AUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet", SaveHelper)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/konfigurator/savehelper.h new/kwallet-4.12.0/src/konfigurator/savehelper.h
--- old/kwallet-4.11.2/src/konfigurator/savehelper.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kwallet-4.12.0/src/konfigurator/savehelper.h 2013-12-09 07:23:12.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2013 Valentin Rusu
+
+ 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 _SAVEHELPER_H_
+#define _SAVEHELPER_H_
+
+#include
+
+using namespace KAuth;
+
+class SaveHelper : public QObject {
+ Q_OBJECT;
+public slots:
+ ActionReply save(QVariantMap args);
+};
+
+#endif // _SAVEHELPER_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/allyourbase.cpp new/kwallet-4.12.0/src/manager/allyourbase.cpp
--- old/kwallet-4.11.2/src/manager/allyourbase.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/allyourbase.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -340,7 +340,8 @@
* KWalletEntryList - A listview to store wallet entries
*/
KWalletEntryList::KWalletEntryList(QWidget *parent, const char *name)
-: QTreeWidget(parent) {
+: QTreeWidget(parent),
+ _wallet(0) {
setObjectName( QLatin1String( name ) );
setColumnCount(1);
setHeaderLabel(i18n("Folders"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalleteditor.cpp new/kwallet-4.12.0/src/manager/kwalleteditor.cpp
--- old/kwallet-4.11.2/src/manager/kwalleteditor.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalleteditor.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -179,6 +179,7 @@
_nonLocal = isPath;
_w = wallet;
+ _entryList->setWallet(_w);
connect(_w, SIGNAL(walletOpened(bool)), this, SLOT(walletOpened(bool)));
connect(_w, SIGNAL(walletClosed()), this, SLOT(walletClosed()));
connect(_w, SIGNAL(folderUpdated(QString)), this, SLOT(updateEntries(QString)));
@@ -189,6 +190,9 @@
emit enableWalletActions(true);
emit enableContextFolderActions(true);
+ _mapEditorShowHide->setChecked(false);
+ showHideMapEditorValue(false);
+
setFocus();
_searchLine->setFocus();
}
@@ -490,7 +494,7 @@
void KWalletEditor::entrySelectionChanged(QTreeWidgetItem *item) {
// do not forget to save changes
- if ( _saveChanges->isEnabled() && (_displayedItem != item) ){
+ if ( _saveChanges->isEnabled() && _displayedItem && (_displayedItem != item) ){
if ( KMessageBox::Yes == KMessageBox::questionYesNo(this,
i18n("The contents of the current item has changed.\nDo you want to save changes?"))) {
saveEntry();
@@ -556,13 +560,12 @@
}
} else if (ci->entryType() == KWallet::Wallet::Map) {
_entryStack->setCurrentIndex(2);
- _mapEditorShowHide->setChecked(false);
- showHideMapEditorValue(false);
if (_w->readMap(item->text(0), _currentMap) == 0) {
_mapEditor->reload();
_entryName->setText(i18n("Name-Value Map: %1", item->text(0)));
_saveChanges->setEnabled(false);
_undoChanges->setEnabled(false);
+ showHideMapEditorValue(_mapEditorShowHide->isChecked());
}
} else if (ci->entryType() == KWallet::Wallet::Stream) {
_entryStack->setCurrentIndex(3);
@@ -889,6 +892,7 @@
KMessageBox::error(this, i18n("An unexpected error occurred trying to delete the entry"));
return;
}
+ _displayedItem = 0;
_w->removeEntry(item->text(0));
delete item;
entrySelectionChanged(_entryList->currentItem());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalletmanager.cpp new/kwallet-4.12.0/src/manager/kwalletmanager.cpp
--- old/kwallet-4.11.2/src/manager/kwalletmanager.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalletmanager.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -121,6 +121,11 @@
action->setText(i18n("&New Wallet..."));
action->setIcon(KIcon( QLatin1String( "kwalletmanager" )));
connect(action, SIGNAL(triggered()), SLOT(createWallet()));
+
+ action = actionCollection()->addAction(QLatin1String( "wallet_open") );
+ action->setText(i18n("Open Wallet..."));
+ connect(action, SIGNAL(triggered()), this, SLOT(openWallet()));
+
action = actionCollection()->addAction(QLatin1String( "wallet_delete" ));
action->setText(i18n("&Delete Wallet..."));
action->setIcon(KIcon( QLatin1String( "trash-empty" )));
@@ -321,8 +326,7 @@
void KWalletManager::openWallet(const QString& walletName)
{
- Q_UNUSED(walletName);
- qWarning("TODO: implement openWallet from name");
+ _managerWidget->openWallet(walletName);
}
void KWalletManager::openWallet()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalletmanagerwidget.cpp new/kwallet-4.12.0/src/manager/kwalletmanagerwidget.cpp
--- old/kwallet-4.11.2/src/manager/kwalletmanagerwidget.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalletmanagerwidget.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -106,6 +106,17 @@
return false;
}
+bool KWalletManagerWidget::openWallet(const QString& name)
+{
+ bool result = false;
+ if (_walletPages.contains(name)) {
+ KWalletManagerWidgetItem *wi = _walletPages[name];
+ setCurrentPage(wi);
+ result = wi->openWallet();
+ }
+ return result;
+}
+
const QString& KWalletManagerWidget::activeWalletName() const
{
return qobject_cast(currentPage())->walletName();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalletmanagerwidget.h new/kwallet-4.12.0/src/manager/kwalletmanagerwidget.h
--- old/kwallet-4.11.2/src/manager/kwalletmanagerwidget.h 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalletmanagerwidget.h 2013-12-09 07:23:12.000000000 +0100
@@ -35,6 +35,7 @@
void updateWalletDisplay(QString selectWallet = QString());
bool hasWallet(const QString&) const;
bool openWalletFile(const QString& path);
+ bool openWallet(const QString& name);
const QString& activeWalletName() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalletmanagerwidgetitem.cpp new/kwallet-4.12.0/src/manager/kwalletmanagerwidgetitem.cpp
--- old/kwallet-4.11.2/src/manager/kwalletmanagerwidgetitem.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalletmanagerwidgetitem.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -41,4 +41,9 @@
_controlWidget->updateWalletDisplay();
}
+bool KWalletManagerWidgetItem::openWallet()
+{
+ return _controlWidget->openWallet();
+}
+
#include "kwalletmanagerwidgetitem.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/kwalletmanagerwidgetitem.h new/kwallet-4.12.0/src/manager/kwalletmanagerwidgetitem.h
--- old/kwallet-4.11.2/src/manager/kwalletmanagerwidgetitem.h 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/kwalletmanagerwidgetitem.h 2013-12-09 07:23:12.000000000 +0100
@@ -30,6 +30,7 @@
void updateWalletDisplay();
const QString& walletName() const { return _walletName; }
+ bool openWallet();
private:
WalletControlWidget *_controlWidget;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/main.cpp new/kwallet-4.12.0/src/manager/main.cpp
--- old/kwallet-4.11.2/src/manager/main.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/main.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -41,16 +41,16 @@
};
int main(int argc, char **argv) {
- KAboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "1.10",
+ KAboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "2.0",
ki18n("KDE Wallet Management Tool"),
KAboutData::License_GPL,
ki18n("(c) 2003,2004 George Staikos"), KLocalizedString(),
"http://utils.kde.org/projects/kwalletmanager");
- about.addAuthor(ki18n("Michael Leupold"), ki18n("Maintainer"), "lemma@confuego.org");
+ about.addAuthor(ki18n("Valentin Rusu"), ki18n("Maintainer, user interface refactoring"), "kde@rusu.info");
about.addAuthor(ki18n("George Staikos"), ki18n("Original author and former maintainer"), "staikos@kde.org");
+ about.addAuthor(ki18n("Michael Leupold"), ki18n("Developer and former maintainer"), "lemma@confuego.org");
about.addAuthor(ki18n("Isaac Clerencia"), ki18n("Developer"), "isaac@warp.es");
- about.addAuthor(ki18n("Valentin Rusu"), ki18n("Developer - user interface refactoring"), "kde@rusu.info");
KCmdLineArgs::init(argc, argv, &about);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/walletcontrolwidget.cpp new/kwallet-4.12.0/src/manager/walletcontrolwidget.cpp
--- old/kwallet-4.11.2/src/manager/walletcontrolwidget.cpp 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/walletcontrolwidget.cpp 2013-12-09 07:23:12.000000000 +0100
@@ -45,35 +45,51 @@
QTimer::singleShot(1, this, SLOT(onSetupWidget()));
}
+bool WalletControlWidget::openWallet()
+{
+ bool result = false;
+ if (_wallet && _wallet->isOpen()) {
+ result = true; // already opened
+ } else {
+ _wallet = KWallet::Wallet::openWallet(_walletName, winId());
+ result = _wallet != 0;
+ onSetupWidget();
+ }
+ return result;
+}
+
void WalletControlWidget::onSetupWidget()
{
if (KWallet::Wallet::isOpen(_walletName)) {
if (0 == _wallet) {
_wallet = KWallet::Wallet::openWallet(_walletName, winId());
- Q_ASSERT(_wallet != 0);
- }
- if (_wallet) {
- connect(_wallet, SIGNAL(walletClosed()), this, SLOT(onWalletClosed()));
- _openClose->setText(i18n("&Close"));
-
- if (0 == _walletEditor) {
- _walletEditor = new KWalletEditor(_editorFrame);
- _editorFrameLayout->addWidget(_walletEditor);
- _walletEditor->setVisible(true);
+ if (0 == _wallet) {
+ kDebug() << "Weird situation: wallet could not be opened when setting-up the widget.";
}
- _walletEditor->setWallet(_wallet);
+ }
+ }
- if (0 == _applicationsManager) {
- _applicationsManager = new ApplicationsManager(_applicationsFrame);
- _applicationsFrameLayout->addWidget(_applicationsManager);
- _applicationsManager->setVisible(true);
- }
- _applicationsManager->setWallet(_wallet);
+ if (_wallet) {
+ connect(_wallet, SIGNAL(walletClosed()), this, SLOT(onWalletClosed()));
+ _openClose->setText(i18n("&Close"));
- _changePassword->setEnabled(true);
- _stateLabel->setText(i18nc("the 'kdewallet' is currently open (e.g. %1 will be replaced with current wallet name)", "The '%1' wallet is currently open", _walletName));
- _tabs->setTabIcon(0, QIcon::fromTheme( QLatin1String("wallet-open")).pixmap(16));
+ if (0 == _walletEditor) {
+ _walletEditor = new KWalletEditor(_editorFrame);
+ _editorFrameLayout->addWidget(_walletEditor);
+ _walletEditor->setVisible(true);
}
+ _walletEditor->setWallet(_wallet);
+
+ if (0 == _applicationsManager) {
+ _applicationsManager = new ApplicationsManager(_applicationsFrame);
+ _applicationsFrameLayout->addWidget(_applicationsManager);
+ _applicationsManager->setVisible(true);
+ }
+ _applicationsManager->setWallet(_wallet);
+
+ _changePassword->setEnabled(true);
+ _stateLabel->setText(i18nc("the 'kdewallet' is currently open (e.g. %1 will be replaced with current wallet name)", "The '%1' wallet is currently open", _walletName));
+ _tabs->setTabIcon(0, QIcon::fromTheme( QLatin1String("wallet-open")).pixmap(16));
} else {
_openClose->setText(i18n("&Open..."));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/walletcontrolwidget.h new/kwallet-4.12.0/src/manager/walletcontrolwidget.h
--- old/kwallet-4.11.2/src/manager/walletcontrolwidget.h 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/walletcontrolwidget.h 2013-12-09 07:23:12.000000000 +0100
@@ -34,6 +34,8 @@
public:
WalletControlWidget(QWidget* parent, const QString& walletName);
+ bool openWallet();
+
public Q_SLOTS:
void onSetupWidget();
void onOpenClose();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.11.2/src/manager/walletwidget.ui new/kwallet-4.12.0/src/manager/walletwidget.ui
--- old/kwallet-4.11.2/src/manager/walletwidget.ui 2013-08-28 19:08:58.000000000 +0200
+++ new/kwallet-4.12.0/src/manager/walletwidget.ui 2013-12-09 07:23:12.000000000 +0100
@@ -174,6 +174,9 @@
<family>Monospace</family>
</font>
</property>
+ <property name="acceptRichText">
+ <bool>false</bool>
+ </property>
</widget>
</item>
</layout>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org