From 34cade70a696c21b833b6b0e0159d7c5ef75cf25 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Fri, 9 Jan 2015 10:19:44 +0200
Subject: [PATCH] First update message box can activate

---
 ShareX.HelpersLib/Helpers/Helpers.cs           |  4 ++--
 .../Properties/Resources.Designer.cs           |  4 ++--
 ShareX.HelpersLib/Properties/Resources.resx    |  3 +--
 ShareX.HelpersLib/Properties/Resources.tr.resx |  3 +++
 .../UpdateChecker/UpdateMessageBox.Designer.cs |  1 +
 .../UpdateChecker/UpdateMessageBox.cs          | 18 ++++++++++++++++--
 .../UpdateChecker/UpdateMessageBox.resx        |  8 ++++----
 ShareX/Forms/MainForm.cs                       |  5 +++--
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/ShareX.HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs
index 891229b19..b6b3f85d2 100644
--- a/ShareX.HelpersLib/Helpers/Helpers.cs
+++ b/ShareX.HelpersLib/Helpers/Helpers.cs
@@ -42,8 +42,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Windows.Forms;
 using System.Web;
+using System.Windows.Forms;
 
 namespace ShareX.HelpersLib
 {
@@ -668,7 +668,7 @@ public static void CreateDirectoryIfNotExist(string path, bool isFilePath = true
                     catch (Exception e)
                     {
                         DebugHelper.WriteException(e);
-                        MessageBox.Show(Resources.Helpers_CreateDirectoryIfNotExist_Create_failed_ + "\r\n" + e, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBox.Show(Resources.Helpers_CreateDirectoryIfNotExist_Create_failed_ + "\r\n\r\n" + e, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
             }
diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs
index fe64e244d..ad2f2738d 100644
--- a/ShareX.HelpersLib/Properties/Resources.Designer.cs
+++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -673,7 +673,7 @@ internal class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Could not create directory, check your path settings:.
+        ///   Looks up a localized string similar to Could not create directory, check your path settings..
         /// </summary>
         internal static string Helpers_CreateDirectoryIfNotExist_Create_failed_ {
             get {
diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx
index a0efcfa0b..9f2c056e3 100644
--- a/ShareX.HelpersLib/Properties/Resources.resx
+++ b/ShareX.HelpersLib/Properties/Resources.resx
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -617,6 +616,6 @@ Would you like to download and install it?</value>
     <value>Update is available</value>
   </data>
   <data name="Helpers_CreateDirectoryIfNotExist_Create_failed_" xml:space="preserve">
-    <value>Could not create directory, check your path settings:</value>
+    <value>Could not create directory, check your path settings.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HelpersLib/Properties/Resources.tr.resx b/ShareX.HelpersLib/Properties/Resources.tr.resx
index 05535ee1b..80b551ac6 100644
--- a/ShareX.HelpersLib/Properties/Resources.tr.resx
+++ b/ShareX.HelpersLib/Properties/Resources.tr.resx
@@ -593,4 +593,7 @@ Dosya boyutu: {2:n0} / {3:n0} KB</value>
   <data name="UpdateMessageBox_UpdateMessageBox_update_is_available" xml:space="preserve">
     <value>Güncelleştirme mevcut</value>
   </data>
+  <data name="Helpers_CreateDirectoryIfNotExist_Create_failed_" xml:space="preserve">
+    <value>Klasör yaratılamıyor, yol ayarlarını kontrol ediniz.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.Designer.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.Designer.cs
index 24d698fba..f8538bddb 100644
--- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.Designer.cs
+++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.Designer.cs
@@ -66,6 +66,7 @@ private void InitializeComponent()
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.Name = "UpdateMessageBox";
+            this.Shown += new System.EventHandler(this.UpdateMessageBox_Shown);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.UpdateMessageBox_Paint);
             this.ResumeLayout(false);
 
diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs
index 1f77bcd83..2c4c40777 100644
--- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs
+++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs
@@ -34,6 +34,8 @@ public partial class UpdateMessageBox : Form
     {
         public static bool IsOpen { get; private set; }
 
+        public bool ActivateWindow { get; set; }
+
         private Rectangle fillRect;
 
         public UpdateMessageBox()
@@ -47,7 +49,7 @@ public UpdateMessageBox()
             fillRect = new Rectangle(0, 0, ClientSize.Width, ClientSize.Height);
         }
 
-        public static void Start(UpdateChecker updateChecker)
+        public static void Start(UpdateChecker updateChecker, bool activateWindow = true)
         {
             if (updateChecker != null && updateChecker.Status == UpdateStatus.UpdateAvailable)
             {
@@ -59,6 +61,7 @@ public static void Start(UpdateChecker updateChecker)
 
                     using (UpdateMessageBox messageBox = new UpdateMessageBox())
                     {
+                        messageBox.ActivateWindow = activateWindow;
                         result = messageBox.ShowDialog();
                     }
 
@@ -84,7 +87,18 @@ public static void Start(UpdateChecker updateChecker)
 
         protected override bool ShowWithoutActivation
         {
-            get { return true; }
+            get
+            {
+                return !ActivateWindow;
+            }
+        }
+
+        private void UpdateMessageBox_Shown(object sender, System.EventArgs e)
+        {
+            if (ActivateWindow)
+            {
+                this.ShowActivate();
+            }
         }
 
         private void UpdateMessageBox_Paint(object sender, PaintEventArgs e)
diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.resx b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.resx
index bb4850b6f..48ecd11a1 100644
--- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.resx
+++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.resx
@@ -131,6 +131,10 @@
   <data name="lblText.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblText.Text" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
   <data name="&gt;&gt;lblText.Name" xml:space="preserve">
     <value>lblText</value>
   </data>
@@ -206,10 +210,6 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>399, 135</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index ca4c98354..0c711983e 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -43,7 +43,7 @@ public partial class MainForm : HotkeyForm
     {
         public bool IsReady { get; private set; }
 
-        private bool forceClose;
+        private bool forceClose, firstUpdateCheck = true;
         private UploadInfoManager uim;
         private ToolStripDropDownItem tsmiImageFileUploaders, tsmiTrayImageFileUploaders, tsmiTextFileUploaders, tsmiTrayTextFileUploaders;
         private System.Threading.Timer updateTimer;
@@ -662,7 +662,8 @@ private void CheckUpdate()
             if (!UpdateMessageBox.IsOpen)
             {
                 UpdateChecker updateChecker = TaskHelpers.CheckUpdate();
-                UpdateMessageBox.Start(updateChecker);
+                UpdateMessageBox.Start(updateChecker, firstUpdateCheck);
+                firstUpdateCheck = false;
             }
         }