From d49983d4cbf013b4e009a65f9b843111b98f7e82 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 27 Jan 2017 22:17:58 +0100 Subject: [PATCH] identify items which force GtkLumiera to be a singleton - WindowList (ex WindowManager) - Project & Controller the latter ones are defunct and can be replicated down into each of the old timeline pannel instances. They just serve the purpose to keep this old code barely functional, so it can be used as reference for building the new timeline --- src/gui/panel/timeline-panel-obsolete.cpp | 2 + src/gui/panel/timeline-panel-obsolete.hpp | 9 ++ src/gui/workspace/actions.cpp | 8 +- wiki/thinkPad.ichthyo.mm | 125 ++++++++++++++++++++-- 4 files changed, 132 insertions(+), 12 deletions(-) diff --git a/src/gui/panel/timeline-panel-obsolete.cpp b/src/gui/panel/timeline-panel-obsolete.cpp index 411428236..66419882a 100644 --- a/src/gui/panel/timeline-panel-obsolete.cpp +++ b/src/gui/panel/timeline-panel-obsolete.cpp @@ -53,6 +53,8 @@ namespace panel { TimelinePanelObsolete::TimelinePanelObsolete (workspace::PanelManager& panelManager, Gdl::DockItem& dockItem) : Panel(panelManager, dockItem, getTitle(), getStockID()) + , obsoleteProject_{} + , obsoleteController_{obsoleteProject_} , timeCode("sequence_clock", "timecode_widget", true) , previousButton(Stock::MEDIA_PREVIOUS) , rewindButton(Stock::MEDIA_REWIND) diff --git a/src/gui/panel/timeline-panel-obsolete.hpp b/src/gui/panel/timeline-panel-obsolete.hpp index 0c003175c..4e0fdfde0 100644 --- a/src/gui/panel/timeline-panel-obsolete.hpp +++ b/src/gui/panel/timeline-panel-obsolete.hpp @@ -33,6 +33,8 @@ #include "gui/widget/timecode-widget.hpp" #include "gui/widget/timeline-widget.hpp" #include "gui/widget/timeline/timeline-zoom-scale.hpp" +#include "gui/model/project.hpp" +#include "gui/ui-bus.hpp" ////////////TODO for the obsolete Controller #include "lib/time/timevalue.hpp" #include "lib/util-coll.hpp" @@ -51,6 +53,8 @@ namespace model{ using std::shared_ptr; using std::weak_ptr; using lib::time::Time; + using model::Project; + using controller::Controller; @@ -144,6 +148,11 @@ namespace model{ //----- Data -----// + // the obsolete and defunct UI model + Project obsoleteProject_; + Controller obsoleteController_; /////////////////////////////////////////TICKET #1048 GtkLumiera must not be a singleton + + // Grip Widgets ButtonBar toolbar; diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index 5b8a25812..1e298b4c9 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -272,7 +272,7 @@ namespace workspace { void Actions::onMenu_file_render() { - dialog::Render dialog(workspaceWindow_); + dialog::Render dialog(workspaceWindow_); ////////////////////////////////////TICKET #1069 how to refer to the _current window_ dialog.run(); } @@ -291,7 +291,7 @@ namespace workspace { void Actions::onMenu_edit_preferences() { - dialog::PreferencesDialog dialog(workspaceWindow_); + dialog::PreferencesDialog dialog(workspaceWindow_); ////////////////////////////////TICKET #1069 how to refer to the _current window_ dialog.run(); } @@ -331,7 +331,7 @@ namespace workspace { void Actions::onMenu_sequence_add() { - dialog::NameChooser dialog(workspaceWindow_, + dialog::NameChooser dialog(workspaceWindow_, ////////////////////////////////////TICKET #1069 how to refer to the _current window_ _("Add Sequence"), _("New Sequence")); if(dialog.run() == RESPONSE_OK) workspaceWindow_.getProject().add_new_sequence(dialog.getName()); @@ -369,7 +369,7 @@ namespace workspace { void Actions::onMenu_show_panel(int panel_index) { - workspaceWindow_.getPanelManager().showPanel(panel_index); + workspaceWindow_.getPanelManager().showPanel(panel_index); /////////////////////////TICKET #1069 how to refer to the _current window_ } diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 518f8d32b..9e10b4314 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -1636,8 +1636,18 @@ - - + + + + + + + + + + + + @@ -1650,6 +1660,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1668,8 +1702,9 @@ - + + @@ -1688,6 +1723,34 @@ + + + + + + + + + + + + + + +

+ eigentlich wollen wir "das aktuelle" +

+ + + + + + + + + + + @@ -1695,7 +1758,7 @@ - + @@ -1731,15 +1794,25 @@ - - + + - - + + + + + + + + + + + + @@ -9541,6 +9614,42 @@ + + + + + + + + + +

+ Beispiel: Aktionen, die im globalen Menü stehen. +

+

+ "Add Sequence" +

+
    +
  • + wer bildet daraus ein Command? +
    • +
  • + auf welchen Kontext bezieht sich das +
    • +
  • + wen kann die Menü-Registrierung konkret ansprechen (Verdrahtung ist statisch) +
    • +
+ + + + + + + + + +