Merge branch 'app-refactoring' into doc-args

src/plugins/streamers/cif/unit_tests/dbCIFReader.cc

@@ -54,7 +54,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char *
   db::LoadLayoutOptions options;
   options.set_options (opt);
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m), layout2 (&m), layout2_cif (&m), layout_au (&m);
 
   {

src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc

@@ -222,7 +222,7 @@ TEST(1)
 {
   tl::InputMemoryStream im ((const char *) data, sizeof (data));
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
   tl::InputStream file (im);
   db::Reader reader (file);
@@ -264,7 +264,7 @@ TEST(2)
 {
   tl::InputMemoryStream im ((const char *) data, sizeof (data));
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   db::LayerMap map_full;
@@ -351,7 +351,7 @@ TEST(2)
 
 TEST(Bug_121_1)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {
@@ -372,7 +372,7 @@ TEST(Bug_121_1)
 
 TEST(Bug_121_2)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {

src/plugins/streamers/gds2/unit_tests/dbGDS2Writer.cc

@@ -33,7 +33,7 @@
 
 void run_test (tl::TestBase *_this, const char *file, const char *file_ref, bool priv = false, const db::GDS2WriterOptions &opt = db::GDS2WriterOptions ())
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout_org (&m);
   {
     std::string fn (priv ? tl::testsrc_private () : tl::testsrc ());
@@ -85,7 +85,7 @@ TEST(1)
 
 TEST(2)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout_org (&m);
 
   db::cell_index_type cid = layout_org.add_cell ("TOP");
@@ -131,7 +131,7 @@ TEST(2)
 // Test the writer's capabilities to cut a polygon into small pieces correctly
 TEST(3)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout_org (&m);
   {
     std::string fn (tl::testsrc ());
@@ -190,7 +190,7 @@ TEST(4)
 {
   db::ShapeProcessor sp;
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout_org (&m);
   {
     std::string fn (tl::testsrc ());
@@ -247,7 +247,7 @@ TEST(4)
 
 TEST(100)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -329,7 +329,7 @@ TEST(100)
 
 TEST(101)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -401,7 +401,7 @@ TEST(101)
 
 TEST(102)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -481,7 +481,7 @@ TEST(102)
 
 TEST(103)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -554,7 +554,7 @@ TEST(103)
 
 TEST(110)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -630,7 +630,7 @@ TEST(110)
 
 TEST(111)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -703,7 +703,7 @@ TEST(111)
 
 TEST(112)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -780,7 +780,7 @@ TEST(112)
 
 TEST(113)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -856,7 +856,7 @@ TEST(114)
 {
   // text alignment flags, font and text size
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -946,7 +946,7 @@ TEST(115)
 {
   //  polygons and boxes without area
   
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;
@@ -1012,7 +1012,7 @@ TEST(116)
 {
   //  big paths with multi-xy
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;
@@ -1073,7 +1073,7 @@ TEST(117)
 {
   //  big polygons with multi-xy
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;

src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc

@@ -69,8 +69,8 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("db::import_lef", "import_lef:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("LEF"))));
-    menu_entries.push_back (lay::MenuEntry ("db::import_def", "import_def:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("DEF/LEF"))));
+    menu_entries.push_back (lay::menu_item ("db::import_lef", "import_lef:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("LEF"))));
+    menu_entries.push_back (lay::menu_item ("db::import_def", "import_def:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("DEF/LEF"))));
   }
 
   virtual bool configure (const std::string &name, const std::string &value)
@@ -115,7 +115,7 @@ public:
         lay::MainWindow::instance ()->cancel ();
 
         //  store configuration
-        lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+        lay::Dispatcher *config_root = lay::Dispatcher::instance ();
         if (import_lef) {
           config_root->config_set (cfg_lef_import_spec, data.to_string ());
         } else {

src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImport.cc

@@ -53,7 +53,7 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file
 {
   db::LEFDEFLayerDelegate ld (&tc);
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m), layout2 (&m), layout_au (&m);
 
   tl::Extractor ex (filename);

src/plugins/streamers/magic/unit_tests/dbMAGReader.cc

@@ -57,7 +57,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char *
   db::LoadLayoutOptions options;
   options.set_options (opt);
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m), layout2 (&m), layout2_mag (&m), layout_au (&m);
 
   {

src/plugins/streamers/oasis/unit_tests/dbOASISReader.cc

@@ -81,7 +81,7 @@ compare_ref (tl::TestBase *_this, const char *test, const db::Layout &layout)
 void
 run_test (tl::TestBase *_this, const char *test)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
   std::string fn (tl::testsrc ());
   fn += "/testdata/oasis/t";
@@ -106,7 +106,7 @@ run_test (tl::TestBase *_this, const char *test)
 void
 run_test_error (tl::TestBase *_this, const char *test, const char *msg_au)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
   std::string fn (tl::testsrc ());
   fn += "/testdata/oasis/t";
@@ -435,7 +435,7 @@ TEST(99)
     "end_lib\n"
   ;
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {
@@ -518,7 +518,7 @@ TEST(100)
     "end_lib\n"
   ;
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {
@@ -540,7 +540,7 @@ TEST(100)
 
 TEST(Bug_121_1)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {
@@ -561,7 +561,7 @@ TEST(Bug_121_1)
 
 TEST(Bug_121_2)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout (&m);
 
   {

src/plugins/streamers/oasis/unit_tests/dbOASISWriter.cc

@@ -36,7 +36,7 @@
 void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int compr, bool recompress)
 {
   {
-    db::Manager m;
+    db::Manager m (false);
     db::Layout layout_org (&m);
     std::string fn (tl::testsrc ());
     fn += "/testdata/oasis/";
@@ -81,7 +81,7 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com
   }
 
   {
-    db::Manager m;
+    db::Manager m (false);
     db::Layout layout_org (&m);
     std::string fn (tl::testsrc ());
     fn += "/testdata/oasis/";
@@ -137,7 +137,7 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com
   }
 
   {
-    db::Manager m;
+    db::Manager m (false);
     db::Layout layout_org (&m);
     std::string fn (tl::testsrc ());
     fn += "/testdata/oasis/";
@@ -186,7 +186,7 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com
   }
 
   {
-    db::Manager m;
+    db::Manager m (false);
     db::Layout layout_org (&m);
     std::string fn (tl::testsrc ());
     fn += "/testdata/oasis/";
@@ -237,7 +237,7 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com
 
   if (scaling_test) {
 
-    db::Manager m;
+    db::Manager m (false);
     db::Layout layout (&m);
     std::string fn (tl::testsrc ());
     fn += "/testdata/oasis/";
@@ -513,7 +513,7 @@ TEST(40)
 
 TEST(100)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -596,7 +596,7 @@ TEST(100)
 
 TEST(101)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -669,7 +669,7 @@ TEST(101)
 
 TEST(102)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -750,7 +750,7 @@ TEST(102)
 
 TEST(103)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -824,7 +824,7 @@ TEST(103)
 
 TEST(110)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -901,7 +901,7 @@ TEST(110)
 
 TEST(111)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -975,7 +975,7 @@ TEST(111)
 
 TEST(112)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -1053,7 +1053,7 @@ TEST(112)
 
 TEST(113)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp0;
@@ -1127,7 +1127,7 @@ TEST(113)
 
 TEST(114)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;
@@ -1182,7 +1182,7 @@ TEST(114)
 
 TEST(115)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::property_names_id_type n1, n2, n3;
@@ -1262,7 +1262,7 @@ TEST(115)
 
 TEST(116)
 {
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::property_names_id_type n1, n2, n3;
@@ -1612,7 +1612,7 @@ TEST(117)
 {
   //  polygons and boxes without area
   
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;
@@ -1679,7 +1679,7 @@ TEST(118)
 {
   //  1x1 arrays (#902)
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   db::LayerProperties lp1;
@@ -1734,7 +1734,7 @@ TEST(119_WithAndWithoutContext)
 {
   //  PCells with context and without
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout g (&m);
 
   //  Note: this sample requires the BASIC lib

src/plugins/streamers/oasis/unit_tests/dbOASISWriter2.cc

@@ -34,7 +34,7 @@ TEST(1)
 {
   db::ShapeProcessor sp;
 
-  db::Manager m;
+  db::Manager m (false);
   db::Layout layout_org (&m);
   {
     std::string fn (tl::testsrc ());

src/plugins/streamers/pcb/lay_plugin/layGerberImport.cc

@@ -63,11 +63,11 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("db::import_gerber", "import_gerber_menu:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Gerber PCB")), true));
-    menu_entries.push_back (lay::MenuEntry ("db::import_gerber_new", "import_gerber_new:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project"))));
-    menu_entries.push_back (lay::MenuEntry ("db::import_gerber_new_free", "import_gerber_new_free:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project - Free Layer Mapping"))));
-    menu_entries.push_back (lay::MenuEntry ("db::import_gerber_open", "import_gerber_open:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Open Project"))));
-    menu_entries.push_back (lay::MenuEntry ("db::import_gerber_recent", "import_gerber_recent:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Recent Project"))));
+    menu_entries.push_back (lay::submenu ("db::import_gerber", "import_gerber_menu:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Gerber PCB"))));
+    menu_entries.push_back (lay::menu_item ("db::import_gerber_new", "import_gerber_new:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project"))));
+    menu_entries.push_back (lay::menu_item ("db::import_gerber_new_free", "import_gerber_new_free:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project - Free Layer Mapping"))));
+    menu_entries.push_back (lay::menu_item ("db::import_gerber_open", "import_gerber_open:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Open Project"))));
+    menu_entries.push_back (lay::menu_item ("db::import_gerber_recent", "import_gerber_recent:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Recent Project"))));
   }
 
   virtual bool configure (const std::string &name, const std::string &value)
@@ -125,7 +125,7 @@ public:
 
       }
 
-      lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+      lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
       GerberImportDialog dialog (QApplication::activeWindow (), &data);
       db::GerberImporter importer;

src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc

@@ -107,7 +107,7 @@ public:
 
       bool supports_undo = true;
 
-      if (db::transactions_enabled ()) {
+      if (mp_view->manager () && mp_view->manager ()->is_enabled ()) {
 
         lay::TipDialog td (QApplication::activeWindow (),
                            tl::to_string (QObject::tr ("Undo buffering for the following operation can be memory and time consuming.\nChoose \"Yes\" to use undo buffering or \"No\" for no undo buffering. Warning: in the latter case, the undo history will be lost.\n\nChoose undo buffering?")), 
@@ -244,7 +244,7 @@ public:
 
       bool supports_undo = true;
 
-      if (db::transactions_enabled ()) {
+      if (mp_view->manager () && mp_view->manager ()->is_enabled ()) {
 
         lay::TipDialog td (QApplication::activeWindow (),
                            tl::to_string (QObject::tr ("Undo buffering for the following operation can be memory and time consuming.\nChoose \"Yes\" to use undo buffering or \"No\" for no undo buffering. Warning: in the latter case, the undo history will be lost.\n\nChoose undo buffering?")), 
@@ -359,7 +359,7 @@ public:
 
       bool supports_undo = true;
 
-      if (db::transactions_enabled ()) {
+      if (mp_view->manager () && mp_view->manager ()->is_enabled ()) {
 
         lay::TipDialog td (QApplication::activeWindow (),
                            tl::to_string (QObject::tr ("Undo buffering for the following operation can be memory and time consuming.\nChoose \"Yes\" to use undo buffering or \"No\" for no undo buffering. Warning: in the latter case, the undo history will be lost.\n\nChoose undo buffering?")), 
@@ -478,10 +478,10 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("ops_group", "edit_menu.layer_menu.end"));
-    menu_entries.push_back (lay::MenuEntry ("lay::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations"))));
-    menu_entries.push_back (lay::MenuEntry ("lay::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge"))));
-    menu_entries.push_back (lay::MenuEntry ("lay::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size"))));
+    menu_entries.push_back (lay::separator ("ops_group", "edit_menu.layer_menu.end"));
+    menu_entries.push_back (lay::menu_item ("lay::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations"))));
+    menu_entries.push_back (lay::menu_item ("lay::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge"))));
+    menu_entries.push_back (lay::menu_item ("lay::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size"))));
   }
 
   virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -494,7 +494,7 @@ public:
     // .. nothing yet ..
   }
 
-  lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
+  lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
   {
     return new BooleanOperationsPlugin (root, view);
   }

src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc

@@ -20,10 +20,8 @@
 
 */
 
-
-
-
 #include "layDiffToolDialog.h"
+#include "layDispatcher.h"
 
 #include "layPlugin.h"
 
@@ -91,7 +89,7 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("lay::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool"))));
+    menu_entries.push_back (lay::menu_item ("lay::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool"))));
   }
 
   virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -104,7 +102,7 @@ public:
     // .. nothing yet ..
   }
 
