Skip to content

GitLab

Commit 9b307573 authored by Ben Avison's avatar Ben Avison
Browse files

Fixed menu interactive help to be in right order. Added interactive help for... 

Fixed menu interactive help to be in right order. Added interactive help for dialogue boxes. Fixed volume slider to be Style Guide compliant. Made share dialogue box open at bottom left of screen, not mid right.

Version 2.43. Tagged as 'CDFSFiler-2_43'
parent 4555b88f
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 62 deletions
Resources/UK/Messages
View file @ 9b307573
......@@ -20,17 +20,28 @@ M37:512K
BNK:
#{HelpTokens}
CDI:\TCD-ROM drive %0 icon.|M\Sdisplay the root directory.
DIS:\Sdismount the disc.
CDI:\TCD-ROM drive %0 icon.|M\Sdisplay the root directory of the disc in the drive.
DIS:\Sdismount the disc in drive %0.
CON:\Ralter the CDFS configuration.
SHR:\Rselect how to share the disc in drive %0.
VOL:\Schange the volume level of drive %0.
BUF:\Ralter the CDFS buffer size.
SHR:\Rshare the disc
DRV:\Ralter the number of CD-ROM drives.
CBF:\Sto alter the CDFS buffer size.
CDR:Enter the new number of drives and press Return.
NSH:Click to unshare the disc
SHP:Click to share the disc
VOL:Change the maximum volume level.
NSH:\Sstop sharing the disc in drive %0.
SHP:\Sshare the disc in drive %0.
SW:This window allows sharing of the CD-ROM in drive %0.
SW1:This is the volume identifier of the CD-ROM in drive %0.
SW2:Enter the share name here.
SW3:\Sshare the CD-ROM in drive %0.
SW5:\Sclose this window.
VW:This window allows volume control of CD-ROM drive %0.
VW1:\Sconfirm the volume setting and close this window.
VW7:\Srestore the volume setting to its previous value and close this window.
VW9:Drag SELECT to adjust the volume of CD-ROM drive %0.
#{DictTokens}
NoDrive:No CD-ROM drive present
VersionASM
View file @ 9b307573
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.42"
Module_Version SETA 242
Module_MajorVersion SETS "2.43"
Module_Version SETA 243
Module_MinorVersion SETS ""
Module_Date SETS "05 Nov 2002"
Module_ApplicationDate SETS "05-Nov-02"
Module_Date SETS "08 Nov 2002"
Module_ApplicationDate SETS "08-Nov-02"
Module_ComponentName SETS "CDFSFiler"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
Module_FullVersion SETS "2.42"
Module_HelpVersion SETS "2.42 (05 Nov 2002)"
Module_FullVersion SETS "2.43"
Module_HelpVersion SETS "2.43 (08 Nov 2002)"
END
VersionNum
View file @ 9b307573
/* (2.42)
/* (2.43)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 2.42
#define Module_MajorVersion_CMHG 2.43
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Nov 2002
#define Module_Date_CMHG 08 Nov 2002
#define Module_MajorVersion "2.42"
#define Module_Version 242
#define Module_MajorVersion "2.43"
#define Module_Version 243
#define Module_MinorVersion ""
#define Module_Date "05 Nov 2002"
#define Module_Date "08 Nov 2002"
#define Module_ApplicationDate "05-Nov-02"
#define Module_ApplicationDate "08-Nov-02"
#define Module_ComponentName "CDFSFiler"
#define Module_ComponentPath "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
#define Module_FullVersion "2.42"
#define Module_HelpVersion "2.42 (05 Nov 2002)"
#define Module_LibraryVersionInfo "2:42"
#define Module_FullVersion "2.43"
#define Module_HelpVersion "2.43 (08 Nov 2002)"
#define Module_LibraryVersionInfo "2:43"
hdr/Icons
View file @ 9b307573
......@@ -32,14 +32,14 @@
; Colours for slider bar
;****************************************************************************
BC__CENTRE * 11 ; centre of bar is red
BC__CENTRE * 4 ; centre of bar is grey 4
;****************************************************************************
; Volume window
;****************************************************************************
VOLUME__DRAW_BAR * 8 ; this is the bar to be drawn
VOLUME__TOUCH_BAR * 9 ; this is the bar that receives clicks
VOLUME__DRAW_BAR * 9 ; this is the bar to be drawn
VOLUME__WELL * 8 ; this is the well
VOLUME__CANCEL * 7 ; cancel the volume
VOLUME__SET * 1 ; set the volume
......
s/CDFSFiler
View file @ 9b307573
......@@ -245,6 +245,12 @@ ram_menuend # 0
mb_drives # 4 ; aligned, with room for terminator
mb_buffers # 4 ; aligned, with room for terminator
menudrive # 4 ; the disc name block of the last-opened menu
sharewindrive # 4 ; the disc name block of the share window
volumewindrive # 4 ; the disc name block of the volume window
dragging # 4 ; flag to say whether we're dragging the volume bar
; ---------------------------
cd_namedisc # 4 ; for indirect data
; ---------------------------
......@@ -280,6 +286,8 @@ OldVolumeSetting # 4
;-----------------------------------
;-----------------------------------
AlignSpace 16
dirnamebuffer # &100
userdata # &100
......@@ -926,7 +934,10 @@ repollwimp ROUT
BLVS ReportError
BVS ErrorAbort ; error from reporterror!
MOV r0, #pointerchange_bits + null_bit
LDR r0, dragging
TEQ r0, #0
MOVNE r0, #pointerchange_bits ; enable null events only while dragging
MOVEQ r0, #pointerchange_bits + null_bit
ADRL r1, userdata
SWI XWimp_Poll
BVS repollwimp
......@@ -960,8 +971,29 @@ repollwimp ROUT
CMPNE r0, #User_Message_Recorded
BEQ event_user_message
CMP r0, #User_Drag_Box
BEQ event_drag_box
CMP r0, #0
BEQ event_null
B repollwimp
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
event_drag_box
MOV r1, #0
STR r1, dragging
SWI XWimp_DragBox
B repollwimp
event_null
ADRL r1, userdata
SWI XWimp_GetPointerInfo
LDR r0, [r1]
Push "lr"
B event_volume_bar ; as though we'd clicked on it again
[ Module_Version >= 236
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -1073,7 +1105,7 @@ event_volume_window_click
TEQ r4, # VOLUME__CANCEL
BEQ event_volume_cancel
TEQ r4, # VOLUME__TOUCH_BAR
TEQ r4, # VOLUME__DRAW_BAR
BEQ event_volume_bar
EXIT
......@@ -1167,9 +1199,12 @@ event_volume_bar
LDR r2, [ r1, # 4 ] ; min. x
LDR r3, [ r1, # 20 ] ; scroll x
SUB r6, r3, r2 ; work area x coord of screen origin
LDR r2, [ r1, # 16 ] ; max. y
LDR r3, [ r1, # 24 ] ; scroll y
SUB r7, r3, r2 ; work area y coord of screen origin
SUB r2, r5, r2
ADD r2, r2, r3
ADD r2, r5, r6 ; work area x coord of pointer
; r2 = x position in bar icon
......@@ -1178,8 +1213,8 @@ event_volume_bar
STR r3, [ r1, # 4 ]
SWI XWimp_GetIconState
LDR r3, [ r1, # 8 + 8 ]
LDR r4, [ r1, # 8 + 0 ]
LDR r3, [ r1, # 8 + 8 ] ; max x of slider
LDR r4, [ r1, # 8 + 0 ] ; min x of slider
SUB r3, r3, r4
SUBS r2, r2, r4
......@@ -1202,6 +1237,23 @@ event_volume_bar
MOV r1, r4
BL set_volume_level
; ensure the pointer is constrained
ADRL r1, userdata
ADD lr, r1, #8
LDMIA lr, {r2-r5} ; still contains work area coords of slider icon
SUB r2, r2, r6
SUB r3, r3, r7
SUB r4, r4, r6
SUB r5, r5, r7
ADD lr, r1, #24
STMIA lr, {r2-r5} ; store screen coords of icon
LDR r2, volumewin_handle
MOV r3, #7 ; drag type 7 = drag point
STMIA r1, {r2, r3}
SWI XWimp_DragBox
MOV r1, #1
STR r1, dragging
; Redraw the bar
ADRL r1, userdata
......@@ -1250,10 +1302,6 @@ event_redraw_volume
ERV_Loop
; Choose a colour
MOV r0, # BC__CENTRE
SWI XWimp_SetColour
; Get icon information
Push "r1"
ADRL r3, userdata + 128
......@@ -1302,44 +1350,46 @@ ERV_Loop
; r6 = (r.box.y1-r.scy)
; move to bottom right
;draw_bar( (r.box.x0-r.scx) + icon.box.x0, (r.box.y1-r.scy) + icon.box.y0,
Push "r1-r2"
LDR r1, [ r3, # 8 + 0 ] ; min. x
LDR r1, [ r3, # 8 + 8 ] ; max. x
ADD r1, r1, r5
ADD r1, r1, # 1
SUB r1, r1, # 1
LDR r2, [ r3, # 8 + 4 ] ; min. y
ADD r2, r2, r6
ADD r2, r2, # 1
MOV r0, # 68
SWI XOS_Plot
Pull "r1-r2"
; plot
; plot white rectangle to top of slider
; (r.box.x0-r.scx) + x, (r.box.y1-r.scy) + icon.box.y1 ) ;
Push "r1-r2"
MOV r0, #0
SWI XWimp_SetColour
ADD r1, r5, r4
ADD r1, r4, r5
LDR r2, [ r3, # 8 + 12 ] ; max. y
ADD r2, r2, r6
SUB r2, r2, # 2
SUB r2, r2, # 1
MOV r0, # &65
SWI XOS_Plot
Pull "r1-r2"
; plot grey rectangle to bottom of slider, unless slider is 0 length
MOV r0, # BC__CENTRE
SWI XWimp_SetColour
LDR r1, [ r3, # 8 + 0 ] ; min. x
TEQ r1, r4
ADDNE r1, r1, r5
;draw_3d_bar( (r.box.x0-r.scx) + icon.box.x0, (r.box.y1-r.scy) + icon.box.y0,
; (r.box.x0-r.scx) + icon.box.x1, (r.box.y1-r.scy) + icon.box.y1, 0 ) ;
LDRNE r2, [ r3, # 8 + 4 ] ; min. y
ADDNE r2, r2, r6
MOVNE r0, # &65
SWINE XOS_Plot
Pull "r1-r6"
......@@ -1905,6 +1955,7 @@ click_menu_iconbar ROUT
BL matchdriveicon ; r1 -> drive number (eg. :0)
EXIT VS
STR r1, menudrive
;put the drives number into its buffer
SWI XCDFS_GetNumberOfDrives
......@@ -2141,6 +2192,10 @@ decodelp
go_cd_volume
; Set up interactive help
LDR r1, menudrive
STR r1, volumewindrive
; What is the drive number ?
LDR r1, matchedindex
SWI XCDFS_GetNumberOfDrives
......@@ -2414,6 +2469,9 @@ $l MOV r0, $action
MEND
open_sharewin
LDR r1, menudrive
STR r1, sharewindrive ; set up interactive help
MOV r11, #0
ADRL r1, driveno ; re-read media name
......@@ -3842,16 +3900,31 @@ event_user_message Entry
; Token used by the XMessage_Lookup SWI for interactive help
cdi_tag DCB "CDI", 0
dismount_tag DCB "DIS", 0
configure_tag DCB "CON", 0
share_tag DCB "SHR", 0
volume_tag DCB "VOL", 0
buffers_tag DCB "BUF", 0
drives_tag DCB "DRV", 0
configure_buffers_tag DCB "CBF", 0
configure_drives_tag DCB "CDR", 0
notshare_tag DCB "NSH", 0
sharep_tag DCB "SHP", 0
volume_tag DCB "VOL", 0
sharewin_tag DCB "SW", 0
sharewin1_tag DCB "SW1", 0
sharewin2_tag DCB "SW2", 0
sharewin3_tag DCB "SW3", 0
sharewin5_tag DCB "SW5", 0
volumewin_tag DCB "VW", 0
volumewin1_tag DCB "VW1", 0
volumewin7_tag DCB "VW7", 0
volumewin9_tag DCB "VW9", 0
ALIGN
......@@ -3878,6 +3951,12 @@ returnhelp
MOV r0, #&FF ; "HFF" is the token for the iconbar
B gothelpindex
01
LDR lr, sharewin_handle
CMP r2, lr
BEQ sharewin_help
LDR lr, volumewin_handle
CMP r2, lr
BEQ volumewin_help
CMP r3, #0 ; if null icon, don't bother
BLT %FT99 ; (avoid confusion with parent node)
......@@ -3896,6 +3975,9 @@ returnhelp
MOV r1, r5
LDR r0, menudrive
ADD r5, r0, #drv_number + 1 ; skip the ':'
; Which window ?
CMP r3, #-1
BEQ first_window_help
......@@ -3908,31 +3990,81 @@ third_window_help
TEQ r3, #0
ADREQ r0, configure_buffers_tag
ADRNE r0, configure_drives_tag
MOV r3, #0
MOV r3, #0 ; no parameters
ADD r1, r1, #ms_data
B quick_peek
; First window : Dismount, Configure =>
first_window_help
ADR r0, configure_tag
TEQ r2, # 1
ADREQ r0, dismount_tag
TEQ r2, # 0
CMP r2, #3
ADREQ r0, volume_tag
ADRCC r0, share_tag
CMP r2, #1
ADREQ r0, configure_tag
ADRCC r0, dismount_tag
MOV r3, #0
MOV r3, r5 ; parameter 0 (when used) is drive number
; MOV r3,#0
ADD r1, r1, #ms_data
B quick_peek
; Second window : Buffers =>, Drives =>
second_window_help
TEQ r2, #1
BNE %FT01
TEQ r3, #0
ADREQ r0, buffers_tag
ADRNE r0, drives_tag
MOV r3, #0
MOV r3, #0 ; no parameters
ADD r1, r1, #ms_data
B quick_peek
01
TEQ r3, #0
ADREQ r0, notshare_tag
ADRNE r0, sharep_tag
MOV r3, r5 ; parameter 0 is drive number
; MOV r3,#0
ADD r1, r1, #ms_data
B quick_peek
;------------------------------------------------------------------------------------
; Display help for the share window
;------------------------------------------------------------------------------------
sharewin_help
ADRL r0, sharewin_tag
TEQ r3, #1
ADREQL r0, sharewin1_tag
TEQ r3, #2
ADREQL r0, sharewin2_tag
TEQ r3, #3
ADREQL r0, sharewin3_tag
TEQ r3, #5
ADREQL r0, sharewin5_tag
ADD r1, r1, #ms_data ; r1 -> data field of message
LDR r3, sharewindrive
ADD r3, r3, #drv_number + 1 ; skip the ':'
B quick_peek
;------------------------------------------------------------------------------------
; Display help for the volume window
;------------------------------------------------------------------------------------
volumewin_help
ADRL r0, volumewin_tag
TEQ r3, #1
ADREQL r0, volumewin1_tag
TEQ r3, #7
ADREQL r0, volumewin7_tag
TEQ r3, #8
TEQNE r3, #9
ADREQL r0, volumewin9_tag
ADD r1, r1, #ms_data ; r1 -> data field of message
LDR r3, volumewindrive
ADD r3, r3, #drv_number + 1 ; skip the ':'
B quick_peek
;------------------------------------------------------------------------------------
; Display help for the icon on the icon bar, 'This is the CD-ROM drive xx icon ...'
;------------------------------------------------------------------------------------
......
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