From a61baf0594f1f85cfce62c5ba511518698ffca03 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 15 Oct 2024 14:06:09 +0200 Subject: [PATCH] Core: Use ModuleIO in RecentFilesAction & RecentMacrosAction --- src/Gui/Action.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index 4665f3160e..537ab7891e 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -28,8 +28,8 @@ # include # include # include +# include # include -# include # include # include # include @@ -50,8 +50,8 @@ #include "PreferencePages/DlgSettingsWorkbenchesImp.h" #include "Document.h" #include "EditorView.h" -#include "FileDialog.h" #include "Macro.h" +#include "ModuleIO.h" #include "MainWindow.h" #include "PythonEditor.h" #include "WhatsThis.h" @@ -902,20 +902,13 @@ void RecentFilesAction::activateFile(int id) } QString filename = files[id]; - QFileInfo fi(filename); - if (!fi.exists() || !fi.isFile()) { - QMessageBox::critical(getMainWindow(), tr("File not found"), tr("The file '%1' cannot be opened.").arg(filename)); + if (!ModuleIO::verifyFile(filename)) { files.removeAll(filename); setFiles(files); save(); } else { - // invokes appendFile() - SelectModule::Dict dict = SelectModule::importHandler(filename); - for (SelectModule::Dict::iterator it = dict.begin(); it != dict.end(); ++it) { - Application::Instance->open(it.key().toUtf8(), it.value().toLatin1()); - break; - } + ModuleIO::openFile(filename); } } @@ -1102,8 +1095,7 @@ void RecentMacrosAction::activateFile(int id) QString filename = files[id]; QFileInfo fi(filename); - if (!fi.exists() || !fi.isFile()) { - QMessageBox::critical(getMainWindow(), tr("File not found"), tr("The file '%1' cannot be opened.").arg(filename)); + if (!ModuleIO::verifyFile(filename)) { files.removeAll(filename); setFiles(files); }