Index: trunk/ChameleonPrefPane/CHANGES =================================================================== --- trunk/ChameleonPrefPane/CHANGES (revision 51) +++ trunk/ChameleonPrefPane/CHANGES (revision 52) @@ -1,3 +1,6 @@ +- Added forceBootConfigPath to the tabview panel for quicker setup, so now no + need to edit the preferences file manually. +- Added SystemId - Added full bootOptions loading into the interface with no custom code needed, all loading features are implemented in base class PreferencesControllerBase, with the automatic parser engine. Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 51) +++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 52) @@ -23,8 +23,8 @@ 01993199110A2C61003B056E /* string_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993198110A2C61003B056E /* string_util.h */; }; 019931DD110A37FA003B056E /* PreferencesControllerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 019931DB110A37FA003B056E /* PreferencesControllerBase.h */; }; 019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */; }; - 01993567110AA9FA003B056E /* BootPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993565110AA9FA003B056E /* BootPropertyList.h */; }; - 01993568110AA9FA003B056E /* BootPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01993566110AA9FA003B056E /* BootPropertyList.cpp */; }; + 01993567110AA9FA003B056E /* ChameleonPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993565110AA9FA003B056E /* ChameleonPropertyList.h */; }; + 01993568110AA9FA003B056E /* ChameleonPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01993566110AA9FA003B056E /* ChameleonPropertyList.cpp */; }; 01A40F75110550F4002A74CD /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 01A40F74110550F4002A74CD /* CHANGES */; }; 01AF5E69110C1C6800816AA8 /* string_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01AF5E68110C1C6800816AA8 /* string_util.cpp */; }; 01AF5E6C110C1C9C00816AA8 /* KernOptionsParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01AF5E6A110C1C9C00816AA8 /* KernOptionsParser.cpp */; }; @@ -43,6 +43,8 @@ 01B0E8251108B87A00ACF21B /* Windows.png in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E81F1108B87A00ACF21B /* Windows.png */; }; 01B0E8271108B89100ACF21B /* CREDITS in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E8261108B89100ACF21B /* CREDITS */; }; 01B0E8291108B89D00ACF21B /* version in Resources */ = {isa = PBXBuildFile; fileRef = 01B0E8281108B89D00ACF21B /* version */; }; + 01D5D9C6110D723200AAE2C3 /* file_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D5D9C5110D723200AAE2C3 /* file_util.h */; }; + 01D5DBE0110DA3CD00AAE2C3 /* GroupControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D5DBDF110DA3CD00AAE2C3 /* GroupControllerProtocol.h */; }; 01E0E9511108F9ED004EF6E8 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 01E0E9501108F9ED004EF6E8 /* TODO */; }; 8D202CEA0486D31800D8A456 /* StartupPrefPane_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCFA20370C41700C91783 /* StartupPrefPane_Prefix.pch */; }; 8D202CED0486D31800D8A456 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; @@ -68,8 +70,8 @@ 01993198110A2C61003B056E /* string_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_util.h; path = Sources/string_util.h; sourceTree = SOURCE_ROOT; }; 019931DB110A37FA003B056E /* PreferencesControllerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencesControllerBase.h; path = Sources/PreferencesControllerBase.h; sourceTree = ""; }; 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PreferencesControllerBase.mm; path = Sources/PreferencesControllerBase.mm; sourceTree = ""; }; - 01993565110AA9FA003B056E /* BootPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BootPropertyList.h; path = Sources/BootPropertyList.h; sourceTree = ""; }; - 01993566110AA9FA003B056E /* BootPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BootPropertyList.cpp; path = Sources/BootPropertyList.cpp; sourceTree = ""; }; + 01993565110AA9FA003B056E /* ChameleonPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChameleonPropertyList.h; path = Sources/ChameleonPropertyList.h; sourceTree = ""; }; + 01993566110AA9FA003B056E /* ChameleonPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChameleonPropertyList.cpp; path = Sources/ChameleonPropertyList.cpp; sourceTree = ""; }; 01A40F74110550F4002A74CD /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; 01AF5E68110C1C6800816AA8 /* string_util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = string_util.cpp; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/string_util.cpp; sourceTree = SOURCE_ROOT; }; 01AF5E6A110C1C9C00816AA8 /* KernOptionsParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KernOptionsParser.cpp; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp; sourceTree = SOURCE_ROOT; }; @@ -88,6 +90,8 @@ 01B0E81F1108B87A00ACF21B /* Windows.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Windows.png; path = Resources/Windows.png; sourceTree = ""; }; 01B0E8261108B89100ACF21B /* CREDITS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CREDITS; sourceTree = ""; }; 01B0E8281108B89D00ACF21B /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = version; path = bin/version; sourceTree = ""; }; + 01D5D9C5110D723200AAE2C3 /* file_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_util.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/file_util.h; sourceTree = SOURCE_ROOT; }; + 01D5DBDF110DA3CD00AAE2C3 /* GroupControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupControllerProtocol.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/GroupControllerProtocol.h; sourceTree = SOURCE_ROOT; }; 01E0E9501108F9ED004EF6E8 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; 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 = ""; }; @@ -157,6 +161,7 @@ 08FB77AFFE84173DC02AAC07 /* Classes */ = { isa = PBXGroup; children = ( + 01D5DBDF110DA3CD00AAE2C3 /* GroupControllerProtocol.h */, 01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */, 01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */, 019931DB110A37FA003B056E /* PreferencesControllerBase.h */, @@ -169,14 +174,15 @@ 019930FD110A0E6F003B056E /* PeripheralsController.mm */, 01993113110A0EB9003B056E /* AdvancedSetupController.h */, 01993114110A0EB9003B056E /* AdvancedSetupController.mm */, + 01D5D9C5110D723200AAE2C3 /* file_util.h */, 01993198110A2C61003B056E /* string_util.h */, 01AF5E68110C1C6800816AA8 /* string_util.cpp */, 01B0E8111108B85A00ACF21B /* ShellProcess.h */, 01B0E8101108B85A00ACF21B /* ShellProcess.cpp */, 01B0E8131108B85A00ACF21B /* PropertyList.h */, 01B0E8121108B85A00ACF21B /* PropertyList.cpp */, - 01993565110AA9FA003B056E /* BootPropertyList.h */, - 01993566110AA9FA003B056E /* BootPropertyList.cpp */, + 01993565110AA9FA003B056E /* ChameleonPropertyList.h */, + 01993566110AA9FA003B056E /* ChameleonPropertyList.cpp */, 01AF5E6B110C1C9C00816AA8 /* KernOptionsParser.h */, 01AF5E6A110C1C9C00816AA8 /* KernOptionsParser.cpp */, ); @@ -242,8 +248,10 @@ 01993115110A0EB9003B056E /* AdvancedSetupController.h in Headers */, 01993199110A2C61003B056E /* string_util.h in Headers */, 019931DD110A37FA003B056E /* PreferencesControllerBase.h in Headers */, - 01993567110AA9FA003B056E /* BootPropertyList.h in Headers */, + 01993567110AA9FA003B056E /* ChameleonPropertyList.h in Headers */, 01AF5E6D110C1C9C00816AA8 /* KernOptionsParser.h in Headers */, + 01D5D9C6110D723200AAE2C3 /* file_util.h in Headers */, + 01D5DBE0110DA3CD00AAE2C3 /* GroupControllerProtocol.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -335,7 +343,7 @@ 019930FF110A0E6F003B056E /* PeripheralsController.mm in Sources */, 01993116110A0EB9003B056E /* AdvancedSetupController.mm in Sources */, 019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */, - 01993568110AA9FA003B056E /* BootPropertyList.cpp in Sources */, + 01993568110AA9FA003B056E /* ChameleonPropertyList.cpp in Sources */, 01AF5E69110C1C6800816AA8 /* string_util.cpp in Sources */, 01AF5E6C110C1C9C00816AA8 /* KernOptionsParser.cpp in Sources */, ); 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/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 51) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 52) @@ -72,7 +72,7 @@ 1 - + 292 YES @@ -85,7 +85,7 @@ 72482368 138544128 - Version 2.0.0 + Version 2.0 b1 LucidaGrande 11 @@ -570,7 +570,7 @@ 69336641 134219776 Text Cell - + LucidaGrande 14 16 @@ -602,7 +602,7 @@ 69336641 2048 Text Cell - + YES 1 @@ -733,6 +733,7 @@ {{10, 33}, {640, 267}} + Boot From ... @@ -741,7 +742,7 @@ 2 - + 256 YES @@ -1021,19 +1022,19 @@ 25 - + 268 {{12, 26}, {128, 18}} 2 YES - + 67239424 0 Boot Config Path - + 1211912703 2 @@ -1044,19 +1045,19 @@ 25 - + 12 {{152, 24}, {422, 22}} 2 YES - + 611450433 272630784 - + YES @@ -1092,7 +1093,6 @@ {{10, 33}, {640, 267}} - Boot Setup @@ -1997,18 +1997,18 @@ 25 - + 268 {{258, 12}, {79, 23}} YES - + 67239424 0 SystemId - + 1211912703 2 @@ -2136,7 +2136,7 @@ 67239424 0 Disable kext blacklist - + LucidaGrande 11 16 @@ -2152,18 +2152,18 @@ 25 - + 12 {{353, 18}, {255, 19}} YES - + 611450433 272630784 - - + + YES @@ -2512,14 +2512,14 @@ - + 0 YES YES YES - + @@ -3729,7 +3729,7 @@ onCheckButtonChange: - + 744 @@ -3737,7 +3737,7 @@ mSystemId - + 748 @@ -3745,7 +3745,7 @@ mSystemIdText - + 749 @@ -3753,7 +3753,7 @@ onTextFiedChange: - + 750 @@ -3761,7 +3761,7 @@ onCheckButtonChange: - + 760 @@ -3769,7 +3769,7 @@ onTextFiedChange: - + 761 @@ -3777,7 +3777,7 @@ mBootConfigPath - + 762 @@ -3785,7 +3785,7 @@ mBootConfigPathText - + 763 @@ -4484,8 +4484,8 @@ - - + + @@ -5127,8 +5127,8 @@ - - + + @@ -5204,59 +5204,59 @@ 738 - + YES - + 739 - - + + 741 - + YES - + 742 - - + + 754 - + YES - + 755 - - + + 757 - + YES - + 758 - - + + @@ -6207,7 +6207,7 @@ ToolTip ToolTip - + Set the SystemId from which will be generated the Hardware UUID. If no values are set, then the BIOS DMI UUID is taken as default, if no BIOS DMI UUID is found, then a fixed value is set. @@ -6217,7 +6217,7 @@ ToolTip ToolTip - + Set the SystemId from which will be generated the Hardware UUID. If no values are set, then the BIOS DMI UUID is taken as default, if no BIOS DMI UUID is found, then a fixed value is set. @@ -6227,7 +6227,7 @@ ToolTip ToolTip - + Swap disks indexes 0<->1, use this option if your disk sequence in osx does not match the chameleon boot disk sequence @@ -6238,7 +6238,7 @@ ToolTip ToolTip - + Sets the boot partitions "hd(x,y) MyVolumeName " where 'x' is the disk number, 'y' the partition number and MyVolumeName is the alias you want to give to this partition. (i.e: useful for renaming System Reserved boot partition for Windows 7) @@ -6421,11 +6421,13 @@ YES onCheckButtonChange: + onForceBootConfigPath: onTextFiedChange: YES NSButton + id NSTextField