From 704273209138d66fb835683da3c0f43ededc8b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com>
Date: Tue, 7 May 2024 19:47:42 +0800
Subject: [PATCH] =?UTF-8?q?[stylesheet]=EF=BC=9A=E4=BF=AE=E6=94=B9=20QHead?=
 =?UTF-8?q?erView=E5=92=8CQComboBox=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/coreplugin/configwidget.cpp | 22 ++++++++++++----------
 src/plugins/coreplugin/configwidget.h   |  2 +-
 src/resource/qss/common.css             |  3 ++-
 src/utils/utils.cpp                     |  9 ++++-----
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/plugins/coreplugin/configwidget.cpp b/src/plugins/coreplugin/configwidget.cpp
index c5618be..e668b07 100644
--- a/src/plugins/coreplugin/configwidget.cpp
+++ b/src/plugins/coreplugin/configwidget.cpp
@@ -8,21 +8,22 @@
 class ConfigWidget::ConfigWidgetPrivate
 {
 public:
-    ConfigWidgetPrivate(ConfigWidget *q)
+    explicit ConfigWidgetPrivate(ConfigWidget *q)
         : q_ptr(q)
     {
         languageBox = new QComboBox(q_ptr);
-        languageBox->addItem(tr("Chinese"), Utils::LanguageConfig::Language::Chinese);
-        languageBox->addItem(tr("English"), Utils::LanguageConfig::Language::English);
+        languageBox->setView(new QListView(languageBox));
+        languageBox->addItem("", Utils::LanguageConfig::Language::Chinese);
+        languageBox->addItem("", Utils::LanguageConfig::Language::English);
     }
 
     void setupUI()
     {
-        auto fromLayout = new QFormLayout(q_ptr);
+        auto *fromLayout = new QFormLayout(q_ptr);
         fromLayout->addRow(tr("Language(Requires Restart): "), languageBox);
     }
 
-    void setData()
+    void setData() const
     {
         languageBox->setCurrentIndex(Utils::LanguageConfig::instance()->currentLanguage());
     }
@@ -39,20 +40,21 @@ ConfigWidget::ConfigWidget(QWidget *parent)
     buildConnect();
     Utils::setMacComboBoxStyle(this);
     d_ptr->setData();
+    setTr();
 }
 
-ConfigWidget::~ConfigWidget() {}
+ConfigWidget::~ConfigWidget() = default;
 
-void ConfigWidget::onReloadLanguage(int)
+void ConfigWidget::onReloadLanguage(int /*unused*/)
 {
     Utils::LanguageConfig::instance()->loadLanguage(
         Utils::LanguageConfig::Language(d_ptr->languageBox->currentData().toInt()));
 }
 
-void ConfigWidget::changeEvent(QEvent *e)
+void ConfigWidget::changeEvent(QEvent *event)
 {
-    QWidget::changeEvent(e);
-    switch (e->type()) {
+    QWidget::changeEvent(event);
+    switch (event->type()) {
     case QEvent::LanguageChange: setTr(); break;
     default: break;
     }
diff --git a/src/plugins/coreplugin/configwidget.h b/src/plugins/coreplugin/configwidget.h
index 073ac17..dafd21c 100644
--- a/src/plugins/coreplugin/configwidget.h
+++ b/src/plugins/coreplugin/configwidget.h
@@ -14,7 +14,7 @@ private slots:
     void onReloadLanguage(int index);
 
 protected:
-    void changeEvent(QEvent *e) override;
+    void changeEvent(QEvent *event) override;
 
 private:
     void buildConnect();
diff --git a/src/resource/qss/common.css b/src/resource/qss/common.css
index 75a2248..0c629ce 100644
--- a/src/resource/qss/common.css
+++ b/src/resource/qss/common.css
@@ -132,7 +132,7 @@ QStackedWidget {
 *****************************************************************************/
 
 QHeaderView::section {
-    background: rgb(45, 45, 45);
+    background: rgb(54, 62, 78);
     color: white;
     border: 1px soild white;
 }
@@ -359,6 +359,7 @@ QComboBox {
     color: #495060;
     background: #fff;
     padding: 0 4px;
+    combobox-popup: 0;
 }
 
 QComboBox:!editable{
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index fe4eec4..7e25c78 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -412,25 +412,24 @@ auto Utils::crashPath() -> QString
 {
     const auto path = configLocation() + "/crash";
     generateDirectorys(path);
-    return QDir::toNativeSeparators(path);
+    return path;
 }
 
 auto Utils::logPath() -> QString
 {
     const auto path = configLocation() + "/log";
     generateDirectorys(path);
-    return QDir::toNativeSeparators(path);
+    return path;
 }
 
 auto Utils::configPath() -> QString
 {
     const auto path = configLocation() + "/config";
     generateDirectorys(path);
-    return QDir::toNativeSeparators(path);
+    return path;
 }
 
 auto Utils::configFilePath() -> QString
 {
-    const auto path = configPath() + "/config.ini";
-    return QDir::toNativeSeparators(path);
+    return (configPath() + "/config.ini");
 }