diff --git a/src/stage/timeline/marker-widget.hpp b/src/stage/timeline/marker-widget.hpp index ad8ad0bee..88bb4a471 100644 --- a/src/stage/timeline/marker-widget.hpp +++ b/src/stage/timeline/marker-widget.hpp @@ -62,6 +62,7 @@ namespace timeline { /** * @todo WIP-WIP as of 12/2016 + * @todo 9/2022 baseclass sigc::trackable is ambiguous, we inherit it from two chains (diamond of death) */ class MarkerWidget : public model::Widget diff --git a/src/stage/widget/element-box-widget.cpp b/src/stage/widget/element-box-widget.cpp index 8b522c99f..5a5f1ef3b 100644 --- a/src/stage/widget/element-box-widget.cpp +++ b/src/stage/widget/element-box-widget.cpp @@ -68,14 +68,30 @@ namespace widget { } + Literal + ElementBoxWidget::Strategy::getIconID() const + { + ///////////////////////////////////////////////////////////////////////////TICKET #1185 : implement logic to pick suitable icon... + return "track_enabled"; //////////////////////////////////////////////TICKET #1219 : maybe at leas a better generic placeholder icon...? + } + + Gtk::IconSize + ElementBoxWidget::Strategy::getIconSize() const + { + ///////////////////////////////////////////////////////////////////////////TICKET #1185 : is Icon-Size flexible under some circumstances? + return Gtk::ICON_SIZE_MENU; + } + + ElementBoxWidget::ElementBoxWidget (Strategy strategy) : Frame{} , label_{Gtk::ORIENTATION_HORIZONTAL} - , icon_{Gtk::StockID{"track_enabled"}, Gtk::ICON_SIZE_MENU} ////////////////TODO: use of stockIDs is deprecated; care for a more modern icon naming scheme + , icon_{Gtk::StockID{strategy.getIconID()} ///////////////////////////////TICKET #1030 : use of stockIDs is deprecated; care for a more modern icon naming scheme + , strategy.getIconSize()} { strategy.configure(); set_name(ID_element); - get_style_context()->add_class(CLASS_background); + get_style_context()->add_class(CLASS_background); // Style to ensure an opaque backdrop set_label_align(0.0, 0.0); set_label_widget(label_); diff --git a/src/stage/widget/element-box-widget.hpp b/src/stage/widget/element-box-widget.hpp index 308d8454b..252d7ccbc 100644 --- a/src/stage/widget/element-box-widget.hpp +++ b/src/stage/widget/element-box-widget.hpp @@ -46,6 +46,7 @@ #include "lib/builder-qualifier-support.hpp" //#include "lib/util.hpp" +#include "lib/symbol.hpp" #include "lib/format-string.hpp" //#include @@ -57,6 +58,7 @@ namespace stage { namespace widget { + using lib::Literal; using std::string; /////TODO using util::_Fmt; /////TODO debugging? @@ -132,6 +134,9 @@ namespace widget { /** decide upon the presentation strategy */ void configure(); + Literal getIconID() const; + Gtk::IconSize getIconSize() const; + cuString getName() const { diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 8fafda409..96e8a39c2 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -6359,6 +6359,25 @@ + + + + + + +

+ ...stammt im Kern noch von Joel Holdsworth < 2012 +

+ + + + + + + + + + @@ -18505,7 +18524,22 @@ + + + + + + + + + + + + + + +