Merge branch 'master' into stanley/branches-view-fixes

Author: StanleyGoldman

src/GitHub.Api/Git/GitRemote.cs

@@ -24,41 +24,6 @@ public struct GitRemote
         public GitRemoteFunction function;
         public string token;
 
-        public string Name
-        {
-            get { return name; }
-        }
-
-        public string Url
-        {
-            get { return url; }
-        }
-
-        public string Login
-        {
-            get { return login; }
-        }
-
-        public string User
-        {
-            get { return user; }
-        }
-
-        public string Token
-        {
-            get { return token; }
-        }
-
-        public string Host
-        {
-            get { return host; }
-        }
-
-        public GitRemoteFunction Function
-        {
-            get { return function; }
-        }
-
         public GitRemote(string name, string host, string url, GitRemoteFunction function, string user, string login, string token)
         {
             this.name = name;
@@ -77,8 +42,8 @@ public GitRemote(string name, string host, string url, GitRemoteFunction functio
             this.host = host;
             this.function = function;
             this.user = user;
-            login = null;
-            token = null;
+            this.login = null;
+            this.token = null;
         }
 
         public GitRemote(string name, string host, string url, GitRemoteFunction function)
@@ -96,11 +61,11 @@ public GitRemote(string name, string url)
         {
             this.name = name;
             this.url = url;
-            login = null;
-            user = null;
-            token = null;
-            host = null;
-            function = GitRemoteFunction.Unknown;
+            this.login = null;
+            this.user = null;
+            this.token = null;
+            this.host = null;
+            this.function = GitRemoteFunction.Unknown;
         }
 
         public override string ToString()
@@ -114,5 +79,13 @@ public override string ToString()
             sb.AppendLine(String.Format("Function: {0}", Function));
             return sb.ToString();
         }
+
+        public string Name => name;
+        public string Url => url;
+        public string Login => login;
+        public string User => user;
+        public string Token => token;
+        public string Host => host;
+        public GitRemoteFunction Function => function;
     }
 }

src/GitHub.Api/Localization.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    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 
+
+    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>
@@ -26,36 +26,36 @@
         <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 
+
+    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 
+
+    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 
+
+    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 
+
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -286,12 +286,12 @@
     <value>Branch pushed</value>
   </data>
   <data name="InitializeRepositoryButtonText" xml:space="preserve">
-    <value>Initialize repository</value>
+    <value>Initialize a git repository for this project</value>
   </data>
   <data name="SwitchBranchTitle" xml:space="preserve">
     <value>Switch branch</value>
   </data>
   <data name="SwitchBranchFailedDescription" xml:space="preserve">
     <value>Could not switch to branch {0}</value>
   </data>
-</root>
+</root>

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -151,6 +151,8 @@
     <EmbeddedResource Include="IconsAndLogos\dot.png" />
     <EmbeddedResource Include="IconsAndLogos\dropdown-list-icon%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\dropdown-list-icon.png" />
+    <EmbeddedResource Include="IconsAndLogos\[email protected]" />
+    <EmbeddedResource Include="IconsAndLogos\empty-state-init.png" />
     <EmbeddedResource Include="IconsAndLogos\favorite-branch-indicator.png" />
     <EmbeddedResource Include="IconsAndLogos\git-merge%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\git-merge-light%402x.png" />
@@ -207,12 +209,12 @@
   </ItemGroup>
   <Import Project="..\..\..\..\..\common\nativelibraries.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
   <Import Project="..\..\..\..\..\common\build.targets" />
-</Project>
+</Project>

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/empty-state-init.png

@@ -70,6 +70,7 @@ class Styles
                                 commitFileAreaStyle,
                                 commitButtonStyle,
                                 textFieldStyle,
+                                boldCenteredLabel,
                                 centeredLabel,
                                 commitDescriptionFieldStyle,
                                 toggleMixedStyle,
@@ -95,6 +96,7 @@ class Styles
                                  localCommitIcon,
                                  repoIcon,
                                  lockIcon,
+                                 emptyStateInit,
                                  dropdownListIcon;
 
         public static Texture2D GetFileStatusIcon(GitFileStatus status, bool isLocked)
@@ -557,6 +559,22 @@ public static GUIStyle CenteredLabel
             }
         }
 
+        public static GUIStyle BoldCenteredLabel
+        {
+            get
+            {
+                if (boldCenteredLabel == null)
+                {
+                    boldCenteredLabel = new GUIStyle(EditorStyles.boldLabel);
+                    boldCenteredLabel.name = "BoldCenteredLabelStyle";
+                    boldCenteredLabel.alignment = TextAnchor.MiddleCenter;
+                    boldCenteredLabel.wordWrap = true;
+                }
+                return boldCenteredLabel;
+            }
+        }
+
+
         public static GUIStyle CommitDescriptionFieldStyle
         {
             get
@@ -788,6 +806,19 @@ public static Texture2D LockIcon
             }
         }
 
+        public static Texture2D EmptyStateInit
+        {
+          get
+          {
+            if (emptyStateInit == null)
+            {
+              emptyStateInit = Utility.GetIcon("empty-state-init.png", "[email protected]");
+            }
+            return emptyStateInit;
+          }
+
+        }
+
         public static Texture2D DropdownListIcon
         {
             get

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/[email protected]

@@ -1,28 +1,23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
-
 namespace GitHub.Unity
 {
     //http://answers.unity3d.com/answers/809221/view.html
 
     [Serializable]
     public class SerializableDictionary<TKey, TValue> : Dictionary<TKey, TValue>, ISerializationCallbackReceiver
     {
-        [SerializeField]
-        private List<TKey> keys = new List<TKey>();
-
-        [SerializeField]
-        private List<TValue> values = new List<TValue>();
+        [SerializeField] private List<TKey> keys = new List<TKey>();
+        [SerializeField] private List<TValue> values = new List<TValue>();
 
         // save the dictionary to lists
         public void OnBeforeSerialize()
         {
             keys.Clear();
             values.Clear();
-            foreach (KeyValuePair<TKey, TValue> pair in this)
+            foreach (var pair in this)
             {
                 keys.Add(pair.Key);
                 values.Add(pair.Value);
@@ -32,13 +27,19 @@ public void OnBeforeSerialize()
         // load dictionary from lists
         public void OnAfterDeserialize()
         {
-            this.Clear();
+            Clear();
 
             if (keys.Count != values.Count)
-                throw new Exception(string.Format("there are {0} keys and {1} values after deserialization. Make sure that both key and value types are serializable.", keys.Count, values.Count));
+            {
+                throw new Exception(
+                    string.Format("there are {0} keys and {1} values after deserialization. Make sure that both key and value types are serializable.",
+                        keys.Count, values.Count));
+            }
 
-            for (int i = 0; i < keys.Count; i++)
-                this.Add(keys[i], values[i]);
+            for (var i = 0; i < keys.Count; i++)
+            {
+                Add(keys[i], values[i]);
+            }
         }
     }
-}
+}