summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.mm
diff options
context:
space:
mode:
authorritsuka <damiog@gmail.com>2008-06-25 13:05:04 +0000
committerritsuka <damiog@gmail.com>2008-06-25 13:05:04 +0000
commit65b74e51bbae41b4b2a9a92a410e92caf80e8d8d (patch)
treeea834034b1969e857141bd4525250e4f93babf73 /macosx/Controller.mm
parent3b829798a6b6e4189ffaaea03084b427a1c18097 (diff)
MacGUI: Replace MVMenuButton with standard controls. Thanks blindjimmy.
Replace plus and minus icons with apple's one. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1537 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r--macosx/Controller.mm32
1 files changed, 16 insertions, 16 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index e0edefa02..b899585df 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -176,12 +176,12 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* Initialize currentScanCount so HB can use it to
evaluate successive scans */
currentScanCount = 0;
-
+
/* Init UserPresets .plist */
[self loadPresets];
-
+
fRipIndicatorShown = NO; // initially out of view in the nib
-
+
/* Show/Dont Show Presets drawer upon launch based
on user preference DefaultPresetsDrawerShow*/
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow"] > 0)
@@ -289,22 +289,19 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* Bottom */
[fStatusField setStringValue: @""];
-
+
[self enableUI: NO];
[self setupToolbar];
-
- [fPresetsActionButton setMenu:fPresetsActionMenu];
-
+
/* We disable the Turbo 1st pass checkbox since we are not x264 */
[fVidTurboPassCheck setEnabled: NO];
[fVidTurboPassCheck setState: NSOffState];
-
-
+
+
/* lets get our default prefs here */
[self getDefaultPresets: NULL];
/* lets initialize the current successful scancount here to 0 */
currentSuccessfulScanCount = 0;
-
}
- (void) enableUI: (bool) b
@@ -933,6 +930,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
return NO;
}
if (action == @selector(Rip:))
+ {
if (s.state == HB_STATE_WORKING || s.state == HB_STATE_MUXING || s.state == HB_STATE_PAUSED)
{
if(![[menuItem title] isEqualToString:@"Stop Encoding"])
@@ -948,7 +946,12 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
else
return NO;
}
-
+ }
+ if( action == @selector(setDefaultPreset:) )
+ {
+ return [fPresetsOutlineView selectedRow] != -1;
+ }
+
return YES;
}
@@ -2459,13 +2462,11 @@ the user is using "Custom" settings by determining the sender*/
{
/* Deselect the currently selected Preset if there is one*/
[fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
- [[fPresetsActionMenu itemAtIndex:0] setEnabled: NO];
/* Change UI to show "Custom" settings are being used */
[fPresetSelectedDisplay setStringValue: @"Custom"];
-
+
curUserPresetChosenNum = nil;
}
-
}
@@ -4575,10 +4576,9 @@ if (item == nil)
else
{
[fPictureController setDecomb:0];
- }
+ }
}
[self calculatePictureSizing: NULL];
- [[fPresetsActionMenu itemAtIndex:0] setEnabled: YES];
}
}