Merge pull request #158 from edw4rddx/main

Added cut, copy, paste edit menu items
twostraws · Aug 17, 2022 · 18873e2 · 18873e2
2 parents 9f1bd84 + 8763866
commit 18873e2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/ControlRoom/Base.lproj/Main.storyboard b/ControlRoom/Base.lproj/Main.storyboard
@@ -94,12 +94,28 @@ CA
                                                 <action selector="deleteSelectedSimulators:" target="Ady-hI-5gd" id="DXU-j3-jKE"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="m7H-iA-6aX"/>
+                                        <menuItem isSeparatorItem="YES" id="VlF-Lz-b50"/>
+                                        <menuItem title="Cut" keyEquivalent="x" id="fuj-su-hDM">
+                                            <connections>
+                                                <action selector="cut:" target="Ady-hI-5gd" id="Iic-AZ-esb"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy" keyEquivalent="c" id="crV-ox-do9" userLabel="Copy">
+                                            <connections>
+                                                <action selector="copy:" target="Ady-hI-5gd" id="gBe-Db-CS8"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste" keyEquivalent="v" id="f5u-Np-Ehc" userLabel="Paste">
+                                            <connections>
+                                                <action selector="paste:" target="Ady-hI-5gd" id="8AP-N5-VFw"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
                                             <connections>
                                                 <action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="l8R-YC-BZg"/>
                                     </items>
                                 </menu>
                             </menuItem>

diff --git a/ControlRoom/Main Window/MainWindowController.swift b/ControlRoom/Main Window/MainWindowController.swift
@@ -55,6 +55,7 @@ class MainWindowController: NSWindowController {
             self?.adjustWindowLevel()
         }).store(in: &cancellables)
     }
+
     private func adjustWindowLevel() {
         window?.level = preferences.wantsFloatingWindow ? .floating : .normal
     }
@@ -80,6 +81,7 @@ class MainWindowController: NSWindowController {
 }
 
 extension MainWindowController: NSMenuItemValidation {
+
     func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
         if menuItem.action == #selector(toggleFloatingWindow(_:)) {
             menuItem.state = preferences.wantsFloatingWindow ? .on : .off