Tidy up View names

saddam213 · saddam213 · commit b9f99a7debc6 · 2023-11-20T11:37:41.000+13:00
diff --git a/OnnxStack.UI/MainWindow.xaml b/OnnxStack.UI/MainWindow.xaml
@@ -51,7 +51,7 @@
                         <TextBlock Text="Image To Image" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:ImageToImage UISettings="{Binding UISettings}" Margin="0,6,0,0"/>
+                <views:ImageToImageView UISettings="{Binding UISettings}" Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Image Inpaint-->
@@ -66,7 +66,7 @@
                         <TextBlock Text="Image Inpaint" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:ImageInpaint UISettings="{Binding UISettings}" Margin="0,6,0,0"/>
+                <views:ImageInpaintView UISettings="{Binding UISettings}" Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Log Window-->
@@ -78,7 +78,7 @@
                         </StackPanel>
                     </StackPanel>
                 </TabItem.Header>
-                <views:Logger UISettings="{Binding UISettings}" LogOutput="{Binding OutputLog, Mode=TwoWay}" Margin="0,6,0,0"/>
+                <views:LoggerView UISettings="{Binding UISettings}" LogOutput="{Binding OutputLog, Mode=TwoWay}" Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Settings Window-->
@@ -90,7 +90,7 @@
                         </StackPanel>
                     </StackPanel>
                 </TabItem.Header>
-                <views:Settings UISettings="{Binding UISettings, Mode=TwoWay}" Margin="0,6,0,0"/>
+                <views:SettingsView UISettings="{Binding UISettings, Mode=TwoWay}" Margin="0,6,0,0"/>
             </TabItem>
 
 
diff --git a/OnnxStack.UI/Models/BatchOptionsModel.cs b/OnnxStack.UI/Models/BatchOptionsModel.cs
@@ -16,7 +16,7 @@ public class BatchOptionsModel : INotifyPropertyChanged
         private int _batchValue;
         private int _batchsValue = 1;
         private int _realtimeRefreshRate = 1000;
-        private bool _disableHistory;
+        private bool _disableHistory = true;
 
         public BatchOptionType BatchType
         {
diff --git a/OnnxStack.UI/Views/ImageInpaintView.xaml b/OnnxStack.UI/Views/ImageInpaintView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="OnnxStack.UI.Views.ImageInpaint"
+﻿<UserControl x:Class="OnnxStack.UI.Views.ImageInpaintView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OnnxStack.UI/Views/ImageInpaintView.xaml.cs b/OnnxStack.UI/Views/ImageInpaintView.xaml.cs
@@ -21,11 +21,11 @@
 namespace OnnxStack.UI.Views
 {
     /// <summary>
-    /// Interaction logic for ImageInpaint.xaml
+    /// Interaction logic for ImageInpaintView.xaml
     /// </summary>
-    public partial class ImageInpaint : UserControl, INavigatable, INotifyPropertyChanged
+    public partial class ImageInpaintView : UserControl, INavigatable, INotifyPropertyChanged
     {
-        private readonly ILogger<ImageInpaint> _logger;
+        private readonly ILogger<ImageInpaintView> _logger;
         private readonly IStableDiffusionService _stableDiffusionService;
 
         private bool _hasResult;
@@ -47,13 +47,13 @@ public partial class ImageInpaint : UserControl, INavigatable, INotifyPropertyCh
 
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageInpaint"/> class.
+        /// Initializes a new instance of the <see cref="ImageInpaintView"/> class.
         /// </summary>
-        public ImageInpaint()
+        public ImageInpaintView()
         {
             if (!DesignerProperties.GetIsInDesignMode(this))
             {
-                _logger = App.GetService<ILogger<ImageInpaint>>();
+                _logger = App.GetService<ILogger<ImageInpaintView>>();
                 _stableDiffusionService = App.GetService<IStableDiffusionService>();
             }
 
@@ -76,7 +76,7 @@ public OnnxStackUIConfig UISettings
             set { SetValue(UISettingsProperty, value); }
         }
         public static readonly DependencyProperty UISettingsProperty =
-            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageInpaint));
+            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageInpaintView));
 
         public List<DiffuserType> SupportedDiffusers { get; }
         public AsyncRelayCommand CancelCommand { get; }
