From 65d43a965f9147496d1aa3e4f94768eeb8e79654 Mon Sep 17 00:00:00 2001
From: NicKoehler <grillinicola@proton.me>
Date: Wed, 15 Mar 2023 18:31:53 +0100
Subject: [PATCH] rename menubar into toolbar

---
 flutter/lib/desktop/pages/remote_page.dart    |  2 +-
 .../lib/desktop/pages/remote_tab_page.dart    |  2 +-
 ...emote_menubar.dart => remote_toolbar.dart} | 30 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)
 rename flutter/lib/desktop/widgets/{remote_menubar.dart => remote_toolbar.dart} (99%)

diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index 2099f2e95..2b1999b42 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -22,7 +22,7 @@ import '../../models/model.dart';
 import '../../models/platform_model.dart';
 import '../../common/shared_state.dart';
 import '../../utils/image.dart';
-import '../widgets/remote_menubar.dart';
+import '../widgets/remote_toolbar.dart';
 import '../widgets/kb_layout_type_chooser.dart';
 
 bool _isCustomCursorInited = false;
diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart
index d810650fd..f9c30e8c1 100644
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@@ -9,7 +9,7 @@ import 'package:flutter_hbb/common/shared_state.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/models/state_model.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/material_mod_popup_menu.dart'
     as mod_menu;
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
similarity index 99%
rename from flutter/lib/desktop/widgets/remote_menubar.dart
rename to flutter/lib/desktop/widgets/remote_toolbar.dart
index 8a1b2fbd6..d836c4ab2 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -356,7 +356,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
     return Align(
       alignment: Alignment.topCenter,
       child: Obx(() => show.value
-          ? _buildMenubar(context)
+          ? _buildToolbar(context)
           : _buildDraggableShowHide(context)),
     );
   }
@@ -384,39 +384,39 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
     });
   }
 
-  Widget _buildMenubar(BuildContext context) {
-    final List<Widget> menubarItems = [];
+  Widget _buildToolbar(BuildContext context) {
+    final List<Widget> toolbarItems = [];
     if (!isWebDesktop) {
-      menubarItems.add(_PinMenu(state: widget.state));
-      menubarItems.add(
+      toolbarItems.add(_PinMenu(state: widget.state));
+      toolbarItems.add(
           _FullscreenMenu(state: widget.state, setFullscreen: _setFullscreen));
-      menubarItems.add(_MobileActionMenu(ffi: widget.ffi));
+      toolbarItems.add(_MobileActionMenu(ffi: widget.ffi));
     }
 
     if (PrivacyModeState.find(widget.id).isTrue ||
         stateGlobal.displaysCount.value > 1) {
-      menubarItems.add(
+      toolbarItems.add(
         bind.mainGetUserDefaultOption(key: 'show_monitors_menubar') == 'Y'
             ? _MultiMonitorMenu(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));
-    menubarItems.add(_DisplayMenu(
+    toolbarItems.add(_DisplayMenu(
       id: widget.id,
       ffi: widget.ffi,
       state: widget.state,
       setFullscreen: _setFullscreen,
     ));
-    menubarItems.add(_KeyboardMenu(id: widget.id, ffi: widget.ffi));
+    toolbarItems.add(_KeyboardMenu(id: widget.id, ffi: widget.ffi));
     if (!isWeb) {
-      menubarItems.add(_ChatMenu(id: widget.id, ffi: widget.ffi));
-      menubarItems.add(_VoiceCallMenu(id: widget.id, ffi: widget.ffi));
+      toolbarItems.add(_ChatMenu(id: widget.id, ffi: widget.ffi));
+      toolbarItems.add(_VoiceCallMenu(id: widget.id, ffi: widget.ffi));
     }
-    menubarItems.add(_RecordMenu());
-    menubarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi));
+    toolbarItems.add(_RecordMenu());
+    toolbarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi));
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
@@ -436,7 +436,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
               child: Row(
                 children: [
                   SizedBox(width: _MenubarTheme.buttonHMargin * 2),
-                  ...menubarItems,
+                  ...toolbarItems,
                   SizedBox(width: _MenubarTheme.buttonHMargin * 2)
                 ],
               ),