Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 92) +++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 93) @@ -372,7 +372,7 @@ } } - + //-------------------------------------------------------------------------- - (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView { Index: trunk/ChameleonPrefPane/Sources/PropertyList.cpp =================================================================== --- trunk/ChameleonPrefPane/Sources/PropertyList.cpp (revision 92) +++ trunk/ChameleonPrefPane/Sources/PropertyList.cpp (revision 93) @@ -345,7 +345,7 @@ ret=true; } if(cfKey) CFRelease(cfKey); - //if(myString) CFRelease(myString); + if(myString) CFRelease(myString); return ret; } Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm (revision 92) +++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm (revision 93) @@ -37,6 +37,7 @@ BootProp::instance().addOptionDesc(mForceWake, nil, OptionYesNo, "ForceWake", "No"); BootProp::instance().addOptionDesc(mWakeImage, mWakeImageText, OptionFileString, "WakeImage", ""); BootProp::instance().addOptionDesc(mSystemId, mSystemIdText, OptionString, "SystemId", ""); + BootProp::instance().addOptionDesc(mSystemType, mSystemTypeText, OptionString, "SystemType", ""); BootProp::instance().addOptionDesc(mRestartFix, nil, OptionYesNo, "RestartFix", "Yes"); } Index: trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm (revision 92) +++ trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm (revision 93) @@ -366,7 +366,11 @@ if (state && bod->Type==OptionFileString) { NSString* f = [self selectAnyFile ]; - if (f) [(NSTextField*) bod->contentID setStringValue: f]; + if (f) + { + [(NSTextField*)bod->contentID setStringValue: f]; + [f release]; + } } [self synchronizeTextContent: bod withValue: state]; break; @@ -396,8 +400,11 @@ - (NSString*) selectPlistFile:(NSString*) name { - return [self selectFileWithFileTypes: @"/" withName: name - withTypes: [NSArray arrayWithObjects: @"plist", nil] ]; + NSArray* fileTypes = [NSArray arrayWithObjects: @"plist", nil]; + NSString * s= [self selectFileWithFileTypes: @"/" withName: name + withTypes: fileTypes]; + [fileTypes release]; + return s; } - (NSString*) selectAnyFile @@ -426,6 +433,7 @@ } } + return nil; } @end Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h =================================================================== --- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h (revision 92) +++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h (revision 93) @@ -24,6 +24,8 @@ IBOutlet NSComboBox* mCPUText; IBOutlet NSButton* mBusRatio; IBOutlet NSComboBox* mBusRatioText; + IBOutlet NSButton* mSystemType; + IBOutlet NSComboBox* mSystemTypeText; IBOutlet NSButton* mDebug; IBOutlet NSComboBox* mDebugText; Index: trunk/ChameleonPrefPane/Sources/PeripheralsController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/PeripheralsController.mm (revision 92) +++ trunk/ChameleonPrefPane/Sources/PeripheralsController.mm (revision 93) @@ -24,7 +24,8 @@ BootProp::instance().addOptionDesc(mLegacyLogo, nil, OptionYesNo, "Legacy Logo", "No"); BootProp::instance().addOptionDesc(mBootBanner, nil, OptionYesNo, "Boot Banner", "Yes"); BootProp::instance().addOptionDesc(mVBIOS, nil, OptionYesNo, "VBIOS", "No"); - BootProp::instance().addOptionDesc(mVideoROM, mVideoROMText, OptionFileString, "VideoROM", ""); + BootProp::instance().addOptionDesc(mAtiVideoROM, nil, OptionYesNo, "UseAtiVideoROM", "No"); + BootProp::instance().addOptionDesc(mNvidiaVideoROM, nil, OptionYesNo, "UseAtiVideoROM", "No"); BootProp::instance().addOptionDesc(mGraphicsMode, mGraphicsModeText, OptionString, "Graphics Mode", ""); BootProp::instance().addOptionDesc(mGraphicsEnabler, nil, OptionYesNo, "GraphicsEnabler", "No"); BootProp::instance().addOptionDesc(mUSBBusFix, nil, OptionYesNo, "USBBusFix", "No"); Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/BootSetupController.mm (revision 92) +++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm (revision 93) @@ -223,7 +223,11 @@ if (val) { NSString * f = [self selectPlistFile: @"com.Apple.boot.plist"]; - if(f) [mBootConfigPathText setStringValue:f]; + if(f) + { + [mBootConfigPathText setStringValue:f]; + [f release]; + } } Index: trunk/ChameleonPrefPane/Sources/PeripheralsController.h =================================================================== --- trunk/ChameleonPrefPane/Sources/PeripheralsController.h (revision 92) +++ trunk/ChameleonPrefPane/Sources/PeripheralsController.h (revision 93) @@ -16,8 +16,8 @@ IBOutlet NSButton* mLegacyLogo; IBOutlet NSButton* mBootBanner; IBOutlet NSButton* mVBIOS; - IBOutlet NSButton* mVideoROM; - IBOutlet NSTextField* mVideoROMText; + IBOutlet NSButton* mAtiVideoROM; + IBOutlet NSButton* mNvidiaVideoROM; IBOutlet NSButton* mGraphicsMode; IBOutlet NSComboBox* mGraphicsModeText; Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj =================================================================== --- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 92) +++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj (revision 93) @@ -11,11 +11,28 @@ 01466A931104062500088464 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466A921104062500088464 /* Security.framework */; }; 01466C2A110408CC00088464 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466C29110408CC00088464 /* SecurityInterface.framework */; }; 01466C381104091400088464 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01466C371104091400088464 /* SecurityFoundation.framework */; }; + 018458961116060600777A5B /* AboutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0184587C1116060600777A5B /* AboutController.h */; }; + 018458981116060600777A5B /* AboutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0184587E1116060600777A5B /* AboutController.mm */; }; + 0184589B1116060600777A5B /* BootFlagsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 018458811116060600777A5B /* BootFlagsController.mm */; }; + 0184589C1116060600777A5B /* BootFlagsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458821116060600777A5B /* BootFlagsController.h */; }; + 0184589D1116060600777A5B /* SmbiosController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 018458831116060600777A5B /* SmbiosController.mm */; }; + 0184589E1116060600777A5B /* EfiInjectController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 018458841116060600777A5B /* EfiInjectController.mm */; }; + 0184589F1116060600777A5B /* SmbiosController.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458851116060600777A5B /* SmbiosController.h */; }; + 018458A01116060600777A5B /* EfiInjectController.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458861116060600777A5B /* EfiInjectController.h */; }; + 018458A11116060600777A5B /* GroupControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458871116060600777A5B /* GroupControllerProtocol.h */; }; + 018458A21116060600777A5B /* CustomTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458881116060600777A5B /* CustomTableView.h */; }; + 018458A31116060600777A5B /* CustomTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 018458891116060600777A5B /* CustomTableView.mm */; }; + 018458A51116060600777A5B /* KernOptionsParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0184588B1116060600777A5B /* KernOptionsParser.cpp */; }; + 018458A71116060600777A5B /* file_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 0184588D1116060600777A5B /* file_util.h */; }; + 018458AA1116060600777A5B /* KernOptionsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458901116060600777A5B /* KernOptionsParser.h */; }; + 018458AB1116060600777A5B /* string_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 018458911116060600777A5B /* string_util.h */; }; + 018458AC1116060600777A5B /* string_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018458921116060600777A5B /* string_util.cpp */; }; + 018458B8111606EB00777A5B /* getDevProp.sh in Resources */ = {isa = PBXBuildFile; fileRef = 018458B5111606EB00777A5B /* getDevProp.sh */; }; + 018458B9111606EB00777A5B /* gfxutil in Resources */ = {isa = PBXBuildFile; fileRef = 018458B6111606EB00777A5B /* gfxutil */; }; + 018458BA111606EB00777A5B /* cdBootCreator.sh in Resources */ = {isa = PBXBuildFile; fileRef = 018458B7111606EB00777A5B /* cdBootCreator.sh */; }; 0196529B11066CC0009E8F2F /* README in Resources */ = {isa = PBXBuildFile; fileRef = 0196529A11066CC0009E8F2F /* README */; }; 019930E1110A0CB4003B056E /* BootSetupController.h in Headers */ = {isa = PBXBuildFile; fileRef = 019930DF110A0CB4003B056E /* BootSetupController.h */; }; 019930E2110A0CB4003B056E /* BootSetupController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019930E0110A0CB4003B056E /* BootSetupController.mm */; }; - 019930E8110A0D80003B056E /* BootFlagsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 019930E6110A0D80003B056E /* BootFlagsController.h */; }; - 019930E9110A0D80003B056E /* BootFlagsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019930E7110A0D80003B056E /* BootFlagsController.mm */; }; 019930FE110A0E6F003B056E /* PeripheralsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 019930FC110A0E6F003B056E /* PeripheralsController.h */; }; 019930FF110A0E6F003B056E /* PeripheralsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019930FD110A0E6F003B056E /* PeripheralsController.mm */; }; 01993115110A0EB9003B056E /* AdvancedSetupController.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993113110A0EB9003B056E /* AdvancedSetupController.h */; }; @@ -24,23 +41,6 @@ 019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */; }; 01993567110AA9FA003B056E /* ChameleonPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 01993565110AA9FA003B056E /* ChameleonPropertyList.h */; }; 01993568110AA9FA003B056E /* ChameleonPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01993566110AA9FA003B056E /* ChameleonPropertyList.cpp */; }; - 01A25D2E111108C80024EA7E /* AboutController.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D0E111108C80024EA7E /* AboutController.h */; }; - 01A25D2F111108C80024EA7E /* AboutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D0F111108C80024EA7E /* AboutController.mm */; }; - 01A25D3A111108C80024EA7E /* CustomTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D1A111108C80024EA7E /* CustomTableView.h */; }; - 01A25D3B111108C80024EA7E /* CustomTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D1B111108C80024EA7E /* CustomTableView.mm */; }; - 01A25D3C111108C80024EA7E /* EfiInjectController.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D1C111108C80024EA7E /* EfiInjectController.h */; }; - 01A25D3D111108C80024EA7E /* EfiInjectController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D1D111108C80024EA7E /* EfiInjectController.mm */; }; - 01A25D3E111108C80024EA7E /* file_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D1E111108C80024EA7E /* file_util.h */; }; - 01A25D3F111108C80024EA7E /* GroupControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D1F111108C80024EA7E /* GroupControllerProtocol.h */; }; - 01A25D40111108C80024EA7E /* KernOptionsParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D20111108C80024EA7E /* KernOptionsParser.cpp */; }; - 01A25D41111108C80024EA7E /* KernOptionsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D21111108C80024EA7E /* KernOptionsParser.h */; }; - 01A25D4A111108C80024EA7E /* SmbiosController.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D2A111108C80024EA7E /* SmbiosController.h */; }; - 01A25D4B111108C80024EA7E /* SmbiosController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D2B111108C80024EA7E /* SmbiosController.mm */; }; - 01A25D4C111108C80024EA7E /* string_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A25D2C111108C80024EA7E /* string_util.cpp */; }; - 01A25D4D111108C80024EA7E /* string_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A25D2D111108C80024EA7E /* string_util.h */; }; - 01A25D6B111109FF0024EA7E /* cdBootCreator.sh in Resources */ = {isa = PBXBuildFile; fileRef = 01A25D68111109FF0024EA7E /* cdBootCreator.sh */; }; - 01A25D6C111109FF0024EA7E /* getDevProp.sh in Resources */ = {isa = PBXBuildFile; fileRef = 01A25D69111109FF0024EA7E /* getDevProp.sh */; }; - 01A25D6D111109FF0024EA7E /* gfxutil in Resources */ = {isa = PBXBuildFile; fileRef = 01A25D6A111109FF0024EA7E /* gfxutil */; }; 01A40F75110550F4002A74CD /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 01A40F74110550F4002A74CD /* CHANGES */; }; 01B0E8141108B85A00ACF21B /* ChameleonPrefPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */; }; 01B0E8151108B85A00ACF21B /* ChameleonPrefPane.mm in Sources */ = {isa = PBXBuildFile; fileRef = 01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */; }; @@ -69,11 +69,28 @@ 01466A921104062500088464 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 01466C29110408CC00088464 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; }; 01466C371104091400088464 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = System/Library/Frameworks/SecurityFoundation.framework; sourceTree = SDKROOT; }; + 0184587C1116060600777A5B /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutController.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.h; sourceTree = ""; }; + 0184587E1116060600777A5B /* AboutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AboutController.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.mm; sourceTree = ""; }; + 018458811116060600777A5B /* BootFlagsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BootFlagsController.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/BootFlagsController.mm; sourceTree = ""; }; + 018458821116060600777A5B /* BootFlagsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BootFlagsController.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/BootFlagsController.h; sourceTree = ""; }; + 018458831116060600777A5B /* SmbiosController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmbiosController.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/SmbiosController.mm; sourceTree = ""; }; + 018458841116060600777A5B /* EfiInjectController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EfiInjectController.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/EfiInjectController.mm; sourceTree = ""; }; + 018458851116060600777A5B /* SmbiosController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmbiosController.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/SmbiosController.h; sourceTree = ""; }; + 018458861116060600777A5B /* EfiInjectController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EfiInjectController.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/EfiInjectController.h; sourceTree = ""; }; + 018458871116060600777A5B /* GroupControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupControllerProtocol.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/GroupControllerProtocol.h; sourceTree = ""; }; + 018458881116060600777A5B /* CustomTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomTableView.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.h; sourceTree = ""; }; + 018458891116060600777A5B /* CustomTableView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomTableView.mm; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.mm; sourceTree = ""; }; + 0184588B1116060600777A5B /* KernOptionsParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KernOptionsParser.cpp; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp; sourceTree = ""; }; + 0184588D1116060600777A5B /* 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 = ""; }; + 018458901116060600777A5B /* KernOptionsParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KernOptionsParser.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/KernOptionsParser.h; sourceTree = ""; }; + 018458911116060600777A5B /* string_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_util.h; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/string_util.h; sourceTree = ""; }; + 018458921116060600777A5B /* 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 = ""; }; + 018458B5111606EB00777A5B /* getDevProp.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = getDevProp.sh; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Resources/getDevProp.sh; sourceTree = ""; }; + 018458B6111606EB00777A5B /* gfxutil */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = gfxutil; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Resources/gfxutil; sourceTree = ""; }; + 018458B7111606EB00777A5B /* cdBootCreator.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = cdBootCreator.sh; path = ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Resources/cdBootCreator.sh; sourceTree = ""; }; 0196529A11066CC0009E8F2F /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 019930DF110A0CB4003B056E /* BootSetupController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BootSetupController.h; path = Sources/BootSetupController.h; sourceTree = ""; }; 019930E0110A0CB4003B056E /* BootSetupController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BootSetupController.mm; path = Sources/BootSetupController.mm; sourceTree = ""; }; - 019930E6110A0D80003B056E /* BootFlagsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BootFlagsController.h; path = Sources/BootFlagsController.h; sourceTree = ""; }; - 019930E7110A0D80003B056E /* BootFlagsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BootFlagsController.mm; path = Sources/BootFlagsController.mm; sourceTree = ""; }; 019930FC110A0E6F003B056E /* PeripheralsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeripheralsController.h; path = Sources/PeripheralsController.h; sourceTree = ""; }; 019930FD110A0E6F003B056E /* PeripheralsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PeripheralsController.mm; path = Sources/PeripheralsController.mm; sourceTree = ""; }; 01993113110A0EB9003B056E /* AdvancedSetupController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdvancedSetupController.h; path = Sources/AdvancedSetupController.h; sourceTree = ""; }; @@ -82,23 +99,6 @@ 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PreferencesControllerBase.mm; path = Sources/PreferencesControllerBase.mm; 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 = ""; }; - 01A25D0E111108C80024EA7E /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutController.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/AboutController.h; sourceTree = ""; }; - 01A25D0F111108C80024EA7E /* AboutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AboutController.mm; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/AboutController.mm; sourceTree = ""; }; - 01A25D1A111108C80024EA7E /* CustomTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomTableView.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/CustomTableView.h; sourceTree = ""; }; - 01A25D1B111108C80024EA7E /* CustomTableView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomTableView.mm; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/CustomTableView.mm; sourceTree = ""; }; - 01A25D1C111108C80024EA7E /* EfiInjectController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EfiInjectController.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/EfiInjectController.h; sourceTree = ""; }; - 01A25D1D111108C80024EA7E /* EfiInjectController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EfiInjectController.mm; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/EfiInjectController.mm; sourceTree = ""; }; - 01A25D1E111108C80024EA7E /* file_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_util.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/file_util.h; sourceTree = ""; }; - 01A25D1F111108C80024EA7E /* GroupControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupControllerProtocol.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/GroupControllerProtocol.h; sourceTree = ""; }; - 01A25D20111108C80024EA7E /* KernOptionsParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KernOptionsParser.cpp; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/KernOptionsParser.cpp; sourceTree = ""; }; - 01A25D21111108C80024EA7E /* KernOptionsParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KernOptionsParser.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/KernOptionsParser.h; sourceTree = ""; }; - 01A25D2A111108C80024EA7E /* SmbiosController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmbiosController.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/SmbiosController.h; sourceTree = ""; }; - 01A25D2B111108C80024EA7E /* SmbiosController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmbiosController.mm; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/SmbiosController.mm; sourceTree = ""; }; - 01A25D2C111108C80024EA7E /* string_util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = string_util.cpp; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/string_util.cpp; sourceTree = ""; }; - 01A25D2D111108C80024EA7E /* string_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_util.h; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/string_util.h; sourceTree = ""; }; - 01A25D68111109FF0024EA7E /* cdBootCreator.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = cdBootCreator.sh; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Resources/cdBootCreator.sh; sourceTree = ""; }; - 01A25D69111109FF0024EA7E /* getDevProp.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = getDevProp.sh; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Resources/getDevProp.sh; sourceTree = ""; }; - 01A25D6A111109FF0024EA7E /* gfxutil */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = gfxutil; path = ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Resources/gfxutil; sourceTree = ""; }; 01A40F74110550F4002A74CD /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; 01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChameleonPrefPane.h; path = Sources/ChameleonPrefPane.h; sourceTree = ""; }; 01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ChameleonPrefPane.mm; path = Sources/ChameleonPrefPane.mm; sourceTree = ""; }; @@ -145,23 +145,25 @@ 01E314A9110FF91C0058F210 /* Controllers */ = { isa = PBXGroup; children = ( - 01A25D0E111108C80024EA7E /* AboutController.h */, - 01A25D0F111108C80024EA7E /* AboutController.mm */, - 01A25D1F111108C80024EA7E /* GroupControllerProtocol.h */, + 0184587C1116060600777A5B /* AboutController.h */, + 0184587E1116060600777A5B /* AboutController.mm */, + 018458881116060600777A5B /* CustomTableView.h */, + 018458891116060600777A5B /* CustomTableView.mm */, + 018458871116060600777A5B /* GroupControllerProtocol.h */, 019931DB110A37FA003B056E /* PreferencesControllerBase.h */, 019931DC110A37FA003B056E /* PreferencesControllerBase.mm */, 019930DF110A0CB4003B056E /* BootSetupController.h */, 019930E0110A0CB4003B056E /* BootSetupController.mm */, - 019930E6110A0D80003B056E /* BootFlagsController.h */, - 019930E7110A0D80003B056E /* BootFlagsController.mm */, + 018458821116060600777A5B /* BootFlagsController.h */, + 018458811116060600777A5B /* BootFlagsController.mm */, 019930FC110A0E6F003B056E /* PeripheralsController.h */, 019930FD110A0E6F003B056E /* PeripheralsController.mm */, + 018458861116060600777A5B /* EfiInjectController.h */, + 018458841116060600777A5B /* EfiInjectController.mm */, + 018458851116060600777A5B /* SmbiosController.h */, + 018458831116060600777A5B /* SmbiosController.mm */, 01993113110A0EB9003B056E /* AdvancedSetupController.h */, 01993114110A0EB9003B056E /* AdvancedSetupController.mm */, - 01A25D1C111108C80024EA7E /* EfiInjectController.h */, - 01A25D1D111108C80024EA7E /* EfiInjectController.mm */, - 01A25D2A111108C80024EA7E /* SmbiosController.h */, - 01A25D2B111108C80024EA7E /* SmbiosController.mm */, ); name = Controllers; sourceTree = ""; @@ -172,8 +174,6 @@ 01E314A9110FF91C0058F210 /* Controllers */, 01B0E80E1108B85A00ACF21B /* ChameleonPrefPane.h */, 01B0E80F1108B85A00ACF21B /* ChameleonPrefPane.mm */, - 01A25D1A111108C80024EA7E /* CustomTableView.h */, - 01A25D1B111108C80024EA7E /* CustomTableView.mm */, ); name = GUI; sourceTree = ""; @@ -181,17 +181,17 @@ 01E314AB110FF95C0058F210 /* Utilities */ = { isa = PBXGroup; children = ( - 01A25D1E111108C80024EA7E /* file_util.h */, - 01A25D2D111108C80024EA7E /* string_util.h */, - 01A25D2C111108C80024EA7E /* string_util.cpp */, + 0184588D1116060600777A5B /* file_util.h */, + 018458911116060600777A5B /* string_util.h */, + 018458921116060600777A5B /* string_util.cpp */, 01B0E8111108B85A00ACF21B /* ShellProcess.h */, 01B0E8101108B85A00ACF21B /* ShellProcess.cpp */, 01B0E8131108B85A00ACF21B /* PropertyList.h */, 01B0E8121108B85A00ACF21B /* PropertyList.cpp */, 01993565110AA9FA003B056E /* ChameleonPropertyList.h */, 01993566110AA9FA003B056E /* ChameleonPropertyList.cpp */, - 01A25D20111108C80024EA7E /* KernOptionsParser.cpp */, - 01A25D21111108C80024EA7E /* KernOptionsParser.h */, + 0184588B1116060600777A5B /* KernOptionsParser.cpp */, + 018458901116060600777A5B /* KernOptionsParser.h */, ); name = Utilities; sourceTree = ""; @@ -220,9 +220,9 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( - 01A25D68111109FF0024EA7E /* cdBootCreator.sh */, - 01A25D69111109FF0024EA7E /* getDevProp.sh */, - 01A25D6A111109FF0024EA7E /* gfxutil */, + 018458B5111606EB00777A5B /* getDevProp.sh */, + 018458B6111606EB00777A5B /* gfxutil */, + 018458B7111606EB00777A5B /* cdBootCreator.sh */, 01B0E8261108B89100ACF21B /* CREDITS */, 010CC624110927A2006EFFE9 /* QuestionMark.png */, 01B0E81A1108B87A00ACF21B /* CDROM.png */, @@ -300,19 +300,19 @@ 01B0E8171108B85A00ACF21B /* ShellProcess.h in Headers */, 01B0E8191108B85A00ACF21B /* PropertyList.h in Headers */, 019930E1110A0CB4003B056E /* BootSetupController.h in Headers */, - 019930E8110A0D80003B056E /* BootFlagsController.h in Headers */, 019930FE110A0E6F003B056E /* PeripheralsController.h in Headers */, 01993115110A0EB9003B056E /* AdvancedSetupController.h in Headers */, 019931DD110A37FA003B056E /* PreferencesControllerBase.h in Headers */, 01993567110AA9FA003B056E /* ChameleonPropertyList.h in Headers */, - 01A25D2E111108C80024EA7E /* AboutController.h in Headers */, - 01A25D3A111108C80024EA7E /* CustomTableView.h in Headers */, - 01A25D3C111108C80024EA7E /* EfiInjectController.h in Headers */, - 01A25D3E111108C80024EA7E /* file_util.h in Headers */, - 01A25D3F111108C80024EA7E /* GroupControllerProtocol.h in Headers */, - 01A25D41111108C80024EA7E /* KernOptionsParser.h in Headers */, - 01A25D4A111108C80024EA7E /* SmbiosController.h in Headers */, - 01A25D4D111108C80024EA7E /* string_util.h in Headers */, + 018458961116060600777A5B /* AboutController.h in Headers */, + 0184589C1116060600777A5B /* BootFlagsController.h in Headers */, + 0184589F1116060600777A5B /* SmbiosController.h in Headers */, + 018458A01116060600777A5B /* EfiInjectController.h in Headers */, + 018458A11116060600777A5B /* GroupControllerProtocol.h in Headers */, + 018458A21116060600777A5B /* CustomTableView.h in Headers */, + 018458A71116060600777A5B /* file_util.h in Headers */, + 018458AA1116060600777A5B /* KernOptionsParser.h in Headers */, + 018458AB1116060600777A5B /* string_util.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -376,9 +376,9 @@ 01B0E8291108B89D00ACF21B /* version in Resources */, 01E0E9511108F9ED004EF6E8 /* TODO in Resources */, 010CC625110927A2006EFFE9 /* QuestionMark.png in Resources */, - 01A25D6B111109FF0024EA7E /* cdBootCreator.sh in Resources */, - 01A25D6C111109FF0024EA7E /* getDevProp.sh in Resources */, - 01A25D6D111109FF0024EA7E /* gfxutil in Resources */, + 018458B8111606EB00777A5B /* getDevProp.sh in Resources */, + 018458B9111606EB00777A5B /* gfxutil in Resources */, + 018458BA111606EB00777A5B /* cdBootCreator.sh in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -403,17 +403,17 @@ 01B0E8161108B85A00ACF21B /* ShellProcess.cpp in Sources */, 01B0E8181108B85A00ACF21B /* PropertyList.cpp in Sources */, 019930E2110A0CB4003B056E /* BootSetupController.mm in Sources */, - 019930E9110A0D80003B056E /* BootFlagsController.mm in Sources */, 019930FF110A0E6F003B056E /* PeripheralsController.mm in Sources */, 01993116110A0EB9003B056E /* AdvancedSetupController.mm in Sources */, 019931DE110A37FA003B056E /* PreferencesControllerBase.mm in Sources */, 01993568110AA9FA003B056E /* ChameleonPropertyList.cpp in Sources */, - 01A25D2F111108C80024EA7E /* AboutController.mm in Sources */, - 01A25D3B111108C80024EA7E /* CustomTableView.mm in Sources */, - 01A25D3D111108C80024EA7E /* EfiInjectController.mm in Sources */, - 01A25D40111108C80024EA7E /* KernOptionsParser.cpp in Sources */, - 01A25D4B111108C80024EA7E /* SmbiosController.mm in Sources */, - 01A25D4C111108C80024EA7E /* string_util.cpp in Sources */, + 018458981116060600777A5B /* AboutController.mm in Sources */, + 0184589B1116060600777A5B /* BootFlagsController.mm in Sources */, + 0184589D1116060600777A5B /* SmbiosController.mm in Sources */, + 0184589E1116060600777A5B /* EfiInjectController.mm in Sources */, + 018458A31116060600777A5B /* CustomTableView.mm in Sources */, + 018458A51116060600777A5B /* KernOptionsParser.cpp in Sources */, + 018458AC1116060600777A5B /* string_util.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -474,15 +474,21 @@ buildSettings = { CONFIGURATION_BUILD_DIR = build/Debug; COPY_PHASE_STRIP = NO; + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = NO; + DSTROOT = /; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = StartupPrefPane_Prefix.pch; + GENERATE_PROFILING_CODE = YES; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; PRODUCT_NAME = Chameleon; + RUN_CLANG_STATIC_ANALYZER = YES; + SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; WRAPPER_EXTENSION = prefPane; ZERO_LINK = YES; }; Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 92) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 93) @@ -13,7 +13,7 @@ YES - + YES @@ -73,7 +73,7 @@ 1 - + 292 YES @@ -733,7 +733,6 @@ {{10, 33}, {640, 267}} - Boot From ... @@ -1707,7 +1706,7 @@ 268 - {{316, 42}, {134, 23}} + {{333, 42}, {134, 23}} YES @@ -1729,7 +1728,7 @@ 268 - {{541, 42}, {59, 23}} + {{471, 42}, {59, 23}} YES @@ -1748,23 +1747,6 @@ 25 - - - 268 - {{420, 12}, {178, 22}} - - YES - - 611450433 - 272630784 - - - - YES - - - - 12 @@ -1790,13 +1772,13 @@ 268 - {{316, 15}, {98, 18}} + {{333, 15}, {109, 18}} YES 67239424 0 - Video ROM + Use Ati ROM 1211912703 @@ -1896,6 +1878,28 @@ + + + 268 + {{471, 15}, {131, 18}} + + YES + + 67239424 + 0 + Use Nvidia ROM + + + 1211912703 + 2 + + + + + 200 + 25 + + {{1, 1}, {610, 76}} @@ -2150,7 +2154,7 @@ Item 8 - + 256 YES @@ -2311,7 +2315,7 @@ 268 - {{297, 48}, {74, 23}} + {{294, 49}, {74, 23}} YES @@ -2374,32 +2378,6 @@ 25 - - - 268 - {{437, 15}, {157, 18}} - - YES - - 67239424 - 0 - Disable kext blacklist - - LucidaGrande - 13 - 16 - - - 1211912703 - 2 - - - - - 200 - 25 - - 12 @@ -2424,14 +2402,18 @@ 268 - {{297, 15}, {90, 18}} + {{520, 14}, {90, 18}} YES 67239424 0 Restart Fix - + + LucidaGrande + 13 + 16 + 1211912703 2 @@ -2526,7 +2508,7 @@ 268 - {{377, 46}, {54, 26}} + {{374, 46}, {54, 26}} YES @@ -2606,7 +2588,7 @@ 268 - {{227, 46}, {59, 26}} + {{214, 46}, {59, 26}} YES @@ -2772,7 +2754,7 @@ 268 - {{200, 10}, {86, 26}} + {{200, 13}, {84, 23}} YES @@ -2849,6 +2831,112 @@ + + + 268 + {{294, 16}, {102, 18}} + + YES + + 67239424 + 0 + System Type + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{410, 11}, {59, 26}} + + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + 1 + 2 + 3 + 4 + 5 + 6 + + + + + 274 + {13, 63} + + + YES + + YES + + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 268436480 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + + + {{1, 1}, {626, 117}} @@ -3186,6 +3274,7 @@ {{10, 33}, {640, 267}} + Advanced @@ -3399,14 +3488,14 @@ - + 0 YES YES YES - + @@ -3809,14 +3898,6 @@ - mVideoROM - - - - 632 - - - mGraphicsMode @@ -3889,14 +3970,6 @@ - mVideoROMText - - - - 643 - - - mHidePartitionText @@ -3969,14 +4042,6 @@ - mDisableKextsBlacklisting - - - - 658 - - - mDSDTFile @@ -4097,14 +4162,6 @@ - onTextFiedChange: - - - - 675 - - - onCheckButtonChange: @@ -4299,14 +4356,6 @@ onCheckButtonChange: - - - 705 - - - - onCheckButtonChange: - 706 @@ -4935,6 +4984,62 @@ 904 + + + onCheckButtonChange: + + + + 907 + + + + mAtiVideoROM + + + + 908 + + + + mNvidiaVideoROM + + + + 909 + + + + onCheckButtonChange: + + + + 914 + + + + onTextFiedChange: + + + + 915 + + + + mSystemTypeText + + + + 916 + + + + mSystemType + + + + 917 + @@ -5480,10 +5585,10 @@ - - + + @@ -5545,20 +5650,6 @@ - 460 - - - YES - - - - - - 461 - - - - 478 @@ -5600,22 +5691,23 @@ YES - - - - - - - + + + + + + + + @@ -6085,20 +6177,6 @@ - 586 - - - YES - - - - - - 587 - - - - 588 @@ -6655,6 +6733,48 @@ + + 905 + + + YES + + + + + + 906 + + + + + 910 + + + YES + + + + + + 911 + + + YES + + + + + + 912 + + + + + 913 + + + @@ -6758,9 +6878,6 @@ 457.IBPluginDependency 458.IBAttributePlaceholdersKey 458.IBPluginDependency - 460.IBAttributePlaceholdersKey - 460.IBPluginDependency - 461.IBPluginDependency 463.IBPluginDependency 464.IBPluginDependency 478.IBPluginDependency @@ -6862,9 +6979,6 @@ 584.IBAttributePlaceholdersKey 584.IBPluginDependency 585.IBPluginDependency - 586.IBAttributePlaceholdersKey - 586.IBPluginDependency - 587.IBPluginDependency 588.IBAttributePlaceholdersKey 588.IBPluginDependency 589.IBPluginDependency @@ -6951,7 +7065,15 @@ 870.IBPluginDependency 872.IBPluginDependency 873.IBPluginDependency - 893.IBPluginDependency + 897.IBPluginDependency + 905.IBAttributePlaceholdersKey + 905.IBPluginDependency + 906.IBPluginDependency + 910.IBAttributePlaceholdersKey + 910.IBPluginDependency + 911.IBPluginDependency + 912.IBPluginDependency + 913.IBPluginDependency 99.IBAttributePlaceholdersKey 99.IBPluginDependency @@ -6977,9 +7099,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{142, 78}, {668, 368}} + {{148, 191}, {668, 368}} com.apple.InterfaceBuilder.CocoaPlugin - {{142, 78}, {668, 368}} + {{148, 191}, {668, 368}} {224.664, 10} @@ -7190,24 +7312,14 @@ ToolTip - NVidia only. Inject Video BIOS to from a file in /Extra/ named [vendorid][devid].rom where vendorid and devid are 4 digits hexadecimal values(default=No) + Inject VBIOS to device-properties com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Define the GFX card video ROM file that should be loaded at boot - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -7489,7 +7601,7 @@ ToolTip - NVidia only. (obsolete) Define the GFX card video ROM file that should be loaded at boot. Superseded by VBIOS + Use an alternate ATI ROM image (path: /Extra/<vendorid>_<devid>.rom) com.apple.InterfaceBuilder.CocoaPlugin @@ -7498,16 +7610,6 @@ ToolTip ToolTip - - Disable the blacklist kexts filtering in voodoo based kernels. Has no effect on vanilla kernels. (Enabled by default) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip Force to boot in safe mode. Useful in certains situations (i.e: when one kexts hangs the system) @@ -7712,6 +7814,28 @@ ToolTip ToolTip + + Use an alternate Nvidia ROM image (path: /Extra/<vendorid>_<devid>.rom) + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Force physical cpus count (all cores in all cpus), automatically detected by default. Use this override only if autodetection doesn't work for your cpu. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip Click on a partition to make it the default boot partition. @@ -7735,7 +7859,7 @@ - 904 + 917 @@ -7753,7 +7877,7 @@ IBProjectSource - ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/AboutController.h + ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/AboutController.h @@ -7801,6 +7925,8 @@ mSMBIOSFileText mSystemId mSystemIdText + mSystemType + mSystemTypeText mWake mWakeImage mWakeImageText @@ -7833,7 +7959,9 @@ NSButton NSTextField NSButton + NSComboBox NSButton + NSButton NSTextField @@ -7965,7 +8093,6 @@ YES YES - onAbout: onRestart: onShutdown: onSleep: @@ -7975,7 +8102,6 @@ id id id - id @@ -8019,7 +8145,7 @@ NSTableView IBProjectSource - ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/CustomTableView.h + ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/CustomTableView.h @@ -8055,7 +8181,7 @@ IBProjectSource - ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/EfiInjectController.h + ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/EfiInjectController.h @@ -8094,6 +8220,7 @@ YES YES + mAtiVideoROM mBootBanner mEHCIacquire mEthernetBuiltIn @@ -8102,13 +8229,12 @@ mGraphicsMode mGraphicsModeText mLegacyLogo + mNvidiaVideoROM mPciRoot mPciRootText mUHCIreset mUSBBusFix mVBIOS - mVideoROM - mVideoROMText YES @@ -8118,15 +8244,15 @@ NSButton NSButton NSButton + NSButton NSComboBox NSButton NSButton + NSButton NSTextField NSButton NSButton NSButton - NSButton - NSTextField @@ -8164,7 +8290,7 @@ IBProjectSource - ../../../../../../devl/OSX/voodoo/chameleonApplications/trunk/ChameleonPrefPane/Sources/SmbiosController.h + ../../../../../../../devl/OSX/voodoo/chameleonApplications/branches/rekursor/ChameleonPrefPane/Sources/SmbiosController.h Property changes on: trunk/ChameleonPrefPane ___________________________________________________________________ Added: svn:mergeinfo Merged /branches/rekursor/ChameleonPrefPane:r76-92