Skip to content

GitLab

Commit 17fd99f3 authored by Ben Avison's avatar Ben Avison
Browse files

Various little changes. 

Detail:
  * New STB Sprites, Templates and Tools files imported, based upon the
    Lazarus UI rather than the old STB UI.
  * STB build now includes WIMPSymbol.
  * No longer attempts to use WIMPSymbol font in UTF8 builds which didn't
    register the font in ResourceFS.
  * Simplified Resources directories by assigning only a single pair of
    Messages files to each locale, rather than for each UI directory within
    each locale directory. The only code change required is to make the Wimp
    error box always use the "Continue" token for NC/STB builds, rather than
    using one of "OK" and "Continue", as with desktop builds.
Admin:
  Not tested.

Version 4.42. Tagged as 'Wimp-4_42'
parent 50103bb6
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 150 deletions
Makefile
View file @ 17fd99f3
......@@ -82,7 +82,7 @@ resources: resources-${CMDHELP}
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS} Else IfThere LocalRes:Messages Then ${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Templates Then ${CP} LocalRes:<UserIF>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites Then ${CP} LocalRes:<UserIF>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites22 Then ${CP} LocalRes:<UserIF>.Sprites22 ${RESDIR}.${COMPONENT}.Sprites22 ${CPFLAGS}
......@@ -94,7 +94,7 @@ resources-None: resources_common
@
resources-: resources_common
print LocalRes:<UserIF>.CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
IfThere LocalRes:CmdHelp Then Print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
${OBJECT}: ${SOURCE}
${MKDIR} o
......
Resources/UK/Lazarus/CmdHelp → Resources/Denmark/CmdHelp
View file @ 17fd99f3
File moved
Resources/Denmark/NC2/Messages → Resources/Denmark/Messages
View file @ 17fd99f3
......@@ -59,7 +59,7 @@ Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start.
ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
Resources/UK/NC2/CmdHelp → Resources/Finland/CmdHelp
View file @ 17fd99f3
File moved
Resources/UK/Ursula/Messages → Resources/Finland/Messages
View file @ 17fd99f3
......@@ -3,8 +3,8 @@ NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ^ ^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGEUP Delete DELETE Copy COPY End END PageDown PAGEDOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
OK:OK
Continue:Continue
OK:Jatka
Continue:Jatka
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
......
Resources/UK/Ursula/CmdHelp → Resources/Japan/CmdHelp
View file @ 17fd99f3
File moved
Resources/Norway/CmdHelp 0 → 100644
View file @ 17fd99f3
File added
Resources/Finland/NC2/Messages → Resources/Norway/Messages
View file @ 17fd99f3
......@@ -3,8 +3,8 @@ NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ^ ^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGEUP Delete DELETE Copy COPY End END PageDown PAGEDOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
OK:Jatka
Continue:Jatka
OK:Fortsett
Continue:Fortsett
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
......@@ -58,7 +58,7 @@ ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
ErrMemS:There is not enough free memory to start this application. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrMem:%0K free memory is needed before the application will start.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
......
Resources/Sweden/CmdHelp 0 → 100644
View file @ 17fd99f3
File added
Resources/Sweden/NC2/Messages → Resources/Sweden/Messages
View file @ 17fd99f3
......@@ -59,7 +59,7 @@ Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start.
ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
Resources/UK/Lazarus/Messages deleted 100644 → 0
View file @ 50103bb6
Error:Error
NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ^ ^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGEUP Delete DELETE Copy COPY End END PageDown PAGEDOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
OK:Continue
Continue:Continue
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
OSUperSec: OS Units / second
OSUperSec2: OS Units / second
WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
GetRect:Get_Rectangle not called correctly
Focus:Input focus window not found
BadHandle:Illegal window handle
TooMenus:Too many menus
BadExtent:Bad work area extent
BadPointer:Syntax: *Pointer [0|1]
NoTemplateFile:Template file not found
BadTemplate:Template entry invalid
BadFonts:Unable to bind font handle
BadSyntax:Syntax error in validation string
NoTasks:Too many tasks
NoTemplate:Template entry not found
InUse:Window manager in use
BadPalFile:Error in palette file
BadPalFile2:The window manager does not understand this type of palette file
BadVersion:Bad version number passed to Wimp_Initialise
BadMessageSize:Message block is too big / not a multiple of 4
BadReasonCode:Illegal reason code given to SendMessage
BadTaskHandle:Illegal task handle
CantTask:Can't start task from here
BadSubMenu:Submenus require a parent menu tree
OwnerWindow:Access to window denied
BadMode:This screen mode is unsuitable for displaying the desktop
BadTransfer:Wimp transfer out of range
BadSlot:One of the task slots is wrong!!!
BadSysInfo:Bad parameter passed to Wimp in R0
BadPtrInR1:Bad pointer passed to Wimp in R1
BadEscapeState:Wimp_Poll called with escape enabled!
BadIconHandle:Illegal icon handle
BadR3:Illegal Wimp_Poll pointer in R3
BadParent:Bad parent window
NoSprites:There is not enough memory to load all of the available sprites. This may affect the appearance of files and applications.
TemplateEOF:End of file while reading template file.
CantKill:Window manager is currently active
MF:Message from %0
ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
Resources/UK/Messages
View file @ 17fd99f3
......@@ -58,6 +58,7 @@ ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
# The appropriate ErrMem token is selected based upon the Wimp's internal STB flag (which includes NC builds)
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
......
Resources/UK/NC2/Messages deleted 100644 → 0
View file @ 50103bb6
Error:Error
NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ^ ^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGEUP Delete DELETE Copy COPY End END PageDown PAGEDOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
OK:Continue
Continue:Continue
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
OSUperSec: OS Units / second
OSUperSec2: OS Units / second
WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
GetRect:Get_Rectangle not called correctly
Focus:Input focus window not found
BadHandle:Illegal window handle
TooMenus:Too many menus
BadExtent:Bad work area extent
BadPointer:Syntax: *Pointer [0|1]
NoTemplateFile:Template file not found
BadTemplate:Template entry invalid
BadFonts:Unable to bind font handle
BadSyntax:Syntax error in validation string
NoTasks:Too many tasks
NoTemplate:Template entry not found
InUse:Window manager in use
BadPalFile:Error in palette file
BadPalFile2:The window manager does not understand this type of palette file
BadVersion:Bad version number passed to Wimp_Initialise
BadMessageSize:Message block is too big / not a multiple of 4
BadReasonCode:Illegal reason code given to SendMessage
BadTaskHandle:Illegal task handle
CantTask:Can't start task from here
BadSubMenu:Submenus require a parent menu tree
OwnerWindow:Access to window denied
BadMode:This screen mode is unsuitable for displaying the desktop
BadTransfer:Wimp transfer out of range
BadSlot:One of the task slots is wrong!!!
BadSysInfo:Bad parameter passed to Wimp in R0
BadPtrInR1:Bad pointer passed to Wimp in R1
BadEscapeState:Wimp_Poll called with escape enabled!
BadIconHandle:Illegal icon handle
BadR3:Illegal Wimp_Poll pointer in R3
BadParent:Bad parent window
NoSprites:There is not enough memory to load all of the available sprites. This may affect the appearance of files and applications.
TemplateEOF:End of file while reading template file.
CantKill:Window manager is currently active
MF:Message from %0
ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
VersionASM
View file @ 17fd99f3
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "4.41"
Module_Version SETA 441
Module_MajorVersion SETS "4.42"
Module_Version SETA 442
Module_MinorVersion SETS ""
Module_Date SETS "07 Mar 2000"
Module_FullVersion SETS "4.41"
Module_Date SETS "29 Mar 2000"
Module_FullVersion SETS "4.42"
END
VersionNum
View file @ 17fd99f3
/* (4.41)
/* (4.42)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 4.41
#define Module_MajorVersion_CMHG 4.42
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Mar 2000
#define Module_Date_CMHG 29 Mar 2000
#define Module_MajorVersion "4.41"
#define Module_Version 441
#define Module_MajorVersion "4.42"
#define Module_Version 442
#define Module_MinorVersion ""
#define Module_Date "07 Mar 2000"
#define Module_Date "29 Mar 2000"
#define Module_FullVersion "4.41"
#define Module_FullVersion "4.42"
s/Wimp04
View file @ 17fd99f3
......@@ -7452,6 +7452,7 @@ measure_symbols
; Exit: EQ => needs mapping
test_arrow
ROUT
[ RegisterWIMPSymbolFont
Push "LR"
CMP R9, #&80
Pull "PC", LT ; optimisation for ASCII: return NE
......@@ -7476,6 +7477,10 @@ test_arrow
Pull "R0,R1,PC"
LTORG
|
TEQ PC, #0 ; clear Z - no WIMPSymbol font fitted
MOV PC, LR
]
]
END
s/Wimp07
View file @ 17fd99f3
......@@ -2304,7 +2304,11 @@ starterrorbox_draw
MOV R1,#11
B oldapploop
[ STB
oklabel DCB "Continue",0
|
oklabel DCB "OK",0,0
]
contlabel DCB "Continue",0
noappname DCB "switcher",0
[ true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment