diff --git a/JSharp/App.xaml b/JSharp/App.xaml index 55430e2..8e49a12 100644 --- a/JSharp/App.xaml +++ b/JSharp/App.xaml @@ -3,7 +3,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:JSharp" xmlns:prism="http://prismlibrary.com/"> - - - + + + diff --git a/JSharp/Resources/Themes.xaml b/JSharp/Resources/Themes.xaml new file mode 100644 index 0000000..6c547c6 --- /dev/null +++ b/JSharp/Resources/Themes.xaml @@ -0,0 +1,142 @@ + + + + #333333 + #FFFFFF + #444444 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/JSharp/ViewModels/MainWindowViewModel.cs b/JSharp/ViewModels/MainWindowViewModel.cs index 7603dc0..5254b1b 100644 --- a/JSharp/ViewModels/MainWindowViewModel.cs +++ b/JSharp/ViewModels/MainWindowViewModel.cs @@ -210,12 +210,12 @@ internal void UpdateDescriptor() System.Windows.Point? startPoint = focusedImage.Points[0]; if (startPoint != null) { - sb.Append($", Top-left Point 1: ({focusedImage.Points[0]})"); + sb.Append($", Top-left {WindowSpecific.Point} 1: ({focusedImage.Points[0]})"); System.Windows.Point? endPoint = focusedImage.Points[1]; if (endPoint != null) { - sb.Append($", Bottom-right Point 2: ({FocusedImage.Points[1]})"); + sb.Append($", Bottom-right {WindowSpecific.Point} 2: ({FocusedImage.Points[1]})"); // Calculate the width and height of the rectangle double width = Math.Abs(endPoint.Value.X - startPoint.Value.X); diff --git a/JSharp/Views/MainWindow.xaml b/JSharp/Views/MainWindow.xaml index eb2284c..2db8b72 100644 --- a/JSharp/Views/MainWindow.xaml +++ b/JSharp/Views/MainWindow.xaml @@ -9,7 +9,7 @@ xmlns:prism="http://prismlibrary.com/" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Class="JSharp.MainWindow" mc:Ignorable="d" - Title="JSharp" Height="200" Width="700" ResizeMode="CanMinimize" Closing="Window_Closing" PreviewKeyDown="Window_PreviewKeyDown"> + Title="JSharp" Height="180" Width="700" ResizeMode="CanMinimize" Closing="Window_Closing" PreviewKeyDown="Window_PreviewKeyDown"> @@ -99,8 +99,10 @@ - - + + + + @@ -108,7 +110,7 @@