New upstream version 22.0.3+dfsg1

This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions

View file

@ -1,3 +1,37 @@
/* OBSTheme, main QApplication palette and QML values */
OBSTheme {
window: #181819;
windowText: rgb(225,224,225);
base: rgb(18,18,21);
alternateBase: rgb(0,0,0);
text: rgb(225,224,225);
button: #162458;
buttonText: rgb(225,224,225);
brightText: #484848;
light: #162458;
mid: #181819;
dark: rgb(18,18,21);
shadow: rgb(0,0,0);
highlight: #252458;
highlightText: #FFFFFF;
link: #605ee6;
linkVisited: #605ee6;
}
OBSTheme::disabled {
text: #484848;
buttonText: #484848;
brightText: #484848;
}
OBSTheme::inactive {
highlight: rgb(48,47,48);
highlightText: rgb(255, 255, 255);
}
/* General style, we override only what is needed. */
QWidget {
background-color: #181819;
@ -9,6 +43,7 @@ QWidget {
font-family: "Open Sans", "Tahoma", "Arial", sans-serif;
font-size: 12px;
padding: 4px;
overflow: auto;
}
#menubar {
@ -45,6 +80,14 @@ QWidget::disabled {
color: #484848;
}
* [themeID="error"] {
color: #d91740;
}
* [themeID="warning"] {
color: #d9af17;
}
/* Dropdown menus, Scenes box, Sources box */
QAbstractItemView {
background-color: #181819;
@ -94,7 +137,8 @@ QMenuBar::item:selected {
}
/* Listbox item */
QListWidget::item {
QListWidget::item,
SourceTree::item {
padding: 4px 2px;
margin-bottom: 2px;
margin-top: 0px;
@ -110,11 +154,6 @@ QListWidget QLineEdit {
border-radius: none;
}
SourceListWidget::item {
margin-bottom: 1px;
padding: -4px 2px;
}
/* Dock stuff */
QDockWidget {
background: transparent;
@ -157,6 +196,23 @@ SourceListWidget {
border-bottom: 2px solid #2f2f2f;
}
SourceTree {
border: none;
border-bottom: 1px solid #2f2f2f;
}
SourceTree QLabel {
padding: 2px 0px;
margin: -2px 4px -2px;
}
SourceTree QLineEdit {
background-color: #0c101e;
padding: 2px;
margin: -2px 6px -2px 3px;
font-size: 12px;
}
#scenesFrame,
#sourcesFrame {
margin-left: -7px;
@ -179,13 +235,15 @@ SourceListWidget {
}
/* Listbox item selected, unfocused */
QListWidget::item:hover {
QListWidget::item:hover,
SourceTree::item:hover {
background-color: #212121;
border: 1px solid #333336;
}
/* Listbox item selected */
QListWidget::item:selected {
QListWidget::item:selected,
SourceTree::item:selected {
background-color: #131a30;
border: 1px solid #252a45;
}
@ -453,10 +511,12 @@ QPushButton {
QPushButton::flat {
background-color: rgb(24,24,25);
border: none;
}
QPushButton:checked {
background-color: #202b52;
background-color: #581624;
border-color: #84162d;
}
QPushButton:hover {
@ -468,6 +528,16 @@ QPushButton:pressed {
background-color: #161f41;
}
QPushButton:disabled {
border: 1px solid #232426;
background-color: #1a1a1b;
}
QPushButton::flat:hover,
QPushButton::flat:disabled {
border: none;
}
/* Progress Bar */
QProgressBar {
@ -505,16 +575,20 @@ QSlider::handle:horizontal {
}
QSlider::handle:horizontal:pressed {
background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 rgb(240,239,240),
stop: 0.25 rgb(200,199,200),
stop: 1 rgb(162,161,162));
}
QSlider::sub-page:horizontal {
background-color: #2a3a75;
}
QSlider::sub-page:horizontal:disabled {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 rgb(31,30,31),
stop: 0.75 rgb(50, 49, 50));
background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
stop: 0 rgb(26,25,26),
stop: 0.75 rgb(10, 10, 10));
border-radius: 2px;
}
@ -533,23 +607,27 @@ QSlider::handle:vertical {
stop: 0.25 rgb(200,199,200),
stop: 1 rgb(162,161,162));
border: 1px solid rgb(24,24,25);
border-radius: 4px;
border-radius: 3px;
width: 10px;
height: 18px;
margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
margin: 0 -3px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
}
QSlider::handle:vertical:pressed {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 rgb(240,239,240),
stop: 0.25 rgb(200,199,200),
stop: 1 rgb(162,161,162));
}
QSlider::sub-page:vertical:disabled {
QSlider::add-page:vertical {
background-color: #2a3a75;
}
QSlider::add-page:vertical:disabled {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 rgb(31,30,31),
stop: 0.75 rgb(50, 49, 50));
stop: 0 rgb(26,25,26),
stop: 0.75 rgb(10, 10, 10));
border-radius: 2px;
}
@ -557,15 +635,10 @@ QSlider::handle:hover {
background-color: rgb(200,199,200);
}
QSlider::sub-page {
background-color: #2a3a75;
}
QSlider::handle:disabled {
background-color: rgb(15,15,16);
}
/* Volume Control */
/* Old Meters */
@ -724,6 +797,30 @@ OBSHotkeyLabel[hotkeyPairHover=true] {
}
/* Group Collapse Checkbox */
SourceTreeSubItemCheckBox {
background: transparent;
outline: none;
padding: 0px;
}
SourceTreeSubItemCheckBox::indicator {
width: 12px;
height: 12px;
}
SourceTreeSubItemCheckBox::indicator:checked,
SourceTreeSubItemCheckBox::indicator:checked:hover {
image: url(./Dark/expand.png);
}
SourceTreeSubItemCheckBox::indicator:unchecked,
SourceTreeSubItemCheckBox::indicator:unchecked:hover {
image: url(./Dark/collapse.png);
}
/* Label warning/error */
QLabel#warningLabel {
@ -750,21 +847,10 @@ OBSBasicProperties,
background: #101010;
}
#OBSBasicSourceSelect #sourceList {
border-bottom: 2px solid #333336;
}
FocusList::item {
padding: 0px 2px;
}
#transitionsContainer QPushButton,
#mixerDock QPushButton,
#effectWidget QPushButton,
#asyncWidget QPushButton {
border: none;
}
#fpsTypes {
padding: 0px;
}

