Changeset 340 for trunk

Timestamp:

Apr 2, 2021, 9:09:49 PM (4 years ago)

Author:

chronos

Message:

• Added: Support for F11 full screen switch key in Start dialog.
• Fixed: Allow F1 and F11 key in Start dialog even if listbox is focused.
• Modified: Code cleanup.

Location:

trunk

Files:

• Back.pas (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (2 diffs)
• LocalPlayer/Enhance.pas (modified) (6 diffs)
• LocalPlayer/Nego.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (2 diffs)
• Packages/CevoComponents/BaseWin.pas (modified) (3 diffs)
• Start.lfm (modified) (1 diff)
• Start.pas (modified) (2 diffs)

trunk/Back.pas

@@ -75 +75 @@
   end else begin
     WindowState := wsNormal;
+    WindowState := wsFullScreen;
+    WindowState := wsNormal;
     BoundsRect := Bounds(StartDlg.Left - 8, StartDlg.Top - 8,
       StartDlg.Width + 16, StartDlg.Height + 16);

trunk/LocalPlayer/Diagram.pas

@@ -355 +355 @@
       end;
     Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
-  end
+  end;
 end;
 
@@ -370 +370 @@
   else if (Key = VK_F8) and (Kind = dkShip) then // my other key
   else
-    inherited
+    inherited;
 end;
 

trunk/LocalPlayer/Enhance.pas

@@ -48 +48 @@
   EnhanceDlg: TEnhanceDlg;
 
+
 implementation
 
 uses
-  Help;
+  Help, UKeyBindings;
 
 {$R *.lfm}
@@ -231 +232 @@
         Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
-      inc(x, xxt * 2 + 6)
+      inc(x, xxt * 2 + 6);
     end;
   end;
@@ -302 +303 @@
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -317 +318 @@
 begin
   Page := TComponent(Sender).Tag;
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 
@@ -337 +338 @@
           move(MyData.EnhancementJobs[Page, stage + 1],
             MyData.EnhancementJobs[Page, stage], 4 - stage);
-        MyData.EnhancementJobs[Page, 4] := jNone
+        MyData.EnhancementJobs[Page, 4] := jNone;
       end
       else
@@ -364 +365 @@
     begin
       MyData.EnhancementJobs[Page, stage] := jRoad;
-      inc(stage)
+      inc(stage);
     end;
     if (NewJob = jFarm) and not(jIrr in Done) then
     begin
       MyData.EnhancementJobs[Page, stage] := jIrr;
-      inc(stage)
-    end;
-    MyData.EnhancementJobs[Page, stage] := NewJob
-  end;
-  SmartUpdateContent
+      inc(stage);
+    end;
+    MyData.EnhancementJobs[Page, stage] := NewJob;
+  end;
+  SmartUpdateContent;
 end;
 
 procedure TEnhanceDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
-begin
-  if Key = VK_F1 then
+var
+  ShortCut: TShortCut;
+begin
+  ShortCut := KeyToShortCut(Key, Shift);
+  if BHelp.Test(ShortCut) then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
       HelpDlg.TextIndex('MACRO'))

trunk/LocalPlayer/Nego.pas

@@ -681 +681 @@
 procedure TNegoDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -690 +690 @@
   begin
     if OkBtn.Visible then
-      OkBtnClick(nil)
+      OkBtnClick(nil);
   end
   else
-    inherited
+    inherited;
 end;
 

trunk/LocalPlayer/Select.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
-
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
@@ -85 +84 @@
   ListDlg: TListDlg;
   ModalSelectDlg: TModalSelectDlg;
+
 
 implementation

trunk/Packages/CevoComponents/BaseWin.pas

@@ -87 +87 @@
 end;
 
-
 constructor TBufferedDrawDlg.Create(AOwner: TComponent);
 begin
@@ -112 +111 @@
 procedure TBufferedDrawDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  if FWindowMode = wmPersistent then
-  begin
+  if FWindowMode = wmPersistent then begin
     UserLeft := Left;
-    UserTop := Top
+    UserTop := Top;
   end;
   if OffscreenUser = self then
@@ -131 +129 @@
   Shift: TShiftState);
 begin
-  if Key = VK_ESCAPE then
-  begin
+  if Key = VK_ESCAPE then begin
     if fsModal in FormState then
-      ModalResult := mrCancel
-  end
-  else if Key = VK_RETURN then
-  begin
+      ModalResult := mrCancel;
+  end else
+  if Key = VK_RETURN then begin
     if fsModal in FormState then
-      ModalResult := mrOK
-  end
-  else if Key = VK_F1 then begin
+      ModalResult := mrOK;
+  end else
+  if Key = VK_F1 then begin
     if Assigned(ShowNewContentProc) then
       ShowNewContentProc(FWindowMode or wmPersistent, HelpContext);
-  end else if FWindowMode = wmPersistent then begin
+  end else
+  if FWindowMode = wmPersistent then begin
     if Assigned(MainFormKeyDown) then
       MainFormKeyDown(Sender, Key, Shift);

trunk/Start.lfm

@@ -196 +196 @@
     ItemHeight = 0
     OnClick = ListClick
+    OnKeyDown = FormKeyDown
     ParentFont = False
     ScrollWidth = 266

trunk/Start.pas

@@ -143 +143 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UKeyBindings;
 
 {$R *.lfm}
@@ -1742 +1742 @@
 procedure TStartDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
-begin
-  if KeyToShortCut(Key, Shift) = VK_F1 then
+var
+  ShortCut: TShortCut;
+begin
+  ShortCut := KeyToShortCut(Key, Shift);
+  if BFullScreen.Test(ShortCut) then begin
+    FullScreen := not FullScreen;
+    UpdateInterface;
+    Background.UpdateInterface;
+  end else
+  if BHelp.Test(ShortCut) then
     DirectHelp(cStartHelp);
 end;