Changeset 12 for trunk/Form/UFormMain.pas

Timestamp:

Apr 2, 2016, 11:08:30 AM (8 years ago)

Author:

chronos

Message:

• Added: Available block drives detection under Linux.

File:

• trunk/Form/UFormMain.pas (modified) (18 diffs)

trunk/Form/UFormMain.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   Menus, ComCtrls, ExtCtrls, ActnList, dateutils, syncobjs, UProject,
-  UDriveScan, UPrefixMultiplier, XMLConf;
+  UDriveScan, UPrefixMultiplier, XMLConf, UPhysDrive;
 
 type
@@ -27 +27 @@
     AScanStop: TAction;
     ActionList1: TActionList;
-    Button1: TButton;
     Button2: TButton;
     Button3: TButton;
@@ -33 +32 @@
     ButtonScan1: TButton;
     ButtonScan2: TButton;
-    EditDrive: TEdit;
+    ComboBoxDrive: TComboBox;
     Image1: TImage;
     Label1: TLabel;
@@ -75 +74 @@
     Timer1: TTimer;
     XMLConfig1: TXMLConfig;
-    procedure ABrowseDiskExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AFileCloseExecute(Sender: TObject);
@@ -87 +85 @@
     procedure AScanStartExecute(Sender: TObject);
     procedure AScanStopExecute(Sender: TObject);
+    procedure ComboBoxDriveChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -100 +99 @@
     LastProjectFileName: string;
     procedure ReloadOperationList;
-    procedure CheckDrive;
     procedure ProjectOpen(FileName: string);
     procedure DriveScanChange(Sender: TObject);
@@ -108 +106 @@
     procedure UpdateInterface;
   public
+    DriveList: TDriveList;
     DriveScan: TDriveScan;
     Project: TProject;
@@ -134 +133 @@
   SBytes = 'bytes';
 
-const
-  DefaultDriveName = '/dev/sda';
-
 { TFormMain }
 
 procedure TFormMain.FormShow(Sender: TObject);
 begin
+  Detect;
   LoadConfig;
   if FileExists(LastProjectFileName) then
@@ -171 +168 @@
 begin
   PrefixMultiplier := TPrefixMultiplier.Create;
-  EditDrive.Text := DefaultDriveName;
   XMLConfig1.Filename := 'config.xml';
   Project := nil;
+  DriveList := TDriveList.Create;
 end;
 
@@ -182 +179 @@
 end;
 
+procedure TFormMain.ComboBoxDriveChange(Sender: TObject);
+begin
+  DriveScan.SectorCount := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).SectorCount;
+  DriveScan.DriveName := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Path;
+  DriveScan.SectorStart := 0;
+  DriveScan.SectorEnd := DriveScan.SectorCount - 1;
+end;
+
 procedure TFormMain.AScanStartExecute(Sender: TObject);
 begin
   LastBlockPos := 0;
-  DriveScan.DriveName := EditDrive.Text;
+  DriveScan.DriveName := TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Path;
   DriveScan.Reset;
   DriveScan.SectorSize := Project.SectorSize;
@@ -197 +202 @@
 procedure TFormMain.AProjectOptionsExecute(Sender: TObject);
 begin
-  CheckDrive;
   FormProject.Load(Project);
   if FormProject.ShowModal = mrOk then begin
@@ -211 +215 @@
   Project.Modified := True;
   UpdateInterface;
-end;
-
-procedure TFormMain.ABrowseDiskExecute(Sender: TObject);
-begin
-  OpenDialog1.Title := SSelectDriveForScan;
-  OpenDialog1.DefaultExt := '';
-  OpenDialog1.FileName := EditDrive.Text;
-  if OpenDialog1.Execute then
-    EditDrive.Text := OpenDialog1.FileName;
 end;
 
@@ -243 +238 @@
   DriveScan := TDriveScan(Project.Scans[0]);
 
-  CheckDrive;
   DriveScan.SectorStart := 0;
   DriveScan.SectorEnd := DriveScan.SectorCount - 1;
@@ -304 +298 @@
   if Assigned(Project) then FreeAndNil(Project);
   FreeAndNil(PrefixMultiplier);
+  FreeAndNil(DriveList);
 end;
 
@@ -394 +389 @@
 procedure TFormMain.SaveConfig;
 begin
-  XMLConfig1.SetValue('DriveName', EditDrive.Text);
+  XMLConfig1.SetValue('DriveName', TDriveInfo(DriveList[ComboBoxDrive.ItemIndex]).Model);
   XMLConfig1.SetValue('LastProjectFileName', LastProjectFileName);
 end;
@@ -400 +395 @@
 procedure TFormMain.LoadConfig;
 begin
-  EditDrive.Text := XMLConfig1.GetValue('DriveName', DefaultDriveName);
+  ComboBoxDrive.ItemIndex := DriveList.IndexOf(DriveList.FindByModel(XMLConfig1.GetValue('DriveName', '')));
   LastProjectFileName := XMLConfig1.GetValue('LastProjectFileName', '');
 end;
@@ -419 +414 @@
 end;
 
-procedure TFormMain.CheckDrive;
-begin
-  DriveScan.CheckDrive;
-  Project.SectorCount := DriveScan.SectorCount;
-end;
-
 procedure TFormMain.ProjectOpen(FileName: string);
 begin
@@ -445 +434 @@
 
 procedure TFormMain.Detect;
-begin
-
+var
+  I: Integer;
+begin
+  DriveList.Detect;
+  while ComboBoxDrive.Items.Count > DriveList.Count do
+    ComboBoxDrive.Items.Delete(ComboBoxDrive.Items.Count - 1);
+  while ComboBoxDrive.Items.Count < DriveList.Count do
+    ComboBoxDrive.Items.Add('');
+  for I := 0 to DriveList.Count - 1 do
+    ComboBoxDrive.Items[I] := TDriveInfo(DriveList[I]).Model + ' (' +
+      PrefixMultiplier.Add(TDriveInfo(DriveList[I]).Size, BasePrefixMultipliers, 'B') + ')';
 end;