Skip to content

Portable Tool for an Ideal Windows Setup

upd. single instance logic and update localization

Greedeks9b96a76f28d4
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index f58d37cd..c8604105 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -41,7 +41,7 @@ namespace GTweak
SettingsEngine.СheckingParameters();
ApplicationThemeManager.Apply(string.Equals(SettingsEngine.Theme, SettingsEngine.AvailableThemes.First(), StringComparison.OrdinalIgnoreCase) ? ApplicationTheme.Dark : ApplicationTheme.Light);
- RunGuard.CheckingApplicationCopies();
+ RunGuard.CheckingSingleInstance();
await RunGuard.CheckingSystemRequirements();
RunGuard.CheckingAdministratorPrivileges();
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index eddffb1f..8d9d94a6 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Oops..</v:String>
- <v:String x:Key="part1_message">The creation of copies of the program is</v:String>
- <v:String x:Key="part2_message">prohibited,</v:String>
- <v:String x:Key="part3_message">in order to prevent errors and unforeseen situations, scenarios.</v:String>
+ <v:String x:Key="part1_message">The utility is already running. Launching multiple instances</v:String>
+ <v:String x:Key="part2_message">is prohibited</v:String>
+ <v:String x:Key="part3_message">to avoid internal conflicts and software crashes.</v:String>
<v:String x:Key="button_message">Accept (05)</v:String>
<v:String x:Key="noty_message">▪automatic window closing</v:String>
<v:String x:Key="title_nosupport_message">Not supported</v:String>
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index fd89a071..c0a55501 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Oups..</v:String>
- <v:String x:Key="part1_message">La création de copies du programme est</v:String>
- <v:String x:Key="part2_message">interdite,</v:String>
- <v:String x:Key="part3_message">afin d’éviter les erreurs et les situations imprévues, les scénarios.</v:String>
+ <v:String x:Key="part1_message">L'utilitaire est déjà en cours d'exécution. Le lancement de plusieurs instances</v:String>
+ <v:String x:Key="part2_message">est interdit</v:String>
+ <v:String x:Key="part3_message">afin d'éviter les conflits internes et les pannes logicielles.</v:String>
<v:String x:Key="button_message">Accepter (05)</v:String>
<v:String x:Key="noty_message">▪fermeture automatique de la fenêtre</v:String>
<v:String x:Key="title_nosupport_message">Non pris en charge</v:String>
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 859b130d..2b5f167c 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Ops..</v:String>
- <v:String x:Key="part1_message">La creazione di copie del programma è</v:String>
- <v:String x:Key="part2_message">vietata,</v:String>
- <v:String x:Key="part3_message">per evitare errori e situazioni impreviste, scenari.</v:String>
+ <v:String x:Key="part1_message">L'utilità è già in esecuzione. L'avvio di più istanze</v:String>
+ <v:String x:Key="part2_message">è vietato</v:String>
+ <v:String x:Key="part3_message">per evitare conflitti interni e arresti anomali del software.</v:String>
<v:String x:Key="button_message">Accetta (05)</v:String>
<v:String x:Key="noty_message">▪chiusura automatica della finestra</v:String>
<v:String x:Key="title_nosupport_message">Non supportato</v:String>
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index caf3d848..04ddc4d1 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Ups...</v:String>
- <v:String x:Key="part1_message">Tworzenie kopii programu jest</v:String>
- <v:String x:Key="part2_message">zabronione,</v:String>
- <v:String x:Key="part3_message">aby zapobiec błędom i nieprzewidzianym sytuacjom.</v:String>
+ <v:String x:Key="part1_message">Narzędzie jest już uruchomione. Uruchamianie wielu instancji</v:String>
+ <v:String x:Key="part2_message">jest zabronione</v:String>
+ <v:String x:Key="part3_message">aby uniknąć konfliktów wewnętrznych i awarii oprogramowania.</v:String>
<v:String x:Key="button_message">Akceptuję (05)</v:String>
<v:String x:Key="noty_message">▪ automatyczne zamykanie okna</v:String>
<v:String x:Key="title_nosupport_message">Nieobsługiwane</v:String>
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index 4251114e..a210ab93 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Opa..</v:String>
- <v:String x:Key="part1_message">A criação de cópias do programa é</v:String>
- <v:String x:Key="part2_message">proibida,</v:String>
- <v:String x:Key="part3_message">a fim de evitar erros e situações imprevistas.</v:String>
+ <v:String x:Key="part1_message">O utilitário já está em execução. Iniciar várias instâncias</v:String>
+ <v:String x:Key="part2_message">é proibido</v:String>
+ <v:String x:Key="part3_message">para evitar conflitos internos e falhas de software.</v:String>
<v:String x:Key="button_message">Aceitar (05)</v:String>
<v:String x:Key="noty_message">▪fechamento automático da janela</v:String>
<v:String x:Key="title_nosupport_message">Não suportado</v:String>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index f722d2e2..c5d7652e 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -20,9 +20,9 @@
<!--#region Message Window -->
<v:String x:Key="title_message">Упс..</v:String>
- <v:String x:Key="part1_message">Создание копий программы</v:String>
- <v:String x:Key="part2_message">запрещено,</v:String>
- <v:String x:Key="part3_message">для предотвращения ошибок и не непредвиденных ситуаций, сценариев.</v:String>
+ <v:String x:Key="part1_message">Утилита уже запущено. Запуск нескольких экземпляров</v:String>
+ <v:String x:Key="part2_message">запрещен</v:String>
+ <v:String x:Key="part3_message">во избежание внутренних конфликтов и программных сбоев.</v:String>
<v:String x:Key="button_message">Понятно (05)</v:String>
<v:String x:Key="noty_message">▪автоматическое закрытие окна</v:String>
<v:String x:Key="title_nosupport_message">Не поддерживается</v:String>
diff --git a/.Source/GTweak/Utilities/Controls/RunGuard.cs b/.Source/GTweak/Utilities/Controls/RunGuard.cs
index 02282f13..3119331f 100644
--- a/.Source/GTweak/Utilities/Controls/RunGuard.cs
+++ b/.Source/GTweak/Utilities/Controls/RunGuard.cs
@@ -18,31 +18,28 @@ namespace GTweak.Utilities.Controls
private static extern bool ShowWindow(IntPtr handle, int cmdShow);
[DllImport("user32.dll")]
private static extern int SetForegroundWindow(IntPtr handle);
- private static readonly Mutex _mutex = new Mutex(false, "GTweak");
- internal static void CheckingApplicationCopies()
+ private static readonly Mutex _mutex = new Mutex(false, @"GTweak"), _msgMutex = new Mutex(false, @"Global\GTweak");
+
+ internal static void CheckingSingleInstance()
{
- if (!_mutex.WaitOne(150, false))
+ if (!_mutex.WaitOne(0, false))
{
- using (Mutex mutex = new Mutex(false, @"Global\" + "GTweak"))
+ Process existing = Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).FirstOrDefault(p => p.Id != Process.GetCurrentProcess().Id);
+ if (existing != null)
{
- if (mutex.WaitOne(150, false))
- {
- Application.Current.Dispatcher.Invoke(() => { new MessageWindow().ShowDialog(); });
- }
- else
+ IntPtr handle = existing.MainWindowHandle;
+ if (handle != IntPtr.Zero)
{
- Environment.Exit(0);
+ ShowWindow(handle, 9);
+ SetForegroundWindow(handle);
}
}
- using (Process process = Process.GetProcesses().FirstOrDefault(p => p.ProcessName == Process.GetCurrentProcess().ProcessName))
+
+ if (_msgMutex.WaitOne(0, false))
{
- if (process != null)
- {
- IntPtr handle = process.MainWindowHandle;
- ShowWindow(handle, 1);
- SetForegroundWindow(handle);
- }
+ try { Application.Current.Dispatcher.Invoke(() => { new MessageWindow().ShowDialog(); }); }
+ finally { _msgMutex.ReleaseMutex(); }
}
Environment.Exit(0);
}
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml b/.Source/GTweak/Windows/MessageWindow.xaml
index a0110353..f1bd569d 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml
+++ b/.Source/GTweak/Windows/MessageWindow.xaml
@@ -8,20 +8,20 @@
mc:Ignorable="d" Icon="/GTweak.ico"
Background="Transparent" WindowStyle="None" IsTabStop="False" SnapsToDevicePixels="True" UseLayoutRounding="True" KeyboardNavigation.TabNavigation="None"
ExtendsContentIntoTitleBar="True" WindowBackdropType="Mica" SizeToContent="Height" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
- Title="GTweak" Topmost="True" MinHeight="140" MinWidth="350" MaxHeight="250" MaxWidth="400">
+ Title="GTweak" ShowInTaskbar="False" Topmost="True" MinHeight="140" MinWidth="350" MaxHeight="250" MaxWidth="400">
<Grid Background="{StaticResource Brush_Background}">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <Grid Grid.Row="0">
+ <Grid Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
- <Grid x:Name="TitleBar" Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent">
+ <Grid Grid.Row="0">
<DockPanel VerticalAlignment="Center" HorizontalAlignment="Left" LastChildFill="True" Height="48">
<ui:SymbolIcon x:Name="MsgIcon" Symbol="Warning24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="15,5,0,0"/>
<Viewbox Stretch="None">