X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_main.lfm;h=b568cbc3d243b405e8bc1b8e86009c85b9ecba7d;hb=45810fb687edbe574a027520711f3dab3d880e21;hp=c51c295fb089769750f5b0966f5231032e4b88db;hpb=b372bf2ef9af243fd5fc6dd34857aed7240b071d;p=d2df-editor.git

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index c51c295..b568cbc 100644
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -3,6 +3,7 @@ object MainForm: TMainForm
   Height = 480
   Top = 255
   Width = 672
+  AllowDropFiles = True
   Caption = '2'
   ClientHeight = 460
   ClientWidth = 672
@@ -18,6 +19,7 @@ object MainForm: TMainForm
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnDropFiles = FormDropFiles
   OnKeyDown = FormKeyDown
   OnKeyUp = FormKeyUp
   OnResize = FormResize
@@ -31,6 +33,7 @@ object MainForm: TMainForm
     Beveled = True
     MinSize = 64
     OnCanResize = Splitter1CanResize
+    OnMoved = Splitter1Moved
     ResizeAnchor = akRight
   end
   object Splitter2: TSplitter
@@ -42,6 +45,7 @@ object MainForm: TMainForm
     Align = alBottom
     MinSize = 64
     OnCanResize = Splitter2CanResize
+    OnMoved = Splitter1Moved
     ResizeAnchor = akBottom
   end
   object PanelProps: TPanel
@@ -61,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
@@ -81,6 +87,7 @@ object MainForm: TMainForm
       OnKeyDown = vleObjectPropertyKeyDown
       DisplayOptions = [doColumnTitles, doAutoColResize]
       DropDownRows = 11
+      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goEditing, goAlwaysShowEditor, goThumbTracking]
       Strings.Strings = (
         ''
       )
@@ -90,8 +97,8 @@ object MainForm: TMainForm
       )
       OnGetPickList = vleObjectPropertyGetPickList
       ColWidths = (
-        70
-        71
+        72
+        72
       )
     end
     object PanelPropApply: TPanel
@@ -740,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
@@ -1714,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
@@ -1937,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 = {