From d006063aab2c260aa173c8e41e887dbd98a1d099 Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 28 Nov 2024 17:59:34 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A7=E4=BB=B6=E9=85=8D=E8=89=B2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b0dee33aabd8dbf0bb4628875b68a53d1b960c5c. --- .../themes/dark/DFileManagerWindow.theme | 6 ++--- .../themes/dark/DStatusBar.theme | 4 ++-- dde-file-manager-lib/themes/dark/config.ini | 2 +- .../themes/light/DFileManagerWindow.theme | 2 +- .../themes/light/DFileView.theme | 2 +- .../themes/light/DStatusBar.theme | 4 ++-- dde-file-manager-lib/themes/light/config.ini | 4 ++-- .../views/dfilemanagerwindow.cpp | 6 ----- .../views/dfilemanagerwindowbackground.cpp | 22 +------------------ 9 files changed, 13 insertions(+), 39 deletions(-) diff --git a/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme b/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme index 1870c54..9f038f3 100644 --- a/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme +++ b/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme @@ -458,7 +458,7 @@ QScrollArea#ComputerView{ } QScrollArea#ComputerView #TitleLabel { - color: #67bdbdbd; + color: #bdbdbd; } QScrollArea#ComputerView #LineLabel { @@ -466,11 +466,11 @@ QScrollArea#ComputerView #LineLabel { } QScrollArea#ComputerView #DiskSize { - color: #67616161; + color: #616161; } QScrollArea#ComputerView ComputerViewItem QTextEdit { - color: #67bdbdbd; + color: #bdbdbd; } /*TabBar*/ diff --git a/dde-file-manager-lib/themes/dark/DStatusBar.theme b/dde-file-manager-lib/themes/dark/DStatusBar.theme index 1a2f9ca..6938c62 100644 --- a/dde-file-manager-lib/themes/dark/DStatusBar.theme +++ b/dde-file-manager-lib/themes/dark/DStatusBar.theme @@ -1,6 +1,6 @@ DStatusBar { - color: "#67bdbdbd"; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #171717, stop: 0.98 #671d1d1d); + color: "#bdbdbd"; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #171717, stop: 0.98 #1d1d1d); border-top: 1px solid rgba(255, 255, 255, 0.1); } diff --git a/dde-file-manager-lib/themes/dark/config.ini b/dde-file-manager-lib/themes/dark/config.ini index 6350ded..58ed8b9 100644 --- a/dde-file-manager-lib/themes/dark/config.ini +++ b/dde-file-manager-lib/themes/dark/config.ini @@ -346,7 +346,7 @@ color=#70ffffff color=white [Tab] -background=#671c1c1c +background=#1c1c1c color=#949494 border=#0d000000 [Tab:hover] diff --git a/dde-file-manager-lib/themes/light/DFileManagerWindow.theme b/dde-file-manager-lib/themes/light/DFileManagerWindow.theme index 05d067a..2b0cd29 100644 --- a/dde-file-manager-lib/themes/light/DFileManagerWindow.theme +++ b/dde-file-manager-lib/themes/light/DFileManagerWindow.theme @@ -501,7 +501,7 @@ QScrollArea#ComputerView #LineLabel { } QScrollArea#ComputerView #DiskSize { - color: #67a2a2a2; + color: #a2a2a2; } /*TabBar*/ diff --git a/dde-file-manager-lib/themes/light/DFileView.theme b/dde-file-manager-lib/themes/light/DFileView.theme index da69887..f2f8ba1 100644 --- a/dde-file-manager-lib/themes/light/DFileView.theme +++ b/dde-file-manager-lib/themes/light/DFileView.theme @@ -55,7 +55,7 @@ QListView::item:hover { QHeaderView { background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #f8f8f8, stop:1 rgba(255, 255, 255, 0.1)); + stop:0 #f8f8f8, stop:1 rgba(255, 255, 255, 0.8)); border-bottom: 1px solid rgba(0, 0, 0, 0.1); max-height: 21px; } diff --git a/dde-file-manager-lib/themes/light/DStatusBar.theme b/dde-file-manager-lib/themes/light/DStatusBar.theme index f557a3b..cde7506 100644 --- a/dde-file-manager-lib/themes/light/DStatusBar.theme +++ b/dde-file-manager-lib/themes/light/DStatusBar.theme @@ -1,6 +1,6 @@ DStatusBar { - color: "#67797979"; - background-color: "#67ffffff"; + color: "#797979"; + background-color: white; } DStatusBar QLabel { diff --git a/dde-file-manager-lib/themes/light/config.ini b/dde-file-manager-lib/themes/light/config.ini index 7fc4ade..404db46 100644 --- a/dde-file-manager-lib/themes/light/config.ini +++ b/dde-file-manager-lib/themes/light/config.ini @@ -339,12 +339,12 @@ background=#da0076F9 color=#797979 [FileView:inactive] background=#BFE4FC -color=#70797979 +color=#797979 [FileView:inactive.checked] color=#e9e9e9 [Tab] -background=#67fafafa +background=#fafafa color=#949494 border=#21000000 [Tab:hover] diff --git a/dde-file-manager-lib/views/dfilemanagerwindow.cpp b/dde-file-manager-lib/views/dfilemanagerwindow.cpp index 7013db3..5b27163 100644 --- a/dde-file-manager-lib/views/dfilemanagerwindow.cpp +++ b/dde-file-manager-lib/views/dfilemanagerwindow.cpp @@ -88,7 +88,6 @@ DWIDGET_USE_NAMESPACE const QColor DARK_TOP_BORDERCOLOR = QColor(255, 255, 255, 13); -const QColor LIGHT_TOP_BORDERCOLOR = QColor(0, 0, 0, 13); std::unique_ptr DFileManagerWindow::renameBarState{ nullptr }; std::atomic DFileManagerWindow::flagForNewWindowFromTab{ false }; @@ -951,11 +950,6 @@ void DFileManagerWindow::initTitleBar() palette.setColor(QPalette::Window, DARK_TOP_BORDERCOLOR); d->toolbar->setPalette(palette); } - else { - QPalette palette; - palette.setColor(QPalette::Window, LIGHT_TOP_BORDERCOLOR); - d->toolbar->setPalette(palette); - } connect(set_theme_action, &QAction::triggered, this, &DFileManagerWindow::onThemeChanged); } diff --git a/dde-file-manager-lib/views/dfilemanagerwindowbackground.cpp b/dde-file-manager-lib/views/dfilemanagerwindowbackground.cpp index 2d79869..7ce2a5a 100644 --- a/dde-file-manager-lib/views/dfilemanagerwindowbackground.cpp +++ b/dde-file-manager-lib/views/dfilemanagerwindowbackground.cpp @@ -14,8 +14,6 @@ DFileManagerWindowBackground::DFileManagerWindowBackground(DMainWindow *window) void DFileManagerWindowBackground::drawInWidget(QPainter *painter) { - QString theme = DThemeManager::instance()->theme(m_dmainWindow); - QList list = { BackgroundPlace::FullWindow, BackgroundPlace::Center, @@ -32,27 +30,9 @@ void DFileManagerWindowBackground::drawInWidget(QPainter *painter) QList xy = getImageXY(DFileManagerWindowBackground::BackgroundPlace(i)); int x = xy[0]; int y = xy[1]; + qDebug() << i << x << y; painter->drawImage(x, y, getImage(DFileManagerWindowBackground::BackgroundPlace(i))); } - //// 绘制半透明图层 - // 备份原来的 QPen 和 QBrush - QPen oldPen = painter->pen(); - QBrush oldBrush = painter->brush(); - if (theme == "dark") { - painter->setPen(QPen(QColor("#99252525"))); - painter->setBrush(QBrush(QColor("#99252525"))); - } - else { - painter->setPen(QPen(QColor("#99ffffff"))); - painter->setBrush(QBrush(QColor("#99ffffff"))); - } - int windowWidth = m_dmainWindow->size().width(); - int windowHeight = m_dmainWindow->size().height(); - painter->drawRect(0, 0, windowWidth, windowHeight); - // 还原原来的 QPen 和 QBrush - painter->setPen(oldPen); - painter->setBrush(oldBrush); - } void DFileManagerWindowBackground::setMainWindow(DMainWindow *window) -- Gitee From 34b3748902745ae62b96c1dde512362295222cd3 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 30 Nov 2024 01:58:18 +0800 Subject: [PATCH 2/2] bump version to 1.1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 91e9eba..674447a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dde-file-manager (4.8.27-1) UNRELEASED; urgency=medium +dde-file-manager (4.8.27-1.1) UNRELEASED; urgency=medium [ shenmo ] * 去除桌面右键全选功能 -- Gitee