Changeset 301 for trunk/Forms

Timestamp:

Jul 10, 2019, 11:35:10 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Corrected dimensions in About dialog.
• Removed: Old Player and Players forms replaced by general item list.

Location:

trunk/Forms

Files:

• UFormAbout.lfm (modified) (6 diffs)
• UFormAbout.lrj (modified) (1 diff)
• UFormAbout.pas (modified) (3 diffs)
• UFormList.lfm (modified) (4 diffs)
• UFormList.pas (modified) (3 diffs)
• UFormPlayer.lfm (deleted)
• UFormPlayer.lrj (deleted)
• UFormPlayer.pas (deleted)
• UFormPlayers.lfm (deleted)
• UFormPlayers.lrj (deleted)
• UFormPlayers.pas (deleted)

trunk/Forms/UFormAbout.lfm

@@ -1 +1 @@
 object FormAbout: TFormAbout
-  Left = 1014
-  Height = 448
-  Top = 442
-  Width = 705
+  Left = 868
+  Height = 402
+  Top = 565
+  Width = 720
   Caption = 'About'
-  ClientHeight = 448
-  ClientWidth = 705
-  DesignTimePPI = 120
+  ClientHeight = 402
+  ClientWidth = 720
+  DesignTimePPI = 144
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object LabelDescription: TLabel
-    Left = 25
-    Height = 40
-    Top = 137
-    Width = 655
+    Left = 30
+    Height = 24
+    Top = 134
+    Width = 660
     Align = alTop
-    BorderSpacing.Around = 25
-    Caption = 'Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules.'
+    BorderSpacing.Left = 30
+    BorderSpacing.Right = 30
+    BorderSpacing.Bottom = 30
+    Constraints.MinHeight = 24
     ParentColor = False
     ParentFont = False
@@ -25 +27 @@
   end
   object ButtonClose: TButton
-    Left = 564
-    Height = 31
-    Top = 398
-    Width = 116
+    Left = 551
+    Height = 37
+    Top = 342
+    Width = 139
     Anchors = [akRight, akBottom]
     Caption = 'Close'
@@ -36 +38 @@
   end
   object LabelContent: TLabel
-    Left = 25
-    Height = 20
-    Top = 202
-    Width = 655
+    Left = 30
+    Height = 26
+    Top = 188
+    Width = 660
     Align = alTop
-    BorderSpacing.Around = 25
+    BorderSpacing.Around = 30
     Caption = '   '
     ParentColor = False
@@ -47 +49 @@
   end
   object ButtonHomePage: TButton
-    Left = 20
-    Height = 31
-    Top = 398
-    Width = 220
+    Left = 24
+    Height = 37
+    Top = 342
+    Width = 264
     Anchors = [akLeft, akBottom]
     Caption = 'Home page'
@@ -59 +61 @@
   object Panel1: TPanel
     Left = 0
-    Height = 112
+    Height = 134
     Top = 0
-    Width = 705
+    Width = 720
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 112
-    ClientWidth = 705
+    ClientHeight = 134
+    ClientWidth = 720
     FullRepaint = False
     ParentFont = False
     TabOrder = 2
     object LabelAppName: TLabel
-      Left = 96
-      Height = 67
-      Top = 20
-      Width = 170
-      Align = alCustom
-      BorderSpacing.Around = 25
-      Caption = 'xTactics'
-      Font.Height = -50
+      Left = 130
+      Height = 100
+      Top = 30
+      Width = 560
+      Align = alTop
+      BorderSpacing.Left = 100
+      BorderSpacing.Around = 30
+      Constraints.MinHeight = 100
+      Font.Height = -60
       ParentColor = False
       ParentFont = False
@@ -83 +86 @@
     end
     object Image1: TImage