View file

@ -28,6 +28,44 @@
/* rgb(42,130,218); /* blue */
/* Custom theme information. This will set the application's QPalette, as
* well as pass to QML via the OBSTheme object.
* Can also use OBSTheme::disabled, OBSTheme::active, and OBSTheme::inactive.
* Using it without will set all three (making 'active' a bit redundant) */
OBSTheme {
window: rgb(58,57,58); /* dark */
windowText: rgb(225,224,225); /* veryLight */
base: rgb(31,30,31); /* veryDark */
alternateBase: rgb(11,10,11); /* veryVeryDark */
text: rgb(225,224,225); /* veryLight */
button: rgb(88,87,88); /* kindaDark */
buttonText: rgb(225,224,225); /* veryLight */
brightText: rgb(200,199,200); /* lighter */
light: rgb(88,87,88); /* kindaDark */
mid: rgb(58,57,58); /* dark */
dark: rgb(31,30,31); /* veryDark */
shadow: rgb(11,10,11); /* veryVeryDark */
highlight: rgb(42,130,218); /* blue */
highlightText: rgb(0,0,0);
link: rgb(114, 162, 255); /* OBS blue */
linkVisited: rgb(114, 162, 255); /* OBS blue */
}
OBSTheme::disabled {
text: rgb(122,121,122); /* light */
buttonText: rgb(122,121,122); /* light */
brightText: rgb(122,121,122); /* light */
}
OBSTheme::inactive {
highlight: rgb(48,47,48);
highlightText: rgb(255, 255, 255);
}
/* General style, we override only what is needed. */
QWidget {
background-color: rgb(58,57,58); /* dark */
@ -423,9 +461,9 @@ QPushButton::menu-indicator {
/* Sliders */
QSlider::groove:horizontal {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 rgb(31,30,31), /* veryDark */
stop: 0.75 rgb(50, 49, 50));
background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
stop: 0 rgb(50, 49, 50), /* dark */
stop: 0.75 rgb(88,87,88)); /* kindaDark */
height: 4px;
border: none;
border-radius: 2px;
@ -450,32 +488,37 @@ QSlider::handle:horizontal:pressed {
stop: 1 rgb(162,161,162)); /* light */
}
QSlider::sub-page:horizontal {
background-color: rgb(42,130,218); /* blue */
border-radius: 2px;
}
QSlider::sub-page:horizontal:disabled {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
stop: 0 rgb(31,30,31), /* veryDark */
stop: 0.75 rgb(50, 49, 50));
stop: 0.75 rgb(50, 49, 50)); /* dark */
border-radius: 2px;
}
QSlider::groove:vertical {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
stop: 0 rgb(31,30,31), /* veryDark */
stop: 0.75 rgb(50, 49, 50));
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(50, 49, 50), /* dark */
stop: 0.75 rgb(88,87,88)); /* kindaDark */
width: 4px;
border: none;
border-radius: 2px;
}
QSlider::handle:vertical {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(240,239,240), /* lighter */
stop: 0.25 rgb(200,199,200),
stop: 1 rgb(162,161,162)); /* light */
border: 1px solid rgb(58,57,58); /* dark */
border-radius: 4px;
border-radius: 3px;
width: 10px;
height: 18px;
margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
margin: 0 -3px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
}
QSlider::handle:vertical:pressed {
@ -485,10 +528,15 @@ QSlider::handle:vertical:pressed {
stop: 1 rgb(162,161,162)); /* light */
}
QSlider::sub-page:vertical:disabled {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
QSlider::add-page:vertical {
background-color: rgb(42,130,218); /* blue */
border-radius: 2px;
}
QSlider::add-page:vertical:disabled {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(31,30,31), /* veryDark */
stop: 0.75 rgb(50, 49, 50));
stop: 0.75 rgb(50, 49, 50)); /* dark */
border-radius: 2px;
}
@ -496,16 +544,10 @@ QSlider::handle:hover {
background-color: rgb(200,199,200); /* veryLight */
}
QSlider::sub-page {
background-color: rgb(42,130,218); /* blue */
border-radius: 2px;
}
QSlider::handle:disabled {
background-color: rgb(122,121,122); /* light */
}
/* Volume Control */
VolumeMeter {
@ -547,6 +589,27 @@ OBSHotkeyLabel[hotkeyPairHover=true] {
}
/* Group Collapse Checkbox */
SourceTreeSubItemCheckBox {
background: transparent;
outline: none;
}
SourceTreeSubItemCheckBox::indicator {
width: 10px;
height: 10px;
}
SourceTreeSubItemCheckBox::indicator:checked {
image: url(./Dark/expand.png);
}
SourceTreeSubItemCheckBox::indicator:unchecked {
image: url(./Dark/collapse.png);
}
/* Label warning/error */
QLabel#warningLabel {

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

@ -51,6 +51,24 @@ MuteCheckBox::indicator:unchecked {
image: url(:/res/images/unmute.png);
}
SourceTreeSubItemCheckBox {
background: transparent;
outline: none;
}
SourceTreeSubItemCheckBox::indicator {
width: 10px;
height: 10px;
}
SourceTreeSubItemCheckBox::indicator:checked {
image: url(:/res/images/expand.png);
}
SourceTreeSubItemCheckBox::indicator:unchecked {
image: url(:/res/images/collapse.png);
}
OBSHotkeyLabel[hotkeyPairHover=true] {
color: red;
}

View file

@ -40,6 +40,76 @@
/***************************************************************************/
/************************/
/* ---- Main Theme ---- */
/************************/
OBSTheme {
window: rgb(49, 54, 59); /* Blue-gray */
windowText: rgb(239, 240, 241); /* White */
base: rgb(0, 139, 163); /* Dark Cyan (Primary Dark) */
alternateBase: rgb(186, 45, 101); /* Dark Pink (Secondary Dark) */
text: rgb(239, 240, 241); /* White */
button: rgb(0, 188, 212); /* Cyan (Primary) */
buttonText: rgb(239, 240, 241); /* White */
brightText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */
light: rgb(162, 161, 162); /* Lighter Gray */
mid: rgb(118, 121, 124); /* Light Grey */
dark: rgb(84, 87, 91); /* Gray */
shadow: rgb(35, 38, 41); /* Dark Gray */
highlight: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
highlightText: rgb(0,0,0);
link: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
linkVisited: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
}
OBSTheme::disabled {
text: rgb(118, 121, 124); /* Light Gray */
buttonText: rgb(118, 121, 124); /* Light Gray */
brightText: rgb(118, 121, 124); /* Light Gray */
}
OBSTheme::inactive {
highlight: rgb(0, 188, 212); /* Cyan (Primary) */
highlightText: rgb(239, 240, 241); /* White */
}
/************************/
/* ---- SourceTree ---- */
/************************/
SourceTree::item:selected:!active {
color: rgb(239, 240, 241); /* White */
background-color: rgba(255, 148, 194, 0.25); /* Light Pink (Secondary Light) */
border: none;
}
SourceTree::item:selected {
background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
border: none;
}
SourceTree::item:hover,
SourceTree::item:disabled:hover,
SourceTree::item:hover:!active {
background-color: rgb(0, 188, 212); /* Cyan (Primary) */
color: rgb(239, 240, 241); /* White */
border: none;
}
SourceTree QLineEdit {
padding-top: 0;
padding-bottom: 0;
padding-right: 0;
padding-left: 2px;
border: none;
border-radius: none;
}
/*************************/
/* --- General style --- */
/*************************/
@ -535,16 +605,6 @@ QLineEdit {
color: rgb(239, 240, 241); /* White */
}
QListWidget QLineEdit {
padding-top: 0;
padding-bottom: 0;
padding-right: 0;
padding-left: 2px;
border: none;
border-radius: none;
}
/**********************/
/* --- Checkboxes --- */
/**********************/
@ -701,6 +761,30 @@ MuteCheckBox::indicator:unchecked:disabled {
image: url(./Dark/unmute.png);
}
/****************************/
/* --- Group Checkboxes --- */
/****************************/
SourceTreeSubItemCheckBox {
background: transparent;
outline: none;
}
SourceTreeSubItemCheckBox::indicator {
width: 10px;
height: 10px;
}
SourceTreeSubItemCheckBox::indicator:checked,
SourceTreeSubItemCheckBox::indicator:checked:hover {
image: url(./Dark/expand.png);
}
SourceTreeSubItemCheckBox::indicator:unchecked,
SourceTreeSubItemCheckBox::indicator:unchecked:hover {
image: url(./Dark/collapse.png);
}
/*************************/
/* --- Progress bars --- */
/*************************/
@ -775,10 +859,10 @@ QPushButton:disabled {
}
QPushButton::menu-indicator {
image: url(./Rachni/down_arrow.png);
subcontrol-position: right;
subcontrol-origin: padding;
width: 25px;
image: url(./Rachni/down_arrow.png);
subcontrol-position: right;
subcontrol-origin: padding;
width: 25px;
}
/******************************/
@ -1022,10 +1106,55 @@ QSlider::handle:horizontal:pressed {
stop: 1 rgb(162, 161, 162));
}
QSlider::sub-page:horizontal {
background-color: rgb(0, 188, 212); /* Cyan (Primary) */
border-radius: 2px;
}
QSlider::sub-page:horizontal:disabled {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 rgb(35, 38, 41), /* Dark Gray */
stop: 0.75 rgb(35, 38, 41)); /* Dark Gray */
border-radius: 2px;
}
QSlider::groove:vertical {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(35, 38, 41), /* Dark Gray */
stop: 0.75 rgb(50, 49, 50));
width: 4px;
border: none;
border-radius: 2px;
}
QSlider::handle:vertical {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(240, 239, 240),
stop: 0.25 rgb(200, 199, 200),
stop: 1 rgb(162, 161, 162));
border: 1px solid rgb(58, 57, 58);
border-radius: 3px;
width: 10px;
height: 18px;
margin: 0 -3px;
}
QSlider::handle:vertical:pressed {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(240, 239, 240),
stop: 0.25 rgb(200, 199, 200),
stop: 1 rgb(162, 161, 162));
}
QSlider::add-page:vertical {
background-color: rgb(0, 188, 212); /* Cyan (Primary) */
border-radius: 2px;
}
QSlider::add-page:vertical:disabled {
background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
stop: 0 rgb(35, 38, 41), /* Dark Gray */
stop: 0.75 rgb(35, 38, 41)); /* Dark Gray */
border-radius: 2px;
}
@ -1033,11 +1162,6 @@ QSlider::handle:hover {
background-color: rgb(200, 199, 200);
}
QSlider::sub-page {
background-color: rgb(0, 188, 212); /* Cyan (Primary) */
border-radius: 2px;
}
QSlider::handle:disabled {
background-color: rgb(122, 121, 122);
}
@ -1069,6 +1193,14 @@ QFrame[frameShape="0"] {
/* Misc style tweaks for dark themes */
* [themeID="error"] {
color: rgb(255, 89, 76); /* Red Error */
}
* [themeID="warning"] {
color: rgb(255, 148, 194); /* Light Pink (Secondary Light) */
}
QStatusBar::item {
border: none;
}