summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordynaflash <[email protected]>2008-12-12 15:53:15 +0000
committerdynaflash <[email protected]>2008-12-12 15:53:15 +0000
commit1a295f78e540e2c086e07615efeaf1c3268637eb (patch)
treef01fbb12a11db4fabe68632b9b299403315a75e3 /macosx
parent53d51e1e9ca1e766bcaa92360cc77e48f0b6d46a (diff)
MacGui: Add "Picture Settings" toolbar item to main window toolbar
- Currently uses the same icon as the picture item in the preferences toolbar - Performs same function as the "Picture Settings ..." button in the video tab which is to say it opens the picture settings window - Removed the "Picture Settings ..." button in the video tab git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2021 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.h1
-rw-r--r--macosx/Controller.mm27
-rw-r--r--macosx/English.lproj/MainMenu.xib58
3 files changed, 23 insertions, 63 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 453b48017..5ab03c60b 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -198,7 +198,6 @@ BOOL fIsDragging;
ChapterTitles * fChapterTitlesDelegate;
/* Bottom */
- IBOutlet NSButton * fPictureButton;
IBOutlet NSTextField * fStatusField;
IBOutlet NSProgressIndicator * fRipIndicator;
BOOL fRipIndicatorShown;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index dc2dacd65..24acbbb06 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -18,6 +18,7 @@ static NSString * StartEncodingIdentifier = @"Start Encoding I
static NSString * PauseEncodingIdentifier = @"Pause Encoding Item Identifier";
static NSString * ShowQueueIdentifier = @"Show Queue Item Identifier";
static NSString * AddToQueueIdentifier = @"Add to Queue Item Identifier";
+static NSString * ShowPictureIdentifier = @"Show Picture Window Item Identifier";
static NSString * ShowActivityIdentifier = @"Debug Output Item Identifier";
static NSString * ChooseSourceIdentifier = @"Choose Source Item Identifier";
@@ -410,7 +411,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
fAudTrack1BitratePopUp, fAudTrack2BitratePopUp, fAudTrack3BitratePopUp, fAudTrack4BitratePopUp,
fAudDrcLabel, fAudTrack1DrcSlider, fAudTrack1DrcField, fAudTrack2DrcSlider,
fAudTrack2DrcField, fAudTrack3DrcSlider, fAudTrack3DrcField, fAudTrack4DrcSlider,fAudTrack4DrcField,
- fPictureButton,fQueueStatus,fPicSettingARkeep, fPicSettingDeinterlace,fPicLabelSettings,fPicLabelSrc,
+ fQueueStatus,fPicSettingARkeep, fPicSettingDeinterlace,fPicLabelSettings,fPicLabelSrc,
fPicLabelOutp,fPicSettingsSrc,fPicSettingsOutp,fPicSettingsAnamorphic,
fPicLabelAr,fPicLabelDeinterlace,fPicSettingPAR,fPicLabelAnamorphic,fPresetsAdd,fPresetsDelete,
fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fPicLabelAutoCrop,
@@ -924,7 +925,17 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[item setTarget: self];
[item setAction: @selector(Pause:)];
}
- else if ([itemIdent isEqualToString: ShowActivityIdentifier]) {
+ else if ([itemIdent isEqualToString: ShowPictureIdentifier])
+ {
+ [item setLabel: @"Picture Settings"];
+ [item setPaletteLabel: @"Show Picture Settings"];
+ [item setToolTip: @"Show Picture Settings"];
+ [item setImage: [NSImage imageNamed: @"pref-picture"]];
+ [item setTarget: self];
+ [item setAction: @selector(showPicturePanel:)];
+ }
+ else if ([itemIdent isEqualToString: ShowActivityIdentifier])
+ {
[item setLabel: @"Activity Window"];
[item setPaletteLabel: @"Show Activity Window"];
[item setToolTip: @"Show Activity Window"];
@@ -954,13 +965,13 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
{
return [NSArray arrayWithObjects: ChooseSourceIdentifier, NSToolbarSeparatorItemIdentifier, StartEncodingIdentifier,
PauseEncodingIdentifier, AddToQueueIdentifier, ShowQueueIdentifier, NSToolbarFlexibleSpaceItemIdentifier,
- NSToolbarSpaceItemIdentifier, ShowActivityIdentifier, ToggleDrawerIdentifier, nil];
+ NSToolbarSpaceItemIdentifier, ShowPictureIdentifier, ShowActivityIdentifier, ToggleDrawerIdentifier, nil];
}
- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
{
return [NSArray arrayWithObjects: StartEncodingIdentifier, PauseEncodingIdentifier, AddToQueueIdentifier,
- ChooseSourceIdentifier, ShowQueueIdentifier, ShowActivityIdentifier, ToggleDrawerIdentifier,
+ ChooseSourceIdentifier, ShowQueueIdentifier, ShowPictureIdentifier, ShowActivityIdentifier, ToggleDrawerIdentifier,
NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier,
NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil];
}
@@ -993,8 +1004,12 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
return YES;
}
if (SuccessfulScan)
+ {
if ([ident isEqualToString: AddToQueueIdentifier])
return YES;
+ if ([ident isEqualToString: ShowPictureIdentifier])
+ return YES;
+ }
}
else if (s.state == HB_STATE_PAUSED)
{
@@ -1010,6 +1025,8 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
return YES;
if ([ident isEqualToString: AddToQueueIdentifier])
return YES;
+ if ([ident isEqualToString: ShowPictureIdentifier])
+ return YES;
}
else if (s.state == HB_STATE_SCANNING)
return NO;
@@ -1028,6 +1045,8 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
}
if ([ident isEqualToString: AddToQueueIdentifier])
return YES;
+ if ([ident isEqualToString: ShowPictureIdentifier])
+ return YES;
}
}
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index ce0ff233d..d910dda87 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -414,29 +414,6 @@
<reference key="NSTextColor" ref="701609070"/>
</object>
</object>
- <object class="NSButton" id="37121296">
- <reference key="NSNextResponder" ref="1053078401"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{580, 95}, {122, 28}}</string>
- <reference key="NSSuperview" ref="1053078401"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="969536223">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134348800</int>
- <string type="base64-UTF8" key="NSContents">UGljdHVyZSBTZXR0aW5nc+KApg</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="37121296"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="26"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSTextField" id="690364175">
<reference key="NSNextResponder" ref="1053078401"/>
<int key="NSvFlags">256</int>
@@ -5214,14 +5191,6 @@
<int key="connectionID">1637</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showPicturePanel:</string>
- <reference key="source" ref="2258723"/>
- <reference key="destination" ref="37121296"/>
- </object>
- <int key="connectionID">1735</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">fPicLabelSrc</string>
<reference key="source" ref="2258723"/>
@@ -5255,14 +5224,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fPictureButton</string>
- <reference key="source" ref="2258723"/>
- <reference key="destination" ref="37121296"/>
- </object>
- <int key="connectionID">1750</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fSubField</string>
<reference key="source" ref="2258723"/>
<reference key="destination" ref="436388527"/>
@@ -6942,7 +6903,6 @@
<reference ref="946167393"/>
<reference ref="554762309"/>
<reference ref="219409733"/>
- <reference ref="37121296"/>
</object>
<reference key="parent" ref="107038816"/>
</object>
@@ -7064,15 +7024,6 @@
<reference key="parent" ref="1053078401"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1713</int>
- <reference key="object" ref="37121296"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="969536223"/>
- </object>
- <reference key="parent" ref="1053078401"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">1714</int>
<reference key="object" ref="219409733"/>
<object class="NSMutableArray" key="children">
@@ -8650,11 +8601,6 @@
<reference key="parent" ref="586924601"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">4882</int>
- <reference key="object" ref="969536223"/>
- <reference key="parent" ref="37121296"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">4883</int>
<reference key="object" ref="215270136"/>
<reference key="parent" ref="219409733"/>
@@ -10176,8 +10122,6 @@
<string>1636.ImportedFromIB2</string>
<string>1638.IBPluginDependency</string>
<string>1638.ImportedFromIB2</string>
- <string>1713.IBPluginDependency</string>
- <string>1713.ImportedFromIB2</string>
<string>1714.IBPluginDependency</string>
<string>1714.ImportedFromIB2</string>
<string>1717.IBPluginDependency</string>
@@ -10939,8 +10883,6 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>{{454, 306}, {270, 550}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0" id="8"/>