diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
index b4269b42b..40fa3891c 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
@@ -1852,6 +1852,33 @@ public static string Settings_Operation {
}
}
+ ///
+ /// Looks up a localized string similar to 艦隊自動選択.
+ ///
+ public static string Settings_Operation_AutomaticFleetSelection {
+ get {
+ return ResourceManager.GetString("Settings_Operation_AutomaticFleetSelection", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 艦隊の編成を変更したとき、その艦隊を自動的に選択する.
+ ///
+ public static string Settings_Operation_AutomaticFleetSelection_OnOrganisation {
+ get {
+ return ResourceManager.GetString("Settings_Operation_AutomaticFleetSelection_OnOrganisation", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 艦隊が出撃したとき、その艦隊を自動的に選択する.
+ ///
+ public static string Settings_Operation_AutomaticFleetSelection_OnSortie {
+ get {
+ return ResourceManager.GetString("Settings_Operation_AutomaticFleetSelection_OnSortie", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 旗艦に工作艦が編成されているときは出撃可能と判断しない.
///
@@ -2491,6 +2518,33 @@ public static string Settings_Window_Layout_SingleWindow {
}
}
+ ///
+ /// Looks up a localized string similar to タスク バー設定.
+ ///
+ public static string Settings_Window_Taskbar {
+ get {
+ return ResourceManager.GetString("Settings_Window_Taskbar", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to インジケーターの動作.
+ ///
+ public static string Settings_Window_Taskbar_IndicatorBehaviour {
+ get {
+ return ResourceManager.GetString("Settings_Window_Taskbar_IndicatorBehaviour", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to インジケーターの動作 (出撃中).
+ ///
+ public static string Settings_Window_Taskbar_IndicatorBehaviour_OnSortie {
+ get {
+ return ResourceManager.GetString("Settings_Window_Taskbar_IndicatorBehaviour_OnSortie", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to ウィンドウを常に最前面に表示する.
///
@@ -3778,6 +3832,15 @@ public static string System_Flash_Not_Installed_Text {
}
}
+ ///
+ /// Looks up a localized string similar to 使用しない.
+ ///
+ public static string TaskbarIndicator_DoNotUse {
+ get {
+ return ResourceManager.GetString("TaskbarIndicator_DoNotUse", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to ツール.
///
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
index 7dfccbe4a..efe4e5f32 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -1399,8 +1399,29 @@ Small Radar LoS × (1.00) + Large Radar LoS × (0.99) +
Check that the flagship is not a repair ship
+
+ Automatically select fleets
+
+
+ When fleet composition is changed
+
+
+ When a fleet sorties
+
+
+ Taskbar Button Settings
+
+
+ Indicator behaviour
+
+
+ Indicator behaviour during sortie
+
+
+ Disable
+
- Repair ETA
+ Repairs
Time until the repairs finish.
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
index 7b6b385c2..514b0f785 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1403,6 +1403,27 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
旗艦に工作艦が編成されているときは出撃可能と判断しない
+
+ 艦隊自動選択
+
+
+ 艦隊の編成を変更したとき、その艦隊を自動的に選択する
+
+
+ 艦隊が出撃したとき、その艦隊を自動的に選択する
+
+
+ タスク バー設定
+
+
+ インジケーターの動作
+
+
+ インジケーターの動作 (出撃中)
+
+
+ 使用しない
+
修復時間
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs
index 0368874a0..0bd7f7825 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs
@@ -76,7 +76,7 @@ public WindowSettingsViewModel()
DisplayViewModel.Create(ExitConfirmationType.Always, Resources.Settings_Window_ConfirmExit_Always),
};
this.TaskbarProgressFeatures = EnumerableEx
- .Return(GeneralSettings.TaskbarProgressSource.ToDefaultDisplay("使用しない"))
+ .Return(GeneralSettings.TaskbarProgressSource.ToDefaultDisplay(Resources.TaskbarIndicator_DoNotUse))
.Concat(TaskbarProgress.Features.ToDisplay(x => x.Id, x => x.DisplayName))
.ToList();
}
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
index 3b985ad6e..3feb2f354 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
@@ -89,15 +89,15 @@
-
-
-
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml
index 1cb4d022a..1c9f8dc3e 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml
@@ -92,6 +92,9 @@
+
+
+
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Window.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Window.xaml
index fca1e6039..75e39436c 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Window.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Window.xaml
@@ -15,34 +15,34 @@
d:DesignWidth="540"
d:DesignHeight="600"
d:DataContext="{d:DesignInstance vms:WindowSettingsViewModel}"
- Background="{DynamicResource ThemeBrushKey}">
-
-
-
-
-
-
-
-
-
+ Background="{DynamicResource ThemeBrushKey}">
+
+
+
+
+
+
+
+
+
-
+ Style="{DynamicResource SettingsHeaderTextStyleKey}" />
+
+ Margin="0,0,10,0" />
-
-
+ MinWidth="140" />
+
+
-
-
@@ -58,7 +58,7 @@
+ Text="{Binding Resources.Settings_Window_Taskbar_IndicatorBehaviour, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
+ Text="{Binding Resources.Settings_Window_Taskbar_IndicatorBehaviour_OnSortie, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
-
+
-
+
@@ -87,287 +87,287 @@
MethodName="SetLocationLeft"
Padding="20,4"
Margin="20,0,0,0"
- HorizontalAlignment="Left">
-
+ HorizontalAlignment="Left">
+
+ HorizontalAlignment="Center" />
-
-
-
-
+ HorizontalAlignment="Center" />
+
+
+
+
-
+
-
-
+
+
-
+ Margin="16,0,0,5">
+
-
+ Value="{DynamicResource InactiveForegroundBrushKey}" />
+
+
+
+
-
+ Value="{DynamicResource AccentForegroundBrushKey}" />
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+ Value="{DynamicResource HighlightBackgroundBrushKey}" />
+
+
+
+
+
+ IsEnabled="{Binding ElementName=MergedCheckBox, Path=IsChecked}">
+ Height="48" />
-
+ vs:Window.IsDockMatched="{Binding DockTop}" />
+
-
-
-
+ vs:Window.IsDockMatched="{Binding DockLeft}" />
+
+
+
-
+ vs:Window.IsDockMatched="{Binding DockRight}" />
+
-
-
-
-
-
-
-
-
-
-
+ Value="{DynamicResource HighlightBackgroundBrushKey}" />
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ IsEnabled="{Binding ElementName=SplitCheckBox, Path=IsChecked}">
+
+
+
+
+
+
+
+
+
+
+
-
+ Margin="12">
+
-
-
+ Value="{DynamicResource ActiveForegroundBrushKey}" />
+
+
+
-
-
-
-
-
+ Style="{DynamicResource KanColleMarkStyleKey}" />
+
+
+
+
+
@@ -376,19 +376,19 @@
Content="{Binding Resources.Common_Apply, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
MinWidth="110"
Padding="16,6"
- Margin="4,2" />
+ Margin="4,2" />
-
-
+ Margin="4,2" />
+
+
-
+
-
-
-
+
+
+