hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-07-04 20:26:43 +08:00
parent b75edd9710
commit 437b5f2ca3
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flutter/lib/common/widgets/dialog.dart
View File

@ -944,6 +944,7 @@ showSetOSPassword(
bool login, bool login,
OverlayDialogManager dialogManager, OverlayDialogManager dialogManager,
String? osPassword, String? osPassword,
Function()? closeCallback,
) async { ) async {
final controller = TextEditingController(); final controller = TextEditingController();
osPassword ??= await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ?? ''; osPassword ??= await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ?? '';
@ -952,6 +953,10 @@ showSetOSPassword(
''; '';
controller.text = osPassword; controller.text = osPassword;
dialogManager.show((setState, close, context) { dialogManager.show((setState, close, context) {
closeWithCallback([dynamic]) {
close();
if (closeCallback != null) closeCallback();
}
submit() { submit() {
var text = controller.text.trim(); var text = controller.text.trim();
bind.sessionPeerOption( bind.sessionPeerOption(
@ -963,7 +968,7 @@ showSetOSPassword(
if (text != '' && login) { if (text != '' && login) {
bind.sessionInputOsPassword(sessionId: sessionId, value: text); bind.sessionInputOsPassword(sessionId: sessionId, value: text);
} }
close(); closeWithCallback();
} }
return CustomAlertDialog( return CustomAlertDialog(
@ -997,7 +1002,7 @@ showSetOSPassword(
dialogButton( dialogButton(
"Cancel", "Cancel",
icon: Icon(Icons.close_rounded), icon: Icon(Icons.close_rounded),
onPressed: close, onPressed: closeWithCallback,
isOutline: true, isOutline: true,
), ),
dialogButton( dialogButton(
@ -1007,7 +1012,7 @@ showSetOSPassword(
), ),
], ],
onSubmit: submit, onSubmit: submit,
onCancel: close, onCancel: closeWithCallback,
); );
}); });
} }

72
flutter/lib/common/widgets/toolbar.dart
View File

@ -46,6 +46,28 @@ class TToggleMenu {
{required this.child, required this.value, required this.onChanged}); {required this.child, required this.value, required this.onChanged});
} }
handleOsPasswordEditIcon(
SessionID sessionId, OverlayDialogManager dialogManager) {
isEditOsPassword = true;
showSetOSPassword(sessionId, false, dialogManager, null, () => isEditOsPassword = false);
}
handleOsPasswordAction(
SessionID sessionId, OverlayDialogManager dialogManager) async {
if (isEditOsPassword) {
isEditOsPassword = false;
return;
}
final password =
await bind.sessionGetOption(sessionId: sessionId, arg: 'os-password') ??
'';
if (password.isEmpty) {
showSetOSPassword(sessionId, true, dialogManager, password, () => isEditOsPassword = false);
} else {
bind.sessionInputOsPassword(sessionId: sessionId, value: password);
}
}
List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) { List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
final ffiModel = ffi.ffiModel; final ffiModel = ffi.ffiModel;
final pi = ffiModel.pi; final pi = ffiModel.pi;
@ -65,36 +87,26 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
// osAccount / osPassword // osAccount / osPassword
v.add( v.add(
TTextMenu( TTextMenu(
child: Row(children: [ child: Row(children: [
Text(translate(pi.is_headless ? 'OS Account' : 'OS Password')), Text(translate(pi.is_headless ? 'OS Account' : 'OS Password')),
Offstage( Offstage(
offstage: isDesktop, offstage: isDesktop,
child: InkWell( child: Icon(Icons.edit, color: MyTheme.accent).marginOnly(left: 12),
onTap: () => )
showSetOSPassword(sessionId, false, ffi.dialogManager, null), ]),
child: trailingIcon: Transform.scale(
Icon(Icons.edit, color: MyTheme.accent).marginOnly(left: 12), scale: 0.8,
), child: InkWell(
) onTap: () => pi.is_headless
]), ? showSetOSAccount(sessionId, ffi.dialogManager)
trailingIcon: Transform.scale(scale: 0.8, child: Icon(Icons.edit)), : handleOsPasswordEditIcon(sessionId, ffi.dialogManager),
onPressed: () => pi.is_headless child: Icon(Icons.edit),
? showSetOSAccount(sessionId, ffi.dialogManager) ),
: () async { ),
if (isEditOsPassword) { onPressed: () => pi.is_headless
isEditOsPassword = false; ? showSetOSAccount(sessionId, ffi.dialogManager)
return; : handleOsPasswordAction(sessionId, ffi.dialogManager),
} ),
final password = await bind.sessionGetOption(
sessionId: sessionId, arg: 'os-password') ??
'';
if (password.isEmpty) {
showSetOSPassword(sessionId, true, ffi.dialogManager, password);
} else {
bind.sessionInputOsPassword(
sessionId: sessionId, value: password);
}
}),
); );
// paste // paste
if (isMobile && perms['keyboard'] != false && perms['clipboard'] != false) { if (isMobile && perms['keyboard'] != false && perms['clipboard'] != false) {