Changeset 303 for branches/highdpi/Start.pas

Timestamp:

Mar 9, 2021, 9:19:49 AM (4 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/Start.pas (modified) (19 diffs)

branches/highdpi/Start.pas

@@ -48 +48 @@
     Bitmap: TDpiBitmap; { game world sample preview }
     Size: TPoint;
-    Colors: array [0 .. $1f, 0 .. 1] of TColor;
+    Colors: array [0 .. 11, 0 .. 1] of TColor;
     Mode: TMiniMode;
     procedure LoadFromLogFile(FileName: string; var LastTurn: Integer);
@@ -143 +143 @@
     DefaultAI: string;
     MiniMap: TMiniMap;
+    LastGame: string;
     procedure DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
     procedure InitPopup(PlayerIndex: Integer);
@@ -165 +166 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Locale, UPixelPointer;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer;
 
 {$R *.lfm}
@@ -241 +242 @@
 begin
   FreeAndNil(Bitmap);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -297 +298 @@
   ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + '.png';
   Mode := mmPicture;
-  if LoadGraphicFile(Bitmap, ImageFileName, gfNoError) then
+  if LoadGraphicFile(Bitmap, ImageFileName, [gfNoError]) then
   begin
     if Bitmap.width div 2 > MaxWidthMapLogo then
@@ -461 +462 @@
       Brains.GetByKind(btAI, AIBrains);
       BrainDefault := Brains[0];
-      AIBrains.Free;
+      FreeAndNil(AIBrains);
     end; // default AI not found, use any
 
@@ -536 +537 @@
   FormerGames := TStringList.Create;
   UpdateFormerGames;
-  ShowTab := tbNew; // always start with new book page
   MapFileName := '';
   Maps := TStringList.Create;
@@ -616 +616 @@
     if ValueExists('AutoDiff') then AutoDiff := Reg.ReadInteger('AutoDiff')
       else AutoDiff := 1;
+    if ValueExists('StartTab') then ShowTab := TStartTab(Reg.ReadInteger('StartTab'))
+       else ShowTab := tbNew;
+    if ValueExists('LastGame') then LastGame := Reg.ReadString('LastGame')
+       else LastGame := '';
 
     if ValueExists('ScreenMode') then
@@ -656 +660 @@
       else WriteInteger('ScreenMode', 0);
     WriteInteger('MultiControl', MultiControl);
+    WriteInteger('StartTab', Integer(ShowTab));
+    WriteString('LastGame', LastGame);
   finally
     Free;
@@ -671 +677 @@
   with AIBrains[I] do begin
     if not LoadGraphicFile(AIBrains[i].Picture, GetAiDir + DirectorySeparator +
-      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
+      FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
       with AIBrains[i].Picture.Canvas do begin
         Brush.Color := $904830;
@@ -683 +689 @@
     end;
   end;
-  AIBrains.Free;
+  FreeAndNil(AIBrains);
 end;
 
@@ -1396 +1402 @@
       if AIBrains[I].Flags and fMultiple <> 0 then
         OfferBrain(AIBrains[I], FixedLines);
-    AIBrains.Free;
+    FreeAndNil(AIBrains);
   end else begin
     FixedLines := 0;
@@ -1424 +1430 @@
           or (Brains[I] = PlayersBrain[PlayerPopupIndex]) then
           OfferBrain(AIBrains[i], FixedLines);
-      AIBrains.Free;
+      FreeAndNil(AIBrains);
     end;
   end;
@@ -1444 +1450 @@
     until FindNext(F) <> 0;
   FindClose(F);
-  ListIndex[tbNew] := FormerGames.Count - 1;
-  if (ShowTab = tbNew) and (FormerGames.Count > 0) then
-    ShowTab := tbPrevious;
+  I := FormerGames.IndexOf(LastGame);
+  if I >= 0 then ListIndex[tbPrevious] := I
+    else ListIndex[tbPrevious] := FormerGames.Count - 1;
   TurnValid := False;
 end;
@@ -1608 +1614 @@
   if Tab <> tbNew then
     if List.Count > 0 then begin
-      if (ListIndex[Tab] < List.Count) and (ListIndex[Tab] >= 0) then
-        List.ItemIndex := ListIndex[Tab]
-        else List.ItemIndex := 0;
+      if (ListIndex[Tab] < List.Count) and (ListIndex[Tab] >= 0) then begin
+        List.ItemIndex := ListIndex[Tab];
+      end else List.ItemIndex := 0;
     end else List.ItemIndex := -1;
   case Tab of
@@ -1650 +1656 @@
       maConfig:
         begin
-          LocaleDlg := TLocaleDlg.Create(nil);
-          if LocaleDlg.ShowModal = mrOk then begin
+          SettingsDlg := TSettingsDlg.Create(nil);
+          if SettingsDlg.ShowModal = mrOk then begin
             LoadAssets;
             Invalidate;
@@ -1657 +1663 @@
             Background.UpdateInterface;
           end;
-          FreeAndNil(LocaleDlg);
+          FreeAndNil(SettingsDlg);
         end;
       maManual:
@@ -1953 +1959 @@
   ShowTab := Tab;
   Background.Enabled := True;
+  LastGame := FormerGames[ListIndex[tbPrevious]];
 end;
 
@@ -1963 +1970 @@
   Shift: TShiftState);
 begin
-  if (Shift = []) and (Key = VK_F1) then
+  if KeyToShortCut(Key, Shift) = VK_F1 then
     DirectHelp(cStartHelp);
 end;