diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 853fcd51..b7567de7 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -157,13 +157,11 @@ AdvSceneSwitcher.mqttConnectionTab.removeMultipleConnectionsPopup.text="Are you # Macro Tab AdvSceneSwitcher.macroTab.title="Macro" -AdvSceneSwitcher.macroTab.macros="Macros" AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab." AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro." AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define macro conditions.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new condition." AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action." AdvSceneSwitcher.macroTab.editElseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nSelect an existing or add a new macro on the left.\nThen click the plus button below to add a new action." -AdvSceneSwitcher.macroTab.edit="Edit macro" AdvSceneSwitcher.macroTab.edit.logic="Logic type:" AdvSceneSwitcher.macroTab.edit.condition="Condition type:" AdvSceneSwitcher.macroTab.edit.action="Action type:" diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index 53e81146..77d59b78 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -68,10 +68,22 @@ 0 0 962 - 1160 + 1142 + + 0 + + + 0 + + + 0 + + + 0 + @@ -592,7 +604,10 @@ - AdvSceneSwitcher.macroTab.macros + + + + false @@ -736,7 +751,7 @@ - AdvSceneSwitcher.macroTab.edit + AdvSceneSwitcher.macroTab.title diff --git a/lib/utils/resource-table.cpp b/lib/utils/resource-table.cpp index 903c30ae..c5c0d17c 100644 --- a/lib/utils/resource-table.cpp +++ b/lib/utils/resource-table.cpp @@ -57,6 +57,7 @@ ResourceTable::ResourceTable(QWidget *parent, const QString &help, auto layout = new QVBoxLayout(); layout->addLayout(helpAndTableLayout); layout->addLayout(controlLayout); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); QWidget::connect(_add, SIGNAL(clicked()), this, SLOT(Add()));