Browse Source

Merging Session and Tab menus back to one Tab menu (partially reverts 3067f4df)

Source commit: 58a6ee44fa965174e8ad9e7c51be6c28e77a27b2
Martin Prikryl 4 years ago
parent
commit
d1ecc3c114
2 changed files with 13 additions and 20 deletions
  1. 12 18
      source/forms/ScpCommander.dfm
  2. 1 2
      source/forms/ScpCommander.h

+ 12 - 18
source/forms/ScpCommander.dfm

@@ -443,24 +443,7 @@ inherited ScpCommanderForm: TScpCommanderForm
           Action = NonVisualDataModule.ColorMenuAction2
           Color = clNone
         end
-        object TBXSeparatorItem29: TTBXSeparatorItem
-        end
-        object TBXSubmenuItem21: TTBXSubmenuItem
-          Action = NonVisualDataModule.OpenedTabsAction
-        end
-        object TBXSubmenuItem231: TTBXSubmenuItem
-          Action = NonVisualDataModule.WorkspacesAction
-        end
-        object TBXItem230: TTBXItem
-          Action = NonVisualDataModule.SaveWorkspaceAction
-        end
-      end
-      object TBXSubmenuItem19: TTBXSubmenuItem
-        Caption = '&Session'
-        HelpKeyword = 'ui_commander_menu#session'
-        Hint = 'Session commands'
-        object TBXItem113: TTBXItem
-          Action = NonVisualDataModule.NewSessionAction
+        object TBXSeparatorItem69: TTBXSeparatorItem
         end
         object TBXItem252: TTBXItem
           Action = NonVisualDataModule.DisconnectSessionAction
@@ -485,6 +468,17 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXItem76: TTBXItem
           Action = NonVisualDataModule.PrivateKeyUploadAction
         end
+        object TBXSeparatorItem29: TTBXSeparatorItem
+        end
+        object TBXSubmenuItem21: TTBXSubmenuItem
+          Action = NonVisualDataModule.OpenedTabsAction
+        end
+        object TBXSubmenuItem231: TTBXSubmenuItem
+          Action = NonVisualDataModule.WorkspacesAction
+        end
+        object TBXItem230: TTBXItem
+          Action = NonVisualDataModule.SaveWorkspaceAction
+        end
         object TBXSeparatorItem23: TTBXSeparatorItem
         end
         object TBXSubmenuItem20: TTBXSubmenuItem

+ 1 - 2
source/forms/ScpCommander.h

@@ -168,8 +168,6 @@ __published:
   TTBXItem *TBXItem57;
   TTBXSeparatorItem *TBXSeparatorItem15;
   TTBXItem *TBXItem58;
-  TTBXSubmenuItem *TBXSubmenuItem19;
-  TTBXItem *TBXItem113;
   TTBXSubmenuItem *TBXSubmenuItem20;
   TTBXSeparatorItem *TBXSeparatorItem29;
   TTBXSubmenuItem *TBXSubmenuItem21;
@@ -453,6 +451,7 @@ __published:
   TTBXSeparatorItem *TBXSeparatorItem68;
   TTBXItem *TBXItem238;
   TTBXItem *TBXItem239;
+  TTBXSeparatorItem *TBXSeparatorItem69;
   void __fastcall SplitterMoved(TObject *Sender);
   void __fastcall SplitterCanResize(TObject *Sender, int &NewSize,
     bool &Accept);