Skip to content

V
vlc-2-2
Commit 6b09d57e authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: split main window and main menu 

Note that this is a WIP commit so playlist table columns and displaying individual playlist items is currently unavailable

Any playlist interaction (incl. saving) and playback are not affected.
parent 5d55f77f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6675 additions and 5281 deletions
extras/package/macosx/Resources/English.lproj/MainWindow.xib 0 → 100644
View file @ 6b09d57e
This source diff could not be displayed because it is too large. You can view the blob instead.
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 6b09d57e
......@@ -10,6 +10,8 @@
7D8BB0B21830244B00FAE9B7 /* CrashReporter.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */; };
7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */; };
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; };
7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; };
7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */; };
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 */; };
CC04323D13B246DF00D7D52E /* effects-double-buttons_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */; };
......@@ -476,6 +478,8 @@
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>"; };
7D8BB0B91830367200FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistMenu.xib; sourceTree = "<group>"; };
7D8BB0BF1830393300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/MainWindow.xib; sourceTree = "<group>"; };
7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.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>"; };
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; };
......@@ -1793,6 +1797,8 @@
7D8BB0B01830244B00FAE9B7 /* CrashReporter.xib */,
7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */,
7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */,
7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */,
7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */,
);
name = xibs;
sourceTree = "<group>";
......@@ -2172,6 +2178,7 @@
CC919089159B4BB800E634A7 /* repeat-one-blue-pressed_dark@2x.png in Resources */,
CC91908A159B4BB800E634A7 /* fullscreen-one-button_dark@2x.png in Resources */,
CC91908B159B4BB800E634A7 /* pause_dark@2x.png in Resources */,
7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */,
CC91908C159B4BB800E634A7 /* pause-pressed_dark@2x.png in Resources */,
CC91908D159B4BB800E634A7 /* play_dark@2x.png in Resources */,
CC91908E159B4BB800E634A7 /* play-pressed_dark@2x.png in Resources */,
......@@ -2248,6 +2255,7 @@
CC166FE215F5136B0088201B /* previous-6btns-dark-pressed@2x.png in Resources */,
CC166FE315F5136B0088201B /* previous-6btns-dark.png in Resources */,
7D8BB0B21830244B00FAE9B7 /* CrashReporter.xib in Resources */,
7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */,
CC166FE415F5136B0088201B /* previous-6btns-dark@2x.png in Resources */,
CC166FE915F517660088201B /* backward-6btns-pressed.png in Resources */,
CC166FEA15F517660088201B /* backward-6btns-pressed@2x.png in Resources */,
......@@ -2301,6 +2309,22 @@
name = PlaylistMenu.xib;
sourceTree = "<group>";
};
7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */ = {
isa = PBXVariantGroup;
children = (
7D8BB0BF1830393300FAE9B7 /* English */,
);
name = MainWindow.xib;
sourceTree = "<group>";
};
7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */ = {
isa = PBXVariantGroup;
children = (
7DE88F291831396A00CD9DA2 /* English */,
);
name = PlaylistAccessoryView.xib;
sourceTree = "<group>";
};
CC0663371566CD5A003A411C /* ConvertAndSave.xib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/MainMenu.h
View file @ 6b09d57e
......@@ -69,6 +69,7 @@
IBOutlet NSMenuItem * o_mi_open_recent;
IBOutlet NSMenuItem * o_mi_open_wizard;
IBOutlet NSMenuItem * o_mi_convertandsave;
IBOutlet NSMenuItem * o_mi_save_playlist;
IBOutlet NSMenu * o_mu_edit;
IBOutlet NSMenuItem * o_mi_cut;
......@@ -240,6 +241,7 @@
- (IBAction)intfOpenDisc:(id)sender;
- (IBAction)intfOpenNet:(id)sender;
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)savePlaylist:(id)sender;
- (IBAction)toggleEffectsButton:(id)sender;
- (IBAction)toggleJumpButtons:(id)sender;
......@@ -288,6 +290,8 @@
- (IBAction)openDonate:(id)sender;
- (IBAction)viewErrorsAndWarnings:(id)sender;
- (IBAction)showMessagesPanel:(id)showMessagesPanel;
- (IBAction)showMainWindow:(id)sender;
- (IBAction)showPlaylist:(id)sender;
- (void)setPlay;
- (void)setPause;
......
modules/gui/macosx/MainMenu.m
View file @ 6b09d57e
......@@ -327,6 +327,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mi_convertandsave setTitle: _NS("Convert / Stream...")];
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mu_edit setTitle: _NS("Edit")];
[o_mi_cut setTitle: _NS("Cut")];
......@@ -1050,6 +1051,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
[[[VLCMain sharedInstance] wizard] showWizard];
}
- (IBAction)savePlaylist:(id)sender
{
[[[VLCMain sharedInstance] playlist] savePlaylist:sender];
}
- (IBAction)showConvertAndSave:(id)sender
{
if (o_convertandsave == nil)
......@@ -1110,6 +1116,16 @@ static VLCMainMenu *_o_sharedInstance = nil;
[[VLCDebugMessageVisualizer sharedInstance] showPanel];
}
- (IBAction)showMainWindow:(id)sender
{
[[VLCMainWindow sharedInstance] makeKeyAndOrderFront:sender];
}
- (IBAction)showPlaylist:(id)sender
{
[[VLCMainWindow sharedInstance] togglePlaylist:sender];
}
#pragma mark -
#pragma mark Help and Docs
......
modules/gui/macosx/intf.m
View file @ 6b09d57e
......@@ -638,7 +638,6 @@ static VLCMain *_o_sharedMainInstance = nil;
o_mainmenu = [[VLCMainMenu alloc] init];
o_coreinteraction = [[VLCCoreInteraction alloc] init];
o_eyetv = [[VLCEyeTVController alloc] init];
o_mainwindow = [[VLCMainWindow alloc] init];
/* announce our launch to a potential eyetv plugin */
[[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
......@@ -752,6 +751,11 @@ static VLCMain *_o_sharedMainInstance = nil;
PL_LOCK;
items_at_launch = p_playlist->p_local_category->i_children;
PL_UNLOCK;
[NSBundle loadNibNamed:@"MainWindow" owner: NSApp];
o_playlist = [[VLCPlaylist alloc] init];
o_mainwindow = [[VLCMainWindow alloc] init];
[o_mainwindow makeKeyAndOrderFront:nil];
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
......
modules/gui/macosx/playlist.m
View file @ 6b09d57e
......@@ -521,7 +521,6 @@
- (void)initStrings
{
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_delete setTitle: _NS("Delete")];
[o_mi_recursive_expand setTitle: _NS("Expand Node")];
......@@ -537,11 +536,6 @@
[o_search_field setToolTip: _NS("Search in Playlist")];
[o_search_field_other setToolTip: _NS("Search in Playlist")];
[o_save_accessory_text setStringValue: _NS("File Format:")];
[[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")];
[[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")];
[[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML playlist")];
}
- (void)playlistUpdated
......@@ -720,6 +714,13 @@
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
[NSBundle loadNibNamed:@"PlaylistAccessoryView" owner:self];
[o_save_accessory_text setStringValue: _NS("File Format:")];
[[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")];
[[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")];
[[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML playlist")];
[o_save_panel setTitle: _NS("Save Playlist")];
[o_save_panel setPrompt: _NS("Save")];
[o_save_panel setAccessoryView: o_save_accessory_view];
......
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