From c0897d84743f64caa98d17dc22999ef1d566358d Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 29 Mar 2019 11:22:14 +0100 Subject: [PATCH 1/6] Adding a custom Menu for Pharo VMs --- build.macos32x86/common/Makefile.app | 8 +- .../pharo.cog.spur.lowcode/Makefile | 3 +- .../pharo.cog.spur.minheadless/Makefile | 2 + build.macos32x86/pharo.cog.spur/Makefile | 1 + build.macos32x86/pharo.cog.spur/plugins.ext | 2 +- build.macos32x86/pharo.cog.v3/Makefile | 2 + build.macos32x86/pharo.sista.spur/Makefile | 2 + .../pharo.stack.spur.lowcode/Makefile | 2 + build.macos32x86/pharo.stack.spur/Makefile | 2 + build.macos64x64/common/Makefile.app | 8 +- .../pharo.cog.spur.lowcode/Makefile | 1 + build.macos64x64/pharo.cog.spur/Makefile | 1 + build.macos64x64/pharo.sista.spur/Makefile | 1 + .../pharo.stack.spur.lowcode/Makefile | 1 + build.macos64x64/pharo.stack.spur/Makefile | 1 + .../English.lproj/Pharo-MainMenu-opengl.xib | 1261 +++++++++++++++++ .../iOS/vm/English.lproj/Pharo-MainMenu.xib | 1261 +++++++++++++++++ 17 files changed, 2553 insertions(+), 6 deletions(-) create mode 100644 platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib create mode 100644 platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib diff --git a/build.macos32x86/common/Makefile.app b/build.macos32x86/common/Makefile.app index 55c46d90a1..ea8f64fba2 100644 --- a/build.macos32x86/common/Makefile.app +++ b/build.macos32x86/common/Makefile.app @@ -36,6 +36,10 @@ ifeq ($(USEPLUGINASDYLIB),) USEPLUGINASDYLIB:=FALSE endif +ifeq ($(MENU_FILE),) +MENU_FILE:=MainMenu.xib +endif + ifeq ($(CONFIGURATION),debug) APP:=$(APPNAME)Debug.app VM_IDENTIFIER:=$(APPIDENTIFIER)Debug @@ -149,13 +153,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings @mkdir -p $(dir $@) cp -p $< $@ -$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ --compile $(VMMENUNIB) \ - $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns @mkdir -p $(APP)/Contents/Resources diff --git a/build.macos32x86/pharo.cog.spur.lowcode/Makefile b/build.macos32x86/pharo.cog.spur.lowcode/Makefile index 17fbb905f9..6a28d654d1 100644 --- a/build.macos32x86/pharo.cog.spur.lowcode/Makefile +++ b/build.macos32x86/pharo.cog.spur.lowcode/Makefile @@ -11,7 +11,8 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo - +MENU_FILE:=Pharo-MainMenu.xib + #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES # Now include the Makefile proper, which is common to all Mac OS builds. diff --git a/build.macos32x86/pharo.cog.spur.minheadless/Makefile b/build.macos32x86/pharo.cog.spur.minheadless/Makefile index acf8817649..d8bcccac3c 100644 --- a/build.macos32x86/pharo.cog.spur.minheadless/Makefile +++ b/build.macos32x86/pharo.cog.spur.minheadless/Makefile @@ -12,6 +12,8 @@ APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo EXTRAVMLIBS=libsdl2 +MENU_FILE:=Pharo-MainMenu.xib + # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos32x86/pharo.cog.spur/Makefile b/build.macos32x86/pharo.cog.spur/Makefile index 391fd8485b..edca1587c0 100644 --- a/build.macos32x86/pharo.cog.spur/Makefile +++ b/build.macos32x86/pharo.cog.spur/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.cog.spur/plugins.ext b/build.macos32x86/pharo.cog.spur/plugins.ext index 85529e20f8..d6c0717d85 100644 --- a/build.macos32x86/pharo.cog.spur/plugins.ext +++ b/build.macos32x86/pharo.cog.spur/plugins.ext @@ -1,6 +1,6 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -B3DAcceleratorPlugin \ +#B3DAcceleratorPlugin \ ClipboardExtendedPlugin \ CroquetPlugin \ FT2Plugin \ diff --git a/build.macos32x86/pharo.cog.v3/Makefile b/build.macos32x86/pharo.cog.v3/Makefile index 8c4103c8ce..37330aaa2f 100644 --- a/build.macos32x86/pharo.cog.v3/Makefile +++ b/build.macos32x86/pharo.cog.v3/Makefile @@ -11,6 +11,8 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib + #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.sista.spur/Makefile b/build.macos32x86/pharo.sista.spur/Makefile index b256374ae8..b93b240905 100644 --- a/build.macos32x86/pharo.sista.spur/Makefile +++ b/build.macos32x86/pharo.sista.spur/Makefile @@ -11,6 +11,8 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib + #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.stack.spur.lowcode/Makefile b/build.macos32x86/pharo.stack.spur.lowcode/Makefile index d9e62adb91..e681cf058c 100644 --- a/build.macos32x86/pharo.stack.spur.lowcode/Makefile +++ b/build.macos32x86/pharo.stack.spur.lowcode/Makefile @@ -11,6 +11,8 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib + #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.stack.spur/Makefile b/build.macos32x86/pharo.stack.spur/Makefile index b8c791328c..3c3fdd36b0 100644 --- a/build.macos32x86/pharo.stack.spur/Makefile +++ b/build.macos32x86/pharo.stack.spur/Makefile @@ -11,6 +11,8 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib + #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos64x64/common/Makefile.app b/build.macos64x64/common/Makefile.app index 55c46d90a1..ea8f64fba2 100644 --- a/build.macos64x64/common/Makefile.app +++ b/build.macos64x64/common/Makefile.app @@ -36,6 +36,10 @@ ifeq ($(USEPLUGINASDYLIB),) USEPLUGINASDYLIB:=FALSE endif +ifeq ($(MENU_FILE),) +MENU_FILE:=MainMenu.xib +endif + ifeq ($(CONFIGURATION),debug) APP:=$(APPNAME)Debug.app VM_IDENTIFIER:=$(APPIDENTIFIER)Debug @@ -149,13 +153,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings @mkdir -p $(dir $@) cp -p $< $@ -$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ --compile $(VMMENUNIB) \ - $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns @mkdir -p $(APP)/Contents/Resources diff --git a/build.macos64x64/pharo.cog.spur.lowcode/Makefile b/build.macos64x64/pharo.cog.spur.lowcode/Makefile index 8a00b17d9c..0f712f8fe5 100644 --- a/build.macos64x64/pharo.cog.spur.lowcode/Makefile +++ b/build.macos64x64/pharo.cog.spur.lowcode/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.cog.spur/Makefile b/build.macos64x64/pharo.cog.spur/Makefile index 0affccb9a9..c225268676 100644 --- a/build.macos64x64/pharo.cog.spur/Makefile +++ b/build.macos64x64/pharo.cog.spur/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.sista.spur/Makefile b/build.macos64x64/pharo.sista.spur/Makefile index 25319dd891..6f9f1cd35d 100644 --- a/build.macos64x64/pharo.sista.spur/Makefile +++ b/build.macos64x64/pharo.sista.spur/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.stack.spur.lowcode/Makefile b/build.macos64x64/pharo.stack.spur.lowcode/Makefile index 9cca84ad64..5807884a76 100644 --- a/build.macos64x64/pharo.stack.spur.lowcode/Makefile +++ b/build.macos64x64/pharo.stack.spur.lowcode/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.stack.spur/Makefile b/build.macos64x64/pharo.stack.spur/Makefile index ea2a42cbef..560944f6e1 100644 --- a/build.macos64x64/pharo.stack.spur/Makefile +++ b/build.macos64x64/pharo.stack.spur/Makefile @@ -11,6 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo +MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib new file mode 100644 index 0000000000..0a872f1c70 --- /dev/null +++ b/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib @@ -0,0 +1,1261 @@ + + + + 1070 + 14D136 + 7702 + 1347.57 + 758.70 + + com.apple.InterfaceBuilder.CocoaPlugin + 7702 + + + NSCustomObject + NSMenu + NSMenuItem + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSApplication + + + FirstResponder + + + SqueakOSXApplication + + + AMainMenu + + + + Pharo VM + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + Pharo VM + + + + About Pharo VM + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Hide Pharo VM + h + 1048576 + 2147483647 + + + + + + YES + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Quit Pharo VM + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + YES + YES + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + + Open Recent + + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + YES + YES + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + + + Pharo VM Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + 15 + 2 + {{335, 390}, {480, 360}} + 880279552 + Pharo VM + NSWindow + + + + + 274 + {480, 360} + + + + + {{0, 0}, {2560, 1417}} + {10000000000000, 10000000000000} + 128 + NO + + + SqueakOSXAppDelegate + + + NSFontManager + + + + + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + paste: + + + + 226 + + + + cut: + + + + 228 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + showHelp: + + + + 493 + + + + window + + + + 532 + + + + mainView + + + + 533 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + 19 + + + + + + + + 56 + + + + + + + + 217 + + + + + + + + 83 + + + + + + + + 81 + + + + + + + + + + + + + + + + + + 75 + + + + + 80 + + + + + 78 + + + + + 72 + + + + + 82 + + + + + 124 + + + + + + + + 77 + + + + + 73 + + + + + 79 + + + + + 112 + + + + + 74 + + + + + 125 + + + + + + + + 126 + + + + + 205 + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 57 + + + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 371 + + + + + + + + 372 + + + + + 420 + + + + + 490 + + + + + + + + 491 + + + + + + + + 492 + + + + + 494 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{380, 496}, {480, 360}} + + sqSqueakOSXOpenGLView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 533 + + + + + SqueakOSXAppDelegate + sqSqueakAppDelegate + + NSView + NSWindow + + + + mainView + NSView + + + window + NSWindow + + + + IBProjectSource + ../OSX/SqueakOSXAppDelegate.h + + + + SqueakOSXApplication + NSApplication + + IBProjectSource + ../OSX/SqueakOSXApplication.h + + + + sqSqueakAppDelegate + NSObject + + IBProjectSource + ../Common/Classes/sqSqueakAppDelegate.h + + + + sqSqueakOSXOpenGLView + NSOpenGLView + + IBProjectSource + ../OSX/sqSqueakOSXOpenGLView.h + + + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + + 0 + IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {12, 12} + {10, 2} + + + diff --git a/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib b/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib new file mode 100644 index 0000000000..8895943ac0 --- /dev/null +++ b/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib @@ -0,0 +1,1261 @@ + + + + 1070 + 14D136 + 7702 + 1347.57 + 758.70 + + com.apple.InterfaceBuilder.CocoaPlugin + 7702 + + + NSCustomObject + NSMenu + NSMenuItem + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSApplication + + + FirstResponder + + + SqueakOSXApplication + + + AMainMenu + + + + Pharo VM + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + Pharo VM + + + + About Pharo VM + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Hide Pharo VM + h + 1048576 + 2147483647 + + + + + + YES + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Quit Pharo VM + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + YES + YES + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + + Open Recent + + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + YES + YES + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + + + Pharo VM Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + 15 + 2 + {{335, 390}, {480, 360}} + 880279552 + Pharo VM + NSWindow + + + + + 274 + {480, 360} + + + + + {{0, 0}, {2560, 1417}} + {10000000000000, 10000000000000} + 128 + NO + + + SqueakOSXAppDelegate + + + NSFontManager + + + + + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + paste: + + + + 226 + + + + cut: + + + + 228 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + showHelp: + + + + 493 + + + + window + + + + 532 + + + + mainView + + + + 533 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + 19 + + + + + + + + 56 + + + + + + + + 217 + + + + + + + + 83 + + + + + + + + 81 + + + + + + + + + + + + + + + + + + 75 + + + + + 80 + + + + + 78 + + + + + 72 + + + + + 82 + + + + + 124 + + + + + + + + 77 + + + + + 73 + + + + + 79 + + + + + 112 + + + + + 74 + + + + + 125 + + + + + + + + 126 + + + + + 205 + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 57 + + + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 371 + + + + + + + + 372 + + + + + 420 + + + + + 490 + + + + + + + + 491 + + + + + + + + 492 + + + + + 494 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{380, 496}, {480, 360}} + + sqSqueakOSXViewFactory + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 533 + + + + + SqueakOSXAppDelegate + sqSqueakAppDelegate + + NSView + NSWindow + + + + mainView + NSView + + + window + NSWindow + + + + IBProjectSource + ../OSX/SqueakOSXAppDelegate.h + + + + SqueakOSXApplication + NSApplication + + IBProjectSource + ../OSX/SqueakOSXApplication.h + + + + sqSqueakAppDelegate + NSObject + + IBProjectSource + ../Common/Classes/sqSqueakAppDelegate.h + + + + sqSqueakOSXViewFactory + MTKView + + IBProjectSource + ../OSX/sqSqueakOSXViewFactory.h + + + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + + 0 + IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {12, 12} + {10, 2} + + + From f908305a5b1cf938efcfd2e162b3eefde6574608 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 29 Mar 2019 13:58:06 +0100 Subject: [PATCH 2/6] Adding a optional URL for the help, only fr Pharo --- platforms/iOS/vm/OSX/Pharo-Info.plist | 2 ++ platforms/iOS/vm/OSX/SqueakOSXApplication.m | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/platforms/iOS/vm/OSX/Pharo-Info.plist b/platforms/iOS/vm/OSX/Pharo-Info.plist index 65ced06d76..33086028d6 100644 --- a/platforms/iOS/vm/OSX/Pharo-Info.plist +++ b/platforms/iOS/vm/OSX/Pharo-Info.plist @@ -534,5 +534,7 @@ SqueakUIFadeForFullScreenInSeconds 0.5 + PharoHelpURL + https://www.pharo.org/documentation diff --git a/platforms/iOS/vm/OSX/SqueakOSXApplication.m b/platforms/iOS/vm/OSX/SqueakOSXApplication.m index ab4db8f752..b517cb3661 100644 --- a/platforms/iOS/vm/OSX/SqueakOSXApplication.m +++ b/platforms/iOS/vm/OSX/SqueakOSXApplication.m @@ -49,5 +49,21 @@ -(void)sendEvent:(NSEvent*)anEvent } else { [super sendEvent:anEvent]; } -} +} +#ifdef PharoVM +- (void)showHelp:(id)sender; +{ + NSBundle *mainBundle = [NSBundle mainBundle]; + NSDictionary *infoDictionary = [mainBundle infoDictionary]; + + id urlString = infoDictionary[@"PharoHelpURL"]; + + if(urlString == Nil){ + urlString = @"https://www.pharo.org"; + } + + NSURL *url = [NSURL URLWithString: urlString]; + [[NSWorkspace sharedWorkspace] openURL: url]; +} +#endif @end From fa1d55e98cc0f146e3f0769b95873ff22f205eb1 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 29 Mar 2019 15:28:39 +0100 Subject: [PATCH 3/6] Handling correctly the events of the about window --- platforms/iOS/vm/OSX/SqueakOSXApplication.m | 12 +++++++++++- .../iOS/vm/OSX/sqSqueakOSXApplication+events.m | 16 +++++++++++++++- platforms/iOS/vm/OSX/sqSqueakOSXApplication.h | 5 ++++- platforms/iOS/vm/OSX/sqSqueakOSXApplication.m | 1 + 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/platforms/iOS/vm/OSX/SqueakOSXApplication.m b/platforms/iOS/vm/OSX/SqueakOSXApplication.m index b517cb3661..f38feb817d 100644 --- a/platforms/iOS/vm/OSX/SqueakOSXApplication.m +++ b/platforms/iOS/vm/OSX/SqueakOSXApplication.m @@ -38,8 +38,12 @@ Some of this code was funded via a grant from the European Smalltalk User Group #import "SqueakOSXApplication.h" #import "sqSqueakOSXScreenAndWindow.h" +#import "SqueakOSXAppDelegate.h" +#import "sqSqueakOSXApplication.h" -@implementation SqueakOSXApplication +@implementation SqueakOSXApplication + +extern SqueakOSXAppDelegate *gDelegateApp; -(void)sendEvent:(NSEvent*)anEvent { @@ -66,4 +70,10 @@ - (void)showHelp:(id)sender; [[NSWorkspace sharedWorkspace] openURL: url]; } #endif + +- (void)orderFrontStandardAboutPanel:(id)sender; +{ + [super orderFrontStandardAboutPanel: sender]; + [gDelegateApp.squeakApplication setAboutWindow: [self keyWindow]]; +} @end diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m index 8ee610291e..3c8298f5a3 100644 --- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m +++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m @@ -67,6 +67,20 @@ - (sqButton) resolveModifier:(sqModifier)modifier forMouseButton:(sqButton)mouse @implementation sqSqueakOSXApplication (events) +// This method filters the event that should not be processed by the Squeak Application. +// This events are related to windows that are launched from a third party library (as SDL) +// Check pumpRunLoopEventSendAndSignal:(BOOL)signal for more details. + +// The events processed by the VM are the ones in the main window or in the about window. +- (BOOL) shouldFilterEvent: (NSEvent*)event { + + sqSqueakOSXApplication * sqApplication = (sqSqueakOSXApplication*)gDelegateApp.squeakApplication; + + return event.window + && event.window != gDelegateApp.window + && event.window != [sqApplication aboutWindow]; +} + // Consume all pending events in the NSApp // Events may come from the window open by the VM or windows open by other windowing systems // We need to consume all events in the queue, otherwise this may produce lockups when e.g., switching resolutions @@ -81,7 +95,7 @@ - (void) pumpRunLoopEventSendAndSignal:(BOOL)signal { dequeue:YES])) { // If the event is not a system event or an event of *this* window, queue the event // Otherwise treat the event normally and send it to the app - if (event.window && event.window != gDelegateApp.window){ + if ([self shouldFilterEvent: event]){ [alienEventQueue addObject: event]; }else{ [NSApp sendEvent: event]; diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h index 63dbf73773..15bb2d34b9 100644 --- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h +++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h @@ -41,9 +41,12 @@ #import "sqSqueakMainApplication.h" @interface sqSqueakOSXApplication : sqSqueakMainApplication { - NSCursor *squeakCursor; + NSWindow *aboutWindow; + NSCursor *squeakCursor; + } @property (nonatomic,strong) NSCursor *squeakCursor; +@property (nonatomic,strong) NSWindow *aboutWindow; - (int) parseArgument: (NSString *) argData peek: (char *) peek; - (void) parseArgs: (NSArray *) args; diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m index 661146ac04..5fb1986838 100644 --- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m +++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m @@ -104,6 +104,7 @@ void mtfsfi(unsigned long long fpscr) {} @implementation sqSqueakOSXApplication @synthesize squeakCursor; +@synthesize aboutWindow; - (void) setupFloat { fldcw(0x12bf); /* signed infinity, round to nearest, REAL8, disable intrs, disable signals */ From b1c5be068429dd6840602464afe7b71537f4fcea Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 29 Mar 2019 15:37:54 +0100 Subject: [PATCH 4/6] Making the about window property as weak. --- platforms/iOS/vm/OSX/sqSqueakOSXApplication.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h index 15bb2d34b9..d8c0eb6ae7 100644 --- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h +++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h @@ -41,12 +41,12 @@ #import "sqSqueakMainApplication.h" @interface sqSqueakOSXApplication : sqSqueakMainApplication { - NSWindow *aboutWindow; + NSWindow __weak *aboutWindow; NSCursor *squeakCursor; } @property (nonatomic,strong) NSCursor *squeakCursor; -@property (nonatomic,strong) NSWindow *aboutWindow; +@property (nonatomic,weak) NSWindow *aboutWindow; - (int) parseArgument: (NSString *) argData peek: (char *) peek; - (void) parseArgs: (NSArray *) args; From 49e997fb57866b046fffe699aef236df77385480 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 1 Apr 2019 15:09:00 +0200 Subject: [PATCH 5/6] Reverting a change I needed to compile in my machine --- build.macos32x86/pharo.cog.spur/plugins.ext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.macos32x86/pharo.cog.spur/plugins.ext b/build.macos32x86/pharo.cog.spur/plugins.ext index d6c0717d85..85529e20f8 100644 --- a/build.macos32x86/pharo.cog.spur/plugins.ext +++ b/build.macos32x86/pharo.cog.spur/plugins.ext @@ -1,6 +1,6 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -#B3DAcceleratorPlugin \ +B3DAcceleratorPlugin \ ClipboardExtendedPlugin \ CroquetPlugin \ FT2Plugin \ From c30c66231a0796a3a028284f051071cf9914c403 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Fri, 11 Sep 2020 09:55:35 +0200 Subject: [PATCH 6/6] Use $(SYSTEM)-MainMenu.xib to determine which xib file to use --- build.macos32x86/common/Makefile.app | 8 +- .../pharo.cog.spur.lowcode/Makefile | 1 - .../pharo.cog.spur.minheadless/Makefile | 4 +- build.macos32x86/pharo.cog.spur/Makefile | 1 - build.macos32x86/pharo.cog.v3/Makefile | 4 +- build.macos32x86/pharo.sista.spur/Makefile | 2 - .../pharo.stack.spur.lowcode/Makefile | 2 - build.macos32x86/pharo.stack.spur/Makefile | 2 - build.macos64x64/common/Makefile.app | 8 +- .../pharo.cog.spur.lowcode/Makefile | 1 - build.macos64x64/pharo.cog.spur/Makefile | 1 - build.macos64x64/pharo.sista.spur/Makefile | 1 - .../pharo.stack.spur.lowcode/Makefile | 1 - build.macos64x64/pharo.stack.spur/Makefile | 1 - ...inMenu-cg.xib => Newspeak-MainMenu-cg.xib} | 0 ...pengl.xib => Newspeak-MainMenu-opengl.xib} | 0 .../{MainMenu.xib => Newspeak-MainMenu.xib} | 0 .../vm/English.lproj/Squeak-MainMenu-cg.xib | 1261 +++++++++++++++++ .../English.lproj/Squeak-MainMenu-opengl.xib | 1261 +++++++++++++++++ .../iOS/vm/English.lproj/Squeak-MainMenu.xib | 1261 +++++++++++++++++ 20 files changed, 3789 insertions(+), 31 deletions(-) rename platforms/iOS/vm/English.lproj/{MainMenu-cg.xib => Newspeak-MainMenu-cg.xib} (100%) rename platforms/iOS/vm/English.lproj/{MainMenu-opengl.xib => Newspeak-MainMenu-opengl.xib} (100%) rename platforms/iOS/vm/English.lproj/{MainMenu.xib => Newspeak-MainMenu.xib} (100%) create mode 100644 platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib create mode 100644 platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib create mode 100644 platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib diff --git a/build.macos32x86/common/Makefile.app b/build.macos32x86/common/Makefile.app index ea8f64fba2..722140d05e 100644 --- a/build.macos32x86/common/Makefile.app +++ b/build.macos32x86/common/Makefile.app @@ -36,10 +36,6 @@ ifeq ($(USEPLUGINASDYLIB),) USEPLUGINASDYLIB:=FALSE endif -ifeq ($(MENU_FILE),) -MENU_FILE:=MainMenu.xib -endif - ifeq ($(CONFIGURATION),debug) APP:=$(APPNAME)Debug.app VM_IDENTIFIER:=$(APPIDENTIFIER)Debug @@ -153,13 +149,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings @mkdir -p $(dir $@) cp -p $< $@ -$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ --compile $(VMMENUNIB) \ - $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) + $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns @mkdir -p $(APP)/Contents/Resources diff --git a/build.macos32x86/pharo.cog.spur.lowcode/Makefile b/build.macos32x86/pharo.cog.spur.lowcode/Makefile index 6a28d654d1..03ecb532b1 100644 --- a/build.macos32x86/pharo.cog.spur.lowcode/Makefile +++ b/build.macos32x86/pharo.cog.spur.lowcode/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.cog.spur.minheadless/Makefile b/build.macos32x86/pharo.cog.spur.minheadless/Makefile index d8bcccac3c..4810cddab8 100644 --- a/build.macos32x86/pharo.cog.spur.minheadless/Makefile +++ b/build.macos32x86/pharo.cog.spur.minheadless/Makefile @@ -11,9 +11,7 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -EXTRAVMLIBS=libsdl2 -MENU_FILE:=Pharo-MainMenu.xib - +EXTRAVMLIBS=libsdl2 # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos32x86/pharo.cog.spur/Makefile b/build.macos32x86/pharo.cog.spur/Makefile index edca1587c0..391fd8485b 100644 --- a/build.macos32x86/pharo.cog.spur/Makefile +++ b/build.macos32x86/pharo.cog.spur/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.cog.v3/Makefile b/build.macos32x86/pharo.cog.v3/Makefile index 37330aaa2f..2ff22fc3b8 100644 --- a/build.macos32x86/pharo.cog.v3/Makefile +++ b/build.macos32x86/pharo.cog.v3/Makefile @@ -10,9 +10,7 @@ APPNAME:=Pharo APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE -THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib - +THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.sista.spur/Makefile b/build.macos32x86/pharo.sista.spur/Makefile index b93b240905..b256374ae8 100644 --- a/build.macos32x86/pharo.sista.spur/Makefile +++ b/build.macos32x86/pharo.sista.spur/Makefile @@ -11,8 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib - #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.stack.spur.lowcode/Makefile b/build.macos32x86/pharo.stack.spur.lowcode/Makefile index e681cf058c..d9e62adb91 100644 --- a/build.macos32x86/pharo.stack.spur.lowcode/Makefile +++ b/build.macos32x86/pharo.stack.spur.lowcode/Makefile @@ -11,8 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib - #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos32x86/pharo.stack.spur/Makefile b/build.macos32x86/pharo.stack.spur/Makefile index 3c3fdd36b0..b8c791328c 100644 --- a/build.macos32x86/pharo.stack.spur/Makefile +++ b/build.macos32x86/pharo.stack.spur/Makefile @@ -11,8 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib - #CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES diff --git a/build.macos64x64/common/Makefile.app b/build.macos64x64/common/Makefile.app index ea8f64fba2..722140d05e 100644 --- a/build.macos64x64/common/Makefile.app +++ b/build.macos64x64/common/Makefile.app @@ -36,10 +36,6 @@ ifeq ($(USEPLUGINASDYLIB),) USEPLUGINASDYLIB:=FALSE endif -ifeq ($(MENU_FILE),) -MENU_FILE:=MainMenu.xib -endif - ifeq ($(CONFIGURATION),debug) APP:=$(APPNAME)Debug.app VM_IDENTIFIER:=$(APPIDENTIFIER)Debug @@ -153,13 +149,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings @mkdir -p $(dir $@) cp -p $< $@ -$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ --compile $(VMMENUNIB) \ - $(PLATDIR)/iOS/vm/English.lproj/$(MENU_FILE) + $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns @mkdir -p $(APP)/Contents/Resources diff --git a/build.macos64x64/pharo.cog.spur.lowcode/Makefile b/build.macos64x64/pharo.cog.spur.lowcode/Makefile index 0f712f8fe5..8a00b17d9c 100644 --- a/build.macos64x64/pharo.cog.spur.lowcode/Makefile +++ b/build.macos64x64/pharo.cog.spur.lowcode/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.cog.spur/Makefile b/build.macos64x64/pharo.cog.spur/Makefile index c225268676..0affccb9a9 100644 --- a/build.macos64x64/pharo.cog.spur/Makefile +++ b/build.macos64x64/pharo.cog.spur/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.sista.spur/Makefile b/build.macos64x64/pharo.sista.spur/Makefile index 6f9f1cd35d..25319dd891 100644 --- a/build.macos64x64/pharo.sista.spur/Makefile +++ b/build.macos64x64/pharo.sista.spur/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.stack.spur.lowcode/Makefile b/build.macos64x64/pharo.stack.spur.lowcode/Makefile index 5807884a76..9cca84ad64 100644 --- a/build.macos64x64/pharo.stack.spur.lowcode/Makefile +++ b/build.macos64x64/pharo.stack.spur.lowcode/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/build.macos64x64/pharo.stack.spur/Makefile b/build.macos64x64/pharo.stack.spur/Makefile index 560944f6e1..ea2a42cbef 100644 --- a/build.macos64x64/pharo.stack.spur/Makefile +++ b/build.macos64x64/pharo.stack.spur/Makefile @@ -11,7 +11,6 @@ APPNAMEDEF:=$(APPNAME) APPIDENTIFIER:=org.pharo.$(APPNAME) USEPLUGINASDYLIB:=TRUE THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo -MENU_FILE:=Pharo-MainMenu.xib # Now include the Makefile proper, which is common to all Mac OS builds. # diff --git a/platforms/iOS/vm/English.lproj/MainMenu-cg.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu-cg.xib similarity index 100% rename from platforms/iOS/vm/English.lproj/MainMenu-cg.xib rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu-cg.xib diff --git a/platforms/iOS/vm/English.lproj/MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu-opengl.xib similarity index 100% rename from platforms/iOS/vm/English.lproj/MainMenu-opengl.xib rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu-opengl.xib diff --git a/platforms/iOS/vm/English.lproj/MainMenu.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu.xib similarity index 100% rename from platforms/iOS/vm/English.lproj/MainMenu.xib rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu.xib diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib new file mode 100644 index 0000000000..dc0038e308 --- /dev/null +++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib @@ -0,0 +1,1261 @@ + + + + 1070 + 14D136 + 7702 + 1347.57 + 758.70 + + com.apple.InterfaceBuilder.CocoaPlugin + 7702 + + + NSCustomObject + NSMenu + NSMenuItem + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSApplication + + + FirstResponder + + + SqueakOSXApplication + + + AMainMenu + + + + SqueakOSXApp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + SqueakOSXApp + + + + About SqueakOSXApp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Hide SqueakOSXApp + h + 1048576 + 2147483647 + + + + + + YES + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Quit SqueakOSXApp + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + YES + YES + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + + Open Recent + + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + YES + YES + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + + + SqueakOSXApp Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + 15 + 2 + {{335, 390}, {480, 360}} + 880279552 + SqueakOSXApp + NSWindow + + + + + 274 + {480, 360} + + + + + {{0, 0}, {2560, 1417}} + {10000000000000, 10000000000000} + 128 + NO + + + SqueakOSXAppDelegate + + + NSFontManager + + + + + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + paste: + + + + 226 + + + + cut: + + + + 228 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + showHelp: + + + + 493 + + + + window + + + + 532 + + + + mainView + + + + 533 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + 19 + + + + + + + + 56 + + + + + + + + 217 + + + + + + + + 83 + + + + + + + + 81 + + + + + + + + + + + + + + + + + + 75 + + + + + 80 + + + + + 78 + + + + + 72 + + + + + 82 + + + + + 124 + + + + + + + + 77 + + + + + 73 + + + + + 79 + + + + + 112 + + + + + 74 + + + + + 125 + + + + + + + + 126 + + + + + 205 + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 57 + + + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 371 + + + + + + + + 372 + + + + + 420 + + + + + 490 + + + + + + + + 491 + + + + + + + + 492 + + + + + 494 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{380, 496}, {480, 360}} + + sqSqueakOSXCGView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 533 + + + + + SqueakOSXAppDelegate + sqSqueakAppDelegate + + NSView + NSWindow + + + + mainView + NSView + + + window + NSWindow + + + + IBProjectSource + ../OSX/SqueakOSXAppDelegate.h + + + + SqueakOSXApplication + NSApplication + + IBProjectSource + ../OSX/SqueakOSXApplication.h + + + + sqSqueakAppDelegate + NSObject + + IBProjectSource + ../Common/Classes/sqSqueakAppDelegate.h + + + + sqSqueakOSXCGView + NSView + + IBProjectSource + ../OSX/sqSqueakOSXCGView.h + + + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + + 0 + IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {12, 12} + {10, 2} + + + diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib new file mode 100644 index 0000000000..ddcd72047a --- /dev/null +++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib @@ -0,0 +1,1261 @@ + + + + 1070 + 14D136 + 7702 + 1347.57 + 758.70 + + com.apple.InterfaceBuilder.CocoaPlugin + 7702 + + + NSCustomObject + NSMenu + NSMenuItem + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSApplication + + + FirstResponder + + + SqueakOSXApplication + + + AMainMenu + + + + SqueakOSXApp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + SqueakOSXApp + + + + About SqueakOSXApp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Hide SqueakOSXApp + h + 1048576 + 2147483647 + + + + + + YES + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Quit SqueakOSXApp + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + YES + YES + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + + Open Recent + + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + YES + YES + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + + + SqueakOSXApp Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + 15 + 2 + {{335, 390}, {480, 360}} + 880279552 + SqueakOSXApp + NSWindow + + + + + 274 + {480, 360} + + + + + {{0, 0}, {2560, 1417}} + {10000000000000, 10000000000000} + 128 + NO + + + SqueakOSXAppDelegate + + + NSFontManager + + + + + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + paste: + + + + 226 + + + + cut: + + + + 228 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + showHelp: + + + + 493 + + + + window + + + + 532 + + + + mainView + + + + 533 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + 19 + + + + + + + + 56 + + + + + + + + 217 + + + + + + + + 83 + + + + + + + + 81 + + + + + + + + + + + + + + + + + + 75 + + + + + 80 + + + + + 78 + + + + + 72 + + + + + 82 + + + + + 124 + + + + + + + + 77 + + + + + 73 + + + + + 79 + + + + + 112 + + + + + 74 + + + + + 125 + + + + + + + + 126 + + + + + 205 + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 57 + + + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 371 + + + + + + + + 372 + + + + + 420 + + + + + 490 + + + + + + + + 491 + + + + + + + + 492 + + + + + 494 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{380, 496}, {480, 360}} + + sqSqueakOSXOpenGLView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 533 + + + + + SqueakOSXAppDelegate + sqSqueakAppDelegate + + NSView + NSWindow + + + + mainView + NSView + + + window + NSWindow + + + + IBProjectSource + ../OSX/SqueakOSXAppDelegate.h + + + + SqueakOSXApplication + NSApplication + + IBProjectSource + ../OSX/SqueakOSXApplication.h + + + + sqSqueakAppDelegate + NSObject + + IBProjectSource + ../Common/Classes/sqSqueakAppDelegate.h + + + + sqSqueakOSXOpenGLView + NSOpenGLView + + IBProjectSource + ../OSX/sqSqueakOSXOpenGLView.h + + + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + + 0 + IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {12, 12} + {10, 2} + + + diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib new file mode 100644 index 0000000000..49112af1fb --- /dev/null +++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib @@ -0,0 +1,1261 @@ + + + + 1070 + 14D136 + 7702 + 1347.57 + 758.70 + + com.apple.InterfaceBuilder.CocoaPlugin + 7702 + + + NSCustomObject + NSMenu + NSMenuItem + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSApplication + + + FirstResponder + + + SqueakOSXApplication + + + AMainMenu + + + + SqueakOSXApp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + SqueakOSXApp + + + + About SqueakOSXApp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Hide SqueakOSXApp + h + 1048576 + 2147483647 + + + + + + YES + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + YES + Quit SqueakOSXApp + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + YES + YES + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + + Open Recent + + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + YES + YES + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + + + SqueakOSXApp Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + 15 + 2 + {{335, 390}, {480, 360}} + 880279552 + SqueakOSXApp + NSWindow + + + + + 274 + {480, 360} + + + + + {{0, 0}, {2560, 1417}} + {10000000000000, 10000000000000} + 128 + NO + + + SqueakOSXAppDelegate + + + NSFontManager + + + + + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + paste: + + + + 226 + + + + cut: + + + + 228 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + showHelp: + + + + 493 + + + + window + + + + 532 + + + + mainView + + + + 533 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + 19 + + + + + + + + 56 + + + + + + + + 217 + + + + + + + + 83 + + + + + + + + 81 + + + + + + + + + + + + + + + + + + 75 + + + + + 80 + + + + + 78 + + + + + 72 + + + + + 82 + + + + + 124 + + + + + + + + 77 + + + + + 73 + + + + + 79 + + + + + 112 + + + + + 74 + + + + + 125 + + + + + + + + 126 + + + + + 205 + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 57 + + + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 371 + + + + + + + + 372 + + + + + 420 + + + + + 490 + + + + + + + + 491 + + + + + + + + 492 + + + + + 494 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{380, 496}, {480, 360}} + + sqSqueakOSXViewFactory + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 533 + + + + + SqueakOSXAppDelegate + sqSqueakAppDelegate + + NSView + NSWindow + + + + mainView + NSView + + + window + NSWindow + + + + IBProjectSource + ../OSX/SqueakOSXAppDelegate.h + + + + SqueakOSXApplication + NSApplication + + IBProjectSource + ../OSX/SqueakOSXApplication.h + + + + sqSqueakAppDelegate + NSObject + + IBProjectSource + ../Common/Classes/sqSqueakAppDelegate.h + + + + sqSqueakOSXViewFactory + MTKView + + IBProjectSource + ../OSX/sqSqueakOSXViewFactory.h + + + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + + 0 + IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {12, 12} + {10, 2} + + +