[email protected]

## [1.9.0] - 2021-07-13 Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started! If you have previously used the Unity Asset Store Plastic SCM plug-in, you can now simply use this package. Make sure you delete the plug-in from your project. Removing a previously added Plastic SCM Asset Store Plug-In: - Select the PlasticSCM folder in the Assets\Plugins folder on the Project tab, then click Edit > Delete - Close the Unity Editor and open your project again. You will find the Plastic SCM menu item in the Window menu. ### Added - Added Checkin and Update confirmation notification - Added auto sign in when logged into Unity account ### Changed - Simplified UI: decluttered UI - Improved load time performance ### Fixed - Fixed view not switching to workspace after creating an Enterprise Gluon workspace - Fixed contextual menu not showing up in project view - Fixed SSO renew token after password change - Fixed some namespace collisions with Antlr3
needle-mirror · Jul 13, 2021 · d8981aa · d8981aa
1 parent dca99d0
commit d8981aa
Show file tree

Hide file tree

Showing 80 changed files with 1,251 additions and 780 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,28 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.9.0] - 2021-07-13
+
+Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started!
+If you have previously used the Unity Asset Store Plastic SCM plug-in, you can now simply use this package. Make sure you delete the plug-in from your project.
+Removing a previously added Plastic SCM Asset Store Plug-In:
+- Select the PlasticSCM folder in the Assets\Plugins folder on the Project tab, then click Edit > Delete
+- Close the Unity Editor and open your project again. You will find the Plastic SCM menu item in the Window menu.
+
+### Added
+- Added Checkin and Update confirmation notification
+- Added auto sign in when logged into Unity account
+
+### Changed
+- Simplified UI: decluttered UI
+- Improved load time performance
+
+### Fixed
+- Fixed view not switching to workspace after creating an Enterprise Gluon workspace
+- Fixed contextual menu not showing up in project view
+- Fixed SSO renew token after password change
+- Fixed some namespace collisions with Antlr3
+
 ## [1.7.1] - 2021-06-25
 
 Plastic SCM for Unity is now available as part of the Version Control Package! You can enable Plastic SCM via Window > Plastic SCM to get started!

diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs
@@ -6,24 +6,37 @@
 using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
 using Unity.PlasticSCM.Editor.Inspector;
 using Unity.PlasticSCM.Editor.UI;
+using System.ComponentModel;
 
 namespace Unity.PlasticSCM.Editor.AssetMenu
 {
     [InitializeOnLoad]
     internal class AssetMenuItems
     {
-        // Adds about 500ms to startup time
         static AssetMenuItems()
+        {
+            BackgroundWorker backgroundWorker = new BackgroundWorker();
+            backgroundWorker.DoWork += new DoWorkEventHandler(BackgroundWorker_DoWork);
+            backgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BackgroundWorker_CompletedWork);
+            backgroundWorker.RunWorkerAsync();
+        }
+
+        static void BackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
         {
             PlasticApp.InitializeIfNeeded();
-            sPlasticAPI = new PlasticAPI();
+        }
 
+        static void BackgroundWorker_CompletedWork(object sender, RunWorkerCompletedEventArgs e)
+        {
+            sPlasticAPI = new PlasticAPI();
             Enable();
         }
 
         // TODO: do this after calling plastic workspace
-        static void Enable()
+        internal static void Enable()
         {
+            if (sPlasticAPI==null) sPlasticAPI = new PlasticAPI();
+
             WorkspaceInfo wkInfo = FindWorkspace.InfoForApplicationPath(
                 Application.dataPath,
                 sPlasticAPI);

diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs
@@ -120,7 +120,7 @@ internal static SelectedAssetGroupInfo BuildFromSingleFile(
             string assetPath = Path.GetFullPath(path);
 
             WorkspaceTreeNode wkTreeNode =
-                Plastic.API.GetWorkspaceTreeNode(assetPath);
+                PlasticGui.Plastic.API.GetWorkspaceTreeNode(assetPath);
 
             if (isDirectory)
                 isFileSelection = false;

diff --git a/Editor/PlasticSCM/AssetMenu/AssetOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs
@@ -63,8 +63,8 @@ internal AssetOperations(
 
             mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
             mProgressControls = new EditorProgressControls(mGuiMessage);
-        }
 
+        }
         void IAssetMenuOperations.ShowPendingChanges()
         {
             mViewSwitcher.ShowPendingChanges();
@@ -199,7 +199,7 @@ void IAssetMenuOperations.ShowDiff()
                     string symbolicName = GetSymbolicName(selectedPath);
                     string extension = Path.GetExtension(selectedPath);
 
-                    diffInfo = Plastic.API.BuildDiffInfoForDiffWithPrevious(
+                    diffInfo = PlasticGui.Plastic.API.BuildDiffInfoForDiffWithPrevious(
                         selectedPath, symbolicName, selectedPath, extension, mWkInfo);
                 },
                 /*afterOperationDelegate*/ delegate
@@ -229,7 +229,7 @@ void IAssetMenuOperations.ShowHistory()
             string selectedPath = AssetsSelection.GetSelectedPath(
                 assetList);
 
-            WorkspaceTreeNode node = Plastic.API.
+            WorkspaceTreeNode node = PlasticGui.Plastic.API.
                 GetWorkspaceTreeNode(selectedPath);
 
             mHistoryViewLauncher.ShowHistoryView(
@@ -241,14 +241,14 @@ void IAssetMenuOperations.ShowHistory()
 
         static string GetSymbolicName(string selectedPath)
         {
-            WorkspaceTreeNode node = Plastic.API.
+            WorkspaceTreeNode node = PlasticGui.Plastic.API.
                 GetWorkspaceTreeNode(selectedPath);
 
             string branchName = string.Empty;
             BranchInfoCache.TryGetBranchName(
                 node.RepSpec, node.RevInfo.BranchId, out branchName);
 
-            string userName = Plastic.API.GetUserName(
+            string userName = PlasticGui.Plastic.API.GetUserName(
                 node.RepSpec.Server, node.RevInfo.Owner);
 
             string symbolicName = string.Format(
@@ -324,4 +324,4 @@ static bool IsApplicableForOperation(
             }
         }
     }
-}
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs
@@ -50,7 +50,7 @@ static AssetStatus CalculateStatus(
             if (!IsOnWorkspace(fullPath, wkPath))
                 return AssetStatus.None;
 
-            WorkspaceTreeNode treeNode = Plastic.API.GetWorkspaceTreeNode(fullPath);
+            WorkspaceTreeNode treeNode = PlasticGui.Plastic.API.GetWorkspaceTreeNode(fullPath);
 
             if (CheckWorkspaceTreeNodeStatus.IsPrivate(treeNode))
             {

diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png
diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta
diff --git a/Editor/PlasticSCM/Assets/Images/[email protected] b/Editor/PlasticSCM/Assets/Images/[email protected]
diff --git a/Editor/PlasticSCM/Assets/Images/[email protected] b/Editor/PlasticSCM/Assets/Images/[email protected]
diff --git a/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml
@@ -1,26 +1,28 @@
 <UXML xmlns="UnityEngine.UIElements">
-    <VisualElement class="flex-container main">
-        <Label name="createLabel" class="title" />
-        <VisualElement class="field">
-            <TextField name="orgName"/>
-            <Label name="orgNameNotification" class="notification"/>
+    <VisualElement class="flex-container column main">
+        <VisualElement class="flex-container grow">
+            <Label name="createLabel" class="title"/>
+            <VisualElement class="field">
+                <TextField name="orgName"/>
+                <Label name="orgNameNotification" class="notification"/>
+            </VisualElement>
+            <VisualElement name="datacenter" class="field">
+                <Label name="datacenterLabel" class="field-label"/>
+            </VisualElement>
+            <VisualElement name="dataCenterRetryContainer" class="row hidden">
+                <Label name="dataCenterRetryAlert" class="alert-label"/>
+                <Button name="dataCenterRetryButton"/>
+            </VisualElement>
+            <VisualElement class="field">
+                <Toggle name="encryptData"/>
+                <Label name="encryptExplanation"/>
+                <Button name="encryptLearnMore" class="anchor"/>
+            </VisualElement>
         </VisualElement>
-        <VisualElement name="datacenter" class="field">
-            <Label name="datacenterLabel" class="field-label"/>
+        <VisualElement class="row flex-container flex-end">
+            <Button class="footerButton" name="back"/>
+            <Button class="footerButton" name="create"/>
         </VisualElement>
-        <VisualElement name="dataCenterRetryContainer" class="row hidden">
-            <Label name="dataCenterRetryAlert" class="alert-label" />
-            <Button name="dataCenterRetryButton"/>
-        </VisualElement>
-        <VisualElement name="encryptField" class="field">
-            <Toggle name="encryptData" />
-            <Label name="encryptExplanation"/>
-            <Button name="encryptLearnMore" class="anchor"/>
-        </VisualElement>
-    </VisualElement>
-    <VisualElement class="footer row flex-container main">
-        <VisualElement name="gettingDatacenters" />
-        <Button name="back" />
-        <Button name="create" />
+        <VisualElement name="gettingDatacenters" class="flex-end"/>
     </VisualElement>
 </UXML>