X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_main.lfm;h=8340abb5ae1771f68d6574829012d554870f6045;hb=8cf7d78247066943043d0b95f4b35d45dfebab71;hp=238c1122fd4396ea9cfee8683ac9950d3d911796;hpb=6440b720d7e55069ae59d8c4340981b594c4499b;p=d2df-editor.git

diff --git a/src/editor/f_main.lfm b/src/editor/f_main.lfm
index 238c112..8340abb 100644
--- a/src/editor/f_main.lfm
+++ b/src/editor/f_main.lfm
@@ -1,7 +1,7 @@
 object MainForm: TMainForm
-  Left = 221
+  Left = 176
   Height = 480
-  Top = 232
+  Top = 142
   Width = 672
   AllowDropFiles = True
   Caption = '2'
@@ -25,6 +25,85 @@ object MainForm: TMainForm
   OnResize = FormResize
   OnWindowStateChange = FormWindowStateChange
   LCLVersion = '2.2.4.0'
+  object PanelMap: TPanel
+    Left = 0
+    Height = 317
+    Top = 34
+    Width = 518
+    Align = alClient
+    BevelOuter = bvNone
+    ClientHeight = 317
+    ClientWidth = 518
+    TabOrder = 1
+    object RenderPanel: TOpenGLControl
+      Left = 0
+      Height = 301
+      Top = 0
+      Width = 502
+      Align = alClient
+      AlphaBits = 8
+      OnMouseDown = RenderPanelMouseDown
+      OnMouseMove = RenderPanelMouseMove
+      OnMouseUp = RenderPanelMouseUp
+      OnPaint = RenderPanelPaint
+      OnResize = RenderPanelResize
+    end
+    object sbHorizontal: TScrollBar
+      Left = 0
+      Height = 16
+      Top = 301
+      Width = 518
+      Align = alBottom
+      LargeChange = 256
+      Max = 0
+      PageSize = 0
+      SmallChange = 16
+      TabOrder = 0
+      TabStop = False
+      OnScroll = sbHorizontalScroll
+    end
+    object sbVertical: TScrollBar
+      Left = 502
+      Height = 301
+      Top = 0
+      Width = 16
+      Align = alRight
+      Kind = sbVertical
+      LargeChange = 256
+      Max = 0
+      PageSize = 0
+      SmallChange = 16
+      TabOrder = 1
+      TabStop = False
+      OnScroll = sbVerticalScroll
+    end
+  end
+  object pLoadProgress: TPanel
+    Left = 168
+    Height = 56
+    Top = 144
+    Width = 176
+    ClientHeight = 56
+    ClientWidth = 176
+    TabOrder = 7
+    Visible = False
+    object pbLoad: TProgressBar
+      Left = 8
+      Height = 16
+      Top = 8
+      Width = 160
+      Step = 1
+      TabOrder = 0
+    end
+    object lLoad: TLabel
+      Left = 8
+      Height = 16
+      Top = 32
+      Width = 160
+      AutoSize = False
+      ParentColor = False
+    end
+  end
   object Splitter1: TSplitter
     Left = 518
     Height = 317
@@ -121,85 +200,6 @@ object MainForm: TMainForm
       end
     end
   end
