diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp index d32b4167c..c48f16ef5 100644 --- a/src/gui/gtk-lumiera.hpp +++ b/src/gui/gtk-lumiera.hpp @@ -130,6 +130,9 @@ namespace gui { /** * Top level entry point: The Lumiera GTK UI. + * @todo as of 12/2016 this is a singleton, which is sketchy. + * It should be instantiated in local scope of GuiLifecycle + * within guistart.cpp and discarded right after shutdown ///////////////TICKET #1048 : rectify lifecycle */ class GtkLumiera : boost::noncopyable @@ -140,14 +143,14 @@ namespace gui { public: /** access the the global application object */ - static GtkLumiera& application(); + static GtkLumiera& application(); ////////////////////////////TICKET #1048 : this loophole needs to be closed /** start up the GUI and run the event thread */ void main(int argc, char *argv[]); - WindowManager& windowManager(); + WindowManager& windowManager(); ////////////////////////////TICKET #1048 : this loophole needs to be closed /** the name of the application */ diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index 7569c7d70..4af05afbd 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -64,8 +64,8 @@ namespace gui { ~WorkspaceWindow(); - gui::model::Project& getProject(); - gui::controller::Controller& getController(); + gui::model::Project& getProject(); ////////////////////////////TICKET #1048 : these getters need to disappear, they are no good!!!! + gui::controller::Controller& getController(); ////////////////////////////TICKET #1048 : no one has to muck around with WorkspaceWindow's internals PanelManager& getPanelManager(); void set_close_window_sensitive (bool enable); diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 7a9ffcd9e..c85594fb2 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -25,15 +25,59 @@ - - - - - - + + + + + + + + + + +

+ AUA: Henne oder Ei? +

+ + +
+ + + + + + + +

+ denn: +

+
    +
  • + Nexus verwendet CoreService als "upstream", um alle sonstigen Nachriten dorthin zuzustellen +
  • +
  • + CoreService hat Nexus als Upstream, um mit dem restlichen System kommunizieren zu können +
  • +
+ + +
+ +
+ + + + + + + + + + +