From 3381e6d62fff168bf43584c3d5f3aa54ee26c313 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Tue, 22 May 2018 21:32:41 +0200 Subject: [PATCH] read any file, fix space in file switch name --- file-switch.cpp | 4 ++-- utility.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/file-switch.cpp b/file-switch.cpp index 0be3dd47..83913625 100644 --- a/file-switch.cpp +++ b/file-switch.cpp @@ -67,7 +67,7 @@ void SceneSwitcher::on_writePathLineEdit_textChanged(const QString& text) void SceneSwitcher::on_browseButton_2_clicked() { QString path = QFileDialog::getOpenFileName( - this, tr("Select a file to read from ..."), QDir::currentPath(), tr("Text files (*.txt)")); + this, tr("Select a file to read from ..."), QDir::currentPath(), tr("Any files (*.*)")); if (!path.isEmpty()) ui->readPathLineEdit->setText(path); } @@ -182,7 +182,7 @@ void SwitcherData::checkFileContent(bool& match, OBSWeakSource& scene, OBSWeakSo void SceneSwitcher::on_browseButton_3_clicked() { QString path = QFileDialog::getOpenFileName( - this, tr("Select a file to read from ..."), QDir::currentPath(), tr("Text files (*.txt)")); + this, tr("Select a file to read from ..."), QDir::currentPath(), tr("Any files (*.*)")); if (!path.isEmpty()) ui->filePathLineEdit->setText(path); } diff --git a/utility.hpp b/utility.hpp index b946a3d0..cff394f2 100644 --- a/utility.hpp +++ b/utility.hpp @@ -75,8 +75,8 @@ static inline QString MakeFileSwitchName( QString switchName = QStringLiteral("Switch to ") + scene + QStringLiteral(" using ") + transition + QStringLiteral(" if ") + fileName; if (useTime) - switchName += QStringLiteral(" was modified and "); - switchName += QStringLiteral("contains"); + switchName += QStringLiteral(" was modified and"); + switchName += QStringLiteral(" contains"); if (useRegex) switchName += QStringLiteral(" (RegEx): \n\""); else