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

add file_transfer confirm close

Browse Source
This commit is contained in:
csf 2022-09-08 21:03:20 +08:00
parent 63cb816b7d
commit 30156c694b
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flutter/lib/desktop/pages/connection_tab_page.dart
View File

@ -39,11 +39,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
label: peerId, label: peerId,
selectedIcon: selectedIcon, selectedIcon: selectedIcon,
unselectedIcon: unselectedIcon, unselectedIcon: unselectedIcon,
onTabCloseButton: () { onTabCloseButton: () => handleTabCloseButton(peerId),
debugPrint("onTabCloseButton");
tabController.jumpBy(peerId);
clientClose(ffi(peerId).dialogManager);
},
page: RemotePage( page: RemotePage(
key: ValueKey(peerId), key: ValueKey(peerId),
id: peerId, id: peerId,
@ -75,11 +71,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
label: id, label: id,
selectedIcon: selectedIcon, selectedIcon: selectedIcon,
unselectedIcon: unselectedIcon, unselectedIcon: unselectedIcon,
onTabCloseButton: () { onTabCloseButton: () => handleTabCloseButton(id),
debugPrint("onTabCloseButton");
tabController.jumpBy(id);
clientClose(ffi(id).dialogManager);
},
page: RemotePage( page: RemotePage(
key: ValueKey(id), key: ValueKey(id),
id: id, id: id,
@ -165,4 +157,14 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
int windowId() { int windowId() {
return widget.params["windowId"]; return widget.params["windowId"];
} }
void handleTabCloseButton(String peerId) {
final session = ffi(peerId);
if (session.ffiModel.pi.hostname.isNotEmpty) {
tabController.jumpBy(peerId);
clientClose(session.dialogManager);
} else {
tabController.closeBy(peerId);
}
}
} }

14
flutter/lib/desktop/pages/file_manager_tab_page.dart
View File

@ -8,6 +8,8 @@ import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../mobile/widgets/dialog.dart';
/// File Transfer for multi tabs /// File Transfer for multi tabs
class FileManagerTabPage extends StatefulWidget { class FileManagerTabPage extends StatefulWidget {
final Map<String, dynamic> params; final Map<String, dynamic> params;
@ -31,6 +33,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
label: params['id'], label: params['id'],
selectedIcon: selectedIcon, selectedIcon: selectedIcon,
unselectedIcon: unselectedIcon, unselectedIcon: unselectedIcon,
onTabCloseButton: () => handleTabCloseButton(params['id']),
page: FileManagerPage(key: ValueKey(params['id']), id: params['id']))); page: FileManagerPage(key: ValueKey(params['id']), id: params['id'])));
} }
@ -53,6 +56,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
label: id, label: id,
selectedIcon: selectedIcon, selectedIcon: selectedIcon,
unselectedIcon: unselectedIcon, unselectedIcon: unselectedIcon,
onTabCloseButton: () => handleTabCloseButton(id),
page: FileManagerPage(key: ValueKey(id), id: id))); page: FileManagerPage(key: ValueKey(id), id: id)));
} else if (call.method == "onDestroy") { } else if (call.method == "onDestroy") {
tabController.clear(); tabController.clear();
@ -89,4 +93,14 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
int windowId() { int windowId() {
return widget.params["windowId"]; return widget.params["windowId"];
} }
void handleTabCloseButton(String peerId) {
final session = ffi('ft_$peerId');
if (session.ffiModel.pi.hostname.isNotEmpty) {
tabController.jumpBy(peerId);
clientClose(session.dialogManager);
} else {
tabController.closeBy(peerId);
}
}
} }

3
flutter/lib/desktop/widgets/tabbar_widget.dart
View File

@ -24,7 +24,7 @@ class TabInfo {
final String label; final String label;
final IconData? selectedIcon; final IconData? selectedIcon;
final IconData? unselectedIcon; final IconData? unselectedIcon;
final bool closable; // final bool closable;
final VoidCallback? onTabCloseButton; final VoidCallback? onTabCloseButton;
final Widget page; final Widget page;
@ -147,7 +147,6 @@ class DesktopTabController {
void closeBy(String? key) { void closeBy(String? key) {
if (!isDesktop) return; if (!isDesktop) return;
debugPrint("closeBy: $key");
assert(onRemove != null); assert(onRemove != null);
if (key == null) { if (key == null) {
if (state.value.selected < state.value.tabs.length) { if (state.value.selected < state.value.tabs.length) {