From 00514a6501f8e9fee49f79d0be187ca76af259b7 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sun, 9 Feb 2025 12:59:51 -0700 Subject: [PATCH] I18n: Move some hard-coded shortcuts into res files Missed making 'D' for Duplicate a res entry, and make the digits used in dialog shortcuts resources to self-document. No binary changes. --- common/res/common.res.da | 6 ++++++ common/res/common.res.de | 6 ++++++ common/res/common.res.en | 6 ++++++ common/res/common.res.es | 6 ++++++ common/res/common.res.fr | 6 ++++++ common/res/common.res.it | 6 ++++++ common/res/common.res.nl | 6 ++++++ common/res/common.res.pt | 6 ++++++ common/res/common.res.sv | 6 ++++++ desk.acc/benchmark.s | 4 ++-- desk.acc/calendar.s | 8 ++++---- desk.acc/international.s | 8 ++++---- desktop/auxmem.s | 2 +- desktop/ovl_selector_edit.s | 10 +++++----- desktop/res/desktop.res.da | 1 + desktop/res/desktop.res.de | 1 + desktop/res/desktop.res.en | 1 + desktop/res/desktop.res.es | 1 + desktop/res/desktop.res.fr | 1 + desktop/res/desktop.res.it | 1 + desktop/res/desktop.res.nl | 1 + desktop/res/desktop.res.pt | 1 + desktop/res/desktop.res.sv | 1 + selector/app.s | 4 ++-- 24 files changed, 81 insertions(+), 18 deletions(-) diff --git a/common/res/common.res.da b/common/res/common.res.da index 17c40202..1ebd8999 100644 --- a/common/res/common.res.da +++ b/common/res/common.res.da @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.de b/common/res/common.res.de index 612b81b9..33206671 100644 --- a/common/res/common.res.de +++ b/common/res/common.res.de @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.en b/common/res/common.res.en index c55b4398..4c76a03a 100644 --- a/common/res/common.res.en +++ b/common/res/common.res.en @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.es b/common/res/common.res.es index aaba8038..32ed2633 100644 --- a/common/res/common.res.es +++ b/common/res/common.res.es @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.fr b/common/res/common.res.fr index 6513a7c4..e2b99441 100644 --- a/common/res/common.res.fr +++ b/common/res/common.res.fr @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.it b/common/res/common.res.it index a72ba42b..4be78f61 100644 --- a/common/res/common.res.it +++ b/common/res/common.res.it @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.nl b/common/res/common.res.nl index 21da034e..d4ea9d4d 100644 --- a/common/res/common.res.nl +++ b/common/res/common.res.nl @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.pt b/common/res/common.res.pt index dc5e7a35..5c203b22 100644 --- a/common/res/common.res.pt +++ b/common/res/common.res.pt @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/common/res/common.res.sv b/common/res/common.res.sv index cc4c1800..09ebf48b 100644 --- a/common/res/common.res.sv +++ b/common/res/common.res.sv @@ -15,6 +15,12 @@ .define res_string_shortcut_apple_4 " (\x1F4)" .define res_string_shortcut_apple_5 " (\x1F5)" .define res_string_shortcut_apple_6 " (\x1F6)" +.define res_char_shortcut_apple_1 '1' +.define res_char_shortcut_apple_2 '2' +.define res_char_shortcut_apple_3 '3' +.define res_char_shortcut_apple_4 '4' +.define res_char_shortcut_apple_5 '5' +.define res_char_shortcut_apple_6 '6' .define res_char_shortcut_resize 'G' .define res_char_shortcut_move 'M' .define res_char_shortcut_scroll 'S' diff --git a/desk.acc/benchmark.s b/desk.acc/benchmark.s index 28d1e9ae..641d60aa 100644 --- a/desk.acc/benchmark.s +++ b/desk.acc/benchmark.s @@ -228,10 +228,10 @@ probe_count: ldx event_params::modifiers IF_NOT_ZERO - cmp #'5' + cmp #res_char_shortcut_apple_5 jeq OnClick50Hz - cmp #'6' + cmp #res_char_shortcut_apple_6 jeq OnClick60Hz cmp #kShortcutCloseWindow diff --git a/desk.acc/calendar.s b/desk.acc/calendar.s index 6207350b..6fcb75f7 100644 --- a/desk.acc/calendar.s +++ b/desk.acc/calendar.s @@ -727,7 +727,7 @@ UpdateWindow := PaintWindow::update bcs :- add16 tmp, #1000, tmp txa - ora #'0' + ora #'0' ; convert to digit sta str_year,y iny @@ -737,7 +737,7 @@ UpdateWindow := PaintWindow::update bcs :- add16 tmp, #100, tmp txa - ora #'0' + ora #'0' ; convert to digit sta str_year,y iny @@ -747,12 +747,12 @@ UpdateWindow := PaintWindow::update bcs :- add16 tmp, #10, tmp txa - ora #'0' + ora #'0' ; convert to digit sta str_year,y iny lda tmp - ora #'0' + ora #'0' ; convert to digit sta str_year,y rts diff --git a/desk.acc/international.s b/desk.acc/international.s index e765969f..a02ff755 100644 --- a/desk.acc/international.s +++ b/desk.acc/international.s @@ -211,13 +211,13 @@ init_window: cmp #kShortcutCloseWindow jeq OnKeyOK - cmp #'1' + cmp #res_char_shortcut_apple_1 jeq OnClickMDY - cmp #'2' + cmp #res_char_shortcut_apple_2 jeq OnClickDMY - cmp #'3' + cmp #res_char_shortcut_apple_3 jeq OnClick12Hour - cmp #'4' + cmp #res_char_shortcut_apple_4 jeq OnClick24Hour rts END_IF diff --git a/desktop/auxmem.s b/desktop/auxmem.s index 64a99884..a5b9a26c 100644 --- a/desktop/auxmem.s +++ b/desktop/auxmem.s @@ -156,7 +156,7 @@ file_menu: DEFINE_MENU_SEPARATOR DEFINE_MENU_ITEM label_get_info, res_char_menu_item_get_info_shortcut DEFINE_MENU_ITEM_NOMOD label_rename_icon, CHAR_RETURN, CHAR_RETURN - DEFINE_MENU_ITEM label_duplicate_icon, 'D' + DEFINE_MENU_ITEM label_duplicate_icon, res_char_menu_item_duplicate_shortcut DEFINE_MENU_SEPARATOR DEFINE_MENU_ITEM label_copy_selection DEFINE_MENU_ITEM label_delete_selection, $7F diff --git a/desktop/ovl_selector_edit.s b/desktop/ovl_selector_edit.s index 78281996..6f7ab41b 100644 --- a/desktop/ovl_selector_edit.s +++ b/desktop/ovl_selector_edit.s @@ -354,19 +354,19 @@ is_add_flag: ; high bit set = Add, clear = Edit RTS_IF_ZERO lda event_params::key - cmp #'1' + cmp #res_char_shortcut_apple_1 jeq ClickPrimaryRunListCtrl - cmp #'2' + cmp #res_char_shortcut_apple_2 jeq ClickSecondaryRunListCtrl - cmp #'3' + cmp #res_char_shortcut_apple_3 jeq ClickAtFirstBootCtrl - cmp #'4' + cmp #res_char_shortcut_apple_4 jeq ClickAtFirstUseCtrl - cmp #'5' + cmp #res_char_shortcut_apple_5 jeq ClickNeverCtrl rts diff --git a/desktop/res/desktop.res.da b/desktop/res/desktop.res.da index d9d4a208..eb22a63d 100644 --- a/desktop/res/desktop.res.da +++ b/desktop/res/desktop.res.da @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Omd|b" .define res_string_menu_item_duplicate "Duplikere" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Forfattere: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais og Luc Barthelet" diff --git a/desktop/res/desktop.res.de b/desktop/res/desktop.res.de index 7d5cef00..b43262d8 100644 --- a/desktop/res/desktop.res.de +++ b/desktop/res/desktop.res.de @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Umbenennen" .define res_string_menu_item_duplicate "Duplikat" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Autoren: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais und Luc Barthelet" diff --git a/desktop/res/desktop.res.en b/desktop/res/desktop.res.en index b2e63c4a..2057ef31 100644 --- a/desktop/res/desktop.res.en +++ b/desktop/res/desktop.res.en @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Rename" .define res_string_menu_item_duplicate "Duplicate" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Authors: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais and Luc Barthelet" diff --git a/desktop/res/desktop.res.es b/desktop/res/desktop.res.es index 42b46dd9..c6226c6c 100644 --- a/desktop/res/desktop.res.es +++ b/desktop/res/desktop.res.es @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Renombrar" .define res_string_menu_item_duplicate "Duplicar" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Autores: St\x11phane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais y Luc Barthelet" diff --git a/desktop/res/desktop.res.fr b/desktop/res/desktop.res.fr index fcae5bfd..df0fd43c 100644 --- a/desktop/res/desktop.res.fr +++ b/desktop/res/desktop.res.fr @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Renommer" .define res_string_menu_item_duplicate "Dupliquer" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Auteurs : St{phane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais et Luc Barthelet" diff --git a/desktop/res/desktop.res.it b/desktop/res/desktop.res.it index 50a0e31c..2108f1c0 100644 --- a/desktop/res/desktop.res.it +++ b/desktop/res/desktop.res.it @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Rinomina" .define res_string_menu_item_duplicate "Duplicare" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Autori: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais e Luc Barthelet" diff --git a/desktop/res/desktop.res.nl b/desktop/res/desktop.res.nl index 9ce8c255..58935a2d 100644 --- a/desktop/res/desktop.res.nl +++ b/desktop/res/desktop.res.nl @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Wijzig naam" .define res_string_menu_item_duplicate "Dupliceer" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Auteurs: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais en Luc Barthelet" diff --git a/desktop/res/desktop.res.pt b/desktop/res/desktop.res.pt index dace9487..46fc7923 100644 --- a/desktop/res/desktop.res.pt +++ b/desktop/res/desktop.res.pt @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Renomear" .define res_string_menu_item_duplicate "Dobro" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "Autores: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais e Luc Barthelet" diff --git a/desktop/res/desktop.res.sv b/desktop/res/desktop.res.sv index e2c2c30b..eb731d9f 100644 --- a/desktop/res/desktop.res.sv +++ b/desktop/res/desktop.res.sv @@ -42,6 +42,7 @@ .define res_char_menu_item_get_info_shortcut 'I' .define res_string_menu_item_rename_icon "Byt namn" .define res_string_menu_item_duplicate "Duplicera" +.define res_char_menu_item_duplicate_shortcut 'D' .define res_string_new_folder_default "New.Folder" .define res_string_about_text_line5 "F|rfattare: Stephane Cavril, Bernard Gallet, Henri Lamiraux" .define res_string_about_text_line6 "Richard Danais och Luc Barthelet" diff --git a/selector/app.s b/selector/app.s index e4610103..699be93a 100644 --- a/selector/app.s +++ b/selector/app.s @@ -369,9 +369,9 @@ check_key_down: bmi :+ bit BUTN1 ; Solid Apple? bpl check_key -: cmp #'1' ; Solid Apple + 1...7 = boot slot +: cmp #'1' ; Apple + 1...7 = boot slot bcc check_key - cmp #'8' + cmp #'7'+1 bcs check_key and #%00001111 ; ASCII to number sta quick_boot_slot