Convert forms resources from Delphi to Lazarus format

diff --git a/src/editor/Editor.lpi b/src/editor/Editor.lpi
index cf2c1e329cdab5e955dda0867aa715415e1d0012..f99f0c8bc9cc3bbad5a4d6cbdd85b51f323c3a56 100644 (file)
--- a/src/editor/Editor.lpi
+++ b/src/editor/Editor.lpi
@@ -145,12 +145,16 @@
       <Unit12>
         <Filename Value="f_about.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="AboutForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit12>
       <Unit13>
         <Filename Value="f_options.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="OptionsForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit13>
       <Unit14>
         <Filename Value="f_main.pas"/>
@@ -166,32 +170,44 @@
       <Unit16>
         <Filename Value="f_mapoptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MapOptionsForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit16>
       <Unit17>
         <Filename Value="f_activationtype.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="ActivationTypeForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit17>
       <Unit18>
         <Filename Value="f_addresource.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="AddResourceForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit18>
       <Unit19>
         <Filename Value="f_keys.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="KeysForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit19>
       <Unit20>
         <Filename Value="f_mapcheck.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MapCheckForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit20>
       <Unit21>
         <Filename Value="f_mapoptimization.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MapOptimizationForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit21>
       <Unit22>
         <Filename Value="g_basic.pas"/>
@@ -204,27 +220,37 @@
       <Unit24>
         <Filename Value="f_addresource_texture.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="AddTextureForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit24>
       <Unit25>
         <Filename Value="f_savemap.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="SaveMapForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit25>
       <Unit26>
         <Filename Value="f_selectmap.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="SelectMapForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit26>
       <Unit27>
         <Filename Value="f_addresource_sky.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="AddSkyForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit27>
       <Unit28>
         <Filename Value="f_addresource_sound.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="AddSoundForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit28>
       <Unit29>
         <Filename Value="spectrum.pas"/>
@@ -233,22 +259,30 @@
       <Unit30>
         <Filename Value="f_saveminimap.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="SaveMiniMapForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit30>
       <Unit31>
         <Filename Value="f_packmap.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="PackMapForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit31>
       <Unit32>
         <Filename Value="f_maptest.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="MapTestForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit32>
       <Unit33>
         <Filename Value="f_choosetype.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="ChooseTypeForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit33>
       <Unit34>
         <Filename Value="../lib/fmod/fmod.pas"/>
@@ -273,7 +307,9 @@
       <Unit39>
         <Filename Value="f_selectlang.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="SelectLanguageForm"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit39>
     </Units>
   </ProjectOptions>

diff --git a/src/editor/f_about.lfm b/src/editor/f_about.lfm
index 2f3e0aa6fa4c749d05ebf4c6014806f961b7c9c6..f1cafd5b1780442e92afa156dcab1e8d342e5ccd 100644 (file)
--- a/src/editor/f_about.lfm
+++ b/src/editor/f_about.lfm
@@ -1,117 +1,127 @@
 object AboutForm: TAboutForm
   Left = 414
+  Height = 196
   Top = 220
+  Width = 294
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'О программе'
   ClientHeight = 196
   ClientWidth = 294
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object ButtonOK: TButton
     Left = 8
+    Height = 25
     Top = 168
     Width = 281
-    Height = 25
     Cancel = True
     Caption = 'ОК'
-    TabOrder = 0
     OnClick = ButtonOKClick
+    TabOrder = 0
   end
   object PanelAbout: TPanel
     Left = 8
+    Height = 153
     Top = 8
     Width = 281
-    Height = 153
+    ClientHeight = 153
+    ClientWidth = 281
     TabOrder = 1
     object Bevel1: TBevel
       Left = 6
+      Height = 41
       Top = 6
       Width = 265
-      Height = 41
       Shape = bsFrame
     end
     object Bevel2: TBevel
       Left = 6
+      Height = 89
       Top = 54
       Width = 265
-      Height = 89
       Shape = bsFrame
     end
     object LabelTitle: TLabel
       Left = 10
+      Height = 13
       Top = 10
-      Width = 87
-      Height = 26
+      Width = 164
       Caption = 'Редактор карт Doom 2D: Forever'
+      ParentColor = False
       WordWrap = True
     end
     object LabelVer: TLabel
       Left = 200
+      Height = 13
       Top = 22
       Width = 64
-      Height = 13
       Caption = 'Версия 2.0.3'
+      ParentColor = False
     end
     object LabelAuthor: TLabel
       Left = 10
+      Height = 13
       Top = 62
       Width = 76
-      Height = 13
       Caption = 'Автор: rs.falcon'
+      ParentColor = False
     end
     object LabelMail: TLabel
+      Cursor = crHandPoint
       Left = 172
+      Height = 13
       Top = 62
       Width = 92
-      Height = 13
-      Cursor = crHandPoint
       Caption = 'rmw.falcon@mail.ru'
+      ParentColor = False
       OnClick = LabelMailClick
-      OnMouseMove = LabelMailMouseMove
       OnMouseLeave = LabelMailMouseLeave
+      OnMouseMove = LabelMailMouseMove
     end
     object LabelSite: TLabel
       Left = 10
+      Height = 13
       Top = 118
       Width = 114
-      Height = 13
       Caption = 'Сайт Doom 2D: Forever'
+      ParentColor = False
     end
     object LabelHttp: TLabel
+      Cursor = crHandPoint
       Left = 180
+      Height = 13
       Top = 118
       Width = 83
-      Height = 13
-      Cursor = crHandPoint
       Caption = 'www.doom2d.org'
+      ParentColor = False
       OnClick = LabelHttpClick
-      OnMouseMove = LabelMailMouseMove
       OnMouseLeave = LabelMailMouseLeave
+      OnMouseMove = LabelMailMouseMove
     end
     object LabelAuthor2: TLabel
       Left = 10
+      Height = 13
       Top = 90
       Width = 93
-      Height = 13
       Caption = 'Дорабатывал: Pss'
+      ParentColor = False
     end
     object LabelMail2: TLabel
+      Cursor = crHandPoint
       Left = 197
+      Height = 13
       Top = 90
       Width = 67
-      Height = 13
-      Cursor = crHandPoint
       Caption = 'pssxx@mail.ru'
+      ParentColor = False
       OnClick = LabelMail2Click
-      OnMouseMove = LabelMailMouseMove
       OnMouseLeave = LabelMailMouseLeave
+      OnMouseMove = LabelMailMouseMove
     end
   end
 end