-  lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
+  lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
   {
     return new DiffPlugin (root, view);
   }

src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc

@@ -625,7 +625,7 @@ DiffToolDialog::exec_dialog (lay::LayoutView *view)
     mp_ui->layoutb->set_layout_view (view);
   }
 
-  lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+  lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
   bool f = false;
   if (config_root->config_get (cfg_diff_run_xor, f)) {
@@ -674,7 +674,7 @@ BEGIN_PROTECTED
     throw tl::Exception (tl::to_string (QObject::tr ("Trying to perform an Diff between identical layouts")));  
   }
 
-  lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+  lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
   config_root->config_set (cfg_diff_run_xor, mp_ui->xor_cbx->isChecked ());
   config_root->config_set (cfg_diff_detailed, mp_ui->detailed_cbx->isChecked ());

src/plugins/tools/import/lay_plugin/layStreamImport.cc

@@ -61,7 +61,7 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("lay::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other Files Into Current"))));
+    menu_entries.push_back (lay::menu_item ("lay::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other Files Into Current"))));
   }
 
   virtual bool configure (const std::string &name, const std::string &value)
@@ -95,7 +95,7 @@ public:
         data = StreamImportData ();
       }
 
-      lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+      lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
       StreamImportDialog dialog (QApplication::activeWindow (), &data);
       lay::StreamImporter importer;

