X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_options.lfm;h=6ae5c8e46d8a6f4f32cd9afc867a4e3bdee0f0b5;hb=4cd27745126226e5e57a02f4c2a44ccbab16bbac;hp=d579158963d59ff71dfb1fda12d746d67df24634;hpb=19f8a082fb249eb52f8fe49ad50a794d3176babd;p=d2df-editor.git

diff --git a/src/editor/f_options.lfm b/src/editor/f_options.lfm
index d579158..6ae5c8e 100644
--- a/src/editor/f_options.lfm
+++ b/src/editor/f_options.lfm
@@ -1,526 +1,414 @@
 object OptionsForm: TOptionsForm
-  Left = 1164
-  Height = 360
-  Top = 677
-  Width = 640
+  Left = 96
+  Height = 401
+  Top = 345
+  Width = 713
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'Настройки редактора'
-  ClientHeight = 360
-  ClientWidth = 640
+  ClientHeight = 401
+  ClientWidth = 713
   Color = clBtnFace
+  DesignTimePPI = 107
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -12
   Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '2.2.4.0'
   object PageControl: TPageControl
-    Left = 8
-    Height = 312
-    Top = 8
-    Width = 624
+    Left = 9
+    Height = 348
+    Top = 9
+    Width = 696
     ActivePage = TabGeneral
     TabIndex = 0
-    TabOrder = 2
+    TabOrder = 0
+    Options = [nboKeyboardTabSwitch, nboDoChangeOnSetIndex]
     object TabGeneral: TTabSheet
       Caption = 'General'
-      ClientHeight = 284
-      ClientWidth = 620
+      ClientHeight = 319
+      ClientWidth = 692
       object cbShowDots: TCheckBox
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 8
-        Width = 128
+        Top = 9
+        Width = 135
         Caption = 'Показывать сетку'
         TabOrder = 0
       end
       object cbShowTexture: TCheckBox
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 32
-        Width = 193
+        Top = 36
+        Width = 207
         Caption = 'Показывать текстуру панели'
         TabOrder = 1
       end
       object cbShowSize: TCheckBox
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 56
-        Width = 191
+        Top = 62
+        Width = 204
         Caption = 'Показывать размеры панели'
         TabOrder = 2
       end
       object cbCheckerboard: TCheckBox
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 80
-        Width = 164
+        Top = 89
+        Width = 176
         Caption = 'Использовать шахматку'
         Checked = True
         State = cbChecked
-        TabOrder = 8
+        TabOrder = 3
       end
       object LabelGrid: TLabel
-        Left = 8
-        Height = 14
-        Top = 112
-        Width = 72
+        Left = 9
+        Height = 15
+        Top = 125
+        Width = 78
         Caption = 'Шаги сетки:'
         ParentColor = False
       end
-      object eDotStepOne: TEdit
-        Left = 8
-        Height = 22
-        Top = 128
-        Width = 57
-        TabOrder = 3
-        Text = '16'
-      end
-      object UpDown1: TUpDown
-        Left = 65
-        Height = 22
-        Top = 128
-        Width = 12
-        Associate = eDotStepOne
-        Max = 2048
-        Min = 4
-        Position = 16
+      object SpinEdit1: TSpinEdit
+        Left = 9
+        Height = 23
+        Top = 143
+        Width = 56
+        MaxValue = 2048
+        MinValue = 4
         TabOrder = 4
+        Value = 16
       end
-      object eDotStepTwo: TEdit
-        Left = 8
-        Height = 22
-        Top = 152
-        Width = 57
+      object SpinEdit2: TSpinEdit
+        Left = 9
+        Height = 23
+        Top = 169
+        Width = 56
+        MaxValue = 2048
+        MinValue = 4
         TabOrder = 5
-        Text = '8'
-      end
-      object UpDown2: TUpDown
-        Left = 65
-        Height = 22
-        Top = 152
-        Width = 12
-        Associate = eDotStepTwo
-        Max = 2048
-        Min = 4
-        Position = 8
-        TabOrder = 6
+        Value = 8
       end
       object LabelGridSize: TLabel
-        Left = 8
-        Height = 14
-        Top = 184
-        Width = 118
+        Left = 9
+        Height = 15
+        Top = 205
+        Width = 127
         Caption = 'Размер точек сетки:'
         ParentColor = False
         WordWrap = True
       end
