Timeline: add preliminary track-head display

just some labels, so that we can see the added content
TODO: unsolved problem: how to pass the track name

src/gui/timeline/track-body.cpp

@@ -64,7 +64,7 @@ namespace timeline {
   
   
   
-  TrackBody::TrackBody()
+  TrackBody::TrackBody (ID identity)
     : overviewHeight_{DEFAULT_OVERVIEW_HEIGHT_px}
     , contentHeight_{DEFAULT_OVERVIEW_HEIGHT_px}
     , subTracks_{}

src/gui/timeline/track-body.hpp

@@ -41,6 +41,7 @@
 #define GUI_TIMELINE_TRACK_BODY_H
 
 #include "gui/gtk-base.hpp"
+#include "gui/ctrl/bus-term.hpp"
 
 //#include "lib/util.hpp"
 
@@ -52,6 +53,8 @@
 namespace gui  {
 namespace timeline {
   
+  using ID = ctrl::BusTerm::ID;
+  
   
   /**
    * Helper to organise and draw the space allocated for a fork of sub-tracks.
@@ -75,7 +78,7 @@ namespace timeline {
       SubTracks subTracks_;
       
     public:
-      TrackBody ();
+      TrackBody (ID identity);
      ~TrackBody();
       
       uint calcHeight();

src/gui/timeline/track-head-widget.cpp

@@ -62,9 +62,15 @@ namespace timeline {
   
   
   
-  TrackHeadWidget::TrackHeadWidget ()
+  TrackHeadWidget::TrackHeadWidget (ID identity)
     : Gtk::Grid{}
+    , nameTODO_{identity.getSym()}
+    , treeTODO_{"X"}
     {
+      this->attach (nameTODO_, 0,0, 2,1);
+      this->attach (treeTODO_, 0,1, 1,1);
+      
+      this->show_all();
     }
   
   

src/gui/timeline/track-head-widget.hpp

@@ -46,6 +46,7 @@
 #define GUI_TIMELINE_TRACK_HEAD_WIDGET_H
 
 #include "gui/gtk-base.hpp"
+#include "gui/ctrl/bus-term.hpp"
 
 //#include "lib/util.hpp"
 
@@ -57,6 +58,7 @@
 namespace gui  {
 namespace timeline {
   
+  using ID = ctrl::BusTerm::ID;
   
   /**
    * Header pane control area corresponding to a Track with nested child Tracks.
@@ -68,8 +70,11 @@ namespace timeline {
   class TrackHeadWidget
     : public Gtk::Grid
     {
+      Gtk::Label nameTODO_;
+      Gtk::Label treeTODO_;
+      
     public:
-      TrackHeadWidget ();
+      TrackHeadWidget (ID identity);
      ~TrackHeadWidget();
       
       /** Integrate the control area for a nested sub track fork. */

src/gui/timeline/track-presenter.hpp

@@ -80,9 +80,9 @@ namespace timeline {
       TrackBody       body;
       
       template<class FUN>
-      DisplayFrame (FUN anchorDisplay)
-        : head{}
-        , body{}
+      DisplayFrame (ID id, FUN anchorDisplay)
+        : head{id}
+        , body{id}
         {
           anchorDisplay (head, body);
         }
@@ -121,9 +121,9 @@ namespace timeline {
        * @param nexus a way to connect this Controller to the UI-Bus.
        */
       template<class FUN>
-      TrackPresenter (ID identity, ctrl::BusTerm& nexus, FUN anchorDisplay)
-        : Controller{identity, nexus}
-        , display_{anchorDisplay}
+      TrackPresenter (ID id, ctrl::BusTerm& nexus, FUN anchorDisplay)
+        : Controller{id, nexus}
+        , display_{id, anchorDisplay}
         , subFork_{}
         , markers_{}
         , clips_{}

wiki/thinkPad.ichthyo.mm

@@ -18490,7 +18490,13 @@
 <arrowlink COLOR="#919fc6" DESTINATION="ID_165150753" ENDARROW="Default" ENDINCLINATION="-902;329;" ID="Arrow_ID_651613049" STARTARROW="None" STARTINCLINATION="823;93;"/>
 <icon BUILTIN="info"/>
 <node COLOR="#435e98" CREATED="1540639547294" ID="ID_133813709" MODIFIED="1540639561155" TEXT="TimelineID"/>
-<node COLOR="#435e98" CREATED="1540639550757" ID="ID_521896867" MODIFIED="1540639560108" TEXT="Root-TrackID"/>
+<node COLOR="#435e98" CREATED="1540639550757" ID="ID_521896867" MODIFIED="1540639560108" TEXT="Root-TrackID">
+<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1541462330990" ID="ID_1246009618" MODIFIED="1541462349597" TEXT="TODO: eigentlich redundant">
+<icon BUILTIN="broken-line"/>
+</node>
+<node CREATED="1541462351699" ID="ID_1571413865" MODIFIED="1541462364285" TEXT="sie ist immer &quot;fork&quot;, da es ein Attribut ist"/>
+<node CREATED="1541462368025" ID="ID_66547064" MODIFIED="1541462383522" TEXT="der Entry-ID-Typ ist GenNode"/>
+</node>
 </node>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1480694550601" ID="ID_391329400" MODIFIED="1538940840604" TEXT="TimelineController">
@@ -19236,7 +19242,7 @@
 </node>
 </node>
 <node CREATED="1540683900716" ID="ID_212914080" MODIFIED="1540684245714" TEXT="1.Quadrant == Controls"/>
-<node CREATED="1540683916490" ID="ID_191999039" MODIFIED="1540684245714" TEXT="3.Quadrand : leer (Fork)"/>
+<node CREATED="1540683916490" ID="ID_191999039" MODIFIED="1541388389927" TEXT="3.Quadrant : leer (Fork)"/>
 <node CREATED="1540683829267" ID="ID_828415712" MODIFIED="1540684245714" TEXT="in 4.Quadrant kommt">
 <node CREATED="1540683866753" ID="ID_616355214" MODIFIED="1540684245714" TEXT="entweder content control"/>
 <node CREATED="1540683879103" ID="ID_96481889" MODIFIED="1540684245714" TEXT="oder ein nested HeaderPane"/>
@@ -40834,6 +40840,23 @@
 </node>
 </node>
 </node>
+<node CREATED="1541455966429" ID="ID_973601831" MODIFIED="1541455977463">
+<richcontent TYPE="NODE"><html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Gtk::<b>Grid</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node COLOR="#435e98" CREATED="1541455995128" ID="ID_275278278" MODIFIED="1541456013927" TEXT="(ersetzt Gtk::Table @deprecated)">
+<font NAME="SansSerif" SIZE="10"/>
+</node>
+<node CREATED="1541456025225" ID="ID_1914314588" MODIFIED="1541456041128" TEXT="expand und Fill wie bei Gtk::Box"/>
+</node>
 </node>
 <node CREATED="1538583396203" ID="ID_243616989" MODIFIED="1538584118865" TEXT="TextView">
 <linktarget COLOR="#3251a9" DESTINATION="ID_243616989" ENDARROW="Default" ENDINCLINATION="-2060;-1360;" ID="Arrow_ID_794678010" SOURCE="ID_1836686899" STARTARROW="None" STARTINCLINATION="-3506;-148;"/>