Small Edits (Bg, dialogs and images)

WallcroftUK · Jun 9, 2023 · cac39a5 · cac39a5
1 parent bfe9f96
commit cac39a5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/LuaToolGUI/Images/xmltolua.jpg b/LuaToolGUI/Images/xmltolua.jpg
diff --git a/LuaToolGUI/ToolStationGUI.csproj b/LuaToolGUI/ToolStationGUI.csproj
@@ -7,22 +7,21 @@
     <UseWPF>true</UseWPF>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <ApplicationIcon>Images\logo.ico</ApplicationIcon>
-    <NoWin32Manifest>true</NoWin32Manifest>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>none</DebugType>
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>none</DebugType>
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="eeafe33a8c244152ad6ae8158f180fe6.jpg" />
     <None Remove="Images\bg.jpg" />
-    <None Remove="Images\logo.png" />
     <None Remove="Images\TsMaker\bg.jpg" />
+    <None Remove="Images\xmltolua.jpg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,6 +33,7 @@
     <Resource Include="Images\eeafe33a8c244152ad6ae8158f180fe6.jpg" />
     <Resource Include="Images\logo.png" />
     <Resource Include="Images\TsMaker\bg.jpg" />
+    <Resource Include="Images\xmltolua.jpg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -48,4 +48,11 @@
     <PackageReference Include="YamlDotNet" Version="13.1.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Images\logo.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/...GUI/Windows/ConfigsTool/Functions/base.cs → ...ows/ConfigsTool/Functions/packetToYaml.cs b/...GUI/Windows/ConfigsTool/Functions/base.cs → ...ows/ConfigsTool/Functions/packetToYaml.cs
diff --git a/LuaToolGUI/Windows/InitialMenuWindow.xaml b/LuaToolGUI/Windows/InitialMenuWindow.xaml
@@ -44,7 +44,7 @@
     <Grid>
         <!-- Background image -->
         <Grid.Background>
-            <ImageBrush ImageSource="/Images/bg.jpg" />
+            <ImageBrush ImageSource="/Images/xmltolua.jpg" />
         </Grid.Background>
 
         <!-- Main container -->

diff --git a/LuaToolGUI/Windows/ScriptConverter/Functions/XmlToLuaWindow.xaml b/LuaToolGUI/Windows/ScriptConverter/Functions/XmlToLuaWindow.xaml
@@ -5,8 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ToolStationGUI.Windows.ScriptConverter.Functions"
         mc:Ignorable="d"
-        Title="XmlToLuaWindow" Height="495" Width="540">
-    <Grid>
+        Title="XmlToLuaWindow" Height="508" Width="540">
+    <Grid Height="492" VerticalAlignment="Center">
+        <Grid.Background>
+            <ImageBrush ImageSource="/Images/xmltolua.jpg" Stretch="UniformToFill" />
+        </Grid.Background>
         <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20">
             <TextBox x:Name="XmlCodeTextBox" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Width="400" Height="200" Margin="0,0,0,20" />
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,10">

diff --git a/LuaToolGUI/Windows/ScriptConverter/Functions/XmlToLuaWindow.xaml.cs b/LuaToolGUI/Windows/ScriptConverter/Functions/XmlToLuaWindow.xaml.cs
@@ -39,7 +39,6 @@ private void ConvertButton_Click(object sender, RoutedEventArgs e)
                     File.WriteAllText(Path.Combine(raidsPath, (RaidType)model.Globals.Id.Value + ".lua"), model.ToRaidLuaString());
                     MessageBox.Show($"Created raid: {rType.ToString()}");
                 }
-                MessageBox.Show("Raids imported successfully!");
             }
             else if (TimeSpaceRadioButton.IsChecked == true)
             {
@@ -52,7 +51,6 @@ private void ConvertButton_Click(object sender, RoutedEventArgs e)
                     MessageBox.Show($"Created ts: {finalTitle}");
                     i++;
                 }
-                MessageBox.Show("Timespaces imported successfully!");
             }
             else
             {

diff --git a/LuaToolGUI/Windows/TsMaker/LuaToolWindow.xaml b/LuaToolGUI/Windows/TsMaker/LuaToolWindow.xaml
@@ -8,7 +8,7 @@
 
     <Grid>
         <!-- Background image -->
-        <Image Source="/Images/TsMaker/bg.jpg" Stretch="Fill" />
+        <Image Source="/Images/xmltolua.jpg" Stretch="Fill" />
 
         <Grid Height="419" VerticalAlignment="Top">
             <Grid.ColumnDefinitions>