diff --git a/OnnxStack.UI/Views/ImageToImageView.xaml b/OnnxStack.UI/Views/ImageToImageView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="OnnxStack.UI.Views.ImageToImage"
+﻿<UserControl x:Class="OnnxStack.UI.Views.ImageToImageView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OnnxStack.UI/Views/ImageToImageView.xaml.cs b/OnnxStack.UI/Views/ImageToImageView.xaml.cs
@@ -24,9 +24,9 @@ namespace OnnxStack.UI.Views
     /// <summary>
     /// Interaction logic for ImageToImage.xaml
     /// </summary>
-    public partial class ImageToImage : UserControl, INavigatable, INotifyPropertyChanged
+    public partial class ImageToImageView : UserControl, INavigatable, INotifyPropertyChanged
     {
-        private readonly ILogger<ImageToImage> _logger;
+        private readonly ILogger<ImageToImageView> _logger;
         private readonly IStableDiffusionService _stableDiffusionService;
 
         private bool _hasResult;
@@ -46,13 +46,13 @@ public partial class ImageToImage : UserControl, INavigatable, INotifyPropertyCh
 
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageToImage"/> class.
+        /// Initializes a new instance of the <see cref="ImageToImageView"/> class.
         /// </summary>
-        public ImageToImage()
+        public ImageToImageView()
         {
             if (!DesignerProperties.GetIsInDesignMode(this))
             {
-                _logger = App.GetService<ILogger<ImageToImage>>();
+                _logger = App.GetService<ILogger<ImageToImageView>>();
                 _stableDiffusionService = App.GetService<IStableDiffusionService>();
             }
 
@@ -75,7 +75,7 @@ public OnnxStackUIConfig UISettings
             set { SetValue(UISettingsProperty, value); }
         }
         public static readonly DependencyProperty UISettingsProperty =
-            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageToImage));
+            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageToImageView));
 
         public List<DiffuserType> SupportedDiffusers { get; }
         public AsyncRelayCommand CancelCommand { get; }
diff --git a/OnnxStack.UI/Views/LoggerView.xaml b/OnnxStack.UI/Views/LoggerView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="OnnxStack.UI.Views.Logger"
+﻿<UserControl x:Class="OnnxStack.UI.Views.LoggerView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OnnxStack.UI/Views/LoggerView.xaml.cs b/OnnxStack.UI/Views/LoggerView.xaml.cs
@@ -12,13 +12,13 @@ namespace OnnxStack.UI.Views
     /// <summary>
     /// Interaction logic for Logger.xaml
     /// </summary>
-    public partial class Logger : UserControl, INavigatable, INotifyPropertyChanged
+    public partial class LoggerView : UserControl, INavigatable, INotifyPropertyChanged
     {
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Logger"/> class.
+        /// Initializes a new instance of the <see cref="LoggerView"/> class.
         /// </summary>
-        public Logger()
+        public LoggerView()
         {
             ResetCommand = new AsyncRelayCommand(Reset, CanExecuteReset);
             InitializeComponent();
@@ -30,7 +30,7 @@ public OnnxStackUIConfig UISettings
             set { SetValue(UISettingsProperty, value); }
         }
         public static readonly DependencyProperty UISettingsProperty =
-            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(Logger));
+            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(LoggerView));
 
         public AsyncRelayCommand ResetCommand { get; }
 
@@ -44,7 +44,7 @@ public string LogOutput
             set { SetValue(LogOutputProperty, value); }
         }
         public static readonly DependencyProperty LogOutputProperty =
-            DependencyProperty.Register("LogOutput", typeof(string), typeof(Logger));
+            DependencyProperty.Register("LogOutput", typeof(string), typeof(LoggerView));
 
 
         public Task NavigateAsync(ImageResult imageResult)
diff --git a/OnnxStack.UI/Views/SettingsView.xaml b/OnnxStack.UI/Views/SettingsView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="OnnxStack.UI.Views.Settings"
+﻿<UserControl x:Class="OnnxStack.UI.Views.SettingsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OnnxStack.UI/Views/SettingsView.xaml.cs b/OnnxStack.UI/Views/SettingsView.xaml.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.Extensions.Logging;
 using OnnxStack.Core.Config;
-using OnnxStack.StableDiffusion.Config;
 using OnnxStack.UI.Commands;
 using OnnxStack.UI.Models;
 using System;
