X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_main.lfm;h=4eae45a4aefda5f34bb7961ab5340e3200a312bf;hb=ecf69fd49c810dc4fe78092ec1f0204cbb719e01;hp=d35946313f732d2b62f4064ef5577e59885b3f97;hpb=6f0e2f411ed57b45f4665c44d89d3c5e6d890a9a;p=d2df-editor.git

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index d359463..4eae45a 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,10 +19,11 @@ object MainForm: TMainForm
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnDropFiles = FormDropFiles
   OnKeyDown = FormKeyDown
   OnKeyUp = FormKeyUp
   OnResize = FormResize
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   object Splitter1: TSplitter
     Left = 518
     Height = 289
@@ -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,15 +65,18 @@ object MainForm: TMainForm
       Top = 2
       Width = 145
       Align = alClient
+      AutoAdvance = aaNone
       Constraints.MinWidth = 145
       DefaultColWidth = 60
-      DefaultRowHeight = 16
+      DefaultRowHeight = 20
+      Flat = True
       Font.Color = clWindowText
       Font.Height = -12
       Font.Name = 'MS Sans Serif'
+      MouseWheelOption = mwGrid
       ParentFont = False
       RowCount = 2
-      ScrollBars = ssVertical
+      ScrollBars = ssAutoVertical
       TabOrder = 0
       TitleFont.Color = clWindowText
       TitleFont.Height = -12
@@ -80,6 +87,7 @@ object MainForm: TMainForm
       OnKeyDown = vleObjectPropertyKeyDown
       DisplayOptions = [doColumnTitles, doAutoColResize]
       DropDownRows = 11
+      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goEditing, goAlwaysShowEditor, goThumbTracking]
       Strings.Strings = (
         ''
       )
@@ -89,8 +97,8 @@ object MainForm: TMainForm
       )
       OnGetPickList = vleObjectPropertyGetPickList
       ColWidths = (
-        62
-        62
+        72
+        72
       )
     end
     object PanelPropApply: TPanel
@@ -247,6 +255,7 @@ object MainForm: TMainForm
           Constraints.MinHeight = 70
           ItemHeight = 13
           OnClick = lbTextureListClick
+          OnDrawItem = lbTextureListDrawItem
           Style = lbOwnerDrawFixed
           TabOrder = 0
         end
@@ -294,9 +303,9 @@ object MainForm: TMainForm
           end
           object cbPreview: TCheckBox
             Left = 35
-            Height = 19
+            Height = 17
             Top = 54
-            Width = 165
+            Width = 163
             Caption = 'Предварительный просмотр'
             TabOrder = 0
           end
@@ -585,7 +594,7 @@ object MainForm: TMainForm
             'Выстрел'
             'Монстров нет'
           )
-          ItemHeight = 17
+          ItemHeight = 15
           TabOrder = 1
           Data = {
             06000000000000000000
@@ -605,7 +614,7 @@ object MainForm: TMainForm
             'Красная команда'
             'Синяя команда'
           )
-          ItemHeight = 17
+          ItemHeight = 15
           TabOrder = 2
           Data = {
             050000000000000000
@@ -738,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, *.wad)|*.dfz;*.wad|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofFileMustExist, ofEnableSizing, ofDontAddToRecent]
     left = 32
     top = 64
@@ -1712,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 (*.wad)|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofNoReadOnlyReturn, ofEnableSizing, ofDontAddToRecent]
     left = 64
     top = 64
@@ -1935,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 = {