diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index d62e224d..2ce84699 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -147,7 +147,9 @@ AdvSceneSwitcher.condition.file="File" AdvSceneSwitcher.condition.file.type.match="matches" AdvSceneSwitcher.condition.file.type.contentChange="content changed" AdvSceneSwitcher.condition.file.type.dateChange="modification date changed" -AdvSceneSwitcher.condition.file.entry.line1="Content of{{fileType}}{{filePath}}{{conditions}}" +AdvSceneSwitcher.condition.file.remote="Remote file" +AdvSceneSwitcher.condition.file.local="Local file" +AdvSceneSwitcher.condition.file.entry.line1="{{fileType}}{{filePath}}{{conditions}}" AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}" AdvSceneSwitcher.condition.file.entry.line3="{{useRegex}} {{checkModificationDate}} {{checkFileContent}}" AdvSceneSwitcher.condition.media="Media" diff --git a/src/macro-core/macro-condition-file.cpp b/src/macro-core/macro-condition-file.cpp index c978c8a1..8f14d7a6 100644 --- a/src/macro-core/macro-condition-file.cpp +++ b/src/macro-core/macro-condition-file.cpp @@ -189,8 +189,9 @@ std::string MacroConditionFile::GetShortDesc() const static void populateFileTypes(QComboBox *list) { - list->addItem(obs_module_text("AdvSceneSwitcher.fileTab.local")); - list->addItem(obs_module_text("AdvSceneSwitcher.fileTab.remote")); + list->addItem(obs_module_text("AdvSceneSwitcher.condition.file.local")); + list->addItem( + obs_module_text("AdvSceneSwitcher.condition.file.remote")); } static void populateConditions(QComboBox *list) @@ -248,6 +249,9 @@ MacroConditionFileEdit::MacroConditionFileEdit( QHBoxLayout *line1Layout = new QHBoxLayout; QHBoxLayout *line2Layout = new QHBoxLayout; QHBoxLayout *line3Layout = new QHBoxLayout; + line1Layout->setContentsMargins(0, 0, 0, 0); + line2Layout->setContentsMargins(0, 0, 0, 0); + line3Layout->setContentsMargins(0, 0, 0, 0); placeWidgets( obs_module_text("AdvSceneSwitcher.condition.file.entry.line1"), line1Layout, widgetPlaceholders);