diff --git a/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme b/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme index b327197..81697e4 100644 --- a/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme +++ b/dde-file-manager-lib/themes/dark/DFileManagerWindow.theme @@ -19,6 +19,7 @@ QPushButton#LogoButton:press{ } QFrame#CentralWidget{ + background-position: right bottom; background-color: transparent; border-top: 1px insert rgba(255, 255, 255, 0.05); } @@ -452,6 +453,7 @@ QPushButton#close:hover{ QScrollArea#ComputerView{ border: none; + background-color: transparent; /*background-color: white;*/ } diff --git a/dde-file-manager-lib/themes/dark/DFileViewRoot.theme b/dde-file-manager-lib/themes/dark/DFileViewRoot.theme index f5b551e..66d8cdc 100644 --- a/dde-file-manager-lib/themes/dark/DFileViewRoot.theme +++ b/dde-file-manager-lib/themes/dark/DFileViewRoot.theme @@ -1,5 +1,6 @@ QListView { background: #202020; + background-color: transparent; border: none; } diff --git a/dde-file-manager-lib/themes/light/DFileManagerWindow.theme b/dde-file-manager-lib/themes/light/DFileManagerWindow.theme index a4d42a1..fb68a0b 100644 --- a/dde-file-manager-lib/themes/light/DFileManagerWindow.theme +++ b/dde-file-manager-lib/themes/light/DFileManagerWindow.theme @@ -6,7 +6,6 @@ QMainWindow{ background-color: white; } - QPushButton#LogoButton{ border: none; image: url(:/images/images/dde-file-manager.png); @@ -19,6 +18,8 @@ QPushButton#LogoButton:press{ } QFrame#CentralWidget{ + background-position: right bottom; + background-color: transparent; border-top: 1px solid rgba(0, 0, 0, 0.1); } @@ -487,7 +488,8 @@ QLineEdit#BookmarkLineEdit{ QScrollArea#ComputerView{ border: none; - background-color: white; + /*background-color: white;*/ + background-color: transparent; } QScrollArea#ComputerView #TitleLabel { diff --git a/dde-file-manager-lib/themes/light/DFileView.theme b/dde-file-manager-lib/themes/light/DFileView.theme index 218ffe5..f2f8ba1 100644 --- a/dde-file-manager-lib/themes/light/DFileView.theme +++ b/dde-file-manager-lib/themes/light/DFileView.theme @@ -1,5 +1,6 @@ QListView { - background: white; + /*background: white;*/ + background: transparent; border: none; } diff --git a/dde-file-manager-lib/views/dfilemanagerwindow.cpp b/dde-file-manager-lib/views/dfilemanagerwindow.cpp index 2701bfb..f193a63 100644 --- a/dde-file-manager-lib/views/dfilemanagerwindow.cpp +++ b/dde-file-manager-lib/views/dfilemanagerwindow.cpp @@ -893,6 +893,8 @@ void DFileManagerWindow::initUI() initCentralWidget(); initTitleBar(); setCentralWidget(d->centralWidget); + + refreshBackgroundPicture(); } void DFileManagerWindow::initTitleFrame() @@ -1197,6 +1199,14 @@ void DFileManagerWindow::setTheme(const QString &theme) } } +void DFileManagerWindow::refreshBackgroundPicture() +{ + QString theme = DThemeManager::instance()->theme(this); + this->setStyleSheet(this->styleSheet() + " QFrame#CentralWidget{" + "background: url(" + QDir::homePath() + "/.config/GXDE/dde-file-manager/background-" + theme + ".png) no-repeat;" + + "background-position: right bottom;}"); +} + void DFileManagerWindow::onThemeChanged() { QString theme = DThemeManager::instance()->theme(this); @@ -1211,6 +1221,7 @@ void DFileManagerWindow::onThemeChanged() } WindowManager::instance()->saveWindowState(this); + refreshBackgroundPicture(); } void DFileManagerWindow::showEvent(QShowEvent *event) diff --git a/dde-file-manager-lib/views/dfilemanagerwindow.h b/dde-file-manager-lib/views/dfilemanagerwindow.h index f8d530d..b1f68ed 100644 --- a/dde-file-manager-lib/views/dfilemanagerwindow.h +++ b/dde-file-manager-lib/views/dfilemanagerwindow.h @@ -181,6 +181,8 @@ public slots: QScopedPointer d_ptr; Q_DECLARE_PRIVATE_D(qGetPtrHelper(d_ptr), DFileManagerWindow) + void refreshBackgroundPicture(); + public: static std::unique_ptr renameBarState;//###: record pattern of RenameBar and the string of QLineEdit's content. static std::atomic flagForNewWindowFromTab; //###: open a new window form a already has tab, this will be true. diff --git a/usb-device-formatter/translations/policy/policy.ts b/usb-device-formatter/translations/policy/policy.ts index 88127fa..807d347 100644 --- a/usb-device-formatter/translations/policy/policy.ts +++ b/usb-device-formatter/translations/policy/policy.ts @@ -5,7 +5,7 @@ policy - Authentication is required to run the USB Device Formatter + Authentication is required to run the Device Formatter