From 0c082361f360df8f9af3fdbf0278e92ddf2adb8f Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 25 Sep 2018 06:06:54 +0200
Subject: [PATCH] TestControl: hooked up a simple child-dialog (see #1174)

...which gives us already the base functionality required to run the first tests

- can be triggered from the Help menu
- non-modal dialog (Gtk::Dialog)
- attached as child / slave-Window to the current active workspace window
- window manager hint to keep it on top
- have a notebook control within the dialog
- attached (passively) to the UI-Bus
---
 src/gui/dialog/test-control.hpp |  7 +++--
 src/gui/interact/wizard.cpp     |  7 ++++-
 src/gui/interact/wizard.hpp     |  1 +
 wiki/thinkPad.ichthyo.mm        | 45 ++++++++++++++++++++++++---------
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/gui/dialog/test-control.hpp b/src/gui/dialog/test-control.hpp
index 8a80485f1..c8d242f8c 100644
--- a/src/gui/dialog/test-control.hpp
+++ b/src/gui/dialog/test-control.hpp
@@ -39,6 +39,7 @@
 
 #include "gui/gtk-base.hpp"
 #include "gui/dialog/dialog.hpp"
+#include "gui/ctrl/bus-term.hpp"
 
 namespace gui {
 namespace dialog {
@@ -46,6 +47,7 @@ namespace dialog {
   
   class TestControl
     : public Gtk::Dialog
+    , ctrl::BusTerm
     {
       Gtk::Notebook notebook_;
       
@@ -53,8 +55,9 @@ namespace dialog {
       Gtk::Button trigger_1_;
       
     public:
-      TestControl (Gtk::Window &parent)
+      TestControl (ctrl::BusTerm& upLink, Gtk::Window& parent)
         : Dialog(_("Test and Diagnostics"), parent, Gtk::DIALOG_DESTROY_WITH_PARENT)
+        , ctrl::BusTerm{lib::idi::EntryID<TestControl>{}, upLink}
         , page_1_{Gtk::ORIENTATION_VERTICAL}
         {
           using namespace Gtk;
@@ -74,7 +77,7 @@ namespace dialog {
           notebook_.append_page (page_1_, _("#1099"));
           
           
-          show_all_children();
+          show_all();
         }
       
         
diff --git a/src/gui/interact/wizard.cpp b/src/gui/interact/wizard.cpp
index 88f5d144d..ec5a96871 100644
--- a/src/gui/interact/wizard.cpp
+++ b/src/gui/interact/wizard.cpp
@@ -34,6 +34,7 @@
 #include "gui/interact/spot-locator.hpp"
 #include "gui/workspace/workspace-window.hpp"
 #include "gui/panel/infobox-panel.hpp"
+#include "gui/dialog/test-control.hpp"
 #include "gui/ctrl/notification-hub.hpp"
 #include "gui/ctrl/global-ctx.hpp"
 #include "lib/format-string.hpp"
@@ -124,7 +125,11 @@ namespace interact {
   void
   Wizard::launchTestCtrl()
   {
-    UNIMPLEMENTED ("create and attach a non-modal child dialog box page");
+    if (testControlWindow_)
+      testControlWindow_->present(); // just (re)show the existing window
+    else
+      testControlWindow_ = std::make_unique<dialog::TestControl> (globalCtx_.uiBus_.getAccessPoint(),
+                                                                  globalCtx_.windowLoc_.findActiveWindow());
   }
   
   
diff --git a/src/gui/interact/wizard.hpp b/src/gui/interact/wizard.hpp
index d57741d45..525ef30b7 100644
--- a/src/gui/interact/wizard.hpp
+++ b/src/gui/interact/wizard.hpp
@@ -87,6 +87,7 @@ namespace interact {
     {
       ctrl::GlobalCtx& globalCtx_;
       unique_ptr<ctrl::NotificationHub> notificationHub_;
+      unique_ptr<dialog::TestControl> testControlWindow_;
     
     public:
       Wizard (ctrl::GlobalCtx&);
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index 8db9c8117..03cdaa014 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -2712,10 +2712,10 @@
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689225658" ID="ID_662017160" MODIFIED="1533689310654" TEXT="Pling! -Button">
 <icon BUILTIN="full-5"/>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689235200" ID="ID_1760873318" MODIFIED="1537836493850" TEXT="non-modal TestControl">
-<icon BUILTIN="flag-yellow"/>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537836495530" ID="ID_182389429" MODIFIED="1537836505458" TEXT="per Men&#xfc;eintrag &#xf6;ffnen">
-<icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689235200" ID="ID_1760873318" MODIFIED="1537848115131" TEXT="non-modal TestControl">
+<icon BUILTIN="pencil"/>
+<node COLOR="#338800" CREATED="1537836495530" ID="ID_182389429" MODIFIED="1537848042515" TEXT="per Men&#xfc;eintrag &#xf6;ffnen">
+<icon BUILTIN="button_ok"/>
 <node COLOR="#338800" CREATED="1537841662854" ID="ID_451055929" MODIFIED="1537841679676" TEXT="Men&#xfc;eintrag im Hilfe-Men&#xfc;">
 <icon BUILTIN="button_ok"/>
 </node>
@@ -2723,12 +2723,12 @@
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537836597844" ID="ID_1217826524" MODIFIED="1537836608179" TEXT="Konstrukt wie im Tutorial">
-<icon BUILTIN="flag-yellow"/>
+<node COLOR="#338800" CREATED="1537836597844" ID="ID_1217826524" MODIFIED="1537848040826" TEXT="Konstrukt wie im Tutorial">
+<icon BUILTIN="button_ok"/>
 <node CREATED="1537836612210" ID="ID_225351262" LINK="https://developer.gnome.org/gtkmm-tutorial/stable/sec-about-dialog.html.en#aboutdialog-example" MODIFIED="1537836626843" TEXT="non-modal about dialog">
 <icon BUILTIN="info"/>
 </node>
-<node CREATED="1537838250303" ID="ID_1190002074" MODIFIED="1537841497288" TEXT="ist ein sub-window besser">
+<node CREATED="1537838250303" FOLDED="true" ID="ID_1190002074" MODIFIED="1537848102311" TEXT="ist ein sub-window besser">
 <icon BUILTIN="button_cancel"/>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537838265916" ID="ID_920100816" MODIFIED="1537841473971" TEXT="wie?">
 <icon BUILTIN="help"/>
@@ -2746,12 +2746,30 @@
 <node CREATED="1537841531352" ID="ID_1190471518" MODIFIED="1537841543154" TEXT="hat eigene Konstruktoren, die den Dialog non-modal machen"/>
 <node CREATED="1537841543886" ID="ID_59238198" MODIFIED="1537841558488" TEXT="regelt schon automatisch das Verh&#xe4;ltnis zum Vaterfenster"/>
 <node CREATED="1537846114160" ID="ID_1907327221" MODIFIED="1537846128474" TEXT="Vorbild: Joel&apos;s PreferencesDialog">
-<node CREATED="1537846129846" ID="ID_984655666" MODIFIED="1537846137073" TEXT="mu&#xdf; nur noch non-modal sein..."/>
+<node COLOR="#338800" CREATED="1537848007082" ID="ID_1014258603" MODIFIED="1537848024079" TEXT="Notebook">
+<icon BUILTIN="button_ok"/>
+</node>
+<node COLOR="#338800" CREATED="1537848010330" ID="ID_1307971717" MODIFIED="1537848022373" TEXT="Seite einf&#xfc;gen f&#xfc;r #1099">
+<icon BUILTIN="button_ok"/>
+</node>
+</node>
+<node COLOR="#338800" CREATED="1537846129846" ID="ID_984655666" MODIFIED="1537847935725" TEXT="mu&#xdf; nur noch non-modal sein...">
+<icon BUILTIN="button_ok"/>
+<node CREATED="1537847939155" ID="ID_1465508298" MODIFIED="1537847959601" TEXT="einfach per Gtk::DialogFlags">
+<icon BUILTIN="idea"/>
+</node>
+<node CREATED="1537847979886" ID="ID_1956886110" MODIFIED="1537847981522" TEXT="DIALOG_DESTROY_WITH_PARENT"/>
 </node>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537836550411" ID="ID_899229612" MODIFIED="1537836572756" TEXT="h&#xe4;ngt (passiv) am UI-Bus">
-<icon BUILTIN="flag-yellow"/>
+<node COLOR="#338800" CREATED="1537836550411" ID="ID_899229612" MODIFIED="1537848039348" TEXT="h&#xe4;ngt (passiv) am UI-Bus">
+<icon BUILTIN="button_ok"/>
+<node CREATED="1537848045781" ID="ID_766784189" MODIFIED="1537848055613" TEXT="analog zum NotificationService">
+<icon BUILTIN="idea"/>
+</node>
+<node CREATED="1537848056915" ID="ID_64593877" MODIFIED="1537848089997" TEXT="globals.uiBus_.getAccessPoint()">
+<icon BUILTIN="info"/>
+</node>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537836522950" ID="ID_87203159" MODIFIED="1537836526719" TEXT="Radiobuttons">
 <icon BUILTIN="flag-yellow"/>
@@ -2759,8 +2777,11 @@
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537834955977" ID="ID_556296967" MODIFIED="1537834965289" TEXT="Argument-Textbox">
 <icon BUILTIN="flag-yellow"/>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537836579647" ID="ID_951515368" MODIFIED="1537836584271" TEXT="Pling!">
-<icon BUILTIN="flag-yellow"/>
+<node COLOR="#338800" CREATED="1537836579647" ID="ID_951515368" MODIFIED="1537848122882" TEXT="Pling!">
+<icon BUILTIN="button_ok"/>
+<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1537848127378" ID="ID_1206004" MODIFIED="1537848141916" TEXT="Argument-Werte abgreifen">
+<icon BUILTIN="flag-pink"/>
+</node>
 </node>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689243871" ID="ID_1745090225" MODIFIED="1537834968776" TEXT="triggert Dummy-Command">