diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts index 743a717b..c27fa42e 100644 --- a/i18n/translation_de.ts +++ b/i18n/translation_de.ts @@ -48,38 +48,35 @@ in die Zwischenablage kopiert - + add-peer-tab - Add a peer - + create-group-tab - Create a group - + join-group-tab - Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,39 +84,23 @@ Name - + server Server - + invitation Invitation - + group-addr Address - - - add-peer - Add Peer | Create Group | Join Group - - - - - create-group - - - - - join-group - - BulletinOverlay @@ -258,12 +239,12 @@ Name - + peer-not-online - + add-list-item-btn @@ -286,18 +267,18 @@ Name Klicken, um DM zu senden - + could-not-send-msg-error Could not send this message Nachricht konnte nicht gesendet werden - + acknowledged-label bestätigt - + pending-label Bestätigung ausstehend @@ -358,17 +339,17 @@ Name Ablehnen - + chat-btn Chat - + lists-btn Listen - + bulletins-btn Meldungen @@ -380,55 +361,55 @@ Name PeerSettingsPane - + address-label Adresse - + copy-btn Kopieren - + copied-to-clipboard-notification notification: copied to clipboard in die Zwischenablage kopiert - + display-name-label Angezeigter Name - + save-btn speichern - - + + save-peer-history Save Peer History - + save-peer-history-description - + dont-save-peer-history - + delete-btn löschen - + block-btn @@ -505,6 +486,12 @@ Name Reenter password + + + password-error-empty + Passwords do not match + + create-profile-btn @@ -519,7 +506,6 @@ Name password-error-match - Passwords do not match @@ -529,26 +515,26 @@ Name - + delete-profile-btn Delete Profile - - + + delete-confirm-label Type DELETE to confirm - + delete-profile-confirm-btn Really Delete Profile - + delete-confirm-text DELETE @@ -557,7 +543,7 @@ Name ProfileList - + add-new-profile-btn @@ -576,25 +562,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -613,72 +599,72 @@ Name Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen) - + setting-language Language - + locale-en - + locale-fr - + locale-pt - + locale-de - + setting-interface-zoom Interface Zoom - + large-text-label Groß - + setting-theme Theme - + theme-light - + theme-dark - + experiments-enabled Theme - + version %1 Version %1 - + builddate %2 Built on: %2 @@ -689,7 +675,7 @@ Name defaultmäßige Textgröße (Skalierungsfaktor: - + small-text-label Klein @@ -697,7 +683,7 @@ Name SplashPane - + loading-tor Loading tor... @@ -706,25 +692,25 @@ Name Statusbar - + network-status-disconnected Disconnected from the internet, check your connection - + network-status-attempting-tor Attempting to connect to Tor network - + network-status-connecting Connecting... - + network-status-online Online @@ -733,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm index fd89b959..eb00a31c 100644 Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts index 904bb3a1..59a7ed6d 100644 --- a/i18n/translation_en.ts +++ b/i18n/translation_en.ts @@ -48,38 +48,35 @@ Copied to Clipboard - + add-peer-tab - Add a peer Add a peer - + create-group-tab - Create a group Create a group - + join-group-tab - Join a group Join a group - + peer-address Address Address - + peer-name Name Name - - + + group-name Group Name ---------- @@ -87,38 +84,35 @@ Name Group name - + server Server Server - + invitation Invitation Invitation - + group-addr Address Address - add-peer Add Peer | Create Group | Join Group - Add Peer + Add Peer - create-group - Create group + Create group - join-group - Join group + Join group @@ -338,12 +332,12 @@ Right-click to reset. Search List - + peer-not-online Peer is Offline. Applications cannot be used right now. - + add-list-item-btn Add Item @@ -366,18 +360,18 @@ Right-click to reset. Click to DM - + could-not-send-msg-error Could not send this message Could not send this message - + acknowledged-label Acknowledged - + pending-label Pending @@ -438,17 +432,17 @@ Right-click to reset. Reject - + chat-btn Chat - + lists-btn Lists - + bulletins-btn Bulletins @@ -460,50 +454,50 @@ Right-click to reset. PeerSettingsPane - + address-label Address - + copy-btn Copy - + copied-to-clipboard-notification notification: copied to clipboard Copied to Clipboard - + display-name-label Display Name - + save-btn Save - + block-btn Block Peer - - + + save-peer-history Save Peer History Save Peer History - + save-peer-history-description Determines whether or not to delete any history associated with the peer. - + dont-save-peer-history Delete Peer History @@ -512,7 +506,7 @@ Right-click to reset. Unblock Peer - + delete-btn Delete @@ -611,6 +605,12 @@ Right-click to reset. Reenter password Reenter password + + + password-error-empty + Passwords do not match + Password cannot be empty + create-profile-btn @@ -625,7 +625,6 @@ Right-click to reset. password-error-match - Passwords do not match Passwords do not match @@ -635,26 +634,26 @@ Right-click to reset. Error changing password: Supplied password rejected - + delete-profile-btn Delete Profile Delete Profile - - + + delete-confirm-label Type DELETE to confirm Type DELETE to confirm - + delete-profile-confirm-btn Really Delete Profile Really Delete Profile - + delete-confirm-text DELETE DELETE @@ -663,7 +662,7 @@ Right-click to reset. ProfileList - + add-new-profile-btn Add new profile @@ -682,25 +681,25 @@ Right-click to reset. Password - + error-0-profiles-loaded-for-password 0 profiles loaded with that password 0 profiles loaded with that password - + your-profiles Your Profiles Your Profiles - + your-servers Your Profiles Your Servers - + unlock Unlock Unlock @@ -728,72 +727,72 @@ Right-click to reset. Block Unknown Peers - + setting-language Language Language - + locale-en English - + locale-fr Frances - + locale-pt Portuguesa - + locale-de Deutsche - + setting-interface-zoom Interface Zoom Zoom level - + large-text-label Large - + setting-theme Theme Theme - + theme-light Light - + theme-dark Dark - + experiments-enabled Theme Experiments enabled - + version %1 Version %1 Version %1 - + builddate %2 Built on: %2 Built on: %2 @@ -804,7 +803,7 @@ Right-click to reset. Default size text (scale factor: - + small-text-label Small @@ -812,7 +811,7 @@ Right-click to reset. SplashPane - + loading-tor Loading tor... Loading tor... @@ -829,25 +828,25 @@ Right-click to reset. Statusbar - + network-status-disconnected Disconnected from the internet, check your connection Disconnected from the internet, check your connection - + network-status-attempting-tor Attempting to connect to Tor network Attempting to connect to Tor network - + network-status-connecting Connecting... Connecting to network and peers... - + network-status-online Online Online @@ -856,7 +855,7 @@ Right-click to reset. main - + new-connection-pane-title New Connection New Connection diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts index ff072a80..6d65ff5b 100644 --- a/i18n/translation_fr.ts +++ b/i18n/translation_fr.ts @@ -48,38 +48,35 @@ Copié dans le presse-papier - + add-peer-tab - Add a peer - + create-group-tab - Create a group - + join-group-tab - Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,39 +84,23 @@ Name - + server Server - + invitation Invitation - + group-addr Address - - - add-peer - Add Peer | Create Group | Join Group - - - - - create-group - - - - - join-group - - BulletinOverlay @@ -258,12 +239,12 @@ Name - + peer-not-online - + add-list-item-btn @@ -286,18 +267,18 @@ Name Envoyer un message privé - + could-not-send-msg-error Could not send this message Impossible d'envoyer ce message - + acknowledged-label Confirmé - + pending-label En attente @@ -358,17 +339,17 @@ Name Refuser - + chat-btn Discuter - + lists-btn Listes - + bulletins-btn Bulletins @@ -380,55 +361,55 @@ Name PeerSettingsPane - + address-label Adresse - + copy-btn Copier - + copied-to-clipboard-notification notification: copied to clipboard Copié dans le presse-papier - + display-name-label Pseudo - + save-btn Sauvegarder - - + + save-peer-history Save Peer History - + save-peer-history-description - + dont-save-peer-history - + delete-btn Effacer - + block-btn @@ -505,6 +486,12 @@ Name Reenter password + + + password-error-empty + Passwords do not match + + create-profile-btn @@ -519,7 +506,6 @@ Name password-error-match - Passwords do not match @@ -529,26 +515,26 @@ Name - + delete-profile-btn Delete Profile - - + + delete-confirm-label Type DELETE to confirm - + delete-profile-confirm-btn Really Delete Profile - + delete-confirm-text DELETE @@ -557,7 +543,7 @@ Name ProfileList - + add-new-profile-btn @@ -576,25 +562,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -613,72 +599,72 @@ Name Interface zoom (essentiellement la taille du texte et des composants de l'interface) - + setting-language Language - + locale-en - + locale-fr - + locale-pt - + locale-de - + setting-interface-zoom Interface Zoom - + large-text-label Large - + setting-theme Theme - + theme-light - + theme-dark - + experiments-enabled Theme - + version %1 Version %1 - + builddate %2 Built on: %2 @@ -689,7 +675,7 @@ Name Taille par défaut du texte (échelle: - + small-text-label Petit @@ -697,7 +683,7 @@ Name SplashPane - + loading-tor Loading tor... @@ -706,25 +692,25 @@ Name Statusbar - + network-status-disconnected Disconnected from the internet, check your connection - + network-status-attempting-tor Attempting to connect to Tor network - + network-status-connecting Connecting... - + network-status-online Online @@ -733,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts index ab11775a..d18c42f1 100644 --- a/i18n/translation_pt.ts +++ b/i18n/translation_pt.ts @@ -48,38 +48,35 @@ Copiado - + add-peer-tab - Add a peer - + create-group-tab - Create a group - + join-group-tab - Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,39 +84,23 @@ Name - + server Server - + invitation Invitation - + group-addr Address - - - add-peer - Add Peer | Create Group | Join Group - - - - - create-group - - - - - join-group - - BulletinOverlay @@ -258,12 +239,12 @@ Name - + peer-not-online - + add-list-item-btn @@ -286,18 +267,18 @@ Name Clique para DM - + could-not-send-msg-error Could not send this message Não deu para enviar esta mensagem - + acknowledged-label Confirmada - + pending-label Pendente @@ -358,17 +339,17 @@ Name Recusar - + chat-btn Chat - + lists-btn Listas - + bulletins-btn Boletins @@ -380,55 +361,55 @@ Name PeerSettingsPane - + address-label Endereço - + copy-btn Copiar - + copied-to-clipboard-notification notification: copied to clipboard Copiado - + display-name-label Nome de Exibição - + save-btn Salvar - - + + save-peer-history Save Peer History - + save-peer-history-description - + dont-save-peer-history - + delete-btn Deletar - + block-btn @@ -505,6 +486,12 @@ Name Reenter password + + + password-error-empty + Passwords do not match + + create-profile-btn @@ -519,7 +506,6 @@ Name password-error-match - Passwords do not match @@ -529,26 +515,26 @@ Name - + delete-profile-btn Delete Profile - - + + delete-confirm-label Type DELETE to confirm - + delete-profile-confirm-btn Really Delete Profile - + delete-confirm-text DELETE @@ -557,7 +543,7 @@ Name ProfileList - + add-new-profile-btn @@ -576,25 +562,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -613,72 +599,72 @@ Name Zoom da interface (afeta principalmente tamanho de texto e botões) - + setting-language Language - + locale-en - + locale-fr - + locale-pt - + locale-de - + setting-interface-zoom Interface Zoom - + large-text-label Grande - + setting-theme Theme - + theme-light - + theme-dark - + experiments-enabled Theme - + version %1 Version %1 - + builddate %2 Built on: %2 @@ -689,7 +675,7 @@ Name Texto tamanho padrão (fator de escala: - + small-text-label Pequeno @@ -697,7 +683,7 @@ Name SplashPane - + loading-tor Loading tor... @@ -706,25 +692,25 @@ Name Statusbar - + network-status-disconnected Disconnected from the internet, check your connection - + network-status-attempting-tor Attempting to connect to Tor network - + network-status-connecting Connecting... - + network-status-online Online @@ -733,7 +719,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/qml/main.qml b/qml/main.qml index b2c17069..6678e9b2 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -129,12 +129,18 @@ ApplicationWindow { onBack: { backFn() } onRightMenu: { + // If a group is selected.... if (gcd.selectedConversation.length == 32) { theStack.pane = theStack.groupProfilePane gcd.requestGroupSettings(gcd.selectedConversation) } else { - theStack.pane = theStack.userProfilePane - gcd.requestPeerSettings(gcd.selectedConversation) + // if a peer is selected.. + if (theStack.pane == theStack.userProfilePane) { + theStack.pane = theStack.messagePane + } else { + theStack.pane = theStack.userProfilePane + gcd.requestPeerSettings(gcd.selectedConversation) + } } } } diff --git a/qml/panes/PeerSettingsPane.qml b/qml/panes/PeerSettingsPane.qml index 95a9349f..d83260d5 100644 --- a/qml/panes/PeerSettingsPane.qml +++ b/qml/panes/PeerSettingsPane.qml @@ -60,7 +60,14 @@ Opaque.SettingsList { // settingsPane onClicked: { gcd.savePeerSettings(txtOnion.text, txtDisplayName.text) toolbar.setTitle(txtDisplayName.text) + + // FIXME this is kind of a hack as ideally we could just update the peer name + // and have that change broadcast to each message - but there isn't an easy way to do that + // with our current message model setup. As such we simply reset and reload the message pane + gcd.broadcast("ResetMessagePane") theStack.pane = theStack.messagePane + mm.setHandle(txtOnion.text) + gcd.loadMessagesPane(txtOnion.text) } } } diff --git a/qml/panes/ProfileAddEditPane.qml b/qml/panes/ProfileAddEditPane.qml index dd949e50..180f2c0e 100644 --- a/qml/panes/ProfileAddEditPane.qml +++ b/qml/panes/ProfileAddEditPane.qml @@ -348,7 +348,7 @@ Opaque.Flickable { size: Theme.secondaryTextSize //: Passwords do not match - text: qsTr("password-error-match") + text: txtPassword1.text.length == 0 ? qsTr("password-error-empty") : qsTr("password-error-match") visible: false color: Theme.textfieldErrorColor } @@ -376,7 +376,8 @@ Opaque.Flickable { onClicked: { reset_errors() if (mode == mode_add) { - if (txtPassword1.text != txtPassword2.text) { + + if (radioUsePassword.checked && ((txtPassword1.text != txtPassword2.text) || txtPassword1.text.length == 0)) { passwordErrorLabel.visible = true txtPassword1.error = true txtPassword2.error = true @@ -386,17 +387,15 @@ Opaque.Flickable { parentStack.pane = parentStack.managementPane } } else { - console.log("Save clicked") gcd.updateNick(onion, txtProfileName.text) if (changingPassword) { - console.log("changingPassword") - if (txtPassword1.text != txtPassword2.text) { + // Don't allow an empty password + if (txtPassword1.text != txtPassword2.text || textPassword1.text.length() > 0) { passwordErrorLabel.visible = true txtPassword1.error = true txtPassword2.error = true } else { - console.log("gcd.changePassword") gcd.changePassword(onion, txtCurrentPassword.text, txtPassword1.text, radioNoPassword.checked) } } else {