Changeset 613 for trunk

Timestamp:

Sep 14, 2024, 11:02:08 AM (2 months ago)

Author:

chronos

Message:

• Added: Allow to rename city with mouse right click on city caption in City screen.
• Fixed: Do not overflow city name text in City screen.
• Fixed: Repaint main screen after city and unit rename.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (8 diffs)
• Diplomacy.pas (modified) (9 diffs)
• Select.pas (modified) (4 diffs)
• Term.pas (modified) (4 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -144 +144 @@
   hZoomMap = 124;
   wZoomEnvironment = 68;
+  CaptionX = 42;
+  CaptionY = 7;
 
   ImpPosition: array [28 .. nImp - 1] of Integer = (
@@ -408 +410 @@
     begin
       Assert(cix < 0);
-      Exit
+      Exit;
     end;
     Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
@@ -444 +446 @@
   end;
 var
-  Line, MessageCount: Integer;
+  Line: Integer;
+  MessageCount: Integer;
 
   procedure CheckMessage(Flag: Integer);
@@ -472 +475 @@
 
       S := CityEventName(I);
-      { if Flag=chNoGrowthWarning then
-        if C.Built[imAqueduct]=0 then
-        S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-        else S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
+      { if Flag = chNoGrowthWarning then
+        if C.Built[imAqueduct] = 0 then
+        S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imAqueduct)])
+        else S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imSewer)]); }
       RisedTextOut(Offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
         16 * Line, S);
@@ -528 +531 @@
   BitBltBitmap(Offscreen, 0, 0, 640, 480, Back, 0, 0);
 
+  // Show city size and name
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextOut(Offscreen.Canvas, 42, 7, Caption);
-  with Offscreen.Canvas do
-  begin // city size
+
+  S := Caption;
+  J := Offscreen.Canvas.TextWidth('...');
+  if (Length(S) > 1) and (Offscreen.Canvas.TextWidth(S) > PrevCityBtn.Left - CaptionX) then begin
+    while (Length(S) > 1) and (Offscreen.Canvas.TextWidth(S) > PrevCityBtn.Left - CaptionX - J) do
+      SetLength(S, Length(S) - 1);
+    S := S + '...';
+  end;
+
+  RisedTextOut(Offscreen.Canvas, CaptionX, CaptionY, S);
+  with Offscreen.Canvas do begin // city size
     Brush.Color := $000000;
     FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
@@ -1161 +1173 @@
     Exit; // Not an own city
 
+  if (ssRight in Shift) then begin
+    // Allow to rename city with right mouse click
+    if (X >= CaptionX) and (Y >= CaptionY) and (X <= PrevCityBtn.Left) and
+    (Y <= NextCityBtn.Top + NextCityBtn.Height) then
+    if Term.MainScreen.ListDlg.RenameCity(cix) then begin
+      SmartUpdateContent;
+      Term.MainScreen.RepaintAll;
+    end;
+  end else
   if (ssLeft in Shift) then
     if (ClientMode < scContact) and (X >= xView) and (Y >= yView) and
@@ -1249 +1270 @@
                     ShowModal;
                     if ModalResult <> mrOK then
-                      iix := -1
+                      iix := -1;
                   end
                   else
@@ -1270 +1291 @@
                     ShowModal;
                     if ModalResult <> mrOK then
-                      iix := -1
+                      iix := -1;
                   end;
                   if iix >= 0 then

trunk/LocalPlayer/Diplomacy.pas

@@ -29 +29 @@
         Result := Tribe[P].TPhrase('PRICE_MAP');
       opTreaty:
-        { if Price-opTreaty<Treaty then
+        { if Price - opTreaty < Treaty then
           case Treaty of
-          trPeace: Result:=Phrases.Lookup('FRENDTREATY_PEACE');
-          trFriendlyContact: Result:=Phrases.Lookup('FRENDTREATY_FRIENDLY');
-          trAlliance: Result:=Phrases.Lookup('FRENDTREATY_ALLIANCE');
+            trPeace: Result := Phrases.Lookup('FRENDTREATY_PEACE');
+            trFriendlyContact: Result := Phrases.Lookup('FRENDTREATY_FRIENDLY');
+            trAlliance: Result := Phrases.Lookup('FRENDTREATY_ALLIANCE');
           end
           else } Result := Phrases.Lookup('TREATY', Price - opTreaty);
@@ -61 +61 @@
         Result := Tribe[P].TPhrase('PRICE_ALLMODEL');
       { opCity:
-        Result:=Format(TPhrase('PRICE_CITY',P),[CityName(Price-opCity)]); }
-    end
+        Result := Format(TPhrase('PRICE_CITY', P), [CityName(Price - opCity)]); }
+    end;
   end;
 