diff --git a/src/editor/f_activationtype.lfm b/src/editor/f_activationtype.lfm
index 86a58f2a0ecfbd6836cbb42369d569accd2a0430..d72cd6db6987a1eb41122236095fa02ba3ef8910 100644 (file)
--- a/src/editor/f_activationtype.lfm
+++ b/src/editor/f_activationtype.lfm
@@ -1,48 +1,48 @@
 object ActivationTypeForm: TActivationTypeForm
   Left = 231
+  Height = 149
   Top = 196
+  Width = 124
   BorderIcons = [biSystemMenu]
   BorderStyle = bsToolWindow
   Caption = 'Тип активации'
   ClientHeight = 149
   ClientWidth = 124
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object cbPlayerCollide: TCheckBox
     Left = 2
-    Top = 0
-    Width = 97
     Height = 17
+    Top = 0
+    Width = 88
     Caption = 'Игрок близко'
     TabOrder = 0
   end
   object cbMonsterCollide: TCheckBox
     Left = 2
-    Top = 16
-    Width = 97
     Height = 17
+    Top = 16
+    Width = 95
     Caption = 'Монстр близко'
     TabOrder = 1
   end
   object cbPlayerPress: TCheckBox
     Left = 2
-    Top = 32
-    Width = 97
     Height = 17
+    Top = 32
+    Width = 84
     Caption = 'Игрок нажал'
     TabOrder = 2
   end
   object bOK: TButton
     Left = 2
+    Height = 25
     Top = 120
     Width = 121
-    Height = 25
     Caption = 'OK'
     Default = True
     ModalResult = 1
@@ -50,25 +50,25 @@ object ActivationTypeForm: TActivationTypeForm
   end
   object cbMonsterPress: TCheckBox
     Left = 2
-    Top = 48
-    Width = 97
     Height = 17
+    Top = 48
+    Width = 91
     Caption = 'Монстр нажал'
     TabOrder = 4
   end
   object cbShot: TCheckBox
     Left = 2
-    Top = 64
-    Width = 97
     Height = 17
+    Top = 64
+    Width = 62
     Caption = 'Выстрел'
     TabOrder = 5
   end
   object cbNoMonster: TCheckBox
     Left = 2
-    Top = 80
-    Width = 97
     Height = 17
+    Top = 80
+    Width = 88
     Caption = 'Монстров нет'
     TabOrder = 6
   end

diff --git a/src/editor/f_addresource.lfm b/src/editor/f_addresource.lfm
index ef51f91986d7b48bb1da59e1c2366d5c249e2bfe..2726ba2aabcea9511ebb0149c178f459208584c5 100644 (file)
--- a/src/editor/f_addresource.lfm
+++ b/src/editor/f_addresource.lfm
@@ -1,50 +1,52 @@
 object AddResourceForm: TAddResourceForm
   Left = 271
+  Height = 268
   Top = 208
+  Width = 204
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   ClientHeight = 268
   ClientWidth = 204
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
+  OnActivate = FormActivate
   Position = poScreenCenter
   ShowHint = True
-  OnActivate = FormActivate
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object LabelWADs: TLabel
     Left = 4
+    Height = 13
     Top = 4
     Width = 110
-    Height = 13
     Caption = 'Список WAD-файлов:'
+    ParentColor = False
   end
   object LabelSections: TLabel
     Left = 4
+    Height = 13
     Top = 44
     Width = 143
-    Height = 13
     Caption = 'Список секций WAD-файла:'
+    ParentColor = False
   end
   object bOK: TButton
     Left = 36
+    Height = 25
     Top = 236
     Width = 75
-    Height = 25
     Caption = 'ОК'
     Default = True
     ModalResult = 1
-    TabOrder = 0
     OnClick = bOKClick
+    TabOrder = 0
   end
   object bCancel: TButton
     Left = 124
+    Height = 25
     Top = 236
     Width = 75
-    Height = 25
     Cancel = True
     Caption = 'Отмена'
     ModalResult = 2
@@ -52,35 +54,33 @@ object AddResourceForm: TAddResourceForm
   end
   object cbWADList: TComboBox
     Left = 4
+    Height = 21
     Top = 20
     Width = 193
-    Height = 21
-    AutoComplete = False
-    Style = csDropDownList
     ItemHeight = 13
-    TabOrder = 2
     OnChange = cbWADListChange
+    Style = csDropDownList
+    TabOrder = 2
   end
   object lbResourcesList: TListBox
     Left = 4
+    Height = 145
     Top = 84
     Width = 193
-    Height = 145
-    ItemHeight = 13
+    ItemHeight = 0
     MultiSelect = True
-    TabOrder = 3
     OnClick = lbResourcesListClick
+    TabOrder = 3
   end
   object cbSectionsList: TComboBox
     Left = 4
+    Height = 21
     Top = 60
     Width = 193
-    Height = 21
-    AutoComplete = False
-    Style = csDropDownList
     ItemHeight = 13
+    OnChange = cbSectionsListChange
     Sorted = True
+    Style = csDropDownList
     TabOrder = 4
-    OnChange = cbSectionsListChange
   end
 end

diff --git a/src/editor/f_addresource_sky.lfm b/src/editor/f_addresource_sky.lfm
index 3f941042be17e9baf617edd872af8295549af2e1..d6e6dc9ceb3849ca2643f41827c260e751d73868 100644 (file)
--- a/src/editor/f_addresource_sky.lfm
+++ b/src/editor/f_addresource_sky.lfm
@@ -1,10 +1,11 @@
 inherited AddSkyForm: TAddSkyForm
   Left = 225
+  Height = 250
   Top = 145
+  Width = 529
   Caption = 'Выберите текстуру для неба'
   ClientHeight = 250
   ClientWidth = 529
-  PixelsPerInch = 96
   inherited bOK: TButton
     Top = 220
   end
@@ -14,18 +15,20 @@ inherited AddSkyForm: TAddSkyForm
   inherited lbResourcesList: TListBox
     Height = 127
   end
-  object PanelTexPreview: TPanel
+  object PanelTexPreview: TPanel[7]
     Left = 204
+    Height = 242
     Top = 4
     Width = 322
-    Height = 242
     BevelOuter = bvLowered
+    ClientHeight = 242
+    ClientWidth = 322
     TabOrder = 5
     object iPreview: TImage
       Left = 0
+      Height = 240
       Top = 0
       Width = 320
-      Height = 240
     end
   end
 end

diff --git a/src/editor/f_addresource_sound.lfm b/src/editor/f_addresource_sound.lfm
index 31e837fb94eedce12627bc1feff81654f1d14f12..5627fd6176eff0edd7ca838b727326c036c64bb1 100644 (file)
--- a/src/editor/f_addresource_sound.lfm
+++ b/src/editor/f_addresource_sound.lfm
@@ -1,27 +1,25 @@
 inherited AddSoundForm: TAddSoundForm
   Left = 272
   Top = 110
