Skip to content

Commit

Permalink
Use FileContent parsing in MainWindow, contributes to #107
Browse files Browse the repository at this point in the history 
This also changes the behavior of the main window:
If content should be hidden nothing is shown.
Else the password is always shown as a field (either with hidden with
dots or openly visibly.) the rest is shown as plain text or as field
depending on the template settings.

This is results in a nicer ui and needs one translation (Password
hidden) less.
  • Loading branch information
@lukedirtwalker
lukedirtwalker committed Mar 15, 2018
1 parent 5e07132 commit 81f93a2
Show file tree
Hide file tree
Showing 25 changed files with 1,037 additions and 1,111 deletions.
87 changes: 41 additions & 46 deletions localization/localization_ar_MA.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="1311"/>
<location filename="../src/mainwindow.cpp" line="1289"/>
<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="1323"/>
<location filename="../src/mainwindow.cpp" line="1301"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -554,7 +554,7 @@ Expire-Date: 0
</message>
<message>
<location filename="../src/mainwindow.ui" line="179"/>
<location filename="../src/mainwindow.cpp" line="1305"/>
<location filename="../src/mainwindow.cpp" line="1283"/>
<source>Users</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -596,57 +596,52 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="194"/>
<location filename="../src/mainwindow.cpp" line="195"/>
<source>Failed to connect WebDAV:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="207"/>
<location filename="../src/mainwindow.cpp" line="208"/>
<source>QtPass WebDAV password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="208"/>
<location filename="../src/mainwindow.cpp" line="209"/>
<source>Enter password to connect to WebDAV:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="224"/>
<location filename="../src/mainwindow.cpp" line="225"/>
<source>fusedav exited unexpectedly
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="228"/>
<location filename="../src/mainwindow.cpp" line="229"/>
<source>Failed to start fusedav to connect WebDAV:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="513"/>
<location filename="../src/mainwindow.cpp" line="525"/>
<location filename="../src/mainwindow.cpp" line="514"/>
<location filename="../src/mainwindow.cpp" line="526"/>
<source>Updating password-store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1351"/>
<location filename="../src/mainwindow.cpp" line="1329"/>
<source>New Folder:
(Will be placed in %1 )</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="639"/>
<source>Password hidden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="80"/>
<location filename="../src/mainwindow.cpp" line="81"/>
<source>Add Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="81"/>
<location filename="../src/mainwindow.cpp" line="82"/>
<source>Add Folder</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -656,135 +651,135 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="766"/>
<location filename="../src/mainwindow.cpp" line="744"/>
<source>Clipboard cleared</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="768"/>
<location filename="../src/mainwindow.cpp" line="746"/>
<source>Clipboard not cleared</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="783"/>
<location filename="../src/mainwindow.cpp" line="761"/>
<source>Password and Content hidden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="834"/>
<location filename="../src/mainwindow.cpp" line="812"/>
<source>QProcess::FailedToStart</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="837"/>
<location filename="../src/mainwindow.cpp" line="815"/>
<source>QProcess::Crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="840"/>
<location filename="../src/mainwindow.cpp" line="818"/>
<source>QProcess::Timedout</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="843"/>
<location filename="../src/mainwindow.cpp" line="821"/>
<source>QProcess::ReadError</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="846"/>
<location filename="../src/mainwindow.cpp" line="824"/>
<source>QProcess::WriteError</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="849"/>
<location filename="../src/mainwindow.cpp" line="827"/>
<source>QProcess::UnknownError</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="870"/>
<location filename="../src/mainwindow.cpp" line="848"/>
<source>Looking for: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="961"/>
<location filename="../src/mainwindow.cpp" line="1350"/>
<location filename="../src/mainwindow.cpp" line="939"/>
<location filename="../src/mainwindow.cpp" line="1328"/>
<source>New file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="991"/>
<location filename="../src/mainwindow.cpp" line="969"/>
<source>Delete password?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="991"/>
<location filename="../src/mainwindow.cpp" line="969"/>
<source>Delete folder?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="60"/>
<location filename="../src/mainwindow.cpp" line="61"/>
<source>Welcome to QtPass %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="681"/>
<location filename="../src/mainwindow.cpp" line="1451"/>
<location filename="../src/mainwindow.cpp" line="647"/>
<location filename="../src/mainwindow.cpp" line="1429"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="962"/>
<location filename="../src/mainwindow.cpp" line="940"/>
<source>New password file:
(Will be placed in %1 )</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="992"/>
<location filename="../src/mainwindow.cpp" line="970"/>
<source>Are you sure you want to delete %1%2?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="994"/>
<location filename="../src/mainwindow.cpp" line="972"/>
<source> and whole content</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1027"/>
<location filename="../src/mainwindow.cpp" line="1005"/>
<source>Can not get key list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1028"/>
<location filename="../src/mainwindow.cpp" line="1006"/>
<source>Unable to get list of available gpg keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1061"/>
<location filename="../src/mainwindow.cpp" line="1039"/>
<source>Key not found in keyring</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1135"/>
<location filename="../src/mainwindow.cpp" line="1113"/>
<source>Generating GPG key pair</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1177"/>
<location filename="../src/mainwindow.cpp" line="1155"/>
<source>Profile changed to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1303"/>
<location filename="../src/mainwindow.cpp" line="1281"/>
<source>Add folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1304"/>
<location filename="../src/mainwindow.cpp" line="1282"/>
<source>Add password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1400"/>
<location filename="../src/mainwindow.cpp" line="1378"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading

0 comments on commit 81f93a2

Please sign in to comment.