summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-13 00:45:27 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-15 03:22:09 -0800
commit73987010b2ef9c67b6614e226c6fae65d834d8f3 (patch)
tree8fdf4b5cd61f4b4cc3af9f83f8213728265eff1c
parentfd31984e0c0f9a37087cd1cffaa3ba116b12c2e5 (diff)
XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce5fb856fab20ae96fa89bd2b71ef242)
Diffstat
-rw-r--r--hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib74
-rw-r--r--hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nibbin41652 -> 41769 bytes
2 files changed, 43 insertions, 31 deletions
diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
index 1ed46e9c7..d27162539 100644
--- a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
@@ -1,11 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> 2<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
3 <data> 3 <data>
4 <int key="IBDocument.SystemTarget">1050</int> 4 <int key="IBDocument.SystemTarget">1050</int>
5 <string key="IBDocument.SystemVersion">9F33</string> 5 <string key="IBDocument.SystemVersion">9G55</string>
6 <string key="IBDocument.InterfaceBuilderVersion">672</string> 6 <string key="IBDocument.InterfaceBuilderVersion">677</string>
7 <string key="IBDocument.AppKitVersion">949.34</string> 7 <string key="IBDocument.AppKitVersion">949.43</string>
8 <string key="IBDocument.HIToolboxVersion">352.00</string> 8 <string key="IBDocument.HIToolboxVersion">353.00</string>
9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
10 <bool key="EncodedWithXMLCoder">YES</bool> 10 <bool key="EncodedWithXMLCoder">YES</bool>
11 </object> 11 </object>
@@ -13,6 +13,15 @@
13 <bool key="EncodedWithXMLCoder">YES</bool> 13 <bool key="EncodedWithXMLCoder">YES</bool>
14 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 14 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
15 </object> 15 </object>
16 <object class="NSMutableDictionary" key="IBDocument.Metadata">
17 <bool key="EncodedWithXMLCoder">YES</bool>
18 <object class="NSArray" key="dict.sortedKeys">
19 <bool key="EncodedWithXMLCoder">YES</bool>
20 </object>
21 <object class="NSMutableArray" key="dict.values">
22 <bool key="EncodedWithXMLCoder">YES</bool>
23 </object>
24 </object>
16 <object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544"> 25 <object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
17 <bool key="EncodedWithXMLCoder">YES</bool> 26 <bool key="EncodedWithXMLCoder">YES</bool>
18 <object class="NSCustomObject" id="815810918"> 27 <object class="NSCustomObject" id="815810918">
@@ -256,6 +265,15 @@
256 </object> 265 </object>
257 <object class="NSMutableArray" key="NSMenuItems"> 266 <object class="NSMutableArray" key="NSMenuItems">
258 <bool key="EncodedWithXMLCoder">YES</bool> 267 <bool key="EncodedWithXMLCoder">YES</bool>
268 <object class="NSMenuItem" id="984461797">
269 <reference key="NSMenu" ref="96874957"/>
270 <string key="NSTitle">Close</string>
271 <string key="NSKeyEquiv">w</string>
272 <int key="NSKeyEquivModMask">1048576</int>
273 <int key="NSMnemonicLoc">2147483647</int>
274 <reference key="NSOnImage" ref="531645050"/>
275 <reference key="NSMixedImage" ref="351811234"/>
276 </object>
259 <object class="NSMenuItem" id="677652931"> 277 <object class="NSMenuItem" id="677652931">
260 <reference key="NSMenu" ref="96874957"/> 278 <reference key="NSMenu" ref="96874957"/>
261 <string key="NSTitle">Minimize</string> 279 <string key="NSTitle">Minimize</string>
@@ -274,6 +292,17 @@
274 <reference key="NSOnImage" ref="531645050"/> 292 <reference key="NSOnImage" ref="531645050"/>
275 <reference key="NSMixedImage" ref="351811234"/> 293 <reference key="NSMixedImage" ref="351811234"/>
276 </object> 294 </object>
295 <object class="NSMenuItem" id="280172320">
296 <reference key="NSMenu" ref="96874957"/>
297 <bool key="NSIsDisabled">YES</bool>
298 <bool key="NSIsSeparator">YES</bool>
299 <string key="NSTitle"/>
300 <string key="NSKeyEquiv"/>
301 <int key="NSKeyEquivModMask">1048576</int>
302 <int key="NSMnemonicLoc">2147483647</int>
303 <reference key="NSOnImage" ref="531645050"/>
304 <reference key="NSMixedImage" ref="351811234"/>
305 </object>
277 <object class="NSMenuItem" id="1036389925"> 306 <object class="NSMenuItem" id="1036389925">
278 <reference key="NSMenu" ref="96874957"/> 307 <reference key="NSMenu" ref="96874957"/>
279 <string key="NSTitle">Cycle Through Windows</string> 308 <string key="NSTitle">Cycle Through Windows</string>
@@ -292,26 +321,6 @@
292 <reference key="NSOnImage" ref="531645050"/> 321 <reference key="NSOnImage" ref="531645050"/>
293 <reference key="NSMixedImage" ref="351811234"/> 322 <reference key="NSMixedImage" ref="351811234"/>
294 </object> 323 </object>
295 <object class="NSMenuItem" id="280172320">
296 <reference key="NSMenu" ref="96874957"/>
297 <bool key="NSIsDisabled">YES</bool>
298 <bool key="NSIsSeparator">YES</bool>
299 <string key="NSTitle"/>
300 <string key="NSKeyEquiv"/>
301 <int key="NSKeyEquivModMask">1048576</int>
302 <int key="NSMnemonicLoc">2147483647</int>
303 <reference key="NSOnImage" ref="531645050"/>
304 <reference key="NSMixedImage" ref="351811234"/>
305 </object>
306 <object class="NSMenuItem" id="984461797">
307 <reference key="NSMenu" ref="96874957"/>
308 <string key="NSTitle">Close</string>
309 <string key="NSKeyEquiv">w</string>
310 <int key="NSKeyEquivModMask">1048576</int>
311 <int key="NSMnemonicLoc">2147483647</int>
312 <reference key="NSOnImage" ref="531645050"/>
313 <reference key="NSMixedImage" ref="351811234"/>
314 </object>
315 <object class="NSMenuItem" id="155085383"> 324 <object class="NSMenuItem" id="155085383">
316 <reference key="NSMenu" ref="96874957"/> 325 <reference key="NSMenu" ref="96874957"/>
317 <bool key="NSIsDisabled">YES</bool> 326 <bool key="NSIsDisabled">YES</bool>
@@ -1442,6 +1451,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
1442 </object> 1451 </object>
1443 <string key="NSFrame">{{1, 17}, {301, 198}}</string> 1452 <string key="NSFrame">{{1, 17}, {301, 198}}</string>
1444 <reference key="NSSuperview" ref="1063387772"/> 1453 <reference key="NSSuperview" ref="1063387772"/>
1454 <reference key="NSNextKeyView" ref="905092943"/>
1445 <reference key="NSDocView" ref="905092943"/> 1455 <reference key="NSDocView" ref="905092943"/>
1446 <reference key="NSBGColor" ref="812484075"/> 1456 <reference key="NSBGColor" ref="812484075"/>
1447 <int key="NScvFlags">4</int> 1457 <int key="NScvFlags">4</int>
@@ -1474,6 +1484,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
1474 </object> 1484 </object>
1475 <string key="NSFrame">{{1, 0}, {301, 17}}</string> 1485 <string key="NSFrame">{{1, 0}, {301, 17}}</string>
1476 <reference key="NSSuperview" ref="1063387772"/> 1486 <reference key="NSSuperview" ref="1063387772"/>
1487 <reference key="NSNextKeyView" ref="792419186"/>
1477 <reference key="NSDocView" ref="792419186"/> 1488 <reference key="NSDocView" ref="792419186"/>
1478 <reference key="NSBGColor" ref="812484075"/> 1489 <reference key="NSBGColor" ref="812484075"/>
1479 <int key="NScvFlags">4</int> 1490 <int key="NScvFlags">4</int>
@@ -1482,6 +1493,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
1482 </object> 1493 </object>
1483 <string key="NSFrame">{{20, 20}, {318, 231}}</string> 1494 <string key="NSFrame">{{20, 20}, {318, 231}}</string>
1484 <reference key="NSSuperview" ref="85544634"/> 1495 <reference key="NSSuperview" ref="85544634"/>
1496 <reference key="NSNextKeyView" ref="580565898"/>
1485 <int key="NSsFlags">50</int> 1497 <int key="NSsFlags">50</int>
1486 <reference key="NSVScroller" ref="842897584"/> 1498 <reference key="NSVScroller" ref="842897584"/>
1487 <reference key="NSHScroller" ref="17278747"/> 1499 <reference key="NSHScroller" ref="17278747"/>
@@ -2195,11 +2207,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
2195 <reference ref="276216762"/> 2207 <reference ref="276216762"/>
2196 <reference ref="1066447520"/> 2208 <reference ref="1066447520"/>
2197 <reference ref="1036389925"/> 2209 <reference ref="1036389925"/>
2198 <reference ref="280172320"/>
2199 <reference ref="369641893"/> 2210 <reference ref="369641893"/>
2200 <reference ref="984461797"/>
2201 <reference ref="155085383"/> 2211 <reference ref="155085383"/>
2202 <reference ref="444952046"/> 2212 <reference ref="444952046"/>
2213 <reference ref="984461797"/>
2214 <reference ref="280172320"/>
2203 </object> 2215 </object>
2204 <reference key="parent" ref="931553638"/> 2216 <reference key="parent" ref="931553638"/>
2205 </object> 2217 </object>
@@ -3626,7 +3638,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
3626 <reference ref="9"/> 3638 <reference ref="9"/>
3627 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3639 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
3628 <reference ref="9"/> 3640 <reference ref="9"/>
3629 <string>{{204, 683}, {315, 153}}</string> 3641 <string>{{349, 858}, {315, 153}}</string>
3630 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3642 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
3631 <reference ref="9"/> 3643 <reference ref="9"/>
3632 <string>{{271, 666}, {301, 153}}</string> 3644 <string>{{271, 666}, {301, 153}}</string>
@@ -3634,7 +3646,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
3634 <string>{{437, 749}, {484, 308}}</string> 3646 <string>{{437, 749}, {484, 308}}</string>
3635 <reference ref="9"/> 3647 <reference ref="9"/>
3636 <string>{{184, 290}, {481, 345}}</string> 3648 <string>{{184, 290}, {481, 345}}</string>
3637 <integer value="0"/> 3649 <integer value="0" id="8"/>
3638 <reference ref="9"/> 3650 <reference ref="9"/>
3639 <string>{3.40282e+38, 3.40282e+38}</string> 3651 <string>{3.40282e+38, 3.40282e+38}</string>
3640 <string>{320, 240}</string> 3652 <string>{320, 240}</string>
@@ -3654,13 +3666,13 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
3654 <string>{{68, 585}, {454, 271}}</string> 3666 <string>{{68, 585}, {454, 271}}</string>
3655 <reference ref="9"/> 3667 <reference ref="9"/>
3656 <string>{{433, 406}, {486, 327}}</string> 3668 <string>{{433, 406}, {486, 327}}</string>
3657 <integer value="0"/> 3669 <reference ref="8"/>
3658 <reference ref="9"/> 3670 <reference ref="9"/>
3659 <string>{3.40282e+38, 3.40282e+38}</string> 3671 <string>{3.40282e+38, 3.40282e+38}</string>
3660 <string>{320, 240}</string> 3672 <string>{320, 240}</string>
3661 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3673 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
3662 <reference ref="9"/> 3674 <reference ref="9"/>
3663 <string>{{8, 844}, {336, 20}}</string> 3675 <string>{{145, 1011}, {336, 20}}</string>
3664 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3676 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
3665 <reference ref="9"/> 3677 <reference ref="9"/>
3666 <string>{{67, 819}, {336, 20}}</string> 3678 <string>{{67, 819}, {336, 20}}</string>
diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
index 16c71091a..ee6cdf25e 100644
--- a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 09:08:06 +0000