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

@ -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 {