-      Left = 20
-      Height = 82
-      Top = 25
-      Width = 82
+      Left = 24
+      Height = 98
+      Top = 30
+      Width = 98
       Picture.Data = {
         1754506F727461626C654E6574776F726B47726170686963CF01000089504E47

trunk/Forms/UFormAbout.lrj

@@ -1 +1 @@
 {"version":1,"strings":[
 {"hash":4691652,"name":"tformabout.caption","sourcebytes":[65,98,111,117,116],"value":"About"},
-{"hash":120622558,"name":"tformabout.labeldescription.caption","sourcebytes":[84,117,114,110,45,98,97,115,101,100,32,115,116,114,97,116,101,103,121,32,103,97,109,101,32,105,110,115,112,105,114,101,100,32,98,121,32,99,108,97,115,115,105,99,32,82,105,115,107,32,98,111,97,114,100,32,103,97,109,101,46,32,84,104,101,32,103,97,109,101,32,105,115,32,104,105,103,104,108,121,32,99,111,110,102,105,103,117,114,97,98,108,101,32,116,111,32,97,108,108,111,119,32,116,111,32,97,100,106,117,115,116,32,98,97,116,116,108,101,32,102,105,101,108,100,32,97,110,100,32,103,97,109,101,32,114,117,108,101,115,46],"value":"Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules."},
 {"hash":4863637,"name":"tformabout.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
 {"hash":8736,"name":"tformabout.labelcontent.caption","sourcebytes":[32,32,32],"value":"   "},
-{"hash":58140853,"name":"tformabout.buttonhomepage.caption","sourcebytes":[72,111,109,101,32,112,97,103,101],"value":"Home page"},
-{"hash":175810675,"name":"tformabout.labelappname.caption","sourcebytes":[120,84,97,99,116,105,99,115],"value":"xTactics"}
+{"hash":58140853,"name":"tformabout.buttonhomepage.caption","sourcebytes":[72,111,109,101,32,112,97,103,101],"value":"Home page"}
 ]}

trunk/Forms/UFormAbout.pas

@@ -24 +24 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
-    { public declarations }
+    ApplicationInfo: TApplicationInfo;
   end;
 
@@ -50 +48 @@
 begin
   Core.ThemeManager1.UseTheme(Self);
-  with Core do begin
+  if Assigned(ApplicationInfo) then begin
     LabelAppName.Caption := ApplicationInfo.AppName;
     LabelContent.Caption := SVersion + ': ' + ApplicationInfo.Version + LineEnding +
       SReleaseDate + ': ' + DateToStr(ApplicationInfo.ReleaseDate) + LineEnding +
       SLicense + ': ' + ApplicationInfo.License;
+    LabelDescription.Caption := ApplicationInfo.Description;
   end;
 end;
@@ -60 +59 @@
 procedure TFormAbout.ButtonHomePageClick(Sender: TObject);
 begin
-  OpenWebPage(Core.ApplicationInfo.HomePage);
+  if Assigned(ApplicationInfo) then
+    OpenWebPage(ApplicationInfo.HomePage);
 end;
 

trunk/Forms/UFormList.lfm

@@ -35 +35 @@
     OnDblClick = AModifyExecute
     OnKeyPress = ListView1KeyPress
+    OnKeyUp = ListView1KeyUp
     OnSelectItem = ListView1SelectItem
   end
@@ -43 +44 @@
     Width = 480
     Align = alBottom
+    Images = Core.ImageListSmall
     ParentFont = False
     TabOrder = 1
@@ -67 +69 @@
   end
   object ActionList1: TActionList
+    Images = Core.ImageListSmall
     left = 208
     top = 163
@@ -96 +99 @@
   end
   object PopupMenu1: TPopupMenu
+    Images = Core.ImageListSmall
     left = 352
     top = 160

trunk/Forms/UFormList.pas

@@ -44 +44 @@
     procedure ListView1Data(Sender: TObject; Item: TListItem);
     procedure ListView1KeyPress(Sender: TObject; var Key: char);
+    procedure ListView1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
+      );
     procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
@@ -129 +131 @@
   FormItem := TFormItem.Create(Self);
   try
-    TempEntry.Name := SNew + ' ' + LowerCase(List.GetItemClass.GetClassName);
+    TempEntry.Name := List.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetItemClass.GetClassName));
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin
@@ -250 +252 @@
 end;
 
+procedure TFormList.ListView1KeyUp(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = 45 then AAdd.Execute;
+  if Key = 46 then ARemove.Execute;
+end;
+
 procedure TFormList.ListView1SelectItem(Sender: TObject;
   Item: TListItem; Selected: Boolean);