- We added customization for Pharo to allow a different menu to be used. - We modified the default action of help menu to open an URL (only for Pharo) - We added a Info.plist property with the string value of the URL (only for Pharo)
- And also the about dialog was not receiving the close event, we have fixed that. It was related with the filtering of events for SDL.
@demarey You can view, comment on, or merge this pull request online at:
-- Commit Summary --
* Adding a custom Menu for Pharo VMs * Adding a optional URL for the help, only fr Pharo * Handling correctly the events of the about window * Making the about window property as weak.
-- File Changes --
M build.macos32x86/common/Makefile.app (8) M build.macos32x86/pharo.cog.spur.lowcode/Makefile (3) M build.macos32x86/pharo.cog.spur.minheadless/Makefile (2) M build.macos32x86/pharo.cog.spur/Makefile (1) M build.macos32x86/pharo.cog.spur/plugins.ext (2) M build.macos32x86/pharo.cog.v3/Makefile (2) M build.macos32x86/pharo.sista.spur/Makefile (2) M build.macos32x86/pharo.stack.spur.lowcode/Makefile (2) M build.macos32x86/pharo.stack.spur/Makefile (2) M build.macos64x64/common/Makefile.app (8) M build.macos64x64/pharo.cog.spur.lowcode/Makefile (1) M build.macos64x64/pharo.cog.spur/Makefile (1) M build.macos64x64/pharo.sista.spur/Makefile (1) M build.macos64x64/pharo.stack.spur.lowcode/Makefile (1) M build.macos64x64/pharo.stack.spur/Makefile (1) A platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib (1261) A platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib (1261) M platforms/iOS/vm/OSX/Pharo-Info.plist (2) M platforms/iOS/vm/OSX/SqueakOSXApplication.m (30) M platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m (16) M platforms/iOS/vm/OSX/sqSqueakOSXApplication.h (5) M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m (1)
-- Patch Links --
fixes pharo-project/pharo#3036 fixes pharo-project/pharo-launcher#318
Query though... why disable B3DAcceleratorPlugin ? This is not mentioned anywhere in this PR.
@tesonep pushed 1 commit.
49e997fb57866b046fffe699aef236df77385480 Reverting a change I needed to compile in my machine
It is true, I have reverted that change. Sorry!
No worries. A fresh set of eyes is always useful.
why not rewrite the Makefiles to use platforms/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib? This would match $(OSXDIR)/$(SYSTEM)-Info.plist and mean less files had to change. We'd have to duplicate the MainMenu.xib files, one for Newspeak, Pharo and Squeak, but that's not much, and is in the pattern we already have.
Agree with Eliot, the changes are good, but would be better factored and generalized if we would
1. change the `common/Makefile.app` to include the flavour specific menu `platforms/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib` 2. and `mv platforms/iOS/vm/English.lproj/MainMenu.xib platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib` 3. then `cp platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib platforms/iOS/vm/English.lproj/Newspeak-MainMenu.xib`
I'm inclined to close. Any takers otherwise?
Still not solved - and customization should be allowed/possible.
Otherwise people will not be able to build labeled products based on the VM.
I did a PR to update this one some days ago: https://github.com/tesonep/opensmalltalk-vm/pull/1 Waiting for merge
Merged #388 into Cog.