Merge branch 'release/3.1.0.0'

paralleltree · May 8, 2021 · 6cf34c2 · 6cf34c2
2 parents 7cbfee8 + 2a24300
commit 6cf34c2
Show file tree

Hide file tree

Showing 24 changed files with 1,480 additions and 388 deletions.
diff --git a/Ched/Ched.csproj b/Ched/Ched.csproj
@@ -167,6 +167,13 @@
     <Compile Include="Plugins\SlideSplitter.cs" />
     <Compile Include="Plugins\SusExportPlugin.cs" />
     <Compile Include="UI\Helpers.cs" />
+    <Compile Include="UI\Shortcuts\Commands.cs" />
+    <Compile Include="UI\Shortcuts\KeyExtensions.cs" />
+    <Compile Include="UI\Shortcuts\ShortcutCommandSource.cs" />
+    <Compile Include="UI\Shortcuts\ShortcutKeySource.cs" />
+    <Compile Include="UI\Shortcuts\ShortcutManager.cs" />
+    <Compile Include="UI\Shortcuts\ToolStripItemBuilder.cs" />
+    <Compile Include="UI\Windows\Behaviors\HideWindowCloseButtonBehavior.cs" />
     <Compile Include="UI\Windows\Behaviors\InitialFocusBehavior.cs" />
     <Compile Include="UI\Windows\Behaviors\OpenFileBehavior.cs" />
     <Compile Include="UI\Windows\Behaviors\StyleBehaviorCollection.cs" />
@@ -243,13 +250,18 @@
       <DependentUpon>VersionInfoForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Windows\Converters\BitmapImageSourceConverter.cs" />
+    <Compile Include="UI\Windows\Converters\ShortcutKeyTextConverter.cs" />
     <Compile Include="UI\Windows\DiagnosticsWindow.xaml.cs">
       <DependentUpon>DiagnosticsWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="UI\Windows\EnumSourceProvider.cs" />
+    <Compile Include="UI\Windows\ShortcutSettingsWindow.xaml.cs">
+      <DependentUpon>ShortcutSettingsWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UI\Windows\SusExportWindow.xaml.cs">
       <DependentUpon>SusExportWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UI\Windows\ViewModel.cs" />
     <Compile Include="UI\Windows\WpfExtensions.cs" />
     <EmbeddedResource Include="Localization\ErrorStrings.en.resx" />
     <EmbeddedResource Include="Localization\ErrorStrings.resx">
@@ -452,6 +464,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Windows\ShortcutSettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UI\Windows\SusExportWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Ched/Components/Exporter/SusExporter.cs b/Ched/Components/Exporter/SusExporter.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -44,7 +45,7 @@ public void Export(Stream stream)
                 writer.WriteLine("#PLAYLEVEL {0}", args.PlayLevel);
                 writer.WriteLine("#SONGID \"{0}\"", args.SongId);
                 writer.WriteLine("#WAVE \"{0}\"", args.SoundFileName);
-                writer.WriteLine("#WAVEOFFSET {0}", args.SoundOffset);
+                writer.WriteLine("#WAVEOFFSET {0}", args.SoundOffset.ToString(CultureInfo.InvariantCulture));
                 writer.WriteLine("#JACKET \"{0}\"", args.JacketFilePath);
                 writer.WriteLine();
 
@@ -71,7 +72,7 @@ public void Export(Stream stream)
                 var bpmIdentifiers = EnumerateIdentifiers(2, NumChars.Concat(AlphaChars)).Skip(1).Take(bpmlist.Count).ToList();
                 foreach (var item in bpmlist.GroupBy(p => p.Index).Select(p => p.First()))
                 {
-                    writer.WriteLine("#BPM{0}: {1}", bpmIdentifiers[item.Index], item.Value.Bpm);
+                    writer.WriteLine("#BPM{0}: {1}", bpmIdentifiers[item.Index], item.Value.Bpm.ToString(CultureInfo.InvariantCulture));
                 }
 
                 // 小節オフセット追加用に初期BPM定義だけ1行に分離
@@ -88,7 +89,7 @@ public void Export(Stream stream)
                 var speeds = book.Score.Events.HighSpeedChangeEvents.Select(p =>
                 {
                     var barPos = BarIndexCalculator.GetBarPositionFromTick(p.Tick);
-                    return string.Format("{0}'{1}:{2}", barPos.BarIndex + (p.Tick == 0 ? 0 : BarIndexOffset), barPos.TickOffset, p.SpeedRatio);
+                    return string.Format("{0}'{1}:{2}", barPos.BarIndex + (p.Tick == 0 ? 0 : BarIndexOffset), barPos.TickOffset, p.SpeedRatio.ToString(CultureInfo.InvariantCulture));
                 });
                 writer.WriteLine("#TIL00: \"{0}\"", string.Join(", ", speeds));
                 writer.WriteLine("#HISPEED 00");

diff --git a/Ched/Localization/MainFormStrings.Designer.cs b/Ched/Localization/MainFormStrings.Designer.cs
diff --git a/Ched/Localization/MainFormStrings.en.resx b/Ched/Localization/MainFormStrings.en.resx
@@ -318,4 +318,19 @@
   <data name="InsertSingleBlankAtBeginning" xml:space="preserve">
     <value>Insert a single blank space at the beginning</value>
   </data>
+  <data name="KeyboardShortcuts" xml:space="preserve">
+    <value>Keyboard Shortcuts</value>
+  </data>
+  <data name="Clear" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Command" xml:space="preserve">
+    <value>Command</value>
+  </data>
+  <data name="KeyCombination" xml:space="preserve">
+    <value>Key Combination</value>
+  </data>
+  <data name="ResetAll" xml:space="preserve">
+    <value>Reset All</value>
+  </data>
 </root>
diff --git a/Ched/Localization/MainFormStrings.resx b/Ched/Localization/MainFormStrings.resx
@@ -318,4 +318,19 @@
   <data name="InsertSingleBlankAtBeginning" xml:space="preserve">
     <value>先頭に1小節の空白を挿入する</value>
   </data>
+  <data name="KeyboardShortcuts" xml:space="preserve">
+    <value>ショートカット設定</value>
+  </data>
+  <data name="Clear" xml:space="preserve">
+    <value>クリア</value>
+  </data>
+  <data name="Command" xml:space="preserve">
+    <value>コマンド</value>
+  </data>
+  <data name="KeyCombination" xml:space="preserve">
+    <value>ショートカットキー</value>
+  </data>
+  <data name="ResetAll" xml:space="preserve">
+    <value>初期化</value>
+  </data>
 </root>
diff --git a/Ched/Properties/AssemblyInfo.cs b/Ched/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("4c0c9f98-6fcf-4d2f-b821-37a66362dc75")]
 
-[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
 
 [assembly: DisableDpiAwareness]