mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-03-25 14:11:14 +03:00
improve display name handling
- Append (@username) when multiple users share the same display name - Trim whitespace from display_name before comparison and display - Add missing translate() for Logout button on desktop Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
@@ -2018,7 +2018,7 @@ class _AccountState extends State<_Account> {
|
||||
return Obx(() => _Button(
|
||||
gFFI.userModel.userName.value.isEmpty
|
||||
? 'Login'
|
||||
: 'Logout (${gFFI.userModel.accountLabelWithHandle})',
|
||||
: '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
|
||||
() => {
|
||||
gFFI.userModel.userName.value.isEmpty
|
||||
? loginDialog()
|
||||
@@ -2040,8 +2040,9 @@ class _AccountState extends State<_Account> {
|
||||
child: Column(
|
||||
children: [
|
||||
if (gFFI.userModel.displayName.value.trim().isNotEmpty &&
|
||||
gFFI.userModel.displayName.value != gFFI.userModel.userName.value)
|
||||
text('Display Name', gFFI.userModel.displayName.value),
|
||||
gFFI.userModel.displayName.value.trim() !=
|
||||
gFFI.userModel.userName.value.trim())
|
||||
text('Display Name', gFFI.userModel.displayName.value.trim()),
|
||||
text('Username', gFFI.userModel.userName.value),
|
||||
// text('Group', gFFI.groupModel.groupName.value),
|
||||
],
|
||||
@@ -2137,7 +2138,7 @@ class _PluginState extends State<_Plugin> {
|
||||
return Obx(() => _Button(
|
||||
gFFI.userModel.userName.value.isEmpty
|
||||
? 'Login'
|
||||
: 'Logout (${gFFI.userModel.accountLabelWithHandle})',
|
||||
: '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
|
||||
() => {
|
||||
gFFI.userModel.userName.value.isEmpty
|
||||
? loginDialog()
|
||||
|
||||
Reference in New Issue
Block a user