Skip to content

Commit

Permalink
UI: Add tracks buttons to source meters
Browse files Browse the repository at this point in the history
Setting the tracks for an audio source is done through the Advanced
Audio Panel, which is not very handy. This commit adds track selection
buttons to the source meter.
  • Loading branch information
pkviet committed Jan 6, 2019
1 parent 1ac572f commit 5f1250e
Show file tree
Hide file tree
Showing 19 changed files with 437 additions and 4 deletions.
72 changes: 72 additions & 0 deletions UI/data/themes/Acri.qss
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,78 @@ SendsCheckBox::indicator:unchecked:focus {
image: url(:/res/images/sendsOFF.png);
}

TracksCheckBox#track1 {
outline: none;
}

TracksCheckBox#track1::indicator:checked {
image: url(:/res/images/track1.png);
}

TracksCheckBox#track1::indicator:unchecked {
image: url(:/res/images/track1OFF.png);
}

TracksCheckBox#track2 {
outline: none;
}

TracksCheckBox#track2::indicator:checked {
image: url(:/res/images/track2.png);
}

TracksCheckBox#track2::indicator:unchecked {
image: url(:/res/images/track2OFF.png);
}

TracksCheckBox#track3 {
outline: none;
}

TracksCheckBox#track3::indicator:checked {
image: url(:/res/images/track3.png);
}

TracksCheckBox#track3::indicator:unchecked {
image: url(:/res/images/track3OFF.png);
}

TracksCheckBox#track4 {
outline: none;
}

TracksCheckBox#track4::indicator:checked {
image: url(:/res/images/track4.png);
}

TracksCheckBox#track4::indicator:unchecked {
image: url(:/res/images/track4OFF.png);
}

TracksCheckBox#track5 {
outline: none;
}

TracksCheckBox#track5::indicator:checked {
image: url(:/res/images/track5.png);
}

TracksCheckBox#track5::indicator:unchecked {
image: url(:/res/images/track5OFF.png);
}

TracksCheckBox#track6 {
outline: none;
}

TracksCheckBox#track6::indicator:checked {
image: url(:/res/images/track6.png);
}

TracksCheckBox#track6::indicator:unchecked {
image: url(:/res/images/track6OFF.png);
}

OBSHotkeyLabel[hotkeyPairHover=true] {
color: rgba(27, 96, 166);
}
Expand Down
72 changes: 72 additions & 0 deletions UI/data/themes/Dark.qss
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,78 @@ SendsCheckBox::indicator:unchecked {
image: url(:/res/images/sendsOFF.png);
}

TracksCheckBox#track1 {
outline: none;
}

TracksCheckBox#track1::indicator:checked {
image: url(:/res/images/track1.png);
}

TracksCheckBox#track1::indicator:unchecked {
image: url(:/res/images/track1OFF.png);
}

TracksCheckBox#track2 {
outline: none;
}

TracksCheckBox#track2::indicator:checked {
image: url(:/res/images/track2.png);
}

TracksCheckBox#track2::indicator:unchecked {
image: url(:/res/images/track2OFF.png);
}

TracksCheckBox#track3 {
outline: none;
}

TracksCheckBox#track3::indicator:checked {
image: url(:/res/images/track3.png);
}

TracksCheckBox#track3::indicator:unchecked {
image: url(:/res/images/track3OFF.png);
}

TracksCheckBox#track4 {
outline: none;
}

TracksCheckBox#track4::indicator:checked {
image: url(:/res/images/track4.png);
}

TracksCheckBox#track4::indicator:unchecked {
image: url(:/res/images/track4OFF.png);
}

TracksCheckBox#track5 {
outline: none;
}

TracksCheckBox#track5::indicator:checked {
image: url(:/res/images/track5.png);
}

TracksCheckBox#track5::indicator:unchecked {
image: url(:/res/images/track5OFF.png);
}

TracksCheckBox#track6 {
outline: none;
}

TracksCheckBox#track6::indicator:checked {
image: url(:/res/images/track6.png);
}

TracksCheckBox#track6::indicator:unchecked {
image: url(:/res/images/track6OFF.png);
}

/* Group Collapse Checkbox */

SourceTreeSubItemCheckBox {
Expand Down
72 changes: 72 additions & 0 deletions UI/data/themes/Default.qss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,78 @@ SendsCheckBox::indicator:unchecked {
image: url(:/res/images/sendsOFF.png);
}

TracksCheckBox#track1 {
outline: none;
}

