From 0b3a7b18f22bbdeb270fb7c092861e07513e9ffa Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 23 Sep 2024 01:01:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=9E=E6=94=B6=E7=AB=99=E7=93=A2?= =?UTF-8?q?=E4=BA=86=20adjust:=20=E9=BB=98=E8=AE=A4=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dde-desktop/config/config.cpp | 6 +++--- .../configure/dde-file-manager.default.json | 3 ++- dde-file-manager-lib/dialogs/basedialog.cpp | 2 +- dde-file-manager-lib/dialogs/trashpropertydialog.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dde-desktop/config/config.cpp b/dde-desktop/config/config.cpp index e180096..9f277d6 100644 --- a/dde-desktop/config/config.cpp +++ b/dde-desktop/config/config.cpp @@ -32,9 +32,9 @@ Config::Config() { auto configPath = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first(); configPath = configPath - + "/" + QApplication::organizationName() - + "/" + QApplication::applicationName() - + "/" + QApplication::applicationName() + ".conf"; + + "/" + QApplication::organizationName() + + "/" + QApplication::applicationName() + + "/" + QApplication::applicationName() + ".conf"; qDebug() << configPath; diff --git a/dde-file-manager-lib/configure/dde-file-manager.default.json b/dde-file-manager-lib/configure/dde-file-manager.default.json index 3fb9c54..694b64e 100644 --- a/dde-file-manager-lib/configure/dde-file-manager.default.json +++ b/dde-file-manager-lib/configure/dde-file-manager.default.json @@ -27,7 +27,8 @@ "ShowRecentFileEntry": true, "ShowedFileSuffixOnRename": true, "DisableNonRemovableDeviceUnmount": false, - "HiddenSystemPartition": false + "HiddenSystemPartition": false, + "ShowCsdCrumbBarClickableArea":true }, "AnythingMonitorFilterPath": { "WhiteList":[ diff --git a/dde-file-manager-lib/dialogs/basedialog.cpp b/dde-file-manager-lib/dialogs/basedialog.cpp index f84f650..1fe80f1 100644 --- a/dde-file-manager-lib/dialogs/basedialog.cpp +++ b/dde-file-manager-lib/dialogs/basedialog.cpp @@ -37,7 +37,7 @@ BaseDialog::BaseDialog(QWidget *parent) : DAbstractDialog(parent) { m_titlebar = new DTitlebar(this); m_titlebar->setBackgroundTransparent(true); -// m_titlebar->setWindowFlags(Qt::WindowCloseButtonHint | Qt::WindowTitleHint); + //m_titlebar->setWindowFlags(Qt::WindowCloseButtonHint | Qt::WindowTitleHint); } BaseDialog::~BaseDialog() diff --git a/dde-file-manager-lib/dialogs/trashpropertydialog.cpp b/dde-file-manager-lib/dialogs/trashpropertydialog.cpp index 242982d..0394e58 100644 --- a/dde-file-manager-lib/dialogs/trashpropertydialog.cpp +++ b/dde-file-manager-lib/dialogs/trashpropertydialog.cpp @@ -93,7 +93,7 @@ void TrashPropertyDialog::initUI() mainLayout->setContentsMargins(10, 10, 10, 10); contenFrame->setLayout(mainLayout); - addContent(contenFrame); + addContent(contenFrame,Qt::AlignCenter); startComputerFolderSize(m_url); }