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

UI rework (#44)

Browse Source 
* rework general tab UI

* rework audio tab UI

* rework media tab UI

* rework time tab UI

* rework random tab UI

* rework window tab UI

* rework sreen region tab UI

* rework sequence tab UI

* rework transition tab UI

* adjust log messages to new format

* fix include path and warning

* highlight widgets to guide users (can be disabled)

* add helper frame for screen region tab

* rename main SceneSwitcher widget to AdvSceneSwitcher to resolve naming conflicts with the frontend tools on certain platforms (e.g. Debian 10)

* add media state 'any'

* adjust media switch handling to support vlc source
This commit is contained in:
WarmUpTill
2020-10-31 16:25:44 +01:00
committed by GitHub
parent 7edb6eb6c1
commit 214821b69f
35 changed files with 3975 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/switch-pause.cpp
View File

@@ -1,8 +1,9 @@
#include <regex>
#include "headers/advanced-scene-switcher.hpp"
#include "headers/utility.hpp"
void SceneSwitcher::on_pauseScenesAdd_clicked()
void AdvSceneSwitcher::on_pauseScenesAdd_clicked()
{
QString sceneName = ui->pauseScenesScenes->currentText();
@@ -26,7 +27,7 @@ void SceneSwitcher::on_pauseScenesAdd_clicked()
}
}
void SceneSwitcher::on_pauseScenesRemove_clicked()
void AdvSceneSwitcher::on_pauseScenesRemove_clicked()
{
QListWidgetItem *item = ui->pauseScenes->currentItem();
if (!item)
@@ -51,7 +52,7 @@ void SceneSwitcher::on_pauseScenesRemove_clicked()
delete item;
}
void SceneSwitcher::on_pauseWindowsAdd_clicked()
void AdvSceneSwitcher::on_pauseWindowsAdd_clicked()
{
QString windowName = ui->pauseWindowsWindows->currentText();
@@ -75,7 +76,7 @@ void SceneSwitcher::on_pauseWindowsAdd_clicked()
}
}
void SceneSwitcher::on_pauseWindowsRemove_clicked()
void AdvSceneSwitcher::on_pauseWindowsRemove_clicked()
{
QListWidgetItem *item = ui->pauseWindows->currentItem();
if (!item)
@@ -100,7 +101,7 @@ void SceneSwitcher::on_pauseWindowsRemove_clicked()
delete item;
}
void SceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
void AdvSceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
{
if (loading)
return;
@@ -121,7 +122,7 @@ void SceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
}
}
void SceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
void AdvSceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
{
if (loading)
return;
@@ -141,7 +142,7 @@ void SceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
}
}
int SceneSwitcher::PauseScenesFindByData(const QString &scene)
int AdvSceneSwitcher::PauseScenesFindByData(const QString &scene)
{
int count = ui->pauseScenes->count();
int idx = -1;
@@ -159,7 +160,7 @@ int SceneSwitcher::PauseScenesFindByData(const QString &scene)
return idx;
}
int SceneSwitcher::PauseWindowsFindByData(const QString &window)
int AdvSceneSwitcher::PauseWindowsFindByData(const QString &window)
{
int count = ui->pauseWindows->count();
int idx = -1;
@@ -223,7 +224,7 @@ bool SwitcherData::checkPause()
}
if (verbose && pause)
blog(LOG_INFO, "Advanced Scene Switcher pause match");
blog(LOG_INFO, "pause match");
return pause;
}
@@ -239,9 +240,8 @@ void SwitcherData::savePauseSwitches(obs_data_t *obj)
const char *n = obs_source_get_name(source);
obs_data_set_string(array_obj, "pauseScene", n);
obs_data_array_push_back(pauseScenesArray, array_obj);
obs_source_release(source);
}
obs_source_release(source);
obs_data_release(array_obj);
}
obs_data_set_array(obj, "pauseScenes", pauseScenesArray);
@@ -300,7 +300,7 @@ void SwitcherData::loadPauseSwitches(obs_data_t *obj)
obs_data_array_release(pauseWindowsArray);
}
void SceneSwitcher::setupPauseTab()
void AdvSceneSwitcher::setupPauseTab()
{
populateSceneSelection(ui->pauseScenesScenes, false);
populateWindowSelection(ui->pauseWindowsWindows);