diff --git a/LegendaryExplorer/LegendaryExplorer/AppResources.xaml b/LegendaryExplorer/LegendaryExplorer/AppResources.xaml index f62bd55a2e..b8fe1a5339 100644 --- a/LegendaryExplorer/LegendaryExplorer/AppResources.xaml +++ b/LegendaryExplorer/LegendaryExplorer/AppResources.xaml @@ -1,28 +1,234 @@ - - /LegendaryExplorer;component/Resources/Fonts/TitilliumWeb-Italic.ttf#Titillium Web - /LegendaryExplorer;component/Resources/Fonts/TitilliumWeb-Light.ttf#Titillium Web - /LegendaryExplorer;component/Resources/Fonts/TitilliumWeb-SemiBold.ttf#Titillium Web - /LegendaryExplorer;component/Resources/Fonts/TitilliumWeb-Regular.ttf#Titillium Web - /LegendaryExplorer;component/Resources/Fonts/Hack-Bold.ttf#Hack - /LegendaryExplorer;component/Resources/Fonts/Exo-SemiBold.ttf#Exo - /LegendaryExplorer;component/Resources/Fonts/Exo-Regular.ttf#Exo - /LegendaryExplorer;component/Resources/Fonts/BIOMASS2-LIGHT.TTF#Biomass2 Light - /LegendaryExplorer;component/Resources/Fonts/BIOMASS2-BOLD.TTF#Biomass2 Bold + - - + + + + + - 300 - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/AddPropertyDialog.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/AddPropertyDialog.xaml index 63f2da0641..dd91ca7038 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/AddPropertyDialog.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/AddPropertyDialog.xaml @@ -1,4 +1,4 @@ -Add New String Range Enter the range of String IDs to add. Blank strings will be created for each ID in the range. - ⚠ Only make strings you need to use. + ? Only make strings you need to use. Do not add unused strings, as these may override other mods using those values. diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/ClassPickerDlg.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/ClassPickerDlg.xaml index be63068b1d..c364fdda57 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/ClassPickerDlg.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/ClassPickerDlg.xaml @@ -1,4 +1,4 @@ - - + - + + + + + + diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/ListDialog.xaml.cs b/LegendaryExplorer/LegendaryExplorer/Dialogs/ListDialog.xaml.cs index 03dcaeb96b..5e0589a9b7 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/ListDialog.xaml.cs +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/ListDialog.xaml.cs @@ -4,6 +4,7 @@ using System.Windows.Input; using LegendaryExplorer.SharedUI.Bases; using LegendaryExplorerCore.Misc; +using MessageBox = Xceed.Wpf.Toolkit.MessageBox; namespace LegendaryExplorer.Dialogs { diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/NamePromptDialog.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/NamePromptDialog.xaml index a2e5cbaf4e..f8c0a4cefb 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/NamePromptDialog.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/NamePromptDialog.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/PromptDialog.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/PromptDialog.xaml index 9c13bf8ea6..ec5fb8b043 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/PromptDialog.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/PromptDialog.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml index ba166c0709..20581156b8 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml.cs b/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml.cs index 6a5284a41f..5b90717817 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml.cs +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/SelectOrAddNamePromptDialog.xaml.cs @@ -7,6 +7,7 @@ using LegendaryExplorerCore.Misc; using LegendaryExplorerCore.Packages; using LegendaryExplorerCore.Unreal; +using MessageBox = Xceed.Wpf.Toolkit.MessageBox; namespace LegendaryExplorer.Dialogs { diff --git a/LegendaryExplorer/LegendaryExplorer/Dialogs/SetWwisePathDialog.xaml b/LegendaryExplorer/LegendaryExplorer/Dialogs/SetWwisePathDialog.xaml index 4ad01590ea..056fdae9cf 100644 --- a/LegendaryExplorer/LegendaryExplorer/Dialogs/SetWwisePathDialog.xaml +++ b/LegendaryExplorer/LegendaryExplorer/Dialogs/SetWwisePathDialog.xaml @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + @@ -68,13 +68,13 @@ - - - - + + IsEnabled="{Binding CurrentLoadedExport, Converter={StaticResource NullEnabledConverter}}" Margin="0" ToolBar.OverflowMode="Never" + Style="{DynamicResource {x:Static ToolBar.TextBoxStyleKey}}"/> + KeyDown="ValueTextBox_KeyDown" ToolBar.OverflowMode="Never" + Style="{DynamicResource {x:Static ToolBar.ComboBoxStyleKey}}"> - + @@ -113,7 +115,8 @@ + IsEnabled="{Binding CurrentLoadedExport, Converter={StaticResource NullEnabledConverter}}" ToolBar.OverflowMode="Never" + Style="{DynamicResource {x:Static ToolBar.TextBoxStyleKey}}"/>