Merge pull request #28 from limyz/v362_branch_latest

Merge updates to v362 back to master
limyz · Jul 28, 2020 · c7633e5 · c7633e5
2 parents 4a30c09 + 5b91560
commit c7633e5
Show file tree

Hide file tree

Showing 125 changed files with 4,138 additions and 3,142 deletions.
diff --git a/DTXCreatorプロジェクト/DTXCreatorソリューション.sln b/DTXCreatorプロジェクト/DTXCreatorソリューション.sln
@@ -1,13 +1,15 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXCreatorプロジェクト", "DTXCreatorプロジェクト.csproj", "{BAC81BCC-5689-4600-91A0-7427667500D6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FDK19", "..\FDK17プロジェクト\FDK19.csproj", "{BCD40908-F3E2-4707-BFAA-1DD99DF6357D}"
 EndProject
 Global
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
@@ -25,8 +27,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 EndGlobal
diff --git a/DTXCreatorプロジェクト/DTXCreatorプロジェクト.csproj b/DTXCreatorプロジェクト/DTXCreatorプロジェクト.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,16 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DTXCreator</RootNamespace>
     <AssemblyName>DTXCreator</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
     <ApplicationIcon>コード\99.リソース\DTXC.ico</ApplicationIcon>
     <ApplicationManifest>DTXCreator.exe.x86.manifest</ApplicationManifest>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/DTXCreatorプロジェクト/Properties/Resources.Designer.cs b/DTXCreatorプロジェクト/Properties/Resources.Designer.cs
diff --git a/DTXCreatorプロジェクト/Properties/Settings.Designer.cs b/DTXCreatorプロジェクト/Properties/Settings.Designer.cs
diff --git a/DTXCreatorプロジェクト/app.config b/DTXCreatorプロジェクト/app.config
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-	<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/DTXCreatorプロジェクト/コード/00.全体/Cメインフォーム.cs b/DTXCreatorプロジェクト/コード/00.全体/Cメインフォーム.cs
@@ -2233,27 +2233,6 @@ private void Cメインフォーム_DragEnter( object sender, DragEventArgs e )
 				e.Effect = DragDropEffects.None;
 			}
 		}
-        //KSM: Hotkeys without GUI can be processed here
-        //07/05/2016: Added space shortcut key for F8: Switch mode
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-        {
-            if (keyData == Keys.Space)
-            {
-                //KSM: Copied from toolStripMenuItemモード切替_Click handler
-                if (this.b選択モードである)
-                {
-                    this.t編集モードにする();
-                }
-                else
-                {
-                    this.t選択モードにする();
-                }
-                //
-                return true;
-            }
-            return base.ProcessCmdKey(ref msg, keyData);
-        }
-        //
 		private void Cメインフォーム_FormClosing( object sender, FormClosingEventArgs e )
 		{
 			if( this.t未保存なら保存する() == DialogResult.Cancel )

diff --git a/DTXManiaプロジェクト/DTXManiaソリューション.sln b/DTXManiaプロジェクト/DTXManiaソリューション.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXManiaプロジェクト", "DTXManiaプロジェクト.csproj", "{81BEC512-8074-4BD1-8A3C-AC73BC7BF846}"
 EndProject

diff --git a/DTXManiaプロジェクト/DTXManiaプロジェクト.csproj b/DTXManiaプロジェクト/DTXManiaプロジェクト.csproj
@@ -19,12 +19,6 @@
     </AssemblyOriginatorKeyFile>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <ApplicationManifest>DTXManiaGR.exe.x86.manifest</ApplicationManifest>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -39,6 +33,12 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,7 +51,7 @@
     <NoWarn>0219</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -219,11 +219,6 @@
     <Content Include="dtx.ico" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
       <Visible>False</Visible>
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -239,11 +234,6 @@
       <ProductName>.NET Framework 3.5</ProductName>
       <Install>false</Install>
     </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FDK17プロジェクト\FDK19.csproj">

diff --git a/DTXManiaプロジェクト/Properties/AssemblyInfo.cs b/DTXManiaプロジェクト/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DTXManiaGR")]
-[assembly: AssemblyCopyright( "原作:Copyright (C) 2000-2015 DTXMania Group" )]
+[assembly: AssemblyCopyright( "原作:Copyright (C) 2000-2019 DTXMania Group" )]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,7 +33,7 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.4.0.0" )]
+[assembly: AssemblyVersion( "3.6.2.0" )]
 [assembly: AssemblyFileVersion( "0.0.0.0" )]
 [assembly: NeutralResourcesLanguageAttribute("ja-JP")]
 

diff --git a/DTXManiaプロジェクト/Properties/Resources.Designer.cs b/DTXManiaプロジェクト/Properties/Resources.Designer.cs
diff --git a/DTXManiaプロジェクト/Properties/Settings.Designer.cs b/DTXManiaプロジェクト/Properties/Settings.Designer.cs
diff --git a/DTXManiaプロジェクト/app.config b/DTXManiaプロジェクト/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-	<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>