-      object cbDotSize: TComboBox
-        Left = 8
-        Height = 25
-        Top = 200
-        Width = 73
-        ItemHeight = 0
-        ItemIndex = 0
-        Items.Strings = (
-          '1'
-          '2'
-        )
-        TabOrder = 7
-        Text = '1'
+      object SpinEdit4: TSpinEdit
+        Left = 9
+        Height = 23
+        Top = 223
+        Width = 56
+        MaxValue = 2
+        MinValue = 1
+        TabOrder = 6
+        Value = 1
       end
       object LabelMinimap: TLabel
-        Left = 8
-        Height = 14
-        Top = 240
-        Width = 128
+        Left = 9
+        Height = 15
+        Top = 259
+        Width = 139
         Caption = 'Масштаб мини-карты:'
         ParentColor = False
       end
-      object cbScale: TComboBox
-        Left = 8
+      object SpinEdit5: TSpinEdit
+        Left = 9
         Height = 23
-        Top = 256
-        Width = 70
-        ItemHeight = 0
-        ItemIndex = 0
-        Items.Strings = (
-          '1x'
-          '2x'
-        )
-        Style = csDropDownList
-        TabOrder = 9
-        Text = '1x'
+        Top = 276
+        Width = 56
+        MaxValue = 10
+        MinValue = 1
+        TabOrder = 7
+        Value = 1
       end
       object LabelGridCol: TLabel
-        Left = 304
-        Height = 14
-        Top = 8
-        Width = 68
+        Left = 339
+        Height = 15
+        Top = 9
+        Width = 74
         Caption = 'Цвет сетки:'
         ParentColor = False
       end
-      object sDotColor: TShape
-        Left = 304
-        Height = 25
-        Top = 24
-        Width = 56
-      end
-      object bGrid: TButton
-        Left = 360
-        Height = 25
-        Top = 24
-        Width = 11
-        Caption = '..'
-        OnClick = bGridClick
-        TabOrder = 10
+      object ColorButton1: TColorButton
+        Left = 339
+        Height = 28
+        Top = 27
+        Width = 84
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clRed
       end
       object LabelBack: TLabel
-        Left = 304
-        Height = 14
-        Top = 64
-        Width = 65
+        Left = 339
+        Height = 15
+        Top = 71
+        Width = 70
         Caption = 'Цвет фона:'
         ParentColor = False
       end
-      object sBackColor: TShape
-        Left = 304
-        Height = 25
-        Top = 80
-        Width = 56
-        Brush.Color = clBlack
-      end
-      object bBack: TButton
-        Left = 360
-        Height = 25
-        Top = 80
-        Width = 11
-        Caption = '..'
-        OnClick = bBackClick
-        TabOrder = 11
+      object ColorButton2: TColorButton
+        Left = 339
+        Height = 28
+        Top = 89
+        Width = 84
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clLime
       end
       object LabelPreview: TLabel
-        Left = 304
-        Height = 14
-        Top = 120
-        Width = 248
+        Left = 339
+        Height = 15
+        Top = 134
+        Width = 270
         Caption = 'Цвет фона поля предпросмотра текстуры:'
         ParentColor = False
         WordWrap = True
       end
-      object sPreviewColor: TShape
-        Left = 304
-        Height = 25
-        Top = 136
-        Width = 56
-        Brush.Color = clBlack
-      end
-      object bPreview: TButton
-        Left = 360
-        Height = 25
-        Top = 136
-        Width = 11
-        Caption = '..'
-        OnClick = bPreviewClick
-        TabOrder = 12
+      object ColorButton3: TColorButton
+        Left = 339
+        Height = 28
+        Top = 152
+        Width = 84
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clBlue
       end
       object LabelLanguage: TLabel
-        Left = 304
-        Height = 14
-        Top = 172
+        Left = 339
+        Height = 15
+        Top = 192
         Width = 34
         Caption = 'Язык:'
         ParentColor = False
       end
       object cbLanguage: TComboBox
-        Left = 304
-        Height = 26
-        Top = 192
-        Width = 68
+        Left = 339
+        Height = 27
+        Top = 214
+        Width = 134
         ItemHeight = 0
         Style = csDropDownList
-        TabOrder = 13
+        TabOrder = 8
       end
     end
     object TabFiles: TTabSheet
       Caption = 'Files'
-      ClientHeight = 284
-      ClientWidth = 620
-      object cbCompress: TCheckBox
-        Left = 8
-        Height = 21
-        Top = 8
-        Width = 249
-        Caption = 'Сжимать архив при сохранении'
-        TabOrder = 2
-      end
-      object cbBackup: TCheckBox
-        Left = 8
-        Height = 21
-        Top = 32
-        Width = 258
-        Caption = 'Резервная копия при сохранении'
-        TabOrder = 3
-      end
+      ClientHeight = 319
+      ClientWidth = 692
       object LabelRecent: TLabel