+  Width = 450
   Caption = 'Выберите звук или музыку'
   ClientWidth = 450
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  PixelsPerInch = 96
-  object pSpectrum: TPanel
+  object pSpectrum: TPanel[7]
     Left = 204
+    Height = 61
     Top = 52
     Width = 240
-    Height = 61
     BevelOuter = bvNone
     TabOrder = 5
   end
-  object bbPlay: TBitBtn
+  object bbPlay: TBitBtn[8]
     Left = 205
+    Height = 25
     Top = 16
     Width = 25
-    Height = 25
-    TabOrder = 6
-    OnClick = bbPlayClick
     Glyph.Data = {
       76010000424D7601000000000000760000002800000020000000100000000100
       04000000000000010000130B0000130B00001000000000000000000000000000
@@ -34,16 +32,17 @@ inherited AddSoundForm: TAddSoundForm
       70E337F33377773337F3E0F33300033370E337F33377733337F3E0F333003333
       70E337F33377333337F3E0F33303333370E337F33373333337F3E0F333333333
       70E337F33333333337F3E0FFFFFFFFFFF0E337FFFFFFFFFFF7F3E00000000000
-      00E33777777777777733EEEEEEEEEEEEEEE33333333333333333}
+      00E33777777777777733EEEEEEEEEEEEEEE33333333333333333
+    }
     NumGlyphs = 2
+    OnClick = bbPlayClick
+    TabOrder = 6
   end
-  object bbStop: TBitBtn
+  object bbStop: TBitBtn[9]
     Left = 229
+    Height = 25
     Top = 16
     Width = 25
-    Height = 25
-    TabOrder = 7
-    OnClick = bbStopClick
     Glyph.Data = {
       76010000424D7601000000000000760000002800000020000000100000000100
       04000000000000010000130B0000130B00001000000000000000000000000000
@@ -56,24 +55,27 @@ inherited AddSoundForm: TAddSoundForm
       70E337F3377777F337F3E0F33000003370E337F3377777F337F3E0F330000033
       70E337F33777773337F3E0F33333333370E337F33333333337F3E0F333333333
       70E337F33333333337F3E0FFFFFFFFFFF0E337FFFFFFFFFFF7F3E00000000000
-      00E33777777777777733EEEEEEEEEEEEEEE33333333333333333}
+      00E33777777777777733EEEEEEEEEEEEEEE33333333333333333
+    }
     NumGlyphs = 2
+    OnClick = bbStopClick
+    TabOrder = 7
   end
-  object bEmpty: TButton
+  object bEmpty: TButton[10]
     Left = 216
+    Height = 25
     Top = 236
     Width = 75
-    Height = 25
     Caption = 'Нет звука'
     ModalResult = 1
-    TabOrder = 8
     OnClick = bEmptyClick
+    TabOrder = 8
   end
-  object Timer: TTimer
+  object Timer: TTimer[11]
     Enabled = False
     Interval = 20
     OnTimer = TimerTimer
-    Left = 264
-    Top = 144
+    left = 264
+    top = 144
   end
 end

diff --git a/src/editor/f_addresource_texture.lfm b/src/editor/f_addresource_texture.lfm
index c1fed5a115a14b0f068adec9c0e3c0b52c563d2f..866889ac45b4099da0948d16d0feaf942867bafe 100644 (file)
--- a/src/editor/f_addresource_texture.lfm
+++ b/src/editor/f_addresource_texture.lfm
@@ -25,7 +25,6 @@ inherited AddTextureForm: TAddTextureForm
   inherited lbResourcesList: TListBox
     Height = 150
     Top = 112
-    ItemHeight = 0
   end
   object PanelTexPreview: TPanel[7]
     Left = 204

diff --git a/src/editor/f_choosetype.lfm b/src/editor/f_choosetype.lfm
index 3be8cdf94581af41e9fc246aee541c0513c0eb87..6729b5bcf7c1e4b916c0a1fa0d22f6661ea334fd 100644 (file)
--- a/src/editor/f_choosetype.lfm
+++ b/src/editor/f_choosetype.lfm
@@ -1,32 +1,32 @@
 object ChooseTypeForm: TChooseTypeForm
   Left = 414
+  Height = 220
   Top = 235
+  Width = 205
   BorderIcons = [biSystemMenu]
   BorderStyle = bsToolWindow
   Caption = 'Выбор типа'
   ClientHeight = 220
   ClientWidth = 205
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object lbTypeSelect: TListBox
     Left = 2
+    Height = 183
     Top = 2
     Width = 201
-    Height = 183
-    ItemHeight = 13
+    ItemHeight = 0
     TabOrder = 0
   end
   object bOK: TButton
     Left = 2
+    Height = 25
     Top = 192
     Width = 201
-    Height = 25
     Caption = 'OK'
     Default = True
     ModalResult = 1

diff --git a/src/editor/f_keys.lfm b/src/editor/f_keys.lfm
index fe3597007778b810b931ac7dfb9b49e253f443d0..2cb59bcae91ef409c57087761da440f3a0a9dd69 100644 (file)
--- a/src/editor/f_keys.lfm
+++ b/src/editor/f_keys.lfm
@@ -1,48 +1,48 @@
 object KeysForm: TKeysForm
   Left = 392
+  Height = 114
   Top = 191
+  Width = 124
   BorderIcons = [biSystemMenu]
   BorderStyle = bsToolWindow
   Caption = 'Ключи'
   ClientHeight = 114
   ClientWidth = 124
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object cbRedKey: TCheckBox
     Left = 2
-    Top = 0
-    Width = 111
     Height = 17
+    Top = 0
+    Width = 91
     Caption = 'Красный ключ'
     TabOrder = 0
   end
   object cbGreenKey: TCheckBox
     Left = 2
-    Top = 16
-    Width = 111
     Height = 17
+    Top = 16
+    Width = 91
     Caption = 'Зеленый ключ'
     TabOrder = 1
   end
   object cbBlueKey: TCheckBox
     Left = 2
-    Top = 32
-    Width = 111
     Height = 17
+    Top = 32
+    Width = 77
     Caption = 'Синий ключ'
     TabOrder = 2
   end
   object bOK: TButton
     Left = 2
+    Height = 25
     Top = 88
     Width = 121
-    Height = 25
     Caption = 'OK'
     Default = True
     ModalResult = 1
@@ -50,17 +50,17 @@ object KeysForm: TKeysForm
   end
   object cbRedTeam: TCheckBox
     Left = 2
-    Top = 48
-    Width = 111
     Height = 17
+    Top = 48
+    Width = 108
     Caption = 'Красная команда'
     TabOrder = 4
   end
   object cbBlueTeam: TCheckBox
     Left = 2
