Additional tweaks for 1.0 release.

googlearchive · Nov 30, 2017 · b2dd01d · b2dd01d
1 parent 25af431
commit b2dd01d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/PolyToolkitUnity/Assets/PolyToolkit/Editor/AssetBrowser/AssetBrowserWindow.cs b/PolyToolkitUnity/Assets/PolyToolkit/Editor/AssetBrowser/AssetBrowserWindow.cs
@@ -1014,7 +1014,9 @@ private void DrawDetailsUi() {
     guiHelper.EndHorizontal();
     GUILayout.Space(5);
 
-    if (File.Exists(PtUtils.ToAbsolutePath(ptAssetLocalPath))) {
+    if (!File.Exists(PtUtils.ToAbsolutePath(ptAssetLocalPath))) {
+      GUILayout.Label(PolyInternalUtils.ATTRIBUTION_NOTICE, EditorStyles.wordWrappedLabel);
+    } else {
       GUILayout.Label("WARNING: The indicated asset already exists and will be OVERWRITTEN by " +
         "the new asset. Existing instances of the old asset will be automatically updated " +
         "to the new asset.",
@@ -1038,6 +1040,7 @@ private void DrawDetailsUi() {
         PtAnalytics.SendEvent(PtAnalytics.Action.IMPORT_STARTED_FROM_SEARCH,
             GetAssetFormatDescription(selectedAsset));
       }
+
       manager.StartDownloadAndImport(selectedAsset, ptAssetLocalPath, importOptions);
     }
   }

diff --git a/PolyToolkitUnity/Assets/PolyToolkit/Editor/AssetBrowser/WelcomeWindow.cs b/PolyToolkitUnity/Assets/PolyToolkit/Editor/AssetBrowser/WelcomeWindow.cs
@@ -38,7 +38,7 @@ public class WelcomeWindow : EditorWindow {
   private const string ONLINE_DOCUMENTATION_URL = "https://developers.google.com/poly/develop/unity";
 
   private const int DEFAULT_WIDTH = 500;
-  private const int DEFAULT_HEIGHT = 400;
+  private const int DEFAULT_HEIGHT = 500;
   private const int WELCOME_TEX_WIDTH = 500;
   private const int WELCOME_TEX_HEIGHT = 150;
 
@@ -97,6 +97,7 @@ public void OnGUI() {
         "The Poly Toolkit window was added to your editor. You can use it as a separate " +
         "window or dock like any tool window. If you close it, you can access it again " +
         "from the Poly menu.\n\n" +
+        PolyInternalUtils.ATTRIBUTION_NOTICE + "\n\n" +
         "Have fun!",
         EditorStyles.wordWrappedLabel);
 

diff --git a/PolyToolkitUnity/Assets/PolyToolkit/Internal/PolyInternalUtils.cs b/PolyToolkitUnity/Assets/PolyToolkit/Internal/PolyInternalUtils.cs
@@ -21,6 +21,11 @@ namespace PolyToolkitInternal {
   /// Internal utilities (that is, for use by our internal code, not by users of the library).
   /// </summary>
   public static class PolyInternalUtils {
+    public const string ATTRIBUTION_NOTICE =
+        "IMPORTANT: Third-party assets are licensed through the Creative Commons license. When using any " +
+        "third-party assets in your project, you are required to give proper attribution. For more information " +
+        "refer to https://goo.gl/CNVF5Z. By continuing, you agree to use assets in " +
+        "accordance to their license.";
     /// <summary>
     /// Creates a singleton GameObject in a way that's appropriate for
     /// the current runtime environment (Unity Editor or regular play mode).