Resizable update found window

Updated converting window text
Mantas-2155X · Jun 11, 2023 · 8a98936 · 8a98936
1 parent aab8384
commit 8a98936
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/HardSubberGUI/HardSubberGUI.csproj b/HardSubberGUI/HardSubberGUI.csproj
@@ -8,8 +8,8 @@
         <TrimMode>copyused</TrimMode>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <PackageVersion>1.0.1</PackageVersion>
-        <AssemblyVersion>1.4.1.0</AssemblyVersion>
-        <FileVersion>1.4.1.0</FileVersion>
+        <AssemblyVersion>1.5.0.0</AssemblyVersion>
+        <FileVersion>1.5.0.0</FileVersion>
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />

diff --git a/HardSubberGUI/ViewModels/ConvertingViewModel.cs b/HardSubberGUI/ViewModels/ConvertingViewModel.cs
@@ -4,7 +4,7 @@ namespace HardSubberGUI.ViewModels
 {
 	public class ConvertingViewModel : ViewModelBase
 	{
-		public static string ProgressFormat => "{0}/{3} Files";
+		public static string ProgressFormat => "{0}/{3} Files Converted";
 
 		#region Tooltips
 
@@ -14,7 +14,7 @@ public class ConvertingViewModel : ViewModelBase
 
 		#region Labels
 
-		public static string Text => "Converting...";
+		public static string Text => "Converting...\nSee minimized terminals for more info.";
 
 		#endregion
 

diff --git a/HardSubberGUI/ViewModels/UpdateFoundViewModel.cs b/HardSubberGUI/ViewModels/UpdateFoundViewModel.cs
@@ -13,14 +13,14 @@ public class UpdateFoundViewModel : ViewModelBase
 
 		#region Labels
 
-		public static string Text => "A new update is available.\nOpen download link?";
+		public static string Text => "A new update is available.";
 
 		#endregion
 
 		#region Buttons
 
-		public static string Yes => "Yes";
-		public static string No => "No";
+		public static string Yes => "Open Link";
+		public static string No => "Ignore";
 
 		#endregion
 

diff --git a/HardSubberGUI/Views/ConvertingWindow.axaml b/HardSubberGUI/Views/ConvertingWindow.axaml
@@ -7,9 +7,9 @@
         x:Class="HardSubberGUI.Views.ConvertingWindow"
         Background="{Binding MainPanelColor}"
         CanResize="False"
-        Width="265" Height="105"
-        MinWidth="265" MinHeight="105"
-        WindowStartupLocation="CenterScreen"
+        Width="265" Height="125"
+        MinWidth="265" MinHeight="125"
+        WindowStartupLocation="CenterOwner"
         Icon="/Assets/hardsubber.ico"
         Title="HardSubberGUI">
 

diff --git a/HardSubberGUI/Views/UpdateFoundWindow.axaml b/HardSubberGUI/Views/UpdateFoundWindow.axaml
@@ -6,10 +6,9 @@
         mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="105"
         x:Class="HardSubberGUI.Views.UpdateFoundWindow"
         Background="{Binding MainPanelColor}"
-        CanResize="False"
-        Width="375" Height="225"
-        MinWidth="375" MinHeight="225"
-        WindowStartupLocation="CenterScreen"
+        Width="350" Height="225"
+        MinWidth="350" MinHeight="225"
+        WindowStartupLocation="CenterOwner"
         Icon="/Assets/hardsubber.ico"
         Title="HardSubberGUI">
 
@@ -20,22 +19,22 @@
     <DockPanel Margin="5">
         <!--Bottom Panel-->
         <Panel DockPanel.Dock="Bottom" Height="30" Background="{Binding MainPanelColor}">
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="5">
                 <Button Name="NoControl" Width="125" HorizontalContentAlignment="Center" Content="{Binding No}" Click="No_OnClick" ToolTip.Tip="{Binding NoTooltip}"/>
                 <Button Name="YesControl" Width="125" HorizontalContentAlignment="Center" Content="{Binding Yes}" Click="Yes_OnClick" ToolTip.Tip="{Binding YesTooltip}"/>
             </StackPanel>
         </Panel>
 
-        <Panel DockPanel.Dock="Top" Height="175" Background="{Binding MainPanelColor}">
-            <StackPanel Orientation="Vertical" Spacing="5">
-                <!--Text-->
-                <TextBlock TextAlignment="Center" VerticalAlignment="Center" Text="{Binding Text}"/>
+        <Panel DockPanel.Dock="Top" Background="{Binding MainPanelColor}">
+            <DockPanel>
+                <!--Title-->
+                <TextBlock DockPanel.Dock="Top" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding Text}"/>
 
-                <ScrollViewer Padding="5, 0, 5, 0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Height="125" Width="365" Background="{Binding SecondaryPanelColor}">
-                    <!--Changes-->
+                <!--Changes-->
+                <ScrollViewer DockPanel.Dock="Top" Margin="0, 5, 0, 5" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Background="{Binding SecondaryPanelColor}">
                     <TextBlock TextAlignment="Left" VerticalAlignment="Top" Name="ChangesControl"/>
                 </ScrollViewer>
-            </StackPanel>
+            </DockPanel>
         </Panel>
     </DockPanel>
 </Window>