From 0be0f77c160dc545b6c68c3beb1b04d2a15e8d88 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 21 Sep 2018 14:38:38 +0200
Subject: [PATCH] NotificationDisplay: wire up simple message display

---
 src/gui/panel/infobox-panel.cpp      |  2 +-
 src/gui/widget/error-log-display.hpp | 39 ++++++------
 wiki/thinkPad.ichthyo.mm             | 88 +++++++++++++++++++++++-----
 3 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/src/gui/panel/infobox-panel.cpp b/src/gui/panel/infobox-panel.cpp
index c17910b73..215689e97 100644
--- a/src/gui/panel/infobox-panel.cpp
+++ b/src/gui/panel/infobox-panel.cpp
@@ -117,7 +117,7 @@ namespace panel{
     static uint bangNo{0};
     static _Fmt msgTemplate{"Bang #%d\n"};
     
-    getLog().showMsg(NOTE_WARN, msgTemplate % ++bangNo);
+    getLog().addMsg (msgTemplate % ++bangNo);
   }
   
   
diff --git a/src/gui/widget/error-log-display.hpp b/src/gui/widget/error-log-display.hpp
index 7e4d59a7e..01ae3ad54 100644
--- a/src/gui/widget/error-log-display.hpp
+++ b/src/gui/widget/error-log-display.hpp
@@ -101,33 +101,18 @@ namespace widget {
       model::Revealer reveal;
       
       
-      void
-      showMsg (NotifyLevel severity, string const& text)
-        {
-          //////////////////////////////////////////////////TICKET #1102 : add formatting according to the error level
-          switch (severity) {
-            case NOTE_ERROR:
-                addEntry ("ERROR: "+text);
-              break;
-            case NOTE_WARN:
-                addEntry ("WARN: "+text);
-              break;
-            default:
-                addEntry (text);
-              break;
-          }
-        }
-      
       void
       clearAll()
         {
           UNIMPLEMENTED ("empty buffer and discard all error bookmarks");
         }
       
+      /** just add normal information message to buffer,
+       *  without special markup and without expanding the widget */
       void
       addMsg (string text)
         {
-          UNIMPLEMENTED ("add normal information message to buffer");
+          showMsg (NOTE_INFO, text);
         }
       
       void
@@ -158,6 +143,24 @@ namespace widget {
       
     private:/* ===== Internals ===== */
       
+      void
+      showMsg (NotifyLevel severity, string const& text)
+        {
+          //////////////////////////////////////////////////TICKET #1102 : add formatting according to the error level
+          switch (severity) {
+            case NOTE_ERROR:
+                addEntry ("ERROR: "+text);
+              break;
+            case NOTE_WARN:
+                addEntry ("WARN: "+text);
+              break;
+            default:
+                addEntry (text);
+              break;
+          }
+        }
+      
+      
       Gtk::TextView textLog_;
       
       /** add message entry to the (ever growing) text buffer.
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index b77d5ef85..e87c25dd7 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -320,8 +320,8 @@
 <node CREATED="1481502335583" ID="ID_1245191241" MODIFIED="1518487921041" TEXT="Felder im GuiRunner sollten noexcept sein">
 <icon BUILTIN="yes"/>
 </node>
-<node CREATED="1484793048273" ID="ID_66499328" MODIFIED="1518487921041" TEXT="verschoben">
-<arrowlink COLOR="#4072ad" DESTINATION="ID_1019455888" ENDARROW="Default" ENDINCLINATION="-334;0;" ID="Arrow_ID_693735378" STARTARROW="None" STARTINCLINATION="-131;33;"/>
+<node CREATED="1484793048273" ID="ID_66499328" MODIFIED="1537532341697" TEXT="verschoben">
+<arrowlink COLOR="#4072ad" DESTINATION="ID_1019455888" ENDARROW="Default" ENDINCLINATION="-127;0;" ID="Arrow_ID_693735378" STARTARROW="None" STARTINCLINATION="-99;38;"/>
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
@@ -329,7 +329,7 @@
 <icon BUILTIN="button_ok"/>
 <node COLOR="#338800" CREATED="1484793113472" ID="ID_221612387" MODIFIED="1518487921042" TEXT="Lebenszyklus nochmal pr&#xfc;fen">
 <icon BUILTIN="button_ok"/>
-<node COLOR="#338800" CREATED="1484797253856" ID="ID_226245696" MODIFIED="1518487921042" TEXT="GUI start sauber">
+<node COLOR="#338800" CREATED="1484797253856" FOLDED="true" ID="ID_226245696" MODIFIED="1537532327605" TEXT="GUI start sauber">
 <icon BUILTIN="button_ok"/>
 <node CREATED="1484797307376" ID="ID_842106541" MODIFIED="1518487921042" TEXT="Abfolge">
 <icon BUILTIN="info"/>
@@ -415,7 +415,7 @@
   </body>
 </html></richcontent>
 </node>
-<node CREATED="1484797584483" FOLDED="true" ID="ID_1316050570" MODIFIED="1533608416104" TEXT="dieser hat Member ">
+<node CREATED="1484797584483" ID="ID_1316050570" MODIFIED="1537532298858" TEXT="dieser hat Member ">
 <node CREATED="1484797623574" ID="ID_1754670675" MODIFIED="1518487921043" TEXT="Nexus"/>
 <node CREATED="1484797620495" ID="ID_1710248767" MODIFIED="1518487921043" TEXT="GuiNotificationService"/>
 </node>
@@ -530,8 +530,8 @@
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
-<node CREATED="1484793022924" ID="ID_1019455888" MODIFIED="1518487921045" TEXT="neuer Facade-Kontext">
-<linktarget COLOR="#4072ad" DESTINATION="ID_1019455888" ENDARROW="Default" ENDINCLINATION="-334;0;" ID="Arrow_ID_693735378" SOURCE="ID_66499328" STARTARROW="None" STARTINCLINATION="-131;33;"/>
+<node CREATED="1484793022924" ID="ID_1019455888" MODIFIED="1537532341698" TEXT="neuer Facade-Kontext">
+<linktarget COLOR="#4072ad" DESTINATION="ID_1019455888" ENDARROW="Default" ENDINCLINATION="-127;0;" ID="Arrow_ID_693735378" SOURCE="ID_66499328" STARTARROW="None" STARTINCLINATION="-99;38;"/>
 <icon BUILTIN="idea"/>
 <node CREATED="1501866627055" ID="ID_1521184600" MODIFIED="1518487921045" TEXT="RAII-Stil"/>
 <node CREATED="1501866591164" ID="ID_751026549" MODIFIED="1518487921045" TEXT="&#xf6;ffnet/schlie&#xdf;t die &#xf6;ffentlichen Interfaces"/>
@@ -930,7 +930,8 @@
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1504203488690" ID="ID_149796171" MODIFIED="1518487921049" TEXT="Fehlermeldungen">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1504203488690" ID="ID_149796171" MODIFIED="1537532525240" TEXT="Fehlermeldungen">
+<linktarget COLOR="#c19dc4" DESTINATION="ID_149796171" ENDARROW="Default" ENDINCLINATION="1300;76;" ID="Arrow_ID_451002492" SOURCE="ID_821848615" STARTARROW="None" STARTINCLINATION="1509;156;"/>
 <icon BUILTIN="flag-yellow"/>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1504203497529" ID="ID_1933339677" MODIFIED="1531585056392" TEXT="#1102 brauche Fehlerlog-Widget">
 <linktarget COLOR="#5e6d7f" DESTINATION="ID_1933339677" ENDARROW="Default" ENDINCLINATION="201;-32;" ID="Arrow_ID_1887448672" SOURCE="ID_376091136" STARTARROW="None" STARTINCLINATION="-44;52;"/>
@@ -1329,7 +1330,7 @@
 </html></richcontent>
 <icon BUILTIN="help"/>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1531584775498" ID="ID_1901801971" MODIFIED="1531584845023" TEXT="7/2018 notification-Display fehlt noch">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1531584775498" ID="ID_1901801971" MODIFIED="1537532231352" TEXT="7/2018 notification-Display fehlt noch">
 <richcontent TYPE="NOTE"><html>
   <head>
     
@@ -1343,6 +1344,7 @@
     </p>
   </body>
 </html></richcontent>
+<linktarget COLOR="#ed223a" DESTINATION="ID_1901801971" ENDARROW="Default" ENDINCLINATION="287;0;" ID="Arrow_ID_1609281182" SOURCE="ID_1545300987" STARTARROW="None" STARTINCLINATION="83;-25;"/>
 <icon BUILTIN="yes"/>
 </node>
 </node>
@@ -1960,8 +1962,8 @@
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534725101578" ID="ID_974315967" MODIFIED="1534725412673" TEXT="clearAll">
 <icon BUILTIN="flag-yellow"/>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534725131214" ID="ID_1479834475" MODIFIED="1534725417504" TEXT="addMsg">
-<icon BUILTIN="flag-yellow"/>
+<node COLOR="#338800" CREATED="1534725131214" ID="ID_1479834475" MODIFIED="1537533467539" TEXT="addMsg">
+<icon BUILTIN="button_ok"/>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534725152139" ID="ID_887758432" MODIFIED="1534725420632" TEXT="addError">
 <icon BUILTIN="flag-yellow"/>
@@ -1972,6 +1974,12 @@
 <icon BUILTIN="flag-yellow"/>
 </node>
 </node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531676045" ID="ID_548104404" MODIFIED="1537531681238" TEXT="addWarning">
+<icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531682564" ID="ID_1510582702" MODIFIED="1537531692044" TEXT="nur speziell ausgezeichnete Meldung">
+<icon BUILTIN="flag-yellow"/>
+</node>
+</node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534725142756" ID="ID_343395831" MODIFIED="1534725674269" TEXT="clearInfoMsg">
 <icon BUILTIN="flag-yellow"/>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534725716254" ID="ID_1648079400" MODIFIED="1534725735604" TEXT="Fehler-Texte beiseite Speichern">
@@ -2071,7 +2079,8 @@
 </node>
 </node>
 </node>
-<node CREATED="1533689031860" ID="ID_657232437" MODIFIED="1533689036552" TEXT="Implementierung">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689031860" ID="ID_657232437" MODIFIED="1537532001855" TEXT="Implementierung">
+<icon BUILTIN="pencil"/>
 <node COLOR="#338800" CREATED="1533689046050" ID="ID_32330448" MODIFIED="1533689051525" TEXT="ErrorLog-Widget">
 <icon BUILTIN="button_ok"/>
 </node>
@@ -2147,7 +2156,7 @@
 <node COLOR="#338800" CREATED="1533689076590" ID="ID_321096443" MODIFIED="1534119951865" TEXT="mit Bus verdrahten und ID global konstant definieren">
 <icon BUILTIN="full-2"/>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689098787" ID="ID_191346591" MODIFIED="1533689301486" TEXT="Empfangs-Logik im NotificationController">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1533689098787" ID="ID_191346591" MODIFIED="1537531589557" TEXT="Empfangs-Logik im NotificationHub (Controller)">
 <icon BUILTIN="full-3"/>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534119968325" ID="ID_1630503080" MODIFIED="1534730011960" TEXT="Einrichtung">
 <icon BUILTIN="pencil"/>
@@ -2473,8 +2482,8 @@
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534120150459" ID="ID_1466610963" MODIFIED="1535752377006" TEXT="doRevealYourself()">
-<icon BUILTIN="pencil"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534120150459" ID="ID_1466610963" MODIFIED="1537530994065" TEXT="doRevealYourself()">
+<icon BUILTIN="bell"/>
 <node CREATED="1534120150460" ID="ID_1726008784" MODIFIED="1537459860078">
 <richcontent TYPE="NODE"><html>
   <head>
@@ -2498,8 +2507,8 @@
 <icon BUILTIN="info"/>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534120150462" ID="ID_1528884346" MODIFIED="1534725759894" TEXT="doMsg(text)">
-<icon BUILTIN="pencil"/>
+<node COLOR="#338800" CREATED="1534120150462" ID="ID_1528884346" MODIFIED="1537533440677" TEXT="doMsg(text)">
+<icon BUILTIN="button_ok"/>
 <node CREATED="1534120150462" ID="ID_1226643824" MODIFIED="1534120202934" TEXT="&quot;Possibly allocate Widget, place text into its buffer. No need to expand&quot;">
 <icon BUILTIN="info"/>
 </node>
@@ -2543,6 +2552,12 @@
 <icon BUILTIN="info"/>
 </node>
 </node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531617621" ID="ID_447071799" MODIFIED="1537531623029" TEXT="doMark()">
+<icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531624828" ID="ID_52936917" MODIFIED="1537531653306" TEXT="Spezialbehandlung + Chain, um die Warnungs State-marks abzugreifen">
+<icon BUILTIN="flag-yellow"/>
+</node>
+</node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1534120150465" ID="ID_1862649971" MODIFIED="1534725759893" TEXT="doFlash()">
 <icon BUILTIN="pencil"/>
 <node CREATED="1534120150465" ID="ID_222097969" MODIFIED="1534120315751">
@@ -2593,6 +2608,47 @@
 <linktarget COLOR="#a9b4c1" DESTINATION="ID_1360416196" ENDARROW="Default" ENDINCLINATION="417;34;" ID="Arrow_ID_1337668046" SOURCE="ID_1984401497" STARTARROW="None" STARTINCLINATION="-454;-9;"/>
 <icon BUILTIN="flag-yellow"/>
 </node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531073966" ID="ID_973305985" MODIFIED="1537531170346" TEXT="Funktionen">
+<icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531078757" ID="ID_605735534" MODIFIED="1537531168651" TEXT="Reset">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531084396" ID="ID_648584085" MODIFIED="1537531167834" TEXT="Meldung ausgeben">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531543495" ID="ID_1813117782" MODIFIED="1537531558777" TEXT="Warnung anzeigen">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531109361" ID="ID_1483169066" MODIFIED="1537531167107" TEXT="Fehler ausgeben">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531089012" ID="ID_1427238207" MODIFIED="1537531166466" TEXT="alle Meldungen entfernen">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531153739" ID="ID_538123549" MODIFIED="1537531165851" TEXT="Fehler in Meldungen verwandeln">
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537531160298" ID="ID_1717013245" MODIFIED="1537531165019" TEXT="Flash">
+<icon BUILTIN="flag-yellow"/>
+</node>
+</node>
+</node>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537532006073" HGAP="-92" ID="ID_135756255" MODIFIED="1537532592367" TEXT="Neben-Nutzen" VSHIFT="15">
+<icon BUILTIN="flag-yellow"/>
+<node CREATED="1537532035141" ID="ID_188521578" MODIFIED="1537532581615" TEXT="NotificationService">
+<icon BUILTIN="info"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537532041420" ID="ID_1545300987" MODIFIED="1537532577948" TEXT="Implementierung komplettieren">
+<arrowlink COLOR="#ed223a" DESTINATION="ID_1901801971" ENDARROW="Default" ENDINCLINATION="287;0;" ID="Arrow_ID_1609281182" STARTARROW="None" STARTINCLINATION="83;-25;"/>
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537532447549" ID="ID_821848615" MODIFIED="1537532579109" TEXT="Fehleranzeige-Funktion">
+<arrowlink COLOR="#c19dc4" DESTINATION="ID_149796171" ENDARROW="Default" ENDINCLINATION="1300;76;" ID="Arrow_ID_451002492" STARTARROW="None" STARTINCLINATION="1509;156;"/>
+<icon BUILTIN="flag-yellow"/>
+</node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1537532456004" ID="ID_1700828304" MODIFIED="1537532574773" TEXT="dokumentieren und Ticket #1102 schlie&#xdf;en">
+<icon BUILTIN="flag-yellow"/>
 </node>
 </node>
 </node>