Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 57)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 58)
@@ -45,6 +45,7 @@
 	IBOutlet NSTextField*	mWakeImageText;
 	IBOutlet NSButton*		mSystemId;
 	IBOutlet NSTextField*	mSystemIdText;
+	IBOutlet NSButton*	mRestartFix;
 }
 
 - (IBAction) onCheckButtonChange: (NSButton*) sender;
Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 57)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 58)
@@ -37,6 +37,7 @@
     BootProp::instance().addOptionDesc(mForceWake, nil, OptionYesNo, "ForceWake", "No");
     BootProp::instance().addOptionDesc(mWakeImage, mWakeImageText, OptionString, "WakeImage", "");
     BootProp::instance().addOptionDesc(mSystemId, mSystemIdText, OptionString, "SystemId", "");
+    BootProp::instance().addOptionDesc(mRestartFix, nil, OptionYesNo, "RestartFix", "Yes");
 }
 
 //--------------------------------------------------------------------------
Index: trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 57)
+++ trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 58)
@@ -158,12 +158,15 @@
 	
 	const char * stringForKey = BootProp::instance().getStringForKey(bod->Name);
 	std::string s = stringForKey ? trim(stringForKey) : "";
+	std::string def = trim(bod->Default ? bod->Default : "");
 	
 	switch (bod->Type) 
 	{
 		case OptionYesNo:
-			if (stringForKey!=NULL) 
+			if (s.length()>0) 
 				[(NSButton*)optionID setIntValue: (toupper(s[0])=='Y' ?  1 : 0 ) ];
+			else
+				[(NSButton*)optionID setIntValue: (toupper(def[0])=='Y' ?  1 : 0 ) ];
 			break;
 			
 		case OptionKernel1:
Index: trunk/ChameleonPrefPane/Info.plist
===================================================================
--- trunk/ChameleonPrefPane/Info.plist	(revision 57)
+++ trunk/ChameleonPrefPane/Info.plist	(revision 58)
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0 b4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.2</string>
+	<string>2.0.0</string>
 	<key>NSMainNibFile</key>
 	<string>Chameleon</string>
 	<key>NSPrefPaneIconFile</key>
Index: trunk/ChameleonPrefPane/makebin
===================================================================
--- trunk/ChameleonPrefPane/makebin	(revision 0)
+++ trunk/ChameleonPrefPane/makebin	(revision 58)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Creates binaries archives from the current version stored in ./bin
+#
+# Usage:
+#
+#   makebin <version>
+#
+(cd bin/OSX105; ditto -ck --keepParent ../../build/Release\ 10.5/Chameleon.prefPane Chameleon.zip)
+(cd bin/OSX106; ditto -ck --keepParent ../../build/Release/*.prefPane Chameleon.zip)
+if test "$1" != "" ; then
+	echo "$1" > bin/version
+fi
\ No newline at end of file

Property changes on: trunk/ChameleonPrefPane/makebin
___________________________________________________________________
Added: svn:executable
   + *

Index: trunk/ChameleonPrefPane/CHANGES
===================================================================
--- trunk/ChameleonPrefPane/CHANGES	(revision 57)
+++ trunk/ChameleonPrefPane/CHANGES	(revision 58)
@@ -1,3 +1,9 @@
+- Added scrax to credits: thx for testing the Chameleon PrefPane!
+- Create a makebin script (to enhance) that creates zip archives and sets a version 
+  in the bin dir
+- Fixed default value to Yes not included in the boot config would not be checked 
+  by default in interface
+- Added RestartFix boot option
 - Added forceBootConfigPath to the tabview panel for quicker setup, so now no
   need to edit the preferences file manually.
 - Added SystemId
Index: trunk/ChameleonPrefPane/bin/version
===================================================================
--- trunk/ChameleonPrefPane/bin/version	(revision 57)
+++ trunk/ChameleonPrefPane/bin/version	(revision 58)
@@ -1 +1 @@
-2.0.b3
+2.0.b4
Index: trunk/ChameleonPrefPane/CREDITS
===================================================================
--- trunk/ChameleonPrefPane/CREDITS	(revision 57)
+++ trunk/ChameleonPrefPane/CREDITS	(revision 58)
@@ -14,4 +14,5 @@
   BlackOSX
   MasterChief
   digital_dreamer
-  smith@@
\ No newline at end of file
+  smith@@
+  scrax
\ No newline at end of file
Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 57)
+++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 58)
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="174"/>
+			<integer value="172"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -85,7 +85,7 @@
 												<object class="NSTextFieldCell" key="NSCell" id="98357325">
 													<int key="NSCellFlags">72482368</int>
 													<int key="NSCellFlags2">138544128</int>
-													<string key="NSContents">Version 2.0 b3</string>
+													<string key="NSContents">Version 2.0 b4</string>
 													<object class="NSFont" key="NSSupport" id="26">
 														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">11</double>
@@ -1833,13 +1833,13 @@
 															<object class="NSButton" id="317712564">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">12</int>
-																<string key="NSFrame">{{258, 75}, {90, 23}}</string>
+																<string key="NSFrame">{{258, 75}, {50, 23}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="951067981">
 																	<int key="NSCellFlags">67239424</int>
 																	<int key="NSCellFlags2">0</int>
-																	<string key="NSContents">Device (rd)</string>
+																	<string key="NSContents">rd</string>
 																	<reference key="NSSupport" ref="930899267"/>
 																	<reference key="NSControlView" ref="317712564"/>
 																	<int key="NSButtonFlags">1211912703</int>
@@ -1899,7 +1899,7 @@
 															<object class="NSTextField" id="921716680">
 																<reference key="NSNextResponder" ref="1000898384"/>
 																<int key="NSvFlags">12</int>
-																<string key="NSFrame">{{353, 75}, {255, 22}}</string>
+																<string key="NSFrame">{{310, 77}, {158, 22}}</string>
 																<reference key="NSSuperview" ref="1000898384"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSTextFieldCell" key="NSCell" id="57785620">
@@ -2168,6 +2168,32 @@
 																	<reference key="NSTextColor" ref="866655721"/>
 																</object>
 															</object>
+															<object class="NSButton" id="906728368">
+																<reference key="NSNextResponder" ref="1000898384"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{474, 78}, {136, 18}}</string>
+																<reference key="NSSuperview" ref="1000898384"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="55438299">
+																	<int key="NSCellFlags">67239424</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Restart Fix</string>
+																	<object class="NSFont" key="NSSupport">
+																		<string key="NSName">LucidaGrande</string>
+																		<double key="NSSize">12</double>
+																		<int key="NSfFlags">16</int>
+																	</object>
+																	<reference key="NSControlView" ref="906728368"/>
+																	<int key="NSButtonFlags">1211912703</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="459398604"/>
+																	<reference key="NSAlternateImage" ref="731537593"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+															</object>
 														</object>
 														<string key="NSFrame">{{1, 1}, {626, 111}}</string>
 														<reference key="NSSuperview" ref="138697471"/>
@@ -3788,6 +3814,22 @@
 					</object>
 					<int key="connectionID">763</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">onCheckButtonChange:</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="906728368"/>
+					</object>
+					<int key="connectionID">766</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mRestartFix</string>
+						<reference key="source" ref="523685185"/>
+						<reference key="destination" ref="906728368"/>
+					</object>
+					<int key="connectionID">767</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -4487,10 +4529,11 @@
 							<reference ref="999034340"/>
 							<reference ref="489715876"/>
 							<reference ref="706656551"/>
-							<reference ref="921716680"/>
 							<reference ref="286479560"/>
 							<reference ref="561126957"/>
 							<reference ref="323622459"/>
+							<reference ref="906728368"/>
+							<reference ref="921716680"/>
 						</object>
 						<reference key="parent" ref="241622967"/>
 					</object>
@@ -5257,6 +5300,20 @@
 						<reference key="object" ref="86444871"/>
 						<reference key="parent" ref="39816002"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">764</int>
+						<reference key="object" ref="906728368"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="55438299"/>
+						</object>
+						<reference key="parent" ref="138697471"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">765</int>
+						<reference key="object" ref="55438299"/>
+						<reference key="parent" ref="906728368"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5518,9 +5575,13 @@
 					<string>754.IBAttributePlaceholdersKey</string>
 					<string>754.IBPluginDependency</string>
 					<string>755.IBPluginDependency</string>
+					<string>757.IBAttributePlaceholdersKey</string>
 					<string>757.IBPluginDependency</string>
 					<string>758.IBAttributePlaceholdersKey</string>
 					<string>758.IBPluginDependency</string>
+					<string>764.IBAttributePlaceholdersKey</string>
+					<string>764.IBPluginDependency</string>
+					<string>765.IBPluginDependency</string>
 					<string>99.IBAttributePlaceholdersKey</string>
 					<string>99.IBPluginDependency</string>
 				</object>
@@ -5545,9 +5606,9 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{193, 183}, {668, 368}}</string>
+					<string>{{195, 183}, {668, 368}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{193, 183}, {668, 368}}</string>
+					<string>{{195, 183}, {668, 368}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<string>{224.664, 10}</string>
@@ -6227,11 +6288,19 @@
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="352674020"/>
-							<string key="toolTip">Swap disks indexes 0&lt;-&gt;1, use this option if your disk sequence in osx does not match the chameleon boot disk sequence</string>
+							<string key="toolTip">Force the path of com.apple.Boot.plist. Useful if more than one file is autodetected, and the automatically found one is not the one that the booter use.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="39816002"/>
+							<string key="toolTip">orce the path of com.apple.Boot.plist. Useful if more than one file is autodetected, and the automatically found one is not the one that the booter use.</string>
+						</object>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -6246,6 +6315,16 @@
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
+							<reference key="object" ref="906728368"/>
+							<string key="toolTip">Restart fix enable/disable option. If disabled, no FACP patch will be done at boot time. (Enabled by default)</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
 							<reference key="object" ref="303493593"/>
 							<string key="toolTip">Click on a partition to make it the default boot partition.</string>
 						</object>
@@ -6269,7 +6348,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">763</int>
+			<int key="maxID">767</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -6313,6 +6392,7 @@
 							<string>mIOText</string>
 							<string>mKernel</string>
 							<string>mKernelText</string>
+							<string>mRestartFix</string>
 							<string>mSMBIOSDefaults</string>
 							<string>mSMBIOSFile</string>
 							<string>mSMBIOSFileText</string>
@@ -6345,6 +6425,7 @@
 							<string>NSTextField</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
@@ -7162,7 +7243,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<integer value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>