Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-30 21:25:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor UI changes (#89)

Browse Source 
* automatically scroll to new entry

* fix remote file check always matching

* sort combobox entries alphabetically (meida / processes / audio)

* fix some visual issues on non-default OBS themes
This commit is contained in:
WarmUpTill
2020-12-28 17:03:55 +01:00
committed by GitHub
parent 80e2b3dd14
commit e377be3999
13 changed files with 97 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/switch-file.cpp
View File

@@ -169,10 +169,14 @@ bool compareIgnoringLineEnding(QString &s1, QString &s2)
while (!s1stream.atEnd() || !s2stream.atEnd()) {
QString s1s = s1stream.readLine();
QString s2s = s2stream.readLine();
if (QString::compare(s1s, s2s, Qt::CaseSensitive) != 0) {
if (s1s != s2s) {
return false;
}
}
if (!s1stream.atEnd() && !s2stream.atEnd())
return false;
return true;
}
@@ -197,8 +201,8 @@ bool matchFileContent(QString &filedata, FileSwitch &s)
bool checkRemoteFileContent(FileSwitch &s)
{
std::string data = getRemoteData(s.file);
QString text = QString::fromStdString(s.text);
return matchFileContent(text, s);
QString qdata = QString::fromStdString(data);
return matchFileContent(qdata, s);
}
bool checkLocalFileContent(FileSwitch &s)
@@ -226,6 +230,9 @@ void SwitcherData::checkFileContent(bool &match, OBSWeakSource &scene,
OBSWeakSource &transition)
{
for (FileSwitch &s : fileSwitches) {
if (!s.initialized())
continue;
bool equal = false;
if (s.remote) {
equal = checkRemoteFileContent(s);
@@ -250,13 +257,9 @@ void AdvSceneSwitcher::on_fileAdd_clicked()
std::lock_guard<std::mutex> lock(switcher->m);
switcher->fileSwitches.emplace_back();
QListWidgetItem *item;
item = new QListWidgetItem(ui->fileSwitches);
ui->fileSwitches->addItem(item);
FileSwitchWidget *sw =
new FileSwitchWidget(&switcher->fileSwitches.back());
item->setSizeHint(sw->minimumSizeHint());
ui->fileSwitches->setItemWidget(item, sw);
listAddClicked(ui->fileSwitches,
new FileSwitchWidget(&switcher->fileSwitches.back()),
ui->fileAdd, &addPulse);
}
void AdvSceneSwitcher::on_fileRemove_clicked()
@@ -490,8 +493,6 @@ FileSwitchWidget::FileSwitchWidget(FileSwitch *s) : SwitchWidget(s, false)
checkFileContent->setChecked(s->onlyMatchIfChanged);
}
setStyleSheet("* { background-color: transparent; }");
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
{"{{fileType}}", fileType},
{"{{filePath}}", filePath},