-        Left = 8
-        Height = 14
-        Top = 64
-        Width = 230
+        Left = 9
+        Height = 15
+        Top = 8
+        Width = 250
         Caption = 'Запоминать последних открытых карт:'
         ParentColor = False
         WordWrap = True
       end
-      object eRecent: TEdit
-        Left = 8
-        Height = 22
-        Top = 80
-        Width = 57
+      object SpinEdit3: TSpinEdit
+        Left = 9
+        Height = 23
+        Top = 32
+        Width = 56
+        MaxValue = 10
+        MinValue = 2
         TabOrder = 0
-        Text = '5'
-      end
-      object UpDown3: TUpDown
-        Left = 65
-        Height = 22
-        Top = 80
-        Width = 12
-        Associate = eRecent
-        Max = 10
-        Min = 2
-        Position = 5
-        TabOrder = 1
+        Value = 2
       end
     end
     object TabTesting: TTabSheet
       Caption = 'Testing'
-      ClientHeight = 284
-      ClientWidth = 620
+      ClientHeight = 319
+      ClientWidth = 692
       object LabelPath: TLabel
-        Left = 8
-        Height = 14
-        Top = 8
-        Width = 120
+        Left = 9
+        Height = 15
+        Top = 9
+        Width = 131
         Caption = 'Путь к Doom2DF.exe:'
         ParentColor = False
       end
-      object edD2dexe: TEdit
-        Left = 8
-        Height = 22
-        Top = 24
-        Width = 296
-        TabOrder = 12
+      object ExeEdit: TFileNameEdit
+        Left = 9
+        Height = 23
+        Top = 27
+        Width = 366
+        FileName = 'Doom2DF.exe'
+        DialogOptions = [ofNoChangeDir, ofDontAddToRecent, ofViewDetail]
+        FilterIndex = 0
+        HideDirectories = False
+        ButtonWidth = 26
+        NumGlyphs = 1
+        MaxLength = 0
+        TabOrder = 0
         Text = 'Doom2DF.exe'
       end
-      object bChooseD2d: TButton
-        Left = 304
-        Height = 22
-        Top = 24
-        Width = 25
-        Caption = '...'
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'MS Sans Serif'
-        Font.Style = [fsBold]
-        OnClick = bChooseD2dClick
-        ParentFont = False
-        TabOrder = 13
-      end
       object LabelArgs: TLabel
-        Left = 8
-        Height = 14
-        Top = 55
-        Width = 120
+        Left = 9
+        Height = 15
+        Top = 61
+        Width = 128
         Caption = 'Параметры запуска:'
         ParentColor = False
       end
       object edD2DArgs: TEdit
-        Left = 8
-        Height = 22
-        Top = 72
-        Width = 296
-        TabOrder = 14
+        Left = 9
+        Height = 23
+        Top = 80
+        Width = 335
+        TabOrder = 1
       end
       object rbDM: TRadioButton
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 104
-        Width = 103
+        Top = 116
+        Width = 98
         Caption = 'Deathmatch'
         Checked = True
-        TabOrder = 0
+        TabOrder = 2
         TabStop = True
       end
       object rbTDM: TRadioButton
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 120
-        Width = 142
+        Top = 134
+        Width = 133
         Caption = 'Team Deathmatch'
-        TabOrder = 1
+        TabOrder = 3
       end
       object rbCTF: TRadioButton
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 136
-        Width = 131
+        Top = 152
+        Width = 124
         Caption = 'Capture the Flag'
-        TabOrder = 2
+        TabOrder = 4
       end
       object rbCOOP: TRadioButton
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 152
-        Width = 102
+        Top = 169
+        Width = 94
         Caption = 'Cooperative'
-        TabOrder = 3
+        TabOrder = 5
       end
       object cbTwoPlayers: TCheckBox
-        Left = 168
+        Left = 187
         Height = 21
-        Top = 104
-        Width = 101
+        Top = 116
+        Width = 93
         Caption = 'Два игрока'
-        TabOrder = 4
+        TabOrder = 6
       end
       object cbTeamDamage: TCheckBox
-        Left = 168
+        Left = 187
         Height = 21
-        Top = 120
-        Width = 164
+        Top = 134
+        Width = 150
         Caption = 'Урон своей команде'