src/plugins/tools/import/lay_plugin/layStreamImportDialog.h

@@ -56,7 +56,7 @@ namespace tl
 
 namespace lay
 {
-  class PluginRoot;
+  class Dispatcher;
 }
 
 namespace lay

src/plugins/tools/net_tracer/lay_plugin/layNetTracerConfig.cc

@@ -23,6 +23,7 @@
 
 #include "layNetTracerConfig.h"
 #include "layConverters.h"
+#include "layDispatcher.h"
 
 #include <QColorDialog>
 #include <QPainter>
@@ -129,7 +130,7 @@ NetTracerConfigPage::color_button_clicked ()
 }
 
 void 
-NetTracerConfigPage::setup (lay::PluginRoot *root)
+NetTracerConfigPage::setup (lay::Dispatcher *root)
 {
   //  window mode
   lay::nt_window_type wmode = lay::NTFitNet;
@@ -238,7 +239,7 @@ NetTracerConfigPage::window_changed (int m)
 }
 
 void 
-NetTracerConfigPage::commit (lay::PluginRoot *root)
+NetTracerConfigPage::commit (lay::Dispatcher *root)
 {
   double dim = 1.0;
   tl::from_string (tl::to_string (le_window->text ()), dim);

src/plugins/tools/net_tracer/lay_plugin/layNetTracerConfig.h

@@ -64,8 +64,8 @@ class NetTracerConfigPage
 public:
   NetTracerConfigPage (QWidget *parent);
 
-  virtual void setup (lay::PluginRoot *root);
-  virtual void commit (lay::PluginRoot *root);
+  virtual void setup (lay::Dispatcher *root);
+  virtual void commit (lay::Dispatcher *root);
 
 public slots:
   void window_changed (int);

src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc

@@ -53,7 +53,7 @@ namespace lay
 // -----------------------------------------------------------------------------------
 //  NetTracerDialog implementation
 
-NetTracerDialog::NetTracerDialog (lay::PluginRoot *root, lay::LayoutView *view)
+NetTracerDialog::NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view)
   : lay::Browser (root, view, "net_tracer_dialog"),
     lay::ViewService (view->view_object_widget ()), 
     m_cv_index (0), 

