- Merged changes from Turley (elevate with random altitude)

- Rearranged the TfrmElevateSettings dialog - Fixed transparency settings of the images in the TfrmLogin dialog - Fixed TfrmRegionControl to not react on mouse clicks if no region is selected - Updated Vampyre Imaging Lib to recent SVN - Added missing cedserver_config_2_3 project file
2008-08-29 12:09:26 +02:00
parent fcb7c8a794
commit 0e841f864d
24 changed files with 3203 additions and 1896 deletions
--- a/Client/Tools/UfrmElevateSettings.lfm
+++ b/Client/Tools/UfrmElevateSettings.lfm
@@ -1,61 +1,120 @@
 object frmElevateSettings: TfrmElevateSettings
  Left = 290
-  Height = 65
+  Height = 115
  Top = 171
-  Width = 131
-  HorzScrollBar.Page = 130
+  Width = 231
+  HorzScrollBar.Page = 230
  HorzScrollBar.Range = 122
-  VertScrollBar.Page = 64
+  VertScrollBar.Page = 114
  VertScrollBar.Range = 59
  ActiveControl = rbRaise
  AutoScroll = False
  BorderIcons = []
  BorderStyle = bsToolWindow
  Caption = 'Elevate'
-  ClientHeight = 65
-  ClientWidth = 131
+  ClientHeight = 115
+  ClientWidth = 231
  Font.Height = -11
  OnClose = FormClose
  OnDeactivate = FormDeactivate
  LCLVersion = '0.9.25'
-  object rbRaise: TRadioButton
+  object Panel1: TPanel
    Left = 8
-    Height = 21
+    Height = 67
    Top = 8
-    Width = 58
-    Caption = 'Raise'
-    Checked = True
-    ParentFont = True
-    State = cbChecked
+    Width = 215
+    Align = alTop
+    BorderSpacing.Around = 8
+    BevelOuter = bvNone
+    ClientHeight = 67
+    ClientWidth = 215
    TabOrder = 0
+    object Panel2: TPanel
+      Height = 67
+      Width = 162
+      Align = alClient
+      BevelOuter = bvNone
+      ClientHeight = 67
+      ClientWidth = 162
+      ParentFont = True
+      TabOrder = 0
+      object rbRaise: TRadioButton
+        Height = 21
+        Width = 162
+        Align = alTop
+        Caption = 'Raise'
+        Checked = True
+        State = cbChecked
+        TabOrder = 2
+      end
+      object rbLower: TRadioButton
+        Height = 21
+        Top = 21
+        Width = 162
+        Align = alTop
+        Caption = 'Lower'
+        ParentFont = True
+        TabOrder = 0
+      end
+      object rbSet: TRadioButton
+        Height = 21
+        Top = 42
+        Width = 162
+        Align = alTop
+        Caption = 'Set'
+        ParentFont = True
+        TabOrder = 1
+      end
+    end
+    object Panel3: TPanel
+      Left = 162
+      Height = 67
+      Width = 53
+      Align = alRight
+      BevelOuter = bvNone
+      ClientHeight = 67
+      ClientWidth = 53
+      TabOrder = 1
+      object seZ: TSpinEdit
+        Left = 7
+        Height = 23
+        Top = 20
+        Width = 47
+        MaxValue = 127
+        MinValue = -128
+        ParentFont = True
+        TabOrder = 0
+        Value = 1
+      end
+    end
  end
-  object rbLower: TRadioButton
+  object Panel4: TPanel
    Left = 8
-    Height = 21
-    Top = 24
-    Width = 59
-    Caption = 'Lower'
-    ParentFont = True
-    TabOrder = 1
-  end
-  object seZ: TSpinEdit
-    Left = 72
    Height = 23
