Changeset 111 for trunk/Forms

Timestamp:

Nov 27, 2016, 2:34:31 PM (8 years ago)

Author:

chronos

Message:

• Modified: Changed debian packages configuration files to support build on Launchpad.
• Fixed: Wrong zoom calculation in some case.
• Fixed: Set configuration file name explicitly.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (4 diffs)
• UFormMain.pas (modified) (2 diffs)

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 591
+  ClientHeight = 589
   ClientWidth = 775
   Menu = MainMenu1
@@ -14 +14 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.6.0.4'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
     Height = 28
-    Top = 563
+    Top = 561
     Width = 775
     Panels = <    
@@ -35 +35 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 563
+    Height = 561
     Top = 0
     Width = 80
@@ -118 +118 @@
   object PaintBox1: TPaintBox
     Left = 80
-    Height = 563
+    Height = 561
     Top = 0
     Width = 695

trunk/Forms/UFormMain.pas

@@ -257 +257 @@
     if Factor.X < Factor.Y then NewZoom := Factor.X
       else NewZoom := Factor.Y;
-    //if NewZoom <> 0 then
+    if NewZoom = 0 then NewZoom := 1;
     Zoom := NewZoom;
     CenterMap;
@@ -330 +330 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
+  Core.XMLConfig1.Filename := 'Config.xml';
   LoadConfig(Core.XMLConfig1, 'FormMain');
   Core.PersistentForm.Load(Self, True);