From e50810c36385234d30ca1dc2f3e3613fc86c19d6 Mon Sep 17 00:00:00 2001 From: Pierre Baillargeon Date: Mon, 27 May 2024 15:11:41 -0400 Subject: [PATCH] EMSUSD-1264 add tooltip for lookdevx button in material section in AE --- .../ae/usdschemabase/material_custom_control.py | 9 +++++---- .../resources/scripts/mayaUsdLibRegisterStrings.py | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/mayaUsd/resources/ae/usdschemabase/material_custom_control.py b/lib/mayaUsd/resources/ae/usdschemabase/material_custom_control.py index 8fb0a4abe4..79df6c9e4d 100644 --- a/lib/mayaUsd/resources/ae/usdschemabase/material_custom_control.py +++ b/lib/mayaUsd/resources/ae/usdschemabase/material_custom_control.py @@ -53,14 +53,14 @@ def onCreate(self, *args): hasLookdevX = self._hasLookdevX() graphIcon = 'LookdevX.png' if hasLookdevX else None - self.assignedMat = self._createTextField('material', 'kLabelAssignedMaterial', graphIcon) + self.assignedMat = self._createTextField('material', 'kLabelAssignedMaterial', graphIcon, 'kAnnShowMaterialInLookdevx') self.assignedMatMenu = self._createGraphMenu(self.assignedMat.button) self.strengthMenu = self._createDropDownField( 'strength', 'kLabelMaterialStrength', ['kLabelWeakerMaterial', 'kLabelStrongerMaterial']) - self.inheritedMat = self._createTextField('inherited', 'kLabelInheritedMaterial', graphIcon) + self.inheritedMat = self._createTextField('inherited', 'kLabelInheritedMaterial', graphIcon, 'kAnnShowMaterialInLookdevx') self.inheritedMatMenu = self._createGraphMenu(self.inheritedMat.button) # Note: icon image taken from Maya resources. @@ -76,7 +76,7 @@ def _hasLookdevX(): ''' return bool(cmds.pluginInfo('LookdevXMaya', query=True, loaded=True)) - def _createTextField(self, longName, uiNameRes, image=None): + def _createTextField(self, longName, uiNameRes, image=None, imageTooltipRes=None): ''' Create a disabled text field group and an optional image button with the correct label. ''' @@ -86,7 +86,8 @@ def _createTextField(self, longName, uiNameRes, image=None): cmds.text(label=uiLabel, annotation=uiLabel) textField = cmds.textField(annotation=uiLabel, editable=False, enableKeyboardFocus=True) if image: - button = cmds.symbolButton(enable=False, image=image) + imageTooltip = getMayaUsdLibString(imageTooltipRes) if imageTooltipRes else '' + button = cmds.symbolButton(enable=False, image=image, annotation=imageTooltip) else: button = None return MaterialCustomControl.TextField(rowLayout, textField, button) diff --git a/lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py b/lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py index 7ce805f2cc..a513d3b035 100644 --- a/lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py +++ b/lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py @@ -43,6 +43,7 @@ def mayaUsdLibRegisterStrings(): register('kOpenImage', 'Open') register('kLabelMaterial', 'Material') register('kLabelAssignedMaterial', 'Assigned Material') + register('kAnnShowMaterialInLookdevx', 'Show in LookdevX') register('kLabelInheritedMaterial', 'Inherited Material') register('kLabelInheritedFromPrim', 'Inherited from Prim') register('kLabelInheriting', 'inheriting')