-    Top = 64
-    Width = 111
     Height = 17
+    Top = 64
+    Width = 96
     Caption = 'Синяя команда'
     TabOrder = 5
   end

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index ba976399319fab97f72002dd5e473a0330195790..c51c295fb089769750f5b0966f5231032e4b88db 100644 (file)
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -21,7 +21,7 @@ object MainForm: TMainForm
   OnKeyDown = FormKeyDown
   OnKeyUp = FormKeyUp
   OnResize = FormResize
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   object Splitter1: TSplitter
     Left = 518
     Height = 289
@@ -64,6 +64,7 @@ object MainForm: TMainForm
       Constraints.MinWidth = 145
       DefaultColWidth = 60
       DefaultRowHeight = 16
+      FixedCols = 0
       Font.Color = clWindowText
       Font.Height = -12
       Font.Name = 'MS Sans Serif'
@@ -295,9 +296,9 @@ object MainForm: TMainForm
           end
           object cbPreview: TCheckBox
             Left = 35
-            Height = 19
+            Height = 17
             Top = 54
-            Width = 165
+            Width = 163
             Caption = 'Предварительный просмотр'
             TabOrder = 0
           end
@@ -586,7 +587,7 @@ object MainForm: TMainForm
             'Выстрел'
             'Монстров нет'
           )
-          ItemHeight = 17
+          ItemHeight = 15
           TabOrder = 1
           Data = {
             06000000000000000000
@@ -606,7 +607,7 @@ object MainForm: TMainForm
             'Красная команда'
             'Синяя команда'
           )
