Merge pull request #4616 from 21pages/toolbar

rename menubar as toolbar in code and view

flutter/lib/common.dart

@@ -1169,7 +1169,7 @@ class AndroidPermissionManager {
 // TODO remove argument contentPadding, it’s not used, getToggle() has not
 RadioListTile<T> getRadio<T>(
     Widget title, T toValue, T curValue, ValueChanged<T?>? onChange,
-    {EdgeInsetsGeometry? contentPadding}) {
+    {EdgeInsetsGeometry? contentPadding, bool? dense}) {
   return RadioListTile<T>(
     contentPadding: contentPadding ?? EdgeInsets.zero,
     visualDensity: VisualDensity.compact,
@@ -1178,6 +1178,7 @@ RadioListTile<T> getRadio<T>(
     value: toValue,
     groupValue: curValue,
     onChanged: onChange,
+    dense: dense,
   );
 }
 

flutter/lib/common/widgets/peer_tab_page.dart

@@ -456,12 +456,18 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
         fontWeight: FontWeight.normal);
     List<PopupMenuEntry> items = List.empty(growable: true);
     items.add(PopupMenuItem(
-        enabled: false, child: Text(translate("Sort by"), style: style)));
+        height: 36,
+        enabled: false,
+        child: Text(translate("Sort by"), style: style)));
     for (var e in PeerSortType.values) {
       items.add(PopupMenuItem(
-          child: Obx(() =>
+          height: 36,
-              getRadio(Text(translate(e), style: style), e, peerSort.value,
+          child: Obx(() => Center(
-                  (String? v) async {
+                child: SizedBox(
+                  height: 36,
+                  child: getRadio(
+                      Text(translate(e), style: style), e, peerSort.value,
+                      dense: true, (String? v) async {
                     if (v != null) {
                       peerSort.value = v;
                       await bind.setLocalFlutterConfig(
@@ -469,7 +475,9 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
                         v: peerSort.value,
                       );
                     }
-              }))));
+                  }),
+                ),
+              ))));
     }
 
     var menuPos = RelativeRect.fromLTRB(0, 0, 0, 0);

flutter/lib/desktop/pages/remote_page.dart

@@ -33,7 +33,7 @@ class RemotePage extends StatefulWidget {
     Key? key,
     required this.id,
     required this.password,
-    required this.menubarState,
+    required this.toolbarState,
     required this.tabController,
     this.switchUuid,
     this.forceRelay,
@@ -41,7 +41,7 @@ class RemotePage extends StatefulWidget {
 
   final String id;
   final String? password;
-  final MenubarState menubarState;
+  final ToolbarState toolbarState;
   final String? switchUuid;
   final bool? forceRelay;
   final SimpleWrapper<State<RemotePage>?> _lastState = SimpleWrapper(null);
@@ -75,7 +75,7 @@ class _RemotePageState extends State<RemotePage>
 
   final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode");
 
-  Function(bool)? _onEnterOrLeaveImage4Menubar;
+  Function(bool)? _onEnterOrLeaveImage4Toolbar;
 
   late FFI _ffi;
 
@@ -265,14 +265,14 @@ class _RemotePageState extends State<RemotePage>
                 child: getBodyForDesktop(context))),
         upperLayer: [
           OverlayEntry(
-              builder: (context) => RemoteMenubar(
+              builder: (context) => RemoteToolbar(
                     id: widget.id,
                     ffi: _ffi,
-                    state: widget.menubarState,
+                    state: widget.toolbarState,
                     onEnterOrLeaveImageSetter: (func) =>
-                        _onEnterOrLeaveImage4Menubar = func,
+                        _onEnterOrLeaveImage4Toolbar = func,
                     onEnterOrLeaveImageCleaner: () =>
-                        _onEnterOrLeaveImage4Menubar = null,
+                        _onEnterOrLeaveImage4Toolbar = null,
                   ))
         ],
       ),
