prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated stylesheet for all themes.

Browse Source
This commit is contained in:
CJBok
2019-12-28 23:52:56 +01:00
parent 9f141d813a
commit 0907a5216e
6 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/qt_themes/colorful/style.qrc vendored
View File

@@ -10,6 +10,6 @@
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
</qresource>
<qresource prefix="colorful">
<file>style.qss</file>
<file alias="style.qss">../default/style.qss</file>
</qresource>
</RCC>

4
dist/qt_themes/colorful/style.qss vendored
View File

@@ -1,4 +0,0 @@
/*
This file is intentionally left blank.
We do not want to apply any stylesheet for colorful, only icons.
*/

13
dist/qt_themes/default/default.qrc vendored
View File

@@ -1,25 +1,18 @@
<RCC>
<qresource prefix="icons/default">
<file alias="index.theme">icons/index.theme</file>
<file alias="16x16/checked.png">icons/16x16/checked.png</file>
<file alias="16x16/failed.png">icons/16x16/failed.png</file>
<file alias="16x16/lock.png">icons/16x16/lock.png</file>
<file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
<file alias="48x48/chip.png">icons/48x48/chip.png</file>
<file alias="48x48/folder.png">icons/48x48/folder.png</file>
<file alias="48x48/plus.png">icons/48x48/plus.png</file>
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
<file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
</qresource>
<qresource prefix="default">
<file>style.qss</file>
</qresource>
</RCC>

35
dist/qt_themes/default/style.qss vendored Normal file
View File

@@ -0,0 +1,35 @@
QPushButton#StatusBarToggleButton {
color: #959595;
border: 1px solid transparent;
background-color: transparent;
padding: 0px 3px 0px 3px;
text-align: center;
}
QPushButton#StatusBarToggleButton:checked {
color: #000000;
}
QPushButton#StatusBarToggleButton:hover {
border: 1px solid #76797C;
}
QPushButton#RendererStatusBarButton {
color: #656565;
border: 1px solid transparent;
background-color: transparent;
padding: 0px 3px 0px 3px;
text-align: center;
}
QPushButton#RendererStatusBarButton:hover {
border: 1px solid #76797C;
}
QPushButton#RendererStatusBarButton:checked {
color: #e85c00;
}
QPushButton#RendererStatusBarButton:!checked{
color: #0066ff;
}

26
dist/qt_themes/qdarkstyle/style.qss vendored
View File

@@ -1234,7 +1234,7 @@ QDateEdit::down-arrow:focus {
image: url(:/qss_icons/rc/down_arrow.png);
}
QPushButton#StatusButton {
QPushButton#StatusBarToggleButton {
color: #656565;
border: 1px solid transparent;
background-color: transparent;
@@ -1242,10 +1242,30 @@ QPushButton#StatusButton {
text-align: center;
}
QPushButton#StatusButton:checked {
QPushButton#StatusBarToggleButton:checked {
color: #ffffff;
}
QPushButton#StatusButton:hover {
QPushButton#StatusBarToggleButton:hover {
border: 1px solid #76797C;
}
QPushButton#RendererStatusBarButton {
color: #656565;
border: 1px solid transparent;
background-color: transparent;
padding: 0px 3px 0px 3px;
text-align: center;
}
QPushButton#RendererStatusBarButton:hover {
border: 1px solid #76797C;
}
QPushButton#RendererStatusBarButton:checked {
color: #e85c00;
}
QPushButton#RendererStatusBarButton:!checked{
color: #00ccdd;
}

18
src/yuzu/main.cpp
View File

@@ -485,7 +485,7 @@ void GMainWindow::InitializeWidgets() {
async_status_button = new QPushButton();
async_status_button->setText(tr("ASYNC"));
async_status_button->setObjectName(tr("StatusButton"));
async_status_button->setObjectName(tr("StatusBarToggleButton"));
async_status_button->setCheckable(true);
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
statusBar()->addPermanentWidget(async_status_button, 0);
@@ -508,9 +508,7 @@ void GMainWindow::InitializeWidgets() {
renderer_status_button->setChecked(false);
renderer_status_button->setDisabled(true);
#endif // HAS_VULKAN
renderer_status_button->setObjectName(tr("StatusButton"));
renderer_status_button->setStyleSheet(QStringLiteral("QPushButton:checked{color: #e85c00;}"
"QPushButton:!checked{color: #00ccdd;}"));
renderer_status_button->setObjectName(tr("RendererStatusBarButton"));
statusBar()->addPermanentWidget(renderer_status_button, 0);
statusBar()->setVisible(true);
@@ -2372,8 +2370,16 @@ void GMainWindow::UpdateUITheme() {
QStringList theme_paths(default_theme_paths);
if (is_default_theme || current_theme.isEmpty()) {
qApp->setStyleSheet({});
setStyleSheet({});
const QString theme_uri(QLatin1Char{':'} + QStringLiteral("default/style.qss"));
QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
setStyleSheet(ts.readAll());
} else {
qApp->setStyleSheet({});
setStyleSheet({});
}
theme_paths.append(default_icons);
QIcon::setThemeName(default_icons);
} else {