diff options
author | Lukas Vogel <lukedirtwalker@gmail.com> | 2018-03-16 09:27:27 +0100 |
---|---|---|
committer | Lukas Vogel <lukedirtwalker@gmail.com> | 2018-03-16 10:44:39 +0100 |
commit | 827a7104cebace94802dc479e2f3ae7564a99469 (patch) | |
tree | 2d50d03f111bcd44384e14adfa62f10b4a77624d | |
parent | 81f93a25e7db9b511ecf0d0ff45f3fb6435ae96e (diff) |
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
39 files changed, 1150 insertions, 1201 deletions
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 <message> <location filename="../src/mainwindow.ui" line="72"/> <location filename="../src/mainwindow.ui" line="75"/> - <location filename="../src/mainwindow.cpp" line="1289"/> + <location filename="../src/mainwindow.cpp" line="1264"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/mainwindow.ui" line="90"/> <location filename="../src/mainwindow.ui" line="93"/> - <location filename="../src/mainwindow.cpp" line="1301"/> + <location filename="../src/mainwindow.cpp" line="1276"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -554,7 +554,7 @@ Expire-Date: 0 </message> <message> <location filename="../src/mainwindow.ui" line="179"/> - <location filename="../src/mainwindow.cpp" line="1283"/> + <location filename="../src/mainwindow.cpp" line="1258"/> <source>Users</source> <translation type="unfinished"></translation> </message> @@ -596,123 +596,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="195"/> + <location filename="../src/mainwindow.cpp" line="183"/> <source>Failed to connect WebDAV: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="208"/> + <location filename="../src/mainwindow.cpp" line="196"/> <source>QtPass WebDAV password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="209"/> + <location filename="../src/mainwindow.cpp" line="197"/> <source>Enter password to connect to WebDAV:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="225"/> + <location filename="../src/mainwindow.cpp" line="213"/> <source>fusedav exited unexpectedly </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="229"/> + <location filename="../src/mainwindow.cpp" line="217"/> <source>Failed to start fusedav to connect WebDAV: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="514"/> - <location filename="../src/mainwindow.cpp" line="526"/> + <location filename="../src/mainwindow.cpp" line="452"/> + <location filename="../src/mainwindow.cpp" line="464"/> <source>Updating password-store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1329"/> + <location filename="../src/mainwindow.cpp" line="1304"/> <source>New Folder: (Will be placed in %1 )</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="81"/> + <location filename="../src/mainwindow.cpp" line="565"/> <source>Add Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="82"/> + <location filename="../src/mainwindow.cpp" line="566"/> <source>Add Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="643"/> + <location filename="../src/mainwindow.cpp" line="596"/> <source>Content hidden</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="744"/> + <location filename="../src/mainwindow.cpp" line="697"/> <source>Clipboard cleared</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="746"/> + <location filename="../src/mainwindow.cpp" line="699"/> <source>Clipboard not cleared</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="761"/> + <location filename="../src/mainwindow.cpp" line="714"/> <source>Password and Content hidden</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="812"/> + <location filename="../src/mainwindow.cpp" line="787"/> <source>QProcess::FailedToStart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="815"/> + <location filename="../src/mainwindow.cpp" line="790"/> <source>QProcess::Crashed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="818"/> + <location filename="../src/mainwindow.cpp" line="793"/> <source>QProcess::Timedout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="821"/> + <location filename="../src/mainwindow.cpp" line="796"/> <source>QProcess::ReadError</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="824"/> + <location filename="../src/mainwindow.cpp" line="799"/> <source>QProcess::WriteError</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="827"/> + <location filename="../src/mainwindow.cpp" line="802"/> <source>QProcess::UnknownError</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="848"/> + <location filename="../src/mainwindow.cpp" line="823"/> <source>Looking for: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="939"/> - <location filename="../src/mainwindow.cpp" line="1328"/> + <location filename="../src/mainwindow.cpp" line="914"/> + <location filename="../src/mainwindow.cpp" line="1303"/> <source>New file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="969"/> + <location filename="../src/mainwindow.cpp" line="944"/> <source>Delete password?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="969"/> + <location filename="../src/mainwindow.cpp" line="944"/> <source>Delete folder?</source> <translation type="unfinished"></translation> </message> @@ -722,64 +722,64 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="647"/> - <location filename="../src/mainwindow.cpp" line="1429"/> + <location filename="../src/mainwindow.cpp" line="600"/> + <location filename="../src/mainwindow.cpp" line="1404"/> <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="940"/> + <location filename="../src/mainwindow.cpp" line="915"/> <source>New password file: (Will be placed in %1 )</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="970"/> + <location filename="../src/mainwindow.cpp" line="945"/> <source>Are you sure you want to delete %1%2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="972"/> + <location filename="../src/mainwindow.cpp" line="947"/> <source> and whole content</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1005"/> + <location filename="../src/mainwindow.cpp" line="980"/> <source>Can not get key list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1006"/> + <location filename="../src/mainwindow.cpp" line="981"/> <source>Unable to get list of available gpg keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1039"/> + <location filename="../src/mainwindow.cpp" line="1014"/> <source>Key not found in keyring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1113"/> + <location filename="../src/mainwindow.cpp" line="1088"/> <source>Generating GPG key pair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1155"/> + <location filename="../src/mainwindow.cpp" line="1130"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1281"/> + <location filename="../src/mainwindow.cpp" line="1256"/> <source>Add folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1282"/> + <location filename="../src/mainwindow.cpp" line="1257"/> <source>Add password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1378"/> + <location filename="../src/mainwindow.cpp" line="1353"/> <source>Copied to clipboard</source> <translation type="unfinished"></translation> </message> 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 <message> <location filename="../src/mainwindow.ui" line="72"/> <location filename="../src/mainwindow.ui" line="75"/> - <location filename="../src/mainwindow.cpp" line="1289"/> + <location filename="../src/mainwindow.cpp" line="1264"/> <source>Edit</source> <translation>Edita</translation> </message> <message> <location filename="../src/mainwindow.ui" line="90"/> <location filename="../src/mainwindow.ui" line="93"/> - <location filename="../src/mainwindow.cpp" line="1301"/> + <location filename="../src/mainwindow.cpp" line="1276"/> <source>Delete</source> <translation>Suprimeix</translation> </message> @@ -575,7 +575,7 @@ Expire-Date: 0 </message> <message> <location filename="../src/mainwindow.ui" line="179"/> - <location filename="../src/mainwindow.cpp" line="1283"/> + <location filename="../src/mainwindow.cpp" line="1258"/> <source>Users</source> <translation>Usuaris</translation> </message> @@ -629,49 +629,49 @@ p, li { white-space: pre-wrap; } <translation>Benvingut a QtPass %1</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="81"/> + <location filename="../src/mainwindow.cpp" line="565"/> <source>Add Password</source> <translation>Afegeix una contrasenya</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="82"/> + <location filename="../src/mainwindow.cpp" line="566"/> <source>Add Folder</source> <translation>Afegeix una carpeta</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="195"/> + <location filename="../src/mainwindow.cpp" line="183"/> <source>Failed to connect WebDAV: </source> <translation>Ha fallat la connexió a WebDAV: </translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="208"/> + <location filename="../src/mainwindow.cpp" line="196"/> <source>QtPass WebDAV password</source> <translation>Contrasenya de WebDAV de QtPass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="209"/> + <location filename="../src/mainwindow.cpp" line="197"/> <source>Enter password to connect to WebDAV:</source> <translation>Introduïu la contrasenya per connectar a WebDAV:</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="225"/> + <location filename="../src/mainwindow.cpp" line="213"/> <source>fusedav exited unexpectedly </source> <translation>fusedav ha sortit inesperadament </translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="229"/> + <location filename="../src/mainwindow.cpp" line="217"/> <source>Failed to start fusedav to connect WebDAV: </source> <translation>Ha fallat l'inici de fusedav per connectar a WebDAV: </translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="514"/> - <location filename="../src/mainwindow.cpp" line="526"/> + <location filename="../src/mainwindow.cpp" line="452"/> + <location filename="../src/mainwindow.cpp" line="464"/> <source>Updating password-store</source> <translation>Actualització del magatzem de contrasenyes</translation> </message> @@ -688,81 +688,81 @@ p, li { white-space: pre-wrap; } <translation type="vanished">S'ha ocultat la contrasenya</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="643"/> + <location filename="../src/mainwindow.cpp" line="596"/> <source>Content hidden</source> <translation>S'ha ocultat la contingut</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="647"/> - <location filename="../src/mainwindow.cpp" line="1429"/> + <location filename="../src/mainwindow.cpp" line="600"/> + <location filename="../src/mainwindow.cpp" line="1404"/> <source>Password</source> <translation>Contrasenya</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="744"/> + <location filename="../src/mainwindow.cpp" line="697"/> <source>Clipboard cleared</source> <translation>S'ha netejat el porta-retalls</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="746"/> + <location filename="../src/mainwindow.cpp" line="699"/> <source>Clipboard not cleared</source> <translation>No s'ha netejat el porta-retalls</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="761"/> + <location filename="../src/mainwindow.cpp" line="714"/> <source>Password and Content hidden</source> <translation>S'ha ocultat el porta-retalls i la contrasenya</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="812"/> + <location filename="../src/mainwindow.cpp" line="787"/> <source>QProcess::FailedToStart</source> <translation>QProcess::FailedToStart</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="815"/> + <location filename="../src/mainwindow.cpp" line="790"/> <source>QProcess::Crashed</source> <translation>QProcess::Crashed</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="818"/> + <location filename="../src/mainwindow.cpp" line="793"/> <source>QProcess::Timedout</source> <translation>QProcess::Timedout</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="821"/> + <location filename="../src/mainwindow.cpp" line="796"/> <source>QProcess::ReadError</source> <translation>QProcess::ReadError</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="824"/> + <location filename="../src/mainwindow.cpp" line="799"/> <source>QProcess::WriteError</source> <translation>QProcess::WriteError</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="827"/> + <location filename="../src/mainwindow.cpp" line="802"/> <source>QProcess::UnknownError</source> <translation>QProcess::UnknownError</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="848"/> + <location filename="../src/mainwindow.cpp" line="823"/> <source>Looking for: %1</source> <translation>Cerca de: %1</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="939"/> - <location filename="../src/mainwindow.cpp" line="1328"/> + <location filename="../src/mainwindow.cpp" line="914"/> + <location filename="../src/mainwindow.cpp" line="1303"/> <source>New file</source> <translation>Fitxer nou</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="940"/> + <location filename="../src/mainwindow.cpp" line="915"/> <source>New password file: (Will be placed in %1 )</source> <translation>Fitxer de contrasenyes nou: (s'ubicarà a %1 )</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="969"/> + <location filename="../src/mainwindow.cpp" line="944"/> <source>Delete password?</source> <translation>Suprimir la contrasenya?</translation> </message> @@ -771,64 +771,64 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Esteu segur que voleu suprimir %1?</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="969"/> + <location filename="../src/mainwindow.cpp" line="944"/> <source>Delete folder?</source> <translation>Suprimir la carpeta?</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="970"/> + <location filename="../src/mainwindow.cpp" line="945"/> <source>Are you sure you want to delete %1%2?</source> <translation>Esteu segur que voleu suprimir %1%2?</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="972"/> + <location filename="../src/mainwindow.cpp" line="947"/> <source> and whole content</source> <translation> i tot el contingut</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1005"/> + <location filename="../src/mainwindow.cpp" line="980"/> <source>Can not get key list</source> <translation>No es pot obtenir la llista de claus</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1006"/> + <location filename="../src/mainwindow.cpp" line="981"/> <source>Unable to get list of available gpg keys</source> <translation>No es pot obtenir la llista de claus gpg disponibles</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1039"/> + <location filename="../src/mainwindow.cpp" line="1014"/> <source>Key not found in keyring</source> <translation>No s'ha trobat la clau a l'anell de claus</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1113"/> + <location filename="../src/mainwindow.cpp" line="1088"/> <source>Generating GPG key pair</source> <translation>Generació del parell de claus GPG</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1155"/> + <location filename="../src/mainwindow.cpp" line="1130"/> <source>Profile changed to %1</source> <translation>S'ha canviat el perfil a %1</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1281"/> + <location filename="../src/mainwindow.cpp" line="1256"/> <source>Add folder</source> <translation>Afegeix una carpeta</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1282"/> + <location filename="../src/mainwindow.cpp" line="1257"/> <source>Add password</source> <translation>Afegeix una contrasenya</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1329"/> + <location filename="../src/mainwindow.cpp" line="1304"/> <source>New Folder: (Will be placed in %1 )</source> <translation>Carpeta nova: (s'ubicarà a %1 )</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="1378"/> + <location filename="../src/mainwindow.cpp" line="1353"/> <source>Copied to clipboard</source> <translation>S'ha copiat al porta-retalls</translation> </message> 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 <message> <location filename="../src/mainwindow.ui" line="72"/> <location filename="../src/mainwindow.ui" line="75"/> - <location filename="../src/mainwindow.cpp" line="1289"/> + <location filename="../src/mainwindow.cpp" line="1264"/> <source>Edit</source> <translation>Upravit</translation> </message> <message> <location filename="../src/mainwindow.ui" line="90"/> <location filename="../src/mainwindow.ui" line="93"/> - <location filename="../src/mainwindow.cpp" line="1301"/> + <location filename="../src/mainwindow.cpp" line="1276"/> <source>Delete</source> <translation>Smazat</translation> </message> @@ -575,7 +575,7 @@ Expire-Date: 0 </message> <message> <location filename="../src/mainwindow.ui" line="179"/> - <location filename="../src/mainwindow.cpp" line="1283"/> + <location filename="../src/mainwindow.cpp" line="1258"/> <source>Users</source> <translation>Uživatelé</translation> </message> @@ -622,49 +622,49 @@ p, li { white-space: pre-wrap; } <translation>Vítejte v QtPass %1</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="81"/> + <location filename="../src/mainwindow.cpp" line="565"/> <source>Add Password</source> <translation>Přidat heslo</translation> </message> <message> - <location filename="../src/mainwindow.cpp |