Changeset 94 for trunk

Timestamp:

Sep 27, 2022, 12:04:27 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Night and day state in clock.
• Fixed: Translation of short days of weeks names.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (3 diffs)
• Languages/BigMetro.cs.po (modified) (1 diff)
• Languages/BigMetro.de.po (modified) (1 diff)
• Languages/BigMetro.fr.po (modified) (1 diff)
• Languages/BigMetro.pot (modified) (1 diff)
• Packages/Common/UPixelPointer.pas (modified) (1 diff)
• UEngine.pas (modified) (4 diffs)

trunk/Forms/UFormMain.lfm

@@ -40 +40 @@
   object Translator1: TTranslator
     POFilesFolder = 'Languages'
+    OnTranslate = Translator1Translate
     Left = 496
     Top = 358

trunk/Forms/UFormMain.pas

@@ -38 +38 @@
     procedure PaintBox1Resize(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
+    procedure Translator1Translate(Sender: TObject);
   private
     Initialized: Boolean;
@@ -62 +63 @@
   UFormImages, UPixelPointer;
 
+resourcestring
+  SMondayShort = 'MON';
+  STuesdayShort = 'TUE';
+  SWednesdayShort = 'WED';
+  SThrusdayShort = 'THU';
+  SFridayShort = 'FRI';
+  SSaturdayShort = 'SAT';
+  SSundayShort = 'SUN';
+
 { TFormMain }
 
@@ -177 +187 @@
   if Engine.RedrawPending then
     PaintBox1.Repaint;
+end;
+
+procedure TFormMain.Translator1Translate(Sender: TObject);
+begin
+  FormatSettings.ShortDayNames[1] := SSundayShort;
+  FormatSettings.ShortDayNames[2] := SMondayShort;
+  FormatSettings.ShortDayNames[3] := STuesdayShort;
+  FormatSettings.ShortDayNames[4] := SWednesdayShort;
+  FormatSettings.ShortDayNames[5] := SThrusdayShort;
+  FormatSettings.ShortDayNames[6] := SFridayShort;
+  FormatSettings.ShortDayNames[7] := SSaturdayShort;
 end;
 

trunk/Languages/BigMetro.cs.po

@@ -83 +83 @@
 msgstr "Tokyo"
 
+#: uformmain.sfridayshort
+msgid "FRI"
+msgstr "Pá"
+
+#: uformmain.smondayshort
+msgid "MON"
+msgstr "Po"
+
+#: uformmain.ssaturdayshort
+msgid "SAT"
+msgstr "So"
+
+#: uformmain.ssundayshort
+msgid "SUN"
+msgstr "Ne"
+
+#: uformmain.sthrusdayshort
+msgid "THU"
+msgstr "Čt"
+
+#: uformmain.stuesdayshort
+msgid "TUE"
+msgstr "Út"
+
+#: uformmain.swednesdayshort
+msgid "WED"
+msgstr "St"
+
 #: umenu.sautomatic
 msgid "Automatic"

trunk/Languages/BigMetro.de.po

@@ -83 +83 @@
 msgstr ""
 
+#: uformmain.sfridayshort
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgid "WED"
+msgstr ""
+
 #: umenu.sautomatic
 msgid "Automatic"

trunk/Languages/BigMetro.fr.po

@@ -83 +83 @@
 msgstr ""
 
+#: uformmain.sfridayshort
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgid "WED"
+msgstr ""
+
 #: umenu.sautomatic
 msgid "Automatic"

trunk/Languages/BigMetro.pot

@@ -71 +71 @@
 #: uengine.stokyo
 msgid "Tokyo"
+msgstr ""
+
+#: uformmain.sfridayshort
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgid "WED"
 msgstr ""
 

trunk/Packages/Common/UPixelPointer.pas

@@ -310 +310 @@
 end;
 
-
 end.
 

trunk/UEngine.pas

@@ -187 +187 @@
     procedure DrawTrains(Canvas: TCanvas);
     procedure DrawGameOver(Canvas: TCanvas; CanvasSize: TPoint);
+    procedure DrawNewTrain(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawStationPassengerOverload(Canvas: TCanvas);
     procedure DrawLines(Canvas: TCanvas);
@@ -1834 +1835 @@
   ClockSize = 20;
 begin
+  if (Time / OneHour > 6) and (Time / OneHour < 18) then begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := Colors.Background;
+  end else begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := Colors.Text;
+  end;
   Canvas.Pen.Style := psSolid;
   Canvas.Pen.Color := Colors.Text;
@@ -1840 +1848 @@
   Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
   Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
+  Canvas.Brush.Style := bsClear;
+
+  if (Time / OneHour > 6) and (Time / OneHour < 18) then begin
+    Canvas.Pen.Color := Colors.Text;
+  end else begin
+    Canvas.Pen.Color := Colors.Background;
+  end;
   Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
     ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
   for I := 0 to 12 do begin
     Angle := I / 12 * 2 * Pi;
-    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8),
+    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.7),
+      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.7),
       ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.9),
       ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
   end;
-  Y := ClockCenter.Y + ScaleY(5, 96);
-
+  Y := ClockCenter.Y;
+
+  Canvas.Pen.Color := Colors.Text;
   Canvas.Font.Color := Colors.Text;
   Text := FormatDateTime('ddd', Time + 2);
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10,
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
     Y - Canvas.TextHeight(Text) div 2, Text);
-  Y := Y + Canvas.TextHeight(Text)  + ScaleY(5, 96);
+  Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
 
   Text := SDay + ' ' + IntToStr(Trunc(Time));
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10,
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
     Y - Canvas.TextHeight(Text) div 2, Text);
-  Y := Y + Canvas.TextHeight(Text)  + ScaleY(5, 96);
+  Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
 
   ImagePause.Canvas := Canvas;
-  ImagePause.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96), Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePause.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96), Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImagePause.Paint;
   Y := Y + ImagePause.Bounds.Height + ScaleY(5, 96);
 
   ImagePlay.Canvas := Canvas;
-  ImagePlay.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePlay.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImagePlay.Paint;
   Y := Y + ImagePlay.Bounds.Height + ScaleY(5, 96);
 
   ImageFastForward.Canvas := Canvas;
-  ImageFastForward.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImageFastForward.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
+    ScaleX(20, 96), ScaleY(20, 96));
   ImageFastForward.Paint;
   Y := Y + ImageFastForward.Bounds.Height + ScaleY(5, 96);
@@ -1989 +2008 @@
       HighestServedDaysCount := ServedDaysCount;
   end;
+end;
+
+procedure TEngine.DrawNewTrain(Canvas: TCanvas; CanvasSize: TPoint);
+begin
+
 end;