UI: Add filters button to scenes toolbar

Makes it easier to access scene filters.
This commit is contained in:
cg2121 2022-09-09 07:20:48 -05:00 committed by Matt Gajownik
parent 572407a928
commit 14bd880822
11 changed files with 55 additions and 0 deletions

View file

@ -113,6 +113,7 @@ MoveSourceDown="Move Source(s) Down"
SourceProperties="Open Source Properties"
SourceFilters="Open Source Filters"
MixerToolbarMenu="Audio Mixer Menu"
SceneFilters="Open Scene Filters"
# warning for plugin load failures
PluginsFailedToLoad.Title="Plugin Load Error"

View file

@ -524,6 +524,10 @@ QToolButton:pressed {
qproperty-icon: url(./Dark/media-pause.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Dark/filter.svg);
}
QToolBarExtension {
background: palette(button);
min-width: 12px;

View file

@ -328,6 +328,10 @@ QToolButton:pressed {
qproperty-icon: url(./Dark/cogs.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Dark/filter.svg);
}
/* Tab Widget */
QTabWidget::pane { /* The tab widget frame */

View file

@ -522,6 +522,10 @@ QToolButton:pressed {
qproperty-icon: url(./Dark/media-pause.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Dark/filter.svg);
}
QToolBarExtension {
background: palette(button);
min-width: 12px;

View file

@ -522,6 +522,10 @@ QToolButton:pressed {
qproperty-icon: url(./Light/media-pause.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Light/filter.svg);
}
QToolBarExtension {
background: palette(button);
min-width: 12px;

View file

@ -530,6 +530,10 @@ QToolButton:pressed {
qproperty-icon: url(./Dark/media-pause.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Dark/filter.svg);
}
QToolBarExtension {
background: palette(button);
min-width: 12px;

View file

@ -58,6 +58,10 @@ OBSThemeMeta {
qproperty-icon: url(:/res/images/cogs.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(:/res/images/filter.svg);
}
MuteCheckBox {
outline: none;
}

View file

@ -526,6 +526,10 @@ QToolButton:pressed {
qproperty-icon: url(./Dark/media-pause.svg);
}
* [themeID="filtersIcon"] {
qproperty-icon: url(./Dark/filter.svg);
}
QToolBarExtension {
background: palette(button);
min-width: 12px;

View file

@ -842,6 +842,8 @@
<addaction name="actionAddScene"/>
<addaction name="actionRemoveScene"/>
<addaction name="separator"/>
<addaction name="actionSceneFilters"/>
<addaction name="separator"/>
<addaction name="actionSceneUp"/>
<addaction name="actionSceneDown"/>
</widget>
@ -2349,6 +2351,21 @@
<string>menuIconSmall</string>
</property>
</action>
<action name="actionSceneFilters">
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/res/images/filter.svg</normaloff>:/res/images/filter.svg</iconset>
</property>
<property name="text">
<string>SceneFilters</string>
</property>
<property name="toolTip">
<string>SceneFilters</string>
</property>
<property name="themeID" stdset="0">
<string>filtersIcon</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

View file

@ -10197,6 +10197,14 @@ void OBSBasic::on_sourceFiltersButton_clicked()
OpenFilters();
}
void OBSBasic::on_actionSceneFilters_triggered()
{
OBSSource sceneSource = GetCurrentSceneSource();
if (sceneSource)
OpenFilters(sceneSource);
}
void OBSBasic::on_sourceInteractButton_clicked()
{
on_actionInteract_triggered();

View file

@ -1032,6 +1032,7 @@ private slots:
void on_actionCenterToScreen_triggered();
void on_actionVerticalCenter_triggered();
void on_actionHorizontalCenter_triggered();
void on_actionSceneFilters_triggered();
void on_OBSBasic_customContextMenuRequested(const QPoint &pos);