From f6d4fcbaca313470f32389d66cb88eeaf4fb493f Mon Sep 17 00:00:00 2001
From: aivanov <aivanov@oneincsystems.com>
Date: Thu, 1 Feb 2018 00:26:53 +0300
Subject: [PATCH] fix #1871. Remove Splash screen at all

---
 GitExtensions/Program.cs     |  30 +++-----
 GitUI/FormSplash.Designer.cs | 129 -----------------------------------
 GitUI/FormSplash.cs          |  78 ---------------------
 GitUI/FormSplash.resx        | 120 --------------------------------
 GitUI/GitUI.csproj           |  10 ---
 5 files changed, 10 insertions(+), 357 deletions(-)
 delete mode 100644 GitUI/FormSplash.Designer.cs
 delete mode 100644 GitUI/FormSplash.cs
 delete mode 100644 GitUI/FormSplash.resx

diff --git a/GitExtensions/Program.cs b/GitExtensions/Program.cs
index 19c5aee4c50..e6a88137121 100644
--- a/GitExtensions/Program.cs
+++ b/GitExtensions/Program.cs
@@ -54,27 +54,22 @@ private static void Main()
             }
 
             string[] args = Environment.GetCommandLineArgs();
-            FormSplash.ShowSplash();
-            //Store here SynchronizationContext.Current, because later sometimes it can be null
-            //see http://stackoverflow.com/questions/11621372/synchronizationcontext-current-is-null-in-continuation-on-the-main-ui-thread
-            GitUIExtensions.UISynchronizationContext = SynchronizationContext.Current;
-            AsyncLoader.DefaultContinuationTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-            Application.DoEvents();
+
+            //This form created for obtain UI synchronization context only
+            using (var empFormForSyncContext = new Form())
+            {
+                //Store here SynchronizationContext.Current, because later sometimes it can be null
+                //see http://stackoverflow.com/questions/11621372/synchronizationcontext-current-is-null-in-continuation-on-the-main-ui-thread
+                GitUIExtensions.UISynchronizationContext = SynchronizationContext.Current;
+                AsyncLoader.DefaultContinuationTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+            }
 
             AppSettings.LoadSettings();
             if (EnvUtils.RunningOnWindows())
             {
-              WebBrowserEmulationMode.SetBrowserFeatureControl();
-
-              //Quick HOME check:
-                FormSplash.SetAction("Checking home path...");
-                Application.DoEvents();
-
+                WebBrowserEmulationMode.SetBrowserFeatureControl();
                 FormFixHome.CheckHomePath();
             }
-            //Register plugins
-            FormSplash.SetAction("Loading plugins...");
-            Application.DoEvents();
 
             if (string.IsNullOrEmpty(AppSettings.Translation))
             {
@@ -91,9 +86,6 @@ private static void Main()
                     || string.IsNullOrEmpty(AppSettings.GitCommandValue)
                     || !File.Exists(AppSettings.GitCommandValue)))
                 {
-                    FormSplash.SetAction("Checking settings...");
-                    Application.DoEvents();
-
                     GitUICommands uiCommands = new GitUICommands(string.Empty);
                     var commonLogic = new CommonLogic(uiCommands.Module);
                     var checkSettingsLogic = new CheckSettingsLogic(commonLogic);
@@ -115,8 +107,6 @@ private static void Main()
                 // TODO: remove catch-all
             }
 
-            FormSplash.HideSplash();
-
             if (EnvUtils.RunningOnWindows())
                 MouseWheelRedirector.Active = true;
 
diff --git a/GitUI/FormSplash.Designer.cs b/GitUI/FormSplash.Designer.cs
deleted file mode 100644
index ee620bc0718..00000000000
--- a/GitUI/FormSplash.Designer.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-namespace GitUI
-{
-    partial class FormSplash
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this._NO_TRANSLATE_osLabel = new System.Windows.Forms.Label();
-            this._NO_TRANSLATE_versionLabel = new System.Windows.Forms.Label();
-            this._NO_TRANSLATE_programTitle = new System.Windows.Forms.Label();
-            this._NO_TRANSLATE_actionLabel = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Location = new System.Drawing.Point(5, 5);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(5);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Padding = new System.Windows.Forms.Padding(5);
-            this.pictureBox1.Size = new System.Drawing.Size(128, 128);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            // 
-            // panel1
-            // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this._NO_TRANSLATE_osLabel);
-            this.panel1.Controls.Add(this._NO_TRANSLATE_versionLabel);
-            this.panel1.Controls.Add(this._NO_TRANSLATE_programTitle);
-            this.panel1.Controls.Add(this._NO_TRANSLATE_actionLabel);
-            this.panel1.Controls.Add(this.pictureBox1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(256, 138);
-            this.panel1.TabIndex = 1;
-            // 
-            // _NO_TRANSLATE_osLabel
-            // 
-            this._NO_TRANSLATE_osLabel.AutoSize = true;
-            this._NO_TRANSLATE_osLabel.Location = new System.Drawing.Point(134, 52);
-            this._NO_TRANSLATE_osLabel.Name = "_NO_TRANSLATE_osLabel";
-            this._NO_TRANSLATE_osLabel.Size = new System.Drawing.Size(22, 13);
-            this._NO_TRANSLATE_osLabel.TabIndex = 4;
-            this._NO_TRANSLATE_osLabel.Text = "OS";
-            // 
-            // _NO_TRANSLATE_versionLabel
-            // 
-            this._NO_TRANSLATE_versionLabel.AutoSize = true;
-            this._NO_TRANSLATE_versionLabel.Location = new System.Drawing.Point(134, 30);
-            this._NO_TRANSLATE_versionLabel.Name = "_NO_TRANSLATE_versionLabel";
-            this._NO_TRANSLATE_versionLabel.Size = new System.Drawing.Size(59, 13);
-            this._NO_TRANSLATE_versionLabel.TabIndex = 3;
-            this._NO_TRANSLATE_versionLabel.Text = "Version {0}";
-            // 
-            // _NO_TRANSLATE_programTitle
-            // 
-            this._NO_TRANSLATE_programTitle.AutoSize = true;
-            this._NO_TRANSLATE_programTitle.Location = new System.Drawing.Point(134, 8);
-            this._NO_TRANSLATE_programTitle.Name = "_NO_TRANSLATE_programTitle";
-            this._NO_TRANSLATE_programTitle.Size = new System.Drawing.Size(74, 13);
-            this._NO_TRANSLATE_programTitle.TabIndex = 2;
-            this._NO_TRANSLATE_programTitle.Text = "Git Extensions";
-            // 
-            // _NO_TRANSLATE_actionLabel
-            // 
-            this._NO_TRANSLATE_actionLabel.AutoSize = true;
-            this._NO_TRANSLATE_actionLabel.Location = new System.Drawing.Point(134, 104);
-            this._NO_TRANSLATE_actionLabel.Name = "_NO_TRANSLATE_actionLabel";
-            this._NO_TRANSLATE_actionLabel.Size = new System.Drawing.Size(54, 13);
-            this._NO_TRANSLATE_actionLabel.TabIndex = 1;
-            this._NO_TRANSLATE_actionLabel.Text = "Loading...";
-            // 
-            // FormSplash
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(256, 138);
-            this.ControlBox = false;
-            this.Controls.Add(this.panel1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "FormSplash";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label _NO_TRANSLATE_programTitle;
-        private System.Windows.Forms.Label _NO_TRANSLATE_actionLabel;
-        private System.Windows.Forms.Label _NO_TRANSLATE_versionLabel;
-        private System.Windows.Forms.Label _NO_TRANSLATE_osLabel;
-    }
-}
\ No newline at end of file
diff --git a/GitUI/FormSplash.cs b/GitUI/FormSplash.cs
deleted file mode 100644
index 07ba2ebf63f..00000000000
--- a/GitUI/FormSplash.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using GitCommands;
-using GitCommands.Utils;
-using ResourceManager;
-
-namespace GitUI
-{
-    /// <summary>
-    ///   DO NOT INHERIT FORM GITEXTENIONSFORM SINCE THE SETTINGS ARE NOT YET LOADED WHEN THIS
-    ///   FORM IS SHOWN! TRANSLATIONS AND COLORED APPLICATION ICONS WILL BREAK!!!!
-    /// </summary>
-    public partial class FormSplash : Form
-    {
-        private readonly TranslationString _version = new TranslationString("Version {0}");
-
-        private static FormSplash instance;
-
-        public static void ShowSplash()
-        {
-            instance = new FormSplash();
-            instance.Show();
-        }
-
-        public static void SetAction(string action)
-        {
-            if (instance != null)
-                instance.SetActionText(action);
-        }
-
-        public static void HideSplash()
-        {
-            if (instance != null)
-            {
-                instance.Dispose();
-                instance = null;
-            }
-        }
-
-        private FormSplash()
-        {
-            ShowInTaskbar = false;
-
-            InitializeComponent();
-
-            SetFont();
-            _NO_TRANSLATE_programTitle.Font = new Font(SystemFonts.MessageBoxFont, FontStyle.Bold);
-			
-           	var image = Lemmings.GetPictureBoxImage(DateTime.Now);
-           	pictureBox1.Image = image ?? Properties.Resources.git_extensions_logo_final_128;
-        }
-
-        private void SetFont()
-        {
-            Font = SystemFonts.MessageBoxFont;
-        }
-
-        private void SetActionText(string action)
-        {
-            _NO_TRANSLATE_actionLabel.Text = action;
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            _NO_TRANSLATE_versionLabel.Text = string.Format(_version.Text, AppSettings.ProductVersion);
-
-            if (EnvUtils.RunningOnUnix())
-                _NO_TRANSLATE_osLabel.Text = "Unix";
-            if (EnvUtils.RunningOnMacOSX())
-                _NO_TRANSLATE_osLabel.Text = "MacOSX";
-            if (EnvUtils.RunningOnWindows())
-                _NO_TRANSLATE_osLabel.Text = "Windows";
-        }
-    }
-}
\ No newline at end of file
diff --git a/GitUI/FormSplash.resx b/GitUI/FormSplash.resx
deleted file mode 100644
index d58980a38d7..00000000000
--- a/GitUI/FormSplash.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/GitUI/GitUI.csproj b/GitUI/GitUI.csproj
index ecdbf379d06..21d1f6c0a3f 100644
--- a/GitUI/GitUI.csproj
+++ b/GitUI/GitUI.csproj
@@ -599,12 +599,6 @@
     <Compile Include="FormStatus.Designer.cs">
       <DependentUpon>FormStatus.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormSplash.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FormSplash.Designer.cs">
-      <DependentUpon>FormSplash.cs</DependentUpon>
-    </Compile>
     <Compile Include="CommandsDialogs\FormBrowse.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1563,10 +1557,6 @@
       <DependentUpon>FormSettings.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormSplash.resx">
-      <DependentUpon>FormSplash.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="CommandsDialogs\FormStash.resx">
       <DependentUpon>FormStash.cs</DependentUpon>
       <SubType>Designer</SubType>