diff --git a/src/GM.WPF/GM.WPF.Test/App.xaml.cs b/src/GM.WPF/GM.WPF.Test/App.xaml.cs
index 9a2c0d0..6e3581c 100644
--- a/src/GM.WPF/GM.WPF.Test/App.xaml.cs
+++ b/src/GM.WPF/GM.WPF.Test/App.xaml.cs
@@ -37,9 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
namespace GM.WPF.Test
{
- ///
- /// Interaction logic for App.xaml
- ///
public partial class App : Application
{
private MainWindow mainWindow;
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml
new file mode 100644
index 0000000..c385c71
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml.cs
new file mode 100644
index 0000000..aa9155c
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/ControlsTest.xaml.cs
@@ -0,0 +1,54 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls
+{
+ public partial class ControlsTest : BaseControl
+ {
+ public ControlsTest()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml
new file mode 100644
index 0000000..a943fb1
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some random content ...
+ Some random content ...
+ Some random content ...
+ Some random content ...
+ Some random content ...
+ Some random content ...
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml.cs
new file mode 100644
index 0000000..bc3ce43
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTest.xaml.cs
@@ -0,0 +1,57 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls
+{
+ public partial class ProgressOverlayTest : BaseControl
+ {
+ public ProgressOverlayTest()
+ {
+ InitializeComponent();
+
+ var vm = new ProgressOverlayTestViewModel();
+ ViewModel = vm;
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTestViewModel.cs b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTestViewModel.cs
new file mode 100644
index 0000000..2937ca1
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/ProgressOverlayTestViewModel.cs
@@ -0,0 +1,78 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GM.WPF.MVVM;
+
+namespace GM.WPF.Test.Controls
+{
+ class ProgressOverlayTestViewModel:ViewModel
+ {
+ public string Message { get; set; }
+
+ private double? _value;
+ public double? Value
+ {
+ get => _value;
+ set
+ {
+ _value = value;
+ if(value != null) {
+ IsIndeterminate = false;
+ }
+ }
+ }
+
+ private bool _isIndeterminate;
+ public bool IsIndeterminate
+ {
+ get => _isIndeterminate;
+ set
+ {
+ _isIndeterminate = value;
+ if(value) {
+ Value = null;
+ } else if(Value == null) {
+ Value = 0;
+ }
+ }
+ }
+
+ public ProgressOverlayTestViewModel()
+ {
+ if(IsInDesignMode) {
+ Message = "Loading ...";
+ return;
+ }
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml
new file mode 100644
index 0000000..ecdf2dc
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml.cs
new file mode 100644
index 0000000..b9a3fe4
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimeControlTest.xaml.cs
@@ -0,0 +1,75 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls
+{
+ public partial class TimeControlTest : BaseControl
+ {
+ public TimeControlTest()
+ {
+ InitializeComponent();
+ }
+
+ private void Top_TimeChanged(object sender, TimeSpan e)
+ {
+ TimeChanged(e, _TextBox_Event_Top);
+ }
+
+ private void Bottom_TimeChanged(object sender, TimeSpan e)
+ {
+ TimeChanged(e, _TextBox_Event_Bottom);
+ }
+
+ private void TimeChanged(TimeSpan newValue, TextBox associatedTextBox)
+ {
+ string text = $"TimeChanged event fired. Current time value: {newValue}";
+ if(!string.IsNullOrEmpty(associatedTextBox.Text)) {
+ text = Environment.NewLine + text;
+ }
+
+ associatedTextBox.AppendText(text);
+ associatedTextBox.ScrollToEnd();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml
new file mode 100644
index 0000000..8d070ef
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml.cs
new file mode 100644
index 0000000..8611711
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTest.xaml.cs
@@ -0,0 +1,54 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls
+{
+ public partial class TimePickerTest : BaseControl
+ {
+ public TimePickerTest()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml
new file mode 100644
index 0000000..d9c8aa0
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml.cs
new file mode 100644
index 0000000..aa1c4d7
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTest.xaml.cs
@@ -0,0 +1,68 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.Utility;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ public partial class TimePickerBindingTest : BaseControl
+ {
+ public TimePickerBindingTest()
+ {
+ InitializeComponent();
+
+ var vm = new TimePickerBindingTestViewModel();
+ vm.PropertyChanged += Vm_PropertyChanged;
+ ViewModel = vm;
+ }
+
+ private void Vm_PropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ var vm = (TimePickerBindingTestViewModel)ViewModel;
+
+ _TextBox.Text += $"ViewModel property changed: {e.PropertyName}={vm.GetPropertyValue(e.PropertyName)}"+Environment.NewLine;
+ _TextBox.ScrollToEnd();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTestViewModel.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTestViewModel.cs
new file mode 100644
index 0000000..ce9b5ff
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerBindingTestViewModel.cs
@@ -0,0 +1,67 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GalaSoft.MvvmLight.CommandWpf;
+using GM.WPF.MVVM;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ class TimePickerBindingTestViewModel:ViewModel
+ {
+ public RelayCommand Command_SetValueToCurrentTime { get; private set; }
+ public RelayCommand Command_SetValueToNull { get; private set; }
+
+ public TimeSpan? SelectedTime { get; set; }
+
+ public TimePickerBindingTestViewModel()
+ {
+ if(IsInDesignMode) {
+ SelectedTime = DateTime.Now.TimeOfDay;
+ return;
+ }
+
+ Command_SetValueToCurrentTime = new RelayCommand(SetValueToCurrentTime);
+ Command_SetValueToNull = new RelayCommand(SetValueToNull);
+ }
+
+ private void SetValueToCurrentTime()
+ {
+ SelectedTime = DateTime.Now.TimeOfDay;
+ }
+
+ private void SetValueToNull()
+ {
+ SelectedTime = null;
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml
new file mode 100644
index 0000000..6b595e7
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml.cs
new file mode 100644
index 0000000..e598a46
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerGeneralTest.xaml.cs
@@ -0,0 +1,95 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ public partial class TimePickerGeneralTest : BaseControl
+ {
+ public TimePickerGeneralTest()
+ {
+ InitializeComponent();
+ }
+
+ private void Left_SelectedTimeChanged(object sender, TimeSpan e)
+ {
+ EventOccured(nameof(TimePicker.SelectedTimeChanged), (TimePicker)sender, _Event_TextBox_Left);
+ }
+
+ private void Right_SelectedTimeChanged(object sender, TimeSpan e)
+ {
+ EventOccured(nameof(TimePicker.SelectedTimeChanged), (TimePicker)sender, _Event_TextBox_Right);
+ }
+
+ private void Left_SelectedTimeSelected(object sender, TimeSpan e)
+ {
+ EventOccured(nameof(TimePicker.SelectedTimeSelected), (TimePicker)sender, _Event_TextBox_Left);
+ }
+
+ private void Right_SelectedTimeSelected(object sender, TimeSpan e)
+ {
+ EventOccured(nameof(TimePicker.SelectedTimeSelected), (TimePicker)sender, _Event_TextBox_Right);
+ }
+
+ private void Left_PopupOpened(object sender, EventArgs e)
+ {
+ EventOccured(nameof(TimePicker.PopupOpened), (TimePicker)sender, _Event_TextBox_Left);
+ }
+
+ private void Right_PopupOpened(object sender, EventArgs e)
+ {
+ EventOccured(nameof(TimePicker.PopupOpened), (TimePicker)sender, _Event_TextBox_Right);
+ }
+
+ private void EventOccured(string eventName, TimePicker timePicker, TextBox associatedTextBox)
+ {
+ string text = $"{eventName}: {timePicker.SelectedTime}";
+ if(!string.IsNullOrEmpty(associatedTextBox.Text)) {
+ text = Environment.NewLine + text;
+ }
+
+ associatedTextBox.AppendText(text);
+ associatedTextBox.ScrollToEnd();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml
new file mode 100644
index 0000000..4359aef
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml.cs
new file mode 100644
index 0000000..5bc17c5
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTest.xaml.cs
@@ -0,0 +1,77 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using GM.Utility;
+using GM.WPF.Controls;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ public partial class TimePickerInDataGridTest : BaseControl
+ {
+ public TimePickerInDataGridTest()
+ {
+ InitializeComponent();
+
+ var vm = new TimePickerInDataGridTestViewModel();
+ vm.PropertyChanged += Vm_PropertyChanged;
+ vm.Items.ForEach(m => m.PropertyChanged += M_PropertyChanged);
+ ViewModel = vm;
+ }
+
+ private void Vm_PropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ var vm = (TimePickerBindingTestViewModel)ViewModel;
+
+ _TextBox.Text += $"ViewModel property changed: {e.PropertyName}={vm.GetPropertyValue(e.PropertyName)}" + Environment.NewLine;
+ _TextBox.ScrollToEnd();
+ }
+
+ private void M_PropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ var m = (TimePickerInDataGridTestModel)sender;
+
+ _TextBox.Text += $"Item property changed: {e.PropertyName}={m.GetPropertyValue(e.PropertyName)}" + Environment.NewLine;
+ _TextBox.ScrollToEnd();
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestModel.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestModel.cs
new file mode 100644
index 0000000..2da0c03
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestModel.cs
@@ -0,0 +1,44 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GalaSoft.MvvmLight;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ class TimePickerInDataGridTestModel : ObservableObject
+ {
+ public string Name { get; set; }
+ public TimeSpan Time1 { get; set; }
+ public TimeSpan Time2 { get; set; }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestViewModel.cs b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestViewModel.cs
new file mode 100644
index 0000000..965e03d
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/Controls/TimePickerTests/TimePickerInDataGridTestViewModel.cs
@@ -0,0 +1,61 @@
+/*
+MIT License
+
+Copyright (c) 2018 Grega Mohorko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Project: GM.WPF.Test
+Created: 2018-12-26
+Author: GregaMohorko
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GM.WPF.MVVM;
+
+namespace GM.WPF.Test.Controls.TimePickerTests
+{
+ class TimePickerInDataGridTestViewModel:ViewModel
+ {
+ public List Items { get; private set; }
+
+ public TimePickerInDataGridTestViewModel()
+ {
+ Items = new List
+ {
+ new TimePickerInDataGridTestModel
+ {
+ Name="Test item 1",
+ Time1=DateTime.Now.TimeOfDay,
+ Time2=new TimeSpan(1,2,3)
+ },
+ new TimePickerInDataGridTestModel
+ {
+ Name="Test item 2",
+ Time1=new TimeSpan(),
+ Time2=new TimeSpan(4,5,6)
+ }
+ };
+ }
+ }
+}
diff --git a/src/GM.WPF/GM.WPF.Test/FodyWeavers.xml b/src/GM.WPF/GM.WPF.Test/FodyWeavers.xml
index d067df2..16f0a2d 100644
--- a/src/GM.WPF/GM.WPF.Test/FodyWeavers.xml
+++ b/src/GM.WPF/GM.WPF.Test/FodyWeavers.xml
@@ -1,4 +1,4 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/src/GM.WPF/GM.WPF.Test/FodyWeavers.xsd b/src/GM.WPF/GM.WPF.Test/FodyWeavers.xsd
new file mode 100644
index 0000000..2f1b8aa
--- /dev/null
+++ b/src/GM.WPF/GM.WPF.Test/FodyWeavers.xsd
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+ Used to control if the On_PropertyName_Changed feature is enabled.
+
+
+
+
+ Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.
+
+
+
+
+ Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.
+
+
+
+
+ Used to control if equality checks should use the Equals method resolved from the base class.
+
+
+
+
+ Used to control if equality checks should use the static Equals method resolved from the base class.
+
+
+
+
+
+
+
+ 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
+
+
+
+
+ A comma-separated list of error codes that can be safely ignored in assembly verification.
+
+
+
+
+ 'false' to turn off automatic generation of the XML Schema file.
+
+
+
+
+
\ No newline at end of file
diff --git a/src/GM.WPF/GM.WPF.Test/GM.WPF.Test.csproj b/src/GM.WPF/GM.WPF.Test/GM.WPF.Test.csproj
index 8fd118b..88f6a4d 100644
--- a/src/GM.WPF/GM.WPF.Test/GM.WPF.Test.csproj
+++ b/src/GM.WPF/GM.WPF.Test/GM.WPF.Test.csproj
@@ -1,6 +1,6 @@
-
+ Debug
@@ -49,11 +49,11 @@
..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
- ..\packages\GM.Utility.1.2.6\lib\netstandard2.0\GM.Utility.dll
+
+ ..\packages\GM.Utility.1.2.7\lib\netstandard2.0\GM.Utility.dll
-
- ..\packages\PropertyChanged.Fody.2.5.13\lib\net452\PropertyChanged.dll
+
+ ..\packages\PropertyChanged.Fody.2.6.0\lib\net452\PropertyChanged.dll
@@ -78,6 +78,34 @@
MSBuild:CompileDesigner
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+ MSBuild:CompileDesigner
@@ -86,6 +114,31 @@
App.xamlCode
+
+ ControlsTest.xaml
+
+
+ ProgressOverlayTest.xaml
+
+
+
+ TimeControlTest.xaml
+
+
+ TimePickerTest.xaml
+
+
+ TimePickerBindingTest.xaml
+
+
+
+ TimePickerGeneralTest.xaml
+
+
+ TimePickerInDataGridTest.xaml
+
+
+ MainWindow.xamlCode
@@ -136,8 +189,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/GM.WPF/GM.WPF.Test/MainWindow.xaml b/src/GM.WPF/GM.WPF.Test/MainWindow.xaml
index df59e5c..113134b 100644
--- a/src/GM.WPF/GM.WPF.Test/MainWindow.xaml
+++ b/src/GM.WPF/GM.WPF.Test/MainWindow.xaml
@@ -35,6 +35,7 @@ Author: Grega Mohorko
xmlns:controls="clr-namespace:GM.WPF.Controls;assembly=GM.WPF"
xmlns:dialogs="clr-namespace:GM.WPF.Controls.Dialogs;assembly=GM.WPF"
xmlns:converters="clr-namespace:GM.WPF.Converters;assembly=GM.WPF"
+ xmlns:controlsTests="clr-namespace:GM.WPF.Test.Controls"
mc:Ignorable="d"
Title="GM.WPF.Test"
Height="700"
@@ -69,75 +70,8 @@ Author: Grega Mohorko
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some random content ...
- Some random content ...
- Some random content ...
- Some random content ...
- Some random content ...
- Some random content ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/GM.WPF/GM.WPF.Test/MainWindow.xaml.cs b/src/GM.WPF/GM.WPF.Test/MainWindow.xaml.cs
index d8f2219..2ed4327 100644
--- a/src/GM.WPF/GM.WPF.Test/MainWindow.xaml.cs
+++ b/src/GM.WPF/GM.WPF.Test/MainWindow.xaml.cs
@@ -48,9 +48,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
namespace GM.WPF.Test
{
- ///
- /// Interaction logic for MainWindow.xaml
- ///
public partial class MainWindow : BaseWindow, IDisposable
{
public MainWindow()
@@ -192,71 +189,5 @@ private async void MenuItem_Dialogs_Select_Single_Click(object sender, RoutedEve
#endregion // Dialogs
#endregion // MainMenu
-
- #region TimeControl
- private void TimeControl_Top_TimeChanged(object sender, TimeSpan e)
- {
- TimeControl_TimeChanged(e, _TimeControl_Event_TextBox_Top);
- }
-
- private void TimeControl_Bottom_TimeChanged(object sender, TimeSpan e)
- {
- TimeControl_TimeChanged(e, _TimeControl_Event_TextBox_Bottom);
- }
-
- private void TimeControl_TimeChanged(TimeSpan newValue, TextBox associatedTextBox)
- {
- string text = $"TimeChanged event fired. Current time value: {newValue}";
- if(!string.IsNullOrEmpty(associatedTextBox.Text)) {
- text = Environment.NewLine + text;
- }
-
- associatedTextBox.AppendText(text);
- associatedTextBox.ScrollToEnd();
- }
- #endregion // TimeControl
-
- #region TimePicker
- private void TimePicker_Left_SelectedTimeChanged(object sender, TimeSpan e)
- {
- TimePicker_EventOccured(nameof(TimePicker.SelectedTimeChanged), (TimePicker)sender, _TimePicker_Event_TextBox_Left);
- }
-
- private void TimePicker_Right_SelectedTimeChanged(object sender, TimeSpan e)
- {
- TimePicker_EventOccured(nameof(TimePicker.SelectedTimeChanged), (TimePicker)sender, _TimePicker_Event_TextBox_Right);
- }
-
- private void TimePicker_Left_SelectedTimeSelected(object sender, TimeSpan e)
- {
- TimePicker_EventOccured(nameof(TimePicker.SelectedTimeSelected), (TimePicker)sender, _TimePicker_Event_TextBox_Left);
- }
-
- private void TimePicker_Right_SelectedTimeSelected(object sender, TimeSpan e)
- {
- TimePicker_EventOccured(nameof(TimePicker.SelectedTimeSelected), (TimePicker)sender, _TimePicker_Event_TextBox_Right);
- }
-
- private void TimePicker_Left_PopupOpened(object sender, EventArgs e)
- {
- TimePicker_EventOccured(nameof(TimePicker.PopupOpened), (TimePicker)sender, _TimePicker_Event_TextBox_Left);
- }
-
- private void TimePicker_Right_PopupOpened(object sender, EventArgs e)
- {
- TimePicker_EventOccured(nameof(TimePicker.PopupOpened), (TimePicker)sender, _TimePicker_Event_TextBox_Right);
- }
-
- private void TimePicker_EventOccured(string eventName, TimePicker timePicker, TextBox associatedTextBox)
- {
- string text = $"{eventName}: {timePicker.SelectedTime}";
- if(!string.IsNullOrEmpty(associatedTextBox.Text)) {
- text = Environment.NewLine + text;
- }
-
- associatedTextBox.AppendText(text);
- associatedTextBox.ScrollToEnd();
- }
- #endregion // TimePicker
}
}
diff --git a/src/GM.WPF/GM.WPF.Test/MainWindowViewModel.cs b/src/GM.WPF/GM.WPF.Test/MainWindowViewModel.cs
index 9e71009..6192098 100644
--- a/src/GM.WPF/GM.WPF.Test/MainWindowViewModel.cs
+++ b/src/GM.WPF/GM.WPF.Test/MainWindowViewModel.cs
@@ -38,40 +38,5 @@ namespace GM.WPF.Test
class MainWindowViewModel : ViewModel
{
public bool IsDialogProgressShown { get; set; }
-
- #region PROGRESS OVERLAY
- public string ProgressOverlay_Message { get; set; }
- private double? _progressOverlay_Value;
- public double? ProgressOverlay_Value
- {
- get => _progressOverlay_Value;
- set
- {
- _progressOverlay_Value = value;
- if(value != null) {
- ProgressOverlay_IsIndeterminate = false;
- }
- }
- }
- private bool _progressOverlay_IsIndeterminate;
- public bool ProgressOverlay_IsIndeterminate
- {
- get => _progressOverlay_IsIndeterminate;
- set
- {
- _progressOverlay_IsIndeterminate = value;
- if(value) {
- ProgressOverlay_Value = null;
- } else if(ProgressOverlay_Value==null) {
- ProgressOverlay_Value = 0;
- }
- }
- }
- #endregion // ProgressOverlay
-
- public MainWindowViewModel()
- {
- ProgressOverlay_Message = "Loading ...";
- }
}
}
diff --git a/src/GM.WPF/GM.WPF.Test/packages.config b/src/GM.WPF/GM.WPF.Test/packages.config
index 79716a2..a2f1c06 100644
--- a/src/GM.WPF/GM.WPF.Test/packages.config
+++ b/src/GM.WPF/GM.WPF.Test/packages.config
@@ -28,8 +28,8 @@ Author: Grega Mohorko
-->
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/GM.WPF/GM.WPF/GM.WPF.nuspec b/src/GM.WPF/GM.WPF/GM.WPF.nuspec
index f6440f6..d5c9032 100644
--- a/src/GM.WPF/GM.WPF/GM.WPF.nuspec
+++ b/src/GM.WPF/GM.WPF/GM.WPF.nuspec
@@ -11,8 +11,14 @@
https://mohorko.info/favicon.icofalse$description$
- Fixed a bug in the DependencyVMProperty when the name of the view models property differs from the controls.$copyright$WPF MVVM controls utility extensions dialogs converters behaviors windows
+ Added: PanelBehavior.Spacing, GMDataGrid, collection converters, BindingUtility, TreeViewUtility.
+Improved dialogs:
+ - InputDialog: Added support for any type of input
+ - SelectDialog:
+ - support for custom convertion of items to text
+ - support for DataGrid with custom columns
+Fixed TimePicker not working in DataGrid.
diff --git a/src/GM.WPF/GM.WPF/Properties/AssemblyInfo.cs b/src/GM.WPF/GM.WPF/Properties/AssemblyInfo.cs
index 4f46ecc..a4d62e5 100644
--- a/src/GM.WPF/GM.WPF/Properties/AssemblyInfo.cs
+++ b/src/GM.WPF/GM.WPF/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.2")]
-[assembly: AssemblyFileVersion("1.0.1.2")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]