-        TabOrder = 5
+        TabOrder = 7
       end
       object cbAllowExit: TCheckBox
-        Left = 168
+        Left = 187
         Height = 21
-        Top = 136
-        Width = 141
+        Top = 152
+        Width = 128
         Caption = 'Выход из уровня'
         Checked = True
         State = cbChecked
-        TabOrder = 6
+        TabOrder = 8
       end
       object cbWeaponStay: TCheckBox
-        Left = 168
+        Left = 187
         Height = 21
-        Top = 152
-        Width = 145
+        Top = 169
+        Width = 133
         Caption = 'Оружие остается'
-        TabOrder = 7
+        TabOrder = 9
       end
       object cbMonstersDM: TCheckBox
-        Left = 168
+        Left = 187
         Height = 21
-        Top = 168
-        Width = 124
+        Top = 187
+        Width = 113
         Caption = 'Монстры в DM'
-        TabOrder = 8
+        TabOrder = 10
       end
       object LabelTime: TLabel
-        Left = 8
-        Height = 14
-        Top = 200
-        Width = 92
+        Left = 9
+        Height = 15
+        Top = 223
+        Width = 103
         Caption = 'Лимит времени:'
         ParentColor = False
       end
       object edTime: TEdit
-        Left = 120
-        Height = 22
-        Top = 200
-        Width = 49
-        TabOrder = 9
+        Left = 134
+        Height = 23
+        Top = 223
+        Width = 55
+        TabOrder = 11
         Text = '0'
       end
       object LabelSecs: TLabel
-        Left = 174
-        Height = 14
-        Top = 200
-        Width = 42
+        Left = 194
+        Height = 15
+        Top = 223
+        Width = 44
         Caption = 'секунд'
         ParentColor = False
       end
       object LabelScore: TLabel
-        Left = 8
-        Height = 14
-        Top = 223
-        Width = 76
+        Left = 9
+        Height = 15
+        Top = 249
+        Width = 84
         Caption = 'Лимит очков:'
         ParentColor = False
       end
       object edScore: TEdit
-        Left = 120
-        Height = 22
-        Top = 223
-        Width = 49
-        TabOrder = 10
+        Left = 134
+        Height = 23
+        Top = 249
+        Width = 55
+        TabOrder = 12
         Text = '0'
       end
       object cbMapOnce: TCheckBox
-        Left = 8
+        Left = 9
         Height = 21
-        Top = 256
-        Width = 287
+        Top = 285
+        Width = 259
         Caption = 'Закрыть игру после выхода из карты'
-        TabOrder = 11
+        TabOrder = 13
       end
     end
   end
   object bOK: TButton
-    Left = 464
-    Height = 25
-    Top = 328
-    Width = 75
+    Left = 517
+    Height = 28
+    Top = 366
+    Width = 84
     Caption = 'ОК'
     Default = True
     OnClick = bOKClick
-    TabOrder = 0
+    TabOrder = 1
   end
   object bCancel: TButton
-    Left = 557
-    Height = 25
-    Top = 328
-    Width = 75
+    Left = 621
+    Height = 28
+    Top = 366
+    Width = 84
     Cancel = True
     Caption = 'Отмена'
     OnClick = bCancelClick
-    TabOrder = 1
-  end
-  object ColorDialog: TColorDialog
-    Color = clBlack
-    CustomColors.Strings = (
-      'ColorA=000000'
-      'ColorB=000080'
-      'ColorC=008000'
-      'ColorD=008080'
-      'ColorE=800000'
-      'ColorF=800080'
-      'ColorG=808000'
-      'ColorH=808080'
-      'ColorI=C0C0C0'
-      'ColorJ=0000FF'
-      'ColorK=00FF00'
-      'ColorL=00FFFF'
-      'ColorM=FF0000'
-      'ColorN=FF00FF'
-      'ColorO=FFFF00'
-      'ColorP=FFFFFF'
-      'ColorQ=C0DCC0'
-      'ColorR=F0CAA6'
-      'ColorS=F0FBFF'
-      'ColorT=A4A0A0'
-    )
-    left = 568
-    top = 264
-  end
-  object FindD2dDialog: TOpenDialog
-    Title = 'Выберите файл игры Doom 2D: Forever'
-    DefaultExt = '.exe'
-    Filter = 'Doom2DF.exe|Doom2DF.exe;Doom2DF'
-    Options = [ofHideReadOnly, ofNoChangeDir, ofEnableSizing]
-    left = 472
-    top = 264
+    TabOrder = 2
   end
 end