From 621bc4e4b7dc1246553e1c9fee4933c1004d8b68 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Thu, 10 Apr 2025 14:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=96=E5=BA=AB=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OverlayFormObj/OverlayForm.cs | 4 ++-- PrimaryFormParts/PrimaryForm.cs | 4 ++-- bin/sounds/desktop.ini | 4 ++++ bin/{ => themes/superstar}/ButtonImages/服務鈴.png | Bin bin/{ => themes/superstar}/superstar-pic/1-1.png | Bin bin/{ => themes/superstar}/superstar-pic/1-2.png | Bin bin/{ => themes/superstar}/superstar-pic/2-1.png | Bin bin/{ => themes/superstar}/superstar-pic/2-2.png | Bin bin/{ => themes/superstar}/superstar-pic/5-1.png | Bin bin/{ => themes/superstar}/superstar-pic/5-10.png | Bin bin/{ => themes/superstar}/superstar-pic/5-11.png | Bin bin/{ => themes/superstar}/superstar-pic/5-12.png | Bin bin/{ => themes/superstar}/superstar-pic/5-2.png | Bin bin/{ => themes/superstar}/superstar-pic/5-3.png | Bin bin/{ => themes/superstar}/superstar-pic/5-4.png | Bin bin/{ => themes/superstar}/superstar-pic/5-5.png | Bin bin/{ => themes/superstar}/superstar-pic/5-6.png | Bin bin/{ => themes/superstar}/superstar-pic/5-7.png | Bin bin/{ => themes/superstar}/superstar-pic/5-8.png | Bin bin/{ => themes/superstar}/superstar-pic/5-9.png | Bin 20 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 bin/sounds/desktop.ini rename bin/{ => themes/superstar}/ButtonImages/服務鈴.png (100%) rename bin/{ => themes/superstar}/superstar-pic/1-1.png (100%) rename bin/{ => themes/superstar}/superstar-pic/1-2.png (100%) rename bin/{ => themes/superstar}/superstar-pic/2-1.png (100%) rename bin/{ => themes/superstar}/superstar-pic/2-2.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-1.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-10.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-11.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-12.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-2.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-3.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-4.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-5.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-6.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-7.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-8.png (100%) rename bin/{ => themes/superstar}/superstar-pic/5-9.png (100%) diff --git a/OverlayFormObj/OverlayForm.cs b/OverlayFormObj/OverlayForm.cs index acd1ad7..afe077c 100644 --- a/OverlayFormObj/OverlayForm.cs +++ b/OverlayFormObj/OverlayForm.cs @@ -82,9 +82,9 @@ namespace OverlayFormObj InitializeFormSettings(); ConfigureTimers(); LoadBackgroundImage(); - ConfigureImageDisplay(); InitializeLabels(); ConfigureSegmentTimer(); + imageYPos = (screenHeight / 3) - 1024 / 6; } private void ConfigureSegmentTimer() { @@ -800,7 +800,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) Console.WriteLine("Form Height: " + this.Height); - string imagePath = String.Format("{0}\\superstar-pic\\{1}.png", Application.StartupPath, stickerId); + string imagePath = String.Format("{0}\\themes\\superstar\\superstar-pic\\{1}.png", Application.StartupPath, stickerId); Console.WriteLine("Image path: " + imagePath); try { diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs index 0860cca..698c490 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -2691,7 +2691,7 @@ public class MultiPagePanel : Panel mouseDownImageCategoryQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\類別查詢_已按.jpg")); resizedMouseDownImageForCategoryQuery = ResizeImage(mouseDownImageCategoryQuery, targetWidth, targetHeight); - + normalStateImageForPromotionsAndMenu = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\555021.jpg")); resizedNormalStateImageForPromotionsAndMenu = ResizeImage(normalStateImageForPromotionsAndMenu, targetWidth, targetHeight); @@ -3498,7 +3498,7 @@ public class MultiPagePanel : Panel { try { - string filePath = Path.Combine(Application.StartupPath, "ButtonImages", imageName); + string filePath = Path.Combine(Application.StartupPath,"themes" ,"superstar" ,"ButtonImages", imageName); if (File.Exists(filePath)) { return Image.FromFile(filePath); diff --git a/bin/sounds/desktop.ini b/bin/sounds/desktop.ini new file mode 100644 index 0000000..d957fd1 --- /dev/null +++ b/bin/sounds/desktop.ini @@ -0,0 +1,4 @@ +[ViewState] +Mode= +Vid= +FolderType=Generic diff --git a/bin/ButtonImages/服務鈴.png b/bin/themes/superstar/ButtonImages/服務鈴.png similarity index 100% rename from bin/ButtonImages/服務鈴.png rename to bin/themes/superstar/ButtonImages/服務鈴.png diff --git a/bin/superstar-pic/1-1.png b/bin/themes/superstar/superstar-pic/1-1.png similarity index 100% rename from bin/superstar-pic/1-1.png rename to bin/themes/superstar/superstar-pic/1-1.png diff --git a/bin/superstar-pic/1-2.png b/bin/themes/superstar/superstar-pic/1-2.png similarity index 100% rename from bin/superstar-pic/1-2.png rename to bin/themes/superstar/superstar-pic/1-2.png diff --git a/bin/superstar-pic/2-1.png b/bin/themes/superstar/superstar-pic/2-1.png similarity index 100% rename from bin/superstar-pic/2-1.png rename to bin/themes/superstar/superstar-pic/2-1.png diff --git a/bin/superstar-pic/2-2.png b/bin/themes/superstar/superstar-pic/2-2.png similarity index 100% rename from bin/superstar-pic/2-2.png rename to bin/themes/superstar/superstar-pic/2-2.png diff --git a/bin/superstar-pic/5-1.png b/bin/themes/superstar/superstar-pic/5-1.png similarity index 100% rename from bin/superstar-pic/5-1.png rename to bin/themes/superstar/superstar-pic/5-1.png diff --git a/bin/superstar-pic/5-10.png b/bin/themes/superstar/superstar-pic/5-10.png similarity index 100% rename from bin/superstar-pic/5-10.png rename to bin/themes/superstar/superstar-pic/5-10.png diff --git a/bin/superstar-pic/5-11.png b/bin/themes/superstar/superstar-pic/5-11.png similarity index 100% rename from bin/superstar-pic/5-11.png rename to bin/themes/superstar/superstar-pic/5-11.png diff --git a/bin/superstar-pic/5-12.png b/bin/themes/superstar/superstar-pic/5-12.png similarity index 100% rename from bin/superstar-pic/5-12.png rename to bin/themes/superstar/superstar-pic/5-12.png diff --git a/bin/superstar-pic/5-2.png b/bin/themes/superstar/superstar-pic/5-2.png similarity index 100% rename from bin/superstar-pic/5-2.png rename to bin/themes/superstar/superstar-pic/5-2.png diff --git a/bin/superstar-pic/5-3.png b/bin/themes/superstar/superstar-pic/5-3.png similarity index 100% rename from bin/superstar-pic/5-3.png rename to bin/themes/superstar/superstar-pic/5-3.png diff --git a/bin/superstar-pic/5-4.png b/bin/themes/superstar/superstar-pic/5-4.png similarity index 100% rename from bin/superstar-pic/5-4.png rename to bin/themes/superstar/superstar-pic/5-4.png diff --git a/bin/superstar-pic/5-5.png b/bin/themes/superstar/superstar-pic/5-5.png similarity index 100% rename from bin/superstar-pic/5-5.png rename to bin/themes/superstar/superstar-pic/5-5.png diff --git a/bin/superstar-pic/5-6.png b/bin/themes/superstar/superstar-pic/5-6.png similarity index 100% rename from bin/superstar-pic/5-6.png rename to bin/themes/superstar/superstar-pic/5-6.png diff --git a/bin/superstar-pic/5-7.png b/bin/themes/superstar/superstar-pic/5-7.png similarity index 100% rename from bin/superstar-pic/5-7.png rename to bin/themes/superstar/superstar-pic/5-7.png diff --git a/bin/superstar-pic/5-8.png b/bin/themes/superstar/superstar-pic/5-8.png similarity index 100% rename from bin/superstar-pic/5-8.png rename to bin/themes/superstar/superstar-pic/5-8.png diff --git a/bin/superstar-pic/5-9.png b/bin/themes/superstar/superstar-pic/5-9.png similarity index 100% rename from bin/superstar-pic/5-9.png rename to bin/themes/superstar/superstar-pic/5-9.png