MAYA-128363 pin stage in layer editor

lib/usd/ui/layerEditor/layerEditorWidget.cpp

@@ -48,70 +48,6 @@ namespace {
 
 using namespace UsdLayerEditor;
 
-// returns image_100.png" when you pass "image",
-// using the DPI setting and also returns always 100 on mac, because Qt doesn't
-// properly support high dpi with style sheets
-QString getDPIPixmapName(QString baseName)
-{
-#ifdef Q_OS_DARWIN
-    return baseName + "_100.png";
-#else
-    const auto scale = utils->dpiScale();
-    if (scale >= 2.0)
-        return baseName + "_200.png";
-    else if (scale >= 1.5)
-        return baseName + "_150.png";
-    return baseName + "_100.png";
-#endif
-}
-
-// setup a push button with DPI-appropriate regular, hover and pressed png in the
-// autodesk human interface guideline style
-static void setupButtonWithHIGBitmaps(QPushButton* button, const QString& baseName)
-{
-    button->setFlat(true);
-
-    // regular size: 16px, pressed:24px
-    // therefore, border is 4
-    int     padding = DPIScale(4);
-    QString cssTemplate(R"CSS(
-    QPushButton {
-        padding : %1px;
-        background-image: url(%2);
-        background-position: center center;
-        background-repeat: no-repeat;
-        border: 0px;
-        background-origin: content;
-        }
-    QPushButton::hover {
-            background-image: url(%3);
-        }
-    QPushButton::pressed {
-        background-image: url(%4);
-        border: 0px;
-        padding: 0px;
-        background-origin: content;
-        })CSS");
-
-    QString css = cssTemplate.arg(padding)
-                      .arg(getDPIPixmapName(baseName))
-                      .arg(getDPIPixmapName(baseName + "_hover"))
-                      .arg(getDPIPixmapName(baseName + "_pressed"));
-
-    button->setStyleSheet(css);
-
-    // overkill, but used to generate the grayed out version
-    auto effect = new QGraphicsOpacityEffect(button);
-    button->setGraphicsEffect(effect);
-}
-
-void disableHIGButton(QPushButton* button, bool disable = true)
-{
-    button->setDisabled(disable);
-    auto effect = dynamic_cast<QGraphicsOpacityEffect*>(button->graphicsEffect());
-    effect->setOpacity(disable ? 0.4 : 1.0);
-}
-
 // create the default menus on the parent QMainWindow
 void setupDefaultMenu(SessionState* in_sessionState, QMainWindow* in_parent)
 {
@@ -225,7 +161,7 @@ QLayout* LayerEditorWidget::setupLayout_toolbar()
               auto higButtonYOffset = DPIScale(4);
               auto higBtn = new QPushButton();
               higBtn->move(0, higButtonYOffset);
-              setupButtonWithHIGBitmaps(higBtn, iconName);
+              QtUtils::setupButtonWithHIGBitmaps(higBtn, iconName);
               higBtn->setFixedSize(buttonSize, buttonSize);
               higBtn->setToolTip(tooltip);
               toolbar->addWidget(higBtn, 0, buttonAlignment);
@@ -279,7 +215,7 @@ QLayout* LayerEditorWidget::setupLayout_toolbar()
         _saveButtonParent->setFixedSize(saveButtonSize);
         auto saveStageBtn = new QPushButton(_saveButtonParent);
         saveStageBtn->move(0, saveButtonYOffset);
-        setupButtonWithHIGBitmaps(saveStageBtn, ":/UsdLayerEditor/LE_save_all");
+        QtUtils::setupButtonWithHIGBitmaps(saveStageBtn, ":/UsdLayerEditor/LE_save_all");
         saveStageBtn->setFixedSize(buttonSize, buttonSize);
         saveStageBtn->setToolTip(
             StringResources::getAsQString(StringResources::kSaveAllEditsInLayerStack));
@@ -371,7 +307,7 @@ void LayerEditorWidget::updateButtons()
         int        count = static_cast<int>(layers.size());
         _buttons._dirtyCountBadge->updateCount(count);
         bool disable = count == 0;
-        disableHIGButton(_buttons._saveStageButton, disable);
+        QtUtils::disableHIGButton(_buttons._saveStageButton, disable);
     } else {
         _saveButtonParent->setVisible(false);
     }

lib/usd/ui/layerEditor/qtUtils.cpp

@@ -48,6 +48,65 @@ QPixmap QtUtils::createPixmap(QString const& in_pixmapName, int width, int heigh
     return pixmap;
 }
 
+QString QtUtils::getDPIPixmapName(QString baseName)
+{
+#ifdef Q_OS_DARWIN
+    return baseName + "_100.png";
+#else
+    const auto scale = utils->dpiScale();
+    if (scale >= 2.0)
+        return baseName + "_200.png";
+    else if (scale >= 1.5)
+        return baseName + "_150.png";
+    return baseName + "_100.png";
+#endif
+}
+
+void QtUtils::setupButtonWithHIGBitmaps(QPushButton* button, const QString& baseName)
+{
+    button->setFlat(true);
+
+    // regular size: 16px, pressed:24px
+    // therefore, border is 4
+    int     padding = DPIScale(4);
+    QString cssTemplate(R"CSS(
+    QPushButton {
+        padding : %1px;
+        background-image: url(%2);
+        background-position: center center;
+        background-repeat: no-repeat;
+        border: 0px;
+        background-origin: content;
+        }
+    QPushButton::hover {
+            background-image: url(%3);
+        }
+    QPushButton::pressed {
+        background-image: url(%4);
+        border: 0px;
+        padding: 0px;
+        background-origin: content;
+        })CSS");
+
+    QString css = cssTemplate.arg(padding)
+                      .arg(getDPIPixmapName(baseName))
+                      .arg(getDPIPixmapName(baseName + "_hover"))
+                      .arg(getDPIPixmapName(baseName + "_pressed"));
+
+    button->setStyleSheet(css);
+
+    // overkill, but used to generate the grayed out version
+    auto effect = new QGraphicsOpacityEffect(button);
+    button->setGraphicsEffect(effect);
+}
+
+void QtUtils::disableHIGButton(QPushButton* button, bool disable)
+{
+    button->setDisabled(disable);
+    auto effect = dynamic_cast<QGraphicsOpacityEffect*>(button->graphicsEffect());
+    effect->setOpacity(disable ? 0.4 : 1.0);
+}
+
 UsdLayerEditor::QtUtils* utils;
 
 void QtUtils::initLayoutMargins(QLayout* layout, int margin)

lib/usd/ui/layerEditor/qtUtils.h

@@ -51,6 +51,17 @@ class QtUtils
         auto localPos = widget->mapFromGlobal(globalPos);
         return rect.contains(localPos);
     }
