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

rename menubar into toolbar

Browse Source
This commit is contained in:
NicKoehler 2023-03-15 18:31:53 +01:00
parent 948d2db073
commit 65d43a965f
No known key found for this signature in database
GPG Key ID: BAE01394EB51AC58
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/desktop/pages/remote_page.dart
View File

@ -22,7 +22,7 @@ import '../../models/model.dart';
import '../../models/platform_model.dart'; import '../../models/platform_model.dart';
import '../../common/shared_state.dart'; import '../../common/shared_state.dart';
import '../../utils/image.dart'; import '../../utils/image.dart';
import '../widgets/remote_menubar.dart'; import '../widgets/remote_toolbar.dart';
import '../widgets/kb_layout_type_chooser.dart'; import '../widgets/kb_layout_type_chooser.dart';
bool _isCustomCursorInited = false; bool _isCustomCursorInited = false;

2
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@ -9,7 +9,7 @@ import 'package:flutter_hbb/common/shared_state.dart';
import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/models/state_model.dart';
import 'package:flutter_hbb/desktop/pages/remote_page.dart'; import 'package:flutter_hbb/desktop/pages/remote_page.dart';
import 'package:flutter_hbb/desktop/widgets/remote_menubar.dart'; import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart';
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/desktop/widgets/material_mod_popup_menu.dart' import 'package:flutter_hbb/desktop/widgets/material_mod_popup_menu.dart'
as mod_menu; as mod_menu;

30
flutter/lib/desktop/widgets/remote_menubar.dart → flutter/lib/desktop/widgets/remote_toolbar.dart
View File

@ -356,7 +356,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
return Align( return Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Obx(() => show.value child: Obx(() => show.value
? _buildMenubar(context) ? _buildToolbar(context)
: _buildDraggableShowHide(context)), : _buildDraggableShowHide(context)),
); );
} }
@ -384,39 +384,39 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
}); });
} }
Widget _buildMenubar(BuildContext context) { Widget _buildToolbar(BuildContext context) {
final List<Widget> menubarItems = []; final List<Widget> toolbarItems = [];
if (!isWebDesktop) { if (!isWebDesktop) {
menubarItems.add(_PinMenu(state: widget.state)); toolbarItems.add(_PinMenu(state: widget.state));
menubarItems.add( toolbarItems.add(
_FullscreenMenu(state: widget.state, setFullscreen: _setFullscreen)); _FullscreenMenu(state: widget.state, setFullscreen: _setFullscreen));
menubarItems.add(_MobileActionMenu(ffi: widget.ffi)); toolbarItems.add(_MobileActionMenu(ffi: widget.ffi));
} }
if (PrivacyModeState.find(widget.id).isTrue || if (PrivacyModeState.find(widget.id).isTrue ||
stateGlobal.displaysCount.value > 1) { stateGlobal.displaysCount.value > 1) {
menubarItems.add( toolbarItems.add(
bind.mainGetUserDefaultOption(key: 'show_monitors_menubar') == 'Y' bind.mainGetUserDefaultOption(key: 'show_monitors_menubar') == 'Y'
? _MultiMonitorMenu(id: widget.id, ffi: widget.ffi) ? _MultiMonitorMenu(id: widget.id, ffi: widget.ffi)
: _MonitorMenu(id: widget.id, ffi: widget.ffi), : _MonitorMenu(id: widget.id, ffi: widget.ffi),
); );
} }
menubarItems toolbarItems
.add(_ControlMenu(id: widget.id, ffi: widget.ffi, state: widget.state)); .add(_ControlMenu(id: widget.id, ffi: widget.ffi, state: widget.state));
menubarItems.add(_DisplayMenu( toolbarItems.add(_DisplayMenu(
id: widget.id, id: widget.id,
ffi: widget.ffi, ffi: widget.ffi,
state: widget.state, state: widget.state,
setFullscreen: _setFullscreen, setFullscreen: _setFullscreen,
)); ));
menubarItems.add(_KeyboardMenu(id: widget.id, ffi: widget.ffi)); toolbarItems.add(_KeyboardMenu(id: widget.id, ffi: widget.ffi));
if (!isWeb) { if (!isWeb) {
menubarItems.add(_ChatMenu(id: widget.id, ffi: widget.ffi)); toolbarItems.add(_ChatMenu(id: widget.id, ffi: widget.ffi));
menubarItems.add(_VoiceCallMenu(id: widget.id, ffi: widget.ffi)); toolbarItems.add(_VoiceCallMenu(id: widget.id, ffi: widget.ffi));
} }
menubarItems.add(_RecordMenu()); toolbarItems.add(_RecordMenu());
menubarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi)); toolbarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi));
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -436,7 +436,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
child: Row( child: Row(
children: [ children: [
SizedBox(width: _MenubarTheme.buttonHMargin * 2), SizedBox(width: _MenubarTheme.buttonHMargin * 2),
...menubarItems, ...toolbarItems,
SizedBox(width: _MenubarTheme.buttonHMargin * 2) SizedBox(width: _MenubarTheme.buttonHMargin * 2)
], ],
), ),