From 091f723a7c51117383b10ec27b41771688f3ce58 Mon Sep 17 00:00:00 2001 From: "max.lv" Date: Wed, 29 Nov 2023 14:34:58 +0800 Subject: [PATCH 1/2] fix: to support network\tags\trash\recent sessions save the url all info to localfile Log: to support network\tags\trash\recent sessions Bug: https://pms.uniontech.com/bug-view-230695.html --- src/apps/dde-file-manager/commandparser.cpp | 2 +- src/apps/dde-file-manager/sessionloader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/dde-file-manager/commandparser.cpp b/src/apps/dde-file-manager/commandparser.cpp index b7ae1021cf..d7a3c1baf7 100644 --- a/src/apps/dde-file-manager/commandparser.cpp +++ b/src/apps/dde-file-manager/commandparser.cpp @@ -327,7 +327,7 @@ void CommandParser::openSession() QString sessionFile = ""; if (!SessionBusiness::instance()->readPath(filename, &sessionFile)) qCWarning(logAppFileManager) << "no session path get"; - openWindowWithUrl(QUrl::fromLocalFile(sessionFile)); + openWindowWithUrl(QUrl(sessionFile)); break; // current time only support one file. } } diff --git a/src/apps/dde-file-manager/sessionloader.cpp b/src/apps/dde-file-manager/sessionloader.cpp index 4697456422..27740c6263 100755 --- a/src/apps/dde-file-manager/sessionloader.cpp +++ b/src/apps/dde-file-manager/sessionloader.cpp @@ -160,5 +160,5 @@ void SessionBusiness::onCurrentUrlChanged(quint64 windId, const QUrl &url) auto window = FMWindowsIns.findWindowById(windId); Q_ASSERT_X(window, "WindowMonitor", "Cannot find window by id"); - savePath(window->winId(), url.toLocalFile()); + savePath(window->winId(), url.toString()); } From 2a4e0715afb306ef88e6b33d14142432e9a00f06 Mon Sep 17 00:00:00 2001 From: "max.lv" Date: Wed, 29 Nov 2023 14:47:57 +0800 Subject: [PATCH 2/2] chore: update the baseline version to 6.0.37 update the baseline version to 6.0.37 Log: update the baseline version to 6.0.37 Bug: no --- debian/changelog | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80c13a3f46..810df5538e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +dde-file-manager (6.0.37) unstable; urgency=medium + + * update file manager baseline version to V6.0.37 + + -- lvwujun Wed, 29 Nov 2023 14:42:33 +0800 + dde-file-manager (6.0.36) unstable; urgency=medium * update file manager baseline version to V6.0.36 - -- lvwujun Thur, 22 Nov 2023 15:47:21 +0800 + -- lvwujun Wed, 22 Nov 2023 15:47:21 +0800 dde-file-manager (6.0.35) unstable; urgency=medium @@ -22,7 +28,7 @@ dde-file-manager (6.0.33) unstable; urgency=medium * update file manager baseline version to V6.0.33 - -- lvwujun Thur, 2 Nov 2023 11:07:21 +0800 + -- lvwujun Thu, 2 Nov 2023 11:07:21 +0800 dde-file-manager (6.0.31) unstable; urgency=medium @@ -58,7 +64,7 @@ dde-file-manager (6.0.26) unstable; urgency=medium * update file manager baseline version to V6.0.26 that merged eagle-sp5-2 - -- lvwujun Thur, 3 Aug 2023 11:08:21 +0800 + -- lvwujun Thu, 3 Aug 2023 11:08:21 +0800 dde-file-manager (6.0.25) unstable; urgency=medium @@ -100,7 +106,7 @@ dde-file-manager (6.0.19) unstable; urgency=medium * update file manager V6.0.19 baseline version - -- lvwujun Thur, 31 May 2023 15:13:07 +0800 + -- lvwujun Thu, 31 May 2023 15:13:07 +0800 dde-file-manager (6.0.18) unstable; urgency=medium @@ -134,7 +140,7 @@ dde-file-manager (6.0.12) unstable; urgency=medium * update file manager V6.0.12 baseline version - -- lvwujun Thur, 23 Mar 2023 15:36:29 +0800 + -- lvwujun Thu, 23 Mar 2023 15:36:29 +0800 dde-file-manager (6.0.9) unstable; urgency=medium