Skip to content

Commit

Permalink
Updated to 1.35
Browse files Browse the repository at this point in the history
  • Loading branch information
geraldholdsworth committed Aug 2, 2021
1 parent f06a49f commit 1e0d4cb
Show file tree
Hide file tree
Showing 46 changed files with 6,760 additions and 4,456 deletions.
26 changes: 26 additions & 0 deletions Documentation/Changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,32 @@ Bug fixes
* If a file, on a Commodore image, had a dot '.' as part of the name then this would fail to be found. This means that operations such as downloading would not work.
* An AFS Level 2 image, where the headers do not match, were getting IDed as a DFS image.

1.35 - 1st August 2021
----------------------
New or improved features
* Added a window for editing the Acorn FS 'Passwords' file, and enabled the button.
* Password files for Acorn FS images can now be edited.
* Enabled the button to create a new password file.
* Split the toolbar into 4 toolbars, and re-arranged the buttons (moved 'Fix ADFS Directories' to Tools).
* New menu - 'View', with three items to enable the viewing, or hiding, of the File Details pane, Image Details status bar or the Toolbars.
* Changed the main menu to reflect the new grouping in the toolbars.
* Delete Partition now works for DS DFS images (producing SS DFS images) and ADFS Hybrid (producing either ADFS or Acorn FS images).
* Save Partition now works for DS DFS images (producing SS DFS images) and ADFS Hybrid (producing either ADFS or Acorn FS images).
* Slight change to the format strings for Acorn ADFS Hybrid images.
* Two single sided DFS images can now be combined to form a double sided image, away from the Split/Combine DFS utility.
* Split/Combine DFS button, and menu item, removed from the toolbar and main menu, along with the Utilities menu.
* Functions to do with Partitions and AFS Password files removed from the File context menu.
* Added the function to Add Partition to ADFS 8 bit images, along with the corresponding menu item and tool bar button.
* Improved the free space calculation with Acorn FS partitions.

Bug fixes
* Deleting a file in Acorn FS Level 3 did not release the object header sector.
* Reading the second side of a double sided DFS image would read the filenames from the first side.
* A DFS directory identifier as '&' would result in an underlined '.' in the file details display.
* Failed to import any files to the Acorn FS partition of an ADFS/AFS Hybrid.
* The attribute panel would be shown when a root directory is selected.
* The Free Space Map for ADFS/AFS hybrids was not getting read correctly.


Platform History
----------------
Expand Down
Binary file modified Documentation/Disc Image Manager User Guide.pdf
Binary file not shown.
18 changes: 3 additions & 15 deletions Documentation/ToDo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,14 @@ General
* For RISC OS applications, look inside for a sprite file to display instead of the standard RISC OS Application icon.
* Ask to force overwrite if many files are getting written.
* Export the contents of an open image to another image, or set of images if the selected format is too small or are more directory entries than the format allows.
* Duplicate the facility to prevent infinite loops when reading images from Acorn FS to ADFS, Amiga and Spark.
* Cancel button for progress display?
* Tool to change the interleave of an image (ADFS L and AFS).
* Click on root to enable saving of just that partition/drive (splitting of a DS DFS) (REF:1).
* Click on root to enable deleting of partition (and splitting of a DS DFS) (REF:1).
* Import AFS into ADFS to create new partition (REF:1).
* Import SD DFS into SD DFS to create combined DS DFS (REF:1).
* Side pane (left hand side) to allow separate images to be opened (REF:3).
* Use side pane for opening MMFS images and remove the code from TDiscImage (REF:3).
* Put settings form into tabs, or similar, to separate the various options.
* Add in 'View' options to show or hide: File Details pane; Toolbar; Status Bar.

ADFS
* Change the size of the ADFS partition or image.
* Compact the free space map.
* Add option to create an AFS partition (REF:1).
* Change the size of the ADFS partition or image (ideally, this can be done using a similar method to below - create a new image and import the contents into it).
* Compact the free space map (this can be done from the GUI - use method to create a new image, same size and format as current, then import the contents of the current image across).

Amiga
* Write/Delete/Rename files/directories to Amiga images.
Expand All @@ -51,8 +43,4 @@ Spark
* Write file.
* Rename file/directory.
* Delete file/directory.
* Move file.

Acorn File Store (AFS)
* Add a dialogue box to allow the entering of user accounts for the password file.
* Create blank ADFS/AFS L3 hybrid images (REF:1).
* Move file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Buttons/Add Partition/Add Partition.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Buttons/Add Partition/Add Partition.psd
Binary file not shown.
Binary file added Graphics/Buttons/Add Partition/discs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Buttons/Add Partition/harddisc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions LazarusSource/AFSPartitionUnit.lfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
object AFSPartitionForm: TAFSPartitionForm
Left = 436
Height = 85
Top = 224
Width = 320
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'Acorn FS Partition Size'
ClientHeight = 85
ClientWidth = 320
Color = 15527148
OnResize = FormResize
Position = poMainFormCenter
LCLVersion = '2.0.12.0'
object PartitionSize: TTrackBar
Left = 0
Height = 24
Top = 0
Width = 320
OnChange = PartitionSizeChange
Position = 0
TickMarks = tmBoth
TickStyle = tsNone
Align = alTop
TabOrder = 0
end
object PartitionSizeLabel: TLabel
Left = 0
Height = 16
Top = 24
Width = 320
Align = alTop
Alignment = taCenter
Caption = 'PartitionSizeLabel'
ParentColor = False
end
object CancelButton: TBitBtn
Left = 8
Height = 30
Top = 48
Width = 100
Cancel = True
Caption = 'Cancel'
Color = 15527148
ModalResult = 2
TabOrder = 1
end
object OKBtnBack: TPanel
Left = 124
Height = 30
Top = 48
Width = 100
BevelColor = clYellow
BevelInner = bvLowered
BevelOuter = bvLowered
BevelWidth = 4
ClientHeight = 30
ClientWidth = 100
Color = clYellow
ParentColor = False
TabOrder = 2
object OKButton: TBitBtn
Left = 0
Height = 30
Top = 0
Width = 100
Caption = '&OK'
Color = 15527148
ModalResult = 1
TabOrder = 0
end
end
end
51 changes: 51 additions & 0 deletions LazarusSource/AFSPartitionUnit.pas
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
unit AFSPartitionUnit;

{$mode objfpc}{$H+}

interface

uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls,
Buttons, ExtCtrls;

type

{ TAFSPartitionForm }

TAFSPartitionForm = class(TForm)
CancelButton: TBitBtn;
OKBtnBack: TPanel;
OKButton: TBitBtn;
PartitionSizeLabel: TLabel;
PartitionSize: TTrackBar;
procedure FormResize(Sender: TObject);
procedure PartitionSizeChange(Sender: TObject);
private

public

end;

var
AFSPartitionForm: TAFSPartitionForm;

implementation

uses MainUnit;

{$R *.lfm}

{ TAFSPartitionForm }

procedure TAFSPartitionForm.PartitionSizeChange(Sender: TObject);
begin
PartitionSizeLabel.Caption:=FloatToStr((PartitionSize.Position*$100)/1024)+'KB';
end;

procedure TAFSPartitionForm.FormResize(Sender: TObject);
begin
MainForm.FileInfoPanelPaint(Sender);
end;

end.

Loading

0 comments on commit 1e0d4cb

Please sign in to comment.