Skip to content

Commit

Permalink
Add tooltips to the layout list button and the equipment preset button (
Browse files Browse the repository at this point in the history
#75)

* Add tooltips to the layout list button

* Add tooltips to the equipment preset button
  • Loading branch information
proudust authored Oct 20, 2020
1 parent f513d85 commit 4ae0ea4
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 7 deletions.
7 changes: 7 additions & 0 deletions X4_ComplexCalculator/Localization/Lang.csv
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ EmpireOverview;Empire overview
Layout;Layout(_L)
SaveLayout;Save layout
LayoutList;Layout list
LayoutSaveButtonToolTip;Overwrite Layout
LayoutEditButtonToolTip;Rename Layout
LayoutRemoveButtonToolTip;Delete Layout
EditLayoutName;Edit layout name
LayoutName;Layout name
LayoutSavedMessage;Saved the layout of plan "{0}" as "{1}".
Expand Down Expand Up @@ -252,6 +255,10 @@ ModuleType;Module type
EditEquipmentWindowTitle;Edit equipment window
EquipmentSize;Equipment size
Preset;Preset
PresetRemoveButtonToolTip;Delete Loadout
PresetAddButtonToolTip;Save as New
PresetEditButtonToolTip;Rename Loadout
PresetSaveButtonToolTip;Overwrite Loadout
List;List
Equiped;Equiped = [{0}/{1}]
EquipmentAddButtonToolTip;You can add a selection at once by clicking while holding down the left Shift key.
Expand Down
7 changes: 7 additions & 0 deletions X4_ComplexCalculator/Localization/Lang.en-US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ EmpireOverview;Empire overview
Layout;Layout(_L)
SaveLayout;Save layout
LayoutList;Layout list
LayoutSaveButtonToolTip;Overwrite Layout
LayoutEditButtonToolTip;Rename Layout
LayoutRemoveButtonToolTip;Delete Layout
EditLayoutName;Edit layout name
LayoutName;Layout name
LayoutSavedMessage;Saved the layout of plan "{0}" as "{1}".
Expand Down Expand Up @@ -252,6 +255,10 @@ ModuleType;Module type
EditEquipmentWindowTitle;Edit equipment window
EquipmentSize;Equipment size
Preset;Preset
PresetRemoveButtonToolTip;Delete Loadout
PresetAddButtonToolTip;Save as New
PresetEditButtonToolTip;Rename Loadout
PresetSaveButtonToolTip;Overwrite Loadout
List;List
Equiped;Equiped = [{0}/{1}]
EquipmentAddButtonToolTip;You can add a selection at once by clicking while holding down the left Shift key.
Expand Down
7 changes: 7 additions & 0 deletions X4_ComplexCalculator/Localization/Lang.ja-JP.csv
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ EmpireOverview;帝国の概要
Layout;レイアウト(_L)
SaveLayout;レイアウト保存
LayoutList;レイアウト一覧
LayoutSaveButtonToolTip;レイアウトを上書き
LayoutEditButtonToolTip;名前を変更
LayoutRemoveButtonToolTip;削除
EditLayoutName;レイアウト名編集
LayoutName;レイアウト名
LayoutSavedMessage;計画「{0}」のレイアウトを「{1}」として保存しました。
Expand Down Expand Up @@ -252,6 +255,10 @@ ModuleType;モジュール種別
EditEquipmentWindowTitle;兵装編集画面
EquipmentSize;装備サイズ
Preset;プリセット
PresetRemoveButtonToolTip;削除
PresetAddButtonToolTip;新規セーブ
PresetEditButtonToolTip;名前を変更
PresetSaveButtonToolTip;兵装を上書き
List;一覧
Equiped;装備中 = [{0}/{1}]
EquipmentAddButtonToolTip;左Shiftキーを押しながらクリックで選択項目を一気に追加できます
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,25 +93,29 @@
Width="20"
Command="{Binding RemovePresetCommand, Mode=OneTime}"
Content="🗑️"
DockPanel.Dock="Right" />
DockPanel.Dock="Right"
ToolTip="{lex:Loc Lang:PresetRemoveButtonToolTip}" />

<Button
Width="20"
Command="{Binding AddPresetCommand, Mode=OneTime}"
Content=""
DockPanel.Dock="Right" />
DockPanel.Dock="Right"
ToolTip="{lex:Loc Lang:PresetAddButtonToolTip}" />

<Button
Width="20"
Command="{Binding EditPresetCommand, Mode=OneTime}"
Content=""
DockPanel.Dock="Right" />
DockPanel.Dock="Right"
ToolTip="{lex:Loc Lang:PresetEditButtonToolTip}" />

<Button
Width="20"
Command="{Binding SavePresetCommand, Mode=OneTime}"
Content="💾"
DockPanel.Dock="Right" />
DockPanel.Dock="Right"
ToolTip="{lex:Loc Lang:PresetSaveButtonToolTip}" />

<ComboBox
x:Name="presetCombobox"
Expand Down
10 changes: 7 additions & 3 deletions X4_ComplexCalculator/Themes/MenuItemThemes.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:local="clr-namespace:X4_ComplexCalculator.Themes">

<!-- 削除ボタン付きMenuItem -->
Expand Down Expand Up @@ -79,17 +80,20 @@
Grid.Column="6"
Margin="2"
Command="{Binding SaveButtonClickedCommand, Mode=OneTime}"
Content="💾" />
Content="💾"
ToolTip="{lex:Loc Lang:LayoutSaveButtonToolTip}" />
<Button
Grid.Column="7"
Margin="2"
Command="{Binding EditButtonClickedCommand, Mode=OneTime}"
Content="" />
Content=""
ToolTip="{lex:Loc Lang:LayoutEditButtonToolTip}" />
<Button
Grid.Column="8"
Margin="2"
Command="{Binding DeleteButtonClickedCommand, Mode=OneTime}"
Content="🗑️" />
Content="🗑️"
ToolTip="{lex:Loc Lang:LayoutRemoveButtonToolTip}" />
</Grid>
</Border>
<ControlTemplate.Triggers>
Expand Down

0 comments on commit 4ae0ea4

Please sign in to comment.