Changeset 103 for trunk

Timestamp:

Dec 9, 2024, 3:04:44 PM (5 weeks ago)

Author:

chronos

Message:

• Modified: Tile skin and color palette setting moved from new game dialog to menu. It can be now set during gameplay.

Location:

trunk

Files:

• Forms/FormMain.lfm (modified) (2 diffs)
• Forms/FormMain.lrj (modified) (1 diff)
• Forms/FormMain.pas (modified) (6 diffs)
• Forms/FormNew.lfm (modified) (3 diffs)
• Forms/FormNew.lrj (modified) (1 diff)
• Forms/FormNew.pas (modified) (4 diffs)
• Install/flatpak/net.zdechov.app.x2048.yml (modified) (3 diffs)
• Languages/Game2048.cs.po (modified) (3 diffs)

trunk/Forms/FormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 534
-  Height = 959
+  Height = 1027
   Top = 223
   Width = 1491
@@ -42 +42 @@
         OnClick = MenuItemFullScreenClick
       end
+      object MenuItemColorPalette: TMenuItem
+        Caption = 'Color palette'
+      end
+      object MenuItemTileSkin: TMenuItem
+        Caption = 'Tile skin'
+      end
     end
     object MenuItemTools: TMenuItem

trunk/Forms/FormMain.lrj

@@ -4 +4 @@
 {"hash":380871,"name":"tformmain.menuitem5.caption","sourcebytes":[86,105,101,119],"value":"View"},
 {"hash":131549534,"name":"tformmain.menuitemfullscreen.caption","sourcebytes":[70,117,108,108,32,115,99,114,101,101,110],"value":"Full screen"},
+{"hash":203534229,"name":"tformmain.menuitemcolorpalette.caption","sourcebytes":[67,111,108,111,114,32,112,97,108,101,116,116,101],"value":"Color palette"},
+{"hash":41409278,"name":"tformmain.menuitemtileskin.caption","sourcebytes":[84,105,108,101,32,115,107,105,110],"value":"Tile skin"},
 {"hash":5989939,"name":"tformmain.menuitemtools.caption","sourcebytes":[84,111,111,108,115],"value":"Tools"},
 {"hash":322608,"name":"tformmain.menuitemhelp.caption","sourcebytes":[72,101,108,112],"value":"Help"}

trunk/Forms/FormMain.pas

@@ -28 +28 @@
     MenuItem5: TMenuItem;
     MenuItem6: TMenuItem;
+    MenuItemColorPalette: TMenuItem;
+    MenuItemTileSkin: TMenuItem;
     MenuItemFullScreen: TMenuItem;
     MenuItemMovesHistory: TMenuItem;
@@ -58 +60 @@
     MoveBuffer: array of TMoveDirection;
     MoveBufferLock: TCriticalSection;
+    procedure MenuItemTileSkinClick(Sender: TObject);
+    procedure MenuItemColorPaletteClick(Sender: TObject);
     procedure AddToMoveBuffer(Direction: TMoveDirection);
     procedure ProcessMoveBuffer;
@@ -179 +183 @@
 
 procedure TFormMain.FormCreate(Sender: TObject);
+var
+  TileSkin: TTileSkin;
+  ColorPalette: TColorPalette;
+  MenuItem: TMenuItem;
 begin
   MoveBufferLock := TCriticalSection.Create;
@@ -186 +194 @@
   MoveThread.Start;
   ControlStyle := ControlStyle + [csOpaque];
+
+  for TileSkin := Low(SkinText) to High(SkinText) do begin
+    MenuItem := TMenuItem.Create(MenuItemTileSkin);
+    MenuItem.RadioItem := True;
+    MenuItem.AutoCheck := True;
+    MenuItem.Tag := Integer(TileSkin);
+    MenuItem.Caption := SkinText[TileSkin];
+    MenuItem.OnClick := MenuItemTileSkinClick;
+    MenuItemTileSkin.Add(MenuItem);
+  end;
+
+  for ColorPalette := Low(ColorPaletteText) to High(ColorPaletteText) do begin
+    MenuItem := TMenuItem.Create(MenuItemColorPalette);
+    MenuItem.RadioItem := True;
+    MenuItem.AutoCheck := True;
+    MenuItem.Tag := Integer(ColorPalette);
+    MenuItem.Caption := ColorPaletteText[ColorPalette];
+    MenuItem.OnClick := MenuItemColorPaletteClick;
+    MenuItemColorPalette.Add(MenuItem);
+  end;
 end;
 
