Changeset 75 for trunk/Forms/UFormNew.pas

Timestamp:

Oct 4, 2014, 11:33:16 PM (10 years ago)

Author:

chronos

Message:

• Added: New game option "Map shape" which can use image in file as base for map generation. Black color is used as void.
• Modified: New game dialog restructured to separate player, map and rules settings.

File:

• trunk/Forms/UFormNew.pas (modified) (13 diffs)

trunk/Forms/UFormNew.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Spin, ExtCtrls, ActnList, UGame;
+  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame;
 
 type
@@ -18 +18 @@
     APlayerModify: TAction;
     ActionList1: TActionList;
+    ButtonImageBrowse: TButton;
     ButtonCancel: TButton;
     ButtonOk: TButton;
@@ -23 +24 @@
     ButtonPlayerModify: TButton;
     ButtonPlayerRemove: TButton;
+    CheckBoxCity: TCheckBox;
     CheckBoxSymetricMap: TCheckBox;
-    CheckBoxCity: TCheckBox;
     CheckBoxVoid: TCheckBox;
     ComboBoxGridType: TComboBox;
+    ComboBoxMapShape: TComboBox;
     ComboBoxWinObjective: TComboBox;
+    EditImageFile: TEdit;
     Label1: TLabel;
     Label2: TLabel;
@@ -35 +38 @@
     Label6: TLabel;
     Label7: TLabel;
+    Label8: TLabel;
+    Label9: TLabel;
     ListView1: TListView;
-    Panel1: TPanel;
-    Panel2: TPanel;
+    MenuItem1: TMenuItem;
+    MenuItem2: TMenuItem;
+    MenuItem3: TMenuItem;
+    OpenPictureDialog1: TOpenPictureDialog;
+    PageControl1: TPageControl;
+    PopupMenu1: TPopupMenu;
     RadioGroupGrowAmount: TRadioGroup;
     RadioGroupGrowCells: TRadioGroup;
@@ -46 +55 @@
     SpinEditVoidPercent: TSpinEdit;
     Splitter1: TSplitter;
+    TabSheet1: TTabSheet;
+    TabSheet2: TTabSheet;
+    TabSheet3: TTabSheet;
     TrackBarSizeX: TTrackBar;
     TrackBarSizeY: TTrackBar;
@@ -51 +63 @@
     procedure APlayerModifyExecute(Sender: TObject);
     procedure APlayerRemoveExecute(Sender: TObject);
+    procedure ButtonImageBrowseClick(Sender: TObject);
     procedure CheckBoxCityChange(Sender: TObject);
     procedure CheckBoxVoidChange(Sender: TObject);
+    procedure ComboBoxMapShapeChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -103 +117 @@
   SGrowAmountByOne = 'By one';
   SGrowAmountBySquareRoot = 'By square root';
-
+  SRectangular = 'Rectangular';
+  SFromImageFile = 'From image file';
 
 { TFormNew }
@@ -185 +200 @@
     ItemIndex := LastIndex;
   end;
+  with ComboBoxMapShape do begin
+    LastIndex := ItemIndex;
+    Clear;
+    Items.Add(SRectangular);
+    Items.Add(SFromImageFile);
+    ItemIndex := LastIndex;
+  end;
   with RadioGroupGrowCells do begin
     LastIndex := ItemIndex;
@@ -209 +231 @@
   ButtonPlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListView1.Selected);
+  EditImageFile.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
+  ButtonImageBrowse.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
   Translate;
 end;
@@ -242 +266 @@
 begin
   SpinEditVoidPercent.Enabled := CheckBoxVoid.Checked;
+end;
+
+procedure TFormNew.ComboBoxMapShapeChange(Sender: TObject);
+begin
+  ReloadView;
 end;
 
@@ -260 +289 @@
     Players.Remove(ListView1.Selected.Data);
     ReloadView;
+  end;
+end;
+
+procedure TFormNew.ButtonImageBrowseClick(Sender: TObject);
+begin
+  OpenPictureDialog1.FileName := EditImageFile.Text;
+  if OpenPictureDialog1.Execute then begin
+    EditImageFile.Text := OpenPictureDialog1.FileName;
   end;
 end;
@@ -309 +346 @@
   ComboBoxWinObjective.ItemIndex := Integer(Game.WinObjective);
   SpinEditNeutralUnits.Value := Game.MaxNeutralUnits;
+  ComboBoxMapShape.ItemIndex := Integer(Game.Map.Shape);
+  EditImageFile.Text := Game.MapImageFileName;
 end;
 
@@ -334 +373 @@
   Game.WinObjective := TWinObjective(ComboBoxWinObjective.ItemIndex);
   Game.MaxNeutralUnits := SpinEditNeutralUnits.Value;
+  Game.Map.Shape := TMapShape(ComboBoxMapShape.ItemIndex);
+  Game.MapImageFileName := EditImageFile.Text;
 end;