...
 
Commits (2)
  • Chris Mahoney's avatar
    Add ellipsis after Free · 5e33d5f1
    Chris Mahoney authored
    As per bug 448, the "Free" menu item on each filer should have an ellipsis because it opens a persistent dialogue box.
    5e33d5f1
  • ROOL's avatar
    Key ellipsis suffix off OS version · c5f1e092
    ROOL authored
    Detail:
      Omni is a disc based component, hide the ellipsis on OS versions where the other filers would also be missing one.
    
    Version 2.32. Tagged as 'Omni-2_32'
    c5f1e092
...@@ -11,8 +11,10 @@ _Version:Filled by build system ...@@ -11,8 +11,10 @@ _Version:Filled by build system
# Menu definitions & entry strings # Menu definitions & entry strings
mhdr.icon:OmniClient mhdr.icon:OmniClient
menu.icon:>Info, FS list,>Mounts, Bye|>About,, Open '$', Free menu.icon:>Info,FS list,>Mounts,Bye|>About,,Open '$',Free...
menu.icone:>Info, FS list,>Mounts,>Quit|>About,, Open '$', Free menu.icone:>Info,FS list,>Mounts,>Quit|>About,,Open '$',Free...
menu.icono:>Info,FS list,>Mounts,Bye|>About,,Open '$',Free
menu.iconoe:>Info,FS list,>Mounts,>Quit|>About,,Open '$',Free
icon.reset:Reset icon.reset:Reset
icon.dismount:Dismount icon.dismount:Dismount
mhdr.icon_i:Info mhdr.icon_i:Info
......
/* (2.31) /* (2.32)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 2.31 #define Module_MajorVersion_CMHG 2.32
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Feb 2020 #define Module_Date_CMHG 16 Mar 2020
#define Module_MajorVersion "2.31" #define Module_MajorVersion "2.32"
#define Module_Version 231 #define Module_Version 232
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "29 Feb 2020" #define Module_Date "16 Mar 2020"
#define Module_ApplicationDate "29-Feb-20" #define Module_ApplicationDate "16-Mar-20"
#define Module_ComponentName "Omni" #define Module_ComponentName "Omni"
#define Module_FullVersion "2.31" #define Module_FullVersion "2.32"
#define Module_HelpVersion "2.31 (29 Feb 2020)" #define Module_HelpVersion "2.32 (16 Mar 2020)"
#define Module_LibraryVersionInfo "2:31" #define Module_LibraryVersionInfo "2:32"
...@@ -383,7 +383,7 @@ extern void ConfigWrite(void) ...@@ -383,7 +383,7 @@ extern void ConfigWrite(void)
*/ */
extern bool coreinit(void) extern bool coreinit(void)
{ {
char appname[64]; char appname[64], token[16];
char menudescription[260]; char menudescription[260];
mount_record *mr = NULL; mount_record *mr = NULL;
int msg_block[] = /* List of all known message numbers, 0 terminated */ int msg_block[] = /* List of all known message numbers, 0 terminated */
...@@ -394,7 +394,7 @@ extern bool coreinit(void) ...@@ -394,7 +394,7 @@ extern bool coreinit(void)
Desk_message_INITTASK, 0 Desk_message_INITTASK, 0
}; };
char *err = NULL; char *err = NULL;
int active; int active, osver = 0;
dprintf (("", "coreinit.Entry:\n")); dprintf (("", "coreinit.Entry:\n"));
Desk_Hourglass_Start(5); Desk_Hourglass_Start(5);
...@@ -490,12 +490,13 @@ extern bool coreinit(void) ...@@ -490,12 +490,13 @@ extern bool coreinit(void)
/* Menus /* Menus
*/ */
Desk_Msgs_Lookup("mhdr.icon", appname, 63); _swix(OS_Module, _INR(0, 2) | _OUT(6), 20, 0, -1, &osver);
strcpy(token, osver < 0x52700 ? "menu.icono" : "menu.icon");
#ifdef EXPERT #ifdef EXPERT
Desk_Msgs_Lookup((prog_config.expert) ? "menu.icone" : "menu.icon", menudescription, 259); if (prog_config.expert) strcat(token, "e");
#else
Desk_Msgs_Lookup("menu.icon", menudescription, 259);
#endif #endif
Desk_Msgs_Lookup("mhdr.icon", appname, 63);
Desk_Msgs_Lookup(token, menudescription, 259);
menu_icon = Desk_Menu_New(appname, menudescription); menu_icon = Desk_Menu_New(appname, menudescription);
menu_icon_mo = NULL; menu_icon_mo = NULL;
Desk_Msgs_Lookup("mhdr.icon_d", appname, 63); Desk_Msgs_Lookup("mhdr.icon_d", appname, 63);
......