Commit fe51361d authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

[574] Pop configure plug-in to top rather than running another

Copy the same logic from !Alarm, and check before running !PinSetup that it's
not already running. If it is send a Wimp message to pop to top.
Delete unused 2D templates.
Move command help into CmdHelp and delete (unused) syntax tokens.

Version 1.06. Tagged as 'Pinboard-1_06'
parent 40ab3cef
No preview for this file type
No preview for this file type
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
Module_MajorVersion SETS "1.05" Module_MajorVersion SETS "1.06"
Module_Version SETA 105 Module_Version SETA 106
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "16 Nov 2019" Module_Date SETS "23 Jan 2023"
Module_ApplicationDate SETS "16-Nov-19" Module_ApplicationDate SETS "23-Jan-23"
Module_ComponentName SETS "Pinboard" Module_ComponentName SETS "Pinboard"
Module_FullVersion SETS "1.05" Module_FullVersion SETS "1.06"
Module_HelpVersion SETS "1.05 (16 Nov 2019)" Module_HelpVersion SETS "1.06 (23 Jan 2023)"
END END
/* (1.05) /* (1.06)
* *
* 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 1.05 #define Module_MajorVersion_CMHG 1.06
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Nov 2019 #define Module_Date_CMHG 23 Jan 2023
#define Module_MajorVersion "1.05" #define Module_MajorVersion "1.06"
#define Module_Version 105 #define Module_Version 106
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "16 Nov 2019" #define Module_Date "23 Jan 2023"
#define Module_ApplicationDate "16-Nov-19" #define Module_ApplicationDate "23-Jan-23"
#define Module_ComponentName "Pinboard" #define Module_ComponentName "Pinboard"
#define Module_FullVersion "1.05" #define Module_FullVersion "1.06"
#define Module_HelpVersion "1.05 (16 Nov 2019)" #define Module_HelpVersion "1.06 (23 Jan 2023)"
#define Module_LibraryVersionInfo "1:5" #define Module_LibraryVersionInfo "1:6"
...@@ -271,14 +271,50 @@ selection_menu_selection ...@@ -271,14 +271,50 @@ selection_menu_selection
; The 'Configure...' option was selected. ; The 'Configure...' option was selected.
; Open the configure plugin for the Pinboard, if present. ; Open the configure plugin for the Pinboard, if present.
OpenConfigure OpenConfigure ROUT
MOV r0, #0
10
ADR r1, temp_buffer
ASSERT ?temp_buffer >= 16
MOV r2, #16 ; One task at a time
SWI XTaskManager_EnumerateTasks
MOVVS r0, #-1
MOVS r0, r0
BMI %FT30 ; Enumerated all, no match, just run it
ADR r1, temp_buffer
LDR r2, [r1, #4] ; -> task name
ADR r3, OpenCfgTask
20
LDRB r4, [r2], #1
CMP r4, #' ' ; Switcher string may be control terminated
MOVCC r4, #0
LDRB r5, [r3], #1
TEQ r4, r5
BNE %BT10 ; No match, enumerate next
TEQ r4, #0 ; End of string?
BNE %BT20
MOV r0, #5*4
MOV r3, #0
LDR r4, =&50D83 ; Message_OpenConfigWindow
Push "r0-r4"
LDR r2, [r1, #0] ; -> task handle
MOV r1, sp
MOV r0, #User_Message
SWI XWimp_SendMessage ; Make it pop to the top
ADD sp, sp, #5*4
Pull "PC"
30
ADR R0,OpenCfgCmd ; (FG) -> command to run Pinboard plugin ADR R0,OpenCfgCmd ; (FG) -> command to run Pinboard plugin
SWI XWimp_StartTask ; (FG) start command as a task SWI XWimp_StartTask ; (FG) start command as a task
Pull "PC" ; (FG) say bye bye Pull "PC" ; (FG) say bye bye
OpenCfgPath DCB "BootResources$$Path",0 OpenCfgPath DCB "BootResources$$Path",0
OpenCfgCmd DCB "IfThere BootResources:Configure.!PinSetup Then Filer_Run BootResources:Configure.!PinSetup",0 OpenCfgTask DCB "Pinboard Setup",0
OpenCfgCmd DCB "/BootResources:Configure.!PinSetup",0
ALIGN ALIGN
......
...@@ -396,7 +396,7 @@ Pinboard_Help ...@@ -396,7 +396,7 @@ Pinboard_Help
DCB "*Pinboard clears the pinboard." DCB "*Pinboard clears the pinboard."
DCB 13,10 DCB 13,10
Pinboard_Syntax Pinboard_Syntax
DCB "Syntax: *Pinboard [-Grid]",0 DCB "Syntax: *Pinboard [-Grid] [-IconiseToIconbar]",0
Pin_Help Pin_Help
DCB "*Pin adds a file, application or directory to the desktop pinboard." DCB "*Pin adds a file, application or directory to the desktop pinboard."
......
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