diff options
author | dynaflash <[email protected]> | 2008-01-03 19:11:26 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2008-01-03 19:11:26 +0000 |
commit | aaa9d4d352cd79964f6d9b2224d7fd99c4c1ce9e (patch) | |
tree | 02c9a73b283c12780231b2f3858ed6158eda49c2 /macosx/English.lproj | |
parent | 8a1ca7778958645f470d5aefa82a9968eb511657 (diff) |
MacGui: Loose Anamorphic initial implementation
- Changes the PAR checkbox to an anamorphic NSPopUp Button with "None", "Strict", and "Loose".
- Sanity checks against the ffmpeg encoder, until that gets fixed.
- removed six unneeded outlets for picture sizing in Controller.mm.
- Previous presets will gracefully degrade to us "Strict" if anamorphic is specified.
- I know about the bug where the picture window changes size on the first width drop when resizing Loose Anamorphic, so dont ask ;)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1161 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/English.lproj')
-rw-r--r-- | macosx/English.lproj/MainMenu.nib/classes.nib | 18 | ||||
-rw-r--r-- | macosx/English.lproj/MainMenu.nib/info.nib | 2 | ||||
-rw-r--r-- | macosx/English.lproj/MainMenu.nib/keyedobjects.nib | bin | 92816 -> 82015 bytes | |||
-rw-r--r-- | macosx/English.lproj/PictureSettings.nib/classes.nib | 162 | ||||
-rw-r--r-- | macosx/English.lproj/PictureSettings.nib/info.nib | 18 | ||||
-rw-r--r-- | macosx/English.lproj/PictureSettings.nib/keyedobjects.nib | bin | 24625 -> 26332 bytes |
6 files changed, 127 insertions, 73 deletions
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib index fe465b1ae..a1654d0c7 100644 --- a/macosx/English.lproj/MainMenu.nib/classes.nib +++ b/macosx/English.lproj/MainMenu.nib/classes.nib @@ -196,16 +196,10 @@ <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> @@ -218,19 +212,13 @@ <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> + <key>fPicSettingsAnamorphic</key> <string>NSTextField</string> - <key>fPicSrcHeight</key> + <key>fPicSettingsOutp</key> <string>NSTextField</string> - <key>fPicSrcWidth</key> + <key>fPicSettingsSrc</key> <string>NSTextField</string> <key>fPictureButton</key> <string>NSButton</string> diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index 2c679cd24..4888833ae 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -10,7 +10,7 @@ <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>2</integer> + <integer>1478</integer> </array> <key>IBSystem Version</key> <string>9B18</string> diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib Binary files differindex c33ccfe43..9bf9e598c 100644 --- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib +++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib diff --git a/macosx/English.lproj/PictureSettings.nib/classes.nib b/macosx/English.lproj/PictureSettings.nib/classes.nib index cfecb9ddb..ae456d39c 100644 --- a/macosx/English.lproj/PictureSettings.nib/classes.nib +++ b/macosx/English.lproj/PictureSettings.nib/classes.nib @@ -1,49 +1,113 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = HBPictureGLView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView; }, - {CLASS = NSObject; LANGUAGE = ObjC; }, - { - ACTIONS = { - ClosePanel = id; - NextPicture = id; - PreviousPicture = id; - SettingsChanged = id; - }; - CLASS = PictureController; - LANGUAGE = ObjC; - OUTLETS = { - delegate = id; - fCropBottomField = NSTextField; - fCropBottomStepper = NSStepper; - fCropLeftField = NSTextField; - fCropLeftStepper = NSStepper; - fCropMatrix = NSMatrix; - fCropRightField = NSTextField; - fCropRightStepper = NSStepper; - fCropTopField = NSTextField; - fCropTopStepper = NSStepper; - fDeblockCheck = NSButton; - fDeinterlacePopUp = NSPopUpButton; - fDenoisePopUp = NSPopUpButton; - fDetelecineCheck = NSButton; - fEffectsCheck = NSButton; - fHeightField = NSTextField; - fHeightStepper = NSStepper; - fInfoField = NSTextField; - fNextButton = NSButton; - fPARCheck = NSButton; - fPictureGLView = HBPictureGLView; - fPictureGLViewArea = NSBox; - fPicturePanel = NSPanel; - fPrevButton = NSButton; - fRatioCheck = NSButton; - fVFRCheck = NSButton; - fWidthField = NSTextField; - fWidthStepper = NSStepper; - }; - 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>CLASS</key> + <string>HBPictureGLView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSOpenGLView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>ClosePanel</key> + <string>id</string> + <key>NextPicture</key> + <string>id</string> + <key>PreviousPicture</key> + <string>id</string> + <key>SettingsChanged</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>PictureController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>delegate</key> + <string>id</string> + <key>fAnamorphicPopUp</key> + <string>NSPopUpButton</string> + <key>fCropBottomField</key> + <string>NSTextField</string> + <key>fCropBottomStepper</key> + <string>NSStepper</string> + <key>fCropLeftField</key> + <string>NSTextField</string> + <key>fCropLeftStepper</key> + <string>NSStepper</string> + <key>fCropMatrix</key> + <string>NSMatrix</string> + <key>fCropRightField</key> + <string>NSTextField</string> + <key>fCropRightStepper</key> + <string>NSStepper</string> + <key>fCropTopField</key> + <string>NSTextField</string> + <key>fCropTopStepper</key> + <string>NSStepper</string> + <key>fDeblockCheck</key> + <string>NSButton</string> + <key>fDeinterlacePopUp</key> + <string>NSPopUpButton</string> + <key>fDenoisePopUp</key> + <string>NSPopUpButton</string> + <key>fDetelecineCheck</key> + <string>NSButton</string> + <key>fEffectsCheck</key> + <string>NSButton</string> + <key>fHeightField</key> + <string>NSTextField</string> + <key>fHeightStepper</key> + <string>NSStepper</string> + <key>fInfoField</key> + <string>NSTextField</string> + <key>fNextButton</key> + <string>NSButton</string> + <key>fPARCheck</key> + <string>NSButton</string> + <key>fPictureGLView</key> + <string>HBPictureGLView</string> + <key>fPictureGLViewArea</key> + <string>NSBox</string> + <key>fPicturePanel</key> + <string>NSPanel</string> + <key>fPrevButton</key> + <string>NSButton</string> + <key>fRatioCheck</key> + <string>NSButton</string> + <key>fVFRCheck</key> + <string>NSButton</string> + <key>fWidthField</key> + <string>NSTextField</string> + <key>fWidthStepper</key> + <string>NSStepper</string> + </dict> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>FirstResponder</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</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/PictureSettings.nib/info.nib b/macosx/English.lproj/PictureSettings.nib/info.nib index 2f049637a..36055763b 100644 --- a/macosx/English.lproj/PictureSettings.nib/info.nib +++ b/macosx/English.lproj/PictureSettings.nib/info.nib @@ -1,16 +1,18 @@ <?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>45 380 356 240 0 0 1440 878 </string> <key>IBFramework Version</key> - <string>446.1</string> + <string>629</string> + <key>IBLastKnownRelativeProjectPath</key> + <string>../../HandBrake.xcodeproj</string> + <key>IBOldestOS</key> + <integer>5</integer> <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> + <array/> <key>IBSystem Version</key> - <string>8R2218</string> + <string>9B18</string> + <key>targetFramework</key> + <string>IBCocoaFramework</string> </dict> </plist> diff --git a/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib Binary files differindex a3cac2a7f..20eea9f88 100644 --- a/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib +++ b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib |