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); }