🛫 Version 1.1.1

Merge pull request #8 from valnoxy/dev

GoAwayEdge/GoAwayEdge.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
@@ -13,7 +13,7 @@
 		<AssemblyName>GoAwayEdge</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.1.0.38</Version>
+		<Version>1.1.1.42</Version>
 		<Copyright>Copyright (c) 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/GoAwayEdge</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/GoAwayEdge</RepositoryUrl>

GoAwayEdge/Installer.xaml

@@ -6,7 +6,7 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:local="clr-namespace:GoAwayEdge"
         mc:Ignorable="d"
-        Title="{StaticResource Title}" MaxHeight="500" MaxWidth="800" 
+        Title="{DynamicResource Title}" MaxHeight="500" MaxWidth="800" 
         MinHeight="500" MinWidth="800" Height="500" Width="800"
         WindowStartupLocation="CenterScreen"
         ExtendsContentIntoTitleBar="True"
@@ -31,11 +31,11 @@
                 <Label Content="Version 1.2.0" VerticalContentAlignment="Bottom" x:Name="VersionLbl"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Content="{StaticResource Back}" Margin="0,0,5,0" Click="BackBtn_OnClick" x:Name="BackBtn" IsEnabled="false"/>
-                <Button Content="{StaticResource Next}" Margin="0,0,5,0" Click="NextBtn_OnClick" x:Name="NextBtn" IsEnabled="false"/>
+                <Button Content="{DynamicResource Back}" Margin="0,0,5,0" Click="BackBtn_OnClick" x:Name="BackBtn" IsEnabled="false"/>
+                <Button Content="{DynamicResource Next}" Margin="0,0,5,0" Click="NextBtn_OnClick" x:Name="NextBtn" IsEnabled="false"/>
             </StackPanel>
         </DockPanel>
 
-        <ui:TitleBar x:Name="Bar" Title="{StaticResource Title}" Grid.Row="0" ShowMaximize="false"/>
+        <ui:TitleBar x:Name="Bar" Title="{DynamicResource Title}" Grid.Row="0" ShowMaximize="false"/>
     </Grid>
 </ui:UiWindow>

GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml

@@ -30,6 +30,8 @@
     <!-- Setup finished -->
     <system:String x:Key="SetupFinishedTitle">Installation abgeschlossen!</system:String>
     <system:String x:Key="SetupFinishedDescription">Öffnen Sie das Installationsprogramm, wenn Sie GoAwayEdge erneut anpassen möchten.</system:String>
+    <system:String x:Key="UninstallFinishedTitle">Deinstallation abgeschlossen!</system:String>
+    <system:String x:Key="UninstallFinishedDescription">GoAwayEdge wurde erfolgreich vom System entfernt.</system:String>
     <system:String x:Key="DonateButton">Über PayPal spenden</system:String>
 
 </ResourceDictionary>

GoAwayEdge/Localization/ResourceDictionary.xaml

@@ -30,6 +30,8 @@
     <!-- Setup finished -->
     <system:String x:Key="SetupFinishedTitle">Installation completed!</system:String>
     <system:String x:Key="SetupFinishedDescription">Simply open this Installer, if you want to customize GoAwayEdge again.</system:String>
+    <system:String x:Key="UninstallFinishedTitle">Uninstallation completed!</system:String>
+    <system:String x:Key="UninstallFinishedDescription">GoAwayEdge has been successfully removed from the system.</system:String>
     <system:String x:Key="DonateButton">Donate via PayPal</system:String>
 
 </ResourceDictionary>

GoAwayEdge/Pages/Installation.xaml

@@ -9,11 +9,11 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="Apps24" FontSize="80" />
-        <Label Content="{StaticResource SetupProgressTitle}" 
+        <Label Content="{DynamicResource SetupProgressTitle}" 
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="{StaticResource SetupProgressDescription}" 
+        <Label Content="{DynamicResource SetupProgressDescription}" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"

GoAwayEdge/Pages/InstallationSuccess.xaml

@@ -9,15 +9,17 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="CheckmarkCircle24" FontSize="80" />
-        <Label Content="{StaticResource SetupFinishedTitle}"
+        <Label Content="{DynamicResource SetupFinishedTitle}"
+               x:Name="SetupTitle"
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="{StaticResource SetupFinishedDescription}" 
+        <Label Content="{DynamicResource SetupFinishedDescription}" 
+               x:Name="SetupDescription"
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"
                HorizontalAlignment="Center"/>
-        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="{StaticResource DonateButton}"/>
+        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="{DynamicResource DonateButton}"/>
     </StackPanel>
 </UserControl>

GoAwayEdge/Pages/InstallationSuccess.xaml.cs

@@ -1,4 +1,6 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
+using GoAwayEdge.Common;
 
 namespace GoAwayEdge.Pages
 {
@@ -10,6 +12,19 @@ public partial class InstallationSuccess : UserControl
         public InstallationSuccess()
         {
             InitializeComponent();
+
+            if (Configuration.Uninstall)
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    var titleResource = (string)Application.Current.MainWindow!.FindResource("UninstallFinishedTitle");
+                    var descriptionResource = (string)Application.Current.MainWindow!.FindResource("UninstallFinishedDescription");
+                    SetupTitle.Content = !string.IsNullOrEmpty(titleResource) 
+                        ? titleResource : "Uninstallation completed!";
+                    SetupDescription.Content = !string.IsNullOrEmpty(descriptionResource) 
+                        ? descriptionResource : "GoAwayEdge has been successfully removed from the system.";
+                });
+            }
         }
     }
 }

GoAwayEdge/Pages/License.xaml