+
+    // Prepares a push button with DPI-appropriate regular, hover and pressed png in the
+    // autodesk human interface guideline style
+    static void setupButtonWithHIGBitmaps(QPushButton* button, const QString& baseName);
+
+    // Returns image_100.png" when you pass "image",
+    // using the DPI setting and also returns always 100 on mac, because Qt doesn't
+    // properly support high dpi with style sheets
+    static QString getDPIPixmapName(QString baseName);
+
+    static void disableHIGButton(QPushButton* button, bool disable = true);
 };
 
 /**

lib/usd/ui/layerEditor/resources.qrc

@@ -35,6 +35,24 @@
         <file alias="LE_import_layer_pressed_150.png">resources/import_layer_pressed_150.png</file>
         <file alias="LE_import_layer_pressed_200.png">resources/import_layer_pressed_200.png</file>
 
+        <file alias="pin_off_100.png">resources/pin_off_100.png</file>
+        <file alias="pin_off_150.png">resources/pin_off_150.png</file>
+        <file alias="pin_off_200.png">resources/pin_off_200.png</file>
+        <file alias="pin_off_hover_100.png">resources/pin_off_hover_100.png</file>
+        <file alias="pin_off_hover_150.png">resources/pin_off_hover_150.png</file>
+        <file alias="pin_off_hover_200.png">resources/pin_off_hover_200.png</file>
+        <file alias="pin_off_pressed_100.png">resources/pin_on_hover_100.png</file>
+        <file alias="pin_off_pressed_150.png">resources/pin_on_hover_150.png</file>
+        <file alias="pin_off_pressed_200.png">resources/pin_on_hover_200.png</file>
+        <file alias="pin_on_100.png">resources/pin_on_100.png</file>
+        <file alias="pin_on_150.png">resources/pin_on_150.png</file>
+        <file alias="pin_on_200.png">resources/pin_on_200.png</file>
+        <file alias="pin_on_hover_100.png">resources/pin_on_hover_100.png</file>
+        <file alias="pin_on_hover_150.png">resources/pin_on_hover_150.png</file>
+        <file alias="pin_on_hover_200.png">resources/pin_on_hover_200.png</file>
+        <file alias="pin_on_pressed_100.png">resources/pin_off_hover_100.png</file>
+        <file alias="pin_on_pressed_150.png">resources/pin_off_hover_150.png</file>
+        <file alias="pin_on_pressed_200.png">resources/pin_off_hover_200.png</file>
 
         <file alias="target_hover.png">resources/target_hover_100.png</file>
         <file alias="target_hover_150.png">resources/target_hover_150.png</file>