brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkAgent: Update dialog entry descriptions for new design

Browse Source 
With the new dialog design the descriptions of entries are now
implemented as hint-text of the StEntry. That means the colon at the end
of the descriptions no longer makes sense and should be removed.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/977
This commit is contained in:
Jonas Dreßler 2020-02-04 19:24:43 +01:00 committed by Florian Müllner
parent c8734b8f35
commit 775c3345eb
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/ui/components/networkAgent.js
View File

@ -199,19 +199,19 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
case 'wpa-none': case 'wpa-none':
case 'wpa-psk': case 'wpa-psk':
case 'sae': case 'sae':
secrets.push({ label: _("Password: "), key: 'psk', secrets.push({ label: _('Password'), key: 'psk',
value: wirelessSecuritySetting.psk || '', value: wirelessSecuritySetting.psk || '',
validate: this._validateWpaPsk, password: true }); validate: this._validateWpaPsk, password: true });
break; break;
case 'none': // static WEP case 'none': // static WEP
secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`, secrets.push({ label: _('Key'), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`,
value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '', value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
wep_key_type: wirelessSecuritySetting.wep_key_type, wep_key_type: wirelessSecuritySetting.wep_key_type,
validate: this._validateStaticWep, password: true }); validate: this._validateStaticWep, password: true });
break; break;
case 'ieee8021x': case 'ieee8021x':
if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP
secrets.push({ label: _("Password: "), key: 'leap-password', secrets.push({ label: _('Password'), key: 'leap-password',
value: wirelessSecuritySetting.leap_password || '', password: true }); value: wirelessSecuritySetting.leap_password || '', password: true });
} else { // Dynamic (IEEE 802.1x) WEP } else { // Dynamic (IEEE 802.1x) WEP
this._get8021xSecrets(secrets); this._get8021xSecrets(secrets);
@ -231,15 +231,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
/* If hints were given we know exactly what we need to ask */ /* If hints were given we know exactly what we need to ask */
if (this._settingName == "802-1x" && this._hints.length) { if (this._settingName == "802-1x" && this._hints.length) {
if (this._hints.includes('identity')) { if (this._hints.includes('identity')) {
secrets.push({ label: _("Username: "), key: 'identity', secrets.push({ label: _('Username'), key: 'identity',
value: ieee8021xSetting.identity || '', password: false }); value: ieee8021xSetting.identity || '', password: false });
} }
if (this._hints.includes('password')) { if (this._hints.includes('password')) {
secrets.push({ label: _("Password: "), key: 'password', secrets.push({ label: _('Password'), key: 'password',
value: ieee8021xSetting.password || '', password: true }); value: ieee8021xSetting.password || '', password: true });
} }
if (this._hints.includes('private-key-password')) { if (this._hints.includes('private-key-password')) {
secrets.push({ label: _("Private key password: "), key: 'private-key-password', secrets.push({ label: _('Private key password'), key: 'private-key-password',
value: ieee8021xSetting.private_key_password || '', password: true }); value: ieee8021xSetting.private_key_password || '', password: true });
} }
return; return;
@ -254,15 +254,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
// TTLS and PEAP are actually much more complicated, but this complication // TTLS and PEAP are actually much more complicated, but this complication
// is not visible here since we only care about phase2 authentication // is not visible here since we only care about phase2 authentication
// (and don't even care of which one) // (and don't even care of which one)
secrets.push({ label: _("Username: "), key: null, secrets.push({ label: _('Username'), key: null,
value: ieee8021xSetting.identity || '', password: false }); value: ieee8021xSetting.identity || '', password: false });
secrets.push({ label: _("Password: "), key: 'password', secrets.push({ label: _('Password'), key: 'password',
value: ieee8021xSetting.password || '', password: true }); value: ieee8021xSetting.password || '', password: true });
break; break;
case 'tls': case 'tls':
secrets.push({ label: _("Identity: "), key: null, secrets.push({ label: _('Identity'), key: null,
value: ieee8021xSetting.identity || '', password: false }); value: ieee8021xSetting.identity || '', password: false });
secrets.push({ label: _("Private key password: "), key: 'private-key-password', secrets.push({ label: _('Private key password'), key: 'private-key-password',
value: ieee8021xSetting.private_key_password || '', password: true }); value: ieee8021xSetting.private_key_password || '', password: true });
break; break;
default: default:
@ -272,11 +272,11 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
_getPPPoESecrets(secrets) { _getPPPoESecrets(secrets) {
let pppoeSetting = this._connection.get_setting_pppoe(); let pppoeSetting = this._connection.get_setting_pppoe();
secrets.push({ label: _("Username: "), key: 'username', secrets.push({ label: _('Username'), key: 'username',
value: pppoeSetting.username || '', password: false }); value: pppoeSetting.username || '', password: false });
secrets.push({ label: _("Service: "), key: 'service', secrets.push({ label: _('Service'), key: 'service',
value: pppoeSetting.service || '', password: false }); value: pppoeSetting.service || '', password: false });
secrets.push({ label: _("Password: "), key: 'password', secrets.push({ label: _('Password'), key: 'password',
value: pppoeSetting.password || '', password: true }); value: pppoeSetting.password || '', password: true });
} }
@ -286,7 +286,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm(); setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm();
else else
setting = this._connection.get_setting_by_name(connectionType); setting = this._connection.get_setting_by_name(connectionType);
secrets.push({ label: _("Password: "), key: 'password', secrets.push({ label: _('Password'), key: 'password',
value: setting.value || '', password: true }); value: setting.value || '', password: true });
} }
@ -310,7 +310,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
case '802-3-ethernet': case '802-3-ethernet':
content.title = _("Wired 802.1X authentication"); content.title = _("Wired 802.1X authentication");
content.message = null; content.message = null;
content.secrets.push({ label: _("Network name: "), key: null, content.secrets.push({ label: _('Network name'), key: null,
value: connectionSetting.get_id(), password: false }); value: connectionSetting.get_id(), password: false });
this._get8021xSecrets(content.secrets); this._get8021xSecrets(content.secrets);
break; break;
@ -324,7 +324,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
let gsmSetting = this._connection.get_setting_gsm(); let gsmSetting = this._connection.get_setting_gsm();
content.title = _("PIN code required"); content.title = _("PIN code required");
content.message = _("PIN code is needed for the mobile broadband device"); content.message = _("PIN code is needed for the mobile broadband device");
content.secrets.push({ label: _("PIN: "), key: 'pin', content.secrets.push({ label: _('PIN'), key: 'pin',
value: gsmSetting.pin || '', password: true }); value: gsmSetting.pin || '', password: true });
break; break;
} }