summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.h1
-rw-r--r--macosx/Controller.mm161
-rw-r--r--macosx/English.lproj/MainMenu.nib/classes.nib631
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib45
-rw-r--r--macosx/English.lproj/MainMenu.nib/keyedobjects.nibbin71982 -> 80040 bytes
5 files changed, 459 insertions, 379 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index a1df9d47c..030d21eef 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -165,6 +165,7 @@
IBOutlet NSTextField * fPresetNewName;
IBOutlet NSTextField * fPresetNewDesc;
IBOutlet NSPopUpButton * fPresetNewPicSettingsPopUp;
+ IBOutlet NSButton * fPresetNewPicFiltersCheck;
IBOutlet NSTextField * fPresetSelectedDisplay;
NSString * AppSupportDirectory;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 110a310ac..b09dec31f 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2474,8 +2474,8 @@ the user is using "Custom" settings by determining the sender*/
{
hb_job_t * job = fTitle->job;
/* We use the output picture width and height
- as calculated from libhb right after title is set
- in TitlePopUpChanged */
+ as calculated from libhb right after title is set
+ in TitlePopUpChanged */
job->width = PicOrigOutputWidth;
job->height = PicOrigOutputHeight;
[fPictureController setAutoCrop:YES];
@@ -2484,11 +2484,11 @@ the user is using "Custom" settings by determining the sender*/
job->crop[1] = AutoCropBottom;
job->crop[2] = AutoCropLeft;
job->crop[3] = AutoCropRight;
-
-
- [self calculatePictureSizing: sender];
- /* We call method method to change UI to reflect whether a preset is used or not*/
- [self customSettingUsed: sender];
+
+
+ [self calculatePictureSizing: sender];
+ /* We call method to change UI to reflect whether a preset is used or not*/
+ [self customSettingUsed: sender];
}
/**
@@ -3075,8 +3075,8 @@ the user is using "Custom" settings by determining the sender*/
- (IBAction)tableViewSelected:(id)sender
{
/* Since we cannot disable the presets tableView in terms of clickability
- we will use the enabled state of the add presets button to determine whether
- or not clicking on a preset will do anything */
+ we will use the enabled state of the add presets button to determine whether
+ or not clicking on a preset will do anything */
if ([fPresetsAdd isEnabled])
{
if ([tableView selectedRow] >= 0)
@@ -3109,7 +3109,7 @@ the user is using "Custom" settings by determining the sender*/
[fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]]];
/* We can show the preset options here in the gui if we want to
- so we check to see it the user has specified it in the prefs */
+ so we check to see it the user has specified it in the prefs */
[fAdvancedOptions setOptions: [NSString stringWithFormat:[chosenPreset valueForKey:@"x264Option"]]];
/* Lets run through the following functions to get variables set there */
@@ -3128,7 +3128,7 @@ the user is using "Custom" settings by determining the sender*/
/* Video framerate */
/* For video preset video framerate, we want to make sure that Same as source does not conflict with the
- detected framerate in the fVidRatePopUp so we use index 0*/
+ detected framerate in the fVidRatePopUp so we use index 0*/
if ([[NSString stringWithFormat:[chosenPreset valueForKey:@"VideoFramerate"]] isEqualToString: @"Same as source"])
{
[fVidRatePopUp selectItemAtIndex: 0];
@@ -3157,11 +3157,19 @@ the user is using "Custom" settings by determining the sender*/
[fSubPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Subtitles"]]];
/* Picture Settings */
- /* Look to see if we apply these here in objectForKey:@"UsesPictureSettings"] */
- if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] > 0)
+ /* Note: objectForKey:@"UsesPictureSettings" now refers to picture size, this encompasses:
+ * height, width, keep ar, anamorphic and crop settings.
+ * picture filters are now handled separately.
+ * We will be able to actually change the key names for legacy preset keys when preset file
+ * update code is done. But for now, lets hang onto the old legacy key name for backwards compatibility.
+ */
+ /* Check to see if the objectForKey:@"UsesPictureSettings is greater than 0, as 0 means use picture sizing "None"
+ * and the preset completely ignores any picture sizing values in the preset.
+ */
+ if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] > 0)
{
hb_job_t * job = fTitle->job;
- /* Check to see if we should use the max picture setting for the current title*/
+ /* Check to see if the objectForKey:@"UsesPictureSettings is 2 which is "Use Max for the source */
if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] == 2 || [[chosenPreset objectForKey:@"UsesMaxPictureSettings"] intValue] == 1)
{
/* Use Max Picture settings for whatever the dvd is.*/
@@ -3178,7 +3186,7 @@ the user is using "Custom" settings by determining the sender*/
}
job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
}
- else // Apply picture settings that were in effect at the time the preset was saved
+ else // /* If not 0 or 2 we assume objectForKey:@"UsesPictureSettings is 1 which is "Use picture sizing from when the preset was set" */
{
job->width = [[chosenPreset objectForKey:@"PictureWidth"] intValue];
job->height = [[chosenPreset objectForKey:@"PictureHeight"] intValue];
@@ -3194,23 +3202,9 @@ the user is using "Custom" settings by determining the sender*/
}
job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
- /* Filters */
- [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
-
- if ([chosenPreset objectForKey:@"PictureDetelecine"])
- {
- [fPictureController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
- }
- if ([chosenPreset objectForKey:@"PictureDenoise"])
- {
- [fPictureController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
- }
- if ([chosenPreset objectForKey:@"PictureDeblock"])
- {
- [fPictureController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
- }
+
/* If Cropping is set to custom, then recall all four crop values from
- when the preset was created and apply them */
+ when the preset was created and apply them */
if ([[chosenPreset objectForKey:@"PictureAutoCrop"] intValue] == 0)
{
[fPictureController setAutoCrop:NO];
@@ -3232,14 +3226,76 @@ the user is using "Custom" settings by determining the sender*/
job->crop[3] = AutoCropRight;
}
+ /* If the preset has no objectForKey:@"UsesPictureFilters", then we know it is a legacy preset
+ * and handle the filters here as before.
+ * NOTE: This should be removed when the update presets code is done as we can be assured that legacy
+ * presets are updated to work properly with new keys.
+ */
+ if (![chosenPreset objectForKey:@"UsesPictureFilters"])
+ {
+ /* Filters */
+ [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
+
+ if ([[chosenPreset objectForKey:@"VFR"] intValue] == 1)
+ {
+ [fPictureController setVFR:[[chosenPreset objectForKey:@"VFR"] intValue]];
+ }
+ else
+ {
+ [fPictureController setVFR:0];
+ }
+
+ if ([chosenPreset objectForKey:@"PictureDetelecine"])
+ {
+ [fPictureController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
+ }
+ if ([chosenPreset objectForKey:@"PictureDenoise"])
+ {
+ [fPictureController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
+ }
+ if ([chosenPreset objectForKey:@"PictureDeblock"])
+ {
+ [fPictureController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
+ }
+ [self calculatePictureSizing: NULL];
+ }
+
}
- [self calculatePictureSizing: NULL];
+
+
}
-
-
+ /* If the preset has an objectForKey:@"UsesPictureFilters", then we know it is a newer style filters preset
+ * and handle the filters here depending on whether or not the preset specifies applying the filter.
+ */
+ if ([chosenPreset objectForKey:@"UsesPictureFilters"] && [[chosenPreset objectForKey:@"UsesPictureFilters"] intValue] > 0)
+ {
+ /* Filters */
+ [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
+ if ([chosenPreset objectForKey:@"VFR"])
+ {
+ [fPictureController setVFR:[[chosenPreset objectForKey:@"VFR"] intValue]];
+ }
+ else
+ {
+ [fPictureController setVFR:0];
+ }
+ if ([chosenPreset objectForKey:@"PictureDetelecine"])
+ {
+ [fPictureController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
+ }
+ if ([chosenPreset objectForKey:@"PictureDenoise"])
+ {
+ [fPictureController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
+ }
+ if ([chosenPreset objectForKey:@"PictureDeblock"])
+ {
+ [fPictureController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
+ }
+ }
+ [self calculatePictureSizing: NULL];
[[fPresetsActionMenu itemAtIndex:0] setEnabled: YES];
- }
-}
+ }
+ }
}
@@ -3402,8 +3458,9 @@ id theRecord, theValue;
[fPresetNewPicSettingsPopUp addItemWithTitle:@"Current"];
[fPresetNewPicSettingsPopUp addItemWithTitle:@"Source Maximum (post source scan)"];
[fPresetNewPicSettingsPopUp selectItemAtIndex: 0];
-
- /* Erase info from the input fields fPresetNewDesc*/
+ /* Uncheck the preset use filters checkbox */
+ [fPresetNewPicFiltersCheck setState:NSOffState];
+ /* Erase info from the input fields*/
[fPresetNewName setStringValue: @""];
[fPresetNewDesc setStringValue: @""];
/* Show the panel */
@@ -3467,9 +3524,12 @@ id theRecord, theValue;
[preset setObject:[NSNumber numberWithInt:1] forKey:@"Type"];
/*Set whether or not this is default, at creation set to 0*/
[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- /*Get the whether or not to apply pic settings in the AddPresetPanel*/
+ /*Get the whether or not to apply pic Size and Cropping (includes Anamorphic)*/
[preset setObject:[NSNumber numberWithInt:[fPresetNewPicSettingsPopUp indexOfSelectedItem]] forKey:@"UsesPictureSettings"];
- /* Get New Preset Description from the field in the AddPresetPanel*/
+ /* Get whether or not to use the current Picture Filter settings for the preset */
+ [preset setObject:[NSNumber numberWithInt:[fPresetNewPicFiltersCheck state]] forKey:@"UsesPictureFilters"];
+
+ /* Get New Preset Description from the field in the AddPresetPanel*/
[preset setObject:[fPresetNewDesc stringValue] forKey:@"PresetDescription"];
/* File Format */
[preset setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
@@ -3506,26 +3566,29 @@ id theRecord, theValue;
[preset setObject:[NSNumber numberWithInt:[fVidTurboPassCheck state]] forKey:@"VideoTurboTwoPass"];
/*Picture Settings*/
hb_job_t * job = fTitle->job;
- /* Basic Picture Settings */
+ /* Picture Sizing */
/* Use Max Picture settings for whatever the dvd is.*/
[preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"];
[preset setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PictureWidth"];
[preset setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PictureHeight"];
[preset setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
[preset setObject:[NSNumber numberWithInt:fTitle->job->pixel_ratio] forKey:@"PicturePAR"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
- /* Set crop settings here */
- /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+ /* Set crop settings here */
[preset setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
-
- [preset setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
[preset setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
[preset setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
[preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
+
+ /* Picture Filters */
+ [preset setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
+
+
/*Audio*/
/* Audio Sample Rate*/
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 8b6a2a447..c24a5d47b 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -1,294 +1,337 @@
-{
- IBClasses = (
- {
- ACTIONS = {
- X264AdvancedOptionsChanged = id;
- X264AdvancedOptionsSet = id;
- X264AdvancedOptionsSetCurrentSettings = id;
- X264AdvancedOptionsStandardizeOptString = id;
- };
- CLASS = HBAdvancedController;
- LANGUAGE = ObjC;
- OUTLETS = {
- fDisplayX264Options = NSTextField;
- fDisplayX264OptionsLabel = NSTextField;
- fX264opt8x8dctLabel = NSTextField;
- fX264opt8x8dctSwitch = NSButton;
- fX264optAlphaDeblockPopUp = NSPopUpButton;
- fX264optAnalyseLabel = NSTextField;
- fX264optAnalysePopUp = NSPopUpButton;
- fX264optBPyramidLabel = NSTextField;
- fX264optBPyramidSwitch = NSButton;
- fX264optBRDOLabel = NSTextField;
- fX264optBRDOSwitch = NSButton;
- fX264optBetaDeblockPopUp = NSPopUpButton;
- fX264optBframesLabel = NSTextField;
- fX264optBframesPopUp = NSPopUpButton;
- fX264optBiMELabel = NSTextField;
- fX264optBiMESwitch = NSButton;
- fX264optCabacLabel = NSTextField;
- fX264optCabacSwitch = NSButton;
- fX264optDeblockLabel = NSTextField;
- fX264optDirectPredLabel = NSTextField;
- fX264optDirectPredPopUp = NSPopUpButton;
- fX264optMERangeLabel = NSTextField;
- fX264optMERangePopUp = NSPopUpButton;
- fX264optMixedRefsLabel = NSTextField;
- fX264optMixedRefsSwitch = NSButton;
- fX264optMotionEstLabel = NSTextField;
- fX264optMotionEstPopUp = NSPopUpButton;
- fX264optNfpskipLabel = NSTextField;
- fX264optNfpskipSwitch = NSButton;
- fX264optNodctdcmtLabel = NSTextField;
- fX264optNodctdcmtSwitch = NSButton;
- fX264optRefLabel = NSTextField;
- fX264optRefPopUp = NSPopUpButton;
- fX264optSubmeLabel = NSTextField;
- fX264optSubmePopUp = NSPopUpButton;
- fX264optTrellisLabel = NSTextField;
- fX264optTrellisPopUp = NSPopUpButton;
- fX264optView = NSView;
- fX264optViewTitleLabel = NSTextField;
- fX264optWeightBLabel = NSTextField;
- fX264optWeightBSwitch = NSButton;
- };
- SUPERCLASS = NSView;
- },
- {
- ACTIONS = {
- Cancel = id;
- Pause = id;
- Rip = id;
- addAllAudioTracksToPopUp = id;
- addFactoryPresets = id;
- addToQueue = id;
- addUserPreset = id;
- audioTrackMixdownChanged = id;
- audioTrackPopUpChanged = id;
- browseFile = id;
- browseSources = id;
- calculateBitrate = id;
- calculatePictureSizing = id;
- chapterPopUpChanged = id;
- closeAddPresetPanel = id;
- closeSourceTitleScanPanel = id;
- codecsPopUpChanged = id;
- customSettingUsed = id;
- deleteFactoryPresets = id;
- deletePreset = id;
- encoderPopUpChanged = id;
- formatPopUpChanged = id;
- getDefaultPresets = id;
- insertPreset = id;
- openForums = id;
- openHomepage = id;
- openMainWindow = id;
- openUserGuide = id;
- qualitySliderChanged = id;
- revertPictureSizeToMax = id;
- selectDefaultPreset = id;
- setDefaultPreset = id;
- setEnabledStateOfAudioMixdownControls = id;
- showAddPresetPanel = id;
- showDebugOutputPanel = id;
- showGrowlDoneNotification = id;
- showNewScan = id;
- showPicturePanel = id;
- showPreferencesWindow = id;
- showQueueWindow = id;
- showScanPanel = id;
- showSourceTitleScanPanel = id;
- subtitleSelectionChanged = id;
- tableViewSelected = id;
- titlePopUpChanged = id;
- twoPassCheckboxChanged = id;
- videoFrameRateChanged = id;
- videoMatrixChanged = id;
- };
- CLASS = HBController;
- LANGUAGE = ObjC;
- OUTLETS = {
- fAddPresetPanel = NSPanel;
- fAdvancedView = NSBox;
- fAudBitrateField = NSTextField;
- fAudBitratePopUp = NSPopUpButton;
- fAudLang1Field = NSTextField;
- fAudLang1PopUp = NSPopUpButton;
- fAudLang2Field = NSTextField;
- fAudLang2PopUp = NSPopUpButton;
- fAudRateField = NSTextField;
- fAudRatePopUp = NSPopUpButton;
- fAudTrack1MixLabel = NSTextField;
- fAudTrack1MixPopUp = NSPopUpButton;
- fAudTrack2MixLabel = NSTextField;
- fAudTrack2MixPopUp = NSPopUpButton;
- fChapterTable = NSTableView;
- fCreateChapterMarkers = NSButton;
- fDstBrowseButton = NSButton;
- fDstCodecsField = NSTextField;
- fDstCodecsPopUp = NSPopUpButton;
- fDstFile1Field = NSTextField;
- fDstFile2Field = NSTextField;
- fDstFormatField = NSTextField;
- fDstFormatPopUp = NSPopUpButton;
- fDstMpgLargeFileCheck = NSButton;
- fOpenSourceTitleMMenu = NSMenuItem;
- fPicLabelAnamorphic = NSTextField;
- fPicLabelAr = NSTextField;
- fPicLabelAutoCrop = NSTextField;
- fPicLabelDeblock = NSTextField;
- fPicLabelDeinterlace = NSTextField;
- fPicLabelDenoise = NSTextField;
- fPicLabelDetelecine = NSTextField;
- fPicLabelOutp = NSTextField;
- fPicLabelOutputX = NSTextField;
- fPicLabelPAROutputX = NSTextField;
- fPicLabelSettings = NSTextField;
- fPicLabelSrc = NSTextField;
- fPicLabelSrcX = NSTextField;
- fPicSettingARkeep = NSTextField;
- fPicSettingAutoCrop = NSTextField;
- fPicSettingDeblock = NSTextField;
- fPicSettingDeinterlace = NSTextField;
- fPicSettingDenoise = NSTextField;
- fPicSettingDetelecine = NSTextField;
- fPicSettingHeight = NSTextField;
- fPicSettingPAR = NSTextField;
- fPicSettingPARHeight = NSTextField;
- fPicSettingPARWidth = NSTextField;
- fPicSettingWidth = NSTextField;
- fPicSrcHeight = NSTextField;
- fPicSrcWidth = NSTextField;
- fPictureButton = NSButton;
- fPresetDrawer = NSDrawer;
- fPresetNewDesc = NSTextField;
- fPresetNewName = NSTextField;
- fPresetNewPicSettingsPopUp = NSPopUpButton;
- fPresetSelectedDisplay = NSTextField;
- fPresetsActionButton = MVMenuButton;
- fPresetsActionMenu = NSMenu;
- fPresetsAdd = NSButton;
- fPresetsDelete = NSButton;
- fQueueStatus = NSTextField;
- fRipIndicator = NSProgressIndicator;
- fScanIndicator = NSProgressIndicator;
- fScanSrcTitleCancelButton = NSButton;
- fScanSrcTitleNumField = NSTextField;
- fScanSrcTitleOpenButton = NSButton;
- fScanSrcTitlePanel = NSPanel;
- fScanSrcTitlePathField = NSTextField;
- fSrcChapterEndPopUp = NSPopUpButton;
- fSrcChapterField = NSTextField;
- fSrcChapterStartPopUp = NSPopUpButton;
- fSrcChapterToField = NSTextField;
- fSrcDVD2Field = NSTextField;
- fSrcDsplyNameTitleScan = NSTextField;
- fSrcDuration1Field = NSTextField;
- fSrcDuration2Field = NSTextField;
- fSrcTitleField = NSTextField;
- fSrcTitlePopUp = NSPopUpButton;
- fStatusField = NSTextField;
- fSubField = NSTextField;
- fSubForcedCheck = NSButton;
- fSubPopUp = NSPopUpButton;
- fVidBitrateCell = NSButtonCell;
- fVidBitrateField = NSTextField;
- fVidConstantCell = NSButtonCell;
- fVidEncoderField = NSTextField;
- fVidEncoderPopUp = NSPopUpButton;
- fVidGrayscaleCheck = NSButton;
- fVidQualityField = NSTextField;
- fVidQualityMatrix = NSMatrix;
- fVidQualitySlider = NSSlider;
- fVidRateField = NSTextField;
- fVidRatePopUp = NSPopUpButton;
- fVidTargetCell = NSButtonCell;
- fVidTargetSizeField = NSTextField;
- fVidTurboPassCheck = NSButton;
- fVidTwoPassCheck = NSButton;
- fWindow = NSWindow;
- tableView = NSTableView;
- };
- SUPERCLASS = NSObject;
- },
- {CLASS = HBPictureGLView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView; },
- {
- CLASS = HBTargetSizeField;
- LANGUAGE = ObjC;
- OUTLETS = {
- fRipAudBitPopUp = NSPopUpButton;
- fRipCustomField = NSTextField;
- fRipFormatPopUp = NSPopUpButton;
- fRipLang2PopUp = NSPopUpButton;
- };
- SUPERCLASS = NSTextField;
- },
- {CLASS = MVMenuButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; },
- {
- ACTIONS = {
- ClosePanel = id;
- NextPicture = id;
- PreviousPicture = id;
- SettingsChanged = id;
- };
- CLASS = PictureController;
- LANGUAGE = ObjC;
- OUTLETS = {
- fCropBottomField = NSTextField;
- fCropBottomStepper = NSStepper;
- fCropLeftField = NSTextField;
- fCropLeftStepper = NSStepper;
- fCropMatrix = NSMatrix;
- fCropRightField = NSTextField;
- fCropRightStepper = NSStepper;
- fCropTopField = NSTextField;
- fCropTopStepper = NSStepper;
- fDeinterlacePopUp = NSPopUpButton;
- fDenoisePopUp = NSPopUpButton;
- fDetelecineCheck = NSButton;
- fEffectsCheck = NSButton;
- fHeightField = NSTextField;
- fHeightStepper = NSStepper;
- fInfoField = NSTextField;
- fNextButton = NSButton;
- fPARCheck = NSButton;
- fPictureGLView = HBPictureGLView;
- fPrevButton = NSButton;
- fRatioCheck = NSButton;
- fWidthField = NSTextField;
- fWidthStepper = NSStepper;
- };
- SUPERCLASS = NSObject;
- },
- {CLASS = PictureGLView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView; },
- {
- ACTIONS = {CheckChanged = id; ClosePanel = id; OpenPanel = id; };
- CLASS = PrefsController;
- LANGUAGE = ObjC;
- OUTLETS = {
- fDefAdvancedx264FlagsShow = NSButton;
- fDefAdvancedx264FlagsView = NSTextField;
- fDefAutoNaming = NSButton;
- fDefChapterMarkers = NSButton;
- fDefCrf = NSButton;
- fDefDeinterlace = NSButton;
- fDefPicSizeAutoSetipod = NSButton;
- fDefPixelRatio = NSButton;
- fDefPresetDrawerShow = NSButton;
- fFileExtItunes = NSButton;
- fPanel = NSPanel;
- fUpdateCheck = NSButton;
- fdefaultlanguage = NSComboBox;
- };
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {ClosePanel = id; Remove = id; Update = id; };
- CLASS = QueueController;
- LANGUAGE = ObjC;
- OUTLETS = {fScrollView = NSScrollView; fTaskView = NSView; };
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-} \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>Cancel</key>
+ <string>id</string>
+ <key>Pause</key>
+ <string>id</string>
+ <key>Rip</key>
+ <string>id</string>
+ <key>addAllAudioTracksToPopUp</key>
+ <string>id</string>
+ <key>addFactoryPresets</key>
+ <string>id</string>
+ <key>addToQueue</key>
+ <string>id</string>
+ <key>addUserPreset</key>
+ <string>id</string>
+ <key>audioTrackMixdownChanged</key>
+ <string>id</string>
+ <key>audioTrackPopUpChanged</key>
+ <string>id</string>
+ <key>browseFile</key>
+ <string>id</string>
+ <key>browseSources</key>
+ <string>id</string>
+ <key>calculateBitrate</key>
+ <string>id</string>
+ <key>calculatePictureSizing</key>
+ <string>id</string>
+ <key>chapterPopUpChanged</key>
+ <string>id</string>
+ <key>closeAddPresetPanel</key>
+ <string>id</string>
+ <key>closeSourceTitleScanPanel</key>
+ <string>id</string>
+ <key>codecsPopUpChanged</key>
+ <string>id</string>
+ <key>customSettingUsed</key>
+ <string>id</string>
+ <key>deleteFactoryPresets</key>
+ <string>id</string>
+ <key>deletePreset</key>
+ <string>id</string>
+ <key>encoderPopUpChanged</key>
+ <string>id</string>
+ <key>formatPopUpChanged</key>
+ <string>id</string>
+ <key>getDefaultPresets</key>
+ <string>id</string>
+ <key>insertPreset</key>
+ <string>id</string>
+ <key>openForums</key>
+ <string>id</string>
+ <key>openHomepage</key>
+ <string>id</string>
+ <key>openMainWindow</key>
+ <string>id</string>
+ <key>openUserGuide</key>
+ <string>id</string>
+ <key>qualitySliderChanged</key>
+ <string>id</string>
+ <key>revertPictureSizeToMax</key>
+ <string>id</string>
+ <key>selectDefaultPreset</key>
+ <string>id</string>
+ <key>setDefaultPreset</key>
+ <string>id</string>
+ <key>setEnabledStateOfAudioMixdownControls</key>
+ <string>id</string>
+ <key>showAddPresetPanel</key>
+ <string>id</string>
+ <key>showDebugOutputPanel</key>
+ <string>id</string>
+ <key>showGrowlDoneNotification</key>
+ <string>id</string>
+ <key>showNewScan</key>
+ <string>id</string>
+ <key>showPicturePanel</key>
+ <string>id</string>
+ <key>showPreferencesWindow</key>
+ <string>id</string>
+ <key>showQueueWindow</key>
+ <string>id</string>
+ <key>showScanPanel</key>
+ <string>id</string>
+ <key>showSourceTitleScanPanel</key>
+ <string>id</string>
+ <key>subtitleSelectionChanged</key>
+ <string>id</string>
+ <key>tableViewSelected</key>
+ <string>id</string>
+ <key>titlePopUpChanged</key>
+ <string>id</string>
+ <key>twoPassCheckboxChanged</key>
+ <string>id</string>
+ <key>videoFrameRateChanged</key>
+ <string>id</string>
+ <key>videoMatrixChanged</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>HBController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>fAddPresetPanel</key>
+ <string>NSPanel</string>
+ <key>fAdvancedView</key>
+ <string>NSBox</string>
+ <key>fAudBitrateField</key>
+ <string>NSTextField</string>
+ <key>fAudBitratePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fAudLang1Field</key>
+ <string>NSTextField</string>
+ <key>fAudLang1PopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fAudLang2Field</key>
+ <string>NSTextField</string>
+ <key>fAudLang2PopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fAudRateField</key>
+ <string>NSTextField</string>
+ <key>fAudRatePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fAudTrack1MixLabel</key>
+ <string>NSTextField</string>
+ <key>fAudTrack1MixPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fAudTrack2MixLabel</key>
+ <string>NSTextField</string>
+ <key>fAudTrack2MixPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fChapterTable</key>
+ <string>NSTableView</string>
+ <key>fCreateChapterMarkers</key>
+ <string>NSButton</string>
+ <key>fDstBrowseButton</key>
+ <string>NSButton</string>
+ <key>fDstCodecsField</key>
+ <string>NSTextField</string>
+ <key>fDstCodecsPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fDstFile1Field</key>
+ <string>NSTextField</string>
+ <key>fDstFile2Field</key>
+ <string>NSTextField</string>
+ <key>fDstFormatField</key>
+ <string>NSTextField</string>
+ <key>fDstFormatPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fDstMpgLargeFileCheck</key>
+ <string>NSButton</string>
+ <key>fOpenSourceTitleMMenu</key>
+ <string>NSMenuItem</string>
+ <key>fPicLabelAnamorphic</key>
+ <string>NSTextField</string>
+ <key>fPicLabelAr</key>
+ <string>NSTextField</string>
+ <key>fPicLabelAutoCrop</key>
+ <string>NSTextField</string>
+ <key>fPicLabelDeblock</key>
+ <string>NSTextField</string>
+ <key>fPicLabelDeinterlace</key>
+ <string>NSTextField</string>
+ <key>fPicLabelDenoise</key>
+ <string>NSTextField</string>
+ <key>fPicLabelDetelecine</key>
+ <string>NSTextField</string>
+ <key>fPicLabelOutp</key>
+ <string>NSTextField</string>
+ <key>fPicLabelOutputX</key>
+ <string>NSTextField</string>
+ <key>fPicLabelPAROutputX</key>
+ <string>NSTextField</string>
+ <key>fPicLabelSettings</key>
+ <string>NSTextField</string>
+ <key>fPicLabelSrc</key>
+ <string>NSTextField</string>
+ <key>fPicLabelSrcX</key>
+ <string>NSTextField</string>
+ <key>fPicSettingARkeep</key>
+ <string>NSTextField</string>
+ <key>fPicSettingAutoCrop</key>
+ <string>NSTextField</string>
+ <key>fPicSettingDeblock</key>
+ <string>NSTextField</string>
+ <key>fPicSettingDeinterlace</key>
+ <string>NSTextField</string>
+ <key>fPicSettingDenoise</key>
+ <string>NSTextField</string>
+ <key>fPicSettingDetelecine</key>
+ <string>NSTextField</string>
+ <key>fPicSettingHeight</key>
+ <string>NSTextField</string>
+ <key>fPicSettingPAR</key>
+ <string>NSTextField</string>
+ <key>fPicSettingPARHeight</key>
+ <string>NSTextField</string>
+ <key>fPicSettingPARWidth</key>
+ <string>NSTextField</string>
+ <key>fPicSettingWidth</key>
+ <string>NSTextField</string>
+ <key>fPicSrcHeight</key>
+ <string>NSTextField</string>
+ <key>fPicSrcWidth</key>
+ <string>NSTextField</string>
+ <key>fPictureButton</key>
+ <string>NSButton</string>
+ <key>fPresetDrawer</key>
+ <string>NSDrawer</string>
+ <key>fPresetNewDesc</key>
+ <string>NSTextField</string>
+ <key>fPresetNewName</key>
+ <string>NSTextField</string>
+ <key>fPresetNewPicFiltersCheck</key>
+ <string>NSButton</string>
+ <key>fPresetNewPicSettingsPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fPresetSelectedDisplay</key>
+ <string>NSTextField</string>
+ <key>fPresetsActionButton</key>
+ <string>MVMenuButton</string>
+ <key>fPresetsActionMenu</key>
+ <string>NSMenu</string>
+ <key>fPresetsAdd</key>
+ <string>NSButton</string>
+ <key>fPresetsDelete</key>
+ <string>NSButton</string>
+ <key>fQueueStatus</key>
+ <string>NSTextField</string>
+ <key>fRipIndicator</key>
+ <string>NSProgressIndicator</string>
+ <key>fScanIndicator</key>
+ <string>NSProgressIndicator</string>
+ <key>fScanSrcTitleCancelButton</key>
+ <string>NSButton</string>
+ <key>fScanSrcTitleNumField</key>
+ <string>NSTextField</string>
+ <key>fScanSrcTitleOpenButton</key>
+ <string>NSButton</string>
+ <key>fScanSrcTitlePanel</key>
+ <string>NSPanel</string>
+ <key>fScanSrcTitlePathField</key>
+ <string>NSTextField</string>
+ <key>fSrcChapterEndPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fSrcChapterField</key>
+ <string>NSTextField</string>
+ <key>fSrcChapterStartPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fSrcChapterToField</key>
+ <string>NSTextField</string>
+ <key>fSrcDVD2Field</key>
+ <string>NSTextField</string>
+ <key>fSrcDsplyNameTitleScan</key>
+ <string>NSTextField</string>
+ <key>fSrcDuration1Field</key>
+ <string>NSTextField</string>
+ <key>fSrcDuration2Field</key>
+ <string>NSTextField</string>
+ <key>fSrcTitleField</key>
+ <string>NSTextField</string>
+ <key>fSrcTitlePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fStatusField</key>
+ <string>NSTextField</string>
+ <key>fSubField</key>
+ <string>NSTextField</string>
+ <key>fSubForcedCheck</key>
+ <string>NSButton</string>
+ <key>fSubPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fVidBitrateCell</key>
+ <string>NSButtonCell</string>
+ <key>fVidBitrateField</key>
+ <string>NSTextField</string>
+ <key>fVidConstantCell</key>
+ <string>NSButtonCell</string>
+ <key>fVidEncoderField</key>
+ <string>NSTextField</string>
+ <key>fVidEncoderPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fVidGrayscaleCheck</key>
+ <string>NSButton</string>
+ <key>fVidQualityField</key>
+ <string>NSTextField</string>
+ <key>fVidQualityMatrix</key>
+ <string>NSMatrix</string>
+ <key>fVidQualitySlider</key>
+ <string>NSSlider</string>
+ <key>fVidRateField</key>
+ <string>NSTextField</string>
+ <key>fVidRatePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fVidTargetCell</key>
+ <string>NSButtonCell</string>
+ <key>fVidTargetSizeField</key>
+ <string>NSTextField</string>
+ <key>fVidTurboPassCheck</key>
+ <string>NSButton</string>
+ <key>fVidTwoPassCheck</key>
+ <string>NSButton</string>
+ <key>fWindow</key>
+ <string>NSWindow</string>
+ <key>tableView</key>
+ <string>NSTableView</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>MVMenuButton</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSButton</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSObject</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index a615f2eb6..f5ed599ef 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -1,47 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>37 120 663 378 0 0 1440 878 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>1843</key>
- <string>620 338 200 530 0 0 1440 878 </string>
- <key>2436</key>
- <string>307 361 192 68 0 0 1440 878 </string>
- <key>29</key>
- <string>57 811 368 44 0 0 1440 878 </string>
- </dict>
<key>IBFramework Version</key>
- <string>446.1</string>
- <key>IBLockedObjects</key>
- <array>
- <integer>2382</integer>
- </array>
- <key>IBLockedTabItems</key>
- <array>
- <integer>1477</integer>
- </array>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../HandBrake.xcodeproj</string>
<key>IBOldestOS</key>
- <integer>4</integer>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>29</integer>
+ <integer>1868</integer>
</array>
<key>IBSystem Version</key>
- <string>8S2167</string>
- <key>IBUserGuides</key>
- <dict>
- <key>21</key>
- <dict>
- <key>guideLocations</key>
- <array>
- <string>Horizontal:498.000000</string>
- </array>
- <key>guidesLocked</key>
- <false/>
- </dict>
- </dict>
+ <string>9B18</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index d376a6449..46401671a 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 11:43:41 +0000