palm-client: standard Edit menu on every screen with a text field; Contacts, Serial Ports and Screenshot shortcuts move off C, P and S

This commit is contained in:
rich committed 2026-11-03 18:20:37 -05:00
1 parent 35663f62af
commit 04346a4b7c
4 files changed
+85 -17

No files matched your search

+1 -1
View File
@@ -63,7 +63,7 @@ build/$(APP): $(OBJS) build/$(APP)-sections.o build/$(APP)-sections.ld
build/res.stamp: resources/$(APP).rcp src/resources.h resources/smallfont.nfnt resources/largefont.nfnt resources/emoji.bin resources/icon/*.bmp | build
rm -rf build/res && mkdir -p build/res
$(PILRC) -q -I src $< build/res
$(PILRC) -q -allowEditID -I src $< build/res
touch $@
build/$(APP).prc: build/$(APP) build/res.stamp
+78 -12
View File
@@ -15,14 +15,17 @@ DATA "EMJI" ID EmojiArtRes "resources/emoji.bin"
/*
* Menus: Go and Options on every screen; a Channel menu on Home and in a
* channel conversation (main.c picks ConvoChanMenuBar or MainMenuBar for ConvoForm).
* channel conversation (main.c picks ConvoChanMenuBar or ConvoMenuBar for
* ConvoForm); the standard Edit menu wherever there's a text field. The
* Edit commands are the system's IDs: FrmHandleEvent applies them to the
* field with the focus. App shortcuts keep clear of U X C P S K G.
*/
MENU ID MainMenuBar
BEGIN
PULLDOWN "Go"
BEGIN
MENUITEM "Conversations" ID MainMenuHome "H"
MENUITEM "Contacts" ID MainMenuContacts "C"
MENUITEM "Contacts" ID MainMenuContacts "T"
MENUITEM "Node" ID MainMenuNode "N"
MENUITEM "Map" ID MainMenuMap "W"
END
@@ -31,19 +34,67 @@ BEGIN
MENUITEM "Flood Scopes..." ID MainMenuScopes "O"
MENUITEM "Preferences..." ID MainMenuSounds "R"
MENUITEM "-" AUTOID
MENUITEM "Serial Ports..." ID MainMenuPorts "P"
MENUITEM "Serial Ports..." ID MainMenuPorts "I"
MENUITEM "Font Preview" ID MainMenuFontPreview "F"
MENUITEM "Screenshot" ID MainMenuShot "S"
MENUITEM "Screenshot" ID MainMenuShot "Z"
MENUITEM "Screenshot in 5 s" ID MainMenuShotLater "D"
END
END
MENU ID ConvoMenuBar
BEGIN
PULLDOWN "Go"
BEGIN
MENUITEM "Conversations" ID MainMenuHome "H"
MENUITEM "Contacts" ID MainMenuContacts "T"
MENUITEM "Node" ID MainMenuNode "N"
MENUITEM "Map" ID MainMenuMap "W"
END
PULLDOWN "Edit"
BEGIN
MENUITEM "Undo" ID 10000 "U"
MENUITEM "Cut" ID 10001 "X"
MENUITEM "Copy" ID 10002 "C"
MENUITEM "Paste" ID 10003 "P"
MENUITEM "Select All" ID 10004 "S"
MENUITEM "-" ID 10005
MENUITEM "Keyboard" ID 10006 "K"
MENUITEM "Graffiti Help" ID 10007 "G"
END
PULLDOWN "Options"
BEGIN
MENUITEM "Flood Scopes..." ID MainMenuScopes "O"
MENUITEM "Preferences..." ID MainMenuSounds "R"
MENUITEM "-" AUTOID
MENUITEM "Serial Ports..." ID MainMenuPorts "I"
MENUITEM "Font Preview" ID MainMenuFontPreview "F"
MENUITEM "Screenshot" ID MainMenuShot "Z"
MENUITEM "Screenshot in 5 s" ID MainMenuShotLater "D"
END
END
/* Forms with text fields and no other menu */
MENU ID EditMenuBar
BEGIN
PULLDOWN "Edit"
BEGIN
MENUITEM "Undo" ID 10000 "U"
MENUITEM "Cut" ID 10001 "X"
MENUITEM "Copy" ID 10002 "C"
MENUITEM "Paste" ID 10003 "P"
MENUITEM "Select All" ID 10004 "S"
MENUITEM "-" ID 10005
MENUITEM "Keyboard" ID 10006 "K"
MENUITEM "Graffiti Help" ID 10007 "G"
END
END
MENU ID HomeMenuBar
BEGIN
PULLDOWN "Go"
BEGIN
MENUITEM "Conversations" ID MainMenuHome "H"
MENUITEM "Contacts" ID MainMenuContacts "C"
MENUITEM "Contacts" ID MainMenuContacts "T"
MENUITEM "Node" ID MainMenuNode "N"
MENUITEM "Map" ID MainMenuMap "W"
END
@@ -56,9 +107,9 @@ BEGIN
MENUITEM "Flood Scopes..." ID MainMenuScopes "O"
MENUITEM "Preferences..." ID MainMenuSounds "R"
MENUITEM "-" AUTOID
MENUITEM "Serial Ports..." ID MainMenuPorts "P"
MENUITEM "Serial Ports..." ID MainMenuPorts "I"
MENUITEM "Font Preview" ID MainMenuFontPreview "F"
MENUITEM "Screenshot" ID MainMenuShot "S"
MENUITEM "Screenshot" ID MainMenuShot "Z"
MENUITEM "Screenshot in 5 s" ID MainMenuShotLater "D"
END
END
@@ -68,10 +119,21 @@ BEGIN
PULLDOWN "Go"
BEGIN
MENUITEM "Conversations" ID MainMenuHome "H"
MENUITEM "Contacts" ID MainMenuContacts "C"
MENUITEM "Contacts" ID MainMenuContacts "T"
MENUITEM "Node" ID MainMenuNode "N"
MENUITEM "Map" ID MainMenuMap "W"
END
PULLDOWN "Edit"
BEGIN
MENUITEM "Undo" ID 10000 "U"
MENUITEM "Cut" ID 10001 "X"
MENUITEM "Copy" ID 10002 "C"
MENUITEM "Paste" ID 10003 "P"
MENUITEM "Select All" ID 10004 "S"
MENUITEM "-" ID 10005
MENUITEM "Keyboard" ID 10006 "K"
MENUITEM "Graffiti Help" ID 10007 "G"
END
PULLDOWN "Channel"
BEGIN
MENUITEM "Add Channel..." ID MainMenuAddChannel "A"
@@ -85,9 +147,9 @@ BEGIN
MENUITEM "Flood Scopes..." ID MainMenuScopes "O"
MENUITEM "Preferences..." ID MainMenuSounds "R"
MENUITEM "-" AUTOID
MENUITEM "Serial Ports..." ID MainMenuPorts "P"
MENUITEM "Serial Ports..." ID MainMenuPorts "I"
MENUITEM "Font Preview" ID MainMenuFontPreview "F"
MENUITEM "Screenshot" ID MainMenuShot "S"
MENUITEM "Screenshot" ID MainMenuShot "Z"
MENUITEM "Screenshot in 5 s" ID MainMenuShotLater "D"
END
END
@@ -110,7 +172,7 @@ END
FORM ID ConvoForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID MainMenuBar
MENUID ConvoMenuBar
BEGIN
TITLE " "
GADGET ID ConvoGadget AT (0 16 153 104)
@@ -182,6 +244,7 @@ END
FORM ID ContactAddForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID EditMenuBar
BEGIN
TITLE "Add Contact"
LABEL "Name:" AUTOID AT (5 20) FONT 1
@@ -203,7 +266,7 @@ END
FORM ID RemoteForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID MainMenuBar
MENUID ConvoMenuBar
BEGIN
TITLE " "
GADGET ID RemoteGadget AT (0 16 153 114)
@@ -270,6 +333,7 @@ END
FORM ID SettingsForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID EditMenuBar
SAVEBEHIND
BEGIN
TITLE "Node Settings"
@@ -358,6 +422,7 @@ END
FORM ID ScopesForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID EditMenuBar
BEGIN
TITLE "Flood Scopes"
LABEL "Radio default:" AUTOID AT (5 17) FONT 1
@@ -467,6 +532,7 @@ END
FORM ID ChannelForm AT (0 0 160 160)
NOFRAME
USABLE
MENUID EditMenuBar
BEGIN
TITLE "Add Channel"
LABEL "Name:" AUTOID AT (5 20) FONT 1
+3 -3
View File
@@ -42,7 +42,7 @@ static Err RomVersionCompatible(UInt32 required, UInt16 launchFlags)
return sysErrRomIncompatible;
}
/* The Options menu is the same on every screen. */
/* Go, Channel and Options commands, whichever screen's menu they're on; Edit is the form's. */
static Boolean HandleMenu(UInt16 itemID)
{
switch (itemID) {
@@ -79,8 +79,8 @@ static Boolean AppHandleEvent(EventType *event)
switch (formId) {
case HomeForm: FrmSetEventHandler(form, HomeFormHandleEvent); break;
case ConvoForm:
/* the Channel menu only for a channel; a DM gets the plain one */
FrmSetMenu(form, gAppConv.type == VM_CONV_CHANNEL ? ConvoChanMenuBar : MainMenuBar);
/* the Channel menu only for a channel */
FrmSetMenu(form, gAppConv.type == VM_CONV_CHANNEL ? ConvoChanMenuBar : ConvoMenuBar);
FrmSetEventHandler(form, ConvoFormHandleEvent);
break;
case ContactsForm: FrmSetEventHandler(form, ContactsFormHandleEvent); break;
+3 -1
View File
@@ -30,7 +30,9 @@
#define HomeMenuBar 1013 /* Go, Channel (Add), Options */
#define MainMenuShot 1015
#define MainMenuShotLater 1016
#define ConvoChanMenuBar 1014 /* Go, Channel (Add, Leave, Mute, Scope), Options */
#define ConvoChanMenuBar 1014 /* Go, Edit, Channel (Add, Leave, Mute, Scope), Options */
#define ConvoMenuBar 1017 /* Go, Edit, Options: a DM, the console */
#define EditMenuBar 1018 /* Edit only: forms with text fields */
#define MainLinkGroup 1
#define SettingsForm 1200