From 1b2a350435755977316805fb5009db401837f1d2 Mon Sep 17 00:00:00 2001 From: fisyher Date: Sun, 19 May 2024 16:58:36 +0800 Subject: [PATCH] Updated version to 1.4.2 Updated many Copyright to 2024 with "Modified by fisyher" text Some minor UI adjustments and label changes to DTXCreator Updated installer.iss --- DTXCreator/Code/00.App/CMainForm.Designer.cs | 1 + DTXCreator/Code/00.App/CMainForm.cs | 6 +- DTXCreator/Code/00.App/CMainForm.resx | 163 ++++++++++--------- DTXCreator/Code/00.App/CVersionInfo.cs | 11 +- DTXCreator/Properties/AssemblyInfo.cs | 2 +- DTXCreator/Properties/Resources.Designer.cs | 4 +- DTXCreator/Properties/Resources.resx | 2 +- DTXMania/Code/App/CDTXMania.cs | 4 +- DTXMania/Code/Stage/02.Title/CStageTitle.cs | 5 +- DTXMania/Properties/AssemblyInfo.cs | 2 +- Installer setup.iss | 4 +- 11 files changed, 105 insertions(+), 99 deletions(-) diff --git a/DTXCreator/Code/00.App/CMainForm.Designer.cs b/DTXCreator/Code/00.App/CMainForm.Designer.cs index 853e865c..6e557901 100644 --- a/DTXCreator/Code/00.App/CMainForm.Designer.cs +++ b/DTXCreator/Code/00.App/CMainForm.Designer.cs @@ -230,6 +230,7 @@ private void InitializeComponent() // this.splitContainerタブと譜面を分割.Panel2.Controls.Add(this.pictureBox譜面パネル); this.splitContainerタブと譜面を分割.Panel2.Controls.Add(this.hScrollBar譜面用水平スクロールバー); + resources.ApplyResources(this.splitContainerタブと譜面を分割.Panel2, "splitContainerタブと譜面を分割.Panel2"); this.splitContainerタブと譜面を分割.Panel2.SizeChanged += new System.EventHandler(this.splitContainerタブと譜面を分割_Panel2_SizeChanged); // // tabControl情報パネル diff --git a/DTXCreator/Code/00.App/CMainForm.cs b/DTXCreator/Code/00.App/CMainForm.cs index 39a864d2..4cc02fa7 100644 --- a/DTXCreator/Code/00.App/CMainForm.cs +++ b/DTXCreator/Code/00.App/CMainForm.cs @@ -130,7 +130,7 @@ internal bool b未保存 { // 変更ありかつ未保存なら「*」を付ける - this.Text = "DTXC* [" + strタイトル + "]"; + this.Text = "DTXC NX *[" + strタイトル + "]"; this.toolStripMenuItem上書き保存.Enabled = true; this.toolStripButton上書き保存.Enabled = true; } @@ -138,7 +138,7 @@ internal bool b未保存 { // 保存後変更がないなら「*」なない - this.Text = "DTXC [" + strタイトル + "]"; + this.Text = "DTXC NX [" + strタイトル + "]"; this.toolStripMenuItem上書き保存.Enabled = false; this.toolStripButton上書き保存.Enabled = false; } @@ -4851,5 +4851,5 @@ private void toolStripComboBox演奏速度_SelectedIndexChanged(object sender, E { this.b再生速度を変更した = true; } - } + } } diff --git a/DTXCreator/Code/00.App/CMainForm.resx b/DTXCreator/Code/00.App/CMainForm.resx index ca4ad6e6..6eaec2a1 100644 --- a/DTXCreator/Code/00.App/CMainForm.resx +++ b/DTXCreator/Code/00.App/CMainForm.resx @@ -129,7 +129,7 @@ Top, Right - 247, 334 + 247, 357 25, 25 @@ -163,7 +163,7 @@ Top, Right - 247, 307 + 247, 330 25, 25 @@ -193,7 +193,7 @@ Top, Right - 247, 280 + 247, 303 25, 25 @@ -223,7 +223,7 @@ Top, Right - 247, 252 + 247, 275 25, 25 @@ -253,7 +253,7 @@ Top, Right - 247, 225 + 247, 248 25, 25 @@ -284,10 +284,10 @@ True - 11, 337 + 11, 360 - 66, 13 + 77, 15 27 @@ -318,10 +318,10 @@ The image size is 204x269. True - 18, 310 + 19, 333 - 61, 13 + 69, 15 29 @@ -352,16 +352,16 @@ The image size is 640x480. True - 5, 283 + 18, 306 - 74, 13 + 70, 15 28 - LoadingImage + LoadImage TopRight @@ -386,10 +386,10 @@ The image size is 640x480. True - 26, 256 + 27, 278 - 51, 13 + 61, 15 27 @@ -420,10 +420,10 @@ The image size is 204x269. True - 33, 231 + 38, 251 - 45, 13 + 50, 15 26 @@ -453,10 +453,10 @@ The image size is 204x269. Top, Left, Right - 85, 334 + 94, 357 - 156, 20 + 147, 21 24 @@ -481,10 +481,10 @@ The image size is 204x269. Top, Left, Right - 85, 307 + 94, 330 - 156, 20 + 147, 21 22 @@ -509,10 +509,10 @@ The image size is 640x480. Top, Left, Right - 85, 280 + 94, 303 - 156, 20 + 147, 21 20 @@ -537,10 +537,10 @@ The image size is 204x269. Top, Left, Right - 85, 252 + 94, 275 - 156, 20 + 147, 21 18 @@ -565,10 +565,10 @@ The image size is 204x269. Top, Left, Right - 85, 225 + 94, 248 - 156, 20 + 147, 21 16 @@ -592,10 +592,10 @@ The image size is 204x269. Top, Left, Right - 85, 197 + 94, 220 - 187, 20 + 178, 21 14 @@ -619,10 +619,10 @@ The image size is 204x269. True - 18, 200 + 19, 223 - 59, 13 + 69, 15 15 @@ -652,10 +652,10 @@ The image size is 204x269. True - 33, 170 + 39, 180 - 45, 13 + 49, 15 13 @@ -683,10 +683,10 @@ The image size is 204x269. 17 - 85, 167 + 94, 177 - 36, 20 + 36, 21 9 @@ -714,10 +714,10 @@ The image size is 204x269. Top, Left, Right - 124, 167 + 133, 177 - 148, 17 + 139, 18 10 @@ -742,10 +742,10 @@ The image size is 204x269. True - 29, 147 + 33, 157 - 50, 13 + 55, 15 12 @@ -774,10 +774,10 @@ The image size is 204x269. 20 - 85, 144 + 94, 154 - 36, 20 + 36, 21 7 @@ -805,10 +805,10 @@ The image size is 204x269. Top, Left, Right - 124, 144 + 133, 154 - 148, 17 + 139, 18 8 @@ -833,10 +833,10 @@ The image size is 204x269. True - 33, 125 + 35, 134 - 47, 13 + 53, 15 11 @@ -864,10 +864,10 @@ The image size is 204x269. 23 - 85, 121 + 94, 131 - 36, 20 + 36, 21 5 @@ -895,10 +895,10 @@ The image size is 204x269. Top, Left, Right - 124, 121 + 133, 131 - 148, 17 + 139, 19 6 @@ -923,10 +923,10 @@ The image size is 204x269. True - 50, 90 + 54, 90 - 30, 13 + 34, 15 8 @@ -956,10 +956,10 @@ The image size is 204x269. True - 26, 64 + 27, 64 - 51, 13 + 61, 15 7 @@ -989,10 +989,10 @@ The image size is 204x269. True - 44, 37 + 55, 37 - 30, 13 + 33, 15 6 @@ -1022,10 +1022,10 @@ The image size is 204x269. True - 50, 10 + 58, 10 - 27, 13 + 30, 15 5 @@ -1052,10 +1052,10 @@ The image size is 204x269. 29 - 85, 88 + 94, 88 - 68, 20 + 68, 21 4 @@ -1082,10 +1082,10 @@ The image size is 204x269. Top, Left, Right - 85, 61 + 94, 61 - 187, 20 + 178, 21 3 @@ -1109,10 +1109,10 @@ The image size is 204x269. Top, Left, Right - 85, 34 + 94, 34 - 187, 20 + 178, 21 2 @@ -1136,13 +1136,13 @@ The image size is 204x269. Top, Left, Right - 85, 7 + 94, 7 10, 19 - 187, 20 + 178, 21 1 @@ -1162,6 +1162,9 @@ The image size is 204x269. 33 + + Microsoft Sans Serif, 9pt + 4, 22 @@ -1235,7 +1238,7 @@ The image size is 204x269. 3, 3 - 272, 421 + 272, 430 0 @@ -1325,7 +1328,7 @@ The image size is 204x269. Play sound on click - 3, 424 + 3, 433 272, 25 @@ -1356,7 +1359,7 @@ The image size is 204x269. 3, 3, 3, 3 - 278, 452 + 278, 461 1 @@ -1410,7 +1413,7 @@ The image size is 204x269. 3, 3 - 272, 421 + 272, 430 1 @@ -1452,7 +1455,7 @@ The image size is 204x269. toolStripButton1 - 3, 424 + 3, 433 272, 25 @@ -1483,7 +1486,7 @@ The image size is 204x269. 3, 3, 3, 3 - 278, 452 + 278, 461 2 @@ -1531,7 +1534,7 @@ The image size is 204x269. 3, 3 - 272, 421 + 272, 430 1 @@ -1579,7 +1582,7 @@ The image size is 204x269. Move down - 3, 424 + 3, 433 272, 25 @@ -1609,7 +1612,7 @@ The image size is 204x269. 3, 3, 3, 3 - 278, 452 + 278, 461 3 @@ -1645,7 +1648,7 @@ The image size is 204x269. Both - 272, 446 + 272, 455 0 @@ -1669,7 +1672,7 @@ The image size is 204x269. 3, 3, 3, 3 - 278, 452 + 278, 461 4 @@ -1776,6 +1779,9 @@ The image size is 204x269. 1 + + Microsoft Sans Serif, 10pt + splitContainerタブと譜面を分割.Panel2 @@ -2020,7 +2026,7 @@ The image size is 204x269. &Edit - 180, 22 + 146, 22 Chip &palette @@ -2101,7 +2107,7 @@ The image size is 204x269. &Narrow - 180, 22 + 146, 22 &Guide margin @@ -2701,6 +2707,9 @@ The image size is 204x269. 731, 558 + + Microsoft Sans Serif, 8.5pt + AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAAMDAAAAEA diff --git a/DTXCreator/Code/00.App/CVersionInfo.cs b/DTXCreator/Code/00.App/CVersionInfo.cs index 32201d39..5397c3bd 100644 --- a/DTXCreator/Code/00.App/CVersionInfo.cs +++ b/DTXCreator/Code/00.App/CVersionInfo.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Windows.Forms; -using System.ComponentModel; using System.Drawing; using DTXCreator.Properties; @@ -30,17 +27,17 @@ private void Cバージョン情報_KeyDown( object sender, KeyEventArgs e ) } private void Cバージョン情報_Paint( object sender, PaintEventArgs e ) { - Font font = new System.Drawing.Font( "Arial", 8f, FontStyle.Bold ); + Font font = new System.Drawing.Font( "Arial", 9f, FontStyle.Bold ); Brush brush = new SolidBrush( Color.FromArgb( 0xff, 179, 194, 251 ) ); - Rectangle layoutRectangle = new Rectangle( 8, 54, 400, 20 ); - e.Graphics.DrawString( "Copyright (c) 2000-2011 FROM/K.YAMASAKI All rights reserved.", font, brush, layoutRectangle ); + Rectangle layoutRectangle = new Rectangle( 8, 54, 400, 40 ); + e.Graphics.DrawString( "Copyright (c) 2000-2024 FROM/K.YAMASAKI All rights reserved.\nModified by fisyher", font, brush, layoutRectangle ); brush.Dispose(); font.Dispose(); font = new System.Drawing.Font( "MS US Gothic", 12f, FontStyle.Regular ); brush = new SolidBrush( Color.FromArgb( 0xff, 220, 220, 220 ) ); layoutRectangle = new Rectangle( 330, 220, 150, 20 ); - e.Graphics.DrawString( "Release " + Resources.DTXC_VERSION, font, brush, layoutRectangle ); + e.Graphics.DrawString( Resources.DTXC_VERSION, font, brush, layoutRectangle ); brush.Dispose(); font.Dispose(); } diff --git a/DTXCreator/Properties/AssemblyInfo.cs b/DTXCreator/Properties/AssemblyInfo.cs index cef1cf91..c3a9b49a 100644 --- a/DTXCreator/Properties/AssemblyInfo.cs +++ b/DTXCreator/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration( "" )] [assembly: AssemblyCompany( "" )] [assembly: AssemblyProduct( "DTXCreator" )] -[assembly: AssemblyCopyright("Copyright (C) 2000 2013 DTXMania Group")] +[assembly: AssemblyCopyright("Copyright (C) 2000 2024 DTXMania Group / Modified by fisyher")] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] diff --git a/DTXCreator/Properties/Resources.Designer.cs b/DTXCreator/Properties/Resources.Designer.cs index 8936e50c..ef5f2669 100644 --- a/DTXCreator/Properties/Resources.Designer.cs +++ b/DTXCreator/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace DTXCreator.Properties { // 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. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -71,7 +71,7 @@ internal static System.Drawing.Bitmap BGMのみ再生 { } /// - /// Looks up a localized string similar to 025(verK). + /// Looks up a localized string similar to NX 1.4.2. /// internal static string DTXC_VERSION { get { diff --git a/DTXCreator/Properties/Resources.resx b/DTXCreator/Properties/Resources.resx index 9a179528..4e5ca203 100644 --- a/DTXCreator/Properties/Resources.resx +++ b/DTXCreator/Properties/Resources.resx @@ -125,7 +125,7 @@ ..\Code\99.Resources\DTXC.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 025(verK) + NX 1.4.2 ..\Code\99.Resources\edit_redohs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/DTXMania/Code/App/CDTXMania.cs b/DTXMania/Code/App/CDTXMania.cs index 4ff15db4..5d665f58 100644 --- a/DTXMania/Code/App/CDTXMania.cs +++ b/DTXMania/Code/App/CDTXMania.cs @@ -25,8 +25,8 @@ namespace DTXMania internal class CDTXMania : Game { // プロパティ - - public static readonly string VERSION = "v1.4.1 20231231"; + public static readonly string VERSION_DISPLAY = "DTX:NX:A:A:2024051900"; + public static readonly string VERSION = "v1.4.2 20240519"; public static readonly string D3DXDLL = "d3dx9_43.dll"; // June 2010 //public static readonly string D3DXDLL = "d3dx9_42.dll"; // February 2010 //public static readonly string D3DXDLL = "d3dx9_41.dll"; // March 2009 diff --git a/DTXMania/Code/Stage/02.Title/CStageTitle.cs b/DTXMania/Code/Stage/02.Title/CStageTitle.cs index 54bede2b..62a7df3a 100644 --- a/DTXMania/Code/Stage/02.Title/CStageTitle.cs +++ b/DTXMania/Code/Stage/02.Title/CStageTitle.cs @@ -11,8 +11,7 @@ namespace DTXMania { internal class CStageTitle : CStage - { - public static readonly string VERSION_DISPLAY = "DTX:NX:A:A:2022022000"; + { // コンストラクタ public CStageTitle() @@ -188,7 +187,7 @@ public override int OnUpdateAndDraw() if( this.tx背景 != null ) this.tx背景.tDraw2D( CDTXMania.app.Device, 0, 0 ); - CDTXMania.actDisplayString.tPrint( 2, 2, CCharacterConsole.EFontType.White, VERSION_DISPLAY); + CDTXMania.actDisplayString.tPrint( 2, 2, CCharacterConsole.EFontType.White, CDTXMania.VERSION_DISPLAY); if( this.txメニュー != null ) { diff --git a/DTXMania/Properties/AssemblyInfo.cs b/DTXMania/Properties/AssemblyInfo.cs index 49b728d3..9367a0d0 100644 --- a/DTXMania/Properties/AssemblyInfo.cs +++ b/DTXMania/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("DTXManiaNX")] -[assembly: AssemblyCopyright( "Copyright (C) 2000-2019 DTXMania Group" )] +[assembly: AssemblyCopyright( "Copyright (C) 2000-2024 DTXMania Group / Modified by fisyher" )] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Installer setup.iss b/Installer setup.iss index a64dc127..0d4debae 100644 --- a/Installer setup.iss +++ b/Installer setup.iss @@ -11,12 +11,12 @@ // custom setup info #define MyAppSetupName "DTXManiaNX" -#define MyAppVersion "1.4.1" +#define MyAppVersion "1.4.2" #define MyAppPublisher "limyz" #define MyAppURL "https://github.com/limyz/DTXmaniaNX" #define MyAppSupportURL "https://discord.gg/Q8xeugf" #define MyAppExeName "DTXManiaNX.exe" -#define MyAppCopyright "Copyright © 2020-2023 DTXManiaNX" +#define MyAppCopyright "Copyright © 2020-2024 DTXManiaNX" [Setup] AppId={{235AD645-2C6B-4FA5-911F-0BCA5D539F97}