-          ItemHeight = 17
+          ItemHeight = 15
           TabOrder = 2
           Data = {
             050000000000000000

diff --git a/src/editor/f_mapcheck.lfm b/src/editor/f_mapcheck.lfm
index d7a10fe7b8999a6f43c58242e6398142ba25ddd2..dd443e16e4a12371f32072add8bc06b716c99651 100644 (file)
--- a/src/editor/f_mapcheck.lfm
+++ b/src/editor/f_mapcheck.lfm
@@ -1,55 +1,57 @@
 object MapCheckForm: TMapCheckForm
   Left = 238
+  Height = 199
   Top = 224
   Width = 525
-  Height = 199
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSizeToolWin
   Caption = 'Проверка карты'
+  ClientHeight = 199
+  ClientWidth = 525
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
   Position = poScreenCenter
-  PixelsPerInch = 96
+  LCLVersion = '1.6.4.0'
   object PanelResults: TPanel
     Left = 0
-    Top = 85
-    Width = 509
     Height = 76
+    Top = 123
+    Width = 525
     Align = alBottom
     BevelOuter = bvNone
+    ClientHeight = 76
+    ClientWidth = 525
     TabOrder = 0
     object bClose: TButton
-      Left = 439
+      Left = 455
+      Height = 25
       Top = 48
       Width = 75
-      Height = 25
       Anchors = [akRight, akBottom]
       Cancel = True
       Caption = 'Закрыть'
-      TabOrder = 1
       OnClick = bCloseClick
+      TabOrder = 1
     end
     object bCheckMap: TButton
-      Left = 327
+      Left = 343
+      Height = 25
       Top = 48
       Width = 105
-      Height = 25
       Anchors = [akRight, akBottom]
       Caption = 'Проверить заново'
       Default = True
-      TabOrder = 0
       OnClick = bCheckMapClick
+      TabOrder = 0
     end
     object mErrorDescription: TMemo
       Left = 0
-      Top = 0
-      Width = 509
       Height = 41
+      Top = 0
+      Width = 525
       Align = alTop
       Color = clBtnFace
       ReadOnly = True
@@ -59,12 +61,12 @@ object MapCheckForm: TMapCheckForm
   end
   object lbErrorList: TListBox
     Left = 0
+    Height = 123
     Top = 0
-    Width = 509
-    Height = 85
+    Width = 525
     Align = alClient
-    ItemHeight = 13
-    TabOrder = 1
+    ItemHeight = 0
     OnClick = lbErrorListClick
+    TabOrder = 1
   end
 end

diff --git a/src/editor/f_mapoptimization.lfm b/src/editor/f_mapoptimization.lfm
index 9a9ed0c5c31b2345506671d950caae1f03f4f1dc..5541fcf1ba2e52c932269d358f4e349735d1ceed 100644 (file)
--- a/src/editor/f_mapoptimization.lfm
+++ b/src/editor/f_mapoptimization.lfm
@@ -1,161 +1,169 @@
 object MapOptimizationForm: TMapOptimizationForm
   Left = 268
+  Height = 275
   Top = 189
+  Width = 433
   BorderIcons = [biSystemMenu]
   BorderStyle = bsToolWindow
   Caption = 'Оптимизация карты'
   ClientHeight = 275
   ClientWidth = 433
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
-  Position = poScreenCenter
   OnActivate = FormActivate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object GroupBoxOpt: TGroupBox
     Left = 0
+    Height = 193
     Top = 0
     Width = 257
-    Height = 193
     Caption = 'Оптимизация'
+    ClientHeight = 175
+    ClientWidth = 253
     TabOrder = 0
     object Bevel1: TBevel
       Left = 6
+      Height = 105
       Top = 66
       Width = 241
-      Height = 105
     end
     object lOptimizationDescription: TLabel
       Left = 10
+      Height = 93
       Top = 70
       Width = 232
-      Height = 93
       AutoSize = False
+      ParentColor = False
       WordWrap = True
     end
     object rbTexturesOptimization: TRadioButton
       Left = 6
-      Top = 10
-      Width = 137
       Height = 17
+      Top = 10
+      Width = 129
       Caption = 'Оптимизация текстур'
-      TabOrder = 0
       OnClick = rbTexturesOptimizationClick
+      TabOrder = 0
     end
     object rbPanelsOptimization: TRadioButton
       Left = 6
-      Top = 34
-      Width = 137
       Height = 17
+      Top = 34
+      Width = 132
       Caption = 'Оптимизация панелей'
-      TabOrder = 1
       OnClick = rbPanelsOptimizationClick
+      TabOrder = 1
     end
   end
   object pcOptimizationOptions: TPageControl
     Left = 264
+    Height = 190
     Top = 3
     Width = 169
-    Height = 190
     ActivePage = tsTextureOptimization
+    TabIndex = 0
     TabOrder = 1
     object tsTextureOptimization: TTabSheet
+      ClientHeight = 164
+      ClientWidth = 161
       TabVisible = False
       object bBeginTextureOptimization: TButton
         Left = 8
+        Height = 25
         Top = 8
         Width = 145
-        Height = 25
         Caption = 'Начать'
-        TabOrder = 0
         OnClick = bBeginTextureOptimizationClick
+        TabOrder = 0
       end
     end
     object tsPanelOptimization: TTabSheet
+      ClientHeight = 0
+      ClientWidth = 0
       ImageIndex = 1
       TabVisible = False
       object cbOptimizeWalls: TCheckBox
         Left = 8
+        Height = 17
         Top = 0
         Width = 97
-        Height = 17
         Caption = 'Стены'
         TabOrder = 0
       end
       object bBeginPanelsOptimization: TButton
         Left = 8
+        Height = 25
         Top = 152
         Width = 145
-        Height = 25
         Caption = 'Начать'
-        TabOrder = 1
         OnClick = bBeginPanelsOptimizationClick
+        TabOrder = 1
       end
       object cbOptimizeForeGround: TCheckBox
         Left = 8
+        Height = 17
         Top = 16
         Width = 97
-        Height = 17
         Caption = 'Передний план'
         TabOrder = 2
       end
       object cbOptimizeBackGround: TCheckBox
         Left = 8
+        Height = 17
         Top = 32
         Width = 97
-        Height = 17
         Caption = 'Задний план'
         TabOrder = 3
       end
       object cbOptimizeSteps: TCheckBox
         Left = 8
+        Height = 17
         Top = 48
         Width = 97
-        Height = 17
         Caption = 'Ступени'
         TabOrder = 4
       end
       object cbOptimizeWater: TCheckBox
         Left = 8
+        Height = 17
         Top = 64
         Width = 97
-        Height = 17
         Caption = 'Вода'
         TabOrder = 5
       end
       object cbOptimizeAcid1: TCheckBox
         Left = 8
+        Height = 17
         Top = 80
         Width = 97
-        Height = 17
         Caption = 'Кислота 1'
         TabOrder = 6
       end
       object cbOptimizeAcid2: TCheckBox
         Left = 8
+        Height = 17
         Top = 96
         Width = 97
-        Height = 17
         Caption = 'Кислота 2'
         TabOrder = 7
       end
       object cbOptimizeLift: TCheckBox
         Left = 8
+        Height = 17
         Top = 112
         Width = 97
-        Height = 17
         Caption = 'Лифты'
         TabOrder = 8
       end
       object cbOptimizeBlockMon: TCheckBox
         Left = 8
+        Height = 17
         Top = 128
         Width = 145
-        Height = 17
         Caption = 'Блокиратор монстров'
         TabOrder = 9
       end
@@ -163,9 +171,9 @@ object MapOptimizationForm: TMapOptimizationForm
   end
   object mOptimizationResult: TMemo
     Left = 0
+    Height = 73
     Top = 200
     Width = 433
-    Height = 73
     ReadOnly = True
     ScrollBars = ssVertical
     TabOrder = 2

diff --git a/src/editor/f_mapoptions.lfm b/src/editor/f_mapoptions.lfm
index f33a7b63f189b2e6dafe1756b7d93349b7cd849a..c4dd3432664215ecabbdd2104f451c7a9c3e45d6 100644 (file)
--- a/src/editor/f_mapoptions.lfm
+++ b/src/editor/f_mapoptions.lfm
@@ -15,7 +15,7 @@ object MapOptionsForm: TMapOptionsForm
   OnActivate = FormActivate
   Position = poScreenCenter
   ShowHint = True
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   object LabelDesc: TLabel
     Left = 3
     Height = 13
@@ -606,9 +606,9 @@ object MapOptionsForm: TMapOptionsForm
     end
     object cbSnapping: TCheckBox
       Left = 128
-      Height = 19
+      Height = 17
       Top = 50
-      Width = 123
+      Width = 121
       Alignment = taLeftJustify
       Caption = 'Сохранять привязку'
       Checked = True

diff --git a/src/editor/f_maptest.lfm b/src/editor/f_maptest.lfm
index 1efbe52e8ab75042df948df3d6f3bbd7df51a874..eca453c3f0ad492da45cac561e19d10b56ea78d8 100644 (file)
--- a/src/editor/f_maptest.lfm
+++ b/src/editor/f_maptest.lfm
@@ -1,80 +1,86 @@
 object MapTestForm: TMapTestForm
   Left = 291
+  Height = 270
   Top = 194
+  Width = 367
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'Настройки теста карты в D2D:F'
   ClientHeight = 270
   ClientWidth = 367
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poScreenCenter
   OnActivate = FormActivate
   OnCreate = FormCreate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object bOK: TButton
     Left = 192
+    Height = 25
     Top = 240
     Width = 75
-    Height = 25
     Caption = 'OK'
     Default = True
-    TabOrder = 0
     OnClick = bOKClick
+    TabOrder = 0
   end
   object bCancel: TButton
     Left = 286
+    Height = 25
     Top = 240
     Width = 75
-    Height = 25
     Cancel = True
     Caption = 'Отмена'
-    TabOrder = 1
     OnClick = bCancelClick
+    TabOrder = 1
   end
   object GroupBox1: TGroupBox
     Left = 8
+    Height = 233
     Top = 0
     Width = 353
-    Height = 233
+    ClientHeight = 215
+    ClientWidth = 349
     TabOrder = 2
     object LabelTime: TLabel
       Left = 14
+      Height = 13
       Top = 98
       Width = 83
-      Height = 13
       Caption = 'Лимит времени:'
+      ParentColor = False
     end
     object LabelSecs: TLabel
       Left = 174
+      Height = 13
       Top = 98
       Width = 35
-      Height = 13
       Caption = 'секунд'
+      ParentColor = False
     end
     object LabelScore: TLabel
       Left = 14
+      Height = 13
       Top = 122
       Width = 68
-      Height = 13
       Caption = 'Лимит очков:'
+      ParentColor = False
     end
     object LabelPath: TLabel
       Left = 14
+      Height = 13
       Top = 170
       Width = 107
-      Height = 13
       Caption = 'Путь к Doom2DF.exe:'
+      ParentColor = False
     end
     object rbDM: TRadioButton
       Left = 14
-      Top = 2
-      Width = 113
       Height = 17
+      Top = 2
+      Width = 76
       Caption = 'Deathmatch'
       Checked = True
       TabOrder = 0
@@ -82,49 +88,49 @@ object MapTestForm: TMapTestForm
     end
     object rbTDM: TRadioButton
       Left = 14
-      Top = 18
-      Width = 113
       Height = 17
+      Top = 18
+      Width = 106
       Caption = 'Team Deathmatch'
       TabOrder = 1
     end
     object rbCTF: TRadioButton
       Left = 14
-      Top = 34
-      Width = 113
       Height = 17
+      Top = 34
+      Width = 96
       Caption = 'Capture the Flag'
       TabOrder = 2
     end
     object rbCOOP: TRadioButton
       Left = 14
-      Top = 50
-      Width = 113
       Height = 17
+      Top = 50
+      Width = 75
       Caption = 'Cooperative'
       TabOrder = 3
     end
     object cbTwoPlayers: TCheckBox
       Left = 174
-      Top = 2
-      Width = 169
       Height = 17
+      Top = 2
+      Width = 77
       Caption = 'Два игрока'
       TabOrder = 4
     end
     object cbTeamDamage: TCheckBox
       Left = 174
-      Top = 18
-      Width = 169
       Height = 17
+      Top = 18
+      Width = 124
       Caption = 'Урон своей команде'
       TabOrder = 5
     end
     object cbAllowExit: TCheckBox
       Left = 174
-      Top = 34
-      Width = 169
       Height = 17
+      Top = 34
+      Width = 103
       Caption = 'Выход из уровня'
       Checked = True
       State = cbChecked
@@ -132,92 +138,97 @@ object MapTestForm: TMapTestForm
     end
     object cbWeaponStay: TCheckBox
       Left = 174
-      Top = 50
-      Width = 169
       Height = 17
+      Top = 50
+      Width = 106
       Caption = 'Оружие остается'
       TabOrder = 7
     end
     object cbMonstersDM: TCheckBox
       Left = 174
-      Top = 66
-      Width = 169
       Height = 17
+      Top = 66
+      Width = 93
       Caption = 'Монстры в DM'
       TabOrder = 8
     end
     object edTime: TEdit
       Left = 102
+      Height = 21
       Top = 98
       Width = 49
-      Height = 21
       TabOrder = 9
       Text = '0'
     end
     object edScore: TEdit
       Left = 102
+      Height = 21
       Top = 122
       Width = 49
-      Height = 21
       TabOrder = 10
       Text = '0'
     end
     object UpDown2: TUpDown
       Left = 151
+      Height = 21
       Top = 122
       Width = 12
-      Height = 21
       Associate = edScore
       Max = 1000
+      Min = 0
+      Position = 0
       TabOrder = 11
+      Wrap = False
     end
     object UpDown1: TUpDown
       Left = 151
+      Height = 21
       Top = 98
       Width = 12
-      Height = 21
       Associate = edTime
       Max = 28800
+      Min = 0
+      Position = 0
       TabOrder = 12
+      Wrap = False
     end
     object edD2dexe: TEdit
       Left = 14
+      Height = 21
       Top = 186
       Width = 297
-      Height = 21
       TabOrder = 13
       Text = 'Doom2DF.exe'
     end
     object bChooseD2d: TButton
       Left = 318
+      Height = 20
       Top = 186
       Width = 25
-      Height = 20
       Caption = '...'
-      Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = [fsBold]
+      OnClick = bChooseD2dClick
       ParentFont = False
       TabOrder = 14
-      OnClick = bChooseD2dClick
     end
     object cbMapOnce: TCheckBox
       Left = 14
-      Top = 146
-      Width = 225
       Height = 17
+      Top = 146
+      Width = 209
       Caption = 'Закрыть игру после выхода из карты'
       TabOrder = 15
     end
   end
   object FindD2dDialog: TOpenDialog
-    DefaultExt = 'Doom2DF.exe'
+    Title = 'Выберите файл игры Doom 2D:Forever'
+    DefaultExt = '.exe'
     Filter = 'Doom2DF.exe|Doom2DF.exe'
     Options = [ofHideReadOnly, ofNoChangeDir, ofEnableSizing]
-    Title = 'Выберите файл игры Doom 2D:Forever'
-    Left = 320
-    Top = 144
+    left = 320
+    top = 144
   end
 end

diff --git a/src/editor/f_options.lfm b/src/editor/f_options.lfm
index d400d8b7b215853f1e49457b8ac95929fc667b1c..028286ee9bace0fb4ef9defe520283be6f1253ee 100644 (file)
--- a/src/editor/f_options.lfm
+++ b/src/editor/f_options.lfm
@@ -14,7 +14,7 @@ object OptionsForm: TOptionsForm
   Font.Name = 'MS Sans Serif'
   OnActivate = FormActivate
   Position = poScreenCenter
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   object GroupBox1: TGroupBox
     Left = 8
     Height = 225
@@ -112,9 +112,9 @@ object OptionsForm: TOptionsForm
     end
     object cbShowDots: TCheckBox
       Left = 6
-      Height = 19
+      Height = 17
       Top = 2
-      Width = 114
+      Width = 112
       Caption = 'Показывать сетку'
       TabOrder = 0
     end
@@ -182,17 +182,17 @@ object OptionsForm: TOptionsForm
     end
     object cbShowTexture: TCheckBox
       Left = 6
-      Height = 19
+      Height = 17
       Top = 18
-      Width = 169
+      Width = 167
       Caption = 'Показывать текстуру панели'
       TabOrder = 7
     end
     object cbShowSize: TCheckBox
       Left = 6
-      Height = 19
+      Height = 17
       Top = 34
-      Width = 171
+      Width = 169
       Caption = 'Показывать размеры панели'
       TabOrder = 8
     end
@@ -238,9 +238,9 @@ object OptionsForm: TOptionsForm
     end
     object rbRussian: TRadioButton
       Left = 86
-      Height = 19
+      Height = 17
       Top = 162
-      Width = 62
+      Width = 60
       Caption = 'Русский'
       Checked = True
       TabOrder = 13
@@ -248,9 +248,9 @@ object OptionsForm: TOptionsForm
     end
     object rbEnglish: TRadioButton
       Left = 86
-      Height = 19
+      Height = 17
       Top = 186
-      Width = 54
+      Width = 52
       Caption = 'English'
       TabOrder = 14
     end

diff --git a/src/editor/f_packmap.lfm b/src/editor/f_packmap.lfm
index 31d3b46506e07bb6d798b26b420d0ab359955fa5..9e28d423586f7cfc2708706e0ddc29d7cc492f79 100644 (file)
--- a/src/editor/f_packmap.lfm
+++ b/src/editor/f_packmap.lfm
@@ -1,121 +1,128 @@
 object PackMapForm: TPackMapForm
   Left = 312
+  Height = 229
   Top = 231
+  Width = 360
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'Упаковать карту'
   ClientHeight = 229
   ClientWidth = 360
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poScreenCenter
   OnCreate = FormCreate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object Panel1: TPanel
     Left = 4
+    Height = 189
     Top = 4
     Width = 353
-    Height = 189
     BevelInner = bvRaised
     BevelOuter = bvLowered
+    ClientHeight = 189
+    ClientWidth = 353
     TabOrder = 0
     object LabelSaveTo: TLabel
       Left = 6
+      Height = 13
       Top = 6
       Width = 65
-      Height = 13
       Caption = 'Сохранить в:'
+      ParentColor = False
     end
     object LabelMapName: TLabel
       Left = 214
+      Height = 13
       Top = 6
       Width = 109
-      Height = 13
       Caption = 'Имя ресурса (карты):'
+      ParentColor = False
     end
     object LabelTextures: TLabel
       Left = 94
+      Height = 13
       Top = 62
       Width = 103
-      Height = 13
       Caption = 'Секция для текстур:'
+      ParentColor = False
     end
     object LabelSky: TLabel
       Left = 94
+      Height = 13
       Top = 86
       Width = 88
-      Height = 13
       Caption = 'Секция для неба:'
+      ParentColor = False
     end
     object LabelMusic: TLabel
       Left = 94
+      Height = 13
       Top = 110
       Width = 103
-      Height = 13
       Caption = 'Секция для музыки:'
+      ParentColor = False
     end
     object eWAD: TEdit
       Left = 6
+      Height = 21
       Top = 22
       Width = 169
-      Height = 21
       TabOrder = 0
     end
     object bSelectWAD: TButton
       Left = 176
-      Top = 20
-      Width = 23
       Height = 23
       Hint = 'Выбрать фон'
+      Top = 20
+      Width = 23
       Caption = '..'
-      TabOrder = 1
       OnClick = bSelectWADClick
+      TabOrder = 1
     end
     object eResource: TEdit
       Left = 214
+      Height = 21
       Top = 22
       Width = 129
-      Height = 21
-      CharCase = ecUpperCase
+      CharCase = ecUppercase
       MaxLength = 16
       TabOrder = 2
     end
     object eTSection: TEdit
       Left = 214
+      Height = 21
       Top = 62
       Width = 129
-      Height = 21
-      CharCase = ecUpperCase
+      CharCase = ecUppercase
       MaxLength = 16
       TabOrder = 4
     end
     object eSSection: TEdit
       Left = 214
+      Height = 21
       Top = 86
       Width = 129
-      Height = 21
-      CharCase = ecUpperCase
+      CharCase = ecUppercase
       MaxLength = 16
       TabOrder = 6
     end
     object eMSection: TEdit
       Left = 214
+      Height = 21
       Top = 110
       Width = 129
-      Height = 21
-      CharCase = ecUpperCase
+      CharCase = ecUppercase
       MaxLength = 16
       TabOrder = 8
     end
     object cbTextrures: TCheckBox
       Left = 6
-      Top = 62
-      Width = 89
       Height = 17
+      Top = 62
+      Width = 67
       Caption = 'Текстуры'
       Checked = True
       State = cbChecked
@@ -123,9 +130,9 @@ object PackMapForm: TPackMapForm
     end
     object cbSky: TCheckBox
       Left = 6
-      Top = 86
-      Width = 89
       Height = 17
+      Top = 86
+      Width = 44
       Caption = 'Небо'
       Checked = True
       State = cbChecked
@@ -133,9 +140,9 @@ object PackMapForm: TPackMapForm
     end
     object cbMusic: TCheckBox
       Left = 6
-      Top = 110
-      Width = 89
       Height = 17
+      Top = 110
+      Width = 57
       Caption = 'Музыку'
       Checked = True
       State = cbChecked
@@ -143,37 +150,37 @@ object PackMapForm: TPackMapForm
     end
     object cbAdd: TCheckBox
       Left = 6
-      Top = 142
-      Width = 193
       Height = 17
+      Top = 142
+      Width = 149
       Caption = 'Не перезаписывать WAD'
       TabOrder = 9
     end
     object cbNonStandart: TCheckBox
       Left = 6
-      Top = 158
-      Width = 209
       Height = 17
       Hint = 'Не сохранять ресурсы из стандартных WAD''ов - Standart.wad и пр.'
+      Top = 158
+      Width = 182
       Caption = 'Только нестандартные ресурсы'
       TabOrder = 10
     end
   end
   object bPack: TButton
     Left = 282
+    Height = 25
     Top = 200
     Width = 75
-    Height = 25
     Caption = 'Упаковать'
     Default = True
-    TabOrder = 1
     OnClick = bPackClick
+    TabOrder = 1
   end
   object SaveDialog: TSaveDialog
-    DefaultExt = 'wad'
+    DefaultExt = '.wad'
     Filter = 'Карты Doom2D: Forever (*.wad)|*.wad|All files (*.*)|*.*'
     Options = [ofHideReadOnly, ofPathMustExist, ofEnableSizing, ofDontAddToRecent]
-    Left = 8
-    Top = 200
+    left = 8
+    top = 200
   end
 end

diff --git a/src/editor/f_savemap.lfm b/src/editor/f_savemap.lfm
index e9a8dbe04384ea26af0aea07a8a2711987898f47..035f4200ad74101d9bdb4e3f8256edd07b5f36f8 100644 (file)
--- a/src/editor/f_savemap.lfm
+++ b/src/editor/f_savemap.lfm
@@ -1,73 +1,77 @@
 object SaveMapForm: TSaveMapForm
   Left = 368
+  Height = 239
   Top = 298
+  Width = 152
   BorderIcons = []
   BorderStyle = bsSingle
   Caption = 'Сохранить карту'
   ClientHeight = 239
   ClientWidth = 152
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poScreenCenter
   OnActivate = FormActivate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object lbMapList: TListBox
     Left = 0
+    Height = 186
     Top = 25
     Width = 152
-    Height = 186
     Align = alClient
-    ItemHeight = 13
+    ItemHeight = 0
+    OnClick = lbMapListClick
     Sorted = True
     TabOrder = 0
-    OnClick = lbMapListClick
   end
   object Panel2: TPanel
     Left = 0
+    Height = 25
     Top = 0
     Width = 152
-    Height = 25
     Align = alTop
     BevelOuter = bvNone
+    ClientHeight = 25
+    ClientWidth = 152
     TabOrder = 1
     object eMapName: TEdit
       Left = 0
+      Height = 21
       Top = 0
       Width = 153
-      Height = 21
-      CharCase = ecUpperCase
+      CharCase = ecUppercase
       MaxLength = 16
-      TabOrder = 0
       OnChange = eMapNameChange
+      TabOrder = 0
     end
   end
   object Panel1: TPanel
     Left = 0
+    Height = 28
     Top = 211
     Width = 152
-    Height = 28
     Align = alBottom
     BevelOuter = bvNone
+    ClientHeight = 28
+    ClientWidth = 152
     TabOrder = 2
     object bOK: TButton
       Left = 0
+      Height = 25
       Top = 0
       Width = 72
-      Height = 25
       Caption = 'OK'
       Default = True
-      TabOrder = 0
       OnClick = bOKClick
+      TabOrder = 0
     end
     object bCancel: TButton
       Left = 77
+      Height = 25
       Top = 0
       Width = 72
-      Height = 25
       Cancel = True
       Caption = 'Отмена'
       ModalResult = 2

diff --git a/src/editor/f_saveminimap.lfm b/src/editor/f_saveminimap.lfm
index f540395c8deddbc7b08f3b364f22e9c2367a9bbb..f7bb23703b23fde359fc8b0030d0c3ac58788b6f 100644 (file)
--- a/src/editor/f_saveminimap.lfm
+++ b/src/editor/f_saveminimap.lfm
@@ -1,84 +1,88 @@
 object SaveMiniMapForm: TSaveMiniMapForm
   Left = 362
+  Height = 225
   Top = 299
   Width = 431
-  Height = 225
   Caption = 'Сохранить мини-карту'
+  ClientHeight = 225
+  ClientWidth = 431
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poScreenCenter
   OnActivate = FormActivate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object pbMiniMap: TPaintBox
     Left = 185
+    Height = 225
     Top = 0
-    Width = 230
-    Height = 187
+    Width = 246
     Align = alClient
     OnPaint = pbMiniMapPaint
   end
   object Panel1: TPanel
     Left = 0
+    Height = 225
     Top = 0
     Width = 185
-    Height = 187
     Align = alLeft
     BevelOuter = bvNone
+    ClientHeight = 225
+    ClientWidth = 185
     TabOrder = 0
     object LabelScale: TLabel
       Left = 4
+      Height = 13
       Top = 10
       Width = 49
-      Height = 13
       Caption = 'Масштаб:'
+      ParentColor = False
     end
     object bSave: TButton
       Left = 2
-      Top = 128
-      Width = 173
       Height = 25
+      Top = 166
+      Width = 173
       Anchors = [akLeft, akBottom]
       Caption = 'Сохранить'
       Default = True
-      TabOrder = 1
       OnClick = bSaveClick
+      TabOrder = 1
     end
     object cbScale: TComboBox
       Left = 98
+      Height = 21
       Top = 6
       Width = 73
-      Height = 21
-      Style = csDropDownList
       ItemHeight = 13
       ItemIndex = 0
-      TabOrder = 0
-      Text = '1/16'
-      OnChange = cbScaleChange
       Items.Strings = (
         '1/16'
-        '1/8')
+        '1/8'
+      )
+      OnChange = cbScaleChange
+      Style = csDropDownList
+      TabOrder = 0
+      Text = '1/16'
     end
     object bClose: TButton
       Left = 2