@@ -221 +249 @@
 begin
   // Do nothing
+end;
+
+procedure TFormMain.MenuItemTileSkinClick(Sender: TObject);
+begin
+  Core.Core.Game.Skin := TTileSkin(TMenuItem(Sender).Tag);
+end;
+
+procedure TFormMain.MenuItemColorPaletteClick(Sender: TObject);
+begin
+  Core.Core.Game.ColorPalette := TColorPalette(TMenuItem(Sender).Tag);
 end;
 
@@ -277 +315 @@
     end;
   MenuItemTools.Visible := ToolsVisible;
+  MenuItemTileSkin.Items[Integer(Core.Core.Game.Skin)].Checked := True;
+  MenuItemColorPalette.Items[Integer(Core.Core.Game.ColorPalette)].Checked := True;
 end;
 

trunk/Forms/FormNew.lfm

@@ -8 +8 @@
   ClientWidth = 514
   DesignTimePPI = 144
-  OnCreate = FormCreate
-  LCLVersion = '3.4.0.0'
+  LCLVersion = '3.6.0.0'
   object ButtonCancel: TButton
     Left = 255
@@ -36 +35 @@
     Width = 497
     HorzScrollBar.Page = 435
-    VertScrollBar.Page = 214
+    VertScrollBar.Page = 118
     Anchors = [akTop, akLeft, akRight, akBottom]
     ClientHeight = 245
@@ -87 +86 @@
       TabOrder = 2
     end
-    object Label2: TLabel
-      Left = 16
-      Height = 26
-      Top = 133
-      Width = 75
-      Caption = 'Tile skin:'
-      ParentColor = False
-    end
-    object ComboBoxSkin: TComboBox
-      Left = 173
-      Height = 38
-      Top = 128
-      Width = 262
-      ItemHeight = 0
-      Items.Strings = (
-        ''
-      )
-      Style = csDropDownList
-      TabOrder = 3
-    end
-    object Label3: TLabel
-      Left = 16
-      Height = 26
-      Top = 181
-      Width = 113
-      Caption = 'Color palette:'
-      ParentColor = False
-    end
-    object ComboBoxColorPalette: TComboBox
-      Left = 173
-      Height = 38
-      Top = 176
-      Width = 262
-      ItemHeight = 0
-      Items.Strings = (
-        'RGB'
-        'RBG'
-        'GRB'
-        'GBR'
-        'BGR'
-        'BRG'
-      )
-      Style = csDropDownList
-      TabOrder = 4
-    end
   end
 end

trunk/Forms/FormNew.lrj

@@ -5 +5 @@
 {"hash":103901194,"name":"tformnew.label1.caption","sourcebytes":[66,111,97,114,100,32,115,105,122,101,58],"value":"Board size:"},
 {"hash":260260820,"name":"tformnew.checkboxundoenabled.caption","sourcebytes":[85,110,100,111,32,101,110,97,98,108,101,100],"value":"Undo enabled"},
-{"hash":146862089,"name":"tformnew.checkboxrecordhistory.caption","sourcebytes":[82,101,99,111,114,100,32,109,111,118,101,115,32,104,105,115,116,111,114,121],"value":"Record moves history"},
-{"hash":125677626,"name":"tformnew.label2.caption","sourcebytes":[84,105,108,101,32,115,107,105,110,58],"value":"Tile skin:"},
-{"hash":35322186,"name":"tformnew.label3.caption","sourcebytes":[67,111,108,111,114,32,112,97,108,101,116,116,101,58],"value":"Color palette:"}
+{"hash":146862089,"name":"tformnew.checkboxrecordhistory.caption","sourcebytes":[82,101,99,111,114,100,32,109,111,118,101,115,32,104,105,115,116,111,114,121],"value":"Record moves history"}
 ]}

