diff options
| -rw-r--r-- | macosx/English.lproj/PictureSettings.xib | 136 | ||||
| -rw-r--r-- | macosx/PictureController.h | 3 |
2 files changed, 61 insertions, 78 deletions
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib index d57a6657a..0d529c935 100644 --- a/macosx/English.lproj/PictureSettings.xib +++ b/macosx/English.lproj/PictureSettings.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">670</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5"/> + <integer value="6"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -113,35 +113,6 @@ </object> </object> </object> - <object class="NSButton" id="345100891"> - <reference key="NSNextResponder" ref="49161063"/> - <int key="NSvFlags">-2147483359</int> - <string key="NSFrame">{{276, 66}, {59, 16}}</string> - <reference key="NSSuperview" ref="49161063"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="352183359"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134479872</int> - <string key="NSContents">Close</string> - <object class="NSFont" key="NSSupport" id="22"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">9.000000e+00</double> - <int key="NSfFlags">3614</int> - </object> - <reference key="NSControlView" ref="345100891"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <object class="NSFont" key="NSAlternateImage" id="826709342"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">9.000000e+00</double> - <int key="NSfFlags">16</int> - </object> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> <object class="NSBox" id="1064912113"> <reference key="NSNextResponder" ref="49161063"/> <int key="NSvFlags">265</int> @@ -624,7 +595,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSPopUpButtonCell" key="NSCell" id="261514411"> <int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags2">264192</int> - <reference key="NSSupport" ref="22"/> + <object class="NSFont" key="NSSupport" id="22"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">9.000000e+00</double> + <int key="NSfFlags">3614</int> + </object> <reference key="NSControlView" ref="147098438"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">1</int> @@ -740,7 +715,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSPopUpButton" id="346912008"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{73, 79}, {110, 15}}</string> + <string key="NSFrame">{{73, 92}, {110, 15}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1034367716"> @@ -750,7 +725,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference key="NSControlView" ref="346912008"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="826709342"/> + <object class="NSFont" key="NSAlternateImage" id="826709342"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">9.000000e+00</double> + <int key="NSfFlags">16</int> + </object> <string key="NSAlternateContents"/> <object class="NSMutableString" key="NSKeyEquivalent"> <characters key="NS.bytes"/> @@ -810,7 +789,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSTextField" id="905607845"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{2, 77}, {68, 17}}</string> + <string key="NSFrame">{{2, 90}, {68, 17}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="522867811"> @@ -826,7 +805,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSButton" id="407610327"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{6, 100}, {82, 18}}</string> + <string key="NSFrame">{{6, 116}, {82, 18}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="832714893"> @@ -847,7 +826,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSButton" id="974850032"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{4, 10}, {82, 18}}</string> + <string key="NSFrame">{{4, 17}, {82, 18}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="464410464"> @@ -868,7 +847,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSPopUpButton" id="243795165"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{74, 54}, {109, 15}}</string> + <string key="NSFrame">{{74, 65}, {109, 15}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="708528272"> @@ -938,7 +917,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSTextField" id="94419441"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{19, 53}, {51, 17}}</string> + <string key="NSFrame">{{19, 64}, {51, 17}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="741873280"> @@ -954,7 +933,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSTextField" id="1069536323"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{10, 31}, {51, 17}}</string> + <string key="NSFrame">{{10, 40}, {51, 17}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="728722104"> @@ -970,7 +949,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSTextField" id="314638156"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{56, 33}, {31, 14}}</string> + <string key="NSFrame">{{56, 42}, {31, 14}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="350598908"> @@ -986,7 +965,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <object class="NSSlider" id="581126685"> <reference key="NSNextResponder" ref="628081139"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{88, 31}, {96, 16}}</string> + <string key="NSFrame">{{88, 40}, {96, 16}}</string> <reference key="NSSuperview" ref="628081139"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="257047106"> @@ -1006,11 +985,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> </object> </object> </object> - <string key="NSFrame">{{2, 2}, {189, 127}}</string> + <string key="NSFrame">{{2, 2}, {189, 143}}</string> <reference key="NSSuperview" ref="309105014"/> </object> </object> - <string key="NSFrame">{{272, 86}, {193, 144}}</string> + <string key="NSFrame">{{272, 70}, {193, 160}}</string> <reference key="NSSuperview" ref="49161063"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1432,14 +1411,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">ClosePanel:</string> - <reference key="source" ref="355312334"/> - <reference key="destination" ref="345100891"/> - </object> - <int key="connectionID">77</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">SettingsChanged:</string> <reference key="source" ref="355312334"/> <reference key="destination" ref="243795165"/> @@ -1678,6 +1649,30 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> </object> <int key="connectionID">240</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fPictureSizeBox</string> + <reference key="source" ref="355312334"/> + <reference key="destination" ref="1011917013"/> + </object> + <int key="connectionID">241</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fPictureCropBox</string> + <reference key="source" ref="355312334"/> + <reference key="destination" ref="1064912113"/> + </object> + <int key="connectionID">242</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fPictureFilterBox</string> + <reference key="source" ref="355312334"/> + <reference key="destination" ref="309105014"/> + </object> + <int key="connectionID">243</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1734,7 +1729,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference ref="628196212"/> <reference ref="196868285"/> <reference ref="986015194"/> - <reference ref="345100891"/> <reference ref="798240356"/> <reference ref="66510867"/> <reference ref="598619000"/> @@ -1820,15 +1814,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference key="parent" ref="49161063"/> </object> <object class="IBObjectRecord"> - <int key="objectID">50</int> - <reference key="object" ref="345100891"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="352183359"/> - </object> - <reference key="parent" ref="49161063"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">92</int> <reference key="object" ref="208214895"/> <object class="NSMutableArray" key="children"> @@ -1842,11 +1827,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference key="parent" ref="628196212"/> </object> <object class="IBObjectRecord"> - <int key="objectID">176</int> - <reference key="object" ref="352183359"/> - <reference key="parent" ref="345100891"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">12</int> <reference key="object" ref="580805308"/> <object class="NSMutableArray" key="children"> @@ -2583,8 +2563,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <string>5.windowTemplate.hasMinSize</string> <string>5.windowTemplate.maxSize</string> <string>5.windowTemplate.minSize</string> - <string>50.IBPluginDependency</string> - <string>50.ImportedFromIB2</string> <string>6.IBPluginDependency</string> <string>6.ImportedFromIB2</string> <string>7.IBPluginDependency</string> @@ -2713,10 +2691,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{491, 299}, {484, 557}}</string> + <string>{{320, 299}, {484, 557}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{491, 299}, {484, 557}}</string> + <string>{{320, 299}, {484, 557}}</string> <reference ref="9"/> <string>{{221, 276}, {533, 580}}</string> <reference ref="9"/> @@ -2731,8 +2709,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -2755,7 +2731,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">240</int> + <int key="maxID">243</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2782,7 +2758,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>ClosePanel:</string> <string>SettingsChanged:</string> <string>createMoviePreview:</string> <string>deblockSliderChanged:</string> @@ -2798,7 +2773,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> <string>NSString</string> <string>id</string> </object> @@ -2831,6 +2805,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <string>fInfoField</string> <string>fMovieCreationProgressIndicator</string> <string>fMovieView</string> + <string>fPictureCropBox</string> + <string>fPictureFilterBox</string> + <string>fPictureSizeBox</string> <string>fPictureSlider</string> <string>fPictureView</string> <string>fPictureViewArea</string> @@ -2868,6 +2845,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes> <string>NSTextField</string> <string>NSProgressIndicator</string> <string>QTMovieView</string> + <string>NSBox</string> + <string>NSBox</string> + <string>NSBox</string> <string>NSSlider</string> <string>NSImageView</string> <string>NSBox</string> diff --git a/macosx/PictureController.h b/macosx/PictureController.h index 6c6eef765..91f88b9ed 100644 --- a/macosx/PictureController.h +++ b/macosx/PictureController.h @@ -26,6 +26,9 @@ IBOutlet NSImageView * fPictureView; IBOutlet NSBox * fPictureViewArea; + IBOutlet NSBox * fPictureSizeBox; + IBOutlet NSBox * fPictureCropBox; + IBOutlet NSBox * fPictureFilterBox; IBOutlet NSTextField * fWidthField; IBOutlet NSStepper * fWidthStepper; IBOutlet NSTextField * fHeightField; |