Commits (4)
  • Jeffrey Lee's avatar
    Fix inconsistent error reporting when changing mode via the iconbar menu · c6f206fb
    Jeffrey Lee authored
    Detail:
      s/Mouse - Fix clicking the 'OK' button in the mode window so that it preserves (and reports) the error instead of clobbering it
    Admin:
      Tested on Raspberry Pi
      Clicking OK after entering a bad mode string now generates an error, previously the error was only reported if return was pressed
    
    
    Version 0.42. Tagged as 'Display-0_42'
    c6f206fb
  • ROOL's avatar
    Accept dropped EDID or MDF · 07fa1019
    ROOL authored
    Detail:
      Since LoadModeFile will load EDID files too, accept both being dropped on Display Manager.
    Admin:
      Submission for the EDID bounty.
    
    Version 0.43. Tagged as 'Display-0_43'
    07fa1019
  • Robert Sprowson's avatar
    Remove use of RESOURCEEXTRA · 79f9119d
    Robert Sprowson authored
    Requires BuildSys-6_91.
    Not tagged.
    79f9119d
  • Robert Sprowson's avatar
    Internationalise the info box properly · 215d2146
    Robert Sprowson authored
    Get the version field from the messages file, rather than a baked in english string.
    
    Version 0.44. Tagged as 'Display-0_44'
    215d2146
......@@ -25,12 +25,8 @@
COMPONENT = DisplayManager
TARGET = Display
ROM_SOURCE = GetAll.s
#RESOURCEEXTRA = resources_templates
RESOURCEEXTRA = resources_templrate
resources_templrate ::
${CP} LocalRes:TemplRate ${RESFSDIR}.Templates ${CPFLAGS}
INSTRES_FILES = Templates
INSTRES_VERSION = Messages
include StdTools
include AAsmModule
......
No preview for this file type
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.41"
Module_Version SETA 41
Module_MajorVersion SETS "0.44"
Module_Version SETA 44
Module_MinorVersion SETS ""
Module_Date SETS "15 Dec 2013"
Module_ApplicationDate SETS "15-Dec-13"
Module_Date SETS "29 May 2016"
Module_ApplicationDate SETS "29-May-16"
Module_ComponentName SETS "Display"
Module_ComponentPath SETS "castle/RiscOS/Sources/Video/UserI/Display"
Module_FullVersion SETS "0.41"
Module_HelpVersion SETS "0.41 (15 Dec 2013)"
Module_FullVersion SETS "0.44"
Module_HelpVersion SETS "0.44 (29 May 2016)"
END
/* (0.41)
/* (0.44)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.41
#define Module_MajorVersion_CMHG 0.44
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Dec 2013
#define Module_Date_CMHG 29 May 2016
#define Module_MajorVersion "0.41"
#define Module_Version 41
#define Module_MajorVersion "0.44"
#define Module_Version 44
#define Module_MinorVersion ""
#define Module_Date "15 Dec 2013"
#define Module_Date "29 May 2016"
#define Module_ApplicationDate "15-Dec-13"
#define Module_ApplicationDate "29-May-16"
#define Module_ComponentName "Display"
#define Module_ComponentPath "castle/RiscOS/Sources/Video/UserI/Display"
#define Module_FullVersion "0.41"
#define Module_HelpVersion "0.41 (15 Dec 2013)"
#define Module_LibraryVersionInfo "0:41"
#define Module_FullVersion "0.44"
#define Module_HelpVersion "0.44 (29 May 2016)"
#define Module_LibraryVersionInfo "0:44"
......@@ -182,6 +182,8 @@ msg_dataload
LDR lr, [r1, #msDataTransfer_filetype]
LDR r0, =FileType_Text
TEQ r0, lr ; Make sure it's a text file.
LDRNE r0, =FileType_EDID
TEQNE r0, lr ; Or an EDID file.
ADRNE r0, ErrorBlock_Modes_InvalidFile
BLNE MsgTrans_ErrorLookup
EXIT VS
......
......@@ -162,12 +162,16 @@ click_select
BL Mode_WimpCommand ; Change mode.
SavePSR r2 ; Ensure any error is preserved for return
Push "r0", VS
TST r4, #button_right ; If adjust clicked then
LDRNE r1, menu_handle ; show menu again
MOVEQ r1, #0 ; else remove menu and dialogue.
STREQ r1, menu_handle
MOVEQ r1, #-1
SWI XWimp_CreateMenu
RestPSR r2,,f
Pull "r0", VS
EXIT
......
......@@ -130,23 +130,10 @@ patch_info_version
LDR r2, [r1, #w_icons+i_size*ic_info_version+i_data+0]
LDR r3, [r1, #w_icons+i_size*ic_info_version+i_data+8]
ADR r1, Version_tag
[ :DEF: use_messages_version
BL MsgTrans_Lookup
EXIT
Version_tag DCB "Version",0
|
10 LDRB lr, [r1], #1
STRB lr, [r2], #1
TEQ lr, #0
SUBNES r3, r3, #1
BNE %BT10
MOV lr, #0
STRB lr, [r2, #-1]
EXIT
Version_tag DCB "$Module_MajorVersion ($Module_ApplicationDate)", 0
]
Version_tag DCB "_Version",0
ALIGN
......