TracksCheckBox#track1::indicator:checked {
image: url(:/res/images/track1.png);
}

TracksCheckBox#track1::indicator:unchecked {
image: url(:/res/images/track1OFF.png);
}

TracksCheckBox#track2 {
outline: none;
}

TracksCheckBox#track2::indicator:checked {
image: url(:/res/images/track2.png);
}

TracksCheckBox#track2::indicator:unchecked {
image: url(:/res/images/track2OFF.png);
}

TracksCheckBox#track3 {
outline: none;
}

TracksCheckBox#track3::indicator:checked {
image: url(:/res/images/track3.png);
}

TracksCheckBox#track3::indicator:unchecked {
image: url(:/res/images/track3OFF.png);
}

TracksCheckBox#track4 {
outline: none;
}

TracksCheckBox#track4::indicator:checked {
image: url(:/res/images/track4.png);
}

TracksCheckBox#track4::indicator:unchecked {
image: url(:/res/images/track4OFF.png);
}

TracksCheckBox#track5 {
outline: none;
}

TracksCheckBox#track5::indicator:checked {
image: url(:/res/images/track5.png);
}

TracksCheckBox#track5::indicator:unchecked {
image: url(:/res/images/track5OFF.png);
}

TracksCheckBox#track6 {
outline: none;
}

TracksCheckBox#track6::indicator:checked {
image: url(:/res/images/track6.png);
}

TracksCheckBox#track6::indicator:unchecked {
image: url(:/res/images/track6OFF.png);
}

SourceTreeSubItemCheckBox {
background: transparent;
outline: none;
Expand Down
72 changes: 72 additions & 0 deletions UI/data/themes/Rachni.qss
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,78 @@ SendsCheckBox::indicator:unchecked:focus {
image: url(:/res/images/sendsOFF.png);
}

TracksCheckBox#track1 {
outline: none;
}

TracksCheckBox#track1::indicator:checked {
image: url(:/res/images/track1.png);
}

TracksCheckBox#track1::indicator:unchecked {
image: url(:/res/images/track1OFF.png);
}

TracksCheckBox#track2 {
outline: none;
}

TracksCheckBox#track2::indicator:checked {
image: url(:/res/images/track2.png);
}

TracksCheckBox#track2::indicator:unchecked {
image: url(:/res/images/track2OFF.png);
}

TracksCheckBox#track3 {
outline: none;
}

TracksCheckBox#track3::indicator:checked {
image: url(:/res/images/track3.png);
}

TracksCheckBox#track3::indicator:unchecked {
image: url(:/res/images/track3OFF.png);
}

TracksCheckBox#track4 {
outline: none;
}

TracksCheckBox#track4::indicator:checked {
image: url(:/res/images/track4.png);
}

TracksCheckBox#track4::indicator:unchecked {
image: url(:/res/images/track4OFF.png);
}

TracksCheckBox#track5 {
outline: none;
}

TracksCheckBox#track5::indicator:checked {
image: url(:/res/images/track5.png);
}

TracksCheckBox#track5::indicator:unchecked {
image: url(:/res/images/track5OFF.png);
}

TracksCheckBox#track6 {
outline: none;
}

TracksCheckBox#track6::indicator:checked {
image: url(:/res/images/track6.png);
}

TracksCheckBox#track6::indicator:unchecked {
image: url(:/res/images/track6OFF.png);
}


/****************************/
/* --- Group Checkboxes --- */
Expand Down
Binary file added UI/forms/images/track1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track1OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track2OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track3OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track4OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track5OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/forms/images/track6OFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions UI/forms/obs.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@
<file>images/monOFF.png</file>
<file>images/sendsON.png</file>
<file>images/sendsOFF.png</file>
<file>images/track1.png</file>
<file>images/track1OFF.png</file>
<file>images/track2.png</file>
<file>images/track2OFF.png</file>
<file>images/track3.png</file>
<file>images/track3OFF.png</file>
<file>images/track4.png</file>
<file>images/track4OFF.png</file>
<file>images/track5.png</file>
<file>images/track5OFF.png</file>
<file>images/track6.png</file>
<file>images/track6OFF.png</file>
</qresource>
<qresource prefix="/settings">
<file>images/settings/advanced.png</file>
Expand Down
Loading

0 comments on commit 5f1250e

Please sign in to comment.