From 0f53ae64168fb10739adda5ac080c9d1a34c73e9 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Tue, 13 May 2025 10:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=8C=E6=9C=AC=E5=8F=83=E6=95=B8=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrimaryForm.SongSearch.NumberSearch.cs | 17 --- ...rimaryForm.SongSearch.StrokeCountSearch.cs | 14 --- bin/config.ini | 114 +++++++++--------- bin/secondary_graph.grf | 2 +- 4 files changed, 58 insertions(+), 89 deletions(-) delete mode 100644 PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.StrokeCountSearch.cs diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.NumberSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.NumberSearch.cs index 72f3623..f87d348 100644 --- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.NumberSearch.cs +++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.NumberSearch.cs @@ -8,23 +8,6 @@ using System.Collections.Generic; using IniParser; using IniParser.Model; using System.Text; -/* - WordCountSongs -> SongIDSearch - WordCount -> SongID - numberWordCount -> numberSongID - NumberWordCount -> NumberSongID - inputBoxWordCountFontName -> inputBoxSongIDFontName - inputBoxWordCountFontSize -> inputBoxSongIDFontSize - inputBoxWordCountFontStyle -> inputBoxSongIDFontStyle - inputBoxWordCountForeColor -> inputBoxSongIDForeColor - LoadConfigDataforWordCountSongs -> LoadConfigDataforSongIDSearch - LoadButtonCoordinatesForWordCountSongs -> LoadButtonCoordinatesForSongIDSearch - LoadButtonImagesForWordCountSongs -> LoadButtonImagesForSongIDSearch - LoadSpecialButtonCoordinatesForWordCountSongs -> LoadSpecialButtonCoordinatesForSongIDSearch - RemoveWhiteBorderForWordCountSongs -> RemoveWhiteBorderForSongIDSearch - CreateSpecialButtonForWordCountSongs -> CreateSpecialButtonForSongIDSearch - LoadInputBoxConfigForWordCountSongs -> LoadInputBoxConfigForSongIDSearch -*/ namespace DualScreenDemo diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.StrokeCountSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.StrokeCountSearch.cs deleted file mode 100644 index c51443c..0000000 --- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.StrokeCountSearch.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; -using Microsoft.Ink; - -namespace DualScreenDemo -{ - public partial class PrimaryForm - { - - } -} \ No newline at end of file diff --git a/bin/config.ini b/bin/config.ini index 3b00339..3e5bd5e 100644 --- a/bin/config.ini +++ b/bin/config.ini @@ -91,9 +91,9 @@ button35 = 884,628,93,86 modifyButtonZhuYinSingers = 989,627,94,87 clearButtonZhuYinSingers = 151,627,93,87 closeButtonZhuYinSingers = 1093,627,94,87 -modifyButtonEnglishSingers = 1032,633,70,66 -clearButtonEnglishSingers = 408,633,70,66 -closeButtonEnglishSingers = 1110,633,70,66 +modifyButtonEnglishSingers = 1032,632,70,66 +clearButtonEnglishSingers = 408,632,70,66 +closeButtonEnglishSingers = 1110,632,70,66 modifyButtonPinYinSingers = 987,642,94,87 clearButtonPinYinSingers = 154,642,94,87 closeButtonPinYinSingers = 1091,642,94,87 @@ -103,9 +103,9 @@ closeButtonForSingers = 1074,372,70,65 modifyButtonZhuYinSongs = 989,627,94,87 clearButtonZhuYinSongs = 151,627,93,87 closeButtonZhuYinSongs = 1093,627,94,87 -modifyButtonEnglishSongs = 1032,633,70,66 -clearButtonEnglishSongs = 408,633,70,66 -closeButtonEnglishSongs = 1110,633,70,66 +modifyButtonEnglishSongs = 1032,632,70,66 +clearButtonEnglishSongs = 408,632,70,66 +closeButtonEnglishSongs = 1110,632,70,66 modifyButtonPinYinSongs = 987,642,94,87 clearButtonPinYinSongs = 154,642,94,87 closeButtonPinYinSongs = 1091,642,94,87 @@ -118,9 +118,9 @@ closeButtonWordCountSongs = 1088,624,72,67 modifyButtonWordCountSingers = 926,624,72,67 clearButtonWordCountSingers = 845,624,72,67 closeButtonWordCountSingers = 1088,624,72,67 -modifyButtonSongIDSearch = 811,643,94,87 -clearButtonSongIDSearch = 692,643,93,87 -closeButtonSongIDSearch = 1051,643,94,87 +modifyButtonSongIDSearch = 829,643,94,87 +clearButtonSongIDSearch = 722,643,93,87 +closeButtonSongIDSearch = 1043,643,94,87 [ModifyButtonImagesZhuYin] @@ -260,12 +260,12 @@ button1 = 408,418,70,66 button2 = 486,418,70,66 button3 = 564,418,70,66 button4 = 642,418,70,66 -button5 = 720,417,70,66 -button6 = 798,418,70,66 -button7 = 876,418,70,66 -button8 = 954,418,70,66 -button9 = 1033,418,70,66 -button10 = 1111,418,70,66 +button5 = 719,417,70,66 +button6 = 797,418,70,66 +button7 = 875,418,70,66 +button8 = 953,418,70,66 +button9 = 1032,418,70,66 +button10 = 1110,418,70,66 [NumberButtonImages] button0_normal = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢(按鍵)-03.png @@ -300,32 +300,32 @@ button9_mouseDown = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢 button9_mouseOver = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢(按鍵)-12.png [EnglishLetterButtonCoordinates] -button0 = 408,490,70,66 -button1 = 486,490,70,66 -button2 = 564,490,70,66 -button3 = 642,490,70,66 +button0 = 408,489,70,66 +button1 = 486,489,70,66 +button2 = 564,489,70,66 +button3 = 642,489,70,66 button4 = 720,489,70,66 -button5 = 798,490,70,66 -button6 = 876,490,70,66 -button7 = 954,490,70,66 -button8 = 1033,490,70,66 -button9 = 1111,490,70,66 -button10 = 449,561,70,66 -button11 = 527,561,70,66 -button12 = 605,561,70,66 -button13 = 683,561,70,66 -button14 = 761,561,70,66 -button15 = 839,561,70,66 -button16 = 917,561,70,66 -button17 = 995,561,70,66 -button18 = 1073,561,70,66 -button19 = 486,633,70,66 -button20 = 564,633,70,66 -button21 = 642,633,70,66 -button22 = 720,634,70,66 -button23 = 798,633,70,66 -button24 = 876,633,70,66 -button25 = 954,633,70,66 +button5 = 798,489,70,66 +button6 = 876,489,70,66 +button7 = 953,489,70,66 +button8 = 1032,489,70,66 +button9 = 1110,489,70,66 +button10 = 449,560,70,66 +button11 = 527,560,70,66 +button12 = 605,560,70,66 +button13 = 683,560,70,66 +button14 = 761,560,70,66 +button15 = 838,560,70,66 +button16 = 916,560,70,66 +button17 = 994,560,70,66 +button18 = 1072,560,70,66 +button19 = 486,631,70,66 +button20 = 564,631,70,66 +button21 = 642,631,70,66 +button22 = 720,631,70,66 +button23 = 798,631,70,66 +button24 = 876,631,70,66 +button25 = 954,631,70,66 [EnglishLetterButtonImages] button0_normal = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢(按鍵)-13.png @@ -423,9 +423,9 @@ mouseOver = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢(按鍵) mouseDown = themes\superstar\歌星\英文\VOD_歌星查詢_英文查詢(按鍵)-80.png [InputBoxEnglishSingers] -X = 408 -Y = 361 -Width = 444 +X = 409 +Y = 360 +Width = 478 Height = 47 FontName = Times New Roman FontSize = 26 @@ -591,9 +591,9 @@ FontStyle=Bold ForeColor=Black [InputBoxEnglishSongs] -X = 408 -Y = 361 -Width = 444 +X = 409 +Y = 360 +Width = 478 Height = 47 FontName = Times New Roman FontSize = 26 @@ -697,7 +697,7 @@ Height = 442 [InputBoxSongIDSearch] X = 660 -Y = 370 +Y = 380 Width = 530 Height = 63 FontName = Times New Roman @@ -710,16 +710,16 @@ Symbols=1,2,3,4,5,6,7,8,9,0 [NumberSongIDButtonCoordinates] button0 = 650,300,94,87 -button1 = 662,445,94,87 -button2 = 770,445,94,87 -button3 = 880,445,94,87 -button4 = 989,445,94,87 -button5 = 1098,445,94,87 -button6 = 662,545,94,87 -button7 = 770,545,94,87 -button8 = 880,545,94,87 -button9 = 989,545,94,87 -button10 = 1098,545,94,87 +button1 = 668,453,94,87 +button2 = 775,453,94,87 +button3 = 882,453,94,87 +button4 = 989,453,94,87 +button5 = 1097,453,94,87 +button6 = 668,547,94,87 +button7 = 775,547,94,87 +button8 = 882,547,94,87 +button9 = 989,547,94,87 +button10 = 1097,547,94,87 [NumberSongIDButtonImages] button0_normal = themes\superstar\歌名\編號\VOD_歌名查詢_編號查詢(按鍵)-02.png diff --git a/bin/secondary_graph.grf b/bin/secondary_graph.grf index c306648..b6cc34f 100644 --- a/bin/secondary_graph.grf +++ b/bin/secondary_graph.grf @@ -14,5 +14,5 @@ Filter: LAV Splitter Pin: Input Pin: Video Pin: Audio -Filter: C:\video\BGM01.mpg +Filter: C:\video\welcome.mpg Pin: Output