From 6bd8cab129a5db7324948dc085f3b1ea6abb04bf Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Wed, 26 Feb 2025 16:32:14 +0300
Subject: [PATCH] Settings overhaul

---
 Launcher-UI/Assets/Sprites/toml-paper.png | Bin 911 -> 1546 bytes
 Launcher-UI/Views/SettingsWindow.axaml    |  60 ++++++++++++----------
 Launcher-UI/Views/SettingsWindow.axaml.cs |   2 +
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Launcher-UI/Assets/Sprites/toml-paper.png b/Launcher-UI/Assets/Sprites/toml-paper.png
index bff43123749e8fb3e19648f12cc1639552b9689d..a3e0067fd44a8d60f814f19689ebb36a8e8435a6 100644
GIT binary patch
literal 1546
zcmeAS@N?(olHy`uVBq!ia0y~yV9Wqv4mO}j)zieQK#C>Z(btiIVPik{pF~z5pRqW|
z-HGw$Nu7EiM<LlG$QP(oje((|g@NH0P^jSr14F3+1H-EX1_rAc3=HB0b9M#V043Ox
zyxm<G{)6Cxy~`&9MK}vQB8wRqxP?KOkzv*x37{Z*iKnkC`%5M%UNLU#%-^*P46J^h
zE{-7;x8B}8=&Nlg(Hh9URJGhea6=L=>p`p47np>&vleg)__pY3s1?rW{M%oAPN<Vz
zYMx!>u1_gbi|?s29NPJbgMmegp^;4>14uh8U__!D*&uu{jZlO~F<22$6E4M=CX%n1
zQnvy<N{q)ECa$q%n)d45H>)%6H{IO#tN8&7ufhce4ig3@-VG9~=X^ewtT4&r@%=kJ
zofeMFU}2!NOM=RhnLyFYk3ZkL{!Tvc(4V?vE^`n8bMB;vhw;UH4k^CECQvAY18j$g
zo71_ZDdBC~B>0y9;W@le7-UI<1IX0>8^3Wp$X~iq?^5sKOA^@@B?xT~B+NNyo=NAu
z_Ww@Y{`n6taKfXrVg4PJl!~Q^>rzfdh-V7?`SatGdpVLu1!YC`m!;Vo%3f%%lzsN>
zpXA;+$1bp?5FZ|w;EZe$GymFC1@szF2<(^`E@j1T(U+q0_fCn^{q^bFJNtGdE$ot<
zlBZ4_UU*&#;zDpJC+LC0X~B}~&-u3n{QlXz_t=qJju+NCs)G_8Bt88*?CW%BrR)c<
zEcd-0=A3(tM1Yde2x_?2(_(V@(YLrS;oVX!zz~Ba(vAZj9^u9O6%*|yUr^`}HUWke
z*yRo(Zcag7$@TvfkR1MD_QVNkQFlHSXA6Msg(RRpW1&l-ZwoA*-k&|&5hMXkqYX=q
zg@pXN7xDvR4VF~&W&%y9+RG(^B=+O1$BD=uBaW)A8h)T;0daz|k<g`{*)6cN0u&Tz
zo;YDjkk{<DuYn07Z~f|h<)?mx|GKBy(}(25f;(Ez_k5OE5o#^dcj&bnQreK1IJ;#|
z%Bf!G1Dw!Y+Q_EBX3m+JHpTGbTPIl30{Us%IbfKyITs*8DdW5c2hb&ugv10-z2K07
zg&2f}r8Wc&NeEC)NQz*o0i57bOm1+fW`QSLI@kt@aUz|DPx15byiR#nv#**|9RU`$
N44$rjF6*2UngFb?$YlTk

literal 911
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&U=H(iaSW-L^Y*S|pK!QH>qE9y
z#*Pgf%Q!kEXD3YC(66J)?fGp|<dPI|mR82*6vn!>HZh|A*Pps?o>O{T_3Oo{{c(3c
z9cBia$G~tP(srf(gKPWhe&wE?|9|uK(l-xY{lB|8{Qb8*eZKRqi65vHb_inf@M7?s
zyR2o-ikLUKFE=GIO%j3$?rqTt)~oyTaC!Iqzn@;8KRDGUON+Z&Tv&L*6b6W@R})m9
zNc-7N(^ORM>g4qBVesTs&}398T_&`t<l&6c?xam0ZOe4k)Ifr&4NF)iTq*y``e%CY
zZn<`2E#~gIGkQ+lyPA591tJMFHR_*A%GcojRSIYJ<(Jl;kJ~%@)HF_z3&G}Y4dJwW
zwC?x|=YMOC=55|}OMd_V%8#4P-`i^`uJMPd`SUh{Kk(rW*PS<h+lobJ%}4T)>_e55
zm%;tYbsz4}o-DxU4b`%=C8s3+XiA91y!{n*6Bl34xA)mQ4`J)nsS}jn)t|BQHk1_Y
zbB}rQ;_UDK;Q9<iK&=gP;tRJ(JNvFaBsJChp+umQ1q;-_Q-nTkxF)<VFY(*7Rr>Yy
zGpqLAJY<OCqL&fjyN|v+{Azn#FW2$Y@8jb{`p(za?)$M<_h}N6*Gpds8Eq<ejCje-
zl<se_3dNAAs!z83me-cN8x$(qCy0ohRd+Ze)BZp1*q*$$ZuV6jgv6_NUMEhx>V6q5
zb~0Q`Mi~)3Q-q2b`fcpKzk2^H0vMmLa4&sz^vl)xF|9~3JWHr(+M$i#%PZELL&Tny
zFQ=rXw;?EwkZfC}qqw+s%1YabKp&kJ`gKCk`>dA_G>vg8tSmCD{TBW{tMTs{?-xi;
z2?=v@6Pa9W-&cMFVL{ZYmYy1CLrF{5NXygW!hJJ9X$q1UPfwo^`Ms>GXxi;<2*bhI
dfZ>n+Kh~`M|8_3V555f&@pScbS?83{1ONg&a4Y}-

diff --git a/Launcher-UI/Views/SettingsWindow.axaml b/Launcher-UI/Views/SettingsWindow.axaml
index eab1ae2..f2b06c8 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml
+++ b/Launcher-UI/Views/SettingsWindow.axaml
@@ -19,47 +19,51 @@
     Background="#353535"
 >
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel Grid.Row="0" Grid.ColumnSpan="2">
+<Window.Background>
+    <ImageBrush Source="/Assets/Sprites/toml-paper.png" Stretch="UniformToFill"/>
+</Window.Background>
+
+<StackPanel Margin="5">
+
+    <StackPanel HorizontalAlignment="Center">
+        <TextBlock
+            Text="All tweaks can be found in TOML near executable."
+            FontFamily="{StaticResource QuicksandFont}"
+        />
+
+        <TextBlock
+            x:Name="tweaksVersion"
+            FontFamily="{StaticResource QuicksandFont}"
+        />
+
+    </StackPanel>
+
+    <StackPanel Margin="20">
+
+        <StackPanel>
+            
             <TextBlock
-                HorizontalAlignment="Center"
-                Text="All tweaks can be found in TOML near executable."
+                x:Name="currentDir"
                 FontFamily="{StaticResource QuicksandFont}"
             />
 
-            <TextBlock
-                HorizontalAlignment="Center"
-                x:Name="tweaksVersion"
-                FontFamily="{StaticResource QuicksandFont}"
-            />
-
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.Column="0">
-
             <Button
                 Margin="5"
                 Content="Select minecraft folder"
                 Click="OnFilePickerClick"
+                HorizontalAlignment="Center"
             />
-
+        
         </StackPanel>
 
-        <StackPanel Grid.Row="2" Grid.Column="1">
-            <Image Source="/Assets/Sprites/toml-paper.png" Stretch="Uniform" />
+    </StackPanel>
+
+    <!-- <StackPanel Grid.Row="2" Grid.Column="1">
+        <Image Source="/Assets/Sprites/toml-paper.png" Stretch="Uniform" /> 
 
 
-        </StackPanel>
+    </StackPanel> -->
 
-    </Grid>
+</StackPanel>
 
 </Window>
diff --git a/Launcher-UI/Views/SettingsWindow.axaml.cs b/Launcher-UI/Views/SettingsWindow.axaml.cs
index adf4795..32140dc 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml.cs
+++ b/Launcher-UI/Views/SettingsWindow.axaml.cs
@@ -15,6 +15,7 @@ public partial class SettingsWindow : Window
         InitializeComponent();
         _mainWindowVM = mainWindowVM;
         tweaksVersion.Text = $"Current tweaks version: {_mainWindowVM.TweaksVersion}";
+        currentDir.Text = $"Current saving directory: {_mainWindowVM.RuntimeLocation}";
     }
 
     private async void OnFilePickerClick(object sender, RoutedEventArgs args)
@@ -36,6 +37,7 @@ public partial class SettingsWindow : Window
             if (location is null) throw new NullReferenceException("Invalid location selected!");
             _mainWindowVM.RuntimeLocation = location;
             System.Console.WriteLine($"Selected {_mainWindowVM.RuntimeLocation}.");
+            currentDir.Text = $"Current saving directory: {_mainWindowVM.RuntimeLocation}";
             ConfigManager.WriteInConfig("runtime-path", location);
         }
     }