trunk/Forms/FormNew.pas

@@ -16 +16 @@
     CheckBoxRecordHistory: TCheckBox;
     CheckBoxUndoEnabled: TCheckBox;
-    ComboBoxColorPalette: TComboBox;
     ComboBoxSize: TComboBox;
-    ComboBoxSkin: TComboBox;
     Label1: TLabel;
-    Label2: TLabel;
-    Label3: TLabel;
     ScrollBox1: TScrollBox;
-    procedure FormCreate(Sender: TObject);
   public
     procedure Load(Game: TGame);
@@ -35 +30 @@
 
 { TFormNew }
-
-procedure TFormNew.FormCreate(Sender: TObject);
-var
-  TileSkin: TTileSkin;
-  ColorPalette: TColorPalette;
-begin
-  ComboBoxSkin.Items.BeginUpdate;
-  try
-    ComboBoxSkin.Items.Clear;
-    for TileSkin := Low(SkinText) to High(SkinText) do
-      ComboBoxSkin.Items.Add(SkinText[TileSkin]);
-  finally
-    ComboBoxSkin.Items.EndUpdate;
-  end;
-
-  ComboBoxColorPalette.Items.BeginUpdate;
-  try
-    ComboBoxColorPalette.Items.Clear;
-    for ColorPalette := Low(ColorPaletteText) to High(ColorPaletteText) do
-      ComboBoxColorPalette.Items.Add(ColorPaletteText[ColorPalette]);
-  finally
-    ComboBoxColorPalette.Items.EndUpdate;
-  end;
-end;
-
 procedure TFormNew.Load(Game: TGame);
 begin
@@ -65 +35 @@
   CheckBoxUndoEnabled.Checked := Game.UndoEnabled;
   CheckBoxRecordHistory.Checked := Game.RecordHistory;
-  ComboBoxSkin.ItemIndex := Integer(Game.Skin);
-  ComboBoxColorPalette.ItemIndex := Integer(Game.ColorPalette);
 end;
 
@@ -74 +42 @@
   Game.UndoEnabled := CheckBoxUndoEnabled.Checked;
   Game.RecordHistory := CheckBoxRecordHistory.Checked;
-  Game.Skin := TTileSkin(ComboBoxSkin.ItemIndex);
-  Game.ColorPalette := TColorPalette(ComboBoxColorPalette.ItemIndex);
 end;
 

trunk/Install/flatpak/net.zdechov.app.x2048.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.x2048
 runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 sdk-extensions:
@@ -10 +10 @@
   - --socket=fallback-x11
   - --socket=wayland
-  - --socket=pulseaudio
   - --device=dri
 modules:
@@ -38 +37 @@
       - install -Dm644 "Images/Logo 256x256.png" $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/Game2048/Languages
+      - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/Game2048/Languages
       - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml

trunk/Languages/Game2048.cs.po

@@ -228 +228 @@
 msgstr "Zobrazení"
 
+#: tformmain.menuitemcolorpalette.caption
+msgid "Color palette"
+msgstr "Paleta barev"
+
 #: tformmain.menuitemfullscreen.caption
 msgid "Full screen"
@@ -241 +245 @@
 msgstr "Nápověda"
 
+#: tformmain.menuitemtileskin.caption
+msgid "Tile skin"
+msgstr "Povrch dlaždic"
+
 #: tformmain.menuitemtools.caption
 msgid "Tools"
@@ -272 +280 @@
 msgstr "Velikost desky:"
 
-#: tformnew.label2.caption
-msgid "Tile skin:"
-msgstr "Povrch dlaždic:"
-
-#: tformnew.label3.caption
-msgid "Color palette:"
-msgstr "Barevná paleta:"
-
 #: tformsettings.buttoncancel.caption
 msgctxt "tformsettings.buttoncancel.caption"