WIP, some refactoring and bug fixing. Move toolkit widget works

src/laybasic/laybasic/layMove.cc

@@ -470,6 +470,7 @@ public:
   {
     lay::EditorOptionsPage *page = lay::EditorOptionsPageFactoryBase::create_page_by_name (move_editor_options_name, view, dispatcher);
     if (page) {
+      page->set_plugin_declaration (this);
       pages.push_back (page);
     }
   }

src/laybasic/laybasic/laybasic.pro

@@ -36,8 +36,6 @@ SOURCES += \
   gsiDeclLayTextInfo.cc \
   gsiDeclLayTlAdded.cc \
   gsiDeclLayRdbAdded.cc \
-  gsiDeclLayConfigPage.cc \
-  gsiDeclLayEditorOptionsPage.cc \
   gsiDeclLayPlugin.cc \
   gsiDeclLayPluginFactory.cc \
   layAbstractMenu.cc \
@@ -95,8 +93,6 @@ SOURCES += \
   layUtils.cc \
 
 HEADERS += \
-  gsiDeclLayConfigPage.h \
-  gsiDeclLayEditorOptionsPage.h \
   gsiDeclLayPlugin.h \
   layEditorOptionsPage.h \
   layEditorUtils.h \

src/layview/layview/gsiDeclLayEditorOptionsPage.cc

@@ -30,7 +30,7 @@
 namespace gsi
 {
 
-Class<lay::EditorOptionsPage> decl_EditorOptionsPageBase (QT_EXTERNAL_BASE (QWidget) "lay", "EditorOptionsPageBase",
+Class<lay::EditorOptionsPageWidget> decl_EditorOptionsPageBase (QT_EXTERNAL_BASE (QWidget) "lay", "EditorOptionsPageBase",
   method ("view", &lay::EditorOptionsPage::view,
     "@brief Gets the view object this page is associated with\n"
   ) +

src/layview/layview/gsiDeclLayEditorOptionsPage.h

@@ -28,14 +28,14 @@
 #include "gsiDecl.h"
 #include "gsiDeclBasic.h"
 
-#include "layEditorOptionsPage.h"
+#include "layEditorOptionsPageWidget.h"
 #include "layLayoutViewBase.h"
 
 namespace gsi
 {
 
 class EditorOptionsPageImpl
-  : public lay::EditorOptionsPage, public gsi::ObjectBase
+  : public lay::EditorOptionsPageWidget, public gsi::ObjectBase
 {
 public:
   EditorOptionsPageImpl (const std::string &title, int index);

src/layview/layview/layEditorOptionsPages.cc

@@ -98,7 +98,8 @@ EditorOptionsPages::editor_options_pages (const lay::PluginDeclaration *plugin_d
 {
   std::vector<lay::EditorOptionsPage *> pages;
   for (auto p = m_pages.begin (); p != m_pages.end (); ++p) {
-    if (p->plugin_declaration () == plugin_declaration) {
+    if (p->plugin_declaration () == plugin_declaration ||
+        (p->plugin_declaration () == 0 && plugin_declaration->enable_catchall_editor_options_pages ())) {
       pages.push_back (const_cast<lay::EditorOptionsPage *> (p.operator-> ()));
     }
   }

src/layview/layview/layview.pro

@@ -9,6 +9,8 @@ DEFINES += MAKE_LAYVIEW_LIBRARY
 RESOURCES = \
 
 SOURCES = \
+  gsiDeclLayEditorOptionsPage.cc \
+  gsiDeclLayConfigPage.cc \
   layEditorOptionsPageWidget.cc \
   layGridNet.cc \
   layEditorOptionsFrame.cc \
@@ -18,6 +20,8 @@ SOURCES = \
   gsiDeclLayAdditional.cc \
 
 HEADERS = \
+  gsiDeclLayEditorOptionsPage.h \
+  gsiDeclLayConfigPage.h \
   layEditorOptionsPageWidget.h \
   layGridNet.h \
   layEditorOptionsFrame.h \