diff --git a/src/gui/timeline/track-body.cpp b/src/gui/timeline/track-body.cpp index f953432bc..9412dbe93 100644 --- a/src/gui/timeline/track-body.cpp +++ b/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_{} diff --git a/src/gui/timeline/track-body.hpp b/src/gui/timeline/track-body.hpp index 0abcdf4e5..3cb59e26a 100644 --- a/src/gui/timeline/track-body.hpp +++ b/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(); diff --git a/src/gui/timeline/track-head-widget.cpp b/src/gui/timeline/track-head-widget.cpp index 518ac9dc4..506c62410 100644 --- a/src/gui/timeline/track-head-widget.cpp +++ b/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(); } diff --git a/src/gui/timeline/track-head-widget.hpp b/src/gui/timeline/track-head-widget.hpp index cb448bf51..2bf611cba 100644 --- a/src/gui/timeline/track-head-widget.hpp +++ b/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. */ diff --git a/src/gui/timeline/track-presenter.hpp b/src/gui/timeline/track-presenter.hpp index a2a2244ee..926b88f98 100644 --- a/src/gui/timeline/track-presenter.hpp +++ b/src/gui/timeline/track-presenter.hpp @@ -80,9 +80,9 @@ namespace timeline { TrackBody body; template - 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 - 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_{} diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 564be6475..4505370ec 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -18490,7 +18490,13 @@ - + + + + + + + @@ -19236,7 +19242,7 @@ - + @@ -40834,6 +40840,23 @@ + + + + + + +

+ Gtk::Grid +

+ + +
+ + + + +