@@ -9,16 +9,16 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}" Text="{StaticResource LicenseNote}"/>
+            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}" Text="{DynamicResource LicenseNote}"/>
 
             <ui:Card Margin="0,10,0,10">
                 <ScrollViewer Height="240" Margin="0,-5,-10,0">
                     <TextBlock x:Name="LicenseBlock" />
                 </ScrollViewer>
             </ui:Card>
 
-            <RadioButton Content="{StaticResource LicenseAccept}" Click="AcceptLicenseRb_Click"/>
-            <RadioButton Content="{StaticResource LicenseDecline}" IsChecked="true" Click="DeclineLicenseRb_Click"/>
+            <RadioButton Content="{DynamicResource LicenseAccept}" Click="AcceptLicenseRb_Click"/>
+            <RadioButton Content="{DynamicResource LicenseDecline}" IsChecked="true" Click="DeclineLicenseRb_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>

GoAwayEdge/Pages/Settings.xaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
-        <Label FontSize="20" Content="{StaticResource SettingsTitle}" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Label FontSize="20" Content="{DynamicResource SettingsTitle}" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
         <StackPanel Margin="0,5,0,0">
             <ui:CardControl Icon="Channel24">
                 <ui:CardControl.Header>
@@ -21,11 +21,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsEdgeChannelTitle}" />
+                                Text="{DynamicResource SettingsEdgeChannelTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsEdgeChannelDescription}" />
+                                Text="{DynamicResource SettingsEdgeChannelDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" x:Name="EdgeChannelBox" Width="180" SelectionChanged="EdgeChannelBox_OnSelectionChanged"/>
                     </Grid>
@@ -45,11 +45,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsSearchEngineTitle}" />
+                                Text="{DynamicResource SettingsSearchEngineTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsSearchEngineDescription}" />
+                                Text="{DynamicResource SettingsSearchEngineDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" x:Name="SearchEngineBox" Width="180" SelectionChanged="SearchEngineBox_OnSelectionChanged"/>
                     </Grid>
@@ -69,11 +69,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsCustomSearchEngineTitle}" />
+                                Text="{DynamicResource SettingsCustomSearchEngineTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsCustomSearchEngineDescription}"/>
+                                Text="{DynamicResource SettingsCustomSearchEngineDescription}"/>
                         </StackPanel>
                         <ui:TextBox Grid.Column="1" Width="300" x:Name="QueryUrlTextBox" TextChanged="QueryUrlTextBox_OnTextChanged" PlaceholderText="https://www.google.com/search?q="/>
                     </Grid>
@@ -93,11 +93,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="{StaticResource SettingsUninstallTitle}" />
+                                Text="{DynamicResource SettingsUninstallTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="{StaticResource SettingsUninstallDescription}" 
+                                Text="{DynamicResource SettingsUninstallDescription}" 
                                 x:Name="EdgeUninstallNote"/>
                         </StackPanel>
                         <ui:ToggleSwitch Grid.Column="1" x:Name="UninstallSwitch" Click="UninstallSwitch_OnClick"/>

GoAwayEdge/Pages/Settings.xaml.cs

@@ -52,12 +52,14 @@ public Settings()
                 Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
                 "valnoxy",
                 "GoAwayEdge");
-
+
+            if (!Path.Exists(instDir))
+                UninstallSwitch.IsEnabled = false;
             if (Path.GetDirectoryName(Environment.ProcessPath) != instDir) return;
             UninstallSwitch.IsEnabled = false;
             Dispatcher.Invoke(() =>
             {
-                var resourceValue = (string)Application.Current.MainWindow.FindResource("SettingsUninstallUseInstaller");
+                var resourceValue = (string)Application.Current.MainWindow!.FindResource("SettingsUninstallUseInstaller");
                 EdgeUninstallNote.Text = !string.IsNullOrEmpty(resourceValue) ? resourceValue : "Please use the Installer in order to uninstall GoAwayEdge.";
             });
         }

README.md

@@ -4,7 +4,7 @@
 <p align="center">
     Redirect all Edge calls to your favorite browser! 
     <br />
-    <strong>Version: </strong>1.1.0
+    <strong>Version: </strong>1.1.1
     <br />
     <br />
     <a href="https://github.com/valnoxy/GoAwayEdge/releases"><strong>Download now »</strong></a>
@@ -13,6 +13,8 @@
     <a href="https://github.com/valnoxy/GoAwayEdge/issues">Report Bug</a>
     ·
     <a href="https://github.com/valnoxy/GoAwayEdge/discussions/">Discussions</a>
+    ·
+    <a href="https://crowdin.com/project/goawayedge">Help me translate</a>
   </p>
 </p>
 
@@ -21,6 +23,7 @@
 ![Download counter](https://img.shields.io/github/downloads/valnoxy/GoAwayEdge/total.svg)
 ![License](https://img.shields.io/github/license/valnoxy/GoAwayEdge)
 ![version](https://img.shields.io/github/v/release/valnoxy/GoAwayEdge)
+[![Crowdin](https://badges.crowdin.net/goawayedge/localized.svg)](https://crowdin.com/project/goawayedge)
 
 ## 🔔 Information
 Don't like MS Edge? Me neither. Redirect all Edge calls (like Windows Search and Widgets) to your favorite browser! 
@@ -30,6 +33,9 @@ Don't like MS Edge? Me neither. Redirect all Edge calls (like Windows Search and
 - Filter search queries (removes url tracker)
 - Simple usage
 
+## 🖼️ Screenshot
+<img src="https://dl.exploitox.de/goawayedge/GoAwayEdge_Screenshot1.png" alt="GoAwayEdge Setup" width=650>
+
 ## 🔧 Usage
 1. Download the latest version from [GitHub](https://github.com/valnoxy/GoAwayEdge/releases).
 2. Start the application.