--- oup/current/Tools/Extractor.pas	2007/02/21 03:12:33	109
+++ oup/current/Tools/Extractor.pas	2007/06/18 13:41:12	220
@@ -1,19 +1,21 @@
 unit Extractor;
+
 interface
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, Template, StdCtrls, ExtCtrls, ComCtrls, Menus, Buttons, StrUtils;
+  Dialogs, _TemplateFileList, Menus, StdCtrls, ExtCtrls, Buttons, ComCtrls;
 
 type
-  TForm_Extractor = class(TForm_ToolTemplate)
+  TForm_Extractor = class(TForm_TemplateFileList)
     group_extract: TGroupBox;
+    label_export_sel: TLabel;
+    label_path: TLabel;
     check_dat: TCheckBox;
     check_raw: TCheckBox;
     check_convert: TCheckBox;
     radio_selected: TRadioButton;
-    label_export_sel: TLabel;
     radio_all: TRadioButton;
-    label_path: TLabel;
     edit_path: TEdit;
     btn_path: TButton;
     btn_export: TButton;
@@ -22,57 +24,35 @@ type
     lbl_estimated: TLabel;
     progress: TProgressBar;
     btn_abort: TButton;
-    procedure FormCreate(Sender: TObject);
     procedure btn_abortClick(Sender: TObject);
-    procedure btn_pathClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure btn_exportClick(Sender: TObject);
+    procedure btn_pathClick(Sender: TObject);
   private
   public
   end;
 
-var
-  Form_Extractor: TForm_Extractor;
 
 implementation
 {$R *.dfm}
-uses Main, Functions, Data, ConnectionManager, FolderBrowser, Exporters;
+uses
+  Data, FolderBrowser, Exporters, _TemplateFile, ConnectionManager, Functions,
+  StrUtils;
 
 
-procedure TForm_Extractor.FormCreate(Sender: TObject);
-begin
-  inherited;
-  Self.AllowMultiSelect := True;
-  edit_path.Text := AppSettings.ExtractPath;
-end;
 
 procedure TForm_Extractor.btn_abortClick(Sender: TObject);
 begin
   ShowMessage('X');
 end;
 
-procedure TForm_Extractor.btn_pathClick(Sender: TObject);
-var
-  fb: TFolderBrowser;
-begin
-  inherited;
-
-  fb := TFolderBrowser.Create(Handle, 'Please select a folder where you want ' +
-        'the files to be stored...', edit_path.Text, False, True);
-  if fb.Execute then
-  begin
-    edit_path.Text := fb.SelectedItem;
-    AppSettings.ExtractPath := edit_path.Text;
-  end;
-  fb.Free;
-end;
-
 procedure TForm_Extractor.btn_exportClick(Sender: TObject);
 var
   begintime: Double;
-  files:     LongWord;
-  i, done:   LongWord;
+  files:     Integer;
+  i, done:   Integer;
   selonly:   Boolean;
-  fileid:    LongWord;
+  fileid:    Integer;
   filename:  String;
   path:      String;
 begin
@@ -128,7 +108,30 @@ begin
   group_progress.Visible := False;
 end;
 
+procedure TForm_Extractor.btn_pathClick(Sender: TObject);
+var
+  fb: TFolderBrowser;
+begin
+  inherited;
+
+  fb := TFolderBrowser.Create(Handle, 'Please select a folder where you want ' +
+        'the files to be stored...', edit_path.Text, False, True);
+  if fb.Execute then
+  begin
+    edit_path.Text := fb.SelectedItem;
+    AppSettings.ExtractPath := edit_path.Text;
+  end;
+  fb.Free;
+end;
+
+procedure TForm_Extractor.FormCreate(Sender: TObject);
+begin
+  inherited;
+  Self.AllowMultiSelect := True;
+  edit_path.Text := AppSettings.ExtractPath;
+end;
 
 begin
   AddToolListEntry('extractor', 'Extractor', '');
-end.
\ No newline at end of file
+end.
+