|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/CMakeLists.txt
|
| @@ -1,26 +1,42 @@
-project(kwallet)
+project(kwalletmanager5)
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
- find_package(KDE4)
- include( KDE4Defaults )
- include_directories(${KDE4_INCLUDES})
-
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-
- # If definitions like -D_GNU_SOURCE are needed for these checks they
- # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally
- # defined outside this file. Here we include these definitions in
- # CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of
- # checks below.
- set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} )
-endif()
+cmake_minimum_required(VERSION 2.8.12)
+
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+find_package(Qt5 5.2.0 CONFIG REQUIRED Core Gui Widgets DBus)
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(FeatureSummary)
+include(ECMInstallIcons)
+include(ECMAddAppIcon)
+
+find_package(KF5 5.2.0 REQUIRED
+ CoreAddons
+ DocTools
+ Auth
+ Wallet
+ Service
+ KCMUtils
+ KDELibs4Support
+ I18n
+ XmlGui
+ Config
+ ConfigWidgets
+ DBusAddons
+)
add_subdirectory( doc )
-add_subdirectory( icons )
-add_subdirectory( src )
+add_subdirectory( icons )
+add_subdirectory( src )
+if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+endif()
########### install files ###############
-
-install( PROGRAMS kwalletmanager.desktop kwalletmanager-kwalletd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install( PROGRAMS org.kde.kwalletmanager5.desktop kwalletmanager5-kwalletd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/CTestConfig.cmake
^
|
| @@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING()
## INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "kwallet")
+set(CTEST_PROJECT_NAME "kwalletmanager")
set(CTEST_NIGHTLY_START_TIME "20:00:00 CET")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=kwallet")
+set(CTEST_DROP_LOCATION "/submit.php?project=kwalletmanager")
set(CTEST_DROP_SITE_CDASH TRUE)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/doc/CMakeLists.txt
^
|
| @@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kwallet)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kwallet5)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/doc/index.docbook
^
|
| @@ -1,16 +1,16 @@
<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kwallet "<application>KWallet</application>">
- <!ENTITY kwalletmanager "<application>KWallet Manager</application>">
- <!ENTITY package "kwallet">
- <!ENTITY kappname "&kwallet;">
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+ <!ENTITY kwallet5 "<application>KWallet</application>">
+ <!ENTITY kwalletmanager5 "<application>KWallet Manager</application>">
+ <!ENTITY package "kwallet5">
+ <!ENTITY kappname "&kwallet5;">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>
-<book id="kwallet" lang="&language;">
+<book id="kwallet5" lang="&language;">
<bookinfo>
-<title>The &kwallet; Handbook</title>
+<title>The &kwallet5; Handbook</title>
<authorgroup>
<author>
@@ -57,7 +57,7 @@
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,
+<para>&kwallet5; 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>
@@ -69,17 +69,17 @@
<itemizedlist>
<listitem><para>Use the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>New
-Wallet</guimenuitem></menuchoice> in the &kwalletmanager;</para></listitem>
+Wallet</guimenuitem></menuchoice> in the &kwalletmanager5;</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>.
+not create a wallet so far, see section <link linkend="kwallet-using">Using &kwallet5;</link>.
</para></listitem>
</itemizedlist>
-<para>&kwallet; offers two different ways to store your data:</para>
+<para>&kwallet5; offers two different ways to store your data:</para>
<screenshot>
<screeninfo>Select encryption</screeninfo>
@@ -94,7 +94,7 @@
<varlistentry>
<term>Blowfish encryption</term>
<listitem>
-<para>&kwallet; saves this sensitive data for you in a strongly encrypted
+<para>&kwallet5; saves this sensitive data for you in a strongly encrypted
file, accessible by all applications, and protected with a master
password that you define.</para>
@@ -142,13 +142,13 @@
</mediaobject>
</screenshot>
-<para>&kwallet; will now use GPG when storing wallets and when opening them.
+<para>&kwallet5; 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 same &kde; session can handle simultaneously both file formats. &kwallet5; will transparently detect
the file format and load the correct backend to handle it.</para>
<para>
@@ -156,7 +156,7 @@
<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>
+<listitem><para>Launch &kwalletmanager5; 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>
@@ -165,7 +165,7 @@
</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>.
+to your old wallet, located in <filename class="directory">$<envar>KDEHOME</envar>/.local/share/kwalletd</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
@@ -179,10 +179,10 @@
</variablelist>
<tip>
-<para>&kwallet; supports multiple wallets, so
+<para>&kwallet5; supports multiple wallets, so
for the most secure operation, you should use one wallet for local
passwords, and another for network passwords and form data. You can
-configure this behavior in the &kwallet; &systemsettings; module, however
+configure this behavior in the &kwallet5; &systemsettings; module, however
the default setting is to store everything in one wallet.</para>
</tip>
@@ -192,7 +192,7 @@
</sect1>
<sect1 id="kwallet-using">
-<title>Using &kwallet;</title>
+<title>Using &kwallet5;</title>
<para>If you visit ⪚ the &kde; bugtracker and enter the login data for
the first time, a dialog pops up offering to store the password in an
@@ -230,24 +230,24 @@
</chapter>
-<chapter id="kwalletmanager">
-<title>&kwalletmanager;</title>
+<chapter id="kwalletmanager5">
+<title>&kwalletmanager5;</title>
-<para>&kwalletmanager; serves a number of functions. Firstly it allows you to see if
+<para>&kwalletmanager5; serves a number of functions. Firstly it allows you to see if
any wallets are open, which wallets those are, and which applications are
using each wallet. You can disconnect an application's access to a wallet
-from within the &kwalletmanager;.</para>
+from within the &kwalletmanager5;.</para>
<para>You may also manage the wallets installed on the system, creating and
deleting wallets and manipulating their contents (changing keys, ...).</para>
-<para>The &kwalletmanager; application is launched with <menuchoice>
+<para>The &kwalletmanager5; application is launched with <menuchoice>
<guimenu>Applications</guimenu><guisubmenu>System</guisubmenu>
<guimenuitem>Wallet Management Tool</guimenuitem></menuchoice> from the
application launcher.
Alternatively start &krunner; with shortcut <keycombo
action="simul">&Alt;<keycap>F2</keycap></keycombo> and enter
-<command>kwalletmanager</command>.</para>
+<command>kwalletmanager5</command>.</para>
<para>A system tray icon indicates that a wallet is open:
<mediaobject>
@@ -267,14 +267,14 @@
</para>
-<para>Click once on the system tray wallet icon to display the &kwalletmanager;
+<para>Click once on the system tray wallet icon to display the &kwalletmanager5;
window.</para>
<para>
<screenshot>
<screeninfo>Main window with one wallet</screeninfo>
<mediaobject>
<imageobject>
-<imagedata fileref="kwalletmanager.png"/>
+<imagedata fileref="kwalletmanager5.png"/>
</imageobject>
<textobject>
<phrase>Main window with one wallet</phrase>
@@ -295,7 +295,7 @@
<para>If you have more than one wallet all available wallets are shown as icons on the left. The Icons reflect the
current wallet status, either open or closed.
</para>
-<para>Clicking on a wallet in the &kwalletmanager; window will display
+<para>Clicking on a wallet in the &kwalletmanager5; window will display
that wallet's status and the contents of an opened wallet. A wallet may contain any number
of folders, which allow storing of password information. By default a wallet
will contain folders named Form Data and Passwords.
@@ -404,18 +404,18 @@
</chapter>
<chapter id="kwallet-kcontrol-module">
-<title>Configuring &kwallet;</title>
+<title>Configuring &kwallet5;</title>
<sect1 id="wallet-preferences">
<title>Wallet Preferences</title>
-<para>&kwallet; contains a small configuration panel with several options
-that allow you to tune &kwallet; to your personal preferences. The
-default settings for &kwallet; are sufficient for most users.</para>
+<para>&kwallet5; contains a small configuration panel with several options
+that allow you to tune &kwallet5; to your personal preferences. The
+default settings for &kwallet5; are sufficient for most users.</para>
<para>Check the box to enable or disable the &kde; wallet subsystem
-entirely. If this box is unchecked, then &kwallet; is entirely disabled and
-none of the other options here have any effect, nor will &kwallet; record
+entirely. If this box is unchecked, then &kwallet5; is entirely disabled and
+none of the other options here have any effect, nor will &kwallet5; record
any information, or offer to fill in forms for you.</para>
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/icons/22-actions-folder_closed.png
^
|
| (renamed from icons/hi22-action-folder_closed.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/icons/22-actions-folder_open.png
^
|
| (renamed from icons/hi22-action-folder_open.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/icons/CMakeLists.txt
^
|
| @@ -1 +1 @@
-kde4_install_icons( ${DATA_INSTALL_DIR}/kwalletmanager/icons )
+ecm_install_icons( ICONS 22-actions-folder_closed.png 22-actions-folder_open.png DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager5/icons )
|
|
[-]
[+]
|
Deleted |
kwalletmanager-5.3.0.tar.xz/kwalletmanager-kwalletd.desktop
^
|
| @@ -1,78 +0,0 @@
-[Desktop Entry]
-Name=Wallet Management Tool
-Name[ar]=أداة إدارة المحفظة
-Name[ast]=Ferramienta pa xestionar cartera
-Name[bg]=Инструмент за настройване на "Портфейл"
-Name[br]=Merour an doug-paperoù
-Name[bs]=Alatka za upravljanje novčanicima
-Name[ca]=Eina de gestió de carteres
-Name[ca@valencia]=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]=Passwortverwaltung
-Name[el]=Εργαλείο διαχείρισης πορτοφολιού
-Name[en_GB]=Wallet Management Tool
-Name[eo]=Paperuja administrilo
-Name[es]=Herramienta de gestión de carteras
-Name[et]=Turvalaeka haldur
-Name[eu]=Zorroa kudeatzeko tresna
-Name[fa]=ابزار مدیریت Wallet
-Name[fi]=Lompakonhallinta
-Name[fr]=Outil de gestion de portefeuilles
-Name[ga]=Uirlis Bhainisteoireachta Wallet
-Name[gl]=Utilidade de xestión de carteiras
-Name[he]=כלי לניהול הארנק של KDE
-Name[hne]=बटुआ प्रबंधन औजार
-Name[hr]=Alat za upravljanje novčanikom
-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
-Name[it]=Strumento per la gestione dei portafogli
-Name[ja]=ウォレット管理ツール
-Name[kk]=Әмиянын басқару құралы
-Name[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
-Name[ko]=지갑 관리 도구
-Name[lt]=Spatažodinių tvarkymo įrankis
-Name[lv]=Maka pārvaldības rīks
-Name[mk]=Алатка за менаџирање на паричници
-Name[mr]=पाकीट व्यवस्थापन साधन
-Name[nb]=Wallet administrasjonsverktøy
-Name[nds]=Knippenpleger
-Name[ne]=वालेट व्यवस्थापन उपकरण
-Name[nl]=Portefeuillebeheer
-Name[nn]=Wallet-administrasjonsverktøy
-Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
-Name[pl]=Zarządzanie portfelem
-Name[pt]=Ferramenta de Gestão da Carteira
-Name[pt_BR]=Ferramenta de gerenciamento de carteiras
-Name[ro]=Administrare portofel
-Name[ru]=Управление бумажниками
-Name[sk]=Nástroj pre správu KDE Wallet
-Name[sl]=Orodje za upravljanje z listnicami
-Name[sq]=Mjet i Menaxhimit të Portofolit
-Name[sr]=Алатка за управљање новчаницима
-Name[sr@ijekavian]=Алатка за управљање новчаницима
-Name[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
-Name[sr@latin]=Alatka za upravljanje novčanicima
-Name[sv]=Hanteringsverktyg för plånbok
-Name[ta]=வாலட் மேலாண்மை கருவி
-Name[tg]=Асбоби Идоракунии Ҳамён
-Name[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
-Name[tr]=Cüzdan Yönetim Aracı
-Name[ug]=ھەميان باشقۇرۇش قورالى
-Name[uk]=Засіб керування торбинками
-Name[uz]=Qopchiq boshqarish vositasi
-Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
-Name[vi]=Công Cụ Quản Lý Ví
-Name[x-test]=xxWallet Management Toolxx
-Name[zh_CN]=钱包管理工具
-Name[zh_TW]=錢包管理工具
-Exec=kwalletmanager --kwalletd
-Icon=kwalletmanager
-Type=Application
-Terminal=false
-X-KDE-StartupNotify=false
-NoDisplay=true
-
|
|
[-]
[+]
|
Deleted |
kwalletmanager-5.3.0.tar.xz/kwalletmanager.desktop
^
|
| @@ -1,124 +0,0 @@
-[Desktop Entry]
-Name=KWalletManager
-Name[ar]=KWalletManager
-Name[ast]=KWalletManager
-Name[bg]=KWalletManager
-Name[bs]=KWalletManager
-Name[ca]=KWalletManager
-Name[ca@valencia]=KWalletManager
-Name[cs]=KWalletManager
-Name[da]=KWalletManager
-Name[de]=KWalletManager
-Name[el]=KWalletManager
-Name[en_GB]=KWalletManager
-Name[es]=KWalletManager
-Name[et]=Turvalaeka haldur
-Name[eu]=KWalletManager
-Name[fi]=KWalletManager
-Name[fr]=KWalletManager
-Name[ga]=KWalletManager
-Name[gl]=KWalletManager
-Name[hne]=के-वालेट-मैनेजर
-Name[hr]=KWalletManager
-Name[hu]=KWalletManager
-Name[ia]=Gerente KWallet
-Name[id]=KWalletManager
-Name[it]=KWalletManager
-Name[ja]=KWalletManager
-Name[kk]=KWalletManager
-Name[km]=KWalletManager
-Name[ko]=KWalletManager
-Name[lt]=KWalletManager
-Name[lv]=KWalletManager
-Name[mr]=के-वॉलेट व्यवस्थापक
-Name[nb]=KWalletManager
-Name[nds]=KDE-Knippenpleger
-Name[nl]=KWalletManager
-Name[nn]=KWalletManager
-Name[pa]=ਕੇਵਾਲਿਟ-ਮੈਨੇਜਰ
-Name[pl]=KWalletManager
-Name[pt]=KWalletManager
-Name[pt_BR]=KWalletManager
-Name[ro]=KWalletManager
-Name[ru]=KWalletManager
-Name[sk]=KWalletManager
-Name[sl]=Upravljalnik Listnice za KDE
-Name[sq]=KWalletManager
-Name[sr]=Менаџер К‑новчаника
-Name[sr@ijekavian]=Менаџер К‑новчаника
-Name[sr@ijekavianlatin]=Menadžer K‑novčanika
-Name[sr@latin]=Menadžer K‑novčanika
-Name[sv]=Hanteringsverktyg för plånbok
-Name[th]=จัดการกระเป๋าคุมข้อมูล-K
-Name[tr]=KWallet Yönetim Aracı
-Name[ug]=KWalletManager
-Name[uk]=KWalletManager
-Name[x-test]=xxKWalletManagerxx
-Name[zh_CN]=KWalletManager
-Name[zh_TW]=KDE 錢包管理員
-GenericName=Wallet Management Tool
-GenericName[ar]=أداة إدارة المحفظة
-GenericName[ast]=Ferramienta pa xestionar cartera
-GenericName[bg]=Управление на "Портфейл"
-GenericName[bs]=Alatka za upravljanje novčanicima
-GenericName[ca]=Eina de gestió de carteres
-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]=Passwortverwaltung
-GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
-GenericName[en_GB]=Wallet Management Tool
-GenericName[es]=Herramienta de gestión de carteras
-GenericName[et]=Turvalaeka haldur
-GenericName[eu]=Zorroa kudeatzeko tresna
-GenericName[fi]=Lompakonhallinta
-GenericName[fr]=Outil de gestion de portefeuilles
-GenericName[ga]=Uirlis Bhainisteoireachta Sparáin
-GenericName[gl]=Utilidade de xestión de carteiras
-GenericName[hne]=बटुआ प्रबंधन औजार
-GenericName[hr]=Alat za upravljanje novčanikom
-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
-GenericName[ja]=ウォレット管理ツール
-GenericName[kk]=Әмиянын басқару құралы
-GenericName[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
-GenericName[ko]=지갑 관리 도구
-GenericName[lt]=Spatažodinių tvarkymo įrankis
-GenericName[lv]=Maka pārvaldības rīks
-GenericName[mr]=पाकीट व्यवस्थापन साधन
-GenericName[nb]=Wallet administrasjonsverktøy
-GenericName[nds]=Knippenpleger
-GenericName[nl]=Portefeuillebeheer
-GenericName[nn]=Wallet-administrasjonsverktøy
-GenericName[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
-GenericName[pl]=Zarządzanie portfelem
-GenericName[pt]=Ferramenta de Gestão da Carteira
-GenericName[pt_BR]=Ferramenta de gerenciamento de carteiras
-GenericName[ro]=Administrare portofel
-GenericName[ru]=Управление бумажниками
-GenericName[sk]=Nástroj pre správu KDE Wallet
-GenericName[sl]=Orodje za upravljanje z listnicami
-GenericName[sq]=Mjet i Menaxhimit të Portofolit
-GenericName[sr]=Алатка за управљање новчаницима
-GenericName[sr@ijekavian]=Алатка за управљање новчаницима
-GenericName[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
-GenericName[sr@latin]=Alatka za upravljanje novčanicima
-GenericName[sv]=Hanteringsverktyg för plånbok
-GenericName[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
-GenericName[tr]=Cüzdan Yönetim Aracı
-GenericName[ug]=ھەميان باشقۇرۇش قورالى
-GenericName[uk]=Засіб керування торбинками
-GenericName[x-test]=xxWallet Management Toolxx
-GenericName[zh_CN]=钱包管理工具
-GenericName[zh_TW]=錢包管理工具
-Exec=kwalletmanager %u
-MimeType=application/x-kwallet;
-InitialPreference=6
-Icon=kwalletmanager
-Type=Application
-Terminal=false
-X-KDE-StartupNotify=false
-Categories=Qt;KDE;System;Security;
-X-DocPath=kwallet/index.html
|
|
[-]
[+]
|
Added |
kwalletmanager-5.3.0.tar.xz/kwalletmanager5-kwalletd.desktop
^
|
| @@ -0,0 +1,78 @@
+[Desktop Entry]
+Name=Wallet Management Tool
+Name[ar]=أداة إدارة المحفظة
+Name[ast]=Ferramienta pa xestionar cartera
+Name[bg]=Инструмент за настройване на "Портфейл"
+Name[br]=Merour an doug-paperoù
+Name[bs]=Alatka za upravljanje novčanicima
+Name[ca]=Eina de gestió de carteres
+Name[ca@valencia]=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]=Passwortverwaltung
+Name[el]=Εργαλείο διαχείρισης πορτοφολιού
+Name[en_GB]=Wallet Management Tool
+Name[eo]=Paperuja administrilo
+Name[es]=Herramienta de gestión de cartera
+Name[et]=Turvalaeka haldur
+Name[eu]=Zorroa kudeatzeko tresna
+Name[fa]=ابزار مدیریت Wallet
+Name[fi]=Lompakonhallinta
+Name[fr]=Outil de gestion de portefeuilles
+Name[ga]=Uirlis Bhainisteoireachta Wallet
+Name[gl]=Utilidade de xestión de carteiras
+Name[he]=כלי לניהול הארנק של KDE
+Name[hne]=बटुआ प्रबंधन औजार
+Name[hr]=Alat za upravljanje novčanikom
+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
+Name[it]=Strumento per la gestione dei portafogli
+Name[ja]=ウォレット管理ツール
+Name[kk]=Әмиянын басқару құралы
+Name[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
+Name[ko]=지갑 관리 도구
+Name[lt]=Spatažodinių tvarkymo įrankis
+Name[lv]=Maka pārvaldības rīks
+Name[mk]=Алатка за менаџирање на паричници
+Name[mr]=पाकीट व्यवस्थापन साधन
+Name[nb]=Wallet administrasjonsverktøy
+Name[nds]=Knippenpleger
+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 de carteiras
+Name[ro]=Administrare portofel
+Name[ru]=Управление бумажниками
+Name[sk]=Nástroj pre správu KDE Wallet
+Name[sl]=Orodje za upravljanje z listnicami
+Name[sq]=Mjet i Menaxhimit të Portofolit
+Name[sr]=Алатка за управљање новчаницима
+Name[sr@ijekavian]=Алатка за управљање новчаницима
+Name[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
+Name[sr@latin]=Alatka za upravljanje novčanicima
+Name[sv]=Hanteringsverktyg för plånbok
+Name[ta]=வாலட் மேலாண்மை கருவி
+Name[tg]=Асбоби Идоракунии Ҳамён
+Name[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
+Name[tr]=Cüzdan Yönetim Aracı
+Name[ug]=ھەميان باشقۇرۇش قورالى
+Name[uk]=Засіб керування торбинками
+Name[uz]=Qopchiq boshqarish vositasi
+Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
+Name[vi]=Công Cụ Quản Lý Ví
+Name[x-test]=xxWallet Management Toolxx
+Name[zh_CN]=钱包管理工具
+Name[zh_TW]=錢包管理工具
+Exec=kwalletmanager5 --kwalletd
+Icon=kwalletmanager
+Type=Application
+Terminal=false
+X-KDE-StartupNotify=false
+NoDisplay=true
+X-DocPath=help:/kwallet5/index.html
|
|
[-]
[+]
|
Added |
kwalletmanager-5.3.0.tar.xz/org.kde.kwalletmanager5.desktop
^
|
| @@ -0,0 +1,125 @@
+[Desktop Entry]
+Name=KWalletManager
+Name[ar]=KWalletManager
+Name[ast]=KWalletManager
+Name[bg]=KWalletManager
+Name[bs]=KWalletManager
+Name[ca]=KWalletManager
+Name[ca@valencia]=KWalletManager
+Name[cs]=KWalletManager
+Name[da]=KWalletManager
+Name[de]=KWalletManager
+Name[el]=KWalletManager
+Name[en_GB]=KWalletManager
+Name[es]=KWalletManager
+Name[et]=Turvalaeka haldur
+Name[eu]=KWalletManager
+Name[fi]=KWalletManager
+Name[fr]=KWalletManager
+Name[ga]=KWalletManager
+Name[gl]=KWalletManager
+Name[hne]=के-वालेट-मैनेजर
+Name[hr]=KWalletManager
+Name[hu]=KWalletManager
+Name[ia]=Gerente KWallet
+Name[id]=KWalletManager
+Name[it]=KWalletManager
+Name[ja]=KWalletManager
+Name[kk]=KWalletManager
+Name[km]=KWalletManager
+Name[ko]=KWalletManager
+Name[lt]=KWalletManager
+Name[lv]=KWalletManager
+Name[mr]=के-वॉलेट व्यवस्थापक
+Name[nb]=KWalletManager
+Name[nds]=KDE-Knippenpleger
+Name[nl]=KWalletManager
+Name[nn]=KWalletManager
+Name[pa]=ਕੇਵਾਲਿਟ-ਮੈਨੇਜਰ
+Name[pl]=Zarządzanie Portfelem
+Name[pt]=KWalletManager
+Name[pt_BR]=KWalletManager
+Name[ro]=KWalletManager
+Name[ru]=KWalletManager
+Name[sk]=KWalletManager
+Name[sl]=KWalletManager
+Name[sq]=KWalletManager
+Name[sr]=Менаџер К‑новчаника
+Name[sr@ijekavian]=Менаџер К‑новчаника
+Name[sr@ijekavianlatin]=Menadžer K‑novčanika
+Name[sr@latin]=Menadžer K‑novčanika
+Name[sv]=Hanteringsverktyg för plånbok
+Name[th]=จัดการกระเป๋าคุมข้อมูล-K
+Name[tr]=KWallet Yönetim Aracı
+Name[ug]=KWalletManager
+Name[uk]=KWalletManager
+Name[x-test]=xxKWalletManagerxx
+Name[zh_CN]=KWalletManager
+Name[zh_TW]=KDE 錢包管理員
+GenericName=Wallet Management Tool
+GenericName[ar]=أداة إدارة المحفظة
+GenericName[ast]=Ferramienta pa xestionar cartera
+GenericName[bg]=Управление на "Портфейл"
+GenericName[bs]=Alatka za upravljanje novčanicima
+GenericName[ca]=Eina de gestió de carteres
+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]=Passwortverwaltung
+GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
+GenericName[en_GB]=Wallet Management Tool
+GenericName[es]=Herramienta de gestión de carteras
+GenericName[et]=Turvalaeka haldur
+GenericName[eu]=Zorroa kudeatzeko tresna
+GenericName[fi]=Lompakonhallinta
+GenericName[fr]=Outil de gestion de portefeuilles
+GenericName[ga]=Uirlis Bhainisteoireachta Sparáin
+GenericName[gl]=Utilidade de xestión de carteiras
+GenericName[hne]=बटुआ प्रबंधन औजार
+GenericName[hr]=Alat za upravljanje novčanikom
+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
+GenericName[ja]=ウォレット管理ツール
+GenericName[kk]=Әмиянын басқару құралы
+GenericName[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
+GenericName[ko]=지갑 관리 도구
+GenericName[lt]=Spatažodinių tvarkymo įrankis
+GenericName[lv]=Maka pārvaldības rīks
+GenericName[mr]=पाकीट व्यवस्थापन साधन
+GenericName[nb]=Wallet administrasjonsverktøy
+GenericName[nds]=Knippenpleger
+GenericName[nl]=Portefeuillebeheer
+GenericName[nn]=Wallet-administrasjonsverktøy
+GenericName[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
+GenericName[pl]=Narzędzie do zarządzania Portfelem
+GenericName[pt]=Ferramenta de Gestão da Carteira
+GenericName[pt_BR]=Ferramenta de gerenciamento de carteiras
+GenericName[ro]=Administrare portofel
+GenericName[ru]=Управление бумажниками
+GenericName[sk]=Nástroj pre správu KDE Wallet
+GenericName[sl]=Orodje za upravljanje z listnicami
+GenericName[sq]=Mjet i Menaxhimit të Portofolit
+GenericName[sr]=Алатка за управљање новчаницима
+GenericName[sr@ijekavian]=Алатка за управљање новчаницима
+GenericName[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
+GenericName[sr@latin]=Alatka za upravljanje novčanicima
+GenericName[sv]=Hanteringsverktyg för plånbok
+GenericName[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
+GenericName[tr]=Cüzdan Yönetim Aracı
+GenericName[ug]=ھەميان باشقۇرۇش قورالى
+GenericName[uk]=Засіб керування торбинками
+GenericName[x-test]=xxWallet Management Toolxx
+GenericName[zh_CN]=钱包管理工具
+GenericName[zh_TW]=錢包管理工具
+Exec=kwalletmanager5 %u
+MimeType=application/x-kwallet;
+InitialPreference=6
+Icon=kwalletmanager
+Type=Application
+Terminal=false
+StartupNotify=false
+Categories=Qt;KDE;System;Security;
+X-DocPath=kwallet/index.html
+X-DBUS-ServiceName=org.kde.kwalletmanager5
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/CMakeLists.txt
^
|
| @@ -1,31 +1,41 @@
-
-
-
-
########### next target ###############
+add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwallet\")
set(kcm_kwallet_PART_SRCS konfigurator.cpp )
-kde4_add_ui_files(kcm_kwallet_PART_SRCS walletconfigwidget.ui )
+ki18n_wrap_ui(kcm_kwallet_PART_SRCS walletconfigwidget.ui )
-kde4_add_plugin(kcm_kwallet ${kcm_kwallet_PART_SRCS})
+add_library(kcm_kwallet5 MODULE ${kcm_kwallet_PART_SRCS})
-target_link_libraries(kcm_kwallet ${KDE4_KDEUI_LIBS})
+target_link_libraries(kcm_kwallet5
+ Qt5::Core
+ KF5::Auth
+ KF5::CoreAddons
+ KF5::KCMUtils
+ KF5::Wallet
+ KF5::I18n
+ Qt5::DBus
+)
-install(TARGETS kcm_kwallet DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kcm_kwallet5 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})
+add_executable(kcm_kwallet_helper5 ${kcm_kwallet_helper_SRCS})
+target_link_libraries(kcm_kwallet_helper5
+ Qt5::Core
+ KF5::Auth
+ KF5::Wallet
+ KF5::CoreAddons
+)
-install(TARGETS kcm_kwallet_helper DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS kcm_kwallet_helper5 DESTINATION ${KAUTH_HELPER_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)
+kauth_install_helper_files(kcm_kwallet_helper5 org.kde.kcontrol.kcmkwallet5 root)
+kauth_install_actions(org.kde.kcontrol.kcmkwallet5 kwallet.actions)
########### install files ###############
-install( FILES kwalletconfig.desktop kwalletmanager_show.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install( FILES kwalletconfig5.desktop kwalletmanager5_show.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/konfigurator.cpp
^
|
| @@ -18,213 +18,213 @@
*/
#include "konfigurator.h"
-#include <QtDBus/QtDBus>
-#include <kaboutdata.h>
-#include <kapplication.h>
#include <ksharedconfig.h>
-#include <kdialog.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
-#include <kinputdialog.h>
-#include <kmenu.h>
+#include <qinputdialog.h>
#include <kwallet.h>
#include <kauthaction.h>
-#include <kdebug.h>
+#include <kauthactionreply.h>
+#include <kauthexecutejob.h>
+#include <ktoolinvocation.h>
+#include <kconfiggroup.h>
+#include <kmessagebox.h>
+#include <kaboutdata.h>
+
+#include <QDebug>
#include <QCheckBox>
+#include <QDialog>
+#include <QMenu>
#include <QPushButton>
+#include <QtDBus/QtDBus>
#include <QVBoxLayout>
-#include <ktoolinvocation.h>
-#include <kconfiggroup.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
+
#define KWALLETMANAGERINTERFACE "org.kde.KWallet"
K_PLUGIN_FACTORY(KWalletFactory, registerPlugin<KWalletConfig>();)
-K_EXPORT_PLUGIN(KWalletFactory("kcmkwallet"))
-
-
-KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList& args)
-: KCModule(KWalletFactory::componentData(), parent, args),
- _cfg(KSharedConfig::openConfig(QLatin1String( "kwalletrc" ), KConfig::NoGlobals)) {
-
- KAboutData *about =
- new KAboutData(I18N_NOOP("kcmkwallet"), 0,
- ki18n("KDE Wallet Control Module"),
- 0, KLocalizedString(), KAboutData::License_GPL,
- ki18n("(c) 2003 George Staikos"));
- about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "staikos@kde.org");
- setAboutData( about );
+KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList &args)
+ : KCModule(parent, args),
+ _cfg(KSharedConfig::openConfig(QLatin1String("kwalletrc"), KConfig::NoGlobals))
+{
+ KAboutData *about =
+ new KAboutData(QLatin1String("kcmkwallet5"),
+ i18n("KDE Wallet Control Module"),
+ QString(), QString(), KAboutLicense::GPL,
+ i18n("(c) 2003 George Staikos"));
+ about->addAuthor(i18n("George Staikos"), QString(), QLatin1String("staikos@kde.org"));
+ setAboutData(about);
setNeedsAuthorization(true);
- QVBoxLayout *vbox = new QVBoxLayout(this);
- vbox->setSpacing(KDialog::spacingHint());
- vbox->setMargin(0);
- _wcw = new WalletConfigWidget(this);
- vbox->addWidget(_wcw);
-
- 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(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint)));
+ QVBoxLayout *vbox = new QVBoxLayout(this);
+ //PORT QT5 vbox->setSpacing(KDialog::spacingHint());
+ vbox->setMargin(0);
+ _wcw = new WalletConfigWidget(this);
+ vbox->addWidget(_wcw);
+
+ connect(_wcw->_enabled, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_launchManager, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_autocloseManager, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_autoclose, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_closeIdle, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_openPrompt, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_screensaverLock, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_localWalletSelected, &QCheckBox::clicked, this, &KWalletConfig::configChanged);
+ connect(_wcw->_idleTime, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KWalletConfig::configChanged);
+ connect(_wcw->_launch, &QPushButton::clicked, this, &KWalletConfig::launchManager);
+ connect(_wcw->_newWallet, &QPushButton::clicked, this, &KWalletConfig::newNetworkWallet);
+ connect(_wcw->_newLocalWallet, &QPushButton::clicked, this, &KWalletConfig::newLocalWallet);
+ connect(_wcw->_localWallet, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &KWalletConfig::configChanged);
+ connect(_wcw->_defaultWallet, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &KWalletConfig::configChanged);
+ connect(_wcw->_accessList, &QTreeWidget::customContextMenuRequested, this, &KWalletConfig::customContextMenuRequested);
+
+ _wcw->_accessList->setAllColumnsShowFocus(true);
+ _wcw->_accessList->setContextMenuPolicy(Qt::CustomContextMenu);
+ updateWalletLists();
- _wcw->_accessList->setAllColumnsShowFocus(true);
- _wcw->_accessList->setContextMenuPolicy(Qt::CustomContextMenu);
- updateWalletLists();
-
- if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String( "org.kde.kwalletmanager" ))) {
- _wcw->_launch->hide();
- }
+ if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.kwalletmanager"))) {
+ _wcw->_launch->hide();
+ }
}
-
-KWalletConfig::~KWalletConfig() {
+KWalletConfig::~KWalletConfig()
+{
}
+void KWalletConfig::updateWalletLists()
+{
+ const QString p1(_wcw->_localWallet->currentText());
+ const QString p2(_wcw->_defaultWallet->currentText());
-void KWalletConfig::updateWalletLists() {
- const QString p1( _wcw->_localWallet->currentText() );
- const QString p2( _wcw->_defaultWallet->currentText() );
-
- _wcw->_localWallet->clear();
- _wcw->_defaultWallet->clear();
+ _wcw->_localWallet->clear();
+ _wcw->_defaultWallet->clear();
- const QStringList wl = KWallet::Wallet::walletList();
- _wcw->_localWallet->addItems(wl);
- _wcw->_defaultWallet->addItems(wl);
+ const QStringList wl = KWallet::Wallet::walletList();
+ _wcw->_localWallet->addItems(wl);
+ _wcw->_defaultWallet->addItems(wl);
- int index = wl.indexOf(p1);
- if (index != -1) {
- _wcw->_localWallet->setCurrentIndex(index);
- }
+ int index = wl.indexOf(p1);
+ if (index != -1) {
+ _wcw->_localWallet->setCurrentIndex(index);
+ }
- index = wl.indexOf(p2);
- if (index != -1) {
- _wcw->_defaultWallet->setCurrentIndex(index);
- }
+ index = wl.indexOf(p2);
+ if (index != -1) {
+ _wcw->_defaultWallet->setCurrentIndex(index);
+ }
}
+QString KWalletConfig::newWallet()
+{
+ bool ok;
+
+ const QString n = QInputDialog::getText(this, i18n("New Wallet"),
+ i18n("Please choose a name for the new wallet:"),
+ QLineEdit::Normal, QString(),
+ &ok);
-QString KWalletConfig::newWallet() {
- bool ok;
-
- const QString n = KInputDialog::getText(i18n("New Wallet"),
- i18n("Please choose a name for the new wallet:"),
- QString(),
- &ok,
- this);
-
- if (!ok) {
- return QString();
- }
+ if (!ok) {
+ return QString();
+ }
- KWallet::Wallet *w = KWallet::Wallet::openWallet(n, topLevelWidget()->winId());
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/konfigurator.h
^
|
| @@ -26,37 +26,38 @@
class WalletConfigWidget : public QWidget, public Ui::WalletConfigWidget
{
public:
- WalletConfigWidget( QWidget *parent ) : QWidget( parent ) {
- setupUi( this );
- }
+ WalletConfigWidget(QWidget *parent) : QWidget(parent)
+ {
+ setupUi(this);
+ }
};
+class KWalletConfig : public KCModule
+{
+ Q_OBJECT
+public:
+ explicit KWalletConfig(QWidget *parent = 0L, const QVariantList & = QVariantList());
+ virtual ~KWalletConfig();
-class KWalletConfig : public KCModule {
- Q_OBJECT
- public:
- explicit KWalletConfig(QWidget *parent = 0L, const QVariantList& = QVariantList());
- virtual ~KWalletConfig();
-
- void load();
- void save();
- void defaults();
-
- QString quickHelp() const;
-
- public slots:
- void configChanged();
- void launchManager();
- void newLocalWallet();
- void newNetworkWallet();
- void updateWalletLists();
- QString newWallet();
- void deleteEntry();
- void customContextMenuRequested(const QPoint& pos);
-
- private:
- WalletConfigWidget *_wcw;
- KSharedConfig::Ptr _cfg;
+ void load();
+ void save();
+ void defaults();
+
+ QString quickHelp() const;
+
+public slots:
+ void configChanged();
+ void launchManager();
+ void newLocalWallet();
+ void newNetworkWallet();
+ void updateWalletLists();
+ QString newWallet();
+ void deleteEntry();
+ void customContextMenuRequested(const QPoint &pos);
+
+private:
+ WalletConfigWidget *_wcw;
+ KSharedConfig::Ptr _cfg;
};
#endif
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/kwallet.actions
^
|
| @@ -1,15 +1,13 @@
[Domain]
Name=KDE Wallet system
Name[bs]=Sistem KDE novčanika
-Name[ca]=Sistema de carteres del KDE
+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[en_GB]=KDE Wallet system
Name[es]=Sistema de carteras de KDE
-Name[et]=KDE turvalaekasüsteem
Name[eu]=KDEren zorro sistema
Name[fi]=KDE:n lompakkojärjestelmä
Name[fr]=Systèmes de portefeuilles de KDE
@@ -22,7 +20,6 @@
Name[nb]=KDEs Lommebok-system
Name[nds]=KDE-Knippensysteem
Name[nl]=KDE-portefeuillesysteem
-Name[pa]=KDE ਵਾਲਿਟ ਸਿਸਟਮ
Name[pl]=System portfela KDE
Name[pt]=Sistema da Carteira do KDE
Name[pt_BR]=Sistema de carteiras do KDE
@@ -42,7 +39,7 @@
Name[zh_TW]=KDE 錢包系統
Icon=kwalletmanager
-[org.kde.kcontrol.kcmkwallet.save]
+[org.kde.kcontrol.kcmkwallet5.save]
Name=Save wallet configuration
Name[bs]=Snimi konfiguraciju novčanika
Name[ca]=Desa la configuració de la cartera
@@ -51,9 +48,7 @@
Name[da]=Gem konfiguration af tegnebog
Name[de]=Einstellungen des Passwortspeichers speichern
Name[el]=Αποθήκευση διαμόρφωσης πορτοφολιού KDE
-Name[en_GB]=Save wallet configuration
Name[es]=Guardar la configuración de la cartera
-Name[et]=Turvalaeka seadistuse salvestamine
Name[eu]=Gorde zorroaren Konfigurazioa
Name[fi]=Tallenna lompakon asetukset
Name[fr]=Enregistrer la configuration du portefeuille
@@ -66,8 +61,7 @@
Name[nb]=Lagre lommebok-oppsett
Name[nds]=Knippinstellen sekern
Name[nl]=Portefeuille-instellingen opslaan
-Name[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੰਭਾਲੋ
-Name[pl]=Zapisz ustawienia portfela
+Name[pl]=Zapisz konfigurację portfela
Name[pt]=Gravar a configuração da carteira
Name[pt_BR]=Salvar a configuração da carteira
Name[ro]=Salvează configurarea portofelului
@@ -92,9 +86,7 @@
Description[da]=Tillad gemning af tegnebogsindstillinger
Description[de]=Ermöglicht es, die Einstellungen des Passwortspeichers zu speichern
Description[el]=Να επιτρέπεται η αποθήκευση της διαμόρφωσης πορτοφολιού
-Description[en_GB]=Allow saving wallet configuration settings
Description[es]=Permitir que se guarde la configuración de la cartera
-Description[et]=Turvalaeka seadistuse salvestamise lubamine
Description[eu]=Baimendu zorroaren konfigurazio ezarpenak gordetzea
Description[fi]=Salli lompakon asetusten tallentaminen
Description[fr]=Autoriser l'enregistrement les paramètres de la configuration du portefeuille
@@ -107,7 +99,7 @@
Description[nb]=Kan lagre oppsettsinnstillingene for lommeboka
Description[nds]=Sekern vun Knippinstellen tolaten
Description[nl]=Opslaan van instellingen van de portefeuille toestaan
-Description[pl]=Zezwól na zapisywanie ustawień portfela
+Description[pl]=Zezwól na zapisywanie konfiguracji portfela
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
|
|
[-]
[+]
|
Deleted |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/kwalletconfig.desktop
^
|
| @@ -1,196 +0,0 @@
-[Desktop Entry]
-Icon=kwalletmanager
-
-Type=Service
-X-KDE-ServiceTypes=KCModule
-
-Exec=kcmshell4 kwalletconfig
-X-DocPath=kwallet/index.html#kwallet-kcontrol-module
-X-KDE-Library=kcm_kwallet
-X-KDE-ParentApp=kcontrol
-X-KDE-System-Settings-Parent-Category=account-details
-
-Name=KDE Wallet
-Name[ar]=محفظة كدى
-Name[ast]=Cartera KDE
-Name[bg]=KDE Wallet
-Name[br]=Doug-paperoù KDE
-Name[bs]=KDE novčanik
-Name[ca]=Cartera del KDE
-Name[ca@valencia]=Cartera del KDE
-Name[cs]=Úschovna KDE
-Name[cy]=Waled KDE
-Name[da]=KDE's tegnebog
-Name[de]=KDE-Passwortspeicher
-Name[el]=Πορτοφόλι του KDE
-Name[en_GB]=KDE Wallet
-Name[eo]=KDE paperujo
-Name[es]=Cartera de KDE
-Name[et]=KDE turvalaegas
-Name[eu]=KDEren zorroa
-Name[fi]=KDE-lompakko
-Name[fr]=Portefeuille de KDE
-Name[ga]=KDE Wallet
-Name[gl]=KDE Wallet
-Name[he]=KDE Wallet
-Name[hne]=केडीई वालेट
-Name[hr]=KDE-ov novčanik
-Name[hu]=KDE Wallet
-Name[ia]=KDE Wallet (Portafolio de KDE)
-Name[id]=Dompet KDE
-Name[is]=KDE veskið
-Name[it]=Portafogli di KDE
-Name[ja]=KDE ウォレット
-Name[kk]=KDE әмияны
-Name[km]=កាបូបរបស់ KDE
-Name[ko]=KDE 지갑
-Name[lt]=KDE slaptažodinės
-Name[lv]=KDE Maks
-Name[mk]=KDE Паричник
-Name[mr]=केडीई पाकीट
-Name[nb]=KDE Wallet
-Name[nds]=KDE-Knipp
-Name[ne]=केडीई वालेट
-Name[nl]=KDE Portefeuillebeheer
-Name[nn]=KDE-lommebok
-Name[pa]=KDE ਵਾਲਿਟ
-Name[pl]=Portfel KDE
-Name[pt]=Carteira do KDE
-Name[pt_BR]=Carteira do KDE
-Name[ro]=Portofel KDE
-Name[ru]=Бумажник
-Name[sk]=KDE Wallet
-Name[sl]=Listnica KDE
-Name[sq]=KDE Portofoli
-Name[sr]=К‑новчаник
-Name[sr@ijekavian]=К‑новчаник
-Name[sr@ijekavianlatin]=K‑novčanik
-Name[sr@latin]=K‑novčanik
-Name[sv]=KDE-plånbok
-Name[ta]= கேடிஇ வாலட்
-Name[tg]=KDE Ҳамён
-Name[th]=กระเป๋าคุมข้อมูลของ KDE
-Name[tr]=KDE Cüzdanı
-Name[ug]=KDE ھەميان
-Name[uk]=Торбинки KDE
-Name[uz]=KDE qopchiq
-Name[uz@cyrillic]=KDE қопчиқ
-Name[vi]=Ví KDE
-Name[wa]=Poite-manoye KDE
-Name[x-test]=xxKDE Walletxx
-Name[zh_CN]=KDE 钱包
-Name[zh_TW]=KDE 錢包
-Comment=KDE Wallet Configuration
-Comment[ar]=إعداد محفظة كدى
-Comment[ast]=Configuración de la Cartera KDE
-Comment[bg]=Настройване на "Портфейл"
-Comment[br]=Kefluniadur Doug-paperoù KDE
-Comment[bs]=Podešavanje KDE novčanika
-Comment[ca]=Configuració de la cartera del KDE
-Comment[ca@valencia]=Configuració de la cartera del KDE
-Comment[cs]=Nastavení úschovny KDE
-Comment[cy]=Ffurfweddiad Waled KDE
-Comment[da]=Konfiguration af KDE's tegnebog
-Comment[de]=Einrichten des Passwortspeichers (KWallet)
-Comment[el]=Διαμόρφωση του πορτοφολιού του KDE
-Comment[en_GB]=KDE Wallet Configuration
-Comment[eo]=KDE paperuja agordo
-Comment[es]=Configuración de la cartera de KDE
-Comment[et]=KDE turvalaeka seadistamine
-Comment[eu]=KDEren zorroaren konfigurazioa
-Comment[fa]=KDE Wallet پیکربندی
-Comment[fi]=KDE-lompakon asetukset
-Comment[fr]=Configuration du portefeuille de KDE
-Comment[ga]=Cumraíocht KDE Wallet
-Comment[gl]=Configuración da carteira de KDE
-Comment[he]=KDE Wallet הגדרות
-Comment[hne]=केडीई वालेट कान्फिगरेसन
-Comment[hr]=Konfiguracija KDE-ovog novčanika
-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
-Comment[it]=Configurazione portafogli di KDE
-Comment[ja]=KDE ウォレットの設定
-Comment[kk]=KDE әмиянның баптауы
-Comment[km]=កំណត់រចនាសម្ព័ន្ធកាបូបរបស់ KDE
-Comment[ko]=KDE 지갑 설정
-Comment[lt]=KDE slaptažodinių konfigūravimas
-Comment[lv]=KDE Maka konfigurācija
-Comment[mk]=Конфигурација на паричник во KDE
-Comment[mr]=केडीई पाकीट संयोजना
-Comment[nb]=Oppsett av KDE Wallet
-Comment[nds]=KDE-Knipp instellen
-Comment[ne]=केडीई वालेट कन्फिगरेसन
-Comment[nl]=KDE-portefeuille instellen
-Comment[nn]=Oppsett av KDE-lommeboka
-Comment[pa]=KDE ਵਾਲਿਟ ਸੰਰਚਨਾ
-Comment[pl]=Ustawienia 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 KDE
-Comment[sq]=Konfigurim i Portofolit KDE
-Comment[sr]=Подешавање К‑новчаника
-Comment[sr@ijekavian]=Подешавање К‑новчаника
-Comment[sr@ijekavianlatin]=Podešavanje K‑novčanika
-Comment[sr@latin]=Podešavanje K‑novčanika
-Comment[sv]=Inställning av KDE-plånbok
-Comment[ta]=கேடிஇ வாலட் வடிவமைப்பு
-Comment[tg]=KDE Танзими Ҳамён
-Comment[th]=ปรับแต่งกระเป๋าคุมข้อมูลของ KDE
-Comment[tr]=KDE Cüzdan Yönetimi
-Comment[uk]=Налаштування KWallet
-Comment[uz]=KDE qopchiq xizmatini moslash
-Comment[uz@cyrillic]=KDE қопчиқ хизматини мослаш
-Comment[vi]=Cấu Hình Ví KDE
-Comment[x-test]=xxKDE Wallet Configurationxx
-Comment[zh_CN]=KDE 钱包配置
-Comment[zh_TW]=KDE 錢包設定
-X-KDE-Keywords=Wallet,Form Fill,Passwords,Form Data
-X-KDE-Keywords[bs]=Wallet,Form Fill,Passwords,Form Data,Novčanik,Lozinke,Formular
-X-KDE-Keywords[ca]=Cartera,Omplir formulari,Contrasenyes,Dades de formulari
-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,Passwortspeicher,Formulardaten
-X-KDE-Keywords[el]=Πορτοφόλι,συμπλήρωση φόρμας,κωδικοί πρόσβασης,δεδομένα φόρμας
-X-KDE-Keywords[en_GB]=Wallet,Form Fill,Passwords,Form Data
-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[eu]=Zorroa, formularioak betetzea, pasahitzak, formularioko datuak
-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[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
-X-KDE-Keywords[ia]=Portafolio, Reimplemento de Formulario,Contrasignos,Datos de formulario
-X-KDE-Keywords[it]=Portafogli,compilazione moduli,password,dati moduli
-X-KDE-Keywords[kk]=Wallet,Form Fill,Passwords,Form Data
-X-KDE-Keywords[km]=កាបូប បំពេញសំណុំបែបបទ ពាក្យសម្ងាត់ ទិន្នន័យសំណុំបែបបទ
-X-KDE-Keywords[ko]=Wallet,Form Fill,Passwords,Form Data,지갑,암호,비밀번호,양식,폼
-X-KDE-Keywords[lt]=Piniginė,Formos užpildymas,Spaltažodžiai,Formos duomenys
-X-KDE-Keywords[mr]=पाकीट,रकाना भरा,गुप्तशब्द,रकाना माहिती
-X-KDE-Keywords[nb]=Lommebok,Skjema,Passord,Skjemadata
-X-KDE-Keywords[nds]=Knipp,Passwöör,Kiekwarkdaten,Formulordaten
-X-KDE-Keywords[nl]=Portefeuille,Formulier invullen,wachtwoorden,formuliergegevens
-X-KDE-Keywords[pa]=ਵਾਲਿਟ,ਫਾਰਮ ਭਰਨਾ,ਪਾਸਵਰਡ,ਫਾਰਮ ਡਾਟਾ
-X-KDE-Keywords[pl]=Portfel,Wypełnienie formularza,Hasła,Dane formularza
-X-KDE-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados de Formulários
-X-KDE-Keywords[pt_BR]=carteira,preencher formulário,senha,dados de formulário
-X-KDE-Keywords[ro]=portofel,completare formular,parole,date formular,formular
-X-KDE-Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,бумажник,пароли,формы
-X-KDE-Keywords[sk]=Peňaženka,Vypĺňanie formulárov,Heslá,Dáta formulára
-X-KDE-Keywords[sl]=listnica,dopolnjevanje obrazcev,gesla,podatki obrazcev
-X-KDE-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка
-X-KDE-Keywords[sr@ijekavian]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка
-X-KDE-Keywords[sr@ijekavianlatin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka
-X-KDE-Keywords[sr@latin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka
-X-KDE-Keywords[sv]=Plånbok,Formulär,Lösenord,Formulärdata
-X-KDE-Keywords[tr]=Cüzdan,Form Doldurma,Parolalar,Form Verileri
-X-KDE-Keywords[uk]=кишеня,торбинка,форма,форми,заповнення форм,пароль,паролі,дані форми,реєстрація
-X-KDE-Keywords[x-test]=xxWalletxx,xxForm Fillxx,xxPasswordsxx,xxForm Dataxx
-X-KDE-Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,表单填写,密码,表单数据
-X-KDE-Keywords[zh_TW]=Wallet,Form Fill,Passwords,Form Data
|
|
[-]
[+]
|
Added |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/kwalletconfig5.desktop
^
|
| @@ -0,0 +1,195 @@
+[Desktop Entry]
+Icon=kwalletmanager
+
+Type=Service
+X-KDE-ServiceTypes=KCModule
+
+Exec=kcmshell5 kwalletconfig5
+X-DocPath=kwallet5/index.html#kwallet-kcontrol-module
+X-KDE-Library=kcm_kwallet5
+X-KDE-ParentApp=kcontrol
+X-KDE-System-Settings-Parent-Category=accountdetails
+
+Name=KDE Wallet
+Name[ar]=محفظة كدى
+Name[ast]=Cartera KDE
+Name[bg]=KDE Wallet
+Name[br]=Doug-paperoù KDE
+Name[bs]=KDE novčanik
+Name[ca]=Cartera del KDE
+Name[ca@valencia]=Cartera del KDE
+Name[cs]=Úschovna KDE
+Name[cy]=Waled KDE
+Name[da]=KDE's tegnebog
+Name[de]=KDE-Passwortspeicher
+Name[el]=Πορτοφόλι του KDE
+Name[en_GB]=KDE Wallet
+Name[eo]=KDE paperujo
+Name[es]=Cartera de KDE
+Name[et]=KDE turvalaegas
+Name[eu]=KDEren zorroa
+Name[fi]=KDE-lompakko
+Name[fr]=Portefeuille de KDE
+Name[ga]=KDE Wallet
+Name[gl]=KDE Wallet
+Name[he]=KDE Wallet
+Name[hne]=केडीई वालेट
+Name[hr]=KDE-ov novčanik
+Name[hu]=KDE Wallet
+Name[ia]=KDE Wallet (Portafolio de KDE)
+Name[id]=Dompet KDE
+Name[is]=KDE veskið
+Name[it]=Portafogli di KDE
+Name[ja]=KDE ウォレット
+Name[kk]=KDE әмияны
+Name[km]=កាបូបរបស់ KDE
+Name[ko]=KDE 지갑
+Name[lt]=KDE slaptažodinės
+Name[lv]=KDE Maks
+Name[mk]=KDE Паричник
+Name[mr]=केडीई पाकीट
+Name[nb]=KDE Wallet
+Name[nds]=KDE-Knipp
+Name[ne]=केडीई वालेट
+Name[nl]=KDE Portefeuillebeheer
+Name[nn]=KDE-lommebok
+Name[pa]=KDE ਵਾਲਿਟ
+Name[pl]=Portfel KDE
+Name[pt]=Carteira do KDE
+Name[pt_BR]=Carteira do KDE
+Name[ro]=Portofel KDE
+Name[ru]=Бумажник
+Name[sk]=KDE Wallet
+Name[sl]=Listnica KDE
+Name[sq]=KDE Portofoli
+Name[sr]=К‑новчаник
+Name[sr@ijekavian]=К‑новчаник
+Name[sr@ijekavianlatin]=K‑novčanik
+Name[sr@latin]=K‑novčanik
+Name[sv]=KDE-plånbok
+Name[ta]= கேடிஇ வாலட்
+Name[tg]=KDE Ҳамён
+Name[th]=กระเป๋าคุมข้อมูลของ KDE
+Name[tr]=KDE Cüzdanı
+Name[ug]=KDE ھەميان
+Name[uk]=Торбинки KDE
+Name[uz]=KDE qopchiq
+Name[uz@cyrillic]=KDE қопчиқ
+Name[vi]=Ví KDE
+Name[wa]=Poite-manoye KDE
+Name[x-test]=xxKDE Walletxx
+Name[zh_CN]=KDE 钱包
+Name[zh_TW]=KDE 錢包
+Comment=KDE Wallet Configuration
+Comment[ar]=إعداد محفظة كدى
+Comment[ast]=Configuración de la Cartera KDE
+Comment[bg]=Настройване на "Портфейл"
+Comment[br]=Kefluniadur Doug-paperoù KDE
+Comment[bs]=Podešavanje KDE novčanika
+Comment[ca]=Configuració de la cartera del KDE
+Comment[ca@valencia]=Configuració de la cartera del KDE
+Comment[cs]=Nastavení úschovny KDE
+Comment[cy]=Ffurfweddiad Waled KDE
+Comment[da]=Konfiguration af KDE's tegnebog
+Comment[de]=Einrichten des Passwortspeicher (KWallet)
+Comment[el]=Διαμόρφωση του πορτοφολιού του KDE
+Comment[en_GB]=KDE Wallet Configuration
+Comment[eo]=KDE paperuja agordo
+Comment[es]=Configuración de la cartera de KDE
+Comment[et]=KDE turvalaeka seadistamine
+Comment[eu]=KDEren zorroaren konfigurazioa
+Comment[fa]=KDE Wallet پیکربندی
+Comment[fi]=KDE-lompakon asetukset
+Comment[fr]=Configuration du portefeuille de KDE
+Comment[ga]=Cumraíocht KDE Wallet
+Comment[gl]=Configuración da carteira de KDE
+Comment[he]=KDE Wallet הגדרות
+Comment[hne]=केडीई वालेट कान्फिगरेसन
+Comment[hr]=Konfiguracija KDE-ovog novčanika
+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
+Comment[it]=Configurazione portafogli di KDE
+Comment[ja]=KDE ウォレットの設定
+Comment[kk]=KDE әмиянның баптауы
+Comment[km]=កំណត់រចនាសម្ព័ន្ធកាបូបរបស់ KDE
+Comment[ko]=KDE 지갑 설정
+Comment[lt]=KDE slaptažodinių konfigūravimas
+Comment[lv]=KDE Maka konfigurācija
+Comment[mk]=Конфигурација на паричник во KDE
+Comment[mr]=केडीई पाकीट संयोजना
+Comment[nb]=Oppsett av KDE Wallet
+Comment[nds]=KDE-Knipp instellen
+Comment[ne]=केडीई वालेट कन्फिगरेसन
+Comment[nl]=KDE-portefeuille instellen
+Comment[nn]=Oppsett av KDE-lommeboka
+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 KDE
+Comment[sq]=Konfigurim i Portofolit KDE
+Comment[sr]=Подешавање К‑новчаника
+Comment[sr@ijekavian]=Подешавање К‑новчаника
+Comment[sr@ijekavianlatin]=Podešavanje K‑novčanika
+Comment[sr@latin]=Podešavanje K‑novčanika
+Comment[sv]=Inställning av KDE-plånbok
+Comment[ta]=கேடிஇ வாலட் வடிவமைப்பு
+Comment[tg]=KDE Танзими Ҳамён
+Comment[th]=ปรับแต่งกระเป๋าคุมข้อมูลของ KDE
+Comment[tr]=KDE Cüzdan Yönetimi
+Comment[uk]=Налаштування KWallet
+Comment[uz]=KDE qopchiq xizmatini moslash
+Comment[uz@cyrillic]=KDE қопчиқ хизматини мослаш
+Comment[vi]=Cấu Hình Ví KDE
+Comment[x-test]=xxKDE Wallet Configurationxx
+Comment[zh_CN]=KDE 钱包配置
+Comment[zh_TW]=KDE 錢包設定
+X-KDE-Keywords=Wallet,Form Fill,Passwords,Form Data
+X-KDE-Keywords[bs]=Wallet,Form Fill,Passwords,Form Data;Novčanik;Lozinke;Formular
+X-KDE-Keywords[ca]=Cartera,Omplir formulari,Contrasenyes,Dades de formulari
+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,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[eu]=Zorroa, formularioak betetzea, pasahitzak, formularioko datuak
+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[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
+X-KDE-Keywords[ia]=Portafolio, Reimplemento de Formulario,Contrasignos,Datos de formulario
+X-KDE-Keywords[it]=Portafogli,compilazione moduli,password,dati moduli
+X-KDE-Keywords[kk]=Wallet,Form Fill,Passwords,Form Data
+X-KDE-Keywords[km]=កាបូប បំពេញសំណុំបែបបទ ពាក្យសម្ងាត់ ទិន្នន័យសំណុំបែបបទ
+X-KDE-Keywords[ko]=Wallet,Form Fill,Passwords,Form Data,지갑,암호,비밀번호,양식,폼
+X-KDE-Keywords[lt]=Piniginė,Formos užpildymas,Spaltažodžiai,Formos duomenys
+X-KDE-Keywords[mr]=पाकीट,रकाना भरा,गुप्तशब्द,रकाना माहिती
+X-KDE-Keywords[nb]=Lommebok,Skjema,Passord,Skjemadata
+X-KDE-Keywords[nds]=Knipp,Passwöör,Kiekwarkdaten,Formulordaten
+X-KDE-Keywords[nl]=Portefeuille,Formulier invullen,wachtwoorden,formuliergegevens
+X-KDE-Keywords[pa]=ਵਾਲਿਟ,ਫਾਰਮ ਭਰਨਾ,ਪਾਸਵਰਡ,ਫਾਰਮ ਡਾਟਾ
+X-KDE-Keywords[pl]=Portfel,Wypełnienie formularza,Hasła,Dane formularza
+X-KDE-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados de Formulários
+X-KDE-Keywords[pt_BR]=carteira,preencher formulário,senha,dados de formulário
+X-KDE-Keywords[ro]=portofel,completare formular,parole,date formular,formular
+X-KDE-Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,бумажник,пароли,формы
+X-KDE-Keywords[sk]=Peňaženka,Vypĺňanie formulárov,Heslá,Dáta formulára
+X-KDE-Keywords[sl]=listnica,dopolnjevanje obrazcev,gesla,podatki obrazcev
+X-KDE-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка
+X-KDE-Keywords[sr@ijekavian]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка
+X-KDE-Keywords[sr@ijekavianlatin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka
+X-KDE-Keywords[sr@latin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka
+X-KDE-Keywords[sv]=Plånbok,Formulär,Lösenord,Formulärdata
+X-KDE-Keywords[tr]=Cüzdan,Form Doldurma,Parolalar,Form Verileri
+X-KDE-Keywords[uk]=кишеня,торбинка,форма,форми,заповнення форм,пароль,паролі,дані форми,реєстрація
+X-KDE-Keywords[x-test]=xxWallet,Form Fill,Passwords,Form Dataxx
+X-KDE-Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,表单填写,密码,表单数据
+X-KDE-Keywords[zh_TW]=Wallet,Form Fill,Passwords,Form Data
|
|
[-]
[+]
|
Added |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/kwalletmanager5_show.desktop
^
|
| @@ -0,0 +1,77 @@
+[Desktop Entry]
+Name=Wallet Management Tool
+Name[ar]=أداة إدارة المحفظة
+Name[ast]=Ferramienta pa xestionar cartera
+Name[bg]=Инструмент за настройване на "Портфейл"
+Name[br]=Merour an doug-paperoù
+Name[bs]=Alatka za upravljanje novčanicima
+Name[ca]=Eina de gestió de carteres
+Name[ca@valencia]=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]=Passwortverwaltung
+Name[el]=Εργαλείο διαχείρισης πορτοφολιού
+Name[en_GB]=Wallet Management Tool
+Name[eo]=Paperuja administrilo
+Name[es]=Herramienta de gestión de cartera
+Name[et]=Turvalaeka haldur
+Name[eu]=Zorroa kudeatzeko tresna
+Name[fa]=ابزار مدیریت Wallet
+Name[fi]=Lompakonhallinta
+Name[fr]=Outil de gestion de portefeuilles
+Name[ga]=Uirlis Bhainisteoireachta Wallet
+Name[gl]=Utilidade de xestión de carteiras
+Name[he]=כלי לניהול הארנק של KDE
+Name[hne]=बटुआ प्रबंधन औजार
+Name[hr]=Alat za upravljanje novčanikom
+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
+Name[it]=Strumento per la gestione dei portafogli
+Name[ja]=ウォレット管理ツール
+Name[kk]=Әмиянын басқару құралы
+Name[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
+Name[ko]=지갑 관리 도구
+Name[lt]=Spatažodinių tvarkymo įrankis
+Name[lv]=Maka pārvaldības rīks
+Name[mk]=Алатка за менаџирање на паричници
+Name[mr]=पाकीट व्यवस्थापन साधन
+Name[nb]=Wallet administrasjonsverktøy
+Name[nds]=Knippenpleger
+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 de carteiras
+Name[ro]=Administrare portofel
+Name[ru]=Управление бумажниками
+Name[sk]=Nástroj pre správu KDE Wallet
+Name[sl]=Orodje za upravljanje z listnicami
+Name[sq]=Mjet i Menaxhimit të Portofolit
+Name[sr]=Алатка за управљање новчаницима
+Name[sr@ijekavian]=Алатка за управљање новчаницима
+Name[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
+Name[sr@latin]=Alatka za upravljanje novčanicima
+Name[sv]=Hanteringsverktyg för plånbok
+Name[ta]=வாலட் மேலாண்மை கருவி
+Name[tg]=Асбоби Идоракунии Ҳамён
+Name[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
+Name[tr]=Cüzdan Yönetim Aracı
+Name[ug]=ھەميان باشقۇرۇش قورالى
+Name[uk]=Засіб керування торбинками
+Name[uz]=Qopchiq boshqarish vositasi
+Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
+Name[vi]=Công Cụ Quản Lý Ví
+Name[x-test]=xxWallet Management Toolxx
+Name[zh_CN]=钱包管理工具
+Name[zh_TW]=錢包管理工具
+Exec=kwalletmanager5 --show
+MimeType=application/x-kwallet;
+InitialPreference=6
+Icon=kwalletmanager
+Type=Service
+X-KDE-StartupNotify=true
|
|
[-]
[+]
|
Deleted |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/kwalletmanager_show.desktop
^
|
| @@ -1,77 +0,0 @@
-[Desktop Entry]
-Name=Wallet Management Tool
-Name[ar]=أداة إدارة المحفظة
-Name[ast]=Ferramienta pa xestionar cartera
-Name[bg]=Инструмент за настройване на "Портфейл"
-Name[br]=Merour an doug-paperoù
-Name[bs]=Alatka za upravljanje novčanicima
-Name[ca]=Eina de gestió de carteres
-Name[ca@valencia]=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]=Passwortverwaltung
-Name[el]=Εργαλείο διαχείρισης πορτοφολιού
-Name[en_GB]=Wallet Management Tool
-Name[eo]=Paperuja administrilo
-Name[es]=Herramienta de gestión de carteras
-Name[et]=Turvalaeka haldur
-Name[eu]=Zorroa kudeatzeko tresna
-Name[fa]=ابزار مدیریت Wallet
-Name[fi]=Lompakonhallinta
-Name[fr]=Outil de gestion de portefeuilles
-Name[ga]=Uirlis Bhainisteoireachta Wallet
-Name[gl]=Utilidade de xestión de carteiras
-Name[he]=כלי לניהול הארנק של KDE
-Name[hne]=बटुआ प्रबंधन औजार
-Name[hr]=Alat za upravljanje novčanikom
-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
-Name[it]=Strumento per la gestione dei portafogli
-Name[ja]=ウォレット管理ツール
-Name[kk]=Әмиянын басқару құралы
-Name[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
-Name[ko]=지갑 관리 도구
-Name[lt]=Spatažodinių tvarkymo įrankis
-Name[lv]=Maka pārvaldības rīks
-Name[mk]=Алатка за менаџирање на паричници
-Name[mr]=पाकीट व्यवस्थापन साधन
-Name[nb]=Wallet administrasjonsverktøy
-Name[nds]=Knippenpleger
-Name[ne]=वालेट व्यवस्थापन उपकरण
-Name[nl]=Portefeuillebeheer
-Name[nn]=Wallet-administrasjonsverktøy
-Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
-Name[pl]=Zarządzanie portfelem
-Name[pt]=Ferramenta de Gestão da Carteira
-Name[pt_BR]=Ferramenta de gerenciamento de carteiras
-Name[ro]=Administrare portofel
-Name[ru]=Управление бумажниками
-Name[sk]=Nástroj pre správu KDE Wallet
-Name[sl]=Orodje za upravljanje z listnicami
-Name[sq]=Mjet i Menaxhimit të Portofolit
-Name[sr]=Алатка за управљање новчаницима
-Name[sr@ijekavian]=Алатка за управљање новчаницима
-Name[sr@ijekavianlatin]=Alatka za upravljanje novčanicima
-Name[sr@latin]=Alatka za upravljanje novčanicima
-Name[sv]=Hanteringsverktyg för plånbok
-Name[ta]=வாலட் மேலாண்மை கருவி
-Name[tg]=Асбоби Идоракунии Ҳамён
-Name[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
-Name[tr]=Cüzdan Yönetim Aracı
-Name[ug]=ھەميان باشقۇرۇش قورالى
-Name[uk]=Засіб керування торбинками
-Name[uz]=Qopchiq boshqarish vositasi
-Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
-Name[vi]=Công Cụ Quản Lý Ví
-Name[x-test]=xxWallet Management Toolxx
-Name[zh_CN]=钱包管理工具
-Name[zh_TW]=錢包管理工具
-Exec=kwalletmanager --show
-MimeType=application/x-kwallet;
-InitialPreference=6
-Icon=kwalletmanager
-Type=Service
-X-KDE-StartupNotify=true
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/savehelper.cpp
^
|
| @@ -19,7 +19,10 @@
#include "savehelper.h"
-#include <kdebug.h>
+#include <kauthhelpersupport.h>
+
+#include <QDebug>
+
#include <unistd.h>
#if defined(Q_CC_MSVC)
@@ -30,9 +33,9 @@
ActionReply SaveHelper::save(QVariantMap args)
{
__uid_t uid = getuid();
- kDebug() << "executing uid=" << uid;
+ qDebug() << "executing uid=" << uid;
- return ActionReply::SuccessReply;
+ return ActionReply::SuccessReply();
}
-KDE4_AUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet", SaveHelper)
+KAUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet5", SaveHelper)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/konfigurator/savehelper.h
^
|
| @@ -24,7 +24,8 @@
using namespace KAuth;
-class SaveHelper : public QObject {
+class SaveHelper : public QObject
+{
Q_OBJECT;
public slots:
ActionReply save(QVariantMap args);
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/128-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi128-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/128-apps-kwalletmanager2.png
^
|
| (renamed from src/manager/hi128-app-kwalletmanager2.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/16-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi16-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/16-apps-kwalletmanager2.png
^
|
| (renamed from src/manager/hi16-app-kwalletmanager2.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/22-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi22-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/32-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi32-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/32-apps-kwalletmanager2.png
^
|
| (renamed from src/manager/hi32-app-kwalletmanager2.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/48-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi48-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/48-apps-kwalletmanager2.png
^
|
| (renamed from src/manager/hi48-app-kwalletmanager2.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/64-apps-kwalletmanager.png
^
|
| (renamed from src/manager/hi64-app-kwalletmanager.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/64-apps-kwalletmanager2.png
^
|
| (renamed from src/manager/hi64-app-kwalletmanager2.png)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/CMakeLists.txt
^
|
| @@ -1,4 +1,5 @@
########### next target ###############
+add_definitions(-DTRANSLATION_DOMAIN=\"kwalletmanager\")
set(kwalletmanager_SRCS
kwalletmanager.cpp
@@ -21,17 +22,53 @@
revokeauthbutton.cpp
)
-qt4_add_dbus_interface(kwalletmanager_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KWallet.xml kwallet_interface)
-
-kde4_add_ui_files(kwalletmanager_SRCS walletwidget.ui kbetterthankdialogbase.ui walletcontrolwidget.ui applicationsmanager.ui)
-
-kde4_add_app_icon(kwalletmanager_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kwalletmanager.png")
+qt5_add_dbus_interface(kwalletmanager_SRCS
+ ${KWALLET_DBUS_INTERFACES_DIR}/kf5_org.kde.KWallet.xml kwallet_interface
+)
-kde4_add_executable(kwalletmanager ${kwalletmanager_SRCS})
+ki18n_wrap_ui(kwalletmanager_SRCS
+ walletwidget.ui
+ kbetterthankdialogbase.ui
+ walletcontrolwidget.ui
+ applicationsmanager.ui
+)
-target_link_libraries(kwalletmanager ${KDE4_KIO_LIBS})
-install(TARGETS kwalletmanager ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES kwalletmanager.rc DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager)
+# Sets the icon on Windows and OSX
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kwalletmanager.png")
+ecm_add_app_icon(kwalletmanager_SRCS ICONS ${ICONS_SRCS})
+
+add_executable(kwalletmanager5 ${kwalletmanager_SRCS})
+
+target_link_libraries(kwalletmanager5
+ Qt5::Core
+ KF5::CoreAddons
+ KF5::I18n
+ KF5::XmlGui #KActionCollection
+ KF5::ConfigWidgets
+ KF5::ItemViews
+ KF5::Wallet
+ KF5::DBusAddons
+ KF5::ConfigCore
+ KF5::Service
+ KF5::KDELibs4Support
+ KF5::Archive
+)
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+install(TARGETS kwalletmanager5 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(FILES kwalletmanager.rc
+ DESTINATION ${KXMLGUI_INSTALL_DIR}/kwalletmanager5)
+
+ecm_install_icons( ICONS
+128-apps-kwalletmanager2.png
+128-apps-kwalletmanager.png
+16-apps-kwalletmanager2.png
+16-apps-kwalletmanager.png
+22-apps-kwalletmanager.png
+32-apps-kwalletmanager2.png
+32-apps-kwalletmanager.png
+48-apps-kwalletmanager2.png
+48-apps-kwalletmanager.png
+64-apps-kwalletmanager2.png
+64-apps-kwalletmanager.png
+DESTINATION ${ICON_INSTALL_DIR} )
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/allyourbase.cpp
^
|
| @@ -20,19 +20,17 @@
#include "allyourbase.h"
-#include <kdebug.h>
-#include <kcomponentdata.h>
-#include <kglobal.h>
#include <kio/netaccess.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <qurl.h>
#include <kwallet.h>
-#include <QFile>
#include <QApplication>
-//Added by qt3to4:
+#include <QDebug>
+#include <QDrag>
+#include <QFile>
+#include <QMimeData>
#include <QPixmap>
#include <QDropEvent>
#include <QDragEnterEvent>
@@ -41,585 +39,625 @@
/****************
* KWalletFolderItem - ListView items to represent kwallet folders
*/
-KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, QTreeWidget* parent, const QString &name, int entries)
-: QTreeWidgetItem(parent, KWalletFolderItemClass),_wallet(w),_name(name),_entries(entries) {
+KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, QTreeWidget *parent, const QString &name, int entries)
+ : QTreeWidgetItem(parent, KWalletFolderItemClass), _wallet(w), _name(name), _entries(entries)
+{
setText(0, QString::fromLatin1("%1 (%2)").arg(_name).arg(_entries));
- setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled);
- setIcon(0, getFolderIcon(KIconLoader::Small));
+ setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled);
+ setIcon(0, getFolderIcon(KIconLoader::Small));
+}
+
+QPixmap KWalletFolderItem::getFolderIcon(KIconLoader::Group group)
+{
+ KIconLoader *loader = KIconLoader::global();
+ QPixmap pix = loader->loadIcon(_name, group, 0,
+ KIconLoader::DefaultState, QStringList(), 0, true);
+ if (pix.isNull())
+ pix = loader->loadIcon(_name.toLower(), group, 0,
+ KIconLoader::DefaultState, QStringList(), 0, true);
+ if (pix.isNull())
+ pix = loader->loadIcon(QLatin1String("folder-red"), group, 0,
+ KIconLoader::DefaultState, QStringList(), 0, true);
+ return pix;
}
-QPixmap KWalletFolderItem::getFolderIcon(KIconLoader::Group group){
- KIconLoader *loader = KIconLoader::global();
- QPixmap pix = loader->loadIcon( _name, group, 0,
- KIconLoader::DefaultState, QStringList(),0, true );
- if (pix.isNull())
- pix = loader->loadIcon( _name.toLower(), group, 0,
- KIconLoader::DefaultState, QStringList(),0, true);
- if (pix.isNull())
- pix = loader->loadIcon( QLatin1String( "folder-red" ), group, 0,
- KIconLoader::DefaultState, QStringList(),0, true);
- return pix;
-}
-
-void KWalletFolderItem::refresh() {
- const QString saveFolder = _wallet->currentFolder();
- _wallet->setFolder(_name);
- setText(0, QString::fromLatin1("%1 (%2)").arg(_name).arg(_wallet->entryList().count()));
- _wallet->setFolder(saveFolder);
+void KWalletFolderItem::refresh()
+{
+ const QString saveFolder = _wallet->currentFolder();
+ _wallet->setFolder(_name);
+ setText(0, QString::fromLatin1("%1 (%2)").arg(_name).arg(_wallet->entryList().count()));
+ _wallet->setFolder(saveFolder);
}
void KWalletFolderItem::refreshItemsCount()
{
- int visibleLeafCount =0;
- for (int i=0; i < childCount(); i++) {
- QTreeWidgetItem* wi = child(i);
+ int visibleLeafCount = 0;
+ for (int i = 0; i < childCount(); i++) {
+ QTreeWidgetItem *wi = child(i);
if (wi->childCount()) {
- for (int l=0; l < wi->childCount(); l++) {
- QTreeWidgetItem* li = wi->child(l);
- if (!li->isHidden())
+ for (int l = 0; l < wi->childCount(); l++) {
+ QTreeWidgetItem *li = wi->child(l);
+ if (!li->isHidden()) {
visibleLeafCount++;
+ }
}
}
}
setText(0, QString::fromLatin1("%1 (%2)").arg(_name).arg(visibleLeafCount));
}
-KWalletContainerItem* KWalletFolderItem::getContainer(KWallet::Wallet::EntryType type) {
- for (int i = 0; i < childCount(); ++i) {
- KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem *>(child(i));
- if (!ci) {
- continue;
- }
- if (ci->entryType() == type) {
- return ci;
- }
- }
- return 0;
-}
-
-bool KWalletFolderItem::contains(const QString& key) {
- return (getItem(key) != 0);
-}
-
-QTreeWidgetItem* KWalletFolderItem::getItem(const QString& key) {
- for (int i = 0; i < childCount(); ++i) {
- KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem *>(child(i));
- if (!ci) {
- continue;
- }
- QTreeWidgetItem *tmp = ci->getItem(key);
- if (tmp) {
- return tmp;
- }
- }
- return 0;
-}
-
-bool KWalletFolderItem::acceptDrop(const QMimeSource *mime) const {
- return mime->provides("application/x-kwallet-entry") ||
- mime->provides("text/uri-list");
+KWalletContainerItem *KWalletFolderItem::getContainer(KWallet::Wallet::EntryType type)
+{
+ for (int i = 0; i < childCount(); ++i) {
+ KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem *>(child(i));
+ if (!ci) {
+ continue;
+ }
+ if (ci->entryType() == type) {
+ return ci;
+ }
+ }
+ return 0;
+}
+
+bool KWalletFolderItem::contains(const QString &key)
+{
+ return (getItem(key) != 0);
}
-QString KWalletFolderItem::name() const {
- return _name;
+QTreeWidgetItem *KWalletFolderItem::getItem(const QString &key)
+{
+ for (int i = 0; i < childCount(); ++i) {
+ KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem *>(child(i));
+ if (!ci) {
+ continue;
+ }
+ QTreeWidgetItem *tmp = ci->getItem(key);
+ if (tmp) {
+ return tmp;
+ }
+ }
+ return 0;
}
-KWalletFolderItem::~KWalletFolderItem() {
+bool KWalletFolderItem::acceptDrop(const QMimeData *mime) const
+{
+ return mime->hasFormat("application/x-kwallet-entry") ||
+ mime->hasFormat("text/uri-list");
+}
+
+QString KWalletFolderItem::name() const
+{
+ return _name;
+}
+
+KWalletFolderItem::~KWalletFolderItem()
+{
}
/****************
* KWalletContainerItem - ListView items to represent kwallet containers, i.e.
* passwords, maps, ...
*/
-KWalletContainerItem::KWalletContainerItem(QTreeWidgetItem* parent, const QString &name, KWallet::Wallet::EntryType entryType)
-: QTreeWidgetItem(parent, QStringList() << name, KWalletContainerItemClass), _type(entryType) {
- setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
+KWalletContainerItem::KWalletContainerItem(QTreeWidgetItem *parent, const QString &name, KWallet::Wallet::EntryType entryType)
+ : QTreeWidgetItem(parent, QStringList() << name, KWalletContainerItemClass), _type(entryType)
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/allyourbase.h
^
|
| @@ -24,7 +24,8 @@
#include <kwallet.h>
#include <kiconloader.h>
#include <kicontheme.h>
-#include <klistwidget.h>
+#include <QListWidget>
+
#include <QPixmap>
#include <QDropEvent>
#include <QDragEnterEvent>
@@ -34,141 +35,150 @@
#define KWALLETENTRYMAGIC ((quint32) 0x6B776C65)
#define KWALLETFOLDERMAGIC ((quint32) 0x6B776C66)
-
enum KWalletListItemClasses {
- KWalletFolderItemClass = QTreeWidgetItem::UserType,
- KWalletContainerItemClass,
- KWalletEntryItemClass,
- KWalletUnknownClass
-};
-
-class KWalletEntryItem : public QTreeWidgetItem {
- public:
- KWalletEntryItem(KWallet::Wallet *w, QTreeWidgetItem* parent, const QString& ename);
- virtual ~KWalletEntryItem();
-
- const QString& name() const { return m_name; }
- void setName(const QString& n);
- // Cancel renaming
- void restoreName();
-
- public:
- KWallet::Wallet *_wallet;
-
- private:
- void setText(int, const QString&) {} // forbidden
- QString m_name;
-};
-
-class KWalletContainerItem : public QTreeWidgetItem {
- public:
- KWalletContainerItem(QTreeWidgetItem* parent, const QString& name, KWallet::Wallet::EntryType entryType);
- virtual ~KWalletContainerItem();
-
- public:
- KWallet::Wallet::EntryType entryType();
- bool contains(const QString& itemKey);
- QTreeWidgetItem* getItem(const QString& itemKey);
-
- private:
- KWallet::Wallet::EntryType _type;
-};
-
-class KWalletFolderItem : public QTreeWidgetItem {
- public:
- KWalletFolderItem(KWallet::Wallet *w, QTreeWidget* parent, const QString& name, int entries);
- virtual ~KWalletFolderItem();
-
- virtual bool acceptDrop(const QMimeSource *mime) const;
-
- QString name() const;
- void refresh();
- KWalletContainerItem* getContainer(KWallet::Wallet::EntryType type);
- QPixmap getFolderIcon(KIconLoader::Group group);
- bool contains(const QString& itemKey);
- QTreeWidgetItem* getItem(const QString& itemKey);
- void refreshItemsCount();
-
- public:
- KWallet::Wallet *_wallet;
-
- private:
- QString _name;
- int _entries;
-};
-
-class KWalletEntryList : public QTreeWidget {
- Q_OBJECT
-
- public:
- explicit KWalletEntryList(QWidget *parent, const char *name = 0L);
- virtual ~KWalletEntryList();
-
- bool existsFolder(const QString& name);
- KWalletFolderItem* getFolder(const QString& name);
- void setWallet(KWallet::Wallet *w);
-
- protected:
- virtual void dragEnterEvent(QDragEnterEvent *e);
- virtual void dragMoveEvent(QDragMoveEvent *e);
- virtual void dropEvent(QDropEvent *e);
- virtual void mousePressEvent(QMouseEvent *e);
- virtual void mouseMoveEvent(QMouseEvent *e);
-
- void itemDropped(QDropEvent *e, QTreeWidgetItem *item);
-
- private:
- static KWalletFolderItem *getItemFolder(QTreeWidgetItem *item);
- QMimeData *itemMimeData(const QTreeWidgetItem *i) const;
-
- public:
- KWallet::Wallet *_wallet;
- QPoint _mousePos;
-
- public Q_SLOTS:
- void selectFirstVisible();
- void refreshItemsCount();
-};
-
-class KWalletItem : public QListWidgetItem {
- public:
- KWalletItem(QListWidget *parent, const QString& walletName);
- virtual ~KWalletItem();
-
- void setOpen(bool state);
-
- void processDropEvent(QDropEvent *e);
-
- private:
- bool _open;
-};
-
-inline QDataStream& operator<<(QDataStream& str, const KWalletEntryItem& w) {
- QString name = w.text(0);
- str << name;
- KWallet::Wallet::EntryType et = w._wallet->entryType(name);
- str << qint64(et);
- QByteArray a;
- w._wallet->readEntry(name, a);
- str << a;
- return str;
+ KWalletFolderItemClass = QTreeWidgetItem::UserType,
+ KWalletContainerItemClass,
+ KWalletEntryItemClass,
+ KWalletUnknownClass
+};
+
+class KWalletEntryItem : public QTreeWidgetItem
+{
+public:
+ KWalletEntryItem(KWallet::Wallet *w, QTreeWidgetItem *parent, const QString &ename);
+ virtual ~KWalletEntryItem();
+
+ const QString &name() const
+ {
+ return m_name;
+ }
+ void setName(const QString &n);
+ // Cancel renaming
+ void restoreName();
+
+public:
+ KWallet::Wallet *_wallet;
+
+private:
+ void setText(int, const QString &) {} // forbidden
+ QString m_name;
+};
+
+class KWalletContainerItem : public QTreeWidgetItem
+{
+public:
+ KWalletContainerItem(QTreeWidgetItem *parent, const QString &name, KWallet::Wallet::EntryType entryType);
+ virtual ~KWalletContainerItem();
+
+public:
+ KWallet::Wallet::EntryType entryType();
+ bool contains(const QString &itemKey);
+ QTreeWidgetItem *getItem(const QString &itemKey);
+
+private:
+ KWallet::Wallet::EntryType _type;
+};
+
+class KWalletFolderItem : public QTreeWidgetItem
+{
+public:
+ KWalletFolderItem(KWallet::Wallet *w, QTreeWidget *parent, const QString &name, int entries);
+ virtual ~KWalletFolderItem();
+
+ virtual bool acceptDrop(const QMimeData *mime) const;
+
+ QString name() const;
+ void refresh();
+ KWalletContainerItem *getContainer(KWallet::Wallet::EntryType type);
+ QPixmap getFolderIcon(KIconLoader::Group group);
+ bool contains(const QString &itemKey);
+ QTreeWidgetItem *getItem(const QString &itemKey);
+ void refreshItemsCount();
+
+public:
+ KWallet::Wallet *_wallet;
+
+private:
+ QString _name;
+ int _entries;
+};
+
+class KWalletEntryList : public QTreeWidget
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/applicationsmanager.cpp
^
|
| @@ -25,9 +25,9 @@
#include <QStyledItemDelegate>
#include <QPainter>
#include <QStandardItemModel>
-#include <kdebug.h>
+#include <QDebug>
-ApplicationsManager::ApplicationsManager(QWidget* parent):
+ApplicationsManager::ApplicationsManager(QWidget *parent):
QWidget(parent),
_wallet(0),
_connectedAppsModel(0),
@@ -42,7 +42,7 @@
delete _authorizedAppModel;
}
-void ApplicationsManager::setWallet(KWallet::Wallet* wallet)
+void ApplicationsManager::setWallet(KWallet::Wallet *wallet)
{
Q_ASSERT(wallet != 0);
_wallet = wallet;
@@ -57,4 +57,4 @@
_authorizedApps->setModel(_authorizedAppModel);
}
-#include "applicationsmanager.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/applicationsmanager.h
^
|
| @@ -25,11 +25,11 @@
class AuthorizedAppModel;
class ConnectedAppModel;
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
-
class ApplicationsManager : public QWidget, public Ui::ApplicationsManager
{
Q_OBJECT
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/authorizedapplicationstable.cpp
^
|
| @@ -21,35 +21,35 @@
#include "authorizedappmodel.h"
#include "revokeauthbutton.h"
-AuthorizedApplicationsTable::AuthorizedApplicationsTable(QWidget* parent) :
+AuthorizedApplicationsTable::AuthorizedApplicationsTable(QWidget *parent) :
QTableView(parent),
_wallet(0)
{
}
-void AuthorizedApplicationsTable::setWallet(KWallet::Wallet* wallet)
+void AuthorizedApplicationsTable::setWallet(KWallet::Wallet *wallet)
{
_wallet = wallet;
}
-void AuthorizedApplicationsTable::setModel(QAbstractItemModel* model)
+void AuthorizedApplicationsTable::setModel(QAbstractItemModel *model)
{
Q_ASSERT(_wallet != 0);
- AuthorizedAppModel *appModel = qobject_cast<AuthorizedAppModel*>(model);
+ AuthorizedAppModel *appModel = qobject_cast<AuthorizedAppModel *>(model);
Q_ASSERT(appModel != 0);
QTableView::setModel(model);
- for (int row =0; row < model->rowCount(); row++) {
- RevokeAuthButton *btn = new RevokeAuthButton( model->index(row, 0).data().toString() , _wallet);
+ for (int row = 0; row < model->rowCount(); row++) {
+ RevokeAuthButton *btn = new RevokeAuthButton(model->index(row, 0).data().toString(), _wallet);
btn->setFixedHeight(btn->sizeHint().height());
setRowHeight(row, btn->height());
- setIndexWidget( model->index(row, 1), btn);
- connect(btn, SIGNAL(appRevoked(QString)), appModel, SLOT(removeApp(QString)));
+ setIndexWidget(model->index(row, 1), btn);
+ connect(btn, &RevokeAuthButton::appRevoked, appModel, &AuthorizedAppModel::removeApp);
}
}
-void AuthorizedApplicationsTable::resizeEvent(QResizeEvent* resizeEvent)
+void AuthorizedApplicationsTable::resizeEvent(QResizeEvent *resizeEvent)
{
// this will keep disconnect buttons column at it's minimum size and
// make the application names take the reminder of the horizontal space
@@ -59,4 +59,4 @@
QAbstractItemView::resizeEvent(resizeEvent);
}
-#include "authorizedapplicationstable.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/authorizedapplicationstable.h
^
|
| @@ -17,13 +17,13 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef AUTHORIZEDAPPLICATIONSTABLE_H
#define AUTHORIZEDAPPLICATIONSTABLE_H
#include <QTableView>
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
@@ -31,7 +31,7 @@
{
Q_OBJECT
public:
- explicit AuthorizedApplicationsTable(QWidget* parent);
+ explicit AuthorizedApplicationsTable(QWidget *parent);
virtual void setModel(QAbstractItemModel *model);
void setWallet(KWallet::Wallet *wallet);
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/authorizedappmodel.cpp
^
|
| @@ -21,12 +21,12 @@
#include <kconfiggroup.h>
#include <kwallet.h>
-#include <kdebug.h>
+#include <QDebug>
#include <QTimer>
-AuthorizedAppModel::AuthorizedAppModel(KWallet::Wallet* wallet):
+AuthorizedAppModel::AuthorizedAppModel(KWallet::Wallet *wallet):
QStandardItemModel(),
- _cfg(KSharedConfig::openConfig(QLatin1String( "kwalletrc" ), KConfig::NoGlobals)),
+ _cfg(KSharedConfig::openConfig(QLatin1String("kwalletrc"), KConfig::NoGlobals)),
_wallet(wallet)
{
// TODO: handle "Auto Deny" applications
@@ -55,11 +55,11 @@
QPersistentModelIndex idx = _authorizedAppsIndexMap[appName];
if (idx.isValid()) {
if (!removeRow(idx.row())) {
- kDebug() << "Remove row failed for app " << appName;
+ qDebug() << "Remove row failed for app " << appName;
}
}
} else {
- kDebug() << "Attempting to remove unknown application " << appName;
+ qDebug() << "Attempting to remove unknown application " << appName;
}
QTimer::singleShot(0, this, SLOT(saveConfig()));
}
@@ -67,7 +67,7 @@
void AuthorizedAppModel::saveConfig()
{
QStringList appList;
- for (int r=0; r <rowCount(); r++) {
+ for (int r = 0; r < rowCount(); r++) {
appList << item(r)->text();
}
QString walletName = _wallet->walletName();
@@ -77,4 +77,4 @@
_cfg->sync();
}
-#include "authorizedappmodel.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/authorizedappmodel.h
^
|
| @@ -23,7 +23,8 @@
#include <QStandardItemModel>
#include <ksharedconfig.h>
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/connectedapplicationstable.cpp
^
|
| @@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "connectedapplicationstable.h"
#include "disconnectappbutton.h"
#include "connectedappmodel.h"
@@ -25,35 +24,35 @@
#include <klocalizedstring.h>
#include <QPushButton>
-ConnectedApplicationsTable::ConnectedApplicationsTable(QWidget* parent):
+ConnectedApplicationsTable::ConnectedApplicationsTable(QWidget *parent):
QTableView(parent),
_wallet(0)
{
}
-void ConnectedApplicationsTable::setWallet(KWallet::Wallet* wallet)
+void ConnectedApplicationsTable::setWallet(KWallet::Wallet *wallet)
{
_wallet = wallet;
}
-void ConnectedApplicationsTable::setModel(QAbstractItemModel* model)
+void ConnectedApplicationsTable::setModel(QAbstractItemModel *model)
{
Q_ASSERT(_wallet != 0);
- ConnectedAppModel *appModel = qobject_cast<ConnectedAppModel*>(model);
+ ConnectedAppModel *appModel = qobject_cast<ConnectedAppModel *>(model);
Q_ASSERT(appModel != 0);
QTableView::setModel(model);
- for (int row =0; row < model->rowCount(); row++) {
- DisconnectAppButton *btn = new DisconnectAppButton( model->index(row, 0).data().toString() , _wallet);
+ for (int row = 0; row < model->rowCount(); row++) {
+ DisconnectAppButton *btn = new DisconnectAppButton(model->index(row, 0).data().toString(), _wallet);
btn->setFixedHeight(btn->sizeHint().height());
setRowHeight(row, btn->height());
- setIndexWidget( model->index(row, 1), btn);
- connect(btn, SIGNAL(appDisconnected(QString)), appModel, SLOT(removeApp(QString)));
+ setIndexWidget(model->index(row, 1), btn);
+ connect(btn, &DisconnectAppButton::appDisconnected, appModel, &ConnectedAppModel::removeApp);
}
}
-void ConnectedApplicationsTable::resizeEvent(QResizeEvent* resizeEvent)
+void ConnectedApplicationsTable::resizeEvent(QResizeEvent *resizeEvent)
{
// this will keep disconnect buttons column at it's minimum size and
// make the application names take the reminder of the horizontal space
@@ -63,4 +62,4 @@
QAbstractItemView::resizeEvent(resizeEvent);
}
-#include "connectedapplicationstable.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/connectedappmodel.cpp
^
|
| @@ -20,10 +20,9 @@
#include "connectedappmodel.h"
#include <kwallet.h>
-#include <kdebug.h>
+#include <QDebug>
-
-ConnectedAppModel::ConnectedAppModel(KWallet::Wallet* wallet):
+ConnectedAppModel::ConnectedAppModel(KWallet::Wallet *wallet):
QStandardItemModel(),
_wallet(wallet)
{
@@ -36,11 +35,11 @@
_connectedAppsIndexMap.clear();
_connectedApps = KWallet::Wallet::users(_wallet->walletName());
- int row =0;
- Q_FOREACH(QString appName, _connectedApps ) {
+ int row = 0;
+ Q_FOREACH(QString appName, _connectedApps) {
// for un unknown reason, kwalletd returs empty strings so lets avoid inserting them
// FIXME: find out why kwalletd returns empty strings here
- if (appName.length()>0) {
+ if (appName.length() > 0) {
QStandardItem *item = new QStandardItem(appName);
item->setEditable(false);
setItem(row, 0, item);
@@ -58,13 +57,12 @@
QPersistentModelIndex idx = _connectedAppsIndexMap[appName];
if (idx.isValid()) {
if (!removeRow(idx.row())) {
- kDebug() << "Remove row failed for app " << appName;
+ qDebug() << "Remove row failed for app " << appName;
}
}
} else {
- kDebug() << "Attempting to remove unknown application " << appName;
+ qDebug() << "Attempting to remove unknown application " << appName;
}
}
-#include "connectedappmodel.moc"
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/connectedappmodel.h
^
|
| @@ -22,7 +22,8 @@
#include <QStandardItemModel>
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
@@ -42,5 +43,4 @@
QMap<QString, QPersistentModelIndex> _connectedAppsIndexMap;
};
-
#endif // CONNECTEDAPPMODEL_H
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/disconnectappbutton.cpp
^
|
| @@ -22,12 +22,12 @@
#include <klocalizedstring.h>
#include <kwallet.h>
-DisconnectAppButton::DisconnectAppButton(const QString& appName, KWallet::Wallet* wallet) :
- _appName(appName), _wallet(wallet)
+DisconnectAppButton::DisconnectAppButton(const QString &appName, KWallet::Wallet *wallet) :
+ _appName(appName), _wallet(wallet)
{
setObjectName(QString("Disconnect_%1").arg(appName));
setText(i18n("Disconnect"));
- connect(this, SIGNAL(clicked(bool)), this, SLOT(onClicked()));
+ connect(this, &DisconnectAppButton::clicked, this, &DisconnectAppButton::onClicked);
}
void DisconnectAppButton::onClicked()
@@ -37,4 +37,4 @@
}
}
-#include "disconnectappbutton.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/disconnectappbutton.h
^
|
| @@ -22,14 +22,16 @@
#include <QPushButton>
-namespace KWallet {
- class Wallet;
+namespace KWallet
+{
+class Wallet;
}
-class DisconnectAppButton : public QPushButton {
+class DisconnectAppButton : public QPushButton
+{
Q_OBJECT
public:
- DisconnectAppButton(const QString& appName, KWallet::Wallet *wallet);
+ DisconnectAppButton(const QString &appName, KWallet::Wallet *wallet);
Q_SIGNALS:
void appDisconnected(QString);
@@ -42,6 +44,4 @@
KWallet::Wallet *_wallet;
};
-
-
#endif // DISCONNECTAPPBUTTON_H
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kbetterthankdialogbase.cpp
^
|
| @@ -18,50 +18,45 @@
* Boston, MA 02110-1301, USA.
*/
-
#include "kbetterthankdialogbase.h"
void KBetterThanKDialogBase::clicked()
{
if (sender() == _allowOnce) {
- done(3);
+ done(3);
} else if (sender() == _allowAlways) {
- done(1);
+ done(1);
} else if (sender() == _deny) {
- done(4);
+ done(4);
} else if (sender() == _denyForever) {
- done(2);
+ done(2);
}
}
-
-void KBetterThanKDialogBase::setLabel( const QString & label )
+void KBetterThanKDialogBase::setLabel(const QString &label)
{
_label->setText(label);
}
-
-KBetterThanKDialogBase::KBetterThanKDialogBase( QWidget* parent )
- : QDialog( parent ), Ui_KBetterThanKDialogBase()
+KBetterThanKDialogBase::KBetterThanKDialogBase(QWidget *parent)
+ : QDialog(parent), Ui_KBetterThanKDialogBase()
{
- setupUi( this );
- connect(_allowOnce, SIGNAL(clicked()), this, SLOT(clicked()));
- connect(_allowAlways, SIGNAL(clicked()), this, SLOT(clicked()));
- connect(_deny,SIGNAL(clicked()), this, SLOT(clicked()));
- connect(_denyForever,SIGNAL(clicked()), this, SLOT(clicked()));
+ setupUi(this);
+ connect(_allowOnce, &QPushButton::clicked, this, &KBetterThanKDialogBase::clicked);
+ connect(_allowAlways, &QPushButton::clicked, this, &KBetterThanKDialogBase::clicked);
+ connect(_deny, &QPushButton::clicked, this, &KBetterThanKDialogBase::clicked);
+ connect(_denyForever, &QPushButton::clicked, this, &KBetterThanKDialogBase::clicked);
_allowOnce->setFocus();
}
-
void KBetterThanKDialogBase::accept()
{
setResult(3);
}
-
void KBetterThanKDialogBase::reject()
{
QDialog::reject();
setResult(4);
}
-#include "kbetterthankdialogbase.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kbetterthankdialogbase.h
^
|
| @@ -23,17 +23,15 @@
#include "ui_kbetterthankdialogbase.h"
-
class KBetterThanKDialogBase : public QDialog, private Ui_KBetterThanKDialogBase
{
Q_OBJECT
public:
- KBetterThanKDialogBase( QWidget* parent = 0 );
-
+ KBetterThanKDialogBase(QWidget *parent = 0);
public slots:
- virtual void setLabel( const QString & label );
+ virtual void setLabel(const QString &label);
virtual void accept();
virtual void reject();
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalleteditor.cpp
^
|
| @@ -23,156 +23,145 @@
#include "kwmapeditor.h"
#include "allyourbase.h"
-#include <stdlib.h>
-#include <QDomElement>
-#include <QDomNode>
-#include <QDomDocument>
-#include <QXmlStreamWriter>
-#include <kaction.h>
-#include <kdebug.h>
-#include <kdialog.h>
-#include <kfiledialog.h>
-#include <kinputdialog.h>
+#include <qaction.h>
+#include <qdialog.h>
+#include <qinputdialog.h>
#include <kio/netaccess.h>
#include <kactioncollection.h>
-#include <klocale.h>
#include <kcodecs.h>
#include <kmessagebox.h>
-#include <kmenu.h>
+#include <QMenu>
#include <ksqueezedtextlabel.h>
-#include <kstandarddirs.h>
#include <kstandardaction.h>
+#include <KConfigGroup>
-#include <ktemporaryfile.h>
+#include <QTemporaryFile>
#include <kxmlguifactory.h>
+#include <KSharedConfig>
+
+#include <ktoolbar.h>
+#include <QIcon>
+#include <KTreeWidgetSearchLine>
+
#include <QCheckBox>
#include <QClipboard>
+#include <QDebug>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
+#include <QFileDialog>
+#include <QList>
#include <QPushButton>
-#include <QTimer>
+#include <QStack>
+#include <QStandardPaths>
#include <QSet>
#include <QTextStream>
-#include <QList>
-#include <QVBoxLayout>
-#include <QStack>
+#include <QTimer>
#include <QToolButton>
+#include <QVBoxLayout>
+#include <QXmlStreamWriter>
#include <assert.h>
-#include <ktoolbar.h>
-#include <kicon.h>
-#include <KAction>
-#include <KTreeWidgetSearchLine>
+#include <stdlib.h>
-QAction *KWalletEditor::_newFolderAction =0;
-QAction *KWalletEditor::_deleteFolderAction =0;
-QAction *KWalletEditor::_exportAction =0;
-QAction *KWalletEditor::_saveAsAction =0;
-QAction *KWalletEditor::_mergeAction =0;
-QAction *KWalletEditor::_importAction =0;
-KAction *KWalletEditor::_newEntryAction =0;
-KAction *KWalletEditor::_renameEntryAction =0;
-KAction *KWalletEditor::_deleteEntryAction =0;
-KAction *KWalletEditor::_copyPassAction =0;
-QAction *KWalletEditor::_alwaysShowContentsAction =0;
-QAction *KWalletEditor::_alwaysHideContentsAction =0;
+QAction *KWalletEditor::_newFolderAction = 0;
+QAction *KWalletEditor::_deleteFolderAction = 0;
+QAction *KWalletEditor::_exportAction = 0;
+QAction *KWalletEditor::_mergeAction = 0;
+QAction *KWalletEditor::_importAction = 0;
+QAction *KWalletEditor::_newEntryAction = 0;
+QAction *KWalletEditor::_renameEntryAction = 0;
+QAction *KWalletEditor::_deleteEntryAction = 0;
+QAction *KWalletEditor::_copyPassAction = 0;
+QAction *KWalletEditor::_alwaysShowContentsAction = 0;
+QAction *KWalletEditor::_alwaysHideContentsAction = 0;
RegisterCreateActionsMethod KWalletEditor::_registerCreateActionMethod(&KWalletEditor::createActions);
-
-KWalletEditor::KWalletEditor(QWidget* parent, const char *name)
-: QWidget(parent), _displayedItem(0), _actionCollection(0), _alwaysShowContents(false) {
- setupUi( this );
- setObjectName( QLatin1String( name ) );
- _newWallet = false;
- _splitter->setStretchFactor(0, 1);
- _splitter->setStretchFactor(1, 2);
- _contextMenu = new KMenu(this);
-
- _undoChanges->setIcon(KIcon( QLatin1String( "edit-undo" )));
- _saveChanges->setIcon(KIcon( QLatin1String( "document-save" )));
-
- QVBoxLayout *box = new QVBoxLayout(_entryListFrame);
- box->setMargin(0);
- _entryList = new KWalletEntryList(_entryListFrame, "Wallet Entry List");
- _entryList->setContextMenuPolicy(Qt::CustomContextMenu);
+KWalletEditor::KWalletEditor(QWidget *parent, const char *name)
+ : QWidget(parent), _displayedItem(0), _actionCollection(0), _alwaysShowContents(false)
+{
+ setupUi(this);
+ setObjectName(QLatin1String(name));
+ _newWallet = false;
+ _splitter->setStretchFactor(0, 1);
+ _splitter->setStretchFactor(1, 2);
+ _contextMenu = new QMenu(this);
+
+ _undoChanges->setIcon(QIcon::fromTheme(QLatin1String("edit-undo")));
+ _saveChanges->setIcon(QIcon::fromTheme(QLatin1String("document-save")));
+
+ QVBoxLayout *box = new QVBoxLayout(_entryListFrame);
+ box->setMargin(0);
+ _entryList = new KWalletEntryList(_entryListFrame, "Wallet Entry List");
+ _entryList->setContextMenuPolicy(Qt::CustomContextMenu);
_searchLine = new KTreeWidgetSearchLine(_entryListFrame, _entryList);
- _searchLine->setClickMessage(i18n("Search"));
- connect(_searchLine, SIGNAL(textChanged(QString)), this, SLOT(onSearchTextChanged(QString)));
- box->addWidget(_searchLine);
- box->addWidget(_entryList);
-
- _entryStack->setEnabled(true);
-
- box = new QVBoxLayout(_entryStack->widget(2));
- box->setMargin(0);
- _mapEditorShowHide = new QCheckBox(i18n("&Show values"), _entryStack->widget(2));
- connect(_mapEditorShowHide, SIGNAL(toggled(bool)), this, SLOT(showHideMapEditorValue(bool)));
- _mapEditor = new KWMapEditor(_currentMap, _entryStack->widget(2));
- box->addWidget(_mapEditorShowHide);
- box->addWidget(_mapEditor);
-
- // load splitter size
- KConfigGroup cg(KGlobal::config(), "WalletEditor");
- QList<int> splitterSize = cg.readEntry("SplitterSize", QList<int>());
- if (splitterSize.size() != 2) {
- splitterSize.clear();
- splitterSize.append(_splitter->width()/2);
- splitterSize.append(_splitter->width()/2);
- }
- _splitter->setSizes(splitterSize);
+ _searchLine->setPlaceholderText(i18n("Search"));
+ connect(_searchLine, &KTreeWidgetSearchLine::textChanged, this, &KWalletEditor::onSearchTextChanged);
+ box->addWidget(_searchLine);
+ box->addWidget(_entryList);
+
+ _entryStack->setEnabled(true);
+
+ box = new QVBoxLayout(_entryStack->widget(2));
+ box->setMargin(0);
+ _mapEditorShowHide = new QCheckBox(i18n("&Show values"), _entryStack->widget(2));
+ connect(_mapEditorShowHide, &QCheckBox::toggled, this, &KWalletEditor::showHideMapEditorValue);
+ _mapEditor = new KWMapEditor(_currentMap, _entryStack->widget(2));
+ box->addWidget(_mapEditorShowHide);
+ box->addWidget(_mapEditor);
+
+ // load splitter size
+ KConfigGroup cg(KSharedConfig::openConfig(), "WalletEditor");
+ QList<int> splitterSize = cg.readEntry("SplitterSize", QList<int>());
+ if (splitterSize.size() != 2) {
+ splitterSize.clear();
+ splitterSize.append(_splitter->width() / 2);
+ splitterSize.append(_splitter->width() / 2);
+ }
+ _splitter->setSizes(splitterSize);
_alwaysShowContents = cg.readEntry("AlwaysShowContents", false);
_searchLine->setFocus();
- connect(_entryList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
- this, SLOT(entrySelectionChanged(QTreeWidgetItem*)));
- connect(_entryList,
- SIGNAL(customContextMenuRequested(QPoint)),
- this,
- SLOT(listContextMenuRequested(QPoint)));
- connect(_entryList,
- SIGNAL(itemChanged(QTreeWidgetItem*,int)),
- this,
- SLOT(listItemChanged(QTreeWidgetItem*,int)));
-
- connect(_passwordValue, SIGNAL(textChanged()),
- this, SLOT(entryEditted()));
- connect(_mapEditor, SIGNAL(dirty()),
- this, SLOT(entryEditted()));
-
- connect(_undoChanges, SIGNAL(clicked()),
- this, SLOT(restoreEntry()));
- connect(_saveChanges, SIGNAL(clicked()),
- this, SLOT(saveEntry()));
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalleteditor.h
^
|
| @@ -30,105 +30,106 @@
#include <QLabel>
class KActionCollection;
-class KMenu;
+class QMenu;
class QTreeWidgetItem;
class QCheckBox;
class KWalletEntryList;
class KWMapEditor;
-class KAction;
class KTreeWidgetSearchLine;
+class KWalletEditor : public QWidget, public Ui::WalletWidget
+{
+ Q_OBJECT
+
+public:
+ KWalletEditor(QWidget *parent, const char *name = 0);
+ virtual ~KWalletEditor();
+
+ void setWallet(KWallet::Wallet *wallet, bool isPath = false);
+ bool isOpen() const
+ {
+ return _w != 0L;
+ }
-class KWalletEditor : public QWidget, public Ui::WalletWidget {
- Q_OBJECT
-
- public:
- KWalletEditor(QWidget* parent, const char* name = 0);
- virtual ~KWalletEditor();
-
- void setWallet(KWallet::Wallet* wallet, bool isPath =false);
- bool isOpen() const { return _w != 0L; }
-
- void setNewWallet(bool newWallet);
+ void setNewWallet(bool newWallet);
protected:
- virtual void hideEvent(QHideEvent*);
- virtual void showEvent(QShowEvent*);
+ virtual void hideEvent(QHideEvent *);
+ virtual void showEvent(QShowEvent *);
- public slots:
- void walletClosed();
- void createFolder();
- void deleteFolder();
-
- private slots:
- void updateFolderList(bool checkEntries = false);
- void entrySelectionChanged(QTreeWidgetItem *item);
- void listItemChanged(QTreeWidgetItem *, int column);
- void listContextMenuRequested(const QPoint& pos);
- void updateEntries(const QString& folder);
-
- void newEntry();
- void renameEntry();
- void deleteEntry();
- void entryEditted();
- void restoreEntry();
- void saveEntry();
-
- void changePassword();
-
- void walletOpened(bool success);
- void hidePasswordContents();
- void showPasswordContents();
- void showHideMapEditorValue(bool show);
-
- void saveAs();
- void exportXML();
- void importXML();
- void importWallet();
-
- void copyPassword();
-
- void onSearchTextChanged(const QString&);
- void onAlwaysShowContents(bool);
- void onAlwaysHideContents(bool);
-
- signals:
- void enableWalletActions(bool enable);
- void enableFolderActions(bool enable);
- void enableContextFolderActions(bool enable);
-
- public:
- QString _walletName;
-
- private:
- static void createActions(KActionCollection*);
- void connectActions();
- void disconnectActions();
- KActionCollection *actionCollection();
-
- bool _nonLocal;
- KWallet::Wallet *_w;
- KWalletEntryList *_entryList;
- static RegisterCreateActionsMethod _registerCreateActionMethod;
- static QAction *_newFolderAction, *_deleteFolderAction;
- static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
- static KAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
- static KAction *_copyPassAction;
- QLabel*_details;
- QString _currentFolder;
- QMap<QString,QString> _currentMap; // save memory by storing
- // only the most recent map.
- KWMapEditor *_mapEditor;
- QCheckBox *_mapEditorShowHide;
- bool _newWallet;
- KMenu *_contextMenu;
- QTreeWidgetItem *_displayedItem; // used to find old item when selection just changed
- KActionCollection *_actionCollection;
- KMenu *_controlMenu;
- KMenu *_walletSubmenu;
- KTreeWidgetSearchLine *_searchLine;
- static QAction *_alwaysShowContentsAction, *_alwaysHideContentsAction;
- bool _alwaysShowContents;
+public slots:
+ void walletClosed();
+ void createFolder();
+ void deleteFolder();
+
+private slots:
+ void updateFolderList(bool checkEntries = false);
+ void entrySelectionChanged(QTreeWidgetItem *item);
+ void listItemChanged(QTreeWidgetItem *, int column);
+ void listContextMenuRequested(const QPoint &pos);
+ void updateEntries(const QString &folder);
+
+ void newEntry();
+ void renameEntry();
+ void deleteEntry();
+ void entryEditted();
+ void restoreEntry();
+ void saveEntry();
+
+ void changePassword();
+
+ void walletOpened(bool success);
+ void hidePasswordContents();
+ void showPasswordContents();
+ void showHideMapEditorValue(bool show);
+
+ void exportXML();
+ void importXML();
+ void importWallet();
+
+ void copyPassword();
+
+ void onSearchTextChanged(const QString &);
+ void onAlwaysShowContents(bool);
+ void onAlwaysHideContents(bool);
+
+signals:
+ void enableWalletActions(bool enable);
+ void enableFolderActions(bool enable);
+ void enableContextFolderActions(bool enable);
+
+public:
+ QString _walletName;
+
+private:
+ static void createActions(KActionCollection *);
+ void connectActions();
+ void disconnectActions();
+ KActionCollection *actionCollection();
+
+ bool _nonLocal;
+ KWallet::Wallet *_w;
+ KWalletEntryList *_entryList;
+ static RegisterCreateActionsMethod _registerCreateActionMethod;
+ static QAction *_newFolderAction, *_deleteFolderAction;
+ static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
+ static QAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
+ static QAction *_copyPassAction;
+ QLabel *_details;
+ QString _currentFolder;
+ QMap<QString, QString> _currentMap; // save memory by storing
+ // only the most recent map.
+ KWMapEditor *_mapEditor;
+ QCheckBox *_mapEditorShowHide;
+ bool _newWallet;
+ QMenu *_contextMenu;
+ QTreeWidgetItem *_displayedItem; // used to find old item when selection just changed
+ KActionCollection *_actionCollection;
+ QMenu *_controlMenu;
+ QMenu *_walletSubmenu;
+ KTreeWidgetSearchLine *_searchLine;
+ static QAction *_alwaysShowContentsAction, *_alwaysHideContentsAction;
+ bool _alwaysShowContents;
};
#endif
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanager.cpp
^
|
| @@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "kwalletmanager.h"
#include "kwalletmanagerwidget.h"
#include "kwalletpopup.h"
@@ -26,221 +25,237 @@
#include "kwallet_interface.h"
#include "registercreateactionmethod.h"
-#include <kaction.h>
-#include <kapplication.h>
+#include <klocalizedstring.h>
+#include <KService/KToolInvocation>
+
+#include <qaction.h>
#include <kconfig.h>
-#include <kdebug.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
#include <kmessagebox.h>
-#include <kstandarddirs.h>
#include <kstandardaction.h>
#include <kstatusnotifieritem.h>
#include <kwallet.h>
#include <kxmlguifactory.h>
+#include <QIcon>
+#include <kactioncollection.h>
+#include <kconfiggroup.h>
+#include <KTar>
+
+#include <QDebug>
#include <QPointer>
#include <QRegExp>
-
#include <QRegExpValidator>
#include <QTimer>
-#include <ktoolinvocation.h>
-#include <kicon.h>
-#include <kactioncollection.h>
-#include <kconfiggroup.h>
+#include <QFileDialog>
+
KWalletManager::KWalletManager(QWidget *parent, const char *name, Qt::WFlags f)
: KXmlGuiWindow(parent, f)
{
+ _kwalletdLaunch = false;
+ _shuttingDown = false;
+ m_kwalletdModule = 0;
+ setObjectName(QLatin1String(name));
RegisterCreateActionsMethod::createActions(actionCollection());
- setObjectName(QLatin1String( name ) );
- QDBusConnection::sessionBus().registerObject(QLatin1String( "/KWalletManager" ), this, QDBusConnection::ExportScriptableSlots);
- KGlobal::dirs()->addResourceType("kwallet", 0, QLatin1String( "share/apps/kwallet" ));
- _kwalletdLaunch = false;
- _shuttingDown = false;
- m_kwalletdModule = 0;
- KConfig cfg( QLatin1String( "kwalletrc" )); // not sure why this setting isn't in kwalletmanagerrc...
- KConfigGroup walletConfigGroup(&cfg, "Wallet");
- if (walletConfigGroup.readEntry("Launch Manager", false)) {
- _tray = new KStatusNotifierItem(this);
- _tray->setObjectName( QLatin1String("kwalletmanager tray" ));
- _tray->setCategory( KStatusNotifierItem::SystemServices );
- _tray->setStatus( KStatusNotifierItem::Passive );
- _tray->setIconByName(QLatin1String( "wallet-closed" ));
- _tray->setToolTip( QLatin1String( "wallet-closed" ), i18n("KDE Wallet"), i18n("No wallets open."));
- //connect(_tray, SIGNAL(quitSelected()), SLOT(shuttingDown()));
- const QStringList wl = KWallet::Wallet::walletList();
- bool isOpen = false;
- for (QStringList::ConstIterator it = wl.begin(); it != wl.end(); ++it) {
- if (KWallet::Wallet::isOpen(*it)) {
- _tray->setIconByName(QLatin1String( "wallet-open" ));
- _tray->setToolTip( QLatin1String( "wallet-open" ), i18n("KDE Wallet"), i18n("A wallet is open."));
- isOpen = true;
- break;
- }
- }
- if (!isOpen && qApp->isSessionRestored()) {
- delete _tray;
- _tray = 0;
- QTimer::singleShot( 0, qApp, SLOT(quit()));
- return;
- }
- } else {
- _tray = 0;
- }
+ QTimer::singleShot(0, this, SLOT(beginConfiguration()));
+}
+
+void KWalletManager::beginConfiguration() {
+ KConfig cfg(QLatin1String("kwalletrc")); // not sure why this setting isn't in kwalletmanagerrc...
+ KConfigGroup walletConfigGroup(&cfg, "Wallet");
+ if (walletConfigGroup.readEntry("Enabled", true)){
+ QTimer::singleShot(0, this, SLOT(configUI()));
+ } else {
+ int rc = KMessageBox::warningYesNo(this,
+ i18n("The KDE Wallet system is not enabled. Do you want me to enable it? If not, the KWalletManager will quit as it cannot work without reading the wallets."));
+ if (rc == KMessageBox::Yes) {
+ walletConfigGroup.writeEntry("Enabled", true);
+ QTimer::singleShot(0, this, SLOT(configUI()));
+ } else {
+ QApplication::quit();
+ }
+ }
+}
+
+void KWalletManager::configUI() {
+ QDBusConnection::sessionBus().registerObject(QLatin1String("/KWalletManager"), this, QDBusConnection::ExportScriptableSlots);
+ KConfig cfg(QLatin1String("kwalletrc")); // not sure why this setting isn't in kwalletmanagerrc...
+ KConfigGroup walletConfigGroup(&cfg, "Wallet");
+ if (walletConfigGroup.readEntry("Launch Manager", false)) {
+ _tray = new KStatusNotifierItem(this);
+ _tray->setObjectName(QLatin1String("kwalletmanager tray"));
+ _tray->setCategory(KStatusNotifierItem::SystemServices);
+ _tray->setStatus(KStatusNotifierItem::Passive);
+ _tray->setIconByName(QLatin1String("wallet-closed"));
+ _tray->setToolTip(QLatin1String("wallet-closed"), i18n("Wallet"), i18n("No wallets open."));
+ //connect(_tray, SIGNAL(quitSelected()), SLOT(shuttingDown()));
+ const QStringList wl = KWallet::Wallet::walletList();
+ bool isOpen = false;
+ for (QStringList::ConstIterator it = wl.begin(); it != wl.end(); ++it) {
+ if (KWallet::Wallet::isOpen(*it)) {
+ _tray->setIconByName(QLatin1String("wallet-open"));
+ _tray->setToolTip(QLatin1String("wallet-open"), i18n("Wallet"), i18n("A wallet is open."));
+ isOpen = true;
+ break;
+ }
+ }
+ if (!isOpen && qApp->isSessionRestored()) {
+ delete _tray;
+ _tray = 0;
+ QTimer::singleShot(0, qApp, SLOT(quit()));
+ return;
+ }
+ } else {
+ _tray = 0;
+ }
_managerWidget = new KWalletManagerWidget(this);
- updateWalletDisplay();
- setCentralWidget(_managerWidget);
- setAutoSaveSettings(QLatin1String("MainWindow"), true);
-// _managerWidget->setMinimumSize(320, 200);
-
- m_kwalletdModule = new org::kde::KWallet(QLatin1String( "org.kde.kwalletd" ), QLatin1String( "/modules/kwalletd" ), QDBusConnection::sessionBus());
- connect(QDBusConnection::sessionBus().interface(),
- SIGNAL(serviceOwnerChanged(QString,QString,QString)),
- this,
- SLOT(possiblyRescan(QString,QString,QString)));
- connect( m_kwalletdModule, SIGNAL(allWalletsClosed()),
- this, SLOT(allWalletsClosed()) );
- connect( m_kwalletdModule, SIGNAL(walletClosed(QString)),
- this, SLOT(updateWalletDisplay()) );
- connect( m_kwalletdModule, SIGNAL(walletOpened(QString)),
- this, SLOT(aWalletWasOpened()) );
- connect( m_kwalletdModule, SIGNAL(walletDeleted(QString)),
- this, SLOT(updateWalletDisplay()) );
- connect( m_kwalletdModule, SIGNAL(walletListDirty()),
- this, SLOT(updateWalletDisplay()) );
- connect( m_kwalletdModule, SIGNAL(walletCreated(QString)), this, SLOT(walletCreated(QString)));
- connect( m_kwalletdModule, SIGNAL(walletDeleted(QString)), this, SLOT(walletDeleted(QString)));
- // FIXME: slight race - a wallet can open, then we get launched, but the
- // wallet closes before we are done opening. We will then stay
- // open. Must check that a wallet is still open here.
-
- QAction *action = actionCollection()->addAction(QLatin1String( "wallet_create" ));
- action->setText(i18n("&New Wallet..."));
- action->setIcon(KIcon( QLatin1String( "kwalletmanager" )));
- connect(action, SIGNAL(triggered()), SLOT(createWallet()));
+ updateWalletDisplay();
+ setCentralWidget(_managerWidget);
+ setAutoSaveSettings(QLatin1String("MainWindow"), true);
+ QFontMetrics fm = fontMetrics();
+ _managerWidget->setMinimumSize(16*fm.height(), 18*fm.height());
+
+ m_kwalletdModule = new org::kde::KWallet(QLatin1String("org.kde.kwalletd5"), QLatin1String("/modules/kwalletd5"), QDBusConnection::sessionBus());
+ connect(QDBusConnection::sessionBus().interface(), SIGNAL(serviceOwnerChanged(QString,QString,QString)), this,
+ SLOT(possiblyRescan(QString,QString,QString)));
+ connect(m_kwalletdModule, &OrgKdeKWalletInterface::allWalletsClosed, this, &KWalletManager::allWalletsClosed);
+ connect(m_kwalletdModule, SIGNAL(walletClosed(QString)),
+ this, SLOT(updateWalletDisplay()));
+
+ connect(m_kwalletdModule, &OrgKdeKWalletInterface::walletOpened, this, &KWalletManager::aWalletWasOpened);
+ connect(m_kwalletdModule, &OrgKdeKWalletInterface::walletDeleted, this, &KWalletManager::updateWalletDisplay);
+ connect(m_kwalletdModule, &OrgKdeKWalletInterface::walletListDirty, this, &KWalletManager::updateWalletDisplay);
+ connect(m_kwalletdModule, &OrgKdeKWalletInterface::walletCreated, this, &KWalletManager::walletCreated);
+ // FIXME: slight race - a wallet can open, then we get launched, but the
+ // wallet closes before we are done opening. We will then stay
+ // open. Must check that a wallet is still open here.
+
+ QAction *action = actionCollection()->addAction(QLatin1String("wallet_create"));
+ action->setText(i18n("&New Wallet..."));
+ action->setIcon(QIcon::fromTheme(QLatin1String("kwalletmanager")));
+ connect(action, SIGNAL(triggered()), SLOT(createWallet()));
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanager.h
^
|
| @@ -27,56 +27,61 @@
class KStatusNotifierItem;
class QListWidgetItem;
class OrgKdeKWalletInterface;
+class QAction;
-class KWalletManager : public KXmlGuiWindow {
- Q_OBJECT
-
- Q_CLASSINFO("D-Bus Interface", "org.kde.kwallet.kwalletmanager")
-
- public:
- explicit KWalletManager(QWidget *parent = 0, const char* name = 0, Qt::WFlags f = 0);
- virtual ~KWalletManager();
-
- void kwalletdLaunch();
-
- public slots:
- void createWallet();
- void deleteWallet();
- void closeWallet(const QString& walletName);
- void changeWalletPassword(const QString& walletName);
- void openWallet(const QString& walletName);
- void openWalletFile(const QString& path);
-// void openWallet(QListWidgetItem *item);
- void contextMenu(const QPoint& pos);
- void walletCreated(const QString& walletName);
-
- protected:
- virtual bool queryClose();
-
- private:
- public Q_SLOTS: //dbus
- Q_SCRIPTABLE void allWalletsClosed();
- Q_SCRIPTABLE void updateWalletDisplay();
- Q_SCRIPTABLE void aWalletWasOpened();
-
- private slots:
- void shuttingDown();
- void possiblyQuit();
- void editorClosed(KXmlGuiWindow* e);
- void possiblyRescan(const QString& app, const QString&, const QString&);
- void setupWallet();
- void openWallet();
- void closeAllWallets();
- void walletDeleted(const QString& walletName);
-
- private:
- KStatusNotifierItem *_tray;
- bool _shuttingDown;
- KWalletManagerWidget *_managerWidget;
- OrgKdeKWalletInterface *m_kwalletdModule;
- QList<KXmlGuiWindow*> _windows;
- bool _kwalletdLaunch;
- QAction *_walletDeleteAction;
+class KWalletManager : public KXmlGuiWindow
+{
+ Q_OBJECT
+
+ Q_CLASSINFO("D-Bus Interface", "org.kde.kwallet.kwalletmanager")
+
+public:
+ explicit KWalletManager(QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0);
+ virtual ~KWalletManager();
+
+ void kwalletdLaunch();
+
+public slots:
+ void createWallet();
+ void deleteWallet();
+ void closeWallet(const QString &walletName);
+ void changeWalletPassword(const QString &walletName);
+ void openWallet(const QString &walletName);
+ void openWalletFile(const QString &path);
+// void openWallet(QListWidgetItem *item);
+ void contextMenu(const QPoint &pos);
+ void walletCreated(const QString &walletName);
+
+protected:
+ virtual bool queryClose();
+
+private:
+public Q_SLOTS: //dbus
+ Q_SCRIPTABLE void allWalletsClosed();
+ Q_SCRIPTABLE void updateWalletDisplay();
+ Q_SCRIPTABLE void aWalletWasOpened();
+
+private slots:
+ void shuttingDown();
+ void possiblyQuit();
+ void editorClosed(KXmlGuiWindow *e);
+ void possiblyRescan(const QString &app, const QString &, const QString &);
+ void setupWallet();
+ void openWallet();
+ void closeAllWallets();
+ void exportWallets();
+ void importWallets();
+ void beginConfiguration();
+ void configUI();
+
+private:
+ KStatusNotifierItem *_tray;
+ bool _shuttingDown;
+ KWalletManagerWidget *_managerWidget;
+ OrgKdeKWalletInterface *m_kwalletdModule;
+ QList<KXmlGuiWindow *> _windows;
+ bool _kwalletdLaunch;
+ QAction *_walletsExportAction = nullptr;
};
#endif
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanager.rc
^
|
| @@ -4,11 +4,11 @@
<Menu name="file"><text>&File</text>
<Action name="wallet_create"/>
<Separator/>
- <Action name="file_save_as"/>
- <Separator/>
<Action name="wallet_merge"/>
<Action name="wallet_import"/>
<Action name="wallet_export"/>
+ <Action name="wallet_import_encrypted"/>
+ <Action name="wallet_export_encrypted"/>
<Separator/>
<Action name="close_all_wallets"/>
<Separator/>
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanagerwidget.cpp
^
|
| @@ -23,20 +23,19 @@
#include "kwallet_interface.h"
#include <kwallet.h>
-#include <kurl.h>
-#include <kglobal.h>
+#include <qurl.h>
#include <kmessagebox.h>
#include <klocalizedstring.h>
#include <kio/netaccess.h>
#include <QDragEnterEvent>
-KWalletManagerWidget::KWalletManagerWidget(QWidget* parent, Qt::WindowFlags flags):
+KWalletManagerWidget::KWalletManagerWidget(QWidget *parent, Qt::WindowFlags flags):
KPageWidget(parent)
{
setFaceType(Auto);
setAcceptDrops(true);
- connect(this, SIGNAL(currentPageChanged(KPageWidgetItem*,KPageWidgetItem*)), SLOT(onCurrentPageChanged(KPageWidgetItem*,KPageWidgetItem*)));
+ connect(this, &KWalletManagerWidget::currentPageChanged, this, &KWalletManagerWidget::onCurrentPageChanged);
}
KWalletManagerWidget::~KWalletManagerWidget()
@@ -44,7 +43,7 @@
}
-void KWalletManagerWidget::onCurrentPageChanged(KPageWidgetItem* current, KPageWidgetItem* before)
+void KWalletManagerWidget::onCurrentPageChanged(KPageWidgetItem *current, KPageWidgetItem *before)
{
}
@@ -53,30 +52,30 @@
{
// NOTE: this method is called upon several kwalletd events
static bool alreadyUpdating = false;
- if (alreadyUpdating)
+ if (alreadyUpdating) {
return;
+ }
alreadyUpdating = true;
// find out pages corresponding to deleted wallets
const QStringList wl = KWallet::Wallet::walletList();
WalletPagesHash::iterator p = _walletPages.begin();
- while ( p != _walletPages.end() ) {
- if ( !wl.contains(p.key()) ) {
+ while (p != _walletPages.end()) {
+ if (!wl.contains(p.key())) {
// remove the page corresponding to the missing wallet
removePage(p.value());
p = _walletPages.erase(p);
- }
- else {
+ } else {
++p;
}
}
// add new wallets
for (QStringList::const_iterator i = wl.begin(); i != wl.end(); ++i) {
- const QString& name = *i;
- if ( !_walletPages.contains(name) ) {
+ const QString &name = *i;
+ if (!_walletPages.contains(name)) {
KWalletManagerWidgetItem *wi = new KWalletManagerWidgetItem(this, name);
- addPage( wi );
+ addPage(wi);
_walletPages.insert(*i, wi);
}
}
@@ -84,30 +83,29 @@
// update existing wallets display, e.g. icon
WalletPagesHash::const_iterator cp = _walletPages.constBegin();
WalletPagesHash::const_iterator cend = _walletPages.constEnd();
- for ( ; cp != cend; cp++ ) {
- cp.value()->updateWalletDisplay();
+ for (; cp != cend; cp++) {
+ cp.value()->updateWalletDisplay();
}
if (!selectWallet.isEmpty()) {
setCurrentPage(_walletPages[selectWallet]);
}
- setVisible(!KWallet::Wallet::walletList().isEmpty());
alreadyUpdating = false;
}
-bool KWalletManagerWidget::hasWallet(const QString& name) const
+bool KWalletManagerWidget::hasWallet(const QString &name) const
{
return _walletPages.contains(name);
}
-bool KWalletManagerWidget::openWalletFile(const QString& path)
+bool KWalletManagerWidget::openWalletFile(const QString &path)
{
Q_ASSERT(0);
// TODO: implement this method: add a new tab with an editor centered on a file
return false;
}
-bool KWalletManagerWidget::openWallet(const QString& name)
+bool KWalletManagerWidget::openWallet(const QString &name)
{
bool result = false;
if (_walletPages.contains(name)) {
@@ -118,25 +116,21 @@
return result;
}
-const QString KWalletManagerWidget::activeWalletName() const
+const QString &KWalletManagerWidget::activeWalletName() const
{
- if (currentPage()) {
- return qobject_cast<KWalletManagerWidgetItem*>(currentPage())->walletName();
- } else {
- return QString();
- }
+ return qobject_cast<KWalletManagerWidgetItem *>(currentPage())->walletName();
}
-void KWalletManagerWidget::dragEnterEvent(QDragEnterEvent* e)
+void KWalletManagerWidget::dragEnterEvent(QDragEnterEvent *e)
{
- if (e->provides("application/x-kwallet-wallet")) {
+ if (e->mimeData()->hasFormat("application/x-kwallet-wallet")) {
e->accept();
} else {
e->ignore();
}
}
-void KWalletManagerWidget::dragMoveEvent(QDragMoveEvent* e)
+void KWalletManagerWidget::dragMoveEvent(QDragMoveEvent *e)
{
qDebug("KWalletManagerWidget::dragMoveEvent");
// KUrl dummy;
@@ -148,7 +142,7 @@
// }
}
-void KWalletManagerWidget::dropEvent(QDropEvent* e)
+void KWalletManagerWidget::dropEvent(QDropEvent *e)
{
qDebug("KWalletManagerWidget::dropEvent");
// KUrl u;
@@ -157,7 +151,7 @@
// e->ignore();
// return;
// }
-//
+//
// if (!item) {
// // Not dropped over an item thus it is a wallet
// const QString dest = KGlobal::dirs()->saveLocation("kwallet") + u.fileName();
@@ -166,7 +160,7 @@
// e->ignore();
// return;
// }
-//
+//
// // FIXME: verify that it is a real wallet file first
// KIO::NetAccess::file_copy(u, KUrl(dest));
// e->accept();
@@ -180,19 +174,19 @@
// }
}
-bool KWalletManagerWidget::shouldIgnoreDropEvent(const QDropEvent* e, KUrl* u) const
+bool KWalletManagerWidget::shouldIgnoreDropEvent(const QDropEvent *e, QUrl *u) const
{
return false;
// if (e->source() == viewport()) {
// return true;
// }
-//
+//
// if (!e->provides("application/x-kwallet-folder") &&
// !e->provides("application/x-kwallet-wallet") &&
// !e->provides("text/uri-list")) {
// return true;
// }
-//
+//
// // Over wallets folders, over nothing wallets
// *item = itemAt(e->pos());
// const QByteArray edata = e->encodedData(item ? "application/x-kwallet-folder" : "application/x-kwallet-wallet");
@@ -200,8 +194,8 @@
// if (*u == KUrl()) {
// *u = decodeUrl(e->encodedData("text/uri-list"));
// }
-//
+//
// return *u == KUrl();
}
-#include "kwalletmanagerwidget.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanagerwidget.h
^
|
| @@ -22,22 +22,25 @@
#include <kpagewidget.h>
-class KUrl;
+class QUrl;
class QDropEvent;
class KWalletManagerWidgetItem;
+class QDragEnterEvent;
+class QDragMoveEvent;
-class KWalletManagerWidget : public KPageWidget {
+class KWalletManagerWidget : public KPageWidget
+{
Q_OBJECT
public:
- explicit KWalletManagerWidget(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+ explicit KWalletManagerWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
virtual ~KWalletManagerWidget();
void updateWalletDisplay(QString selectWallet = QString());
- bool hasWallet(const QString&) const;
- bool openWalletFile(const QString& path);
- bool openWallet(const QString& name);
+ bool hasWallet(const QString &) const;
+ bool openWalletFile(const QString &path);
+ bool openWallet(const QString &name);
- const QString activeWalletName() const;
+ const QString &activeWalletName() const;
protected:
virtual void dragEnterEvent(QDragEnterEvent *e);
@@ -45,12 +48,12 @@
virtual void dropEvent(QDropEvent *e);
private Q_SLOTS:
- void onCurrentPageChanged(KPageWidgetItem*,KPageWidgetItem*);
+ void onCurrentPageChanged(KPageWidgetItem *, KPageWidgetItem *);
private:
- bool shouldIgnoreDropEvent(const QDropEvent *e, KUrl *u) const;
+ bool shouldIgnoreDropEvent(const QDropEvent *e, QUrl *u) const;
- typedef QHash<QString, KWalletManagerWidgetItem*> WalletPagesHash;
+ typedef QHash<QString, KWalletManagerWidgetItem *> WalletPagesHash;
WalletPagesHash _walletPages;
};
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanagerwidgetitem.cpp
^
|
| @@ -22,10 +22,10 @@
#include "walletcontrolwidget.h"
#include <kwallet.h>
-#include <kicon.h>
+#include <QIcon>
-KWalletManagerWidgetItem::KWalletManagerWidgetItem(QWidget* widgetParent, const QString& walletName):
- KPageWidgetItem( _controlWidget = new WalletControlWidget(widgetParent, walletName), walletName ),
+KWalletManagerWidgetItem::KWalletManagerWidgetItem(QWidget *widgetParent, const QString &walletName):
+ KPageWidgetItem(_controlWidget = new WalletControlWidget(widgetParent, walletName), walletName),
_walletName(walletName)
{
updateWalletDisplay();
@@ -34,9 +34,9 @@
void KWalletManagerWidgetItem::updateWalletDisplay()
{
if (KWallet::Wallet::isOpen(_walletName)) {
- setIcon( KIcon( QLatin1String("wallet-open") ) );
+ setIcon(QIcon::fromTheme(QLatin1String("wallet-open")));
} else {
- setIcon( KIcon( QLatin1String("wallet-closed") ) );
+ setIcon(QIcon::fromTheme(QLatin1String("wallet-closed")));
}
_controlWidget->updateWalletDisplay();
}
@@ -46,4 +46,4 @@
return _controlWidget->openWallet();
}
-#include "kwalletmanagerwidgetitem.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwalletmanagerwidgetitem.h
^
|
| @@ -23,13 +23,17 @@
#include <kpagewidgetmodel.h>
class WalletControlWidget;
-class KWalletManagerWidgetItem : public KPageWidgetItem {
+class KWalletManagerWidgetItem : public KPageWidgetItem
+{
Q_OBJECT
public:
- KWalletManagerWidgetItem(QWidget* widgetParent, const QString& walletName);
+ KWalletManagerWidgetItem(QWidget *widgetParent, const QString &walletName);
void updateWalletDisplay();
- const QString& walletName() const { return _walletName; }
+ const QString &walletName() const
+ {
+ return _walletName;
+ }
bool openWallet();
private:
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwmapeditor.cpp
^
|
| @@ -18,228 +18,229 @@
*/
#include "kwmapeditor.h"
-#include <kaction.h>
+
+#include <qaction.h>
#include <kactioncollection.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <QIcon>
+#include <klocalizedstring.h>
+#include <QMenu>
#include <kstandardaction.h>
#include <kwindowsystem.h>
-#include <QPointer>
+#include <ktextedit.h>
+
#include <QApplication>
#include <QClipboard>
-#include <QToolButton>
-#include <ktextedit.h>
+#include <QDebug>
+#include <QItemDelegate>
#include <QFocusEvent>
#include <QKeyEvent>
-#include <QItemDelegate>
+#include <QPointer>
+#include <QToolButton>
-class InlineEditor : public KTextEdit {
- public:
- InlineEditor(KWMapEditor *p) : KTextEdit(), _p(p) {
- setAttribute(Qt::WA_DeleteOnClose);
- setWindowFlags(Qt::Widget | Qt::FramelessWindowHint);
- setCheckSpellingEnabled(false);
- connect(p, SIGNAL(destroyed()), SLOT(close()));
- }
-
- protected:
- virtual void focusOutEvent(QFocusEvent *e) {
- if (e->reason() == Qt::PopupFocusReason) {
- // TODO: It seems we only get here if we're disturbed
- // by our own popup. this needs some clearance though.
- return;
- }
-
- close();
- }
- virtual void keyPressEvent(QKeyEvent *e) {
- if (e->key() == Qt::Key_Escape) {
- e->accept();
- close();
- } else {
- e->ignore();
- KTextEdit::keyPressEvent(e);
- }
- }
- virtual void contextMenuEvent( QContextMenuEvent *event )
- {
- QMenu *menu = createStandardContextMenu();
- popup = menu;
- popup->exec( event->globalPos() );
- delete popup;
- }
- QPointer<KWMapEditor> _p;
- QPointer<QMenu> popup;
+class InlineEditor : public KTextEdit
+{
+public:
+ InlineEditor(KWMapEditor *p) : KTextEdit(), _p(p)
+ {
+ setAttribute(Qt::WA_DeleteOnClose);
+ setWindowFlags(Qt::Widget | Qt::FramelessWindowHint);
+ setCheckSpellingEnabled(false);
+ connect(p, SIGNAL(destroyed()), SLOT(close()));
+ }
+
+protected:
+ virtual void focusOutEvent(QFocusEvent *e)
+ {
+ if (e->reason() == Qt::PopupFocusReason) {
+ // TODO: It seems we only get here if we're disturbed
+ // by our own popup. this needs some clearance though.
+ return;
+ }
+
+ close();
+ }
+ virtual void keyPressEvent(QKeyEvent *e)
+ {
+ if (e->key() == Qt::Key_Escape) {
+ e->accept();
+ close();
+ } else {
+ e->ignore();
+ KTextEdit::keyPressEvent(e);
+ }
+ }
+ virtual void contextMenuEvent(QContextMenuEvent *event)
+ {
+ QMenu *menu = createStandardContextMenu();
+ popup = menu;
+ popup->exec(event->globalPos());
+ delete popup;
+ }
+ QPointer<KWMapEditor> _p;
+ QPointer<QMenu> popup;
};
class KWMapEditorDelegate : public QItemDelegate
{
- public:
- KWMapEditorDelegate(KWMapEditor *parent) : QItemDelegate(parent)
- {
- }
-
- QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const
- {
- if (index.column() != 2) {
- return QItemDelegate::createEditor(parentWidget, option, index);
- }
-
- KWMapEditor *mapEditor = static_cast<KWMapEditor*>(parent());
- return new InlineEditor(mapEditor);
- }
-
- void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
- {
- if (dynamic_cast<InlineEditor*>(editor))
- {
- KWMapEditor *mapEditor = static_cast<KWMapEditor*>(parent());
- const QRect geo = mapEditor->visualRect(index);
- editor->move(mapEditor->mapToGlobal(geo.topLeft()));
- editor->resize(geo.width() * 2, geo.height() * 3);
- }
- else
- {
- QItemDelegate::updateEditorGeometry(editor, option, index);
- }
- }
-
- void setEditorData(QWidget *editor, const QModelIndex &index) const
- {
- InlineEditor *e = dynamic_cast<InlineEditor*>(editor);
- if (e)
- {
- KWMapEditor *mapEditor = static_cast<KWMapEditor*>(parent());
- e->setText(mapEditor->item(index.row(), index.column())->text());
- }
- else
- {
- QItemDelegate::setEditorData(editor, index);
- }
- }
-
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
- {
- InlineEditor *e = dynamic_cast<InlineEditor*>(editor);
- if (e)
- {
- KWMapEditor *mapEditor = static_cast<KWMapEditor*>(parent());
- mapEditor->item(index.row(), index.column())->setText(e->toPlainText());
- }
- else
- {
- QItemDelegate::setModelData(editor, model, index);
- }
- }
+public:
+ KWMapEditorDelegate(KWMapEditor *parent) : QItemDelegate(parent)
+ {
+ }
+
+ QWidget *createEditor(QWidget *parentWidget, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ {
+ if (index.column() != 2) {
+ return QItemDelegate::createEditor(parentWidget, option, index);
+ }
+
+ KWMapEditor *mapEditor = static_cast<KWMapEditor *>(parent());
+ return new InlineEditor(mapEditor);
+ }
+
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ {
+ if (dynamic_cast<InlineEditor *>(editor)) {
+ KWMapEditor *mapEditor = static_cast<KWMapEditor *>(parent());
+ const QRect geo = mapEditor->visualRect(index);
+ editor->move(mapEditor->mapToGlobal(geo.topLeft()));
+ editor->resize(geo.width() * 2, geo.height() * 3);
+ } else {
+ QItemDelegate::updateEditorGeometry(editor, option, index);
+ }
+ }
+
+ void setEditorData(QWidget *editor, const QModelIndex &index) const
+ {
+ InlineEditor *e = dynamic_cast<InlineEditor *>(editor);
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/kwmapeditor.h
^
|
| @@ -24,35 +24,35 @@
#include <QTableWidget>
-class KAction;
class KActionCollection;
-class KWMapEditor : public QTableWidget {
- Q_OBJECT
-
- public:
- KWMapEditor(QMap<QString,QString>& map, QWidget *parent = 0);
- virtual ~KWMapEditor();
-
- public slots:
- void reload();
- void saveMap();
- void erase();
- void contextMenu(const QPoint& pos);
- void addEntry();
- void emitDirty();
-
- private slots:
- void copy();
-
- signals:
- void dirty();
-
- private:
- QMap<QString,QString>& _map;
- int _contextRow;
- KActionCollection *_ac;
- KAction *_copyAct;
+class KWMapEditor : public QTableWidget
+{
+ Q_OBJECT
+
+public:
+ KWMapEditor(QMap<QString, QString> &map, QWidget *parent = 0);
+ virtual ~KWMapEditor();
+
+public slots:
+ void reload();
+ void saveMap();
+ void erase();
+ void contextMenu(const QPoint &pos);
+ void addEntry();
+ void emitDirty();
+
+private slots:
+ void copy();
+
+signals:
+ void dirty();
+
+private:
+ QMap<QString, QString> &_map;
+ int _contextRow;
+ KActionCollection *_ac;
+ QAction *_copyAct;
};
#endif
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/main.cpp
^
|
| @@ -17,82 +17,65 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmimetype.h>
-#include <kstandarddirs.h>
-#include <kuniqueapplication.h>
+#include "kwalletmanager.h"
+
+#include <KDBusAddons/kdbusservice.h>
+#include <klocalizedstring.h>
+#include <QApplication>
+#include <QCommandLineParser>
#include <QFile>
#include <QFileInfo>
+#include <QMimeDatabase>
+#include <QMimeType>
-#include "kwalletmanager.h"
-
+int main(int argc, char **argv)
+{
+ QApplication a(argc, argv);
+
+ QCoreApplication::setApplicationName("kwalletmanager5");
+ QCoreApplication::setApplicationVersion("3.0");
+ QCoreApplication::setOrganizationName("KDE");
+ QCoreApplication::setOrganizationDomain("kde.org");
+ QApplication::setApplicationDisplayName(i18n("Wallet Manager"));
+
+ KDBusService dbssvc(KDBusService::Unique);
+
+ QCommandLineParser parser;
+ parser.addHelpOption();
+ parser.addVersionOption();
+
+ parser.addOption(QCommandLineOption("show", i18n("Show window on startup")));
+ parser.addOption(QCommandLineOption("kwalletd", i18n("For use by kwalletd only")));
+ parser.addOption(QCommandLineOption("name", i18n("A wallet name")));
+
+ parser.process(a);
+ KWalletManager wm;
+ QObject::connect(&dbssvc, &KDBusService::activateRequested, &wm, &QWidget::activateWindow);
+
+ if (parser.isSet("show")) {
+ wm.show();
+ }
+
+ if (parser.isSet("kwalletd")) {
+ wm.kwalletdLaunch();
+ }
+
+ const QStringList arguments = parser.positionalArguments();
+ for (int i = 1; i < arguments.count(); ++i) {
+ QString fn = QFileInfo(arguments.at(i)).absoluteFilePath();
+ if (QFile::exists(fn)) {
+ QMimeDatabase mimeDb;
+ QMimeType mt = mimeDb.mimeTypeForFile(fn, QMimeDatabase::MatchContent);
+
+ if (mt.isValid() && mt.inherits(QLatin1String("application/x-kwallet"))) {
+ wm.openWalletFile(fn);
+ }
+ } else {
+ wm.openWallet(arguments.at(i));
+ }
+ }
-class MyApp : public KUniqueApplication {
- public:
- MyApp() : KUniqueApplication() { KGlobal::ref(); }
- virtual ~MyApp() {}
-
- virtual int newInstance() { return 0; }
-};
-
-int main(int argc, char **argv) {
- 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("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");
-
- KCmdLineArgs::init(argc, argv, &about);
-
- KCmdLineOptions options;
- options.add("show", ki18n("Show window on startup"));
- options.add("kwalletd", ki18n("For use by kwalletd only"));
- options.add("+name", ki18n("A wallet name"));
- KCmdLineArgs::addCmdLineOptions(options);
-
- if (!KUniqueApplication::start()) {
- return 0;
- }
-
- MyApp a;
-
- KWalletManager wm;
- wm.setCaption(i18n("KDE Wallet Manager"));
-
- KGlobal::dirs()->addResourceType("kwallet", 0, QLatin1String( "share/apps/kwallet" ));
-
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- if (args->isSet("show")) {
- wm.show();
- }
-
- if (args->isSet("kwalletd")) {
- wm.kwalletdLaunch();
- }
-
- for (int i = 0; i < args->count(); ++i) {
- QString fn = QFileInfo(args->arg(i)).absoluteFilePath();
- KMimeType::Ptr ptr;
- if (QFile::exists(fn) &&
- (ptr = KMimeType::findByFileContent(fn)) &&
- ptr->is(QLatin1String( "application/x-kwallet" ))) {
- wm.openWalletFile(fn);
- } else {
- wm.openWallet(args->arg(i));
- }
- }
- args->clear();
- return a.exec();
+ return a.exec();
}
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/registercreateactionmethod.cpp
^
|
| @@ -17,23 +17,20 @@
Boston, MA 02110-1301, USA.
*/
-
#include "registercreateactionmethod.h"
-#include <kglobal.h>
-
-K_GLOBAL_STATIC(std::list<RegisterCreateActionsMethod::CreateActionsMethod>, createActionMethodList)
+Q_GLOBAL_STATIC(std::list<RegisterCreateActionsMethod::CreateActionsMethod>, createActionMethodList)
RegisterCreateActionsMethod::RegisterCreateActionsMethod(RegisterCreateActionsMethod::CreateActionsMethod method)
{
createActionMethodList->push_back(method);
}
-void RegisterCreateActionsMethod::createActions(KActionCollection* actionCollection)
+void RegisterCreateActionsMethod::createActions(KActionCollection *actionCollection)
{
std::list<CreateActionsMethod>::const_iterator it = createActionMethodList->begin();
std::list<CreateActionsMethod>::const_iterator end = createActionMethodList->end();
- for ( ; it != end; it++ ) {
+ for (; it != end; it++) {
(*it)(actionCollection);
}
}
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/registercreateactionmethod.h
^
|
| @@ -37,9 +37,10 @@
* To avoid that, the main window will call createActions of this class that will
* in turn delegate to the registered CreateActionsMethod's registered here.
*/
-class RegisterCreateActionsMethod {
+class RegisterCreateActionsMethod
+{
public:
- typedef void (*CreateActionsMethod)(KActionCollection*);
+ typedef void (*CreateActionsMethod)(KActionCollection *);
RegisterCreateActionsMethod(CreateActionsMethod method);
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/revokeauthbutton.cpp
^
|
| @@ -20,14 +20,14 @@
#include "revokeauthbutton.h"
#include <klocalizedstring.h>
-RevokeAuthButton::RevokeAuthButton(const QString& appName, KWallet::Wallet* wallet):
+RevokeAuthButton::RevokeAuthButton(const QString &appName, KWallet::Wallet *wallet):
QPushButton(),
_appName(appName),
_wallet(wallet)
{
setObjectName(QString("Revoke_%1").arg(appName));
setText(i18n("Revoke Authorization"));
- connect(this, SIGNAL(clicked(bool)), this, SLOT(onClicked()));
+ connect(this, &RevokeAuthButton::clicked, this, &RevokeAuthButton::onClicked);
}
void RevokeAuthButton::onClicked()
@@ -35,4 +35,4 @@
emit appRevoked(_appName);
}
-#include "revokeauthbutton.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/revokeauthbutton.h
^
|
| @@ -22,7 +22,8 @@
#include <QPushButton>
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
@@ -30,7 +31,7 @@
{
Q_OBJECT
public:
- RevokeAuthButton(const QString& appName, KWallet::Wallet *wallet);
+ RevokeAuthButton(const QString &appName, KWallet::Wallet *wallet);
private Q_SLOTS:
void onClicked();
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/walletcontrolwidget.cpp
^
|
| @@ -21,18 +21,20 @@
#include "kwalleteditor.h"
#include "applicationsmanager.h"
+#include <klocalizedstring.h>
+#include <kmessagebox.h>
+#include <qmenu.h>
+#include <QTabWidget>
+#include <kwallet.h>
+
+#include <QDebug>
+#include <QEvent>
+#include <QFrame>
#include <QPropertyAnimation>
#include <QTimer>
-#include <QFrame>
#include <QToolButton>
-#include <qevent.h>
-#include <kwallet.h>
-#include <kmessagebox.h>
-#include <kmenu.h>
-#include <KTabWidget>
-#include <kdebug.h>
-WalletControlWidget::WalletControlWidget(QWidget* parent, const QString& walletName):
+WalletControlWidget::WalletControlWidget(QWidget *parent, const QString &walletName):
QWidget(parent),
_walletName(walletName),
_wallet(0),
@@ -64,13 +66,13 @@
if (0 == _wallet) {
_wallet = KWallet::Wallet::openWallet(_walletName, effectiveWinId());
if (0 == _wallet) {
- kDebug() << "Weird situation: wallet could not be opened when setting-up the widget.";
+ qDebug() << "Weird situation: wallet could not be opened when setting-up the widget.";
}
}
}
if (_wallet) {
- connect(_wallet, SIGNAL(walletClosed()), this, SLOT(onWalletClosed()));
+ connect(_wallet, &KWallet::Wallet::walletClosed, this, &WalletControlWidget::onWalletClosed);
_openClose->setText(i18n("&Close"));
if (0 == _walletEditor) {
@@ -89,13 +91,13 @@
_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));
+ _tabs->setTabIcon(0, QIcon::fromTheme(QLatin1String("wallet-open")).pixmap(16));
} else {
_openClose->setText(i18n("&Open..."));
if (_walletEditor) {
_walletEditor->setVisible(false);
- delete _walletEditor, _walletEditor =0;
+ delete _walletEditor, _walletEditor = 0;
}
if (_applicationsManager) {
@@ -104,7 +106,7 @@
}
_changePassword->setEnabled(false);
_stateLabel->setText(i18n("The wallet is currently closed"));
- _tabs->setTabIcon(0, QIcon::fromTheme( QLatin1String("wallet-closed")).pixmap(16));
+ _tabs->setTabIcon(0, QIcon::fromTheme(QLatin1String("wallet-closed")).pixmap(16));
}
}
@@ -147,7 +149,7 @@
// for ( ; i != ie; i++ ) {
// _disconnect->removeAction(*i);
// }
-//
+//
}
void WalletControlWidget::onDisconnectApplication()
@@ -164,12 +166,12 @@
KWallet::Wallet::changePassword(_walletName, effectiveWinId());
}
-void WalletControlWidget::hideEvent(QHideEvent* )
+void WalletControlWidget::hideEvent(QHideEvent *)
{
}
-void WalletControlWidget::showEvent(QShowEvent* ev)
+void WalletControlWidget::showEvent(QShowEvent *ev)
{
}
-#include "walletcontrolwidget.moc"
+
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/walletcontrolwidget.h
^
|
| @@ -24,15 +24,16 @@
class KWalletEditor;
class ApplicationsManager;
-namespace KWallet {
+namespace KWallet
+{
class Wallet;
}
-class WalletControlWidget : public QWidget, public Ui::WalletControlWidget
+class WalletControlWidget : public QWidget, public Ui::WalletControlWidget
{
Q_OBJECT
public:
- WalletControlWidget(QWidget* parent, const QString& walletName);
+ WalletControlWidget(QWidget *parent, const QString &walletName);
bool openWallet();
@@ -45,14 +46,14 @@
void onChangePassword();
protected:
- virtual void hideEvent(QHideEvent*);
- virtual void showEvent(QShowEvent*);
+ virtual void hideEvent(QHideEvent *);
+ virtual void showEvent(QShowEvent *);
private:
QString _walletName;
- KWallet::Wallet* _wallet;
- KWalletEditor* _walletEditor;
- ApplicationsManager* _applicationsManager;
+ KWallet::Wallet *_wallet;
+ KWalletEditor *_walletEditor;
+ ApplicationsManager *_applicationsManager;
};
#endif // WALLETCONTROLWIDGET_H
|
|
[-]
[+]
|
Changed |
kwalletmanager-5.3.0.tar.xz/src/manager/walletwidget.ui
^
|
| @@ -323,7 +323,7 @@
</spacer>
</item>
<item>
- <widget class="KPushButton" name="_undoChanges">
+ <widget class="QPushButton" name="_undoChanges">
<property name="enabled">
<bool>false</bool>
</property>
@@ -333,7 +333,7 @@
</widget>
</item>
<item>
- <widget class="KPushButton" name="_saveChanges">
+ <widget class="QPushButton" name="_saveChanges">
<property name="enabled">
<bool>false</bool>
</property>
@@ -352,18 +352,12 @@
</widget>
<customwidgets>
<customwidget>
- <class>KPushButton</class>
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
- </customwidget>
- <customwidget>
<class>KSqueezedTextLabel</class>
<extends>QLabel</extends>
<header>ksqueezedtextlabel.h</header>
</customwidget>
</customwidgets>
<includes>
- <include location="global">kdialog.h</include>
<include location="global">kiconloader.h</include>
</includes>
<resources/>
|
