From cca73a8ebbf73fd6e86deace6ee9406d009305b7 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Wed, 14 Jan 2026 00:27:53 +0100
Subject: [PATCH] WIP, some refactoring and bug fixing. Move toolkit widget
 works

---
 src/laybasic/laybasic/layMove.cc                              | 1 +
 src/laybasic/laybasic/laybasic.pro                            | 4 ----
 .../laybasic => layview/layview}/gsiDeclLayConfigPage.cc      | 0
 .../laybasic => layview/layview}/gsiDeclLayConfigPage.h       | 0
 .../layview}/gsiDeclLayEditorOptionsPage.cc                   | 2 +-
 .../layview}/gsiDeclLayEditorOptionsPage.h                    | 4 ++--
 src/layview/layview/layEditorOptionsPages.cc                  | 3 ++-
 src/layview/layview/layview.pro                               | 4 ++++
 8 files changed, 10 insertions(+), 8 deletions(-)
 rename src/{laybasic/laybasic => layview/layview}/gsiDeclLayConfigPage.cc (100%)
 rename src/{laybasic/laybasic => layview/layview}/gsiDeclLayConfigPage.h (100%)
 rename src/{laybasic/laybasic => layview/layview}/gsiDeclLayEditorOptionsPage.cc (98%)
 rename src/{laybasic/laybasic => layview/layview}/gsiDeclLayEditorOptionsPage.h (94%)

diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc
index 56087a660..5b759162c 100644
--- a/src/laybasic/laybasic/layMove.cc
+++ b/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);
     }
   }
diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro
index 85c921ff0..7a870fa69 100644
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/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 \
diff --git a/src/laybasic/laybasic/gsiDeclLayConfigPage.cc b/src/layview/layview/gsiDeclLayConfigPage.cc
similarity index 100%
rename from src/laybasic/laybasic/gsiDeclLayConfigPage.cc
rename to src/layview/layview/gsiDeclLayConfigPage.cc
diff --git a/src/laybasic/laybasic/gsiDeclLayConfigPage.h b/src/layview/layview/gsiDeclLayConfigPage.h
similarity index 100%
rename from src/laybasic/laybasic/gsiDeclLayConfigPage.h
rename to src/layview/layview/gsiDeclLayConfigPage.h
diff --git a/src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.cc b/src/layview/layview/gsiDeclLayEditorOptionsPage.cc
similarity index 98%
rename from src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.cc
rename to src/layview/layview/gsiDeclLayEditorOptionsPage.cc
index de8619a37..112bb5444 100644
--- a/src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.cc
+++ b/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"
   ) +
diff --git a/src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.h b/src/layview/layview/gsiDeclLayEditorOptionsPage.h
similarity index 94%
rename from src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.h
rename to src/layview/layview/gsiDeclLayEditorOptionsPage.h
index 8a8ee1b84..972e27070 100644
--- a/src/laybasic/laybasic/gsiDeclLayEditorOptionsPage.h
+++ b/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);
diff --git a/src/layview/layview/layEditorOptionsPages.cc b/src/layview/layview/layEditorOptionsPages.cc
index 4c33c1c83..48eca6d81 100644
--- a/src/layview/layview/layEditorOptionsPages.cc
+++ b/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-> ()));
     }
   }
diff --git a/src/layview/layview/layview.pro b/src/layview/layview/layview.pro
index 3d20f19e6..0a450c59c 100644
--- a/src/layview/layview/layview.pro
+++ b/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 \