X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Ff_options.lfm;h=0a3eca32107fe2c3f30ee1a89ea02cc5c2193a7b;hp=a2ff37d5f1b3696828d4751f862d57dc4023a029;hb=3c82d66d2cc9d0ea466a0129c1455b2fa194c810;hpb=caaa041f34124f7be0c8915e10f7849c4a030b1d

diff --git a/src/editor/f_options.lfm b/src/editor/f_options.lfm
index a2ff37d..0a3eca3 100644
--- a/src/editor/f_options.lfm
+++ b/src/editor/f_options.lfm
@@ -1,7 +1,7 @@
 object OptionsForm: TOptionsForm
-  Left = 1164
+  Left = 98
   Height = 360
-  Top = 677
+  Top = 345
   Width = 640
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
@@ -23,7 +23,8 @@ object OptionsForm: TOptionsForm
     Width = 624
     ActivePage = TabGeneral
     TabIndex = 0
-    TabOrder = 2
+    TabOrder = 0
+    Options = [nboKeyboardTabSwitch, nboDoChangeOnSetIndex]
     object TabGeneral: TTabSheet
       Caption = 'General'
       ClientHeight = 284
@@ -60,7 +61,7 @@ object OptionsForm: TOptionsForm
         Caption = 'Использовать шахматку'
         Checked = True
         State = cbChecked
-        TabOrder = 8
+        TabOrder = 3
       end
       object LabelGrid: TLabel
         Left = 8
@@ -70,43 +71,25 @@ object OptionsForm: TOptionsForm
         Caption = 'Шаги сетки:'
         ParentColor = False
       end
-      object eDotStepOne: TEdit
+      object SpinEdit1: TSpinEdit
         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
+        Width = 50
+        MaxValue = 2048
+        MinValue = 4
         TabOrder = 4
+        Value = 16
       end
-      object eDotStepTwo: TEdit
+      object SpinEdit2: TSpinEdit
         Left = 8
         Height = 22
         Top = 152
-        Width = 57
+        Width = 50
+        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
@@ -117,42 +100,33 @@ object OptionsForm: TOptionsForm
         ParentColor = False
         WordWrap = True
       end
-      object cbDotSize: TComboBox
+      object SpinEdit4: TSpinEdit
         Left = 8
-        Height = 25
+        Height = 22
         Top = 200
-        Width = 73
-        ItemHeight = 0
-        ItemIndex = 0
-        Items.Strings = (
-          '1'
-          '2'
-        )
-        TabOrder = 7
-        Text = '1'
+        Width = 50
+        MaxValue = 2
+        MinValue = 1
+        TabOrder = 6
+        Value = 1
       end
       object LabelMinimap: TLabel
         Left = 8
         Height = 14
-        Top = 240
+        Top = 232
         Width = 128
         Caption = 'Масштаб мини-карты:'
         ParentColor = False
       end
-      object cbScale: TComboBox
+      object SpinEdit5: TSpinEdit
         Left = 8
-        Height = 23
-        Top = 256
-        Width = 70
-        ItemHeight = 0
-        ItemIndex = 0
-        Items.Strings = (
-          '1x'
-          '2x'
-        )
-        Style = csDropDownList
-        TabOrder = 9
-        Text = '1x'
+        Height = 22
+        Top = 248
+        Width = 50
+        MaxValue = 10
+        MinValue = 1
+        TabOrder = 7
+        Value = 1
       end
       object LabelGridCol: TLabel
         Left = 304
@@ -162,20 +136,14 @@ object OptionsForm: TOptionsForm
         Caption = 'Цвет сетки:'
         ParentColor = False
       end
-      object sDotColor: TShape
+      object ColorButton1: TColorButton
         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
+        Width = 75
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clRed
       end
       object LabelBack: TLabel
         Left = 304
@@ -185,21 +153,14 @@ object OptionsForm: TOptionsForm
         Caption = 'Цвет фона:'
         ParentColor = False
       end
-      object sBackColor: TShape
+      object ColorButton2: TColorButton
         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
+        Width = 75
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clLime
       end
       object LabelPreview: TLabel
         Left = 304
@@ -210,21 +171,14 @@ object OptionsForm: TOptionsForm
         ParentColor = False
         WordWrap = True
       end
-      object sPreviewColor: TShape
+      object ColorButton3: TColorButton
         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
+        Width = 75
+        BorderWidth = 2
+        ButtonColorSize = 16
+        ButtonColor = clBlue
       end
       object LabelLanguage: TLabel
         Left = 304
@@ -241,7 +195,7 @@ object OptionsForm: TOptionsForm
         Width = 120
         ItemHeight = 0
         Style = csDropDownList
-        TabOrder = 13
+        TabOrder = 8
       end
     end
     object TabFiles: TTabSheet
@@ -254,7 +208,7 @@ object OptionsForm: TOptionsForm
         Top = 8
         Width = 208
         Caption = 'Сжимать архив при сохранении'
-        TabOrder = 2
+        TabOrder = 0
       end
       object cbBackup: TCheckBox
         Left = 8
@@ -262,7 +216,7 @@ object OptionsForm: TOptionsForm
         Top = 32
         Width = 218
         Caption = 'Резервная копия при сохранении'
