mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-06-02 00:33:16 +00:00
Gui: Adding Pause button working, full screen button and labels to buttons on main window gui (#2634)
* Adding names to gui buttoms and adjusting spacing. * moving refresh button to last slot. * Changing the implementation to tooltips for hover over them - qstring to detect background color. * Fixing some themes with inverted tooltip base * Suggestions / Fixes - Pause and FullScreen Buttons * Update REUSE.toml * cleaning up * Icons stuff * clang * Buttons toggle - Cleaning code - Fixing Icons * cleaning boolean * Toggle pause and play icons and label to "Resume" when paused. * Simplifying the toggles. * New icons and final Push to review * Reuse * Icon rename, adding f9 press for pause game when no gui is on without needed of debug menu * clang + reuse * clang dosent work on this part * again Clang * Last fix for review. Light theme white resume icon fix. * Proper fix for Resume icon * New Rebase * Fixed Orientation with docking issues and cleaning boxlayout code * Adding spacer to separate actions, sizeslider on top of search bar. And adding margins * Fixed Background not showing on OLED Theme * Fixing check marks * Adding all Daniel Suggestions and fixed F9 not working with debug menu open. * Clang * reverting all OLED theme changes * Final suggestions
This commit is contained in:
parent
5caab76a45
commit
ae2c9a745e
21 changed files with 324 additions and 91 deletions
|
@ -19,7 +19,7 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, Qt::white);
|
||||
themePalette.setColor(QPalette::Base, QColor(20, 20, 20));
|
||||
themePalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
|
||||
themePalette.setColor(QPalette::ToolTipBase, Qt::white);
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(20, 20, 20));
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::white);
|
||||
themePalette.setColor(QPalette::Text, Qt::white);
|
||||
themePalette.setColor(QPalette::Button, QColor(53, 53, 53));
|
||||
|
@ -37,18 +37,18 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
"border-radius: 4px; padding: 5px; }"
|
||||
"QLineEdit:focus {"
|
||||
"border: 1px solid #2A82DA; }");
|
||||
themePalette.setColor(QPalette::Window, QColor(240, 240, 240)); // Light gray
|
||||
themePalette.setColor(QPalette::WindowText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Base, QColor(230, 230, 230, 80)); // Grayish
|
||||
themePalette.setColor(QPalette::ToolTipBase, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Text, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Button, QColor(240, 240, 240)); // Light gray
|
||||
themePalette.setColor(QPalette::ButtonText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::BrightText, Qt::red); // Red
|
||||
themePalette.setColor(QPalette::Link, QColor(42, 130, 218)); // Blue
|
||||
themePalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); // Blue
|
||||
themePalette.setColor(QPalette::HighlightedText, Qt::white); // White
|
||||
themePalette.setColor(QPalette::Window, QColor(240, 240, 240)); // Light gray
|
||||
themePalette.setColor(QPalette::WindowText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Base, QColor(230, 230, 230, 80)); // Grayish
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(230, 230, 230, 80)); // Grayish
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Text, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::Button, QColor(240, 240, 240)); // Light gray
|
||||
themePalette.setColor(QPalette::ButtonText, Qt::black); // Black
|
||||
themePalette.setColor(QPalette::BrightText, Qt::red); // Red
|
||||
themePalette.setColor(QPalette::Link, QColor(42, 130, 218)); // Blue
|
||||
themePalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); // Blue
|
||||
themePalette.setColor(QPalette::HighlightedText, Qt::white); // White
|
||||
qApp->setPalette(themePalette);
|
||||
break;
|
||||
case Theme::Green:
|
||||
|
@ -62,8 +62,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Base, QColor(25, 40, 25)); // Darker green base
|
||||
themePalette.setColor(QPalette::AlternateBase,
|
||||
QColor(53, 69, 53)); // Dark green alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase, Qt::white); // White tooltip background
|
||||
QColor(53, 69, 53)); // Dark green alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase,
|
||||
QColor(25, 40, 25)); // White tooltip background
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::white); // White tooltip text
|
||||
themePalette.setColor(QPalette::Text, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Button, QColor(53, 69, 53)); // Dark green button
|
||||
|
@ -85,8 +86,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Base, QColor(20, 40, 60)); // Darker blue base
|
||||
themePalette.setColor(QPalette::AlternateBase,
|
||||
QColor(40, 60, 90)); // Dark blue alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase, Qt::white); // White tooltip background
|
||||
QColor(40, 60, 90)); // Dark blue alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase,
|
||||
QColor(20, 40, 60)); // White tooltip background
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::white); // White tooltip text
|
||||
themePalette.setColor(QPalette::Text, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Button, QColor(40, 60, 90)); // Dark blue button
|
||||
|
@ -109,8 +111,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Base, QColor(80, 30, 90)); // Darker violet base
|
||||
themePalette.setColor(QPalette::AlternateBase,
|
||||
QColor(100, 50, 120)); // Violet alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase, Qt::white); // White tooltip background
|
||||
QColor(100, 50, 120)); // Violet alternate base
|
||||
themePalette.setColor(QPalette::ToolTipBase,
|
||||
QColor(80, 30, 90)); // White tooltip background
|
||||
themePalette.setColor(QPalette::ToolTipText, Qt::white); // White tooltip text
|
||||
themePalette.setColor(QPalette::Text, Qt::white); // White text
|
||||
themePalette.setColor(QPalette::Button, QColor(100, 50, 120)); // Violet button
|
||||
|
@ -133,7 +136,7 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, QColor(249, 245, 215));
|
||||
themePalette.setColor(QPalette::Base, QColor(29, 32, 33));
|
||||
themePalette.setColor(QPalette::AlternateBase, QColor(50, 48, 47));
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(249, 245, 215));
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(29, 32, 33));
|
||||
themePalette.setColor(QPalette::ToolTipText, QColor(249, 245, 215));
|
||||
themePalette.setColor(QPalette::Text, QColor(249, 245, 215));
|
||||
themePalette.setColor(QPalette::Button, QColor(40, 40, 40));
|
||||
|
@ -155,7 +158,7 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
|
|||
themePalette.setColor(QPalette::WindowText, QColor(192, 202, 245));
|
||||
themePalette.setColor(QPalette::Base, QColor(25, 28, 39));
|
||||
themePalette.setColor(QPalette::AlternateBase, QColor(36, 40, 59));
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(192, 202, 245));
|
||||
themePalette.setColor(QPalette::ToolTipBase, QColor(25, 28, 39));
|
||||
themePalette.setColor(QPalette::ToolTipText, QColor(192, 202, 245));
|
||||
themePalette.setColor(QPalette::Text, QColor(192, 202, 245));
|
||||
themePalette.setColor(QPalette::Button, QColor(30, 30, 41));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue