jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add new theme Yami

master
Warchamp7 2022-06-30 13:11:50 -04:00 committed by Jim
parent e1776d872a
commit 936bd58874
16 changed files with 3761 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/data/themes/Dark/dots-vert.svg Normal file
View File

@ -0,0 +1 @@
<svg version="1.2" xmlns="http://www.w3.org/2000/svg" fill="#d2d2d2" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="M39.5,10c0,4.216-3.357,7.633-7.5,7.633l0,0c-4.143,0-7.5-3.417-7.5-7.633l0,0c0-4.216,3.357-7.633,7.5-7.633l0,0 C36.143,2.367,39.5,5.784,39.5,10L39.5,10z"/><path d="M39.5,32c0,4.217-3.356,7.634-7.5,7.634l0,0c-4.143,0-7.5-3.417-7.5-7.634l0,0c0-4.216,3.357-7.633,7.5-7.633l0,0 C36.144,24.367,39.5,27.784,39.5,32L39.5,32z"/><path d="M39.5,54c0,4.215-3.357,7.633-7.5,7.633l0,0c-4.141,0-7.5-3.418-7.5-7.633l0,0c0-4.216,3.359-7.633,7.5-7.633l0,0 C36.143,46.367,39.5,49.784,39.5,54L39.5,54z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 649 B

1
UI/data/themes/Dark/dots.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="#d2d2d2" viewBox="0 0 64 64" width="64" height="64"><path d="M8 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zM1.5 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm13 0a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 236 B

1406
UI/data/themes/Yami.qss Normal file
View File

File diff suppressed because it is too large Load Diff

11
UI/data/themes/Yami/checkbox_checked.svg Normal file
View File

@ -0,0 +1,11 @@
<svg version="1.1" x="0px" y="0px" width="128px" height="128px" viewBox="0 0 128 128">
<g>
<path fill="none" stroke="#B0AFB3" stroke-width="8" stroke-miterlimit="10" d="M115.579,104.736
c0,6.222-5.013,11.264-11.192,11.264H22.771c-6.182,0-11.192-5.042-11.192-11.264V23.263c0-6.221,5.01-11.263,11.192-11.263h81.616
c6.18,0,11.191,5.042,11.191,11.263L115.579,104.736L115.579,104.736z"/>
</g>
<g>
<line fill="none" stroke="#B0AFB3" stroke-width="12" stroke-miterlimit="10" x1="29.213" y1="66.025" x2="54.362" y2="91.168"/>
<line fill="none" stroke="#B0AFB3" stroke-width="12" stroke-miterlimit="10" x1="98.213" y1="38.12" x2="45.165" y2="91.168"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 663 B

11
UI/data/themes/Yami/checkbox_checked_disabled.svg Normal file
View File

@ -0,0 +1,11 @@
<svg version="1.1" x="0" y="0" width="128" height="128" viewBox="0 0 128 128">
<g>
<path id="Unchecked_1_" fill="none" stroke="#4A4C53" stroke-width="8" stroke-miterlimit="10" d="M115.579,104.737
c0,6.221-5.012,11.263-11.192,11.263H22.771c-6.182,0-11.192-5.042-11.192-11.263V23.263c0-6.221,5.01-11.263,11.192-11.263h81.615
c6.181,0,11.192,5.042,11.192,11.263V104.737z"/>
</g>
<g>
<line fill="none" stroke="#4A4C53" stroke-width="12" stroke-miterlimit="10" x1="29.213" y1="66.025" x2="54.362" y2="91.168"/>
<line fill="none" stroke="#4A4C53" stroke-width="12" stroke-miterlimit="10" x1="98.213" y1="38.12" x2="45.165" y2="91.168"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 650 B

11
UI/data/themes/Yami/checkbox_checked_focus.svg Normal file
View File

@ -0,0 +1,11 @@
<svg version="1.1" x="0" y="0" width="128" height="128" viewBox="0 0 128 128">
<g>
<path fill="none" stroke="#FFFFFF" stroke-width="12" stroke-miterlimit="10" d="
M115.579,104.737c0,6.221-5.012,11.263-11.192,11.263H22.771c-6.182,0-11.192-5.042-11.192-11.263V23.263
c0-6.221,5.01-11.263,11.192-11.263h81.615c6.181,0,11.192,5.042,11.192,11.263V104.737z"/>
</g>
<g>
<line fill="none" stroke="#FFFFFF" stroke-width="20" stroke-miterlimit="10" x1="29.213" y1="66.025" x2="54.362" y2="91.168"/>
<line fill="none" stroke="#FFFFFF" stroke-width="20" stroke-miterlimit="10" x1="98.213" y1="38.12" x2="45.165" y2="91.168"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 633 B

9
UI/data/themes/Yami/checkbox_unchecked.svg Normal file
View File

@ -0,0 +1,9 @@
<svg version="1.1" x="0" y="0" width="128" height="128" viewBox="0 0 128 128">
<g>
<path fill="none" stroke="#B0AFB3" stroke-width="8" stroke-miterlimit="10" d="M115.579,104.737
c0,6.221-5.012,11.263-11.192,11.263H22.771c-6.182,0-11.192-5.042-11.192-11.263V23.263c0-6.221,5.01-11.263,11.192-11.263h81.615
c6.181,0,11.192,5.042,11.192,11.263V104.737z"/>
<path display="none" fill="#B0AFB3" d="M90,77.91C90,84.587,84.587,90,77.91,90H50.09C43.413,90,38,84.587,38,77.91V50.09
C38,43.413,43.413,38,50.09,38h27.82C84.587,38,90,43.413,90,50.09V77.91z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 567 B

7
UI/data/themes/Yami/checkbox_unchecked_disabled.svg Normal file
View File

@ -0,0 +1,7 @@
<svg version="1.1" x="0" y="0" width="128" height="128" viewBox="0 0 128 128">
<g>
<path fill="none" stroke="#4A4C53" stroke-width="8" stroke-miterlimit="10" d="M115.579,104.737
c0,6.221-5.012,11.263-11.192,11.263H22.771c-6.182,0-11.192-5.042-11.192-11.263V23.263c0-6.221,5.01-11.263,11.192-11.263h81.615
c6.181,0,11.192,5.042,11.192,11.263V104.737z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 370 B

7
UI/data/themes/Yami/checkbox_unchecked_focus.svg Normal file
View File

@ -0,0 +1,7 @@
<svg version="1.1" x="0" y="0" width="128" height="128" viewBox="0 0 128 128">
<g>
<path fill="none" stroke="#FFFFFF" stroke-width="12" stroke-miterlimit="10" d="
M115.579,104.737c0,6.221-5.012,11.263-11.192,11.263H22.771c-6.182,0-11.192-5.042-11.192-11.263V23.263
c0-6.221,5.01-11.263,11.192-11.263h81.615c6.181,0,11.192,5.042,11.192,11.263V104.737z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 371 B

32
UI/forms/OBSBasic.ui
View File

@ -365,7 +365,7 @@
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID2" stdset="0">
<string notr="true">contextBarButton</string>
@ -391,7 +391,7 @@
<normaloff>:/res/images/filter.svg</normaloff>:/res/images/filter.svg</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID2" stdset="0">
<string notr="true">contextBarButton</string>
@ -417,7 +417,7 @@
<normaloff>:/res/images/interact.svg</normaloff>:/res/images/interact.svg</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID2" stdset="0">
<string notr="true">contextBarButton</string>
@ -1251,12 +1251,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Basic.AddTransition</string>
</property>
@ -1271,7 +1265,7 @@
<normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID" stdset="0">
<string notr="true">addIconSmall</string>
@ -1286,12 +1280,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Basic.RemoveTransition</string>
</property>
@ -1306,7 +1294,7 @@
<normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID" stdset="0">
<string notr="true">removeIconSmall</string>
@ -1321,12 +1309,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Basic.TransitionProperties</string>
</property>
@ -1341,10 +1323,10 @@
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID" stdset="0">
<string notr="true">configIconSmall</string>
<string notr="true">menuIconSmall</string>
</property>
</widget>
</item>

2280
UI/forms/OBSBasic.ui.autosave Normal file
View File

File diff suppressed because it is too large Load Diff

4
UI/forms/OBSBasicSettings.ui
View File

@ -4832,10 +4832,10 @@
<string>Clear</string>
</property>
<property name="flat">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="themeID" stdset="0">
<string>trashIcon</string>
<string>revertIcon</string>
</property>
<property name="fixedSize" stdset="0">
<size>

8
UI/hotkey-edit.cpp
View File

@ -280,15 +280,11 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
auto revert = new QPushButton;
revert->setProperty("themeID", "revertIcon");
revert->setToolTip(QTStr("Revert"));
revert->setFixedSize(24, 24);
revert->setFlat(true);
revert->setEnabled(false);
auto clear = new QPushButton;
clear->setProperty("themeID", "trashIcon");
clear->setToolTip(QTStr("Clear"));
clear->setFixedSize(24, 24);
clear->setFlat(true);
clear->setEnabled(!obs_key_combination_is_empty(combo));
QObject::connect(
@ -302,15 +298,11 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
auto add = new QPushButton;
add->setProperty("themeID", "addIconSmall");
add->setToolTip(QTStr("Add"));
add->setFixedSize(24, 24);
add->setFlat(true);
auto remove = new QPushButton;
remove->setProperty("themeID", "removeIconSmall");
remove->setToolTip(QTStr("Remove"));
remove->setEnabled(removeButtons.size() > 0);
remove->setFixedSize(24, 24);
remove->setFlat(true);
auto CurrentIndex = [&, remove] {
auto res = std::find(begin(removeButtons), end(removeButtons),

2
UI/menu-button.cpp
View File

@ -24,7 +24,7 @@ void MenuButton::keyPressEvent(QKeyEvent *event)
void MenuButton::mousePressEvent(QMouseEvent *event)
{
if (menu()) {
if (width() - event->x() <= 15)
if (width() - event->x() <= 30)
showMenu();
else
setDown(true);

3
UI/volume-control.cpp
View File

@ -176,8 +176,7 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
if (showConfig) {
config = new QPushButton(this);
config->setProperty("themeID", "configIconSmall");
config->setFlat(true);
config->setProperty("themeID", "menuIconSmall");
config->setSizePolicy(QSizePolicy::Maximum,
QSizePolicy::Maximum);
config->setMaximumSize(22, 22);

11
UI/window-basic-main-transitions.cpp
View File

@ -756,23 +756,24 @@ void OBSBasic::CreateProgramOptions()
layout->setSpacing(4);
QPushButton *configTransitions = new QPushButton();
configTransitions->setMaximumSize(22, 22);
configTransitions->setProperty("themeID", "configIconSmall");
configTransitions->setFlat(true);
configTransitions->setProperty("themeID", "menuIconSmall");
QHBoxLayout *mainButtonLayout = new QHBoxLayout();
mainButtonLayout->setSpacing(2);
transitionButton = new QPushButton(QTStr("Transition"));
transitionButton->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Preferred);
QHBoxLayout *quickTransitions = new QHBoxLayout();
quickTransitions->setSpacing(2);
QPushButton *addQuickTransition = new QPushButton();
addQuickTransition->setMaximumSize(22, 22);
addQuickTransition->setProperty("themeID", "addIconSmall");
addQuickTransition->setFlat(true);
QLabel *quickTransitionsLabel = new QLabel(QTStr("QuickTransitions"));
quickTransitionsLabel->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Preferred);
quickTransitions->addWidget(quickTransitionsLabel);
quickTransitions->addWidget(addQuickTransition);