-        TabOrder = 3
+        TabOrder = 1
       end
       object LabelRecent: TLabel
         Left = 8
@@ -273,24 +227,15 @@ object OptionsForm: TOptionsForm
         ParentColor = False
         WordWrap = True
       end
-      object eRecent: TEdit
+      object SpinEdit3: TSpinEdit
         Left = 8
         Height = 22
         Top = 80
-        Width = 57
-        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
+        Width = 50
+        MaxValue = 10
+        MinValue = 2
+        TabOrder = 2
+        Value = 2
       end
     end
     object TabTesting: TTabSheet
@@ -305,28 +250,21 @@ object OptionsForm: TOptionsForm
         Caption = 'Путь к Doom2DF.exe:'
         ParentColor = False
       end
-      object edD2dexe: TEdit
+      object ExeEdit: TFileNameEdit
         Left = 8
         Height = 22
         Top = 24
-        Width = 296
-        TabOrder = 12
+        Width = 328
+        FileName = 'Doom2DF.exe'
+        DialogOptions = [ofNoChangeDir, ofDontAddToRecent, ofViewDetail]
+        FilterIndex = 0
+        HideDirectories = False
+        ButtonWidth = 23
+        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
@@ -339,8 +277,8 @@ object OptionsForm: TOptionsForm
         Left = 8
         Height = 22
         Top = 72
-        Width = 296
-        TabOrder = 14
+        Width = 301
+        TabOrder = 1
       end
       object rbDM: TRadioButton
         Left = 8
@@ -349,7 +287,7 @@ object OptionsForm: TOptionsForm
         Width = 91
         Caption = 'Deathmatch'
         Checked = True
-        TabOrder = 0
+        TabOrder = 2
         TabStop = True
       end
       object rbTDM: TRadioButton
@@ -358,7 +296,7 @@ object OptionsForm: TOptionsForm
         Top = 120
         Width = 124
         Caption = 'Team Deathmatch'
-        TabOrder = 1
+        TabOrder = 3
       end
       object rbCTF: TRadioButton
         Left = 8
@@ -366,7 +304,7 @@ object OptionsForm: TOptionsForm
         Top = 136
         Width = 114
         Caption = 'Capture the Flag'
-        TabOrder = 2
+        TabOrder = 4
       end
       object rbCOOP: TRadioButton
         Left = 8
@@ -374,7 +312,7 @@ object OptionsForm: TOptionsForm
         Top = 152
         Width = 92
         Caption = 'Cooperative'
-        TabOrder = 3
+        TabOrder = 5
       end
       object cbTwoPlayers: TCheckBox
         Left = 168
@@ -382,7 +320,7 @@ object OptionsForm: TOptionsForm
         Top = 104
         Width = 89
         Caption = 'Два игрока'
-        TabOrder = 4
+        TabOrder = 6
       end
       object cbTeamDamage: TCheckBox
         Left = 168
@@ -390,7 +328,7 @@ object OptionsForm: TOptionsForm
         Top = 120
         Width = 141
         Caption = 'Урон своей команде'
-        TabOrder = 5
+        TabOrder = 7
       end
       object cbAllowExit: TCheckBox
         Left = 168
@@ -400,7 +338,7 @@ object OptionsForm: TOptionsForm
         Caption = 'Выход из уровня'
         Checked = True
         State = cbChecked
-        TabOrder = 6
+        TabOrder = 8
       end
       object cbWeaponStay: TCheckBox
         Left = 168
@@ -408,7 +346,7 @@ object OptionsForm: TOptionsForm
         Top = 152
         Width = 125
         Caption = 'Оружие остается'
-        TabOrder = 7
+        TabOrder = 9
       end
       object cbMonstersDM: TCheckBox
         Left = 168
@@ -416,7 +354,7 @@ object OptionsForm: TOptionsForm
         Top = 168
         Width = 103
         Caption = 'Монстры в DM'
-        TabOrder = 8
+        TabOrder = 10
       end
       object LabelTime: TLabel
         Left = 8
@@ -431,7 +369,7 @@ object OptionsForm: TOptionsForm
         Height = 22
         Top = 200
         Width = 49
-        TabOrder = 9
+        TabOrder = 11
         Text = '0'
       end
       object LabelSecs: TLabel
@@ -455,7 +393,7 @@ object OptionsForm: TOptionsForm
         Height = 22
         Top = 223
         Width = 49
-        TabOrder = 10
+        TabOrder = 12
         Text = '0'
       end
       object cbMapOnce: TCheckBox
@@ -464,7 +402,7 @@ object OptionsForm: TOptionsForm
         Top = 256
         Width = 241
         Caption = 'Закрыть игру после выхода из карты'
-        TabOrder = 11
+        TabOrder = 13
       end
     end
   end
@@ -476,7 +414,7 @@ object OptionsForm: TOptionsForm
     Caption = 'ОК'
     Default = True
     OnClick = bOKClick
-    TabOrder = 0
+    TabOrder = 1
   end
   object bCancel: TButton
     Left = 557
@@ -486,41 +424,6 @@ object OptionsForm: TOptionsForm
     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