Skip to content

Commit

Permalink
Rename 'SqueakOSXApp' to 'Squeak' in xib files
Browse files Browse the repository at this point in the history 
This makes the titles consistent with the previously released Squeak bundles for macOS.
Therefore, it is no longer necessary to swap the MainMenu.nib files during the bundling of Squeak. Instead, we can keep the existing file (and therefore, it will stay in sync with OSVM changes).
  • Loading branch information
@fniephaus
fniephaus committed Feb 29, 2020
1 parent eb2ee2c commit 82c8e40
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions platforms/iOS/vm/English.lproj/MainMenu-cg.xib
View file
Expand Up @@ -39,7 +39,7 @@
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="694149608">
<reference key="NSMenu" ref="649796088"/>
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand All @@ -54,11 +54,11 @@
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="110575045"/>
<object class="NSMenu" key="NSSubmenu" id="110575045">
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="238522557">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">About SqueakOSXApp</string>
<string key="NSTitle">About Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
Expand Down Expand Up @@ -125,7 +125,7 @@
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Hide SqueakOSXApp</string>
<string key="NSTitle">Hide Squeak</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -165,7 +165,7 @@
<object class="NSMenuItem" id="632727374">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Quit SqueakOSXApp</string>
<string key="NSTitle">Quit Squeak</string>
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -494,7 +494,7 @@
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
<int key="NSWTFlags">880279552</int>
<string key="NSWindowTitle">SqueakOSXApp</string>
<string key="NSWindowTitle">Squeak</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
Expand Down
12 changes: 6 additions & 6 deletions platforms/iOS/vm/English.lproj/MainMenu-opengl.xib
View file
Expand Up @@ -39,7 +39,7 @@
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="694149608">
<reference key="NSMenu" ref="649796088"/>
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand All @@ -54,11 +54,11 @@
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="110575045"/>
<object class="NSMenu" key="NSSubmenu" id="110575045">
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="238522557">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">About SqueakOSXApp</string>
<string key="NSTitle">About Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
Expand Down Expand Up @@ -125,7 +125,7 @@
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Hide SqueakOSXApp</string>
<string key="NSTitle">Hide Squeak</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -165,7 +165,7 @@
<object class="NSMenuItem" id="632727374">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Quit SqueakOSXApp</string>
<string key="NSTitle">Quit Squeak</string>
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -494,7 +494,7 @@
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
<int key="NSWTFlags">880279552</int>
<string key="NSWindowTitle">SqueakOSXApp</string>
<string key="NSWindowTitle">Squeak</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
Expand Down
12 changes: 6 additions & 6 deletions platforms/iOS/vm/English.lproj/MainMenu.xib
View file
Expand Up @@ -39,7 +39,7 @@
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="694149608">
<reference key="NSMenu" ref="649796088"/>
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand All @@ -54,11 +54,11 @@
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="110575045"/>
<object class="NSMenu" key="NSSubmenu" id="110575045">
<string key="NSTitle">SqueakOSXApp</string>
<string key="NSTitle">Squeak</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="238522557">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">About SqueakOSXApp</string>
<string key="NSTitle">About Squeak</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
Expand Down Expand Up @@ -125,7 +125,7 @@
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Hide SqueakOSXApp</string>
<string key="NSTitle">Hide Squeak</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -165,7 +165,7 @@
<object class="NSMenuItem" id="632727374">
<reference key="NSMenu" ref="110575045"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">Quit SqueakOSXApp</string>
<string key="NSTitle">Quit Squeak</string>
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -494,7 +494,7 @@
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
<int key="NSWTFlags">880279552</int>
<string key="NSWindowTitle">SqueakOSXApp</string>
<string key="NSWindowTitle">Squeak</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
Expand Down

0 comments on commit 82c8e40

Please sign in to comment.