diff --git a/src/assets/assets.qrc b/src/assets/assets.qrc index 59fad20..1ad6602 100644 --- a/src/assets/assets.qrc +++ b/src/assets/assets.qrc @@ -38,5 +38,25 @@ icon/light/globe.svg icon/light/folder.svg icon/light/text.svg + icon/dark/back.svg + icon/dark/box.svg + icon/dark/calendar.svg + icon/dark/download.svg + icon/dark/folder.svg + icon/dark/globe.svg + icon/dark/leftbutton_0.svg + icon/dark/leftbutton_1.svg + icon/dark/leftbutton_2.svg + icon/dark/leftbutton_3.svg + icon/dark/leftbutton_4.svg + icon/dark/leftbutton_5.svg + icon/dark/leftbutton_6.svg + icon/dark/leftbutton_7.svg + icon/dark/leftbutton_8.svg + icon/dark/leftbutton_9.svg + icon/dark/leftbutton_10.svg + icon/dark/leftbutton_11.svg + icon/dark/leftbutton_12.svg + icon/dark/text.svg diff --git a/src/assets/icon/dark/back.svg b/src/assets/icon/dark/back.svg new file mode 100644 index 0000000..8c357a4 --- /dev/null +++ b/src/assets/icon/dark/back.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/box.svg b/src/assets/icon/dark/box.svg new file mode 100644 index 0000000..1fa71a2 --- /dev/null +++ b/src/assets/icon/dark/box.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/calendar.svg b/src/assets/icon/dark/calendar.svg new file mode 100644 index 0000000..0b9d73e --- /dev/null +++ b/src/assets/icon/dark/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/download.svg b/src/assets/icon/dark/download.svg new file mode 100644 index 0000000..07d5e4f --- /dev/null +++ b/src/assets/icon/dark/download.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/folder.svg b/src/assets/icon/dark/folder.svg new file mode 100644 index 0000000..7ef30a9 --- /dev/null +++ b/src/assets/icon/dark/folder.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/globe.svg b/src/assets/icon/dark/globe.svg new file mode 100644 index 0000000..c28295c --- /dev/null +++ b/src/assets/icon/dark/globe.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_0.svg b/src/assets/icon/dark/leftbutton_0.svg new file mode 100644 index 0000000..d000529 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_0.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_1.svg b/src/assets/icon/dark/leftbutton_1.svg new file mode 100644 index 0000000..c28295c --- /dev/null +++ b/src/assets/icon/dark/leftbutton_1.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_10.svg b/src/assets/icon/dark/leftbutton_10.svg new file mode 100644 index 0000000..8f7b753 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_10.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_11.svg b/src/assets/icon/dark/leftbutton_11.svg new file mode 100644 index 0000000..a652454 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_11.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icon/dark/leftbutton_12.svg b/src/assets/icon/dark/leftbutton_12.svg new file mode 100644 index 0000000..baf33c1 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_12.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_2.svg b/src/assets/icon/dark/leftbutton_2.svg new file mode 100644 index 0000000..13fc3a7 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_2.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icon/dark/leftbutton_3.svg b/src/assets/icon/dark/leftbutton_3.svg new file mode 100644 index 0000000..15e4b68 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_3.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_4.svg b/src/assets/icon/dark/leftbutton_4.svg new file mode 100644 index 0000000..2bf9f59 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_4.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_5.svg b/src/assets/icon/dark/leftbutton_5.svg new file mode 100644 index 0000000..7bd09c1 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_5.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_6.svg b/src/assets/icon/dark/leftbutton_6.svg new file mode 100644 index 0000000..e37d008 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_6.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/leftbutton_7.svg b/src/assets/icon/dark/leftbutton_7.svg new file mode 100644 index 0000000..e14514b --- /dev/null +++ b/src/assets/icon/dark/leftbutton_7.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icon/dark/leftbutton_8.svg b/src/assets/icon/dark/leftbutton_8.svg new file mode 100644 index 0000000..3bcc211 --- /dev/null +++ b/src/assets/icon/dark/leftbutton_8.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icon/dark/leftbutton_9.svg b/src/assets/icon/dark/leftbutton_9.svg new file mode 100644 index 0000000..31f7b4f --- /dev/null +++ b/src/assets/icon/dark/leftbutton_9.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/dark/text.svg b/src/assets/icon/dark/text.svg new file mode 100644 index 0000000..342d99e --- /dev/null +++ b/src/assets/icon/dark/text.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index dd8c32f..750b16a 100644 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -21,7 +21,6 @@ MainWindow::MainWindow(QWidget *parent) ui->titlebar->setBackgroundTransparent(true); //ui->titlebar->setSwitchThemeMenuVisible(false); // 去除 dtk 标题栏主题切换菜单 setMaskAlpha(240); - setMaskColor(QColor("#f3f7f8")); initConfig(); updateUi(0); @@ -30,9 +29,29 @@ MainWindow::MainWindow(QWidget *parent) connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) { if (themeType == DGuiApplicationHelper::DarkType) { //深色模式 - + setMaskColor(QColor("#2a2b2b")); + this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\ + QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#FFFFFF}\ + "); + backButtom->setIcon(QIcon(":/icon/light/back.svg")); + downloadButton->setIcon(QIcon(":/icon/light/download.svg")); + int i = 0; + while (i < ui->buttonGroup->buttons().size()) { + ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/dark/leftbutton_" + QString::number(i) + ".svg")); + if (QLocale::system().name() == "zh_CN") { + ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\ + QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;}\ + QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;}"); + } else { + ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;text-align: left; padding-left: 15px;}\ + QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\ + QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}"); + } + i++; + } } else { //亮色模式 + setMaskColor(QColor("#f3f7f8")); this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\ QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#000000}\ "); diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 2d962b6..06dbf19 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -240,7 +240,20 @@ void AppIntoPage::sltAppinfoTags(QStringList *tagList) void AppIntoPage::setTheme(bool dark) { if(dark) - {}else { + { + QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}"; + ui->frame->setStyleSheet(frameStyleSheet); + ui->frame_2->setStyleSheet(frameStyleSheet); + ui->frame_3->setStyleSheet(frameStyleSheet); + ui->frame_4->setStyleSheet(frameStyleSheet); + + ui->icon_1->setPixmap(QPixmap(":/icon/dark/box.svg")); + ui->icon_2->setPixmap(QPixmap(":/icon/dark/box.svg")); + ui->icon_3->setPixmap(QPixmap(":/icon/dark/calendar.svg")); + ui->icon_4->setPixmap(QPixmap(":/icon/dark/text.svg")); + ui->icon_5->setPixmap(QPixmap(":/icon/dark/folder.svg")); + ui->icon_6->setPixmap(QPixmap(":/icon/dark/globe.svg")); + }else { //亮色模式 QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4{background-color: #fbfbfb;border-radius:14px;border:1px solid rgb(229,229,229);}"; ui->frame->setStyleSheet(frameStyleSheet); diff --git a/src/pages/applistpage.cpp b/src/pages/applistpage.cpp index 2e4113b..66cd783 100644 --- a/src/pages/applistpage.cpp +++ b/src/pages/applistpage.cpp @@ -13,10 +13,10 @@ void AppListPage::setTheme(bool dark) isDark=dark; if(dark) { - + this->setStyleSheet("#frame{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}"); }else { //亮色模式 - this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}#webEngineView{border-radius:14px;}"); + this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}"); } if(isSearch) {