@@ -13,19 +12,19 @@
 namespace OnnxStack.UI.Views
 {
     /// <summary>
-    /// Interaction logic for Settings.xaml
+    /// Interaction logic for SettingsView.xaml
     /// </summary>
-    public partial class Settings : UserControl, INavigatable, INotifyPropertyChanged
+    public partial class SettingsView : UserControl, INavigatable, INotifyPropertyChanged
     {
-        private readonly ILogger<Settings> _logger;
+        private readonly ILogger<SettingsView> _logger;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Settings"/> class.
+        /// Initializes a new instance of the <see cref="SettingsView"/> class.
         /// </summary>
-        public Settings()
+        public SettingsView()
         {
             if (!DesignerProperties.GetIsInDesignMode(this))
-                _logger = App.GetService<ILogger<Settings>>();
+                _logger = App.GetService<ILogger<SettingsView>>();
 
             SaveCommand = new AsyncRelayCommand(Save);
             InitializeComponent();
@@ -39,7 +38,7 @@ public OnnxStackUIConfig UISettings
             set { SetValue(UISettingsProperty, value); }
         }
         public static readonly DependencyProperty UISettingsProperty =
-            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(Settings));
+            DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(SettingsView));
 
 
 
diff --git a/OnnxStack.UI/Views/TextToImageView.xaml b/OnnxStack.UI/Views/TextToImageView.xaml
diff --git a/OnnxStack.UI/Views/TextToImageView.xaml.cs b/OnnxStack.UI/Views/TextToImageView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class BatchOptionsModel : INotifyPropertyChanged`
`16`	`16`	`private int _batchValue;`
`17`	`17`	`private int _batchsValue = 1;`
`18`	`18`	`private int _realtimeRefreshRate = 1000;`
`19`		`- private bool _disableHistory;`
	`19`	`+ private bool _disableHistory = true;`
`20`	`20`
`21`	`21`	`public BatchOptionType BatchType`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<UserControl x:Class="OnnxStack.UI.Views.ImageInpaint"`
	`1`	`+<UserControl x:Class="OnnxStack.UI.Views.ImageInpaintView"`
`2`	`2`	`xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`3`	`3`	`xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`
`4`	`4`	`xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@`
`21`	`21`	`namespace OnnxStack.UI.Views`
`22`	`22`	`{`
`23`	`23`	`/// <summary>`
`24`		`- /// Interaction logic for ImageInpaint.xaml`
	`24`	`+ /// Interaction logic for ImageInpaintView.xaml`
`25`	`25`	`/// </summary>`
`26`		`- public partial class ImageInpaint : UserControl, INavigatable, INotifyPropertyChanged`
	`26`	`+ public partial class ImageInpaintView : UserControl, INavigatable, INotifyPropertyChanged`
`27`	`27`	`{`
`28`		`- private readonly ILogger<ImageInpaint> _logger;`
	`28`	`+ private readonly ILogger<ImageInpaintView> _logger;`
`29`	`29`	`private readonly IStableDiffusionService _stableDiffusionService;`
`30`	`30`
`31`	`31`	`private bool _hasResult;`
`@@ -47,13 +47,13 @@ public partial class ImageInpaint : UserControl, INavigatable, INotifyPropertyCh`
`47`	`47`
`48`	`48`
`49`	`49`	`/// <summary>`
`50`		`- /// Initializes a new instance of the <see cref="ImageInpaint"/> class.`
	`50`	`+ /// Initializes a new instance of the <see cref="ImageInpaintView"/> class.`
`51`	`51`	`/// </summary>`
`52`		`- public ImageInpaint()`
	`52`	`+ public ImageInpaintView()`
`53`	`53`	`{`
`54`	`54`	`if (!DesignerProperties.GetIsInDesignMode(this))`
`55`	`55`	`{`
`56`		`- _logger = App.GetService<ILogger<ImageInpaint>>();`
	`56`	`+ _logger = App.GetService<ILogger<ImageInpaintView>>();`
`57`	`57`	`_stableDiffusionService = App.GetService<IStableDiffusionService>();`
`58`	`58`	`}`
`59`	`59`
`@@ -76,7 +76,7 @@ public OnnxStackUIConfig UISettings`
`76`	`76`	`set { SetValue(UISettingsProperty, value); }`
`77`	`77`	`}`
`78`	`78`	`public static readonly DependencyProperty UISettingsProperty =`
`79`		`- DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageInpaint));`
	`79`	`+ DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(ImageInpaintView));`
`80`	`80`
`81`	`81`	`public List<DiffuserType> SupportedDiffusers { get; }`
`82`	`82`	`public AsyncRelayCommand CancelCommand { get; }`