-      Top = 158
-      Width = 173
       Height = 25
+      Top = 196
+      Width = 173
       Anchors = [akLeft, akBottom]
       Cancel = True
       Caption = 'Закрыть'
-      TabOrder = 2
       OnClick = bCloseClick
+      TabOrder = 2
     end
   end
   object SaveDialog: TSaveDialog
     DefaultExt = '.bmp'
     Filter = 'BMP files (*.bmp)|*.bmp|All files (*.*)|*.*'
     Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
-    Left = 8
-    Top = 48
+    left = 8
+    top = 48
   end
 end

diff --git a/src/editor/f_selectlang.lfm b/src/editor/f_selectlang.lfm
index 9a811405fa0f492ff45eb9c3e6bcb8ad7b55e9b0..f01b8d8c909cf4d9345434b22117b3e17fd1e247 100644 (file)
--- a/src/editor/f_selectlang.lfm
+++ b/src/editor/f_selectlang.lfm
@@ -1,6 +1,8 @@
 object SelectLanguageForm: TSelectLanguageForm
   Left = 365
+  Height = 63
   Top = 244
+  Width = 193
   BorderIcons = []
   BorderStyle = bsSingle
   Caption = 'Language / Язык'
@@ -8,34 +10,33 @@ object SelectLanguageForm: TSelectLanguageForm
   ClientWidth = 193
   Color = clBtnFace
   DefaultMonitor = dmMainForm
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poMainFormCenter
   OnActivate = FormActivate
