Skip to content

V
vlc
Commit 491bef0b authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: Remove sharedInstance from About window and rework 

Removes sharedInstance from About window controller, and rework
as a NSWindowController subclass. This is the new owner of the xib
and thus instantiated outside the nib bundle.

Splits Help window in own xib and add own NSWindowController as
well.

refs #5556
parent 55c15c23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 694 additions and 658 deletions
Makefile.am
View file @ 491bef0b
......@@ -145,6 +145,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
extras/package/macosx/Resources/English.lproj/FSPanel.xib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
extras/package/macosx/Resources/English.lproj/Help.xib \
extras/package/macosx/Resources/English.lproj/MainMenu.xib \
extras/package/macosx/Resources/English.lproj/MainWindow.xib \
extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
......
extras/package/macosx/Resources/English.lproj/Help.xib 0 → 100644
View file @ 491bef0b
This diff is collapsed.
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 491bef0b
......@@ -342,6 +342,7 @@
1C88BCC119DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8B19DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png */; };
1C88BCC219DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8C19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png */; };
1C88BCC319DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8D19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png */; };
1CBB2CC81B06A6DE00110ADA /* Help.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1CBB2CC61B06A6DE00110ADA /* Help.xib */; };
1CCB5F511A62A724004C3E90 /* about.h in Sources */ = {isa = PBXBuildFile; fileRef = 8EE1AF9F044465080059A3A7 /* about.h */; };
1CCB5F521A62A724004C3E90 /* about.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EE1AFA0044465080059A3A7 /* about.m */; };
1CCB5F531A62A724004C3E90 /* AddonListDataSource.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF0435E1972E26A0022B534 /* AddonListDataSource.h */; };
......@@ -1204,6 +1205,7 @@
1C88BC8B19DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob@2x.png"; sourceTree = "<group>"; };
1C88BC8C19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob_highlight.png"; sourceTree = "<group>"; };
1C88BC8D19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob_highlight@2x.png"; sourceTree = "<group>"; };
1CBB2CC71B06A6DE00110ADA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Help.xib; sourceTree = "<group>"; };
1CCB5F2F1A62A6A5004C3E90 /* pseudo-vlc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "pseudo-vlc.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1CE5ED1B19DD6AB700FCEFD3 /* lion-window-fullscreen-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lion-window-fullscreen-on.png"; sourceTree = "<group>"; };
1CE5ED1C19DD6AB700FCEFD3 /* lion-window-fullscreen-on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lion-window-fullscreen-on@2x.png"; sourceTree = "<group>"; };
......@@ -2882,6 +2884,7 @@
children = (
E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */,
CCD83E2E13FEA143004F1652 /* About.xib */,
1CBB2CC61B06A6DE00110ADA /* Help.xib */,
CCD83E3013FEA143004F1652 /* AudioEffects.xib */,
CCD83E3213FEA143004F1652 /* Bookmarks.xib */,
CCD83E3413FEA143004F1652 /* CoreDialogs.xib */,
......@@ -3691,6 +3694,7 @@
CC166FEC15F517660088201B /* backward-6btns@2x.png in Resources */,
CC166FF115F517720088201B /* forward-6btns-pressed.png in Resources */,
1C88BCB319DC7CB300645190 /* ys-fs_time_slider_knob@2x.png in Resources */,
1CBB2CC81B06A6DE00110ADA /* Help.xib in Resources */,
CC166FF215F517720088201B /* forward-6btns-pressed@2x.png in Resources */,
CC166FF315F517720088201B /* forward-6btns.png in Resources */,
CC166FF415F517720088201B /* forward-6btns@2x.png in Resources */,
......@@ -3835,6 +3839,14 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
1CBB2CC61B06A6DE00110ADA /* Help.xib */ = {
isa = PBXVariantGroup;
children = (
1CBB2CC71B06A6DE00110ADA /* English */,
);
name = Help.xib;
sourceTree = "<group>";
};
7D3F6523188051F2005776C4 /* BWQuincyMain.xib */ = {
isa = PBXVariantGroup;
children = (
......@@ -4267,6 +4279,7 @@
1CCB5F4C1A62A6A5004C3E90 /* Default */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */ = {
isa = XCConfigurationList;
......
modules/gui/macosx/MainMenu.h
View file @ 491bef0b
......@@ -25,11 +25,13 @@
#import <vlc_common.h>
#import <vlc_interface.h>
@class AboutWindowController;
@class HelpWindowController;
@interface VLCMainMenu : NSObject
{
intf_thread_t *p_intf;
BOOL b_mainMenu_setup;
BOOL b_nib_about_loaded;
BOOL b_nib_videoeffects_loaded;
BOOL b_nib_audioeffects_loaded;
BOOL b_nib_tracksynchro_loaded;
......@@ -37,7 +39,8 @@
BOOL b_nib_convertandsave_loaded;
BOOL b_nib_addonmanager_loaded;
id o_about; /* VLAboutBox */
AboutWindowController *o_about;
HelpWindowController *o_helpWin;
id o_videoeffects; /* VLCVideoEffects */
id o_audioeffects; /* VLCAudioEffects */
id o_trackSynchronization; /* VLCTrackSynchronization */
......@@ -346,4 +349,3 @@
- (int)type;
@end
modules/gui/macosx/MainMenu.m
View file @ 491bef0b
......@@ -94,8 +94,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
if (b_nib_about_loaded)
[o_about release];
[o_about release];
[o_helpWin release];
if (b_nib_videoeffects_loaded)
[o_videoeffects release];
......@@ -1200,11 +1200,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
- (void)initAbout
{
if (! o_about)
o_about = [[VLAboutBox alloc] init];
if (!b_nib_about_loaded)
b_nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp];
if (!o_about)
o_about = [[AboutWindowController alloc] init];
}
- (IBAction)viewAbout:(id)sender
......@@ -1221,8 +1218,10 @@ static VLCMainMenu *_o_sharedInstance = nil;
- (IBAction)viewHelp:(id)sender
{
[self initAbout];
[o_about showHelp];
if (!o_helpWin)
o_helpWin = [[HelpWindowController alloc] init];
[o_helpWin showHelp];
}
- (IBAction)openReadMe:(id)sender
......
modules/gui/macosx/about.h
View file @ 491bef0b
......@@ -27,10 +27,9 @@
/*****************************************************************************
* VLAboutBox interface
*****************************************************************************/
@interface VLAboutBox : NSObject
@interface AboutWindowController : NSWindowController<NSWindowDelegate>
{
/* main about panel and stuff related to its views */
IBOutlet id o_about_window;
IBOutlet id o_name_version_field;
IBOutlet id o_revision_field;
IBOutlet id o_copyright_field;
......@@ -49,23 +48,25 @@
CGFloat f_end;
NSTimeInterval i_start;
BOOL b_restart;
BOOL b_isSetUp;
NSString *o_authors;
}
- (void)showAbout;
- (void)showGPL;
- (IBAction)buttonAction:(id)sender;
@end
/* generic help window */
IBOutlet id o_help_window;
@interface HelpWindowController : NSWindowController
{
IBOutlet WebView *o_help_web_view; //we may _not_ use id here because of method name collisions
IBOutlet id o_help_bwd_btn;
IBOutlet id o_help_fwd_btn;
IBOutlet id o_help_home_btn;
}
+ (VLAboutBox *)sharedInstance;
- (void)showAbout;
- (void)showHelp;
- (void)showGPL;
- (IBAction)buttonAction:(id)sender;
- (IBAction)helpGoHome:(id)sender;
- (void)showHelp;
@end
modules/gui/macosx/about.m
View file @ 491bef0b
This diff is collapsed.
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