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

Adapt to OBS switch from "themeID" to "class" properties

Browse Source 
OBS commit: cb026964b00c366943a3c16dfb1511eafc24c035
This commit is contained in:
WarmUpTill
2024-10-09 10:10:52 +02:00
committed by WarmUpTill
parent 0fd5f47982
commit 8d9519c849
7 changed files with 262 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/utils/list-controls.cpp
View File

@@ -14,29 +14,32 @@ ListControls::ListControls(QWidget *parent, bool reorder) : QToolBar(parent)
setIconSize({16, 16});
AddActionHelper("addIconSmall", "AdvSceneSwitcher.listControls.add",
AddActionHelper("addIconSmall", "icon-plus",
"AdvSceneSwitcher.listControls.add",
[this]() { Add(); });
AddActionHelper("removeIconSmall",
AddActionHelper("removeIconSmall", "icon-trash",
"AdvSceneSwitcher.listControls.remove",
[this]() { Remove(); });
if (reorder) {
addSeparator();
AddActionHelper("upArrowIconSmall",
AddActionHelper("upArrowIconSmall", "icon-up",
"AdvSceneSwitcher.listControls.up",
[this]() { Up(); });
AddActionHelper("downArrowIconSmall",
AddActionHelper("downArrowIconSmall", "icon-down",
"AdvSceneSwitcher.listControls.down",
[this]() { Down(); });
}
}
void ListControls::AddActionHelper(const char *theme, const char *tooltip,
void ListControls::AddActionHelper(const char *theme, const char *className,
const char *tooltip,
const std::function<void()> &signal)
{
auto button = new QToolButton(this);
button->setToolTip(obs_module_text(tooltip));
button->setProperty("themeID", QVariant(QString(theme)));
button->setProperty("class", QVariant(QString(className)));
(void)addWidget(button);
button->connect(button, &QToolButton::clicked, this, signal);
}

3
lib/utils/list-controls.hpp
View File

@@ -18,7 +18,8 @@ signals:
void Down();
private:
void AddActionHelper(const char *theme, const char *tooltip,
void AddActionHelper(const char *theme, const char *className,
const char *tooltip,
const std::function<void()> &signal);
};

3
lib/utils/resource-table.cpp
View File

@@ -21,10 +21,13 @@ ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
{
_add->setProperty("themeID",
QVariant(QString::fromUtf8("addIconSmall")));
_add->setProperty("class", QVariant(QString::fromUtf8("icon-plus")));
_add->setToolTip(addToolTip);
_remove->setProperty("themeID",
QVariant(QString::fromUtf8("removeIconSmall")));
_remove->setProperty("class",
QVariant(QString::fromUtf8("icon-trash")));
_remove->setToolTip(removeToolTip);
_help->setWordWrap(true);

1
lib/utils/status-control.cpp
View File

@@ -197,6 +197,7 @@ StatusDockWidget::StatusDockWidget(QWidget *parent) : QFrame(parent)
auto action = new QAction;
action->setProperty("themeID", QVariant(QString::fromUtf8("cogsIcon")));
action->setProperty("class", QVariant(QString::fromUtf8("icon-cogs")));
action->connect(action, &QAction::triggered, OpenSettingsWindow);
const auto path = QString::fromStdString(GetDataFilePath(
"res/images/" + GetThemeTypeName() + "Advanced.svg"));

1
lib/utils/volume-control.cpp
View File

@@ -122,6 +122,7 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
if (showConfig) {
config = new QPushButton(this);
config->setProperty("themeID", "menuIconSmall");
config->setProperty("class", "icon-dots-vert");
config->setSizePolicy(QSizePolicy::Maximum,
QSizePolicy::Maximum);
config->setMaximumSize(22, 22);