#39726, #39728 More tweaks

* Tweaks based on style feedback.
* Further adobecc->photoshopcc changes

engine.py

@@ -19,7 +19,7 @@
 
 class PhotoshopCCEngine(sgtk.platform.Engine):
     """
-    An Adobe CC engine for Shotgun Toolkit.
+    A Photoshop CC engine for Shotgun Toolkit.
     """
 
     SHOTGUN_ADOBE_PORT = os.environ.get("SHOTGUN_ADOBE_PORT")
@@ -103,7 +103,7 @@ def pre_app_init(self):
         """
 
         # import and keep a handle on the bundled python module
-        self.__tk_adobecc = self.import_module("tk_adobecc")
+        self.__tk_photoshopcc = self.import_module("tk_photoshopcc")
 
         # TODO: do we need this if it's stored at the class level?
         self._app_id = self.SHOTGUN_ADOBE_APPID
@@ -114,7 +114,7 @@ def pre_app_init(self):
 
         # get the adobe instance. it may have been initialized already by a
         # previous instance of the engine. if not, initialize a new one.
-        self._adobe = self.__tk_adobecc.AdobeBridge.get_or_create(
+        self._adobe = self.__tk_photoshopcc.AdobeBridge.get_or_create(
             identifier=self.instance_name,
             port=self.SHOTGUN_ADOBE_PORT,
             logger=self.logger,
@@ -136,8 +136,8 @@ def pre_app_init(self):
         # in order to use frameworks, they have to be imported via
         # import_module. so they're exposed in the bundled python. keep a handle
         # on them for reuse.
-        self.__shotgun_data = self.__tk_adobecc.shotgunutils.shotgun_data
-        self.__shotgun_globals = self.__tk_adobecc.shotgunutils.shotgun_globals
+        self.__shotgun_data = self.__tk_photoshopcc.shotgunutils.shotgun_data
+        self.__shotgun_globals = self.__tk_photoshopcc.shotgunutils.shotgun_globals
 
         # import here since the engine is responsible for defining Qt.
         from sgtk.platform.qt import QtCore

info.yml

@@ -45,8 +45,8 @@ configuration:
 requires_shotgun_fields:
 
 # More verbose description of this item 
-display_name: "Shotgun Engine for Adobe CC"
-description: "Shotgun Integration for Adobe CC"
+display_name: "Shotgun Engine for Photoshop CC"
+description: "Shotgun Integration for Photoshop CC"
 
 # Required minimum versions for this item to run
 requires_shotgun_version:

plugins/README.md

@@ -68,7 +68,7 @@ optional arguments:
                         The name of the engine plugin to build. Ex: 'basic'.
   --extension_name name, -e name
                         The name of the output extension. Ex:
-                        'com.shotgunsoftware.basic.adobecc'
+                        'com.shotgunsoftware.basic.photoshopcc'
   --sign /path/to/ZXPSignCmd /path/to/certificate password, -s /path/to/ZXPSignCmd /path/to/certificate password
                         If supplied, sign the build extension. Requires 3
                         arguments: the path to the 'ZXPSignCmd', the
@@ -119,15 +119,15 @@ file (what Adobe wants for its Add-ons site). This scenario will simply run the
 underlying SG plugin build into a directory of your choosing.
 
 To test with this setup, set an environment variable:
-`SHOTGUN_ADOBECC_DISABLE_AUTO_INSTALL`. In the classic toolkit startup (web,
+`SHOTGUN_ADOBE_DISABLE_AUTO_INSTALL`. In the classic toolkit startup (web,
 Desktop, tk-shell) this will prevent the `.zxp` packaged with the engine from
 being installed automatically.
 
 Now you can build the extension directly to the CEP extensions directory. Here's
 an example of the command run from the top level of the engine repo:
 
 ```
-python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.adobecc -o "/Users/josh/Library/Application Support/Adobe/CEP/extensions/"
+python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.photoshopcc -o "/Users/josh/Library/Application Support/Adobe/CEP/extensions/"
 ```
 
 Argument breakdown:
@@ -151,7 +151,7 @@ You can also build a signed extension that mimics the final build. This workflow
 involves building a `.zxp` file that can be auto-installed and updated as you
 launch toolkit (via web, Desktop, or tk-shell).
 
-First, make sure you do **NOT** have the `SHOTGUN_ADOBECC_DISABLE_AUTO_INSTALL`
+First, make sure you do **NOT** have the `SHOTGUN_ADOBE_DISABLE_AUTO_INSTALL`
 set in your environment. We will build the `.zxp` and allow the auto install to
 run. This env variable prevents that.
 
@@ -165,7 +165,7 @@ Now you can build the `.zxp` file with the extension build script. Here's an
 example command run from the top level of the engine repo:
 
 ```
-python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.adobecc -s ../ZXPSignCmd ~/Documents/certs/my_certificate.p12 my_cert_password
+python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.photoshopcc -s ../ZXPSignCmd ~/Documents/certs/my_certificate.p12 my_cert_password
 ```
 
 The first few arguments are identical to the previous example. The additional
@@ -183,8 +183,8 @@ be build and overwrite the `.zxp` file in the engine. The built extension file
 will look like this:
 
 ```
-com.shotgunsoftware.basic.adobecc.version
-com.shotgunsoftware.basic.adobecc.zxp
+com.shotgunsoftware.basic.photoshopcc.version
+com.shotgunsoftware.basic.photoshopcc.zxp
 ```
 
 Notice the `.version` file. This file is used by the toolkit startup logic to
@@ -206,14 +206,14 @@ exception of specifying an actual version. To do that, you simple add an additio
 argument to the build command:
 
 ```
-python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.adobecc -s ../ZXPSignCmd ~/Documents/certs/my_certificate.p12 my_cert_password -v v0.0.1
+python developer/build_extension.py -c ../tk-core -p basic -e com.shotgunsoftware.basic.photoshopcc -s ../ZXPSignCmd ~/Documents/certs/my_certificate.p12 my_cert_password -v v0.0.1
 ```
 
 The results of the command will look like this:
 
 ```
-com.shotgunsoftware.basic.adobecc.version
-com.shotgunsoftware.basic.adobecc.zxp
+com.shotgunsoftware.basic.photoshopcc.version
+com.shotgunsoftware.basic.photoshopcc.zxp
 ```
 
 Unlike the previous section, the `.version` file will now include the string
@@ -224,7 +224,7 @@ compare and determine if the user's installed version requires an update.
 ### Testing
 
 The `basic` plugin/extension has a flyout menu with options useful for testing
-and debugging. To enable these, set the environment variable `SHOTGUN_ADOBECC_DEVELOPER`.
+and debugging. To enable these, set the environment variable `SHOTGUN_ADOBE_DEVELOPER`.
 
 
 * **Chrome Console...** - Requires Chrome as the default browser. Opens a Chrome

plugins/basic/.debug

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ExtensionList>
-    <Extension Id="com.shotgunsoftware.basic.adobecc.panel">
+    <Extension Id="com.shotgunsoftware.basic.photoshopcc.panel">
         <HostList>
            <Host Name="PHSP" Port="45216"/>
            <Host Name="PHXS" Port="45217"/>

plugins/basic/CSXS/manifest.xml

@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ExtensionManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ExtensionBundleId="com.shotgunsoftware.basic.adobecc" ExtensionBundleName="Shotgun Engine for AdobeCC" ExtensionBundleVersion="1.0" Version="6.0">
+<ExtensionManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ExtensionBundleId="com.shotgunsoftware.basic.photoshopcc" ExtensionBundleName="Shotgun Engine for Photoshop CC" ExtensionBundleVersion="1.0" Version="6.0">
     <ExtensionList>
-        <Extension Id="com.shotgunsoftware.basic.adobecc.manager" Version="1.0"/>
-        <Extension Id="com.shotgunsoftware.basic.adobecc.panel" Version="1.0"/>
+        <Extension Id="com.shotgunsoftware.basic.photoshopcc.manager" Version="1.0"/>
+        <Extension Id="com.shotgunsoftware.basic.photoshopcc.panel" Version="1.0"/>
     </ExtensionList>
     <ExecutionEnvironment>
         <HostList>
             <!-- Photoshop - CC 2014+ -->
             <Host Name="PHSP" Version="15.0"/>
             <Host Name="PHXS" Version="15.0"/>
-
-            <!-- TODO: comment these out before release! -->
-            <!-- TODO: Manager does not sart properly for AE or PPro -->
-
-            <!-- After Effects -->
-            <Host Name="AEFT" Version="13.0" />
-
-            <!-- Premiere Pro -->
-            <Host Name="PPRO" Version="10.0" />
         </HostList>
         <LocaleList>
             <Locale Code="All"/>
@@ -27,7 +18,7 @@
         </RequiredRuntimeList>
     </ExecutionEnvironment>
     <DispatchInfoList>
-        <Extension Id="com.shotgunsoftware.basic.adobecc.manager">
+        <Extension Id="com.shotgunsoftware.basic.photoshopcc.manager">
             <DispatchInfo>
                 <Resources>
                     <MainPath>./html/manager.html</MainPath>
@@ -58,7 +49,7 @@
                 </UI>
             </DispatchInfo>
         </Extension>
-        <Extension Id="com.shotgunsoftware.basic.adobecc.panel">
+        <Extension Id="com.shotgunsoftware.basic.photoshopcc.panel">
             <DispatchInfo>
                 <Resources>
                     <MainPath>./html/panel.html</MainPath>

plugins/basic/css/style.css

@@ -162,8 +162,6 @@ div.sg_error {
     background-color: #525152;
     text-align: left;
     flex-wrap: wrap;
-    padding-left: 14px;
-    padding-right: 0px;
     padding-top: 8px;
     padding-bottom: 4px;
     margin: 0px;
@@ -172,12 +170,15 @@ div.sg_error {
 
 #sg_panel_favorites_header {
     color: #D7D7D7;
-    padding-left: 6px;
+    padding-left: 20px;
+}
+
+#sg_panel_favorites_shelf {
+    padding-left: 12px;
 }
 
 /* grayscale images in favorites until hovered */
 .sg_panel_command_img {
-    -webkit-filter: grayscale(1) brightness(.75);
     width: 19px;
     height: 19px;
 }
@@ -187,19 +188,23 @@ div.sg_error {
     height: 19px;
 }
 
-.sg_panel_command_img:hover {
-    -webkit-filter: grayscale(0) brightness(1);
-}
-
 /* regular command button */
 .sg_command_button {
     display: inline-block;
     border-radius: 3px;
-    margin: 1px;
+    margin: 2px;
     padding: 4px;
     border: 1px solid rgba(0, 0, 0, 0);
 }
 
+.sg_command_button img {
+    -webkit-filter: grayscale(1) brightness(1) contrast(1);
+}
+
+.sg_command_button:hover img {
+    -webkit-filter: grayscale(0) brightness(2) contrast(2);
+}
+
 .sg_command_button:hover {
     border: 1px solid #666666;
     background-color: #454545;
@@ -223,10 +228,13 @@ div.sg_error {
     padding-left: 16px;
     padding-right: 18px;
     padding-top: 5px;
-    -webkit-filter: grayscale(1) brightness(.75);
     color: #D7D7D7;
 }
 
+.sg_panel_command img {
+    -webkit-filter: grayscale(1) brightness(1) contrast(1);
+}
+
 .sg_panel_command a:link {
     color: #D7D7D7;
 }
@@ -238,7 +246,10 @@ div.sg_error {
 .sg_panel_command:hover {
     background-color: #6B6B6B;
     color: white;
-    -webkit-filter: grayscale(0) brightness(1);
+}
+
+.sg_panel_command:hover img {
+    -webkit-filter: grayscale(0) brightness(2) contrast(2);
 }
 
 .sg_panel_command:hover a:link {

plugins/basic/info.yml

@@ -16,7 +16,7 @@
 name: "tk-photoshopcc-basic"
 version: "0.0.1"
 
-description: "Plugin to bootstrap the Shotgun Engine for Adobe CC"
+description: "Plugin to bootstrap the Shotgun Engine for Photoshop CC"
 author: "Shotgun Software"
 organization: "Autodesk Inc."
 contact: "support@shotgunsoftware.com"

plugins/basic/js/shotgun/constants.js

@@ -16,11 +16,11 @@ var sg_constants = sg_constants || {};
 sg_constants.extension_info = {
 
     manager: {
-        id: "com.shotgunsoftware.basic.adobecc.manager"
+        id: "com.shotgunsoftware.basic.photoshopcc.manager"
     },
 
     panel: {
-        id: "com.shotgunsoftware.basic.adobecc.panel"
+        id: "com.shotgunsoftware.basic.photoshopcc.panel"
     }
 };
 
@@ -46,22 +46,6 @@ sg_constants.product_info = {
         display_name: "Photoshop",
         tk_engine_name: "tk-photoshop",
         debug_url: "http://localhost:45217"
-    },
-
-    // After Effects
-
-    AEFT: {
-        display_name: "After Effects",
-        tk_engine_name: "tk-aftereffects",
-        debug_url: "http://localhost:45218"
-    },
-
-    // Premiere Pro
-
-    PPRO: {
-        display_name: "Premiere Pro",
-        tk_engine_name: "tk-premiere",
-        debug_url: "http://localhost:45219"
     }
 
     // NOTE: the debug ports are defined in .debug file at the top level of the

plugins/basic/js/shotgun/events.js

@@ -15,7 +15,7 @@ var sg_event = sg_event || {};
 const _cs_interface = new CSInterface();
 
 // namespace for app events
-const _event_namespace = "com.shotgunsoftware.basic.adobecc.events";
+const _event_namespace = "com.shotgunsoftware.basic.photoshopcc.events";
 
 
 // ---- Functions

plugins/basic/js/shotgun/manager.js

@@ -517,7 +517,7 @@ sg_manager.Manager = new function() {
         // Handle requests for test running.
         sg_panel.RUN_TESTS.connect(
             function(event) {
-                sg_logging.debug("Requesting that tk_adobecc run tests...");
+                sg_logging.debug("Requesting that tk_photoshopcc run tests...");
                 sg_socket_io.rpc_run_tests();
             }
         );

plugins/basic/js/shotgun/panel.js

@@ -348,7 +348,8 @@ sg_panel.Panel = new function() {
         if (favorites.length > 0) {
 
             favorites_html = "<div id='sg_panel_favorites'>" +
-                "<div id='sg_panel_favorites_header'>Run a Command</div>";
+                "<div id='sg_panel_favorites_header'>Run a Command</div>" +
+                "<div id='sg_panel_favorites_shelf'>";
 
             // loop over favorites here
             favorites.forEach(function(favorite) {
@@ -378,7 +379,7 @@ sg_panel.Panel = new function() {
                 // TODO: if command is missing something, log it.
             });
 
-            favorites_html += "</div>";
+            favorites_html += "</div></div>";
         }
 
         // Now process the non-favorite commands
@@ -701,7 +702,7 @@ sg_panel.Panel = new function() {
         const subject = encodeURIComponent("Adobe Integration Error");
         const body = encodeURIComponent(
             "Greetings Shotgun Support Team!\n\n" +
-            "We have some questions about the Adobe CC Integration.\n\n" +
+            "We have some questions about the Photoshop CC Integration.\n\n" +
             "*** Please enter your questions here... ***\n\n"
         );
 
@@ -1191,7 +1192,7 @@ sg_panel.Panel = new function() {
 
         return encodeURIComponent(
             "Greetings Shotgun Support Team!\n\n" +
-            "We are experiencing some difficulties with the Adobe CC Integration. " +
+            "We are experiencing some difficulties with the Photoshop CC Integration. " +
             "The details are included below.\n\n" +
             "Summary of the issue:\n\n" +
             "*** Please enter a summary of the issue here... ***\n\n" +

plugins/basic/js/shotgun/panel_events.js

@@ -22,7 +22,7 @@ sg_event.create_event(sg_panel, "REQUEST_MANAGER_RELOAD");
 // sent by the panel to request an updated state from the python process
 sg_event.create_event(sg_panel, "REQUEST_STATE");
 
-// sent by the panel to alert Python of the need to run the adobecc
+// sent by the panel to alert Python of the need to run the photoshopcc
 // test suite.
 sg_event.create_event(sg_panel, "RUN_TESTS");
 

plugins/basic/python/plugin_bootstrap.py

@@ -117,7 +117,7 @@ def bootstrap(root_path, port, engine_name, app_id):
 
     from sgtk.platform.qt import QtGui
 
-    app_name = 'Shotgun Engine for Adobe CC'
+    app_name = 'Shotgun Engine for Photoshop CC'
 
     # create and set up the Qt app. we don't want the app to close when the
     # last window is shut down since it's running in parallel to the CC product.

plugins/basic/software_credits

@@ -1,5 +1,5 @@
 The following licenses and copyright notices apply to various components
-of the Shotgun Engine for Adobe CC as outlined below.
+of the Shotgun Engine for Photoshop CC as outlined below.
 
 
 ======== socketIO-client (https://pypi.python.org/pypi/socketIO-client) =======

python/__init__.py

@@ -8,4 +8,4 @@
 # agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
 # not expressly granted therein are reserved by Shotgun Software Inc.
 
-from . import tk_adobecc
+from . import tk_photoshopcc