summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/Controller.h2
-rw-r--r--macosx/Controller.m15
-rw-r--r--macosx/English.lproj/MainMenu.xib2
3 files changed, 1 insertions, 18 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 8d8c14df3..3a20d59d4 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -34,7 +34,6 @@ extern NSString *keyTitleTag;
@interface HBController : NSObject <GrowlApplicationBridgeDelegate, HBPictureControllerDelegate, NSToolbarDelegate, NSDrawerDelegate>
{
- NSImage * fApplicationIcon;
IBOutlet NSWindow * fWindow;
/* Video view controller */
@@ -197,7 +196,6 @@ extern NSString *keyTitleTag;
DockTextField * timeField;
}
- (int) getPidnum;
-- (IBAction) showAboutPanel:(id)sender;
- (IBAction) browseSources: (id) sender;
- (void) browseSourcesDone: (NSOpenPanel *) sheet
diff --git a/macosx/Controller.m b/macosx/Controller.m
index ac7afee32..507fb0113 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -56,11 +56,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
return nil;
}
- fApplicationIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"HandBrake.icns"]];
-
- if( fApplicationIcon != nil )
- [NSApp setApplicationIconImage:fApplicationIcon];
-
[HBPreferencesController registerUserDefaults];
fHandle = NULL;
fQueueEncodeLibhb = NULL;
@@ -552,7 +547,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[fQueueController release];
[fPreviewController release];
[fPictureController release];
- [fApplicationIcon release];
hb_close(&fHandle);
hb_close(&fQueueEncodeLibhb);
@@ -1748,15 +1742,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
}
}
-- (IBAction)showAboutPanel:(id)sender
-{
- NSMutableDictionary* d = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- fApplicationIcon, @"ApplicationIcon",
- nil ];
- [NSApp orderFrontStandardAboutPanelWithOptions:d];
- [d release];
-}
-
/* Here we open the title selection sheet where we can specify an exact title to be scanned */
- (IBAction) showSourceTitleScanPanel: (id) sender
{
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 2c7697695..c0391d779 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -432,7 +432,7 @@
<menuItem title="About HandBrake" id="58">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
- <action selector="showAboutPanel:" target="240" id="5245"/>
+ <action selector="orderFrontStandardAboutPanel:" target="-2" id="W6s-9y-dwJ"/>
</connections>
</menuItem>
<menuItem title="Check for Updates…" id="4964">