-  PixelsPerInch = 96
+  Position = poMainFormCenter
+  LCLVersion = '1.6.4.0'
   object Label1: TLabel
     Left = 8
+    Height = 13
     Top = 8
     Width = 174
-    Height = 13
     Caption = 'Select Language / Выберите язык:'
+    ParentColor = False
   end
   object Button1: TButton
     Left = 8
+    Height = 25
     Top = 32
     Width = 75
-    Height = 25
     Caption = 'English'
     TabOrder = 1
   end
   object Button2: TButton
     Left = 112
+    Height = 25
     Top = 32
     Width = 75
-    Height = 25
     Caption = 'Русский'
     TabOrder = 0
   end

diff --git a/src/editor/f_selectmap.lfm b/src/editor/f_selectmap.lfm
index ab0265372a89da2a097f8926558957c438aae9bf..935ce593445cdd59954254119e4b2a6a0658f81d 100644 (file)
--- a/src/editor/f_selectmap.lfm
+++ b/src/editor/f_selectmap.lfm
@@ -1,43 +1,45 @@
 object SelectMapForm: TSelectMapForm
   Left = 488
+  Height = 266
   Top = 205
   Width = 169
-  Height = 266
   BorderIcons = []
   Caption = 'Выберите карту'
+  ClientHeight = 266
+  ClientWidth = 169
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  Position = poScreenCenter
   OnActivate = FormActivate
