test: do not lock editor while map testing

[d2df-editor.git] / src / editor / f_main.lfm

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index 0a7bf85a18f92d62b20f50899da3ae527afe6f60..0a88de2374e93363b72069983e42638a63aed5be 100644 (file)
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -65,13 +65,15 @@ object MainForm: TMainForm
       Top = 2
       Width = 145
       Align = alClient
+      AutoAdvance = aaNone
       Constraints.MinWidth = 145
       DefaultColWidth = 60
-      DefaultRowHeight = 16
-      FixedCols = 0
+      DefaultRowHeight = 20
+      Flat = True
       Font.Color = clWindowText
       Font.Height = -12
       Font.Name = 'MS Sans Serif'
+      MouseWheelOption = mwGrid
       ParentFont = False
       RowCount = 2
       ScrollBars = ssAutoVertical
@@ -85,6 +87,7 @@ object MainForm: TMainForm
       OnKeyDown = vleObjectPropertyKeyDown
       DisplayOptions = [doColumnTitles, doAutoColResize]
       DropDownRows = 11
+      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goEditing, goAlwaysShowEditor, goThumbTracking]
       Strings.Strings = (
         ''
       )
@@ -94,8 +97,8 @@ object MainForm: TMainForm
       )
       OnGetPickList = vleObjectPropertyGetPickList
       ColWidths = (
-        70
-        71
+        72
+        72
       )
     end
     object PanelPropApply: TPanel
@@ -744,8 +747,8 @@ object MainForm: TMainForm
     end
   end
   object OpenDialog: TOpenDialog
-    DefaultExt = '.wad'
-    Filter = 'Карты Doom 2D: Forever (*.wad)|*.wad|Старые карты Doom 2D: Forever (*.ini)|*.ini|Все файлы (*.*)|*.*'
+    DefaultExt = '.dfz'
+    Filter = 'Карты Doom 2D: Forever (*.dfz, *.dfzip, *.zip, *.wad)|*.dfz;*.dfzip;*.zip;*.wad|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofFileMustExist, ofEnableSizing, ofDontAddToRecent]
     left = 32
     top = 64
@@ -1718,8 +1721,8 @@ object MainForm: TMainForm
     }
   end
   object SaveDialog: TSaveDialog
-    DefaultExt = '.wad'
-    Filter = 'Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'
+    DefaultExt = '.dfz'
+    Filter = 'Карты Doom 2D: Forever (*.dfz)|*.dfz|Карты Doom 2D: Forever (*.dfzip)|*.dfzip|Карты Doom 2D: Forever (*.zip)|*.zip|Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofNoReadOnlyReturn, ofEnableSizing, ofDontAddToRecent]
     left = 64
     top = 64
@@ -1941,6 +1944,12 @@ object MainForm: TMainForm
       object miLine1: TMenuItem
         Caption = '-'
       end
+      object miReopenMap: TMenuItem
+        Caption = 'Открыть заново'
+        ImageIndex = 1
+        ShortCut = 116
+        OnClick = miReopenMapClick
+      end
       object miSaveMiniMap: TMenuItem
         Caption = 'Сохранить мини-карту'
         Bitmap.Data = {
@@ -3742,4 +3751,9 @@ object MainForm: TMainForm
     left = 64
     top = 146
   end
+  object MapTestTimer: TTimer
+    OnTimer = MapTestCheck
+    left = 192
+    top = 64
+  end
 end