From 9bc067a007196cfa61bfe8408e1640fc3962c515 Mon Sep 17 00:00:00 2001 From: Pierre Baillargeon Date: Tue, 29 Oct 2024 12:12:39 -0400 Subject: [PATCH] EMSUSD-1766 adjust axis and units section indent Make it offset 8 pixel from parent. Yes, it only requires 2 pixels offset, due to internal margins, etc. --- plugin/adsk/scripts/mayaUsdTranslatorExport.mel | 2 ++ plugin/adsk/scripts/mayaUsdTranslatorImport.mel | 2 ++ plugin/adsk/scripts/mayaUsd_createStageFromFile.mel | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugin/adsk/scripts/mayaUsdTranslatorExport.mel b/plugin/adsk/scripts/mayaUsdTranslatorExport.mel index cadfce101f..f68a0f683b 100644 --- a/plugin/adsk/scripts/mayaUsdTranslatorExport.mel +++ b/plugin/adsk/scripts/mayaUsdTranslatorExport.mel @@ -1333,6 +1333,7 @@ global proc int mayaUsdTranslatorExport (string $parent, } if ($canControlUpAxisAndUnit) { + columnLayout -columnOffset "left" 2; frameLayout -label `getMayaUsdString("kExportAxisAndUnitLbl")` -collapsable true -collapse false axisAndUnitFrameLayout; separator -style "none"; @@ -1363,6 +1364,7 @@ global proc int mayaUsdTranslatorExport (string $parent, optionMenuGrp -edit -select 2 unitPopup; setParent ..; + setParent ..; } separator -style "none"; diff --git a/plugin/adsk/scripts/mayaUsdTranslatorImport.mel b/plugin/adsk/scripts/mayaUsdTranslatorImport.mel index dd7ae2aee9..734ebdc0a1 100644 --- a/plugin/adsk/scripts/mayaUsdTranslatorImport.mel +++ b/plugin/adsk/scripts/mayaUsdTranslatorImport.mel @@ -587,6 +587,7 @@ global proc int mayaUsdTranslatorImport (string $parent, checkBoxGrp -label "" -label1 `getMayaUsdString("kImportToInstanceOpt")` -cw 1 $cw1 -value1 1 -ann `getMayaUsdString("kImportToInstanceAnn")` mayaUsdTranslator_ImportInstancesCheckBox; separator -style "none"; + columnLayout -columnOffset "left" 2; frameLayout -label `getMayaUsdString("kImportAxisAndUnit")` -collapsable true -collapse false axisAndUnitFrameLayout; separator -style "none"; checkBoxGrp -label "" -label1 `getMayaUsdString("kImportUpAxis")` -ann `getMayaUsdString("kImportUpAxisAnn")` @@ -603,6 +604,7 @@ global proc int mayaUsdTranslatorImport (string $parent, menuItem -l `getMayaUsdString("kImportAxisAndUnitOverwritePrefs")` -ann "overwritePrefs"; separator -style "none"; setParent ..; + setParent ..; setParent ..; // Now set to current settings. diff --git a/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel b/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel index 9d320c2fc1..0207d1ea8d 100644 --- a/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel +++ b/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel @@ -114,7 +114,8 @@ global proc string stageFromFile_UISetup(string $parent) excludePrimPathField; frameLayout -label `getMayaUsdString("kStageAdvancedLabel")` -parent $frame -collapsable true -collapse true advancedSection; - frameLayout -label `getMayaUsdString("kStageAxisUnitConversionLabel")` -parent advancedSection -collapsable true -collapse false; + columnLayout -columnOffset "left" 2 -parent advancedSection advancedSectionOffset; + frameLayout -label `getMayaUsdString("kStageAxisUnitConversionLabel")` -parent advancedSectionOffset -collapsable true -collapse false; checkBoxGrp -l `getMayaUsdString("kStageUpAxisLabel")` -ann `getMayaUsdString("kStageUpAxisAnn")` -value1 1