From 827a7104cebace94802dc479e2f3ae7564a99469 Mon Sep 17 00:00:00 2001 From: Lukas Vogel Date: Fri, 16 Mar 2018 09:27:27 +0100 Subject: More refactorings, contributes to #107 * Split datahelpers.h to userinfo.h and passwordconfiguration.h * Rename passwordConfiguration to PasswordConfiguration * Move some code to separate methods in MainWindow * Handle PasswordConfiguration in QtPassSettings and in ConfigDialog --- localization/localization_ar_MA.ts | 82 +++++++++++++-------------- localization/localization_ca.ts | 82 +++++++++++++-------------- localization/localization_cs_CZ.ts | 82 +++++++++++++-------------- localization/localization_de_DE.ts | 82 +++++++++++++-------------- localization/localization_de_LU.ts | 82 +++++++++++++-------------- localization/localization_el_GR.ts | 82 +++++++++++++-------------- localization/localization_en_GB.ts | 82 +++++++++++++-------------- localization/localization_en_US.ts | 82 +++++++++++++-------------- localization/localization_es_ES.ts | 82 +++++++++++++-------------- localization/localization_fr_BE.ts | 82 +++++++++++++-------------- localization/localization_fr_FR.ts | 82 +++++++++++++-------------- localization/localization_fr_LU.ts | 82 +++++++++++++-------------- localization/localization_gl_ES.ts | 82 +++++++++++++-------------- localization/localization_he_IL.ts | 82 +++++++++++++-------------- localization/localization_hu_HU.ts | 82 +++++++++++++-------------- localization/localization_it_IT.ts | 82 +++++++++++++-------------- localization/localization_lb_LU.ts | 82 +++++++++++++-------------- localization/localization_nl_BE.ts | 82 +++++++++++++-------------- localization/localization_nl_NL.ts | 82 +++++++++++++-------------- localization/localization_pl_PL.ts | 82 +++++++++++++-------------- localization/localization_pt_PT.ts | 82 +++++++++++++-------------- localization/localization_ru_RU.ts | 82 +++++++++++++-------------- localization/localization_sv_SE.ts | 82 +++++++++++++-------------- localization/localization_zh_CN.ts | 82 +++++++++++++-------------- src/configdialog.cpp | 77 ++++++------------------- src/configdialog.h | 9 +-- src/datahelpers.h | 96 -------------------------------- src/mainwindow.cpp | 111 ++++++++++++++----------------------- src/mainwindow.h | 16 ++---- src/pass.h | 2 +- src/passwordconfiguration.h | 41 ++++++++++++++ src/passworddialog.cpp | 5 +- src/passworddialog.h | 6 +- src/qtpasssettings.cpp | 44 +++++++++++---- src/qtpasssettings.h | 12 ++-- src/src.pro | 5 +- src/userinfo.h | 61 ++++++++++++++++++++ src/usersdialog.h | 2 +- tests/auto/ui/tst_ui.cpp | 15 ++--- tests/auto/ui/ui.pro | 3 +- 40 files changed, 1211 insertions(+), 1262 deletions(-) delete mode 100644 src/datahelpers.h create mode 100644 src/passwordconfiguration.h create mode 100644 src/userinfo.h diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index cc8e950a..b8aa3c13 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -516,14 +516,14 @@ Expire-Date: 0 - + Edit - + Delete @@ -554,7 +554,7 @@ Expire-Date: 0 - + Users @@ -596,123 +596,123 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + New Folder: (Will be placed in %1 ) - + Add Password - + Add Folder - + Content hidden - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError - + Looking for: %1 - - + + New file - + Delete password? - + Delete folder? @@ -722,64 +722,64 @@ p, li { white-space: pre-wrap; } - - + + Password - + New password file: (Will be placed in %1 ) - + Are you sure you want to delete %1%2? - + and whole content - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Add folder - + Add password - + Copied to clipboard diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index 8a1fb060..34096c30 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -537,14 +537,14 @@ Expire-Date: 0 - + Edit Edita - + Delete Suprimeix @@ -575,7 +575,7 @@ Expire-Date: 0 - + Users Usuaris @@ -629,49 +629,49 @@ p, li { white-space: pre-wrap; } Benvingut a QtPass %1 - + Add Password Afegeix una contrasenya - + Add Folder Afegeix una carpeta - + Failed to connect WebDAV: Ha fallat la connexió a WebDAV: - + QtPass WebDAV password Contrasenya de WebDAV de QtPass - + Enter password to connect to WebDAV: Introduïu la contrasenya per connectar a WebDAV: - + fusedav exited unexpectedly fusedav ha sortit inesperadament - + Failed to start fusedav to connect WebDAV: Ha fallat l'inici de fusedav per connectar a WebDAV: - - + + Updating password-store Actualització del magatzem de contrasenyes @@ -688,81 +688,81 @@ p, li { white-space: pre-wrap; } S'ha ocultat la contrasenya - + Content hidden S'ha ocultat la contingut - - + + Password Contrasenya - + Clipboard cleared S'ha netejat el porta-retalls - + Clipboard not cleared No s'ha netejat el porta-retalls - + Password and Content hidden S'ha ocultat el porta-retalls i la contrasenya - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError - + Looking for: %1 Cerca de: %1 - - + + New file Fitxer nou - + New password file: (Will be placed in %1 ) Fitxer de contrasenyes nou: (s'ubicarà a %1 ) - + Delete password? Suprimir la contrasenya? @@ -771,64 +771,64 @@ p, li { white-space: pre-wrap; } Esteu segur que voleu suprimir %1? - + Delete folder? Suprimir la carpeta? - + Are you sure you want to delete %1%2? Esteu segur que voleu suprimir %1%2? - + and whole content i tot el contingut - + Can not get key list No es pot obtenir la llista de claus - + Unable to get list of available gpg keys No es pot obtenir la llista de claus gpg disponibles - + Key not found in keyring No s'ha trobat la clau a l'anell de claus - + Generating GPG key pair Generació del parell de claus GPG - + Profile changed to %1 S'ha canviat el perfil a %1 - + Add folder Afegeix una carpeta - + Add password Afegeix una contrasenya - + New Folder: (Will be placed in %1 ) Carpeta nova: (s'ubicarà a %1 ) - + Copied to clipboard S'ha copiat al porta-retalls diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 1e266421..ea4e2524 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -537,14 +537,14 @@ Expire-Date: 0 - + Edit Upravit - + Delete Smazat @@ -575,7 +575,7 @@ Expire-Date: 0 - + Users Uživatelé @@ -622,49 +622,49 @@ p, li { white-space: pre-wrap; } Vítejte v QtPass %1 - + Add Password Přidat heslo - + Add Folder Přidat adresář - + Failed to connect WebDAV: Selhalo připojení k WebDAV: - + QtPass WebDAV password QtPass WebDAV heslo - + Enter password to connect to WebDAV: Vložte heslo pro připojení k WebDAV: - + fusedav exited unexpectedly fusedav neočekávaně skončil - + Failed to start fusedav to connect WebDAV: Selhalo spuštění fusedav pro připojení k WebDAV: - - + + Updating password-store Aktualizace úložiště hesel @@ -681,81 +681,81 @@ p, li { white-space: pre-wrap; } Skryté heslo - + Content hidden Skrytý obsah - - + + Password Heslo - + Clipboard cleared Schránka vymazána - + Clipboard not cleared Schránka nevymazána - + Password and Content hidden Skryté heslo i obsah - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError - + Looking for: %1 Vyhledávání: %1 - - + + New file Nový soubor - + New password file: (Will be placed in %1 ) Nový soubor s heslem: (Bude uložen do %1 ) - + Delete password? Smazat heslo? @@ -764,64 +764,64 @@ p, li { white-space: pre-wrap; } Opravdu chcete smazat %1? - + Delete folder? Smazat adresář? - + Are you sure you want to delete %1%2? Opravdu chcete smazat %1? {1%2??} - + and whole content - + Can not get key list Nelze získat seznam klíčů - + Unable to get list of available gpg keys Nelze získat seznam dostupných gpg klíčů - + Key not found in keyring Klíč nebyl v klíčence nalezen - + Generating GPG key pair Generování páru GPG klíčů - + Profile changed to %1 Profil změněn na %1 - + Add folder Přidat adresář - + Add password Přidat heslo - + New Folder: (Will be placed in %1 ) Nový adresář: (Bude umístěn do %1 ) - + Copied to clipboard zkopírovat do schránky diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 0388636a..39743baf 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -525,14 +525,14 @@ Expire-Date: 0 - + Edit Ändern - + Delete Löschen @@ -563,7 +563,7 @@ Expire-Date: 0 - + Users Benutzer @@ -605,57 +605,57 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Passwort Speicher aktualisieren - + Clipboard cleared Zwischenablage gelöscht - + New Folder: (Will be placed in %1 ) Neuer Ordner: (Wird in %1 platziert werden) - + Failed to connect WebDAV: Verbindung zu WebDAV fehlgeschlagen: - + Add Password Passwort Hinzufügen - + Add Folder Ordner Hinzufügen - + QtPass WebDAV password QtPass WebDAV Passwort - + Enter password to connect to WebDAV: Passwort für WebDAV eingeben: - + fusedav exited unexpectedly Unerwarteter Abbruch durch fusedav - + Failed to start fusedav to connect WebDAV: fusedav konnte nicht gestartet werden, WebDav Verbindung fehlgeschlagen: @@ -665,78 +665,78 @@ p, li { white-space: pre-wrap; } Passwort ausgeblendet - + Content hidden Inhalt ausgeblendet - - + + Password Passwort - + Clipboard not cleared Zwischenablage nicht geleert - + Password and Content hidden Password und Inhalt ausgeblendet - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError - + Are you sure you want to delete %1%2? Sind Sie sicher, dass Sie %1%2 löschen wollen? - + and whole content und einhalt - + Copied to clipboard in Zwischenablage kopiert - + Add folder Ordner hinzufügen - + Add password Passwort hinzufügen @@ -746,7 +746,7 @@ p, li { white-space: pre-wrap; } Willkommen bei QtPass %1 - + Looking for: %1 Suche nach: %1 @@ -755,13 +755,13 @@ p, li { white-space: pre-wrap; } Ändern nicht möglich - - + + New file Neue Datei - + Delete password? Passwort löschen? @@ -770,7 +770,7 @@ p, li { white-space: pre-wrap; } Sind Sie sicher, dass Sie %1 löschen wollen? - + Delete folder? Ordner löschen? @@ -779,7 +779,7 @@ p, li { white-space: pre-wrap; } Gewählte Passwort-Datei existiert nicht, Änderung nicht möglich - + New password file: (Will be placed in %1 ) @@ -787,27 +787,27 @@ Neues Passwort-Datei: (Wird in %1 platziert werden) - + Can not get key list Schlüssel-Liste nicht gefunden - + Unable to get list of available gpg keys gpg Schlüssel-Liste konnte nicht gefunden werden - + Key not found in keyring Schlüssel nicht in Keyring gefunden - + Generating GPG key pair GPG Schlüssel-Paar wird generiert - + Profile changed to %1 Profil geändert zu %1 diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index d6f872b5..6ebe7c63 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -524,14 +524,14 @@ Expire-Date: 0 - + Edit Ändern - + Delete Löschen @@ -562,7 +562,7 @@ Expire-Date: 0 - + Users Benutzer @@ -604,57 +604,57 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Password Store aktualisieren - + Clipboard cleared Zwischenablage gelöscht - + New Folder: (Will be placed in %1 ) Neuer Ordner: (Wird in %1 platziert werden) - + Failed to connect WebDAV: Verbindung zu WebDAV fehlgeschlagen: - + Add Password Kennwort Hinzufügen - + Add Folder Ordner Hinzufügen - + QtPass WebDAV password QtPass WebDAV Passwort - + Enter password to connect to WebDAV: Passwort für WebDAV eingeben: - + fusedav exited unexpectedly Unerwarteter Abbruch durch fusedav - + Failed to start fusedav to connect WebDAV: fusedav konnte nicht gestartet werden, WebDav Verbindung fehlgeschlagen: @@ -664,78 +664,78 @@ p, li { white-space: pre-wrap; } Passwort ausgeblendet - + Content hidden Inhalt ausgeblendet - - + + Password Passwort - + Clipboard not cleared Zwischenablage nicht geleert - + Password and Content hidden Password und Inhalt ausgeblendet - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError - + Are you sure you want to delete %1%2? Sind Sie sicher, dass Sie %1 löschen wollen? {1%2??} - + and whole content - + Copied to clipboard in Zwischenablage kopiert - + Add folder Ordner hinzufügen - + Add password Passwort hinzufügen @@ -745,7 +745,7 @@ p, li { white-space: pre-wrap; } Wilkommen bei QtPass %1 - + Looking for: %1 Suche nach: %1 @@ -754,13 +754,13 @@ p, li { white-space: pre-wrap; } Ändern nicht möglich - - + + New file Neue Datei - + Delete password? Passwort löschen? @@ -769,7 +769,7 @@ p, li { white-space: pre-wrap; } Sind Sie sicher, dass Sie %1 löschen wollen? - + Delete folder? Ordner löschen? @@ -778,7 +778,7 @@ p, li { white-space: pre-wrap; } Gewählte Passwort-Datei existiert nicht, Änderung nicht möglich - + New password file: (Will be placed in %1 ) @@ -786,27 +786,27 @@ Neues Passwort-Datei: (Wird in %1 platziert werden) - + Can not get key list Schlüssel-Liste nicht gefunden - + Unable to get list of available gpg keys gpg Schlüssel-Liste konnte nicht gefunden werden - + Key not found in keyring Schlüssel nicht in Keyring gefunden - + Generating GPG key pair GPG Schlüssel-Paar wird generiert - + Profile changed to %1 Profil geändert zu %1 diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index a71ce14a..3a37fe03 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -516,14 +516,14 @@ Expire-Date: 0 - + Edit - + Delete @@ -554,7 +554,7 @@ Expire-Date: 0 - + Users @@ -601,185 +601,185 @@ p, li { white-space: pre-wrap; } - + Add Password - + Add Folder - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: