From 9101bd7ad45d6b259dfae7938d60fe7619568bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=A5IGA?= <164882787+Xphalnos@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:39:48 +0200 Subject: [PATCH] Improved Dark theme, search bar and icon theme (#830) * Improved Dark theme, search bar and icon theme * Update FR translation --- src/images/themes_icon.png | Bin 3395 -> 1413 bytes src/qt_gui/main_window_themes.cpp | 33 +++++++++++++++--------------- src/qt_gui/main_window_ui.h | 2 +- src/qt_gui/translations/fr.ts | 32 ++++++++++++++--------------- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/images/themes_icon.png b/src/images/themes_icon.png index 822ef3af0c61e8ec9f0e13e93634273901fa06ed..cc711011e53f54f032735b712d3485f2513cfb91 100644 GIT binary patch literal 1413 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 HoD!MsetStyleSheet("background-color: #1e1e1e; /* Dark background */" - "color: #ffffff; /* White text */" - "border: 1px solid #ffffff; /* White border */" + mw_searchbar->setStyleSheet("background-color: #1e1e1e;" // Dark background + "color: #ffffff;" // White text + "border: 2px solid #ffffff;" // White border "padding: 5px;"); - themePalette.setColor(QPalette::Window, QColor(53, 53, 53)); + themePalette.setColor(QPalette::Window, QColor(50, 50, 50)); themePalette.setColor(QPalette::WindowText, Qt::white); - themePalette.setColor(QPalette::Base, QColor(25, 25, 25)); + themePalette.setColor(QPalette::Base, QColor(20, 20, 20)); themePalette.setColor(QPalette::AlternateBase, QColor(25, 25, 25)); themePalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53)); themePalette.setColor(QPalette::ToolTipBase, Qt::white); @@ -30,8 +30,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) { break; case Theme::Light: - mw_searchbar->setStyleSheet("background-color: #ffffff; /* Light gray background */" - "color: #000000; /* Black text */" + mw_searchbar->setStyleSheet("background-color: #ffffff;" // Light gray background + "color: #000000;" // Black text + "border: 2px solid #000000;" // Black border "padding: 5px;"); themePalette.setColor(QPalette::Window, QColor(240, 240, 240)); // Light gray themePalette.setColor(QPalette::WindowText, Qt::black); // Black @@ -49,9 +50,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) { break; case Theme::Green: - mw_searchbar->setStyleSheet("background-color: #354535; /* Dark green background */" - "color: #ffffff; /* White text */" - "border: 1px solid #ffffff; /* White border */" + mw_searchbar->setStyleSheet("background-color: #1e1e1e;" // Dark background + "color: #ffffff;" // White text + "border: 2px solid #ffffff;" // White border "padding: 5px;"); themePalette.setColor(QPalette::Window, QColor(53, 69, 53)); // Dark green background themePalette.setColor(QPalette::WindowText, Qt::white); // White text @@ -72,9 +73,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) { break; case Theme::Blue: - mw_searchbar->setStyleSheet("background-color: #283c5a; /* Dark blue background */" - "color: #ffffff; /* White text */" - "border: 1px solid #ffffff; /* White border */" + mw_searchbar->setStyleSheet("background-color: #1e1e1e;" // Dark background + "color: #ffffff;" // White text + "border: 2px solid #ffffff;" // White border "padding: 5px;"); themePalette.setColor(QPalette::Window, QColor(40, 60, 90)); // Dark blue background themePalette.setColor(QPalette::WindowText, Qt::white); // White text @@ -95,9 +96,9 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) { break; case Theme::Violet: - mw_searchbar->setStyleSheet("background-color: #643278; /* Violet background */" - "color: #ffffff; /* White text */" - "border: 1px solid #ffffff; /* White border */" + mw_searchbar->setStyleSheet("background-color: #1e1e1e;" // Dark background + "color: #ffffff;" // White text + "border: 2px solid #ffffff;" // White border "padding: 5px;"); themePalette.setColor(QPalette::Window, QColor(100, 50, 120)); // Violet background themePalette.setColor(QPalette::WindowText, Qt::white); // White text diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h index 8ae5965f8..6ddc4155e 100644 --- a/src/qt_gui/main_window_ui.h +++ b/src/qt_gui/main_window_ui.h @@ -267,8 +267,8 @@ public: menuView->addAction(menuGame_List_Mode->menuAction()); menuView->addAction(menuGame_List_Icons->menuAction()); menuView->addAction(menuThemes->menuAction()); - menuThemes->addAction(setThemeLight); menuThemes->addAction(setThemeDark); + menuThemes->addAction(setThemeLight); menuThemes->addAction(setThemeGreen); menuThemes->addAction(setThemeBlue); menuThemes->addAction(setThemeViolet); diff --git a/src/qt_gui/translations/fr.ts b/src/qt_gui/translations/fr.ts index 33e2990c0..5ba5e7e2e 100644 --- a/src/qt_gui/translations/fr.ts +++ b/src/qt_gui/translations/fr.ts @@ -21,7 +21,7 @@ This software should not be used to play games you have not legally obtained. - Ce logiciel ne doit pas être utilisé pour jouer à des jeux que vous n'avez pas obtenus légalement. + Ce logiciel ne doit pas être utilisé pour jouer à des jeux que vous n'avez pas obtenus légalement. @@ -60,7 +60,7 @@ Directory to install games - Répertoire d'installation des jeux + Répertoire d'installation des jeux @@ -75,7 +75,7 @@ The value for location to install games is not valid. - Le répertoire d'installation des jeux n'est pas valide. + Le répertoire d'installation des jeux n'est pas valide. @@ -118,7 +118,7 @@ Copy Serial - Copier le numéro de série + Copier le N° de série @@ -201,7 +201,7 @@ Exit the application. - Fermer l'application. + Fermer l'application. @@ -291,7 +291,7 @@ Game List Mode - Mode d'affichage + Mode d'affichage @@ -301,7 +301,7 @@ Utils - Utilitaire + Utilitaires @@ -316,12 +316,12 @@ Dark - Noir + Sombre Light - Blanc + Clair @@ -341,7 +341,7 @@ toolBar - Bare d'outils + Bare d'outils @@ -385,7 +385,7 @@ Emulator Language - Langage de l'émulateur + Langage de l'émulateur @@ -400,7 +400,7 @@ Show Splash - Afficher l'image du jeu + Afficher l'image du jeu @@ -410,7 +410,7 @@ Username - Nom d'utilisateur + Nom d'utilisateur @@ -538,7 +538,7 @@ All Patches available for all games have been downloaded. - Tous les patchs disponibles pour les jeux ont été téléchargés. + Tous les patchs disponibles ont été téléchargés. @@ -906,7 +906,7 @@ Can't apply cheats before the game is started - Impossible d'appliquer les triches avant que le jeu ne commence. + Impossible d'appliquer les Cheats avant que le jeu ne commence. @@ -972,7 +972,7 @@ Path - Chemin + Répertoire \ No newline at end of file