Commit 0f148a8e authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: split playlist menu from main menu

parent 697f59f3
This diff is collapsed.
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
7D8BB0B21830244B00FAE9B7 /* CrashReporter.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */; }; 7D8BB0B21830244B00FAE9B7 /* CrashReporter.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */; };
7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */; }; 7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */; };
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; };
7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; }; 7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; };
7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; }; 7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; };
CC04323D13B246DF00D7D52E /* effects-double-buttons_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */; }; CC04323D13B246DF00D7D52E /* effects-double-buttons_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */; };
...@@ -474,6 +475,7 @@ ...@@ -474,6 +475,7 @@
7D8BB0B318302AC000FAE9B7 /* DebugMessageVisualizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DebugMessageVisualizer.h; path = ../../../modules/gui/macosx/DebugMessageVisualizer.h; sourceTree = "<group>"; }; 7D8BB0B318302AC000FAE9B7 /* DebugMessageVisualizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DebugMessageVisualizer.h; path = ../../../modules/gui/macosx/DebugMessageVisualizer.h; sourceTree = "<group>"; };
7D8BB0B418302AC000FAE9B7 /* DebugMessageVisualizer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = DebugMessageVisualizer.m; path = ../../../modules/gui/macosx/DebugMessageVisualizer.m; sourceTree = "<group>"; }; 7D8BB0B418302AC000FAE9B7 /* DebugMessageVisualizer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = DebugMessageVisualizer.m; path = ../../../modules/gui/macosx/DebugMessageVisualizer.m; sourceTree = "<group>"; };
7D8BB0B61830311300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/DebugMessageVisualizer.xib; sourceTree = "<group>"; }; 7D8BB0B61830311300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/DebugMessageVisualizer.xib; sourceTree = "<group>"; };
7D8BB0B91830367200FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistMenu.xib; sourceTree = "<group>"; };
7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; }; 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; };
7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark@2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png"; sourceTree = "<group>"; }; 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark@2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png"; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; }; 8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
...@@ -1790,6 +1792,7 @@ ...@@ -1790,6 +1792,7 @@
CC461F73160084A10022423C /* SharedDialogs.xib */, CC461F73160084A10022423C /* SharedDialogs.xib */,
7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */, 7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */,
7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */, 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */,
7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */,
); );
name = xibs; name = xibs;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2175,6 +2178,7 @@ ...@@ -2175,6 +2178,7 @@
CC91908F159B4BB800E634A7 /* playlist-blue_dark@2x.png in Resources */, CC91908F159B4BB800E634A7 /* playlist-blue_dark@2x.png in Resources */,
CC919090159B4BB800E634A7 /* playlist-blue-pressed_dark@2x.png in Resources */, CC919090159B4BB800E634A7 /* playlist-blue-pressed_dark@2x.png in Resources */,
CC919091159B4BB800E634A7 /* effects-double-buttons_dark@2x.png in Resources */, CC919091159B4BB800E634A7 /* effects-double-buttons_dark@2x.png in Resources */,
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */,
CC919092159B4BB800E634A7 /* effects-double-buttons-pressed_dark@2x.png in Resources */, CC919092159B4BB800E634A7 /* effects-double-buttons-pressed_dark@2x.png in Resources */,
CC919093159B4BB800E634A7 /* effects-one-button_dark@2x.png in Resources */, CC919093159B4BB800E634A7 /* effects-one-button_dark@2x.png in Resources */,
CC919094159B4BB800E634A7 /* effects-one-button-blue_dark@2x.png in Resources */, CC919094159B4BB800E634A7 /* effects-one-button-blue_dark@2x.png in Resources */,
...@@ -2289,6 +2293,14 @@ ...@@ -2289,6 +2293,14 @@
name = DebugMessageVisualizer.xib; name = DebugMessageVisualizer.xib;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */ = {
isa = PBXVariantGroup;
children = (
7D8BB0B91830367200FAE9B7 /* English */,
);
name = PlaylistMenu.xib;
sourceTree = "<group>";
};
CC0663371566CD5A003A411C /* ConvertAndSave.xib */ = { CC0663371566CD5A003A411C /* ConvertAndSave.xib */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
- (IBAction)sortNodeByName:(id)sender; - (IBAction)sortNodeByName:(id)sender;
- (IBAction)sortNodeByAuthor:(id)sender; - (IBAction)sortNodeByAuthor:(id)sender;
- (IBAction)recursiveExpandNode:(id)sender; - (IBAction)recursiveExpandNode:(id)sender;
- (IBAction)showInfoPanel:(id)sender;
- (id)playingItem; - (id)playingItem;
- (NSArray *)draggedItems; - (NSArray *)draggedItems;
......
...@@ -419,6 +419,9 @@ ...@@ -419,6 +419,9 @@
BOOL b_isSortDescending; BOOL b_isSortDescending;
id o_tc_sortColumn; id o_tc_sortColumn;
NSInteger retainedRowSelection; NSInteger retainedRowSelection;
BOOL b_playlistmenu_nib_loaded;
BOOL b_view_setup;
} }
- (void)saveTableColumns; - (void)saveTableColumns;
...@@ -457,6 +460,9 @@ ...@@ -457,6 +460,9 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
if (b_view_setup)
return;
playlist_t * p_playlist = pl_Get(VLCIntf); playlist_t * p_playlist = pl_Get(VLCIntf);
[super awakeFromNib]; [super awakeFromNib];
...@@ -498,6 +504,8 @@ ...@@ -498,6 +504,8 @@
} }
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
b_view_setup = YES;
} }
- (void)applicationWillTerminate:(NSNotification *)notification - (void)applicationWillTerminate:(NSNotification *)notification
...@@ -886,6 +894,11 @@ ...@@ -886,6 +894,11 @@
[o_outline_view selectAll: nil]; [o_outline_view selectAll: nil];
} }
- (IBAction)showInfoPanel:(id)sender
{
[[[VLCMain sharedInstance] info] initPanel];
}
- (IBAction)deleteItem:(id)sender - (IBAction)deleteItem:(id)sender
{ {
int i_count; int i_count;
...@@ -1226,6 +1239,9 @@ ...@@ -1226,6 +1239,9 @@
- (NSMenu *)menuForEvent:(NSEvent *)o_event - (NSMenu *)menuForEvent:(NSEvent *)o_event
{ {
if (!b_playlistmenu_nib_loaded)
b_playlistmenu_nib_loaded = [NSBundle loadNibNamed:@"PlaylistMenu" owner:self];
NSPoint pt; NSPoint pt;
bool b_rows; bool b_rows;
bool b_item_sel; bool b_item_sel;
...@@ -1247,7 +1263,7 @@ ...@@ -1247,7 +1263,7 @@
[o_mi_sort_name setEnabled: b_item_sel]; [o_mi_sort_name setEnabled: b_item_sel];
[o_mi_sort_author setEnabled: b_item_sel]; [o_mi_sort_author setEnabled: b_item_sel];
return(o_ctx_menu); return o_ctx_menu;
} }
- (void)outlineView: (NSOutlineView *)o_tv didClickTableColumn:(NSTableColumn *)o_tc - (void)outlineView: (NSOutlineView *)o_tv didClickTableColumn:(NSTableColumn *)o_tc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment