--- oup/rewrite/Tools/Extractor.dfm	2007/01/18 17:15:59	93
+++ oup/current/Tools/Extractor.dfm	2009/05/06 13:47:23	321
@@ -1,219 +1,204 @@
 inherited Form_Extractor: TForm_Extractor
-  Caption = 'Extractor'
-  ClientHeight = 491
-  ExplicitHeight = 518
+  Caption = 'Form_Extractor'
+  OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13
-  inherited Splitter1: TSplitter
-    Left = 483
-    Height = 491
-    Align = alRight
-    Visible = False
-    ExplicitLeft = 172
-    ExplicitTop = -8
-    ExplicitHeight = 423
-  end
-  inherited panel_files: TPanel
-    Width = 333
-    Height = 491
-    ExplicitWidth = 333
-    ExplicitHeight = 491
-    inherited filelist: TListBox
-      Width = 333
-      Height = 338
-      ExplicitWidth = 333
-      ExplicitHeight = 338
-    end
-    inherited panel_extension: TPanel
-      Width = 333
-      ExplicitWidth = 333
-      inherited Bevel1: TBevel
-        Width = 327
-        ExplicitWidth = 327
-      end
-      inherited combo_extension: TComboBox
-        Width = 325
-        ExplicitWidth = 325
-      end
-      inherited check_zerobyte: TCheckBox
-        Visible = False
-      end
-      inherited edit_filtername: TEdit
-        Width = 325
-        ExplicitWidth = 325
-      end
-      inherited combo_connection: TComboBox
-        Width = 263
-        ExplicitWidth = 263
-      end
+  inherited panel_basecontent: TPanel
+    inherited splitter_content: TSplitter
+      Left = 300
+      ExplicitLeft = 300
     end
-  end
-  inherited content: TPanel
-    Left = 333
-    Width = 150
-    Height = 491
-    ExplicitLeft = 333
-    ExplicitWidth = 150
-    ExplicitHeight = 491
-    object group_extract: TGroupBox
-      AlignWithMargins = True
-      Left = 6
-      Top = 3
-      Width = 138
-      Height = 374
-      Margins.Left = 6
-      Margins.Right = 6
-      Align = alClient
-      Caption = '2. Select extract-method'
-      TabOrder = 0
-      DesignSize = (
-        138
-        374)
-      object label_export_sel: TLabel
-        Left = 7
-        Top = 18
-        Width = 62
-        Height = 20
-        AutoSize = False
-        Caption = 'Export ...'
-      end
-      object label_path: TLabel
-        Left = 7
-        Top = 136
-        Width = 30
-        Height = 18
-        AutoSize = False
-        Caption = 'Path:'
-      end
-      object check_dat: TCheckBox
-        Left = 7
-        Top = 75
-        Width = 121
-        Height = 18
-        Anchors = [akLeft, akTop, akRight]
-        Caption = 'Export .dat-entries'
-        Checked = True
-        State = cbChecked
-        TabOrder = 0
-      end
-      object check_raw: TCheckBox
-        Left = 7
-        Top = 94
-        Width = 121
-        Height = 18
-        Anchors = [akLeft, akTop, akRight]
-        Caption = 'Export .raw-entries'
-        TabOrder = 1
-      end
-      object check_convert: TCheckBox
-        Left = 7
-        Top = 112
-        Width = 121
-        Height = 18
-        Anchors = [akLeft, akTop, akRight]
-        Caption = 'Convert files'
-        TabOrder = 2
-      end
-      object radio_selected: TRadioButton
-        Left = 7
-        Top = 36
-        Width = 113
-        Height = 17
-        Caption = 'selected files'
-        Checked = True
-        TabOrder = 3
-        TabStop = True
-      end
-      object radio_all: TRadioButton
-        Left = 7
-        Top = 52
-        Width = 113
-        Height = 17
-        Caption = 'all files in list'
-        TabOrder = 4
-      end
-      object edit_path: TEdit
-        Left = 36
-        Top = 133
-        Width = 28
-        Height = 21
-        Anchors = [akLeft, akTop, akRight]
-        ReadOnly = True
-        TabOrder = 5
-        Text = 'C:\'
-        OnClick = btn_pathClick
-      end
-      object btn_path: TButton
-        Left = 70
-        Top = 133
-        Width = 62
-        Height = 21
-        Anchors = [akTop, akRight]
-        Caption = 'Select...'
-        TabOrder = 6
-        OnClick = btn_pathClick
-      end
-      object btn_export: TButton
-        Left = 7
-        Top = 180
-        Width = 75
-        Height = 25
-        Caption = 'Export!'
-        TabOrder = 7
-        OnClick = btn_exportClick
+    inherited panel_files: TPanel
+      Width = 300
+      ExplicitWidth = 300
+      inherited FilePages: TPageControl
+        Width = 298
+        inherited tab_files: TTabSheet
+          ExplicitWidth = 290
+          inherited panel_extension: TPanel
+            Width = 290
+            ExplicitWidth = 290
+            inherited combo_extension: TComboBox
+              Width = 286
+              ExplicitWidth = 286
+            end
+            inherited edit_filtername: TEdit
+              Width = 286
+              ExplicitWidth = 286
+            end
+          end
+          inherited filelist: TListBox
+            Width = 290
+            ExplicitWidth = 290
+          end
+        end
       end
     end
-    object group_progress: TGroupBox
-      AlignWithMargins = True
-      Left = 6
-      Top = 381
-      Width = 138
-      Height = 104
-      Margins.Left = 6
-      Margins.Top = 1
-      Margins.Right = 6
-      Margins.Bottom = 6
-      Align = alBottom
-      Caption = 'Progress ...'
-      TabOrder = 1
-      Visible = False
-      DesignSize = (
-        138
-        104)
-      object lbl_progress: TLabel
-        Left = 8
-        Top = 40
-        Width = 265
-        Height = 17
-        AutoSize = False
-        Caption = 'Files done: 0/0'
-      end
-      object lbl_estimated: TLabel
-        Left = 8
-        Top = 56
-        Width = 265
-        Height = 17
-        AutoSize = False
-        Caption = 'Estimated finishing time: 00:00:00'
-      end
-      object progress: TProgressBar
-        Left = 8
-        Top = 16
-        Width = 122
-        Height = 17
-        Anchors = [akLeft, akTop, akRight]
-        Smooth = True
+    inherited panel_content: TPanel
+      Left = 308
+      Width = 290
+      ExplicitLeft = 308
+      ExplicitWidth = 290
+      object group_extract: TGroupBox
+        AlignWithMargins = True
+        Left = 6
+        Top = 3
+        Width = 278
+        Height = 415
+        Margins.Left = 6
+        Margins.Right = 6
+        Align = alClient
+        Caption = '2. Select extract-method'
         TabOrder = 0
-      end
-      object btn_abort: TButton
-        Left = 8
-        Top = 72
-        Width = 97
-        Height = 23
-        Caption = 'Abort'
-        Enabled = False
+        DesignSize = (
+          278
+          415)
+        object label_export_sel: TLabel
+          Left = 7
+          Top = 18
+          Width = 62
+          Height = 20
+          AutoSize = False
+          Caption = 'Export ...'
+        end
+        object label_path: TLabel
+          Left = 7
+          Top = 136
+          Width = 30
+          Height = 18
+          AutoSize = False
+          Caption = 'Path:'
+        end
+        object check_dat: TCheckBox
+          Left = 7
+          Top = 75
+          Width = 121
+          Height = 18
+          Caption = 'Export .dat-entries'
+          Checked = True
+          State = cbChecked
+          TabOrder = 0
+        end
+        object check_raw: TCheckBox
+          Left = 7
+          Top = 94
+          Width = 121
+          Height = 18
+          Caption = 'Export .raw-entries'
+          TabOrder = 1
+        end
+        object check_convert: TCheckBox
+          Left = 7
+          Top = 112
+          Width = 121
+          Height = 18
+          Caption = 'Convert files'
+          TabOrder = 2
+        end
+        object radio_selected: TRadioButton
+          Left = 7
+          Top = 36
+          Width = 113
+          Height = 17
+          Caption = 'selected files'
+          Checked = True
+          TabOrder = 3
+          TabStop = True
+        end
+        object radio_all: TRadioButton
+          Left = 7
+          Top = 52
+          Width = 113
+          Height = 17
+          Caption = 'all files in list'
+          TabOrder = 4
+        end
+        object edit_path: TEdit
+          Left = 36
+          Top = 133
+          Width = 168
+          Height = 21
+          Anchors = [akLeft, akTop, akRight]
+          ReadOnly = True
+          TabOrder = 5
+          Text = 'C:\'
+        end
+        object btn_path: TButton
+          Left = 210
+          Top = 133
+          Width = 62
+          Height = 21
+          Anchors = [akTop, akRight]
+          Caption = 'Select...'
+          TabOrder = 6
+          OnClick = btn_pathClick
+        end
+        object btn_export: TButton
+          Left = 7
+          Top = 180
+          Width = 75
+          Height = 25
+          Caption = 'Export!'
+          TabOrder = 7
+          OnClick = btn_exportClick
+        end
+      end
+      object group_progress: TGroupBox
+        AlignWithMargins = True
+        Left = 6
+        Top = 422
+        Width = 278
+        Height = 104
+        Margins.Left = 6
+        Margins.Top = 1
+        Margins.Right = 6
+        Margins.Bottom = 6
+        Align = alBottom
+        Caption = 'Progress ...'
         TabOrder = 1
-        OnClick = btn_abortClick
+        Visible = False
+        DesignSize = (
+          278
+          104)
+        object lbl_progress: TLabel
+          Left = 8
+          Top = 40
+          Width = 257
+          Height = 17
+          Anchors = [akLeft, akTop, akRight]
+          AutoSize = False
+          Caption = 'Files done: 0/0'
+          ExplicitWidth = 265
+        end
+        object lbl_estimated: TLabel
+          Left = 8
+          Top = 56
+          Width = 257
+          Height = 17
+          Anchors = [akLeft, akTop, akRight]
+          AutoSize = False
+          Caption = 'Estimated finishing time: 00:00:00'
+          ExplicitWidth = 265
+        end
+        object progress: TProgressBar
+          Left = 8
+          Top = 17
+          Width = 261
+          Height = 17
+          Anchors = [akLeft, akTop, akRight]
+          Smooth = True
+          TabOrder = 0
+        end
+        object btn_abort: TButton
+          Left = 8
+          Top = 72
+          Width = 97
+          Height = 23
+          Caption = 'Abort'
+          Enabled = False
+          TabOrder = 1
+          OnClick = btn_abortClick
+        end
       end
     end
   end