Skip to content

Portable Tool for an Ideal Windows Setup

-added file name display when importing

Greedeksd602b475160d
diff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xaml
index d87ceb08..002effc6 100644
--- a/.Source/GTweak/Languages/en/Lang.xaml
+++ b/.Source/GTweak/Languages/en/Lang.xaml
@@ -96,6 +96,7 @@
<v:String x:Key="title_win_import">Importing tweaks</v:String>
<v:String x:Key="wait_win_import">It takes some time...</v:String>
<v:String x:Key="warning_win_import">It is not necessary to close the window forcibly</v:String>
+ <v:String x:Key="file_import">File</v:String>
<!--#endregion-->
<!--#region Reboot Window -->
diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xaml
index 9a3b4a14..f7f4bd90 100644
--- a/.Source/GTweak/Languages/ru/Lang.xaml
+++ b/.Source/GTweak/Languages/ru/Lang.xaml
@@ -96,6 +96,7 @@
<v:String x:Key="title_win_import">Импорт твиков</v:String>
<v:String x:Key="wait_win_import">Это занимает некоторое время...</v:String>
<v:String x:Key="warning_win_import">Принудительно закрывать окно нет необходимости</v:String>
+ <v:String x:Key="file_import">Файл</v:String>
<!--#endregion-->
<!--#region Reboot Window -->
diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index d7803402..743698c6 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -164,7 +164,7 @@ namespace GTweak.Utilities
if (iniManager.Read("GTweak", "Author").Contains("Greedeks") && iniManager.Read("GTweak", "Release").Contains("v4"))
{
if (File.ReadLines(PathConfig).Any(line => line.Contains("TglButton")) || File.ReadLines(PathConfig).Any(line => line.Contains("Slider")))
- new ImportWindow().ShowDialog();
+ new ImportWindow(openFileDialog.SafeFileName).ShowDialog();
else
new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_empty_notification"]);
}
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml b/.Source/GTweak/Windows/ImportWindow.xaml
index a4570fe3..8a0c0574 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml
+++ b/.Source/GTweak/Windows/ImportWindow.xaml
@@ -9,6 +9,7 @@
Height="160" Width="390" MinHeight="160" MinWidth="390" MaxHeight="160" MaxWidth="390"
Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Topmost="True" ResizeMode="CanMinimize"
ShowInTaskbar="False" IsTabStop="False" Loaded="Window_Loaded">
+
<Grid MouseDown="TitleBar_MouseDown">
<Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
@@ -68,6 +69,10 @@
<TextBlock Text="{DynamicResource wait_win_import}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="13px" HorizontalAlignment="Left" TextAlignment="Center" Margin="10,5,0,0"/>
</StackPanel>
</Border>
+ <TextBlock Foreground="{StaticResource Color_Inactive}" Height="auto" Width="auto" MaxWidth="350" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,12,0,0">
+ <Run Text="{DynamicResource file_import}"/>
+ <Run Text="“"/><Run x:Name="ImportedFile" Text="The imported file" Foreground="{StaticResource Color_Accent}"/><Run Text="”"/>
+ </TextBlock>
</StackPanel>
</Grid>
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.cs
index c4e7e8be..4b66a0ae 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs
+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs
@@ -24,9 +24,11 @@ namespace GTweak.Windows
private bool isRestartNeed = false, isLogoutNeed = false;
private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
- public ImportWindow()
+
+ public ImportWindow(in string importedFile)
{
InitializeComponent();
+ ImportedFile.Text = importedFile;
}
private void TitleBar_MouseDown(object sender, MouseButtonEventArgs e)