-  object PanelMap: TPanel
-    Left = 0
-    Height = 317
-    Top = 34
-    Width = 518
-    Align = alClient
-    BevelOuter = bvNone
-    ClientHeight = 317
-    ClientWidth = 518
-    TabOrder = 1
-    object sbHorizontal: TScrollBar
-      Left = 0
-      Height = 16
-      Top = 301
-      Width = 518
-      Align = alBottom
-      LargeChange = 256
-      Max = 0
-      PageSize = 0
-      SmallChange = 16
-      TabOrder = 0
-      TabStop = False
-      OnScroll = sbHorizontalScroll
-    end
-    object sbVertical: TScrollBar
-      Left = 502
-      Height = 301
-      Top = 0
-      Width = 16
-      Align = alRight
-      Kind = sbVertical
-      LargeChange = 256
-      Max = 0
-      PageSize = 0
-      SmallChange = 16
-      TabOrder = 1
-      TabStop = False
-      OnScroll = sbVerticalScroll
-    end
-    object RenderPanel: TOpenGLControl
-      Left = 0
-      Height = 301
-      Top = 0
-      Width = 502
-      Align = alClient
-      AlphaBits = 8
-      OnMouseDown = RenderPanelMouseDown
-      OnMouseMove = RenderPanelMouseMove
-      OnMouseUp = RenderPanelMouseUp
-      OnPaint = RenderPanelPaint
-      OnResize = RenderPanelResize
-      object pLoadProgress: TPanel
-        Left = 142
-        Height = 49
-        Top = 94
-        Width = 185
-        ClientHeight = 49
-        ClientWidth = 185
-        TabOrder = 0
-        Visible = False
-        object lLoad: TLabel
-          Left = 6
-          Height = 13
-          Top = 30
-          Width = 169
-          AutoSize = False
-          ParentColor = False
-        end
-        object pbLoad: TProgressBar
-          Left = 6
-          Height = 16
-          Top = 6
-          Width = 169
-          Step = 1
-          TabOrder = 0
-        end
-      end
-    end
-  end
   object StatusBar: TStatusBar
     Left = 0
     Height = 15
@@ -227,7 +227,7 @@ object MainForm: TMainForm
     ClientHeight = 111
     ClientWidth = 672
     Constraints.MinHeight = 111
-    TabOrder = 3
+    TabOrder = 2
     object pcObjects: TPageControl
       Left = 2
       Height = 107
@@ -637,7 +637,7 @@ object MainForm: TMainForm
     ButtonWidth = 31
     Caption = 'MainToolBar'
     Images = ilToolbar
-    TabOrder = 4
+    TabOrder = 3
     object tbNewMap: TToolButton
       Left = 1
       Hint = 'Очистить карту'
@@ -746,8 +746,8 @@ object MainForm: TMainForm
     end
   end
   object OpenDialog: TOpenDialog
-    DefaultExt = '.dfz'
-    Filter = 'Карты Doom 2D: Forever (*.dfz, *.dfzip, *.zip, *.wad)|*.dfz;*.dfzip;*.zip;*.wad|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*'
+    DefaultExt = '.wad'
+    Filter = 'Карты Doom 2D: Forever (*.wad)|*.wad|Старые карты Doom 2D: Forever (*.ini)|*.ini|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofFileMustExist, ofEnableSizing, ofDontAddToRecent]
     Left = 32
     Top = 64
@@ -890,8 +890,8 @@ object MainForm: TMainForm
     }
   end
   object SaveDialog: TSaveDialog
-    DefaultExt = '.dfz'
-    Filter = 'Карты Doom 2D: Forever (*.dfz)|*.dfz|Карты Doom 2D: Forever (*.dfzip)|*.dfzip|Карты Doom 2D: Forever (*.zip)|*.zip|Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'
+    DefaultExt = '.wad'
+    Filter = 'Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'
     Options = [ofHideReadOnly, ofNoChangeDir, ofPathMustExist, ofNoReadOnlyReturn, ofEnableSizing, ofDontAddToRecent]
     Left = 64
     Top = 64
@@ -1064,7 +1064,7 @@ object MainForm: TMainForm
         OnClick = miSnapToGridClick
       end
       object miSwitchGrid: TMenuItem
-        Caption = 'Switch Grid Granularity'
+        Caption = 'Switch Grid Step'
         ImageIndex = 19
         ShortCut = 16453
         OnClick = miSwitchGridClick
@@ -1159,7 +1159,7 @@ object MainForm: TMainForm
         Caption = '-'
       end
       object miMiniMap: TMenuItem
-        Caption = 'Show Minimap'
+        Caption = 'Show Minimap Navigator'
         ImageIndex = 14
         ShortCut = 16471
         OnClick = miMiniMapClick