@@ -92 +92 @@
           (Integer(OppOffer.Price[0] - opTreaty) > Treaty) then
         // simple treaty offer
-          { if OppOffer.Price[0]-opTreaty=trCeaseFire then
-            Result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
+          { if OppOffer.Price[0] - opTreaty = trCeaseFire then
+            Result := Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
             else } Result := Tribe[pTarget].TPhrase('FRACCEPTTREATY')
         else if OppOffer.nDeliver = 0 then
@@ -132 +132 @@
             sDeliver := sAdd
           else
-            sDeliver := Format(Phrases.Lookup('PRICE_CONCAT'), [sDeliver, sAdd])
+            sDeliver := Format(Phrases.Lookup('PRICE_CONCAT'), [sDeliver, sAdd]);
         end;
         sCost := '';
@@ -141 +141 @@
             sCost := sAdd
           else
-            sCost := Format(Phrases.Lookup('PRICE_CONCAT'), [sCost, sAdd])
+            sCost := Format(Phrases.Lookup('PRICE_CONCAT'), [sCost, sAdd]);
         end;
 
@@ -167 +167 @@
             end;
             Result := Result + Phrases.Lookup('FRDONE');
-            DoIntro := False
-          end
+            DoIntro := False;
+          end;
         end
         else if (Offer.nDeliver + Offer.nCost = 1) and
@@ -183 +183 @@
             trAlliance:
               Result := Result + Tribe[pTarget].TPhrase('FRALLIANCE');
-          end
+          end;
         end
         else if Offer.nDeliver = 0 then // demand
@@ -196 +196 @@
             Result := Result +
               Format(Tribe[pTarget].TPhrase('FRDEMAND_STRONG'), [sCost]);
-            DoIntro := False
-          end
+            DoIntro := False;
+          end;
         end
         else if Offer.nCost = 0 then // present
@@ -216 +216 @@
       Result := Tribe[pSender].TPhrase('FRSTART_NOTREATY') + ' ' + Result
     else
-      Result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + Result
+      Result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + Result;
 end;
 

trunk/LocalPlayer/Select.pas

@@ -69 +69 @@
     procedure InitLines;
     procedure Line(ca: TCanvas; L: Integer; NonText, lit: Boolean);
-    function RenameCity(cix: Integer): Boolean;
     function RenameModel(mix: Integer): Boolean;
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
@@ -75 +74 @@
   public
     Result: Integer;
+    function RenameCity(cix: Integer): Boolean;
     function OnlyChoice(TestKind: TListKind): Integer;
     // -2=empty, -1=ambiguous, other=only choice
@@ -248 +248 @@
   if ScrollBar.Position + L >= FirstShrinkedLine[Layer] then
     ofs := (ScrollBar.Position + L - FirstShrinkedLine[Layer]) and 1 * 33
-  else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
+  else { if FirstShrinkedLine[Layer] < Lines[Layer] then }
     ofs := 33;
 
@@ -973 +973 @@
       case Kind of
         kCities, kCityEvents:
-          if RenameCity(lix) then
+          if RenameCity(lix) then begin
             SmartUpdateContent;
+            Term.MainScreen.RepaintAll;
+          end;
         kModels:
-          if RenameModel(lix) then
+          if RenameModel(lix) then begin
             SmartUpdateContent;
+            Term.MainScreen.RepaintAll;
+          end;
       end;
   end;

trunk/LocalPlayer/Term.pas

@@ -442 +442 @@
     procedure UpdateViews(UpdateCityScreen: Boolean = False);
     function ContactRefused(P: Integer; Item: String): Boolean;
+    procedure RepaintAll;
     // Forms
     property WondersDlg: TWondersDlg read GetWondersDlg;
@@ -4406 +4407 @@
                 MessgText := Format(Phrases.Lookup(MsgItem), [CityName(ID)]);
                 Kind := mkYesNo;
-                // BigIcon:=29;
+                // BigIcon := 29;
                 ShowModal;
                 Zoom := ModalResult <> mrOK;
@@ -4787 +4788 @@
   MiniMapPaint;
   PanelPaint;
+end;
+
+procedure TMainScreen.RepaintAll;
+begin
+  RectInvalidate(0, TopBarHeight, Width, TopBarHeight + MapHeight);
+  MapValid := False;
+  PaintAll;
 end;
 
@@ -8378 +8386 @@
   ManagementArea.Top := TopBarHeight + MapHeight - Overlap + yPalace;
   ArrangeMidPanel;
-  if RepaintOnResize then begin
-    RectInvalidate(0, TopBarHeight, Width, TopBarHeight + MapHeight);
-    MapValid := False;
-    PaintAll;
-  end;
+  if RepaintOnResize then RepaintAll;
 end;