diff --git a/MikuWeather_CS/DataQuery.cs b/MikuWeather_CS/DataQuery.cs index c14b846..8cf0814 100644 --- a/MikuWeather_CS/DataQuery.cs +++ b/MikuWeather_CS/DataQuery.cs @@ -29,7 +29,7 @@ public static Dictionary UpdateData_Caiyun(string coor) { return resultDict; } - var todayTemp = realtime.temperature + " °C"; + var todayTemp = realtime.temperature + "℃"; var todayPic = realtime.skycon; resultDict.Add("today temp", todayTemp); resultDict.Add("today pic", todayPic); @@ -40,7 +40,7 @@ public static Dictionary UpdateData_Caiyun(string coor) { return resultDict; } - var tomorrowTemp = Math.Round(daily.temperature_20h_32h[0].min, 0) + " °C ~ " + Math.Round(daily.temperature_20h_32h[0].max, 0) + " °C"; + var tomorrowTemp = Math.Round(daily.temperature_20h_32h[0].min, 0) + "℃ ~ " + Math.Round(daily.temperature_20h_32h[0].max, 0) + "℃"; var tomorrowPic = daily.skycon_20h_32h[0].value; resultDict.Add("tomorrow temp", tomorrowTemp); resultDict.Add("tomorrow pic", tomorrowPic); diff --git a/MikuWeather_CS/FormMain.Designer.cs b/MikuWeather_CS/FormMain.Designer.cs index 03379f4..ebb341a 100644 --- a/MikuWeather_CS/FormMain.Designer.cs +++ b/MikuWeather_CS/FormMain.Designer.cs @@ -32,70 +32,54 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { components = new Container(); - picBox = new PictureBox(); cmMenu = new ContextMenuStrip(components); cmWebsite = new ToolStripMenuItem(); cmRefresh = new ToolStripMenuItem(); cmExit = new ToolStripMenuItem(); - ((ISupportInitialize)picBox).BeginInit(); cmMenu.SuspendLayout(); SuspendLayout(); // - // picBox - // - picBox.ContextMenuStrip = cmMenu; - picBox.InitialImage = null; - picBox.Location = new System.Drawing.Point(0, 0); - picBox.Margin = new Padding(4, 5, 4, 5); - picBox.Name = "picBox"; - picBox.Size = new System.Drawing.Size(303, 327); - picBox.SizeMode = PictureBoxSizeMode.Zoom; - picBox.TabIndex = 0; - picBox.TabStop = false; - picBox.Visible = false; - picBox.MouseEnter += FormMain_MouseHover; - picBox.MouseLeave += FormMain_MouseLeave; - picBox.MouseHover += FormMain_MouseHover; - // // cmMenu // cmMenu.ImageScalingSize = new System.Drawing.Size(32, 32); cmMenu.Items.AddRange(new ToolStripItem[] { cmWebsite, cmRefresh, cmExit }); cmMenu.Name = "cmMenu"; - cmMenu.Size = new System.Drawing.Size(212, 106); + cmMenu.Size = new System.Drawing.Size(234, 118); // // cmWebsite // cmWebsite.Name = "cmWebsite"; cmWebsite.ShortcutKeyDisplayString = ""; - cmWebsite.Size = new System.Drawing.Size(211, 34); + cmWebsite.Size = new System.Drawing.Size(233, 38); cmWebsite.Text = "Github Repo"; cmWebsite.Click += CmWebsite_Click; // // cmRefresh // cmRefresh.Name = "cmRefresh"; - cmRefresh.Size = new System.Drawing.Size(211, 34); + cmRefresh.Size = new System.Drawing.Size(233, 38); cmRefresh.Text = "更新"; cmRefresh.Click += CmRefresh_Click; // // cmExit // cmExit.Name = "cmExit"; - cmExit.Size = new System.Drawing.Size(211, 34); + cmExit.Size = new System.Drawing.Size(233, 38); cmExit.Text = "退出"; cmExit.Click += CmExit_Click; // // FormMain // - AutoScaleDimensions = new System.Drawing.SizeF(13F, 28F); + AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); AutoScaleMode = AutoScaleMode.Font; BackColor = System.Drawing.Color.Honeydew; - ClientSize = new System.Drawing.Size(303, 327); + BackgroundImage = Properties.Resources.晴_日; + BackgroundImageLayout = ImageLayout.Zoom; + ClientSize = new System.Drawing.Size(200, 179); ContextMenuStrip = cmMenu; - Controls.Add(picBox); + DoubleBuffered = true; FormBorderStyle = FormBorderStyle.None; - Margin = new Padding(4, 6, 4, 6); + Margin = new Padding(4, 7, 4, 7); MaximizeBox = false; MinimizeBox = false; Name = "FormMain"; @@ -107,14 +91,11 @@ private void InitializeComponent() { Load += FormMain_Load; MouseLeave += FormMain_MouseLeave; MouseHover += FormMain_MouseHover; - ((ISupportInitialize)picBox).EndInit(); cmMenu.ResumeLayout(false); ResumeLayout(false); } #endregion - - private PictureBox picBox; private ContextMenuStrip cmMenu; private ToolStripMenuItem cmWebsite; private ToolStripMenuItem cmExit; diff --git a/MikuWeather_CS/FormMain.cs b/MikuWeather_CS/FormMain.cs index 8abb3d3..e9d0559 100644 --- a/MikuWeather_CS/FormMain.cs +++ b/MikuWeather_CS/FormMain.cs @@ -20,8 +20,8 @@ public FormMain() { private void FormMain_Load(object sender, EventArgs e) { if (Screen.PrimaryScreen != null) { - var locationX = Screen.PrimaryScreen.WorkingArea.Width - 290; - var locationY = Screen.PrimaryScreen.WorkingArea.Bottom - Size.Height + 20; + var locationX = Screen.PrimaryScreen.WorkingArea.Width - 300; + var locationY = Screen.PrimaryScreen.WorkingArea.Bottom - Size.Height - 80; SetBounds(locationX, locationY, Size.Width, Size.Height); } @@ -34,7 +34,7 @@ private void FormMain_Load(object sender, EventArgs e) { } private void FormMain_MouseHover(object sender, EventArgs e) { - _frmShow.SetBounds(Location.X - _frmShow.Width / 2 + Width / 2 - 50, Location.Y - _frmShow.Height - 20, _frmShow.Width, _frmShow.Height); + _frmShow.SetBounds(Location.X - _frmShow.Width / 2 + Width / 2 - 20, Location.Y - _frmShow.Height - 10, _frmShow.Width, _frmShow.Height); _frmShow.Show(); } @@ -43,7 +43,11 @@ private void FormMain_MouseLeave(object sender, EventArgs e) { } private void CmWebsite_Click(object sender, EventArgs e) { - Process.Start("https://github.com/lzcapp/MikuWeather_Windows"); + const string repoUrl = "https://github.com/lzcapp/MikuWeather_Windows"; + Process.Start(new ProcessStartInfo { + FileName = repoUrl, + UseShellExecute = true + }); } private void CmExit_Click(object sender, EventArgs e) { @@ -72,8 +76,7 @@ private void UpdateData() { _frmShow.SetTemp(todayTemp, tomorrowTemp); _frmShow.SetWeather(todayWeather, tomorrowWeather); _frmShow.SetPic(todayPic, tomorrowPic); - picBox.Image = todayPic; - picBox.Size = new Size(210, 210); + BackgroundImage = todayPic; TransparentForm(); } @@ -144,7 +147,7 @@ private void CmRefresh_Click(object sender, EventArgs e) { } private void TransparentForm() { - var img = new Bitmap((Bitmap)picBox.Image, new Size(200, 176)); + var img = new Bitmap(((Bitmap)BackgroundImage)!, new Size(200, 176)); GraphicsPath graph = BitmapUtil.GetNoneTransparentRegion(img, 0); Region = new Region(graph); @@ -152,8 +155,8 @@ private void TransparentForm() { BackgroundImageLayout = ImageLayout.None; FormBorderStyle = FormBorderStyle.None; - Width = picBox.Image.Width; - Height = picBox.Image.Height; + Width = BackgroundImage.Width; + Height = BackgroundImage.Height; } } } \ No newline at end of file diff --git a/MikuWeather_CS/FormShow.Designer.cs b/MikuWeather_CS/FormShow.Designer.cs index 6d7e3e9..a7cfdc0 100644 --- a/MikuWeather_CS/FormShow.Designer.cs +++ b/MikuWeather_CS/FormShow.Designer.cs @@ -30,10 +30,10 @@ private void InitializeComponent() { tableLayoutPanel = new TableLayoutPanel(); picToday = new PictureBox(); picTomorrow = new PictureBox(); + lnkTomorrowWeather = new LinkLabel(); lnkTodayTemp = new LinkLabel(); - lnkTomorrowTemp = new LinkLabel(); lnkTodayWeather = new LinkLabel(); - lnkTomorrowWeather = new LinkLabel(); + lnkTomorrowTemp = new LinkLabel(); tableLayoutPanel.SuspendLayout(); ((ISupportInitialize)picToday).BeginInit(); ((ISupportInitialize)picTomorrow).BeginInit(); @@ -49,20 +49,21 @@ private void InitializeComponent() { tableLayoutPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); tableLayoutPanel.Controls.Add(picToday, 0, 1); tableLayoutPanel.Controls.Add(picTomorrow, 1, 1); - tableLayoutPanel.Controls.Add(lnkTodayTemp, 0, 2); - tableLayoutPanel.Controls.Add(lnkTomorrowTemp, 1, 2); - tableLayoutPanel.Controls.Add(lnkTodayWeather, 0, 3); - tableLayoutPanel.Controls.Add(lnkTomorrowWeather, 1, 3); + tableLayoutPanel.Controls.Add(lnkTomorrowWeather, 1, 2); + tableLayoutPanel.Controls.Add(lnkTodayTemp, 0, 3); + tableLayoutPanel.Controls.Add(lnkTodayWeather, 0, 2); + tableLayoutPanel.Controls.Add(lnkTomorrowTemp, 1, 3); tableLayoutPanel.Dock = DockStyle.Fill; tableLayoutPanel.Location = new System.Drawing.Point(0, 0); tableLayoutPanel.Margin = new Padding(0); tableLayoutPanel.Name = "tableLayoutPanel"; - tableLayoutPanel.RowCount = 4; - tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F)); - tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 200F)); - tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); - tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); - tableLayoutPanel.Size = new System.Drawing.Size(710, 396); + tableLayoutPanel.RowCount = 5; + tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 66F)); + tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 230F)); + tableLayoutPanel.RowStyles.Add(new RowStyle()); + tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); + tableLayoutPanel.Size = new System.Drawing.Size(765, 438); tableLayoutPanel.TabIndex = 0; // // picToday @@ -71,9 +72,9 @@ private void InitializeComponent() { picToday.BackgroundImage = Properties.Resources.晴_日; picToday.BackgroundImageLayout = ImageLayout.Zoom; picToday.Dock = DockStyle.Fill; - picToday.Location = new System.Drawing.Point(3, 63); + picToday.Location = new System.Drawing.Point(3, 69); picToday.Name = "picToday"; - picToday.Size = new System.Drawing.Size(349, 194); + picToday.Size = new System.Drawing.Size(376, 224); picToday.TabIndex = 0; picToday.TabStop = false; // @@ -82,75 +83,81 @@ private void InitializeComponent() { picTomorrow.BackColor = System.Drawing.Color.Transparent; picTomorrow.BackgroundImageLayout = ImageLayout.Zoom; picTomorrow.Dock = DockStyle.Fill; - picTomorrow.Location = new System.Drawing.Point(358, 63); + picTomorrow.Location = new System.Drawing.Point(385, 69); picTomorrow.Name = "picTomorrow"; - picTomorrow.Size = new System.Drawing.Size(349, 194); + picTomorrow.Size = new System.Drawing.Size(377, 224); picTomorrow.TabIndex = 1; picTomorrow.TabStop = false; // + // lnkTomorrowWeather + // + lnkTomorrowWeather.AutoSize = true; + lnkTomorrowWeather.BackColor = System.Drawing.Color.Transparent; + lnkTomorrowWeather.Dock = DockStyle.Fill; + lnkTomorrowWeather.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.125F, System.Drawing.FontStyle.Bold); + lnkTomorrowWeather.ForeColor = System.Drawing.Color.WhiteSmoke; + lnkTomorrowWeather.LinkArea = new LinkArea(0, 0); + lnkTomorrowWeather.Location = new System.Drawing.Point(382, 316); + lnkTomorrowWeather.Margin = new Padding(0, 20, 0, 0); + lnkTomorrowWeather.Name = "lnkTomorrowWeather"; + lnkTomorrowWeather.Size = new System.Drawing.Size(383, 36); + lnkTomorrowWeather.TabIndex = 5; + lnkTomorrowWeather.Text = "晴"; + lnkTomorrowWeather.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // lnkTodayTemp // lnkTodayTemp.AutoSize = true; lnkTodayTemp.BackColor = System.Drawing.Color.Transparent; lnkTodayTemp.Dock = DockStyle.Fill; lnkTodayTemp.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.1428576F); - lnkTodayTemp.ForeColor = System.Drawing.Color.LightGreen; - lnkTodayTemp.Location = new System.Drawing.Point(3, 260); + lnkTodayTemp.ForeColor = System.Drawing.Color.WhiteSmoke; + lnkTodayTemp.Location = new System.Drawing.Point(3, 352); lnkTodayTemp.Name = "lnkTodayTemp"; - lnkTodayTemp.Size = new System.Drawing.Size(349, 68); + lnkTodayTemp.Size = new System.Drawing.Size(376, 66); lnkTodayTemp.TabIndex = 2; lnkTodayTemp.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // lnkTomorrowTemp - // - lnkTomorrowTemp.AutoSize = true; - lnkTomorrowTemp.BackColor = System.Drawing.Color.Transparent; - lnkTomorrowTemp.Dock = DockStyle.Fill; - lnkTomorrowTemp.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.1428576F); - lnkTomorrowTemp.ForeColor = System.Drawing.Color.LightGreen; - lnkTomorrowTemp.Location = new System.Drawing.Point(358, 260); - lnkTomorrowTemp.Name = "lnkTomorrowTemp"; - lnkTomorrowTemp.Size = new System.Drawing.Size(349, 68); - lnkTomorrowTemp.TabIndex = 3; - lnkTomorrowTemp.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // lnkTodayWeather // lnkTodayWeather.AutoSize = true; lnkTodayWeather.BackColor = System.Drawing.Color.Transparent; lnkTodayWeather.Dock = DockStyle.Fill; - lnkTodayWeather.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.1428576F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 134); - lnkTodayWeather.ForeColor = System.Drawing.Color.MediumTurquoise; - lnkTodayWeather.Location = new System.Drawing.Point(3, 328); + lnkTodayWeather.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.125F, System.Drawing.FontStyle.Bold); + lnkTodayWeather.ForeColor = System.Drawing.Color.WhiteSmoke; + lnkTodayWeather.LinkArea = new LinkArea(0, 0); + lnkTodayWeather.Location = new System.Drawing.Point(0, 316); + lnkTodayWeather.Margin = new Padding(0, 20, 0, 0); lnkTodayWeather.Name = "lnkTodayWeather"; - lnkTodayWeather.Size = new System.Drawing.Size(349, 68); + lnkTodayWeather.Size = new System.Drawing.Size(382, 36); lnkTodayWeather.TabIndex = 4; + lnkTodayWeather.Text = "晴"; lnkTodayWeather.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // lnkTomorrowWeather + // lnkTomorrowTemp // - lnkTomorrowWeather.AutoSize = true; - lnkTomorrowWeather.BackColor = System.Drawing.Color.Transparent; - lnkTomorrowWeather.Dock = DockStyle.Fill; - lnkTomorrowWeather.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.1428576F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 134); - lnkTomorrowWeather.ForeColor = System.Drawing.Color.MediumTurquoise; - lnkTomorrowWeather.Location = new System.Drawing.Point(358, 328); - lnkTomorrowWeather.Name = "lnkTomorrowWeather"; - lnkTomorrowWeather.Size = new System.Drawing.Size(349, 68); - lnkTomorrowWeather.TabIndex = 5; - lnkTomorrowWeather.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + lnkTomorrowTemp.AutoSize = true; + lnkTomorrowTemp.BackColor = System.Drawing.Color.Transparent; + lnkTomorrowTemp.Dock = DockStyle.Fill; + lnkTomorrowTemp.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.1428576F); + lnkTomorrowTemp.ForeColor = System.Drawing.Color.WhiteSmoke; + lnkTomorrowTemp.Location = new System.Drawing.Point(385, 352); + lnkTomorrowTemp.Name = "lnkTomorrowTemp"; + lnkTomorrowTemp.Size = new System.Drawing.Size(377, 66); + lnkTomorrowTemp.TabIndex = 3; + lnkTomorrowTemp.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // FormShow // - AutoScaleDimensions = new System.Drawing.SizeF(13F, 28F); + AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); AutoScaleMode = AutoScaleMode.Font; BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new System.Drawing.Size(710, 396); + ClientSize = new System.Drawing.Size(765, 438); Controls.Add(tableLayoutPanel); DoubleBuffered = true; FormBorderStyle = FormBorderStyle.None; Location = new System.Drawing.Point(1000, 600); - Margin = new Padding(4, 5, 4, 5); + Margin = new Padding(4, 6, 4, 6); MaximizeBox = false; MinimizeBox = false; Name = "FormShow"; diff --git a/MikuWeather_CS/FormShow.cs b/MikuWeather_CS/FormShow.cs index a4d4752..3e99b7c 100644 --- a/MikuWeather_CS/FormShow.cs +++ b/MikuWeather_CS/FormShow.cs @@ -12,9 +12,9 @@ public partial class FormShow : Form { private static readonly PrivateFontCollection PFCAwe = new(); private static void AddPrivateFont() { - GCHandle hObject = GCHandle.Alloc(Properties.Resources.MFYaYuan, GCHandleType.Pinned); + GCHandle hObject = GCHandle.Alloc(Properties.Resources.FZMingMT, GCHandleType.Pinned); var intptr = hObject.AddrOfPinnedObject(); - PFCAwe.AddMemoryFont(intptr, Properties.Resources.MFYaYuan.Length); + PFCAwe.AddMemoryFont(intptr, Properties.Resources.FZMingMT.Length); } public FormShow() { @@ -23,10 +23,9 @@ public FormShow() { private void FormShow_Load(object sender, EventArgs e) { AddPrivateFont(); + lnkTodayTemp.Font = new Font(PFCAwe.Families[0], 14, FontStyle.Bold); - lnkTodayTemp.UseCompatibleTextRendering = true; lnkTomorrowTemp.Font = new Font(PFCAwe.Families[0], 14, FontStyle.Bold); - lnkTomorrowTemp.UseCompatibleTextRendering = true; } internal void SetTemp(string todayTemp, string tomorrowTemp) { diff --git a/MikuWeather_CS/MikuWeather.csproj b/MikuWeather_CS/MikuWeather.csproj index ccc4d11..d0a4a41 100644 --- a/MikuWeather_CS/MikuWeather.csproj +++ b/MikuWeather_CS/MikuWeather.csproj @@ -96,12 +96,23 @@ + + True + True + Resources.resx + True True Settings.settings + + + ResXFileCodeGenerator + Resources.Designer.cs + + SettingsSingleFileGenerator diff --git a/MikuWeather_CS/Properties/PublishProfiles/x64.pubxml b/MikuWeather_CS/Properties/PublishProfiles/x64.pubxml index 2159b0f..deb942a 100644 --- a/MikuWeather_CS/Properties/PublishProfiles/x64.pubxml +++ b/MikuWeather_CS/Properties/PublishProfiles/x64.pubxml @@ -9,9 +9,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. bin\Publish\x64 FileSystem <_TargetId>Folder - net8.0-windows10.0.22621.0 + net8.0-windows win-x64 false false + true \ No newline at end of file diff --git a/MikuWeather_CS/Properties/PublishProfiles/FolderProfile.pubxml b/MikuWeather_CS/Properties/PublishProfiles/x86.pubxml similarity index 78% rename from MikuWeather_CS/Properties/PublishProfiles/FolderProfile.pubxml rename to MikuWeather_CS/Properties/PublishProfiles/x86.pubxml index b0d62a6..9818d9a 100644 --- a/MikuWeather_CS/Properties/PublishProfiles/FolderProfile.pubxml +++ b/MikuWeather_CS/Properties/PublishProfiles/x86.pubxml @@ -9,9 +9,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. bin\Publish\x86 FileSystem <_TargetId>Folder - net8.0-windows10.0.22621.0 + net8.0-windows win-x86 false false + true \ No newline at end of file diff --git a/MikuWeather_CS/Properties/Resources.Designer.cs b/MikuWeather_CS/Properties/Resources.Designer.cs index 84740d2..4bf9c7d 100644 --- a/MikuWeather_CS/Properties/Resources.Designer.cs +++ b/MikuWeather_CS/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace MikuWeather.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 一个强类型的资源类,用于查找本地化的字符串等。 /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen + // (以 /str 作为命令选项),或重新生成 VS 项目。 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 重写当前线程的 CurrentUICulture 属性,对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap bg_wdt { get { @@ -71,17 +71,17 @@ internal static System.Drawing.Bitmap bg_wdt { } /// - /// Looks up a localized resource of type System.Byte[]. + /// 查找 System.Byte[] 类型的本地化资源。 /// - internal static byte[] MFYaYuan { + internal static byte[] FZMingMT { get { - object obj = ResourceManager.GetObject("MFYaYuan", resourceCulture); + object obj = ResourceManager.GetObject("FZMingMT", resourceCulture); return ((byte[])(obj)); } } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 中雨_日 { get { @@ -91,7 +91,7 @@ internal static System.Drawing.Bitmap 中雨_日 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 多云_夜 { get { @@ -101,7 +101,7 @@ internal static System.Drawing.Bitmap 多云_夜 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 多云_日 { get { @@ -111,7 +111,7 @@ internal static System.Drawing.Bitmap 多云_日 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 大雨 { get { @@ -121,7 +121,7 @@ internal static System.Drawing.Bitmap 大雨 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 大雪 { get { @@ -131,7 +131,7 @@ internal static System.Drawing.Bitmap 大雪 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 晴_夜 { get { @@ -141,7 +141,7 @@ internal static System.Drawing.Bitmap 晴_夜 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 晴_日 { get { @@ -151,7 +151,7 @@ internal static System.Drawing.Bitmap 晴_日 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 阴 { get { @@ -161,7 +161,7 @@ internal static System.Drawing.Bitmap 阴 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雨 { get { @@ -171,7 +171,7 @@ internal static System.Drawing.Bitmap 雨 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雨_夜 { get { @@ -181,7 +181,7 @@ internal static System.Drawing.Bitmap 雨_夜 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雨_日 { get { @@ -191,7 +191,7 @@ internal static System.Drawing.Bitmap 雨_日 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雨雪 { get { @@ -201,7 +201,7 @@ internal static System.Drawing.Bitmap 雨雪 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雪 { get { @@ -211,7 +211,7 @@ internal static System.Drawing.Bitmap 雪 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雪_夜 { get { @@ -221,7 +221,7 @@ internal static System.Drawing.Bitmap 雪_夜 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雪_日 { get { @@ -231,7 +231,7 @@ internal static System.Drawing.Bitmap 雪_日 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雷雨 { get { @@ -241,7 +241,7 @@ internal static System.Drawing.Bitmap 雷雨 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雷雨_夜 { get { @@ -251,7 +251,7 @@ internal static System.Drawing.Bitmap 雷雨_夜 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// internal static System.Drawing.Bitmap 雾 { get { diff --git a/MikuWeather_CS/Properties/Resources.resx b/MikuWeather_CS/Properties/Resources.resx index e715884..4ba2230 100644 --- a/MikuWeather_CS/Properties/Resources.resx +++ b/MikuWeather_CS/Properties/Resources.resx @@ -121,8 +121,8 @@ ..\Resources\bg_wdt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MFYaYuan_Noncommercial-Regular.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\FZMingMTJW-B.TTF;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\中雨_日.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/MikuWeather_CS/Resources/FZMingMTJW-B.TTF b/MikuWeather_CS/Resources/FZMingMTJW-B.TTF new file mode 100644 index 0000000..cfe88b0 Binary files /dev/null and b/MikuWeather_CS/Resources/FZMingMTJW-B.TTF differ diff --git a/MikuWeather_CS/Resources/MFYaYuan_Noncommercial-Regular.otf b/MikuWeather_CS/Resources/MFYaYuan_Noncommercial-Regular.otf deleted file mode 100644 index 9ec1764..0000000 Binary files a/MikuWeather_CS/Resources/MFYaYuan_Noncommercial-Regular.otf and /dev/null differ diff --git a/Screenshot2.png b/Screenshot2.png index ba78a95..7d81786 100644 Binary files a/Screenshot2.png and b/Screenshot2.png differ