-  PixelsPerInch = 96
+  Position = poScreenCenter
+  LCLVersion = '1.6.4.0'
   object lbMapList: TListBox
     Left = 0
+    Height = 238
     Top = 0
-    Width = 153
-    Height = 200
+    Width = 169
     Align = alClient
-    ItemHeight = 13
+    ItemHeight = 0
+    OnClick = lbMapListClick
     Sorted = True
     TabOrder = 0
-    OnClick = lbMapListClick
   end
   object Panel1: TPanel
     Left = 0
-    Top = 200
-    Width = 153
     Height = 28
+    Top = 238
+    Width = 169
     Align = alBottom
     BevelOuter = bvNone
+    ClientHeight = 28
+    ClientWidth = 169
     TabOrder = 1
     object bOK: TButton
       Left = 0
+      Height = 25
       Top = 0
       Width = 72
-      Height = 25
       Caption = 'OK'
       Default = True
       ModalResult = 1
@@ -45,14 +47,14 @@ object SelectMapForm: TSelectMapForm
     end
     object bCancel: TButton
       Left = 77
+      Height = 25
       Top = 0
       Width = 72
-      Height = 25
       Cancel = True
       Caption = 'Отмена'
       ModalResult = 2
-      TabOrder = 1
       OnClick = bCancelClick
+      TabOrder = 1
     end
   end
 end