Skip to content

GitLab

Commits (2)
  • Chris Mahoney's avatar
    Add ellipsis after Free · b4e796d4
    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.
    b4e796d4
  • ROOL's avatar
    Key ellipsis suffix off OS version · 9276cce7
    ROOL authored 
    Detail:
  NetFiler is provided in the universal boot, hide the ellipsis on OS versions where the other filers would also be missing one.

Version 0.87. Tagged as 'NetFiler-0_87'
    9276cce7
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 23 deletions
Resources/UK/Messages
View file @ 9276cce7
...@@ -9,7 +9,8 @@ T00:File server ...@@ -9,7 +9,8 @@ T00:File server
M01: M01:
M02:Logon M02:Logon
M03:Open '$' M03:Open '$'
M04:Free M04:Free...
Mo4:Free
M05:Bye M05:Bye
T03:Disc name T03:Disc name
......
VersionASM
View file @ 9276cce7
; ;
; This file is automatically maintained by srccommit, do not edit manually. ; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
; ;
GBLS Module_MajorVersion GBLS Module_MajorVersion
GBLA Module_Version GBLA Module_Version
...@@ -10,14 +9,12 @@ ...@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath Module_MajorVersion SETS "0.87"
Module_MajorVersion SETS "0.86" Module_Version SETA 87
Module_Version SETA 86
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "23 Oct 2016" Module_Date SETS "21 Mar 2020"
Module_ApplicationDate SETS "23-Oct-16" Module_ApplicationDate SETS "21-Mar-20"
Module_ComponentName SETS "NetFiler" Module_ComponentName SETS "NetFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/NetFS/NetFiler" Module_FullVersion SETS "0.87"
Module_FullVersion SETS "0.86" Module_HelpVersion SETS "0.87 (21 Mar 2020)"
Module_HelpVersion SETS "0.86 (23 Oct 2016)"
END END
VersionNum
View file @ 9276cce7
/* (0.86) /* (0.87)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.86 #define Module_MajorVersion_CMHG 0.87
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Oct 2016 #define Module_Date_CMHG 21 Mar 2020
#define Module_MajorVersion "0.86" #define Module_MajorVersion "0.87"
#define Module_Version 86 #define Module_Version 87
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "23 Oct 2016" #define Module_Date "21 Mar 2020"
#define Module_ApplicationDate "23-Oct-16" #define Module_ApplicationDate "21-Mar-20"
#define Module_ComponentName "NetFiler" #define Module_ComponentName "NetFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/NetFS/NetFiler"
#define Module_FullVersion "0.86" #define Module_FullVersion "0.87"
#define Module_HelpVersion "0.86 (23 Oct 2016)" #define Module_HelpVersion "0.87 (21 Mar 2020)"
#define Module_LibraryVersionInfo "0:86" #define Module_LibraryVersionInfo "0:87"
s/NetFiler
View file @ 9276cce7
...@@ -2096,6 +2096,9 @@ mo_discmenu_fslist Item M23 ; actually "FS list" ...@@ -2096,6 +2096,9 @@ mo_discmenu_fslist Item M23 ; actually "FS list"
DCB 0 ; terminator DCB 0 ; terminator
ALIGN ALIGN
TokenMo4 DCB "Mo4", 0 ; Free
ALIGN
menustr_display * m_discmenu + m_headersize + mi_size * mo_discmenu_display + mi_icondata menustr_display * m_discmenu + m_headersize + mi_size * mo_discmenu_display + mi_icondata
menustr_fslist * m_discmenu + m_headersize + mi_size * mo_discmenu_fslist + mi_icondata menustr_fslist * m_discmenu + m_headersize + mi_size * mo_discmenu_fslist + mi_icondata
...@@ -2112,7 +2115,7 @@ mm_display_largeicons * m_fsdisplay+m_headersize+mi_size*mo_fsdisplay_large ...@@ -2112,7 +2115,7 @@ mm_display_largeicons * m_fsdisplay+m_headersize+mi_size*mo_fsdisplay_large
; ............................................................................. ; .............................................................................
CopyMenus Entry "r1-r3" CopyMenus Entry "r1-r6"
BL allocatemessagedata ; if not already done BL allocatemessagedata ; if not already done
...@@ -2121,7 +2124,23 @@ CopyMenus Entry "r1-r3" ...@@ -2121,7 +2124,23 @@ CopyMenus Entry "r1-r3"
ADRVC r2, ram_menustart ADRVC r2, ram_menustart
MOVVC r3, #ram_menuend-ram_menustart MOVVC r3, #ram_menuend-ram_menustart
SWIVC XMessageTrans_MakeMenus SWIVC XMessageTrans_MakeMenus
EXIT VS
MOV r0, #ModHandReason_EnumerateROM_ModulesWithInfo
MOV r1, #0 ; UtilityModule
MOV r2, #-1
SWI XOS_Module
MOVVS r6, #0
LDR r14, =0x52700
CMP r6, r14
BCS %FT10
LDR r0, messagedata ; pre 5.27 ellipsisless "Free"
ADR r1, TokenMo4
MOV r2, #0
SWI XMessageTrans_Lookup
STRVC r2, mm_free + mi_icondata + ii_buffer
10
LDRVC r14, m_fsmenu + m_itemwidth LDRVC r14, m_fsmenu + m_itemwidth
STRVC r14, m_fsmenu_width ; width without "Display" / "FS list" STRVC r14, m_fsmenu_width ; width without "Display" / "FS list"
......