[vlc-devel] commit: macosx: Work-around a NSUIHeartBeat crash on quit by not allowing the sprefs window to be minimised ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jul 17 14:20:19 2008 +0200| [8006b9d92aa68fc941e930bee4866f49ed238b60]

macosx: Work-around a NSUIHeartBeat crash on quit by not allowing the sprefs window to be minimised

No, better don't ask oO

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8006b9d92aa68fc941e930bee4866f49ed238b60
---

 .../English.lproj/Preferences.nib/info.nib         |   13 +++++++++----
 .../English.lproj/Preferences.nib/keyedobjects.nib |  Bin 94890 -> 94782 bytes
 modules/gui/macosx/simple_prefs.m                  |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index 96cd57c..c80c450 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -7,17 +7,17 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>2311</key>
-		<string>345 426 590 230 0 0 1280 778 </string>
+		<string>345 425 590 230 0 0 1280 778 </string>
 		<key>2330</key>
-		<string>345 222 590 502 0 0 1280 778 </string>
+		<string>345 221 590 502 0 0 1280 778 </string>
 		<key>2440</key>
 		<string>345 307 590 389 0 0 1280 778 </string>
 		<key>2523</key>
 		<string>345 319 590 373 0 0 1280 778 </string>
 		<key>2562</key>
-		<string>345 220 590 505 0 0 1280 778 </string>
+		<string>345 219 590 505 0 0 1280 778 </string>
 		<key>2668</key>
-		<string>345 256 590 457 0 0 1280 778 </string>
+		<string>345 255 590 457 0 0 1280 778 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>489.0</string>
@@ -27,8 +27,13 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>2562</integer>
+		<integer>2311</integer>
 		<integer>2265</integer>
+		<integer>1530</integer>
+		<integer>2330</integer>
 		<integer>2668</integer>
+		<integer>2677</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9E17</string>
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 2b2a5df..42e1208 100644
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index fa6532a..8bfc2fc 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -293,7 +293,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
     [o_sprefs_cancel_btn setTitle: _NS("Cancel")];
-    [o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
+    [o_sprefs_reset_btn setTitle: _NS("Reset All")];
     [o_sprefs_save_btn setTitle: _NS("Save")];
     [o_sprefs_win setTitle: _NS("Preferences")];
 }