Commit 4eedd6aa authored by Richard Leggett's avatar Richard Leggett
Browse files

When the only window icons are on the iconbar, grey out the 'Select all' menu item.

File 'Status' added giving Pinboard status after RPC2 cancellation.
parent 5a77877f
Pinboard status
Work stopped due to Risc PC 2 cancellation of 17/9/98.
Pinboard development is complete, but minor bug fixes are required.
Three bugs are reported in the enclosed emails below.
The only other known bug is that an adjust click on the OK of the pinboard
save dialogue should keep the save box on screen.
Richard Leggett, 18 Sep 98
---------------------------------------------------------------------------
Date: Tue, 02 Jun 1998 11:25:36 +0100
From: Alan Glover <aglover@acorn.com>
Subject: pinboard bug
To: rleggett@acorn.com
investigate & fix.
Alan
>Date: Tue, 2 Jun 1998 11:21:08 +0100 (BST)
>From: Steve Taylor <staylor@acorn.com>
>Subject: pinboard bug
>To: Alan Glover <aglover@acorn.com>
>X-Organization: Acorn Computers Ltd, Cambridge, United Kingdom
>X-Mailer: ANT RISCOS Marcel [ver 1.41]
>
>--------
>
>Ursula Bug Report 040
>
> Steve Taylor [2 June 98]
> ROM Image (28 May 98)
>
> Context: New Pinboard. Open 4 directory viewers. Iconise them to top
>right, stacked vertically, with iconise button. Then select the lowest 2
>icons
>and Tidy Selection.
>
> Bug: The tidied icons are stacked vertically from uppermost point at top
>right - the stack begins on top of icons alreay present, ie. they are not
>placed at the next available free space.
>
>........
>
>
>--
>Steve Taylor, Support Engineer, Information Appliances Group
>Acorn Computers Ltd Tel: +44 (0) 1223 725 510
>Acorn House, 645 Newmarket Road Fax: +44 (0) 1223 725 610
>Cambridge, CB5 8PB, United Kingdom WWW: http://www.acorn.co.uk/
>
>
--
Alan Glover, Principal Software Engineer
Acorn Computers Limited, 645 Newmarket Road, Cambridge, CB5 8PB, UK
Voice: +44 (0) 1223 725219 (direct) +44 (0) 1223 725000 (main)
Fax: +44 (0) 1223 725319 WWW: http://www.acorn.com/
---------------------------------------------------------------------------
Date: Tue, 28 Jul 1998 15:36:41 +0100
From: Alan Glover <aglover@acorn.com>
Subject: Pinboard bug
To: rleggett@acorn.com
>Date: Tue, 28 Jul 1998 13:50:49 +0100 (BST)
>From: Rob Thornburrow <rthornburrow@acorn.com>
>Subject: Pinboard bug
>To: aglover@acorn.com
>X-Organization: Acorn Computers Ltd, Cambridge, United Kingdom
>X-Mailer: ANT RISCOS Marcel [ver 1.41]
>
>This one was reported to me by Neil:
>
>Drag an icon to the pinboard (ie. textfile) then drag it to an application
>such as Zap to view it. The icon remains selected on the pinboard. In
>RISC OS 3.7 the icon becomes unselected.
>
>--
>Rob Thornburrow, Software Engineer, Information Appliances
>Acorn Computers Ltd Tel: +44 (0) 1223 725292
>Acorn House, 645 Newmarket Road Fax: +44 (0) 1223 725392
>Cambridge, CB5 8PB, United Kingdom WWW: http://www.acorn.com/
>
>
--
Alan Glover, Principal Software Engineer
Acorn Computers Limited, 645 Newmarket Road, Cambridge, CB5 8PB, UK
Voice: +44 (0) 1223 725219 (direct) +44 (0) 1223 725000 (main)
Fax: +44 (0) 1223 725319 WWW: http://www.acorn.com/
---------------------------------------------------------------------------
Date: Thu, 30 Jul 1998 13:31:04 +0100
From: Alan Glover <aglover@acorn.com>
Subject: Re: pinboard redraw bug (fwd)
To: rleggett@acorn.com
>Date: Thu, 30 Jul 1998 10:11:03 +0100 (BST)
>From: Rob Thornburrow <rthornburrow@acorn.com>
>Subject: Re: pinboard redraw bug (fwd)
>To: aglover@acorn.com
>X-Organization: Acorn Computers Ltd, Cambridge, United Kingdom
>X-Mailer: ANT RISCOS Marcel [ver 1.41]
>
>Here's some more info on it. I can't seem to recreate it myself.
>
>--
>Rob Thornburrow, Software Engineer, Information Appliances
>Acorn Computers Ltd Tel: +44 (0) 1223 725292
>Acorn House, 645 Newmarket Road Fax: +44 (0) 1223 725392
>Cambridge, CB5 8PB, United Kingdom WWW: http://www.acorn.com/
>---------- Forwarded message ----------
>Date: Thu, 30 Jul 1998 10:08:18 +0100 (BST)
>From: David Brown <dbrown@acorn.com>
>To: Rob Thornburrow <rthornburrow@acorn.com>
>Subject: Re: pinboard redraw bug
>
>On Thu 30 Jul, Rob Thornburrow wrote:
>> On Thu 30 Jul, David Brown wrote:
>> > Ocasionally you get pinboard icons which when moved/removed leave some
a
>> > small piece of the text on the right hand side behind.
>>
>> On average, how long is the filename?
>>
>Length doesn't seem to have anything to do with it. Try creating a
directory
>called 'GGLib' and place it on the left of the pinboard, force a redraw
then
>move or remove the icon. Part of the 'b' will be left behind. This is
most
>easily seen if you have a black backdrop.
>
>Dave
>
>--
>Dave Brown, Probably something like Software Engineer
>Acorn Computers Ltd Tel: +44 (0) 1223 725570
>Acorn House, 645 Newmarket Road Fax: +44 (0) 1223 72????
>Cambridge, CB5 8PB, United Kingdom WWW: http://www.acorn.com/
>
>
>
--
Alan Glover, Principal Software Engineer
Acorn Computers Limited, 645 Newmarket Road, Cambridge, CB5 8PB, UK
Voice: +44 (0) 1223 725219 (direct) +44 (0) 1223 725000 (main)
Fax: +44 (0) 1223 725319 WWW: http://www.acorn.com/
......@@ -206,4 +206,11 @@ Checked in. Tagged as rleggett_Pinboard-0_75
Wed 22-Jul-98
- Last change introduced minor positioning bug. This now fixed.
\ No newline at end of file
Checked in. Tagged as rleggett_Pinboard-0_75c
Wed 26-Aug-98
- When the only window icons are on the iconbar, grey out the 'Select
all' menu item.
Checked in. Tagged as rleggett_Pinboard-0_75d
\ No newline at end of file
......@@ -8,7 +8,7 @@
Version SETA 074 ; 001
VString SETS "0.74" ; "0.01"
Date SETS "22 Jul 1998" ; "05 Aug 1990"
Date SETS "26 Aug 1998" ; "05 Aug 1990"
;;;;;;; Remember to change the Templates file.
END
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
......
......@@ -311,19 +311,27 @@ iconized_click
LDR r3, [r1, #24] ; Load icon flags into r3
LDR r4, [r1] ; If on icon bar, it can't have been selected
LDR r4, [r1] ; r4 is window handle of icon
; If on iconbar, subtract one from Iconbar_Icons
CMP r4, #-2
LDREQ r4, Iconbar_Icons
SUBEQ r4, r4, #1
STREQ r4, Iconbar_Icons
BEQ %FT03
LDR r4, Windows_Selected ; Number of window icons currently selected
TST r3, #is_selected
SUBNE r4, r4, #1 ; if this icon is selected, subtract one from number
; If not on the iconbar, then check if selected and update Windows_Selected
LDR r4, Windows_Selected
TST r3, #is_selected ; Selected?
SUBNE r4, r4, #1
STR r4, Windows_Selected
03
LDR r4, Window_Icons
SUB r4, r4, #1 ; subtract one from number of window icons on pinboard
; subtract one from number of window icons on pinboard
03 LDR r4, Window_Icons
SUB r4, r4, #1
STR r4, Window_Icons
; Delete the icon
SWIVC XWimp_DeleteIcon
TST r4, #PinboardOption_IconiseToIconBar
LDREQ r0, backdrop_handle
......
......@@ -719,6 +719,7 @@ deb_winsel ENTRY "r0-r5"
SWI OS_ConvertInteger4
SWI OS_Write0
SWI OS_NewLine
STRIM " Window_Icons:"
LDR r0, Window_Icons
MOV r1, sp
......@@ -726,6 +727,7 @@ deb_winsel ENTRY "r0-r5"
SWI OS_ConvertInteger4
SWI OS_Write0
SWI OS_NewLine
STRIM "Pinboard_Selected:"
LDR r0, Pinboard_Selected
MOV r1, sp
......@@ -733,6 +735,7 @@ deb_winsel ENTRY "r0-r5"
SWI OS_ConvertInteger4
SWI OS_Write0
SWI OS_NewLine
STRIM " Window_Selected:"
LDR r0, Windows_Selected
MOV r1, sp
......@@ -741,6 +744,14 @@ deb_winsel ENTRY "r0-r5"
SWI OS_Write0
SWI OS_NewLine
STRIM " Iconbar_Icons:"
LDR r0, Iconbar_Icons
MOV r1, sp
MOV r2, #4
SWI OS_ConvertInteger4
SWI OS_Write0
SWI OS_NewLine
ADD sp, sp, #4
EXIT
]
......
......@@ -398,8 +398,10 @@ recreate_pinboard_menu
LDR r14,saveas_handle ; Point save entry at save box.
STR r14,menu_store+28+pm_save*24+4
LDR r14,Pinboard_Icons
LDR r0, Window_Icons
LDR r14, Iconbar_Icons
SUB r0, r0, r14
LDR r14,Pinboard_Icons
ADD r14, r14, r0
TEQ r14,#0 ; Are there any icons on the pinboard ?
......@@ -530,6 +532,8 @@ recreate_pinboard_menu
; Shade 'Select all->Windows' if no windows on backdrop
LDR r0, Window_Icons
LDR r14, Iconbar_Icons
SUB r0, r0, r14
LDR r14, menu_store + selectall_menu_offset + 28 + sa_windows*24+8
CMP r0, #0
ORREQ r14, r14, #is_shaded
......
......@@ -876,15 +876,24 @@ got_task_name
ADR r1,dataarea ; create iconbar entry
[ iconise_to_iconbar
; Deal with Iconise to Iconbar
; Ignore if Shift + Close clicked
LDR lr, IconizeAtFlags
TST lr, #IconizeAtFlag_ShiftCloseIcon
BNE %FT01
; Ignore if not Iconise to Iconbar
LDR lr, Pinboard_options
TST lr, #PinboardOption_IconiseToIconBar
MOVNE r0, #-2
STRNE r0, [r1]
BNE %FT10
BEQ %FT01
; Okay, it's Iconise to Iconbar
LDR r0, Iconbar_Icons
ADD r0, r0, #1
STR r0, Iconbar_Icons
MOV r0, #-2
STR r0, [r1]
B %FT10
01
]
......
......@@ -237,6 +237,7 @@ IconizeAtX # 4 ; X co-ordinate sent by message
IconizeAtY # 4 ; Y co-ordinate sent by message IconizeAt
IconizeAtFlags # 4 ; flags word sent by message IconizeAt
Pinboard_Icons # 4 ; Number of icons on pinboard
Iconbar_Icons # 4 ; Number of iconised window icons on the icon bar
Window_Icons # 4 ; Number of window icons on pinboard
All_PB_Icons # 4 ; total no. of icons
TinyDirs_Icons # 4 ; Number of icons on icon bar.
......
......@@ -137,7 +137,8 @@ Start
STR r0,TinyDirs_Icons
STR r0,Pinboard_Selected
STR r0,TinyDirs_Selected
STR r0, Windows_Selected
STR r0,Windows_Selected
STR r0,Iconbar_Icons
STR r0,soft_selection_window
SUB r0,r0,#1
......
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