diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index d6075f6..28d1867 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -74,9 +74,16 @@
MSBuild:Compile
Designer
+
+ InfoWindow.xaml
+
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
diff --git a/EnvyUpdate/InfoWindow.xaml b/EnvyUpdate/InfoWindow.xaml
new file mode 100644
index 0000000..86ce504
--- /dev/null
+++ b/EnvyUpdate/InfoWindow.xaml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EnvyUpdate/InfoWindow.xaml.cs b/EnvyUpdate/InfoWindow.xaml.cs
new file mode 100644
index 0000000..af23f93
--- /dev/null
+++ b/EnvyUpdate/InfoWindow.xaml.cs
@@ -0,0 +1,51 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace EnvyUpdate
+{
+ ///
+ /// Interaction logic for InfoWindow.xaml
+ ///
+ public partial class InfoWindow : Window
+ {
+ public InfoWindow()
+ {
+ InitializeComponent();
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/");
+ }
+
+ private void text_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ this.Cursor = Cursors.Hand;
+ }
+
+ private void text_MouseLeave(object sender, MouseEventArgs e)
+ {
+ this.Cursor = Cursors.Arrow;
+ }
+
+ private void textEnvyUpdate_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/blob/master/LICENSE");
+ }
+
+ private void textFody_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ System.Diagnostics.Process.Start("https://github.com/Fody/Fody/blob/master/License.txt");
+ }
+
+ private void textNotifyIcon_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ System.Diagnostics.Process.Start("https://github.com/hardcodet/wpf-notifyicon/blob/master/LICENSE");
+ }
+
+ private void textNotifications_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ System.Diagnostics.Process.Start("https://github.com/Federerer/Notifications.Wpf/blob/master/LICENSE");
+ }
+ }
+}
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index bdccd02..dd72dc7 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -21,7 +21,8 @@ namespace EnvyUpdate
private readonly string exeloc = System.Reflection.Assembly.GetEntryAssembly().Location;
private readonly string exepath = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\";
private readonly string startmenu = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu);
- private readonly string version = "1.1";
+ private readonly string version = "1.2";
+ private readonly string argument = Environment.GetCommandLineArgs()[1];
public MainWindow()
{
@@ -55,16 +56,25 @@ namespace EnvyUpdate
}
}
- if (Util.GetLocDriv() != null)
+ if (argument == "--ignore-gpu")
{
- localDriv = Util.GetLocDriv();
- textblockGPU.Text = localDriv;
+ MessageBox.Show("Skipping GPU check!");
+ textblockGPU.Text = "Check skipped.";
}
else
{
- MessageBox.Show("No NVIDIA GPU found. Application will exit.");
- Environment.Exit(255);
+ if (Util.GetLocDriv() != null)
+ {
+ localDriv = Util.GetLocDriv();
+ textblockGPU.Text = localDriv;
+ }
+ else
+ {
+ MessageBox.Show("No NVIDIA GPU found. Application will exit.");
+ Environment.Exit(255);
+ }
}
+
if (File.Exists(appdata + "nvidia-update.txt"))
{
chkPortable.IsChecked = false;
@@ -87,7 +97,9 @@ namespace EnvyUpdate
private void buttonHelp_Click(object sender, RoutedEventArgs e)
{
- System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/");
+ InfoWindow infoWin = new InfoWindow();
+ infoWin.ShowDialog();
+ //System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/");
}
private void Grid_Drop(object sender, DragEventArgs e)
diff --git a/EnvyUpdate/icon.ico b/EnvyUpdate/icon.ico
index 44d9430..d8e053f 100644
Binary files a/EnvyUpdate/icon.ico and b/EnvyUpdate/icon.ico differ
diff --git a/EnvyUpdate/icon.png b/EnvyUpdate/icon.png
index 94e6829..5862f89 100644
Binary files a/EnvyUpdate/icon.png and b/EnvyUpdate/icon.png differ
diff --git a/README.md b/README.md
index 2047392..5a08500 100644
--- a/README.md
+++ b/README.md
@@ -34,3 +34,4 @@ The application is compatible with all Nvidia GPUs that have their drivers avail
* Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
* wpf-notifyicon (for showing an icon in the system tray): [CPOL](https://github.com/hardcodet/wpf-notifyicon/blob/master/LICENSE)
* Notifications.Wpf: [MIT](https://github.com/Federerer/Notifications.Wpf/blob/master/LICENSE)
+* Icon made by Freepik from www.flaticon.com
\ No newline at end of file
diff --git a/res/version.txt b/res/version.txt
index 9459d4b..5625e59 100644
--- a/res/version.txt
+++ b/res/version.txt
@@ -1 +1 @@
-1.1
+1.2