@@ -299,9 +299,9 @@ class _RemotePageState extends State<RemotePage>
   void enterView(PointerEnterEvent evt) {
     _cursorOverImage.value = true;
     _firstEnterImage.value = true;
-    if (_onEnterOrLeaveImage4Menubar != null) {
+    if (_onEnterOrLeaveImage4Toolbar != null) {
       try {
-        _onEnterOrLeaveImage4Menubar!(true);
+        _onEnterOrLeaveImage4Toolbar!(true);
       } catch (e) {
         //
       }
@@ -322,9 +322,9 @@ class _RemotePageState extends State<RemotePage>
 
     _cursorOverImage.value = false;
     _firstEnterImage.value = false;
-    if (_onEnterOrLeaveImage4Menubar != null) {
+    if (_onEnterOrLeaveImage4Toolbar != null) {
       try {
-        _onEnterOrLeaveImage4Menubar!(false);
+        _onEnterOrLeaveImage4Toolbar!(false);
       } catch (e) {
         //
       }

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -45,12 +45,12 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
   static const IconData selectedIcon = Icons.desktop_windows_sharp;
   static const IconData unselectedIcon = Icons.desktop_windows_outlined;
 
-  late MenubarState _menubarState;
+  late ToolbarState _toolbarState;
 
   var connectionMap = RxList<Widget>.empty(growable: true);
 
   _ConnectionTabPageState(Map<String, dynamic> params) {
-    _menubarState = MenubarState();
+    _toolbarState = ToolbarState();
     RemoteCountState.init();
     final peerId = params['id'];
     if (peerId != null) {
@@ -76,7 +76,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
           key: ValueKey(peerId),
           id: peerId,
           password: params['password'],
-          menubarState: _menubarState,
+          toolbarState: _toolbarState,
           tabController: tabController,
           switchUuid: params['switch_uuid'],
           forceRelay: params['forceRelay'],
@@ -103,7 +103,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
         final switchUuid = args['switch_uuid'];
         window_on_top(windowId());
         ConnectionTypeState.init(id);
-        _menubarState.setShow(
+        _toolbarState.setShow(
             bind.mainGetUserDefaultOption(key: 'collapse_toolbar') != 'Y');
         tabController.add(TabInfo(
           key: id,
@@ -115,7 +115,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
             key: ValueKey(id),
             id: id,
             password: args['password'],
-            menubarState: _menubarState,
+            toolbarState: _toolbarState,
             tabController: tabController,
             switchUuid: switchUuid,
             forceRelay: args['forceRelay'],
@@ -138,7 +138,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
   @override
   void dispose() {
     super.dispose();
-    _menubarState.save();
+    _toolbarState.save();
   }
 
   @override
@@ -243,7 +243,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
             ));
   }
 
-  // Note: Some dup code to ../widgets/remote_menubar
+  // Note: Some dup code to ../widgets/remote_toolbar
   Widget _tabMenuBuilder(String key, CancelFunc cancelFunc) {
     final List<MenuEntryBase<String>> menu = [];
     const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
@@ -269,11 +269,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       MenuEntryButton<String>(
         childBuilder: (TextStyle? style) => Obx(() => Text(
               translate(
-                  _menubarState.show.isTrue ? 'Hide Menubar' : 'Show Menubar'),
+                  _toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
               style: style,
             )),
         proc: () {
-          _menubarState.switchShow();
+          _toolbarState.switchShow();
           cancelFunc();
         },
         padding: padding,

flutter/lib/desktop/widgets/remote_toolbar.dart

@@ -29,12 +29,12 @@ const _kKeyLegacyMode = 'legacy';
 const _kKeyMapMode = 'map';
 const _kKeyTranslateMode = 'translate';
 
-class MenubarState {
+class ToolbarState {
   final kStoreKey = 'remoteMenubarState';
   late RxBool show;
   late RxBool _pin;
 
-  MenubarState() {
+  ToolbarState() {
     final s = bind.getLocalFlutterConfig(k: kStoreKey);
     if (s.isEmpty) {
       _initSet(false, false);
@@ -49,7 +49,7 @@ class MenubarState {
         _initSet(m['pin'] ?? false, m['pin'] ?? false);
       }
     } catch (e) {
-      debugPrint('Failed to decode menubar state ${e.toString()}');
+      debugPrint('Failed to decode toolbar state ${e.toString()}');
       _initSet(false, false);
     }
   }
@@ -97,7 +97,7 @@ class MenubarState {
   }
 }
 
-class _MenubarTheme {
+class _ToolbarTheme {
   static const Color blueColor = MyTheme.button;
   static const Color hoverBlueColor = MyTheme.accent;
   static const Color redColor = Colors.redAccent;
@@ -286,14 +286,14 @@ class RemoteMenuEntry {
   }
 }
 
-class RemoteMenubar extends StatefulWidget {
+class RemoteToolbar extends StatefulWidget {
   final String id;
   final FFI ffi;
-  final MenubarState state;
+  final ToolbarState state;
   final Function(Function(bool)) onEnterOrLeaveImageSetter;
   final Function() onEnterOrLeaveImageCleaner;
 
-  RemoteMenubar({
+  RemoteToolbar({
     Key? key,
     required this.id,
     required this.ffi,
@@ -303,10 +303,10 @@ class RemoteMenubar extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  State<RemoteMenubar> createState() => _RemoteMenubarState();
+  State<RemoteToolbar> createState() => _RemoteToolbarState();
 }
 
-class _RemoteMenubarState extends State<RemoteMenubar> {
+class _RemoteToolbarState extends State<RemoteToolbar> {
   late Debouncer<int> _debouncerHide;
   bool _isCursorOverImage = false;
   final _fractionX = 0.5.obs;
@@ -390,7 +390,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
         child: Offstage(
           offstage: _dragging.isTrue,
           child: Material(
-            elevation: _MenubarTheme.elevation,
+            elevation: _ToolbarTheme.elevation,
             shadowColor: MyTheme.color(context).shadow,
             child: _DraggableShowHide(
               sessionId: widget.ffi.sessionId,
@@ -440,7 +440,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
       mainAxisSize: MainAxisSize.min,
       children: [
         Material(
-          elevation: _MenubarTheme.elevation,
+          elevation: _ToolbarTheme.elevation,
           shadowColor: MyTheme.color(context).shadow,
           borderRadius: BorderRadius.all(Radius.circular(4.0)),
           color: Theme.of(context)
@@ -454,9 +454,9 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
               data: themeData(),
               child: Row(
                 children: [
-                  SizedBox(width: _MenubarTheme.buttonHMargin * 2),
+                  SizedBox(width: _ToolbarTheme.buttonHMargin * 2),
                   ...toolbarItems,
-                  SizedBox(width: _MenubarTheme.buttonHMargin * 2)
+                  SizedBox(width: _ToolbarTheme.buttonHMargin * 2)
                 ],
               ),
             ),
@@ -491,7 +491,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
 }
 
 class _PinMenu extends StatelessWidget {
-  final MenubarState state;
+  final ToolbarState state;
   const _PinMenu({Key? key, required this.state}) : super(key: key);
 
   @override
@@ -499,18 +499,18 @@ class _PinMenu extends StatelessWidget {
     return Obx(
       () => _IconMenuButton(
         assetName: state.pin ? "assets/pinned.svg" : "assets/unpinned.svg",
-        tooltip: state.pin ? 'Unpin menubar' : 'Pin menubar',
+        tooltip: state.pin ? 'Unpin Toolbar' : 'Pin Toolbar',
         onPressed: state.switchPin,
-        color: state.pin ? _MenubarTheme.blueColor : Colors.grey[800]!,
+        color: state.pin ? _ToolbarTheme.blueColor : Colors.grey[800]!,
         hoverColor:
-            state.pin ? _MenubarTheme.hoverBlueColor : Colors.grey[850]!,
+            state.pin ? _ToolbarTheme.hoverBlueColor : Colors.grey[850]!,
       ),
     );
   }
 }
 
 class _FullscreenMenu extends StatelessWidget {
-  final MenubarState state;
+  final ToolbarState state;
   final Function(bool) setFullscreen;
   bool get isFullscreen => stateGlobal.fullscreen;
   const _FullscreenMenu(
@@ -524,8 +524,8 @@ class _FullscreenMenu extends StatelessWidget {
           isFullscreen ? "assets/fullscreen_exit.svg" : "assets/fullscreen.svg",
       tooltip: isFullscreen ? 'Exit Fullscreen' : 'Fullscreen',
       onPressed: () => setFullscreen(!isFullscreen),
-      color: _MenubarTheme.blueColor,
+      color: _ToolbarTheme.blueColor,
-      hoverColor: _MenubarTheme.hoverBlueColor,
+      hoverColor: _ToolbarTheme.hoverBlueColor,
     );
   }
 }
@@ -541,8 +541,8 @@ class _MobileActionMenu extends StatelessWidget {
       assetName: 'assets/actions_mobile.svg',
       tooltip: 'Mobile Actions',
       onPressed: () => ffi.dialogManager.toggleMobileActionsOverlay(ffi: ffi),
-      color: _MenubarTheme.blueColor,
+      color: _ToolbarTheme.blueColor,
-      hoverColor: _MenubarTheme.hoverBlueColor,
+      hoverColor: _ToolbarTheme.hoverBlueColor,
     );
   }
 }
@@ -559,8 +559,8 @@ class _MonitorMenu extends StatelessWidget {
         tooltip: 'Select Monitor',
         icon: icon(),
         ffi: ffi,
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         menuStyle: MenuStyle(
             padding:
                 MaterialStatePropertyAll(EdgeInsets.symmetric(horizontal: 6))),
@@ -581,7 +581,7 @@ class _MonitorMenu extends StatelessWidget {
           return Text(
             '${display.value + 1}/${pi.displays.length}',
             style: const TextStyle(
-              color: _MenubarTheme.blueColor,
+              color: _ToolbarTheme.blueColor,
               fontSize: 8,
               fontWeight: FontWeight.bold,
             ),
@@ -597,14 +597,14 @@ class _MonitorMenu extends StatelessWidget {
     for (int i = 0; i < pi.displays.length; i++) {
       rowChildren.add(_IconMenuButton(
         topLevel: false,
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         tooltip: "",
         hMargin: 6,
         vMargin: 12,
         icon: Container(
           alignment: AlignmentDirectional.center,
-          constraints: const BoxConstraints(minHeight: _MenubarTheme.height),
+          constraints: const BoxConstraints(minHeight: _ToolbarTheme.height),
           child: Stack(
             alignment: Alignment.center,
             children: [
@@ -615,7 +615,7 @@ class _MonitorMenu extends StatelessWidget {
               Text(
                 (i + 1).toString(),
                 style: TextStyle(
-                  color: _MenubarTheme.blueColor,
+                  color: _ToolbarTheme.blueColor,
                   fontSize: 12,
                   fontWeight: FontWeight.bold,
                 ),
@@ -639,7 +639,7 @@ class _MonitorMenu extends StatelessWidget {
 class _ControlMenu extends StatelessWidget {
   final String id;
   final FFI ffi;
-  final MenubarState state;
+  final ToolbarState state;
   _ControlMenu(
       {Key? key, required this.id, required this.ffi, required this.state})
       : super(key: key);
@@ -649,8 +649,8 @@ class _ControlMenu extends StatelessWidget {
     return _IconSubmenuButton(
         tooltip: 'Control Actions',
         svg: "assets/actions.svg",
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         ffi: ffi,
         menuChildren: toolbarControls(context, id, ffi).map((e) {
           if (e.divider) {
@@ -804,7 +804,7 @@ class ScreenAdjustor {
 class _DisplayMenu extends StatefulWidget {
   final String id;
   final FFI ffi;
-  final MenubarState state;
+  final ToolbarState state;
   final Function(bool) setFullscreen;
   final Widget pluginItem;
   _DisplayMenu(
@@ -852,8 +852,8 @@ class _DisplayMenuState extends State<_DisplayMenu> {
         tooltip: 'Display Settings',
         svg: "assets/display.svg",
         ffi: widget.ffi,
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         menuChildren: [
           _screenAdjustor.adjustWindow(),
           viewStyle(),
@@ -1281,8 +1281,8 @@ class _KeyboardMenu extends StatelessWidget {
         tooltip: 'Keyboard Settings',
         svg: "assets/keyboard.svg",
         ffi: ffi,
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         menuChildren: [
           mode(modeOnly),
           localKeyboardType(),
@@ -1401,8 +1401,8 @@ class _ChatMenuState extends State<_ChatMenu> {
         key: chatButtonKey,
         svg: 'assets/chat.svg',
         ffi: widget.ffi,
-        color: _MenubarTheme.blueColor,
+        color: _ToolbarTheme.blueColor,
-        hoverColor: _MenubarTheme.hoverBlueColor,
+        hoverColor: _ToolbarTheme.hoverBlueColor,
         menuChildren: [textChat(), voiceCall()]);
   }
 
@@ -1417,7 +1417,7 @@ class _ChatMenuState extends State<_ChatMenu> {
           Offset? initPos;
           if (renderBox != null) {
             final pos = renderBox.localToGlobal(Offset.zero);
-            initPos = Offset(pos.dx, pos.dy + _MenubarTheme.dividerHeight);
+            initPos = Offset(pos.dx, pos.dy + _ToolbarTheme.dividerHeight);
           }
 
           widget.ffi.chatModel.changeCurrentID(ChatModel.clientModeID);
@@ -1467,8 +1467,8 @@ class _VoiceCallMenu extends StatelessWidget {
             tooltip: tooltip,
             onPressed: () =>
                 bind.sessionCloseVoiceCall(sessionId: ffi.sessionId),
-            color: _MenubarTheme.redColor,
+            color: _ToolbarTheme.redColor,
-            hoverColor: _MenubarTheme.hoverRedColor);
+            hoverColor: _ToolbarTheme.hoverRedColor);
       },
     );
   }
@@ -1491,11 +1491,11 @@ class _RecordMenu extends StatelessWidget {
           : 'Start session recording',
       onPressed: () => recordingModel.toggle(),
       color: recordingModel.start
-          ? _MenubarTheme.redColor
+          ? _ToolbarTheme.redColor
-          : _MenubarTheme.blueColor,
+          : _ToolbarTheme.blueColor,
       hoverColor: recordingModel.start
-          ? _MenubarTheme.hoverRedColor
+          ? _ToolbarTheme.hoverRedColor
-          : _MenubarTheme.hoverBlueColor,
+          : _ToolbarTheme.hoverBlueColor,
     );
   }
 }
@@ -1512,8 +1512,8 @@ class _CloseMenu extends StatelessWidget {
       assetName: 'assets/close.svg',
       tooltip: 'Close',
       onPressed: () => clientClose(ffi.sessionId, ffi.dialogManager),
-      color: _MenubarTheme.redColor,
+      color: _ToolbarTheme.redColor,
-      hoverColor: _MenubarTheme.hoverRedColor,
+      hoverColor: _ToolbarTheme.hoverRedColor,
     );
   }
 }
@@ -1555,12 +1555,12 @@ class _IconMenuButtonState extends State<_IconMenuButton> {
         SvgPicture.asset(
           widget.assetName!,
           color: Colors.white,
-          width: _MenubarTheme.buttonSize,
+          width: _ToolbarTheme.buttonSize,
-          height: _MenubarTheme.buttonSize,
+          height: _ToolbarTheme.buttonSize,
         );
     final button = SizedBox(
-      width: _MenubarTheme.buttonSize,
+      width: _ToolbarTheme.buttonSize,
-      height: _MenubarTheme.buttonSize,
+      height: _ToolbarTheme.buttonSize,
       child: MenuItemButton(
         style: ButtonStyle(
             backgroundColor: MaterialStatePropertyAll(Colors.transparent),
@@ -1574,14 +1574,14 @@ class _IconMenuButtonState extends State<_IconMenuButton> {
             type: MaterialType.transparency,
             child: Ink(
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(_MenubarTheme.iconRadius),
+                  borderRadius: BorderRadius.circular(_ToolbarTheme.iconRadius),
                   color: hover ? widget.hoverColor : widget.color,
                 ),
                 child: icon)),
       ),
     ).marginSymmetric(
-        horizontal: widget.hMargin ?? _MenubarTheme.buttonHMargin,
+        horizontal: widget.hMargin ?? _ToolbarTheme.buttonHMargin,
-        vertical: widget.vMargin ?? _MenubarTheme.buttonVMargin);
+        vertical: widget.vMargin ?? _ToolbarTheme.buttonVMargin);
     if (widget.topLevel) {
       return MenuBar(children: [button]);
     } else {
@@ -1626,12 +1626,12 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
         SvgPicture.asset(
           widget.svg!,
           color: Colors.white,
-          width: _MenubarTheme.buttonSize,
+          width: _ToolbarTheme.buttonSize,
-          height: _MenubarTheme.buttonSize,
+          height: _ToolbarTheme.buttonSize,
         );
     final button = SizedBox(
-        width: _MenubarTheme.buttonSize,
+        width: _ToolbarTheme.buttonSize,
-        height: _MenubarTheme.buttonSize,
+        height: _ToolbarTheme.buttonSize,
         child: SubmenuButton(
             menuStyle: widget.menuStyle,
             style: ButtonStyle(
@@ -1646,7 +1646,7 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
                 child: Ink(
                     decoration: BoxDecoration(
                       borderRadius:
-                          BorderRadius.circular(_MenubarTheme.iconRadius),
+                          BorderRadius.circular(_ToolbarTheme.iconRadius),
                       color: hover ? widget.hoverColor : widget.color,
                     ),
                     child: icon)),
@@ -1655,8 +1655,8 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
                 .toList()));
     return MenuBar(children: [
       button.marginSymmetric(
-          horizontal: _MenubarTheme.buttonHMargin,
+          horizontal: _ToolbarTheme.buttonHMargin,
-          vertical: _MenubarTheme.buttonVMargin)
+          vertical: _ToolbarTheme.buttonVMargin)
     ]);
   }
 }
@@ -1938,15 +1938,15 @@ class _MultiMonitorMenu extends StatelessWidget {
           return _IconMenuButton(
             topLevel: false,
             color: i == display.value
-                ? _MenubarTheme.blueColor
+                ? _ToolbarTheme.blueColor
                 : Colors.grey[800]!,
             hoverColor: i == display.value
-                ? _MenubarTheme.hoverBlueColor
+                ? _ToolbarTheme.hoverBlueColor
                 : Colors.grey[850]!,
             icon: Container(
               alignment: AlignmentDirectional.center,
               constraints:
-                  const BoxConstraints(minHeight: _MenubarTheme.height),
+                  const BoxConstraints(minHeight: _ToolbarTheme.height),
               child: Stack(
                 alignment: Alignment.center,
                 children: [
@@ -1959,7 +1959,7 @@ class _MultiMonitorMenu extends StatelessWidget {
                       (i + 1).toString(),
                       style: TextStyle(
                         color: i == display.value
-                            ? _MenubarTheme.blueColor
+                            ? _ToolbarTheme.blueColor
                             : Colors.grey[800]!,
                         fontSize: 12,
                         fontWeight: FontWeight.bold,

flutter/lib/models/state_model.dart

@@ -14,7 +14,7 @@ class StateGlobal {
   final RxBool _showTabBar = true.obs;
   final RxDouble _resizeEdgeSize = RxDouble(kWindowEdgeSize);
   final RxDouble _windowBorderWidth = RxDouble(kWindowBorderWidth);
-  final RxBool showRemoteMenuBar = false.obs;
+  final RxBool showRemoteToolBar = false.obs;
   final RxInt displaysCount = 0.obs;
 
   // Use for desktop -> remote toolbar -> resolution

src/lang/ca.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Relació"),
         ("Image Quality", "Qualitat d'imatge"),
         ("Scroll Style", "Estil de desplaçament"),
-        ("Show Menubar", "Mostra barra de menú"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Amaga barra de menú"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Connexió directa"),
         ("Relay Connection", "Connexió Relay"),
         ("Secure Connection", "Connexió segura"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Utilitza llista de IPs admeses"),
         ("Network", "Xarxa"),
         ("Enable RDP", "Habilitar RDP"),
-        ("Pin menubar", "Bloqueja barra de menú"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Desbloquejar barra de menú"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Gravant"),
         ("Directory", "Directori"),
         ("Automatically record incoming sessions", "Gravació automàtica de sessions entrants"),

src/lang/cn.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "比例"),
         ("Image Quality", "画质"),
         ("Scroll Style", "滚屏方式"),
-        ("Show Menubar", "显示菜单栏"),
+        ("Show Toolbar", "显示工具栏"),
-        ("Hide Menubar", "隐藏菜单栏"),
+        ("Hide Toolbar", "隐藏工具栏"),
         ("Direct Connection", "直接连接"),
         ("Relay Connection", "中继连接"),
         ("Secure Connection", "安全连接"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "只允许白名单上的 IP 访问"),
         ("Network", "网络"),
         ("Enable RDP", "允许 RDP 访问"),
-        ("Pin menubar", "固定菜单栏"),
+        ("Pin Toolbar", "固定工具栏"),
-        ("Unpin menubar", "取消固定菜单栏"),
+        ("Unpin Toolbar", "取消固定工具栏"),
         ("Recording", "录屏"),
         ("Directory", "目录"),
         ("Automatically record incoming sessions", "自动录制来访会话"),

src/lang/cs.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Poměr"),
         ("Image Quality", "Kvalita obrazu"),
         ("Scroll Style", "Štýl posúvania"),
-        ("Show Menubar", "Zobrazit panel nabídek"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "skrýt panel nabídek"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Přímé spojení"),
         ("Relay Connection", "Připojení relé"),
         ("Secure Connection", "Zabezpečené připojení"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Připnout panel nabídek"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Odepnout panel nabídek"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/da.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Forhold"),
         ("Image Quality", "Billedkvalitet"),
         ("Scroll Style", "Rullestil"),
-        ("Show Menubar", "Vis menulinje"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Skjul menulinjen"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Direkte forbindelse"),
         ("Relay Connection", "Viderestillingsforbindelse"),
         ("Secure Connection", "Sikker forbindelse"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Brug IP Whitelisting"),
         ("Network", "Netværk"),
         ("Enable RDP", "Aktivér RDP"),
-        ("Pin menubar", "Fastgør menulinjen"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Frigør menulinjen"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Optager"),
         ("Directory", "Mappe"),
         ("Automatically record incoming sessions", "Optag automatisk indgående sessioner"),

src/lang/de.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Verhältnis"),
         ("Image Quality", "Bildqualität"),
         ("Scroll Style", "Scroll-Stil"),
-        ("Show Menubar", "Menüleiste anzeigen"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Menüleiste ausblenden"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Direkte Verbindung"),
         ("Relay Connection", "Relay-Verbindung"),
         ("Secure Connection", "Sichere Verbindung"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "IP-Whitelist verwenden"),
         ("Network", "Netzwerk"),
         ("Enable RDP", "RDP aktivieren"),
-        ("Pin menubar", "Menüleiste anpinnen"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Menüleiste lösen"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Aufnahme"),
         ("Directory", "Verzeichnis"),
         ("Automatically record incoming sessions", "Eingehende Sitzungen automatisch aufzeichnen"),

src/lang/el.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Αναλογία"),
         ("Image Quality", "Ποιότητα εικόνας"),
         ("Scroll Style", "Στυλ κύλισης"),
-        ("Show Menubar", "Εμφάνιση γραμμής μενού"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Απόκρυψη γραμμής μενού"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Απευθείας σύνδεση"),
         ("Relay Connection", "Αναμεταδιδόμενη σύνδεση"),
         ("Secure Connection", "Ασφαλής σύνδεση"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Χρήση λίστας επιτρεπόμενων IP"),
         ("Network", "Δίκτυο"),
         ("Enable RDP", "Ενεργοποίηση RDP"),
-        ("Pin menubar", "Καρφίτσωμα γραμμής μενού"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Ξεκαρφίτσωμα γραμμής μενού"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Εγγραφή"),
         ("Directory", "Φάκελος εγγραφών"),
         ("Automatically record incoming sessions", "Αυτόματη εγγραφή εισερχόμενων συνεδριών"),

src/lang/eo.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Proporcio"),
         ("Image Quality", "Bilda Kvalito"),
         ("Scroll Style", "Ruluma Stilo"),
-        ("Show Menubar", "Montru menubreton"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "kaŝi menubreton"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Rekta Konekto"),
         ("Relay Connection", "Relajsa Konekto"),
         ("Secure Connection", "Sekura Konekto"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Alpingla menubreto"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Malfiksi menubreton"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/es.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Relación"),
         ("Image Quality", "Calidad de imagen"),
         ("Scroll Style", "Estilo de desplazamiento"),
-        ("Show Menubar", "Mostrar barra de menú"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Ocultar barra de menú"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Conexión directa"),
         ("Relay Connection", "Conexión Relay"),
         ("Secure Connection", "Conexión segura"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Usar lista de IPs admitidas"),
         ("Network", "Red"),
         ("Enable RDP", "Habilitar RDP"),
-        ("Pin menubar", "Pin barra de menú"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Desbloquear barra de menú"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Grabando"),
         ("Directory", "Directorio"),
         ("Automatically record incoming sessions", "Grabación automática de sesiones entrantes"),

src/lang/fa.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "نسبت"),
         ("Image Quality", "کیفیت تصویر"),
         ("Scroll Style", "سبک اسکرول"),
-        ("Show Menubar", "نمایش نوار منو"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "پنهان کردن نوار منو"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "ارتباط مستقیم"),
         ("Relay Connection", "Relay ارتباط"),
         ("Secure Connection", "ارتباط امن"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "های مجاز IP استفاده از"),
         ("Network", "شبکه"),
         ("Enable RDP", "RDP فعال شدن"),
-        ("Pin menubar", "پین کردن نوار منو"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "آنپین کردن نوار منو"),
+        ("Unpin Toolbar", ""),
         ("Recording", "در حال ضبط"),
         ("Directory", "مسیر"),
         ("Automatically record incoming sessions", "ضبط خودکار جلسات ورودی"),

src/lang/fr.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Rapport"),
         ("Image Quality", "Qualité d'image"),
         ("Scroll Style", "Style de défilement"),
-        ("Show Menubar", "Afficher la barre de menus"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "masquer la barre de menus"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Connexion directe"),
         ("Relay Connection", "Connexion relais"),
         ("Secure Connection", "Connexion sécurisée"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Utiliser une liste blanche d'IP"),
         ("Network", "Réseau"),
         ("Enable RDP", "Activer connection RDP"),
-        ("Pin menubar", "Épingler la barre de menus"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Détacher la barre de menu"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Enregistrement"),
         ("Directory", "Répertoire"),
         ("Automatically record incoming sessions", "Enregistrement automatique des sessions entrantes"),

src/lang/hu.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Arány"),
         ("Image Quality", "Képminőség"),
         ("Scroll Style", "Görgetési stílus"),
-        ("Show Menubar", "Menüsor megjelenítése"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Menüsor elrejtése"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Közvetlen kapcsolat"),
         ("Relay Connection", "Közvetett csatlakozás"),
         ("Secure Connection", "Biztonságos kapcsolat"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Engedélyezési lista használata"),
         ("Network", "Hálózat"),
         ("Enable RDP", "RDP engedélyezése"),
-        ("Pin menubar", "Menüsor rögzítése"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Menüsor rögzítésének feloldása"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Felvétel"),
         ("Directory", "Könyvtár"),
         ("Automatically record incoming sessions", "A bejövő munkamenetek automatikus rögzítése"),

src/lang/id.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Perbandingan"),
         ("Image Quality", "Kualitas gambar"),
         ("Scroll Style", "Gaya Gulir"),
-        ("Show Menubar", "Tampilkan bilah menu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "sembunyikan bilah menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Koneksi langsung"),
         ("Relay Connection", "Koneksi Relay"),
         ("Secure Connection", "Koneksi aman"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Gunakan Daftar Putih IP"),
         ("Network", "Jaringan"),
         ("Enable RDP", "Aktifkan RDP"),
-        ("Pin menubar", "Pin menubar"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Unpin menubar"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Rekaman"),
         ("Directory", "Direktori"),
         ("Automatically record incoming sessions", "Secara otomatis merekam sesi masuk"),

src/lang/it.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Rapporto"),
         ("Image Quality", "Qualità immagine"),
         ("Scroll Style", "Stile scorrimento"),
-        ("Show Menubar", "Visualizza barra menu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "nascondi la barra dei menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Connessione diretta"),
         ("Relay Connection", "Connessione relay"),
         ("Secure Connection", "Connessione sicura"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Usa elenco IP autorizzati"),
         ("Network", "Rete"),
         ("Enable RDP", "Abilita RDP"),
-        ("Pin menubar", "Blocca barra menu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Sblocca barra menu"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Registrazione"),
         ("Directory", "Cartella"),
         ("Automatically record incoming sessions", "Registra automaticamente le sessioni in entrata"),

src/lang/ja.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "比率"),
         ("Image Quality", "画質"),
         ("Scroll Style", "スクロール スタイル"),
-        ("Show Menubar", "メニューバーを表示"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "メニューバーを隠す"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "直接接続"),
         ("Relay Connection", "リレー接続"),
         ("Secure Connection", "安全な接続"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "メニューバーを固定する"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "メニューバーのピン留めを外す"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/ko.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "비율"),
         ("Image Quality", "이미지 품질"),
         ("Scroll Style", "스크롤 스타일"),
-        ("Show Menubar", "메뉴 표시줄 표시"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "메뉴 표시줄 숨기기"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "직접 연결"),
         ("Relay Connection", "릴레이 연결"),
         ("Secure Connection", "보안 연결"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "핀 메뉴 바"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "메뉴 모음 고정 해제"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/kz.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Арақатынас"),
         ("Image Quality", "Сурет Сапасы"),
         ("Scroll Style", "Scroll Теңшетұрі"),
-        ("Show Menubar", "Мәзір жолағын көрсету"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Мәзір жолағын жасыру"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Тікелей Қосылым"),
         ("Relay Connection", "Релай Қосылым"),
         ("Secure Connection", "Қауіпсіз Қосылым"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Мәзір жолағын бекіту"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Мәзір жолағын босату"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/lt.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Santykis"),
         ("Image Quality", "Vaizdo kokybė"),
         ("Scroll Style", "Slinkimo stilius"),
-        ("Show Menubar", "Rodyti meniu juostą"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Slėpti meniu juostą"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Tiesioginis ryšys"),
         ("Relay Connection", "Tarpinė jungtis"),
         ("Secure Connection", "Saugus ryšys"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Naudoti patikimą IP sąrašą"),
         ("Network", "Tinklas"),
         ("Enable RDP", "Įgalinti RDP"),
-        ("Pin menubar", "Prisegti meniu juostą"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Atsegti meniu juostą"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Įrašymas"),
         ("Directory", "Katalogas"),
         ("Automatically record incoming sessions", "Automatiškai įrašyti įeinančius seansus"),

src/lang/nl.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Verhouding"),
         ("Image Quality", "Beeldkwaliteit"),
         ("Scroll Style", "Scroll Stijl"),
-        ("Show Menubar", "Toon Menubalk"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Verberg Menubalk"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Directe Verbinding"),
         ("Relay Connection", "Relaisverbinding"),
         ("Secure Connection", "Beveiligde Verbinding"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Gebruik een witte lijst van IP-adressen"),
         ("Network", "Netwerk"),
         ("Enable RDP", "Zet RDP aan"),
-        ("Pin menubar", "Menubalk Vastzetten"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Menubalk vrijmaken"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Opnemen"),
         ("Directory", "Map"),
         ("Automatically record incoming sessions", "Automatisch inkomende sessies opnemen"),

src/lang/pl.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Proporcje"),
         ("Image Quality", "Jakość obrazu"),
         ("Scroll Style", "Styl przewijania"),
-        ("Show Menubar", "Pokaż pasek menu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Ukryj pasek menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Połączenie bezpośrednie"),
         ("Relay Connection", "Połączenie przez bramkę"),
         ("Secure Connection", "Połączenie szyfrowane"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Użyj białej listy IP"),
         ("Network", "Sieć"),
         ("Enable RDP", "Włącz RDP"),
-        ("Pin menubar", "Przypnij pasek menu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Odepnij pasek menu"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Nagrywanie"),
         ("Directory", "Katalog"),
         ("Automatically record incoming sessions", "Automatycznie nagrywaj sesje przychodzące"),

src/lang/pt_PT.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Razão"),
         ("Image Quality", "Qualidade da imagem"),
         ("Scroll Style", "Estilo de rolagem"),
-        ("Show Menubar", "Mostrar barra de menus"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "ocultar barra de menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Conexão direta"),
         ("Relay Connection", "Conexão de relé"),
         ("Secure Connection", "Conexão segura"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Fixar barra de menu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Desenganxa la barra de menús"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/ptbr.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Proporção"),
         ("Image Quality", "Qualidade de Imagem"),
         ("Scroll Style", "Estilo de Rolagem"),
-        ("Show Menubar", "Exibir Barra de Menu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Ocultar Barra de Menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Conexão Direta"),
         ("Relay Connection", "Conexão via Relay"),
         ("Secure Connection", "Conexão Segura"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Utilizar lista de IPs confiáveis"),
         ("Network", "Rede"),
         ("Enable RDP", "Habilitar RDP"),
-        ("Pin menubar", "Fixar barra de menu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Desafixar barra de menu"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Gravando"),
         ("Directory", "Diretório"),
         ("Automatically record incoming sessions", "Gravar automaticamente sessões de entrada"),

src/lang/ro.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Raport"),
         ("Image Quality", "Calitate imagine"),
         ("Scroll Style", "Stil de derulare"),
-        ("Show Menubar", "Arată bara de meniu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Ascunde bara de meniu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Conexiune directă"),
         ("Relay Connection", "Conexiune prin retransmisie"),
         ("Secure Connection", "Conexiune securizată"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Folosește lista de IP-uri autorizate"),
         ("Network", "Rețea"),
         ("Enable RDP", "Activează RDP"),
-        ("Pin menubar", "Fixează bara de meniu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Detașează bara de meniu"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Înregistrare"),
         ("Directory", "Director"),
         ("Automatically record incoming sessions", "Înregistrează automat sesiunile viitoare"),

src/lang/ru.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Соотношение"),
         ("Image Quality", "Качество изображения"),
         ("Scroll Style", "Стиль прокрутки"),
-        ("Show Menubar", "Показать строку меню"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Скрыть строку меню"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Прямая связь"),
         ("Relay Connection", "Ретранслируемое подключение"),
         ("Secure Connection", "Безопасное подключение"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Использовать белый список IP"),
         ("Network", "Сеть"),
         ("Enable RDP", "Включить RDP"),
-        ("Pin menubar", "Закрепить строку меню"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Открепить строку меню"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Запись"),
         ("Directory", "Папка"),
         ("Automatically record incoming sessions", "Автоматически записывать входящие сеансы"),

src/lang/sk.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Pomer"),
         ("Image Quality", "Kvalita obrazu"),
         ("Scroll Style", "Štýl posúvania"),
-        ("Show Menubar", "Zobraziť panel s ponukami"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "skryť panel s ponukami"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Priame pripojenie"),
         ("Relay Connection", "Reléové pripojenie"),
         ("Secure Connection", "Zabezpečené pripojenie"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Pripnúť panel s ponukami"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Uvoľniť panel s ponukami"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/sl.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Razmerje"),
         ("Image Quality", "Kakovost slike"),
         ("Scroll Style", "Način drsenja"),
-        ("Show Menubar", "Prikaži meni"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Skrij meni"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Neposredna povezava"),
         ("Relay Connection", "Posredovana povezava"),
         ("Secure Connection", "Zavarovana povezava"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Omogoči seznam dovoljenih IP naslovov"),
         ("Network", "Mreža"),
         ("Enable RDP", "Omogoči RDP"),
-        ("Pin menubar", "Pripni menijsko vrstico"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Odpni menijsko vrstico"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Snemanje"),
         ("Directory", "Imenik"),
         ("Automatically record incoming sessions", "Samodejno snemaj vhodne seje"),

src/lang/sq.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Raport"),
         ("Image Quality", "Cilësia e imazhit"),
         ("Scroll Style", "Stili i lëvizjes"),
-        ("Show Menubar", "Shfaq shiritin e menusë"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Fshih menunë"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Lidhja e drejtpërdrejtë"),
         ("Relay Connection", "Lidhja rele"),
         ("Secure Connection", "Lidhje e sigurt"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Përdor listën e bardhë IP"),
         ("Network", "Rrjeti"),
         ("Enable RDP", "Aktivizo RDP"),
-        ("Pin menubar", "Pin menubar"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Zgjidh shiritin e menusë"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Regjistrimi"),
         ("Directory", "Direktoria"),
         ("Automatically record incoming sessions", "Regjistro automatikisht seancat hyrëse"),

src/lang/sr.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Odnos"),
         ("Image Quality", "Kvalitet slike"),
         ("Scroll Style", "Stil skrolovanja"),
-        ("Show Menubar", "Prikaži meni"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Sakrij meni"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Direktna konekcija"),
         ("Relay Connection", "Posredna konekcija"),
         ("Secure Connection", "Bezbedna konekcija"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Koristi listu pouzdanih IP"),
         ("Network", "Mreža"),
         ("Enable RDP", "Dozvoli RDP"),
-        ("Pin menubar", "Zakači meni"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Otkači meni"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Snimanje"),
         ("Directory", "Direktorijum"),
         ("Automatically record incoming sessions", "Automatski snimaj dolazne sesije"),

src/lang/sv.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Ratio"),
         ("Image Quality", "Bildkvalitet"),
         ("Scroll Style", "Scrollstil"),
-        ("Show Menubar", "Visa meny"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "Stäng meny"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Direktanslutning"),
         ("Relay Connection", "Relayanslutning"),
         ("Secure Connection", "Säker anslutning"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Använd IP Vitlistning"),
         ("Network", "Nätvärk"),
         ("Enable RDP", "Aktivera RDP"),
-        ("Pin menubar", "Fäst meny"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Sluta fäst meny"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Spelar in"),
         ("Directory", "Katalog"),
         ("Automatically record incoming sessions", "Spela in inkommande sessioner automatiskt"),

src/lang/template.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", ""),
         ("Image Quality", ""),
         ("Scroll Style", ""),
-        ("Show Menubar", ""),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", ""),
+        ("Hide Toolbar", ""),
         ("Direct Connection", ""),
         ("Relay Connection", ""),
         ("Secure Connection", ""),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", ""),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", ""),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),

src/lang/th.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "อัตราส่วน"),
         ("Image Quality", "คุณภาพภาพ"),
         ("Scroll Style", "ลักษณะการเลื่อน"),
-        ("Show Menubar", "แสดงแถบเมนู"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "ซ่อนแถบเมนู"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "การเชื่อมต่อตรง"),
         ("Relay Connection", "การเชื่อมต่อแบบรีเลย์"),
         ("Secure Connection", "การเชื่อมต่อที่ปลอดภัย"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "ใช้งาน IP ไวท์ลิสต์"),
         ("Network", "เครือข่าย"),
         ("Enable RDP", "เปิดการใช้งาน RDP"),
-        ("Pin menubar", "ปักหมุดแถบเมนู"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "ยกเลิกการปักหมุดแถบเมนู"),
+        ("Unpin Toolbar", ""),
         ("Recording", "การบันทึก"),
         ("Directory", "ไดเรกทอรี่"),
         ("Automatically record incoming sessions", "บันทึกเซสชันขาเข้าโดยอัตโนมัติ"),

src/lang/tr.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Oran"),
         ("Image Quality", "Görüntü kalitesi"),
         ("Scroll Style", "Kaydırma Stili"),
-        ("Show Menubar", "Menü çubuğunu göster"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "menü çubuğunu gizle"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Doğrudan Bağlantı"),
         ("Relay Connection", "Röle Bağlantısı"),
         ("Secure Connection", "Güvenli bağlantı"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "IP Beyaz Listeyi Kullan"),
         ("Network", "Ağ"),
         ("Enable RDP", "RDP Aktif Et"),
-        ("Pin menubar", "Menü çubuğunu sabitle"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Menü çubuğunun sabitlemesini kaldır"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Kayıt Ediliyor"),
         ("Directory", "Klasör"),
         ("Automatically record incoming sessions", "Gelen oturumları otomatik olarak kayıt et"),

src/lang/tw.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "比例"),
         ("Image Quality", "畫質"),
         ("Scroll Style", "滾動樣式"),
-        ("Show Menubar", "顯示選單欄"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "隱藏選單欄"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "直接連線"),
         ("Relay Connection", "中繼連線"),
         ("Secure Connection", "安全連線"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "只允許白名單上的 IP 進行連線"),
         ("Network", "網路"),
         ("Enable RDP", "允許 RDP 訪問"),
-        ("Pin menubar", "固定選單欄"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "取消固定選單欄"),
+        ("Unpin Toolbar", ""),
         ("Recording", "錄製"),
         ("Directory", "路徑"),
         ("Automatically record incoming sessions", "自動錄製連入的工作階段"),

src/lang/ua.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Співвідношення"),
         ("Image Quality", "Якість зображення"),
         ("Scroll Style", "Стиль прокрутки"),
-        ("Show Menubar", "Показати рядок меню"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "приховати рядок меню"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Пряме підключення"),
         ("Relay Connection", "Релейне підключення"),
         ("Secure Connection", "Безпечне підключення"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", "Використовувати білий список IP"),
         ("Network", "Мережа"),
         ("Enable RDP", "Увімкнути RDP"),
-        ("Pin menubar", "Закріпити рядок меню"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Відкріпити рядок меню"),
+        ("Unpin Toolbar", ""),
         ("Recording", "Запис"),
         ("Directory", "Директорія"),
         ("Automatically record incoming sessions", "Автоматично записувати вхідні сеанси"),

src/lang/vn.rs

@@ -336,8 +336,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Tỉ lệ"),
         ("Image Quality", "Chất lượng hình ảnh"),
         ("Scroll Style", "Kiểu cuộn"),
-        ("Show Menubar", "Hiển thị thanh menu"),
+        ("Show Toolbar", ""),
-        ("Hide Menubar", "ẩn thanh menu"),
+        ("Hide Toolbar", ""),
         ("Direct Connection", "Kết nối trực tiếp"),
         ("Relay Connection", "Kết nối chuyển tiếp"),
         ("Secure Connection", "Kết nối an toàn"),
@@ -366,8 +366,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use IP Whitelisting", ""),
         ("Network", ""),
         ("Enable RDP", ""),
-        ("Pin menubar", "Ghim thanh menu"),
+        ("Pin Toolbar", ""),
-        ("Unpin menubar", "Bỏ ghim thanh menu"),
+        ("Unpin Toolbar", ""),
         ("Recording", ""),
         ("Directory", ""),
         ("Automatically record incoming sessions", ""),