cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge pull request 'WIP profile manager quick pass to be less hideous' (#322) from dan/ui:01-profiles into master
the build was successful Details 

Reviewed-on: #322
This commit is contained in:
erinn 2020-09-17 15:20:26 -07:00
parent c55a6b196a 31abd0020e
commit bd10a2c303
13 changed files with 452 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
i18n/translation_de.qm
View File

Binary file not shown.

59
i18n/translation_de.ts
View File

@ -184,7 +184,7 @@
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -313,103 +313,114 @@
<context> <context>
<name>ProfileAddEditPane</name> <name>ProfileAddEditPane</name>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="24"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="95"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
<source>default-profile-name</source> <source>default-profile-name</source>
<extracomment>default suggested profile name</extracomment> <extracomment>default suggested profile name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="76"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
<source>profile-onion-label</source> <source>profile-onion-label</source>
<extracomment>Onion</extracomment> <extracomment>Onion</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="87"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
<source>copy-btn</source>
<translation type="unfinished">Kopieren</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">in die Zwischenablage kopiert</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
<source>profile-name</source> <source>profile-name</source>
<extracomment>Display name</extracomment> <extracomment>Display name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="107"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
<source>radio-use-password</source> <source>radio-use-password</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="117"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
<source>radio-no-password</source> <source>radio-no-password</source>
<extracomment>Unencrypted (No password)</extracomment> <extracomment>Unencrypted (No password)</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
<source>no-password-warning</source> <source>no-password-warning</source>
<extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment> <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="135"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
<source>current-password-label</source> <source>current-password-label</source>
<extracomment>Current Password</extracomment> <extracomment>Current Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="149"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
<source>password1-label</source> <source>password1-label</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="169"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
<source>password2-label</source> <source>password2-label</source>
<extracomment>Reenter password</extracomment> <extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>create-profile-btn</source> <source>create-profile-btn</source>
<extracomment>Create Profile || Save Profile</extracomment> <extracomment>Create Profile || Save Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>save-profile-btn</source> <source>save-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="215"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
<source>password-error-match</source> <source>password-error-match</source>
<extracomment>Passwords do not match</extracomment> <extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="223"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
<source>password-change-error</source> <source>password-change-error</source>
<extracomment>Error changing password: Supplied password rejected</extracomment> <extracomment>Error changing password: Supplied password rejected</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="232"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
<source>delete-profile-btn</source> <source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment> <extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="245"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
<source>delete-confirm-label</source> <source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment> <extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="261"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
<source>delete-profile-confirm-btn</source> <source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment> <extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
<source>delete-confirm-text</source> <source>delete-confirm-text</source>
<extracomment>DELETE</extracomment> <extracomment>DELETE</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -418,7 +429,7 @@
<context> <context>
<name>ProfileList</name> <name>ProfileList</name>
<message> <message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/> <location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source> <source>add-new-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -426,24 +437,24 @@
<context> <context>
<name>ProfileManagerPane</name> <name>ProfileManagerPane</name>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="29"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="36"/>
<source>enter-profile-password</source> <source>enter-profile-password</source>
<extracomment>Please enter password:</extracomment> <extracomment>Please enter password:</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="38"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="52"/>
<source>password</source> <source>password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="48"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="83"/>
<source>error-0-profiles-loaded-for-password</source> <source>error-0-profiles-loaded-for-password</source>
<extracomment>0 profiles loaded with that password</extracomment> <extracomment>0 profiles loaded with that password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="58"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="65"/>
<source>unlock</source> <source>unlock</source>
<extracomment>Unlock</extracomment> <extracomment>Unlock</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

BIN
i18n/translation_en.qm
View File

Binary file not shown.

59
i18n/translation_en.ts
View File

@ -264,7 +264,7 @@ Right-click to reset.</translation>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment> <extracomment>Peer is blocked</extracomment>
<translation>Peer is blocked</translation> <translation>Peer is blocked</translation>
</message> </message>
<message> <message>
@ -405,103 +405,114 @@ Right-click to reset.</translation>
<translation type="vanished">Edit Profile</translation> <translation type="vanished">Edit Profile</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="87"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
<source>profile-name</source> <source>profile-name</source>
<extracomment>Display name</extracomment> <extracomment>Display name</extracomment>
<translation>Display name</translation> <translation>Display name</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="24"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="95"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
<source>default-profile-name</source> <source>default-profile-name</source>
<extracomment>default suggested profile name</extracomment> <extracomment>default suggested profile name</extracomment>
<translation>Alice</translation> <translation>Alice</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="76"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
<source>profile-onion-label</source> <source>profile-onion-label</source>
<extracomment>Onion</extracomment> <extracomment>Onion</extracomment>
<translation>Onion</translation> <translation>Onion</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="107"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
<source>copy-btn</source>
<translation>Copy</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation>Copied to Clipboard</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
<source>radio-use-password</source> <source>radio-use-password</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="117"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
<source>radio-no-password</source> <source>radio-no-password</source>
<extracomment>Unencrypted (No password)</extracomment> <extracomment>Unencrypted (No password)</extracomment>
<translation>Unencrypted (No password)</translation> <translation>Unencrypted (No password)</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
<source>no-password-warning</source> <source>no-password-warning</source>
<extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment> <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
<translation>Not using a password on this account means that all data stored locally will not be encrypted</translation> <translation>Not using a password on this account means that all data stored locally will not be encrypted</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="135"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
<source>current-password-label</source> <source>current-password-label</source>
<extracomment>Current Password</extracomment> <extracomment>Current Password</extracomment>
<translation>Current Password</translation> <translation>Current Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="149"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
<source>password1-label</source> <source>password1-label</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="169"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
<source>password2-label</source> <source>password2-label</source>
<extracomment>Reenter password</extracomment> <extracomment>Reenter password</extracomment>
<translation>Reenter password</translation> <translation>Reenter password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>create-profile-btn</source> <source>create-profile-btn</source>
<extracomment>Create Profile || Save Profile</extracomment> <extracomment>Create Profile || Save Profile</extracomment>
<translation>Create Profile</translation> <translation>Create Profile</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>save-profile-btn</source> <source>save-profile-btn</source>
<translation>Save Profile</translation> <translation>Save Profile</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="215"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
<source>password-error-match</source> <source>password-error-match</source>
<extracomment>Passwords do not match</extracomment> <extracomment>Passwords do not match</extracomment>
<translation>Passwords do not match</translation> <translation>Passwords do not match</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="223"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
<source>password-change-error</source> <source>password-change-error</source>
<extracomment>Error changing password: Supplied password rejected</extracomment> <extracomment>Error changing password: Supplied password rejected</extracomment>
<translation>Error changing password: Supplied password rejected</translation> <translation>Error changing password: Supplied password rejected</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="232"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
<source>delete-profile-btn</source> <source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment> <extracomment>Delete Profile</extracomment>
<translation>Delete Profile</translation> <translation>Delete Profile</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="245"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
<source>delete-confirm-label</source> <source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment> <extracomment>Type DELETE to confirm</extracomment>
<translation>Type DELETE to confirm</translation> <translation>Type DELETE to confirm</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="261"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
<source>delete-profile-confirm-btn</source> <source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment> <extracomment>Really Delete Profile</extracomment>
<translation>Really Delete Profile</translation> <translation>Really Delete Profile</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
<source>delete-confirm-text</source> <source>delete-confirm-text</source>
<extracomment>DELETE</extracomment> <extracomment>DELETE</extracomment>
<translation>DELETE</translation> <translation>DELETE</translation>
@ -510,7 +521,7 @@ Right-click to reset.</translation>
<context> <context>
<name>ProfileList</name> <name>ProfileList</name>
<message> <message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/> <location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source> <source>add-new-profile-btn</source>
<translation>Add new profile</translation> <translation>Add new profile</translation>
</message> </message>
@ -518,24 +529,24 @@ Right-click to reset.</translation>
<context> <context>
<name>ProfileManagerPane</name> <name>ProfileManagerPane</name>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="29"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="36"/>
<source>enter-profile-password</source> <source>enter-profile-password</source>
<extracomment>Please enter password:</extracomment> <extracomment>Please enter password:</extracomment>
<translation>Please enter password</translation> <translation>Please enter password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="38"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="52"/>
<source>password</source> <source>password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="48"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="83"/>
<source>error-0-profiles-loaded-for-password</source> <source>error-0-profiles-loaded-for-password</source>
<extracomment>0 profiles loaded with that password</extracomment> <extracomment>0 profiles loaded with that password</extracomment>
<translation>0 profiles loaded with that password</translation> <translation>0 profiles loaded with that password</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="58"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="65"/>
<source>unlock</source> <source>unlock</source>
<extracomment>Unlock</extracomment> <extracomment>Unlock</extracomment>
<translation>Unlock</translation> <translation>Unlock</translation>

BIN
i18n/translation_fr.qm
View File

Binary file not shown.

59
i18n/translation_fr.ts
View File

@ -184,7 +184,7 @@
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -313,103 +313,114 @@
<context> <context>
<name>ProfileAddEditPane</name> <name>ProfileAddEditPane</name>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="24"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="95"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
<source>default-profile-name</source> <source>default-profile-name</source>
<extracomment>default suggested profile name</extracomment> <extracomment>default suggested profile name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="76"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
<source>profile-onion-label</source> <source>profile-onion-label</source>
<extracomment>Onion</extracomment> <extracomment>Onion</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="87"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
<source>copy-btn</source>
<translation type="unfinished">Copier</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">Copié dans le presse-papier</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
<source>profile-name</source> <source>profile-name</source>
<extracomment>Display name</extracomment> <extracomment>Display name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="107"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
<source>radio-use-password</source> <source>radio-use-password</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="117"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
<source>radio-no-password</source> <source>radio-no-password</source>
<extracomment>Unencrypted (No password)</extracomment> <extracomment>Unencrypted (No password)</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
<source>no-password-warning</source> <source>no-password-warning</source>
<extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment> <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="135"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
<source>current-password-label</source> <source>current-password-label</source>
<extracomment>Current Password</extracomment> <extracomment>Current Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="149"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
<source>password1-label</source> <source>password1-label</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="169"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
<source>password2-label</source> <source>password2-label</source>
<extracomment>Reenter password</extracomment> <extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>create-profile-btn</source> <source>create-profile-btn</source>
<extracomment>Create Profile || Save Profile</extracomment> <extracomment>Create Profile || Save Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>save-profile-btn</source> <source>save-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="215"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
<source>password-error-match</source> <source>password-error-match</source>
<extracomment>Passwords do not match</extracomment> <extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="223"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
<source>password-change-error</source> <source>password-change-error</source>
<extracomment>Error changing password: Supplied password rejected</extracomment> <extracomment>Error changing password: Supplied password rejected</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="232"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
<source>delete-profile-btn</source> <source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment> <extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="245"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
<source>delete-confirm-label</source> <source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment> <extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="261"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
<source>delete-profile-confirm-btn</source> <source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment> <extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
<source>delete-confirm-text</source> <source>delete-confirm-text</source>
<extracomment>DELETE</extracomment> <extracomment>DELETE</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -418,7 +429,7 @@
<context> <context>
<name>ProfileList</name> <name>ProfileList</name>
<message> <message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/> <location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source> <source>add-new-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -426,24 +437,24 @@
<context> <context>
<name>ProfileManagerPane</name> <name>ProfileManagerPane</name>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="29"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="36"/>
<source>enter-profile-password</source> <source>enter-profile-password</source>
<extracomment>Please enter password:</extracomment> <extracomment>Please enter password:</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="38"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="52"/>
<source>password</source> <source>password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="48"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="83"/>
<source>error-0-profiles-loaded-for-password</source> <source>error-0-profiles-loaded-for-password</source>
<extracomment>0 profiles loaded with that password</extracomment> <extracomment>0 profiles loaded with that password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="58"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="65"/>
<source>unlock</source> <source>unlock</source>
<extracomment>Unlock</extracomment> <extracomment>Unlock</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

BIN
i18n/translation_pt.qm
View File

Binary file not shown.

59
i18n/translation_pt.ts
View File

@ -184,7 +184,7 @@
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="32"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blockced</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -313,103 +313,114 @@
<context> <context>
<name>ProfileAddEditPane</name> <name>ProfileAddEditPane</name>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="24"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="95"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
<source>default-profile-name</source> <source>default-profile-name</source>
<extracomment>default suggested profile name</extracomment> <extracomment>default suggested profile name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="76"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
<source>profile-onion-label</source> <source>profile-onion-label</source>
<extracomment>Onion</extracomment> <extracomment>Onion</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="87"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
<source>copy-btn</source>
<translation type="unfinished">Copiar</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation type="unfinished">Copiado</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
<source>profile-name</source> <source>profile-name</source>
<extracomment>Display name</extracomment> <extracomment>Display name</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="107"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
<source>radio-use-password</source> <source>radio-use-password</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="117"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
<source>radio-no-password</source> <source>radio-no-password</source>
<extracomment>Unencrypted (No password)</extracomment> <extracomment>Unencrypted (No password)</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
<source>no-password-warning</source> <source>no-password-warning</source>
<extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment> <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="135"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
<source>current-password-label</source> <source>current-password-label</source>
<extracomment>Current Password</extracomment> <extracomment>Current Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="149"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
<source>password1-label</source> <source>password1-label</source>
<extracomment>Password</extracomment> <extracomment>Password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="169"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
<source>password2-label</source> <source>password2-label</source>
<extracomment>Reenter password</extracomment> <extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>create-profile-btn</source> <source>create-profile-btn</source>
<extracomment>Create Profile || Save Profile</extracomment> <extracomment>Create Profile || Save Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
<source>save-profile-btn</source> <source>save-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="215"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
<source>password-error-match</source> <source>password-error-match</source>
<extracomment>Passwords do not match</extracomment> <extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="223"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
<source>password-change-error</source> <source>password-change-error</source>
<extracomment>Error changing password: Supplied password rejected</extracomment> <extracomment>Error changing password: Supplied password rejected</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="232"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
<source>delete-profile-btn</source> <source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment> <extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="245"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
<source>delete-confirm-label</source> <source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment> <extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="261"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
<source>delete-profile-confirm-btn</source> <source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment> <extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/> <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
<source>delete-confirm-text</source> <source>delete-confirm-text</source>
<extracomment>DELETE</extracomment> <extracomment>DELETE</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -418,7 +429,7 @@
<context> <context>
<name>ProfileList</name> <name>ProfileList</name>
<message> <message>
<location filename="../qml/widgets/ProfileList.qml" line="101"/> <location filename="../qml/widgets/ProfileList.qml" line="102"/>
<source>add-new-profile-btn</source> <source>add-new-profile-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -426,24 +437,24 @@
<context> <context>
<name>ProfileManagerPane</name> <name>ProfileManagerPane</name>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="29"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="36"/>
<source>enter-profile-password</source> <source>enter-profile-password</source>
<extracomment>Please enter password:</extracomment> <extracomment>Please enter password:</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="38"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="52"/>
<source>password</source> <source>password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="48"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="83"/>
<source>error-0-profiles-loaded-for-password</source> <source>error-0-profiles-loaded-for-password</source>
<extracomment>0 profiles loaded with that password</extracomment> <extracomment>0 profiles loaded with that password</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="58"/> <location filename="../qml/panes/ProfileManagerPane.qml" line="65"/>
<source>unlock</source> <source>unlock</source>
<extracomment>Unlock</extracomment> <extracomment>Unlock</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

2
qml/main.qml
View File

@ -155,7 +155,7 @@ ApplicationWindow {
Rectangle { // Profile Add / Edit pane Rectangle { // Profile Add / Edit pane
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
color: Theme.backgroundMainColor color: Theme.backgroundPaneColor
ProfileAddEditPane{ ProfileAddEditPane{

467
qml/panes/ProfileAddEditPane.qml
View File

@ -7,9 +7,10 @@ import QtQuick.Window 2.11
import "../opaque" as Opaque import "../opaque" as Opaque
import "../opaque/theme"
// import "../styles" // import "../styles"
ColumnLayout { // Add Profile Pane Opaque.SettingsList { // Add Profile Pane
id: profileAddEditPane id: profileAddEditPane
anchors.fill: parent anchors.fill: parent
@ -55,241 +56,277 @@ ColumnLayout { // Add Profile Pane
} }
Flickable { settings: Column {
anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter
anchors.left: parent.left width: 700
anchors.right: parent.right
anchors.bottom: parent.bottom
boundsBehavior: Flickable.StopAtBounds
clip:true
contentWidth: tehcol.width
contentHeight: tehcol.height
Column {
id: tehcol
leftPadding: 10
spacing: 5
width: profileAddEditPane.width
Opaque.ScalingLabel {
//: Onion
text: qsTr("profile-onion-label") + ":"
visible: mode == "edit"
}
Opaque.ScalingLabel { Opaque.Setting {
inline: false
visible: mode == "edit"
//: Onion
label: qsTr("profile-onion-label") + ":"
field: Opaque.ButtonTextField {
id: onionLabel id: onionLabel
visible: mode == "edit" readOnly: true
} button_text: qsTr("copy-btn")
dropShadowColor: Theme.dropShadowPaneColor
Opaque.ScalingLabel {
//: Display name
text: qsTr("profile-name") + ":"
}
Opaque.TextField {
id: txtProfileName
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
//: default suggested profile name
text: qsTr("default-profile-name")
}
RowLayout {
//id: radioButtons
Opaque.RadioButton {
id: radioUsePassword
checked: true
//: Password
text: qsTr("radio-use-password")
visible: mode == "add" || tag == "v1-defaultPassword"
onClicked: {
changingPassword = true
}
}
Opaque.RadioButton {
id: radioNoPassword
//: Unencrypted (No password)
text: qsTr("radio-no-password")
visible: mode == "add" || tag == "v1-defaultPassword"
onClicked: {
changingPassword = true
}
}
}
Opaque.ScalingLabel {
id: noPasswordLabel
//: Not using a password on this account means that all data stored locally will not be encrypted
text: qsTr("no-password-warning")
visible: radioNoPassword.checked
}
Opaque.ScalingLabel {
id: currentPasswordLabel
//: Current Password
text: qsTr("current-password-label") + ":"
visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword"
}
Opaque.TextField {
id: txtCurrentPassword
Layout.fillWidth: true
echoMode: TextInput.Password
visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword"
}
Opaque.ScalingLabel {
id: passwordLabel
//: Password
text: qsTr("password1-label") + ":"
visible: radioUsePassword.checked
}
Opaque.TextField {
id: txtPassword1
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
echoMode: TextInput.Password
visible: radioUsePassword.checked
onTextEdited: {
changingPassword = true
}
}
Opaque.ScalingLabel {
id: passwordReLabel
//: Reenter password
text: qsTr("password2-label") + ":"
visible: radioUsePassword.checked
}
Opaque.TextField {
id: txtPassword2
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
echoMode: TextInput.Password
visible: radioUsePassword.checked
}
Opaque.Button { // ADD or SAVE button
//: Create Profile || Save Profile
text: mode == "add" ? qsTr("create-profile-btn") : qsTr("save-profile-btn")
onClicked: { onClicked: {
if (mode == "add") { //: notification: copied to clipboard
if (txtPassword1.text != txtPassword2.text) { gcd.popup(qsTr("copied-to-clipboard-notification"))
passwordErrorLabel.visible = true onionLabel.selectAll()
} else { onionLabel.copy()
gcd.createProfile(txtProfileName.text, radioNoPassword.checked, txtPassword1.text) }}
gcd.reloadProfileList() }
parentStack.pane = parentStack.managementPane
}
} else {
gcd.updateNick(onion, txtProfileName.text)
if (changingPassword) {
Opaque.Setting {
inline: false
visible: mode == "edit"
//: Display name
label: qsTr("profile-name") + ":"
field: Opaque.UnderlineTextField {
id: txtProfileName
//Layout.fillWidth: true
//: default suggested profile name
text: qsTr("default-profile-name")
width: parent.width
}
}
Opaque.Setting {
inline: false
visible: mode == "add" || tag == "v1-defaultPassword"
field:
ColumnLayout{
RowLayout {
//id: radioButtons
Opaque.RadioButton {
id: radioUsePassword
checked: true
//: Password
text: qsTr("radio-use-password")
onClicked: {
changingPassword = true
}
}
Opaque.RadioButton {
id: radioNoPassword
//: Unencrypted (No password)
text: qsTr("radio-no-password")
onClicked: {
changingPassword = true
}
}
}
Opaque.ScalingLabel {
id: noPasswordLabel
//: Not using a password on this account means that all data stored locally will not be encrypted
text: qsTr("no-password-warning")
visible: radioNoPassword.checked
}
}
}
Opaque.Setting{
inline: false
visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword"
//: Current Password
label: qsTr("current-password-label") + ":"
field: Opaque.TextField {
id: txtCurrentPassword
Layout.fillWidth: true
echoMode: TextInput.Password
}
}
Opaque.Setting {
visible: radioUsePassword.checked
//: Password
label: qsTr("password1-label") + ":"
field: Opaque.TextField {
id: txtPassword1
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
echoMode: TextInput.Password
visible: radioUsePassword.checked
onTextEdited: {
changingPassword = true
}
}
}
Opaque.Setting {
visible: radioUsePassword.checked
//: Reenter password
label: qsTr("password2-label") + ":"
field: Opaque.TextField {
id: txtPassword2
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
echoMode: TextInput.Password
visible: radioUsePassword.checked
}
}
Column {
width:parent.width * 0.95
anchors.horizontalCenter: parent.horizontalCenter
spacing: 10 * gcd.themeScale
Opaque.Button { // ADD or SAVE button
anchors.right: parent.right
height: Theme.primaryTextSize * 1.5
//: Create Profile || Save Profile
text: mode == "add" ? qsTr("create-profile-btn") : qsTr("save-profile-btn")
onClicked: {
if (mode == "add") {
if (txtPassword1.text != txtPassword2.text) { if (txtPassword1.text != txtPassword2.text) {
passwordErrorLabel.visible = true passwordErrorLabel.visible = true
} else { } else {
gcd.changePassword(onion, txtCurrentPassword.text, txtPassword1.text, radioNoPassword.checked) gcd.createProfile(txtProfileName.text, radioNoPassword.checked, txtPassword1.text)
gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane
} }
} else { } else {
gcd.updateNick(onion, txtProfileName.text)
if (changingPassword) {
if (txtPassword1.text != txtPassword2.text) {
passwordErrorLabel.visible = true
} else {
gcd.changePassword(onion, txtCurrentPassword.text, txtPassword1.text, radioNoPassword.checked)
}
} else {
gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane
}
}
}
}
Opaque.ScalingLabel {
id: passwordErrorLabel
//: Passwords do not match
text: qsTr("password-error-match")
visible: false
color: "red"
}
Opaque.ScalingLabel {
id: passwordChangeErrorLabel
//: Error changing password: Supplied password rejected
text: qsTr("password-change-error")
visible: false
color: "red"
}
// ***** Delete button and confirm flow *****
Opaque.Button {
anchors.right: parent.right
//: Delete Profile
text: qsTr("delete-profile-btn")
icon: "regular/trash-alt"
visible: mode == "edit"
height: Theme.primaryTextSize * 1.5
onClicked: {
deleting = true
}
}
Opaque.ScalingLabel {
id: deleteConfirmLabel
//: Type DELETE to confirm
text: qsTr("delete-confirm-label")+ ":"
visible: deleting
}
Opaque.TextField {
id: confirmDeleteTxt
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
visible: deleting
}
Opaque.Button {
id: confirmDeleteBtn
icon: "regular/trash-alt"
//: Really Delete Profile
text: qsTr("delete-profile-confirm-btn")
color: "red"
visible: deleting
onClicked: {
//: DELETE
if (confirmDeleteTxt.text == qsTr("delete-confirm-text")) {
deleteConfirmLabel.color = "black"
gcd.deleteProfile(onion)
gcd.reloadProfileList() gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane parentStack.pane = parentStack.managementPane
} else {
deleteConfirmLabel.color = "red"
} }
} }
}
}
Opaque.ScalingLabel {
id: passwordErrorLabel
//: Passwords do not match
text: qsTr("password-error-match")
visible: false
color: "red"
}
Opaque.ScalingLabel {
id: passwordChangeErrorLabel
//: Error changing password: Supplied password rejected
text: qsTr("password-change-error")
visible: false
color: "red"
}
// ***** Delete button and confirm flow *****
Opaque.Button {
//: Delete Profile
text: qsTr("delete-profile-btn")
icon: "regular/trash-alt"
visible: mode == "edit"
onClicked: {
deleting = true
}
}
Opaque.ScalingLabel {
id: deleteConfirmLabel
//: Type DELETE to confirm
text: qsTr("delete-confirm-label")+ ":"
visible: deleting
}
Opaque.TextField {
id: confirmDeleteTxt
Layout.fillWidth: true
//style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
visible: deleting
}
Opaque.Button {
id: confirmDeleteBtn
icon: "regular/trash-alt"
//: Really Delete Profile
text: qsTr("delete-profile-confirm-btn")
color: "red"
visible: deleting
onClicked: {
//: DELETE
if (confirmDeleteTxt.text == qsTr("delete-confirm-text")) {
deleteConfirmLabel.color = "black"
gcd.deleteProfile(onion)
gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane
} else {
deleteConfirmLabel.color = "red"
}
} }
} }
}//end of column with padding }//end of column
}//end of flickable
Connections { // UPDATE UNREAD MESSAGES COUNTER
target: gcd
onChangePasswordResponse: function(error) { Connections { // UPDATE UNREAD MESSAGES COUNTER
if (!error) { target: gcd
gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane onChangePasswordResponse: function(error) {
} else { if (!error) {
passwordChangeErrorLabel.visible = true gcd.reloadProfileList()
parentStack.pane = parentStack.managementPane
} else {
passwordChangeErrorLabel.visible = true
}
} }
} }
} }
}

66
qml/panes/ProfileManagerPane.qml
View File

@ -14,6 +14,7 @@ import "../opaque" as Opaque
import "../opaque/controls" import "../opaque/controls"
import "../opaque/styles" import "../opaque/styles"
import "../opaque/theme" import "../opaque/theme"
import "../opaque/fonts"
ColumnLayout { ColumnLayout {
@ -25,19 +26,53 @@ ColumnLayout {
Opaque.ScalingLabel { Opaque.ScalingLabel {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
size: Theme.primaryTextSize
font.family: Fonts.applicationFontRegular.name
font.styleName: "Bold"
//: Please enter password: //: Please enter password:
text: qsTr("enter-profile-password")+":" text: qsTr("enter-profile-password")+":"
} }
Opaque.UnderlineTextField { RowLayout {
id: txtPassword width: 700 * gcd.themeScale
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.rightMargin: 40 Opaque.UnderlineTextField {
Layout.leftMargin: 40 id: txtPassword
placeholderText: qsTr("password") //anchors.horizontalCenter: parent.horizontalCenter
echoMode: TextInput.Password //Layout.fillWidth: true
onAccepted: button.clicked() Layout.maximumWidth: 450 * gcd.themeScale
Layout.minimumWidth: 450 * gcd.themeScale
Layout.rightMargin: 40
Layout.leftMargin: 40
placeholderText: qsTr("password")
echoMode: TextInput.Password
onAccepted: button.clicked()
}
Opaque.Button {
id: "button"
//anchors.horizontalCenter: parent.horizontalCenter
width: 100 * gcd.themeScale
icon: "solid/unlock-alt"
//: Unlock
text: qsTr("unlock")
height: Theme.primaryTextSize * gcd.themeScale
onClicked: {
gcd.unlockProfiles(txtPassword.text)
txtPassword.text = ""
error.visible = false
}
}
} }
Opaque.ScalingLabel { Opaque.ScalingLabel {
@ -49,20 +84,7 @@ ColumnLayout {
visible: false visible: false
} }
Opaque.Button {
id: "button"
anchors.horizontalCenter: parent.horizontalCenter
icon: "solid/unlock-alt"
//: Unlock
text: qsTr("unlock")
onClicked: {
gcd.unlockProfiles(txtPassword.text)
txtPassword.text = ""
error.visible = false
}
}
Connections { // ADD/REMOVE CONTACT ENTRIES Connections { // ADD/REMOVE CONTACT ENTRIES
target: gcd target: gcd

2
qml/widgets/ProfileList.qml
View File

@ -97,7 +97,7 @@ ColumnLayout {
} }
Opaque.PortraitRow { Opaque.PortraitRow {
Layout.fillWidth: true Layout.fillWidth: true
handle: "" handle: ""
displayName: qsTr("add-new-profile-btn") displayName: qsTr("add-new-profile-btn")
nameColor: Theme.mainTextColor nameColor: Theme.mainTextColor

18
qml/widgets/ProfileRow.qml
View File

@ -12,6 +12,7 @@ import "../opaque/styles"
import "../opaque/theme" import "../opaque/theme"
Opaque.PortraitRow { Opaque.PortraitRow {
id: root
badgeColor: Theme.portraitProfileBadgeColor badgeColor: Theme.portraitProfileBadgeColor
portraitBorderColor: Theme.portraitOnlineBorderColor portraitBorderColor: Theme.portraitOnlineBorderColor
@ -26,9 +27,12 @@ Opaque.PortraitRow {
width: height width: height
} }
Opaque.Button {// Edit BUTTON Opaque.Icon {// Edit BUTTON
id: btnEdit id: btnEdit
icon: "solid/user-edit" source: gcd.assetPath + "core/edit-24px.svg"
backgroundColor: root.color
iconColor: Theme.altTextColor
anchors.right: parent.right anchors.right: parent.right
@ -36,14 +40,20 @@ Opaque.PortraitRow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 1 * gcd.themeScale anchors.leftMargin: 1 * gcd.themeScale
anchors.rightMargin: 20 * gcd.themeScale anchors.rightMargin: 20 * gcd.themeScale
height: parent.height * 0.75
height: parent.height * 0.5
width: parent.height * 0.5
size: parent.height * 0.5
onClicked: { onClicked: {
profileAddEditPane.load(handle, displayName, tag) profileAddEditPane.load(handle, displayName, tag)
parentStack.pane = parentStack.addEditProfilePane parentStack.pane = parentStack.addEditProfilePane
} }
onHover: function (hover) {
root.isHover = hover
}
} }
onClicked: function openClick(handle) { onClicked: function openClick(handle) {