no more removing library, header cells in source list

jcm93 · Aug 27, 2017 · 6c8d7df · 6c8d7df
1 parent 142c978
commit 6c8d7df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/jmc/Main Interface Components/Subview Controllers/SourceListViewController.swift b/jmc/Main Interface Components/Subview Controllers/SourceListViewController.swift
@@ -50,6 +50,10 @@ class SourceListViewController: NSViewController, NSOutlineViewDelegate, NSOutli
 
     @IBOutlet var sourceListMenu: NSMenu!
     var editSmartPlaylistMenuItem = NSMenuItem(title: "Edit Smart Playlist", action: #selector(editSmartPlaylistAction), keyEquivalent: "")
+    var removePlaylistMenuItem = NSMenuItem(title: "Remove Playlist", action: #selector(removePlaylist), keyEquivalent: "")
+    var exportPlaylistMenuItem = NSMenuItem(title: "Export Playlist", action: #selector(exportPlaylist), keyEquivalent: "")
+
+    var playlistMenuItems: [NSMenuItem]!
 
     lazy var rootSourceListItem: SourceListItem! = {
         let request = NSFetchRequest<NSFetchRequestResult>(entityName: "SourceListItem")
@@ -104,6 +108,12 @@ class SourceListViewController: NSViewController, NSOutlineViewDelegate, NSOutli
 
     func menuWillOpen(_ menu: NSMenu) {
         guard let item = sourceList.item(atRow: sourceList.clickedRow) as? SourceListItem else { return }
+        guard item.playlist != nil else { menu.removeAllItems(); return }
+        if menu.items.count == 0 {
+            for item in self.playlistMenuItems {
+                menu.addItem(item)
+            }
+        }
         if item.playlist?.smart_criteria != nil {
             if !self.sourceListMenu.items.contains(self.editSmartPlaylistMenuItem) {
                 self.sourceListMenu.insertItem(self.editSmartPlaylistMenuItem, at: 1)
@@ -574,6 +584,7 @@ class SourceListViewController: NSViewController, NSOutlineViewDelegate, NSOutli
         libraryHeaderNode = rootSourceListItem?.children?[0] as? SourceListItem
         sharedHeaderNode = rootSourceListItem?.children?[1] as? SourceListItem
         playlistHeaderNode = rootSourceListItem?.children?[2] as? SourceListItem
+        self.playlistMenuItems = [self.removePlaylistMenuItem, self.exportPlaylistMenuItem]
         sourceList.delegate = self
         sourceList.dataSource = self
         sourceList.autosaveExpandedItems = true

diff --git a/jmc/Main Interface Components/Subview Controllers/SourceListViewController.xib b/jmc/Main Interface Components/Subview Controllers/SourceListViewController.xib
@@ -463,20 +463,6 @@
             <point key="canvasLocation" x="330.5" y="345.5"/>
         </customView>
         <menu id="CJP-UP-07s">
-            <items>
-                <menuItem title="Remove Playlist" id="R4D-LH-Ydh">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="removePlaylist:" target="-2" id="Taf-WF-dpO"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Export..." id="xFF-0U-KLT">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="exportPlaylist:" target="-2" id="7Yo-39-zYV"/>
-                    </connections>
-                </menuItem>
-            </items>
             <point key="canvasLocation" x="89" y="-11"/>
         </menu>
     </objects>