Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix one session bug and update the version to 6.0.37 #1598

Merged
merged 2 commits into from
Nov 29, 2023
Merged

fix one session bug and update the version to 6.0.37 #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
091f723
fix: to support network\tags\trash\recent sessions
max-lvs Nov 29, 2023
2a4e071
chore: update the baseline version to 6.0.37
max-lvs Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
dde-file-manager (6.0.37) unstable; urgency=medium

* update file manager baseline version to V6.0.37

-- lvwujun <[email protected]> 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 <[email protected]> Thur, 22 Nov 2023 15:47:21 +0800
-- lvwujun <[email protected]> Wed, 22 Nov 2023 15:47:21 +0800

dde-file-manager (6.0.35) unstable; urgency=medium

Expand All @@ -22,7 +28,7 @@ dde-file-manager (6.0.33) unstable; urgency=medium

* update file manager baseline version to V6.0.33

-- lvwujun <[email protected]> Thur, 2 Nov 2023 11:07:21 +0800
-- lvwujun <[email protected]> Thu, 2 Nov 2023 11:07:21 +0800

dde-file-manager (6.0.31) unstable; urgency=medium

Expand Down Expand Up @@ -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 <[email protected]> Thur, 3 Aug 2023 11:08:21 +0800
-- lvwujun <[email protected]> Thu, 3 Aug 2023 11:08:21 +0800

dde-file-manager (6.0.25) unstable; urgency=medium

Expand Down Expand Up @@ -100,7 +106,7 @@ dde-file-manager (6.0.19) unstable; urgency=medium

* update file manager V6.0.19 baseline version

-- lvwujun <[email protected]> Thur, 31 May 2023 15:13:07 +0800
-- lvwujun <[email protected]> Thu, 31 May 2023 15:13:07 +0800

dde-file-manager (6.0.18) unstable; urgency=medium

Expand Down Expand Up @@ -134,7 +140,7 @@ dde-file-manager (6.0.12) unstable; urgency=medium

* update file manager V6.0.12 baseline version

-- lvwujun <[email protected]> Thur, 23 Mar 2023 15:36:29 +0800
-- lvwujun <[email protected]> Thu, 23 Mar 2023 15:36:29 +0800

dde-file-manager (6.0.9) unstable; urgency=medium

Expand Down
2 changes: 1 addition & 1 deletion src/apps/dde-file-manager/commandparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/apps/dde-file-manager/sessionloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Loading