[education/rkward] rkward: Merge branch 'work/rework_startpage'

[Thomas Friedrichsmeier]

Git commit ac42f4fc471c00194c456a60ae237a8fb234b68d by Thomas Friedrichsmeier.
Committed on 20/04/2022 at 13:02.
Pushed by tfry into branch 'master'.

Merge branch 'work/rework_startpage'

M  +30   -52   rkward/rkward.cpp

https://invent.kde.org/education/rkward/commit/ac42f4fc471c00194c456a60ae237a8fb234b68d

diff --cc rkward/rkward.cpp
index 2ab8982e,4e4d2bc1..7b79269b
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@@ -832,11 -833,10 +833,10 @@@ void RKWardMainWindow::askOpenWorkspac
  	slotSetStatusBarText(i18n("Opening workspace..."));
  	QUrl lurl = url;
  	if (lurl.isEmpty ()) {
- 		lurl = QFileDialog::getOpenFileUrl(this, i18n("Select workspace to open..."), RKSettingsModuleGeneral::lastUsedUrlFor("workspaces"), i18n("R Workspace Files [%1](%1);;All files [*](*)", RKSettingsModuleGeneral::workspaceFilenameFilter()));
+ 		lurl = QFileDialog::getOpenFileUrl(this, i18n("Select workspace to open..."), RKRecentUrls::mostRecentUrl(RKRecentUrls::workspaceId()).adjusted(QUrl::RemoveFilename), i18n("R Workspace Files [%1](%1);;All files [*](*)", RKSettingsModuleGeneral::workspaceFilenameFilter()));
  	}
  	if (!lurl.isEmpty ()) {
- 		RKSettingsModuleGeneral::updateLastUsedUrl("workspaces", lurl.adjusted(QUrl::RemoveFilename));
 -		new RKLoadAgent (lurl, merge_loads);
 +		new RKLoadAgent(lurl, merge_loads);
  	}
  	slotSetStatusReady();
  }