From 3bd3f20e320575eb76ddc3d763fd9155383b093a Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 19 Nov 2021 12:51:13 +0100 Subject: [PATCH] Gui: [skip ci] add sub-classes of the MDIView to the type system --- src/Gui/Application.cpp | 3 +++ src/Gui/EditorView.cpp | 4 ++++ src/Gui/EditorView.h | 4 ++++ src/Mod/Image/Gui/AppImageGui.cpp | 2 ++ src/Mod/Image/Gui/ImageView.cpp | 2 ++ src/Mod/Image/Gui/ImageView.h | 2 ++ src/Mod/Web/Gui/AppWebGui.cpp | 1 + src/Mod/Web/Gui/BrowserView.cpp | 2 ++ src/Mod/Web/Gui/BrowserView.h | 4 +++- 9 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 7e197b646c..94e2cb47e4 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -99,6 +99,7 @@ #include "ExpressionBindingPy.h" #include "ViewProviderLinkPy.h" +#include "EditorView.h" #include "TextDocumentEditorView.h" #include "SplitView3DInventor.h" #include "View3DInventor.h" @@ -1782,6 +1783,8 @@ void Application::initTypes(void) Gui::AbstractSplitView ::init(); Gui::SplitView3DInventor ::init(); Gui::TextDocumentEditorView ::init(); + Gui::EditorView ::init(); + Gui::PythonEditorView ::init(); // View Provider Gui::ViewProvider ::init(); Gui::ViewProviderExtension ::init(); diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 196a077085..1ad2f0c972 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -83,6 +83,8 @@ public: /* TRANSLATOR Gui::EditorView */ +TYPESYSTEM_SOURCE_ABSTRACT(Gui::EditorView, Gui::MDIView) + /** * Constructs a EditorView which is a child of 'parent', with the * name 'name'. @@ -586,6 +588,8 @@ void EditorView::focusInEvent (QFocusEvent *) // --------------------------------------------------------- +TYPESYSTEM_SOURCE_ABSTRACT(Gui::PythonEditorView, Gui::EditorView) + PythonEditorView::PythonEditorView(PythonEditor* editor, QWidget* parent) : EditorView(editor, parent), _pye(editor) { diff --git a/src/Gui/EditorView.h b/src/Gui/EditorView.h index 80882adb41..cc249fe2aa 100644 --- a/src/Gui/EditorView.h +++ b/src/Gui/EditorView.h @@ -49,6 +49,8 @@ class GuiExport EditorView : public MDIView, public WindowParameter { Q_OBJECT + TYPESYSTEM_HEADER(); + public: enum DisplayName { FullName, @@ -118,6 +120,8 @@ class GuiExport PythonEditorView : public EditorView { Q_OBJECT + TYPESYSTEM_HEADER(); + public: PythonEditorView(PythonEditor* editor, QWidget* parent); ~PythonEditorView(); diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp index 3c4050a813..5c1300a167 100644 --- a/src/Mod/Image/Gui/AppImageGui.cpp +++ b/src/Mod/Image/Gui/AppImageGui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include "ImageView.h" #include "Workbench.h" #include "ViewProviderImagePlane.h" @@ -50,6 +51,7 @@ PyMOD_INIT_FUNC(ImageGui) // instantiating the commands CreateImageCommands(); + ImageGui::ImageView::init(); ImageGui::ViewProviderImagePlane::init(); ImageGui::Workbench::init(); diff --git a/src/Mod/Image/Gui/ImageView.cpp b/src/Mod/Image/Gui/ImageView.cpp index 36e7d5dc81..e1345c64df 100644 --- a/src/Mod/Image/Gui/ImageView.cpp +++ b/src/Mod/Image/Gui/ImageView.cpp @@ -36,6 +36,8 @@ using namespace ImageGui; /* TRANSLATOR ImageGui::ImageView */ +TYPESYSTEM_SOURCE_ABSTRACT(ImageGui::ImageView, Gui::MDIView) + ImageView::ImageView(QWidget* parent) : MDIView(0, parent), _ignoreCloseEvent(false) { diff --git a/src/Mod/Image/Gui/ImageView.h b/src/Mod/Image/Gui/ImageView.h index 7bc34f8e21..ef14bebd75 100644 --- a/src/Mod/Image/Gui/ImageView.h +++ b/src/Mod/Image/Gui/ImageView.h @@ -40,6 +40,8 @@ class ImageGuiExport ImageView : public Gui::MDIView { Q_OBJECT + TYPESYSTEM_HEADER(); + public: ImageView(QWidget* parent); virtual ~ImageView(); diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index a82508b93d..f48928d97a 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -170,6 +170,7 @@ PyMOD_INIT_FUNC(WebGui) // instantiating the commands CreateWebCommands(); + WebGui::BrowserView::init(); WebGui::Workbench::init(); // add resources and reloads the translators diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 3914e06ffd..6e67d5b421 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -359,6 +359,8 @@ void WebView::triggerContextMenuAction(int id) /* TRANSLATOR Gui::BrowserView */ +TYPESYSTEM_SOURCE_ABSTRACT(WebGui::BrowserView, Gui::MDIView) + /** * Constructs a BrowserView which is a child of 'parent', with the * name 'name'. diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index 6123460479..9ce249eddf 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -33,7 +33,7 @@ #include namespace WebGui { class WebEngineUrlRequestInterceptor; -}; +} #elif defined(QTWEBKIT) #include #endif @@ -79,6 +79,8 @@ class WebGuiExport BrowserView : public Gui::MDIView, { Q_OBJECT + TYPESYSTEM_HEADER(); + public: BrowserView(QWidget* parent); ~BrowserView();