Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 15) +++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 16) @@ -91,8 +91,7 @@ mOptionsDict = [[NSMutableDictionary alloc] initWithCapacity:64 ]; [mOptionsDict addEntriesFromDictionary: d]; - if (d != nil) [d dealloc]; - if (b != nil) [b dealloc]; + //if (d != nil) [d dealloc]; return (mOptionsDict != nil) ? true : false; } @@ -368,7 +367,7 @@ } } - if (tableColumn == mFileSystemColumn) + else if (tableColumn == mFileSystemColumn) { ret = [NSString stringWithFormat: @"%s", partInfo[row].fsType().c_str() ]; } Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 15) +++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 16) @@ -25,6 +25,7 @@ 01CB09631107654A00A56FC3 /* Linux.png in Resources */ = {isa = PBXBuildFile; fileRef = 01CB09601107654A00A56FC3 /* Linux.png */; }; 01CB09641107654A00A56FC3 /* MacOSX.png in Resources */ = {isa = PBXBuildFile; fileRef = 01CB09611107654A00A56FC3 /* MacOSX.png */; }; 01CB09651107654A00A56FC3 /* Windows.png in Resources */ = {isa = PBXBuildFile; fileRef = 01CB09621107654A00A56FC3 /* Windows.png */; }; + 01CB09DA1107727D00A56FC3 /* CREDITS in Resources */ = {isa = PBXBuildFile; fileRef = 01CB09D91107727D00A56FC3 /* CREDITS */; }; 8D202CEA0486D31800D8A456 /* StartupPrefPane_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCFA20370C41700C91783 /* StartupPrefPane_Prefix.pch */; }; 8D202CED0486D31800D8A456 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D202CEF0486D31800D8A456 /* Chameleon.xib in Resources */ = {isa = PBXBuildFile; fileRef = F506C042013D9D8C01CA16C8 /* Chameleon.xib */; }; @@ -51,6 +52,7 @@ 01CB09601107654A00A56FC3 /* Linux.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Linux.png; path = ../../../../../devl/OSX/chameleonApplications/trunk/ChameleonPrefPane/Resources/Linux.png; sourceTree = SOURCE_ROOT; }; 01CB09611107654A00A56FC3 /* MacOSX.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = MacOSX.png; path = ../../../../../devl/OSX/chameleonApplications/trunk/ChameleonPrefPane/Resources/MacOSX.png; sourceTree = SOURCE_ROOT; }; 01CB09621107654A00A56FC3 /* Windows.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Windows.png; path = ../../../../../devl/OSX/chameleonApplications/trunk/ChameleonPrefPane/Resources/Windows.png; sourceTree = SOURCE_ROOT; }; + 01CB09D91107727D00A56FC3 /* CREDITS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CREDITS; path = ../../../../../devl/OSX/chameleonApplications/trunk/ChameleonPrefPane/CREDITS; sourceTree = SOURCE_ROOT; }; 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; @@ -161,6 +163,7 @@ 32DBCFA10370C40200C91783 /* Other Sources */ = { isa = PBXGroup; children = ( + 01CB09D91107727D00A56FC3 /* CREDITS */, 32DBCFA20370C41700C91783 /* StartupPrefPane_Prefix.pch */, 01A40F74110550F4002A74CD /* CHANGES */, 0196529A11066CC0009E8F2F /* README */, @@ -239,6 +242,7 @@ 01CB09631107654A00A56FC3 /* Linux.png in Resources */, 01CB09641107654A00A56FC3 /* MacOSX.png in Resources */, 01CB09651107654A00A56FC3 /* Windows.png in Resources */, + 01CB09DA1107727D00A56FC3 /* CREDITS in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Index: trunk/ChameleonPrefPane/bin/OSX105/Chameleon.prefPane.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/OSX106/Chameleon.prefPane.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/version =================================================================== --- trunk/ChameleonPrefPane/bin/version (revision 15) +++ trunk/ChameleonPrefPane/bin/version (revision 16) @@ -1 +1 @@ -1.0b8 +1.0b8-2 Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 15) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 16) @@ -1,15 +1,11 @@ - + 1050 - 10C540 - 740 - 1038.25 - 458.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 740 - + 9L30 + 677 + 949.54 + 353.00 YES @@ -20,7 +16,7 @@ YES - + YES @@ -43,12 +39,12 @@ 2 {{176, 715}, {668, 368}} 1081606144 - << do not localize >> + PDwgZG8gbm90IGxvY2FsaXplID4+A NSWindow View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {224.664, 10} @@ -65,7 +61,7 @@ 36 - {{-7, 53}, {683, 309}} + {{-3.5, 53}, {674, 309}} YES @@ -79,7 +75,7 @@ 268 - {{498, 231}, {147, 19}} + {{498, 224}, {147, 19}} YES @@ -88,7 +84,7 @@ V1.0 b8, by Rekursor LucidaGrande - 11 + 1.100000e+01 3100 @@ -99,19 +95,19 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2OQA 1 - MC4zODc1NDY5NjczIDAuMzkwNDY2Mjc0MyAwLjQxMzA0MzQ3ODMAA + MC4zODc1NDY5NiAwLjM5MDQ2NjI3IDAuNDEzMDQzNDcAA 268 - {{560, 35}, {91, 32}} + {{561, 34}, {91, 32}} YES @@ -120,7 +116,7 @@ Shutdown LucidaGrande - 13 + 1.300000e+01 1044 @@ -135,7 +131,7 @@ 268 - {{498, 83}, {147, 140}} + {{498, 76}, {147, 140}} YES @@ -152,32 +148,6 @@ - - - 268 - {{14, 242}, {146, 22}} - - YES - - 68288064 - 272761856 - Select Boot Partition - - - YES - 1 - - - 6 - System - controlTextColor - - 3 - MAA - - - - 268 @@ -191,7 +161,7 @@ 8448 - {471, 221} + {471, 215} YES @@ -204,15 +174,15 @@ -2147483392 - {{446, 0}, {16, 17}} + {{-26, 0}, {16, 17}} YES - 36 - 10 - 3.4028234663852886e+38 + 3.600000e+01 + 1.000000e+01 + 3.402823e+38 75628096 2048 @@ -231,7 +201,10 @@ 6 System headerTextColor - + + 3 + MAA + @@ -249,9 +222,9 @@ - 198 - 40 - 1000 + 1.980000e+02 + 4.000000e+01 + 1.000000e+03 75628096 67110912 @@ -276,7 +249,12 @@ controlBackgroundColor - + + 6 + System + controlTextColor + + YES sr_Latn_RS @@ -569,9 +547,9 @@ - 84 - 10 - 3.4028229999999999e+38 + 8.400000e+01 + 1.000000e+01 + 3.402823e+38 75628096 134219776 @@ -597,9 +575,9 @@ Name Displayed on the bootable partion during Chameleon boot - 141 - 40 - 1000 + 1.410000e+02 + 4.000000e+01 + 1.000000e+03 75628096 2048 @@ -624,8 +602,8 @@ - 3 - 2 + 3.000000e+00 + 2.000000e+00 6 @@ -636,18 +614,15 @@ MC41AA - 32 + 3.200000e+01 -692060160 - - 4 15 0 YES - 0 - {{1, 17}, {471, 221}} + {{1, 17}, {471, 215}} @@ -661,7 +636,7 @@ _doScroller: - 0.9242424242424242 + 9.242424e-01 @@ -671,7 +646,7 @@ 1 _doScroller: - 0.99577167019027479 + 9.957716e-01 @@ -689,7 +664,7 @@ - {{17, 11}, {473, 239}} + {{17, 10}, {473, 233}} 562 @@ -703,7 +678,7 @@ 268 - {{493, 3}, {158, 32}} + {{493, 2}, {158, 32}} YES @@ -723,7 +698,7 @@ 268 - {{493, 35}, {67, 32}} + {{492, 34}, {67, 32}} YES @@ -741,7 +716,7 @@ - {{10, 33}, {663, 263}} + {{10, 33}, {654, 263}} Select Boot Partition @@ -770,12 +745,11 @@ 268 {{12, 41}, {123, 18}} - 2 YES 67239424 131072 - Swap disks 0<->1 + U3dhcCBkaXNrcyAwPC0+MQ 1211912703 @@ -798,12 +772,11 @@ 268 {{12, 21}, {123, 18}} - 2 YES 67239424 131072 - Swap disks 0<->2 + U3dhcCBkaXNrcyAwPC0+Mg 1211912703 @@ -819,13 +792,11 @@ {{1, 1}, {151, 75}} - 2 - {{15, 173}, {153, 91}} + {{14, 160}, {153, 91}} YES - 2 {0, 0} 67239424 @@ -850,7 +821,7 @@ NO - {{10, 33}, {663, 263}} + {{10, 33}, {654, 263}} Settings @@ -873,7 +844,7 @@ {{0, 0}, {1920, 1178}} {224.664, 32} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} ChameleonPrefPane @@ -1048,20 +1019,22 @@ YES 0 - + + YES + -2 - - File's Owner + + RmlsZSdzIE93bmVyA -1 - + First Responder @@ -1071,7 +1044,7 @@ YES - + PrefPane @@ -1087,13 +1060,13 @@ -3 - + Application 112 - + ChameleonPrefPane @@ -1126,12 +1099,11 @@ YES - - + @@ -1291,26 +1263,12 @@ - 108 - - - YES - - - - - - 109 - - - - 179 YES - + @@ -1374,8 +1332,10 @@ YES - + YES + -1.IBPluginDependency + -2.IBPluginDependency -3.IBPluginDependency 100.IBPluginDependency 101.IBPluginDependency @@ -1385,13 +1345,12 @@ 105.IBPluginDependency 106.IBPluginDependency 107.IBPluginDependency - 108.IBPluginDependency - 109.IBPluginDependency 110.IBAttributePlaceholdersKey 110.IBPluginDependency 111.IBPluginDependency + 112.IBPluginDependency 12.IBEditorWindowLastContentRect - 12.IBPluginDependency + 12.IBViewEditorWindowController.showingLayoutRectangles 12.IBWindowTemplateEditedContentRect 12.ImportedFromIB2 12.windowTemplate.hasMinSize @@ -1451,11 +1410,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{134, 127}, {668, 368}} com.apple.InterfaceBuilder.CocoaPlugin - {{134, 127}, {668, 368}} - - + {{75, 109}, {668, 368}} + + {{75, 109}, {668, 368}} + + {224.664, 10} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1477,7 +1437,8 @@ ToolTip - Swap disks indexes 0<->2, use this option if your disk sequence in osx does not match the chameleon boot disk sequence + U3dhcCBkaXNrcyBpbmRleGVzIDA8LT4yLCB1c2UgdGhpcyBvcHRpb24gaWYgeW91ciBkaXNrIHNlcXVl +bmNlIGluIG9zeCBkb2VzIG5vdCBtYXRjaCB0aGUgY2hhbWVsZW9uIGJvb3QgZGlzayBzZXF1ZW5jZQ com.apple.InterfaceBuilder.CocoaPlugin @@ -1486,7 +1447,8 @@ ToolTip - Swap disks indexes 0<->1, use this option if your disk sequence in osx does not match the chameleon boot disk sequence + U3dhcCBkaXNrcyBpbmRleGVzIDA8LT4xLCB1c2UgdGhpcyBvcHRpb24gaWYgeW91ciBkaXNrIHNlcXVl +bmNlIGluIG9zeCBkb2VzIG5vdCBtYXRjaCB0aGUgY2hhbWVsZW9uIGJvb3QgZGlzayBzZXF1ZW5jZQ com.apple.InterfaceBuilder.CocoaPlugin @@ -1513,7 +1475,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + ToolTip @@ -1527,7 +1489,9 @@ YES - + + YES + YES @@ -1535,7 +1499,9 @@ YES - + + YES + YES @@ -1551,7 +1517,7 @@ NSPreferencePane YES - + YES onRestart: onShutdown: @@ -1568,7 +1534,7 @@ YES - + YES authView mFileSystemColumn @@ -1605,7 +1571,7 @@ IBProjectSource - ../../../../../devl/OSX/chameleonApplications/trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.h + Sources/ChameleonPrefPane.h @@ -1625,566 +1591,8 @@ - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSImageCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSImageCell.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - SecurityInterface.framework/Headers/SFAuthorizationView.h - - - - NSObject - - IBFrameworkSource - SecurityInterface.framework/Headers/SFCertificatePanel.h - - - - NSObject - - IBFrameworkSource - SecurityInterface.framework/Headers/SFChooseIdentityPanel.h - - - - NSPreferencePane - NSObject - - YES - - YES - _firstKeyView - _initialKeyView - _lastKeyView - _window - - - YES - NSView - NSView - NSView - NSWindow - - - - IBFrameworkSource - PreferencePanes.framework/Headers/NSPreferencePane.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSTabView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTabView.h - - - - NSTabViewItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTabViewItem.h - - - - NSTableColumn - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableColumn.h - - - - NSTableHeaderView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTableHeaderView.h - - - - NSTableView - NSControl - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - SFAuthorizationView - NSView - - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES ../ChameleonPrefPane.xcodeproj 3