src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.h

@@ -57,7 +57,7 @@ class NetTracerDialog
 Q_OBJECT
 
 public:
-  NetTracerDialog (lay::PluginRoot *root, lay::LayoutView *view);
+  NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view);
   virtual ~NetTracerDialog ();
 
   virtual bool mouse_move_event (const db::DPoint &p, unsigned int buttons, bool prio);

src/plugins/tools/net_tracer/lay_plugin/layNetTracerPlugin.cc

@@ -67,15 +67,15 @@ public:
   {
     //  TODO: where should that go?
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("net_trace_group", "tools_menu.end"));
-    menu_entries.push_back (lay::MenuEntry ("lay::net_trace", "net_trace", "tools_menu.end", tl::to_string (QObject::tr ("Trace Net"))));
-    menu_entries.push_back (lay::MenuEntry ("", "trace_all_nets_menu", "tools_menu.end", tl::to_string (QObject::tr ("Trace All Nets")), true));
-    menu_entries.push_back (lay::MenuEntry ("lay::trace_all_nets", "trace_all_nets", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Hierarchical"))));
-    menu_entries.push_back (lay::MenuEntry ("lay::trace_all_nets_flat", "trace_all_nets_flat", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Flat"))));
-    menu_entries.push_back (lay::MenuEntry ("lay::edit_layer_stack", "edit_layer_stack", "tools_menu.end", tl::to_string (QObject::tr ("Edit Layer Stack"))));
+    menu_entries.push_back (lay::separator ("net_trace_group", "tools_menu.end"));
+    menu_entries.push_back (lay::menu_item ("lay::net_trace", "net_trace", "tools_menu.end", tl::to_string (QObject::tr ("Trace Net"))));
+    menu_entries.push_back (lay::submenu ("", "trace_all_nets_menu", "tools_menu.end", tl::to_string (QObject::tr ("Trace All Nets"))));
+    menu_entries.push_back (lay::menu_item ("lay::trace_all_nets", "trace_all_nets", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Hierarchical"))));
+    menu_entries.push_back (lay::menu_item ("lay::trace_all_nets_flat", "trace_all_nets_flat", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Flat"))));
+    menu_entries.push_back (lay::menu_item ("lay::edit_layer_stack", "edit_layer_stack", "tools_menu.end", tl::to_string (QObject::tr ("Edit Layer Stack"))));
   }
 
-  virtual lay::Plugin *create_plugin (db::Manager * /*manager*/, lay::PluginRoot *root, lay::LayoutView *view) const
+  virtual lay::Plugin *create_plugin (db::Manager * /*manager*/, lay::Dispatcher *root, lay::LayoutView *view) const
   {
     return new NetTracerDialog (root, view);
   }

src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc

@@ -92,7 +92,7 @@ static db::NetTracerNet trace (db::NetTracer &tracer, const db::Layout &layout,
 
 void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracerTechnologyComponent &tc, const db::LayerProperties &lp_start, const db::Point &p_start, const std::string &file_au, const char *net_name = 0, size_t depth = 0)
 {
-  db::Manager m;
+  db::Manager m (false);
 
   db::Layout layout_org (&m);
   {
@@ -132,7 +132,7 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer
 
 void run_test2 (tl::TestBase *_this, const std::string &file, const db::NetTracerTechnologyComponent &tc, const db::LayerProperties &lp_start, const db::Point &p_start, const db::LayerProperties &lp_stop, const db::Point &p_stop, const std::string &file_au, const char *net_name = 0)
 {
-  db::Manager m;
+  db::Manager m (false);
 
   db::Layout layout_org (&m);
   {

src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc

@@ -52,7 +52,7 @@ static db::NetTracerSymbolInfo symbol (const std::string &s, const std::string &
 
 void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracerTechnologyComponent &tc, const std::string &file_au)
 {
-  db::Manager m;
+  db::Manager m (false);
 
   db::Layout layout_org (&m);
   {

src/plugins/tools/xor/lay_plugin/layXORPlugin.cc

@@ -23,6 +23,7 @@
 
 
 #include "layXORToolDialog.h"
+#include "layDispatcher.h"
 
 #include "layPlugin.h"
 
@@ -96,7 +97,7 @@ public:
   virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
   {
     lay::PluginDeclaration::get_menu_entries (menu_entries);
-    menu_entries.push_back (lay::MenuEntry ("lay::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool"))));
+    menu_entries.push_back (lay::menu_item ("lay::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool"))));
   }
 
   virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -109,7 +110,7 @@ public:
     // .. nothing yet ..
   }
 
-  lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
+  lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
   {
     return new XORPlugin (root, view);
   }

src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc

@@ -208,7 +208,7 @@ XORToolDialog::exec_dialog (lay::LayoutView *view)
   }
 
   //  take current settings from the configurations
-  lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+  lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
   input_mode_t im = IMAll;
   if (config_root->config_get (cfg_xor_input_mode, im, InputModeConverter ())) {
@@ -334,7 +334,7 @@ BEGIN_PROTECTED
     }
   }
   
-  lay::PluginRoot *config_root = lay::PluginRoot::instance ();
+  lay::Dispatcher *config_root = lay::Dispatcher::instance ();
 
   config_root->config_set (cfg_xor_input_mode, InputModeConverter ().to_string ((input_mode_t) mp_ui->input_layers_cbx->currentIndex ()));
   config_root->config_set (cfg_xor_output_mode, OutputModeConverter ().to_string ((output_mode_t) mp_ui->output_cbx->currentIndex ()));