MacGui: Reorganized prefs window. Re-added pref-general.png to copy bundle resoruces phase.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@951 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 13 insertions, 7 deletions

diff --git a/macosx/English.lproj/Preferences.nib/info.nib b/macosx/English.lproj/Preferences.nib/info.nib
index 521deb9a4..8c0693351 100644
--- a/macosx/English.lproj/Preferences.nib/info.nib
+++ b/macosx/English.lproj/Preferences.nib/info.nib
@@ -7,16 +7,20 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>233</key>
-		<string>506 481 468 208 0 0 1440 878 </string>
+		<string>480 459 520 251 0 0 1440 878 </string>
 		<key>234</key>
-		<string>529 520 421 130 0 0 1440 878 </string>
+		<string>480 510 520 150 0 0 1440 878 </string>
 		<key>235</key>
-		<string>490 525 499 119 0 0 1440 878 </string>
+		<string>480 522 520 125 0 0 1440 878 </string>
 		<key>236</key>
-		<string>361 513 456 172 0 0 1440 878 </string>
+		<string>480 472 520 226 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>233</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>
 </dict>
diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index 687039922..40c177c2b 100644
--- a/macosx/English.lproj/Preferences.nib/keyedobjects.nib
+++ b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index fc1266e45..f33c7bbb7 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -50,7 +50,7 @@
         desktopDirectory,   @"LastSourceDirectory",
         @"NO",              @"DefaultAutoNaming",
         @"NO",              @"DefaultChapterMarkers",
-        @"NO",              @"ShowVerboseOutput",
+        @"YES",              @"ShowVerboseOutput",
 		@"NO",              @"AllowLargeFiles",
 		@"NO",              @"DisableDvdAutoDetect",
 		@"Alert Window",    @"AlertWhenDone",
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index aec33037a..c4b9408ff 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -126,6 +126,7 @@
 		A2DFC6770C61980700E66E89 /* MVMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DFC6760C61980700E66E89 /* MVMenuButton.m */; };
 		A91C68A20C967D83003ADAD1 /* pref-audio.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C68A10C967D83003ADAD1 /* pref-audio.png */; };
 		A94537560C95E6A300EBB9B1 /* pref-picture.png in Resources */ = {isa = PBXBuildFile; fileRef = A94537550C95E6A300EBB9B1 /* pref-picture.png */; };
+		A96041080C96FC5C00CBAB1E /* pref-general.png in Resources */ = {isa = PBXBuildFile; fileRef = A96041070C96FC5C00CBAB1E /* pref-general.png */; };
 		A97A1DB40C91A6800015BC08 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = A97A1DB20C91A6800015BC08 /* Express.nib */; };
 		A9ABA2270C92AECA00D98324 /* PictureSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = A9ABA2250C92AECA00D98324 /* PictureSettings.nib */; };
 		A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */; };
@@ -298,12 +299,12 @@
 		A2DFC6760C61980700E66E89 /* MVMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MVMenuButton.m; sourceTree = "<group>"; };
 		A91C68A10C967D83003ADAD1 /* pref-audio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pref-audio.png"; sourceTree = "<group>"; };
 		A94537550C95E6A300EBB9B1 /* pref-picture.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pref-picture.png"; sourceTree = "<group>"; };
+		A96041070C96FC5C00CBAB1E /* pref-general.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pref-general.png"; sourceTree = "<group>"; };
 		A97A1DB30C91A6800015BC08 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Express.nib; sourceTree = "<group>"; };
 		A9ABA2260C92AECA00D98324 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PictureSettings.nib; sourceTree = "<group>"; };
 		A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; };
 		A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
 		A9AC41E60C918DC000DDF9B8 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AdvancedView.nib; sourceTree = "<group>"; };
-		A9B4CEC70C95752B0086548A /* pref-general.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pref-general.png"; sourceTree = "<group>"; };
 		A9DE40430C959834008A5440 /* minus-8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "minus-8.png"; sourceTree = "<group>"; };
 		A9DE40440C959834008A5440 /* plus-8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "plus-8.png"; sourceTree = "<group>"; };
 		B48359A70C82960500E04440 /* lang.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lang.c; path = ../libhb/lang.c; sourceTree = SOURCE_ROOT; };
@@ -554,7 +555,7 @@
 			children = (
 				A91C68A10C967D83003ADAD1 /* pref-audio.png */,
 				A94537550C95E6A300EBB9B1 /* pref-picture.png */,
-				A9B4CEC70C95752B0086548A /* pref-general.png */,
+				A96041070C96FC5C00CBAB1E /* pref-general.png */,
 				A9DE40430C959834008A5440 /* minus-8.png */,
 				A9DE40440C959834008A5440 /* plus-8.png */,
 				A2DFC66C0C6196D900E66E89 /* actionWidget.png */,
@@ -797,6 +798,7 @@
 				A9DE40460C959834008A5440 /* plus-8.png in Resources */,
 				A94537560C95E6A300EBB9B1 /* pref-picture.png in Resources */,
 				A91C68A20C967D83003ADAD1 /* pref-audio.png in Resources */,
+				A96041080C96FC5C00CBAB1E /* pref-general.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};