-    Top = 22
-    Width = 50
-    MaxValue = 127
-    MinValue = -128
-    ParentFont = True
-    TabOrder = 3
-    Value = 1
-  end
-  object rbSet: TRadioButton
-    Left = 8
-    Height = 21
-    Top = 40
-    Width = 43
-    Caption = 'Set'
-    ParentFont = True
-    TabOrder = 2
+    Top = 83
+    Width = 215
+    Align = alTop
+    BorderSpacing.Around = 8
+    BevelOuter = bvNone
+    ClientHeight = 23
+    ClientWidth = 215
+    TabOrder = 1
+    object cbRandomHeight: TCheckBox
+      Height = 23
+      Width = 168
+      Align = alClient
+      Caption = 'Add Random Altitude'
+      ParentFont = True
+      TabOrder = 0
+    end
+    object seRandomHeight: TSpinEdit
+      Left = 168
+      Height = 23
+      Width = 47
+      Align = alRight
+      OnChange = seRandomHeightChange
+      ParentFont = True
+      TabOrder = 1
+    end
  end
 end
--- a/Client/Tools/UfrmElevateSettings.pas
+++ b/Client/Tools/UfrmElevateSettings.pas
@@ -1,81 +1,93 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2007 Andreas Schneider
- *)
-unit UfrmElevateSettings;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, LMessages,
-  LCLIntf, StdCtrls, Spin;
-
-type
-
-  { TfrmElevateSettings }
-
-  TfrmElevateSettings = class(TForm)
-    rbSet: TRadioButton;
-    rbRaise: TRadioButton;
-    rbLower: TRadioButton;
-    seZ: TSpinEdit;
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormDeactivate(Sender: TObject);
-  protected
-    procedure MouseLeave(var msg: TLMessage); message CM_MouseLeave;
-  public
-    { public declarations }
-  end; 
-
-var
-  frmElevateSettings: TfrmElevateSettings;
-
-implementation
-
-{ TfrmElevateSettings }
-
-procedure TfrmElevateSettings.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  CloseAction := caHide;
-end;
-
-procedure TfrmElevateSettings.FormDeactivate(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TfrmElevateSettings.MouseLeave(var msg: TLMessage);
-begin
-  if not PtInRect(ClientRect, ScreenToClient(Mouse.CursorPos)) then
-    Close;
-end;
-
-initialization
-  {$I UfrmElevateSettings.lrs}
-
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2008 Andreas Schneider
+ *)
+unit UfrmElevateSettings;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, LMessages,
+  LCLIntf, StdCtrls, Spin, ExtCtrls;
+
+type
+
+  { TfrmElevateSettings }
+
+  TfrmElevateSettings = class(TForm)
+    cbRandomHeight: TCheckBox;
+    Panel1: TPanel;
+    Panel2: TPanel;
+    Panel3: TPanel;
+    Panel4: TPanel;
+    rbRaise: TRadioButton;
+    rbLower: TRadioButton;
+    rbSet: TRadioButton;
+    seRandomHeight: TSpinEdit;
+    seZ: TSpinEdit;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormDeactivate(Sender: TObject);
+    procedure seRandomHeightChange(Sender: TObject);
+  protected
+    procedure MouseLeave(var msg: TLMessage); message CM_MouseLeave;
+  public
+    { public declarations }
+  end; 
+
+var
+  frmElevateSettings: TfrmElevateSettings;
+
+implementation
+
+{ TfrmElevateSettings }
+
+procedure TfrmElevateSettings.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  CloseAction := caHide;
+end;
+
+procedure TfrmElevateSettings.FormDeactivate(Sender: TObject);
+begin
+  Close;
+end;
+
+procedure TfrmElevateSettings.seRandomHeightChange(Sender: TObject);
+begin
+  cbRandomHeight.Checked := True;
+end;
+
+procedure TfrmElevateSettings.MouseLeave(var msg: TLMessage);
+begin
+  if not PtInRect(ClientRect, ScreenToClient(Mouse.CursorPos)) then
+    Close;
+end;
+
+initialization
+  {$I UfrmElevateSettings.lrs}
+
+end.
+