diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 79e402310..7e8d356ea 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -21,67 +21,67 @@ lumigui_srcdir = $(top_srcdir)/src/gui #lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror lumigui_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ $(GTK_LUMIERA_CFLAGS) bin_PROGRAMS += lumigui -lumigui_SOURCES = \ - $(lumigui_srcdir)/gtk-lumiera.cpp \ - $(lumigui_srcdir)/gtk-lumiera.hpp \ - $(lumigui_srcdir)/window-manager.cpp \ - $(lumigui_srcdir)/window-manager.hpp \ - $(lumigui_srcdir)/workspace/actions.cpp \ - $(lumigui_srcdir)/workspace/actions.hpp \ - $(lumigui_srcdir)/workspace/workspace-window.cpp \ - $(lumigui_srcdir)/workspace/workspace-window.hpp \ - $(lumigui_srcdir)/dialogs/render.cpp \ - $(lumigui_srcdir)/dialogs/render.hpp \ - $(lumigui_srcdir)/dialogs/preferences-dialog.cpp \ - $(lumigui_srcdir)/dialogs/preferences-dialog.hpp \ - $(lumigui_srcdir)/panels/panel.cpp \ - $(lumigui_srcdir)/panels/panel.hpp \ - $(lumigui_srcdir)/panels/timeline-panel.cpp \ - $(lumigui_srcdir)/panels/timeline-panel.hpp \ - $(lumigui_srcdir)/panels/viewer-panel.cpp \ - $(lumigui_srcdir)/panels/viewer-panel.hpp \ - $(lumigui_srcdir)/panels/assets-panel.cpp \ - $(lumigui_srcdir)/panels/assets-panel.hpp \ - $(lumigui_srcdir)/widgets/video-display-widget.cpp \ - $(lumigui_srcdir)/widgets/video-display-widget.hpp \ - $(lumigui_srcdir)/widgets/timeline-widget.cpp \ - $(lumigui_srcdir)/widgets/timeline-widget.hpp \ - $(lumigui_srcdir)/widgets/timeline/header-container.cpp \ - $(lumigui_srcdir)/widgets/timeline/header-container.hpp \ - $(lumigui_srcdir)/widgets/timeline/track.cpp \ - $(lumigui_srcdir)/widgets/timeline/track.hpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-body.cpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-body.hpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-ruler.cpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-ruler.hpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-tool.cpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-tool.hpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp \ - $(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp \ - $(lumigui_srcdir)/model/project.cpp \ - $(lumigui_srcdir)/model/project.hpp \ - $(lumigui_srcdir)/output/displayer.cpp \ - $(lumigui_srcdir)/output/displayer.hpp \ - $(lumigui_srcdir)/output/gdkdisplayer.cpp \ - $(lumigui_srcdir)/output/gdkdisplayer.hpp \ - $(lumigui_srcdir)/output/xvdisplayer.cpp \ +lumigui_SOURCES = \ + $(lumigui_srcdir)/gtk-lumiera.cpp \ + $(lumigui_srcdir)/gtk-lumiera.hpp \ + $(lumigui_srcdir)/window-manager.cpp \ + $(lumigui_srcdir)/window-manager.hpp \ + $(lumigui_srcdir)/workspace/actions.cpp \ + $(lumigui_srcdir)/workspace/actions.hpp \ + $(lumigui_srcdir)/workspace/workspace-window.cpp \ + $(lumigui_srcdir)/workspace/workspace-window.hpp \ + $(lumigui_srcdir)/dialogs/render.cpp \ + $(lumigui_srcdir)/dialogs/render.hpp \ + $(lumigui_srcdir)/dialogs/preferences-dialog.cpp \ + $(lumigui_srcdir)/dialogs/preferences-dialog.hpp \ + $(lumigui_srcdir)/panels/panel.cpp \ + $(lumigui_srcdir)/panels/panel.hpp \ + $(lumigui_srcdir)/panels/timeline-panel.cpp \ + $(lumigui_srcdir)/panels/timeline-panel.hpp \ + $(lumigui_srcdir)/panels/viewer-panel.cpp \ + $(lumigui_srcdir)/panels/viewer-panel.hpp \ + $(lumigui_srcdir)/panels/assets-panel.cpp \ + $(lumigui_srcdir)/panels/assets-panel.hpp \ + $(lumigui_srcdir)/widgets/video-display-widget.cpp \ + $(lumigui_srcdir)/widgets/video-display-widget.hpp \ + $(lumigui_srcdir)/widgets/timeline-widget.cpp \ + $(lumigui_srcdir)/widgets/timeline-widget.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-header-container.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-header-container.hpp \ + $(lumigui_srcdir)/widgets/timeline/track.cpp \ + $(lumigui_srcdir)/widgets/timeline/track.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-body.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-body.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-ruler.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-ruler.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-tool.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-tool.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp \ + $(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp \ + $(lumigui_srcdir)/model/project.cpp \ + $(lumigui_srcdir)/model/project.hpp \ + $(lumigui_srcdir)/output/displayer.cpp \ + $(lumigui_srcdir)/output/displayer.hpp \ + $(lumigui_srcdir)/output/gdkdisplayer.cpp \ + $(lumigui_srcdir)/output/gdkdisplayer.hpp \ + $(lumigui_srcdir)/output/xvdisplayer.cpp \ $(lumigui_srcdir)/output/xvdisplayer.hpp lumigui_LDFLAGS = lumigui_LDADD = $(GTK_LUMIERA_LIBS) liblumicommon.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -lumigui_DEPENDENCIES = \ - $(top_builddir)/lumiera_ui.rc \ - $(top_builddir)/liblumicommon.a \ +lumigui_DEPENDENCIES = \ + $(top_builddir)/lumiera_ui.rc \ + $(top_builddir)/liblumicommon.a \ $(top_builddir)/liblumi.a $(top_builddir)/lumiera_ui.rc: diff --git a/src/gui/lumiera_ui.rc b/src/gui/lumiera_ui.rc index 9d4f4d771..dcce8df48 100644 --- a/src/gui/lumiera_ui.rc +++ b/src/gui/lumiera_ui.rc @@ -152,13 +152,13 @@ style "timeline_ruler" = "default_base" gtkmm__CustomObject_TimelineRuler::playback_period_arrow_stem_size = 3 } -style "header_container" = "default_base" +style "timeline_header_container" = "default_base" { gtkmm__CustomObject_HeaderContainer::heading_margin = 4 } class "gtkmm__CustomObject_TimelineBody" style:highest "timeline_body" class "gtkmm__CustomObject_TimelineRuler" style:highest "timeline_ruler" -class "gtkmm__CustomObject_HeaderContainer" style:highest "header_container" +class "gtkmm__CustomObject_TimelineHeaderContainer" style:highest "timeline_header_container" diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index 20014e675..6c397f9f1 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -53,7 +53,7 @@ TimelineWidget::TimelineWidget() : { body = new TimelineBody(this); ENSURE(body != NULL); - headerContainer = new HeaderContainer(this); + headerContainer = new TimelineHeaderContainer(this); ENSURE(headerContainer != NULL); ruler = new TimelineRuler(this); ENSURE(ruler != NULL); diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp index 9a43769ed..7785e7bc8 100644 --- a/src/gui/widgets/timeline-widget.hpp +++ b/src/gui/widgets/timeline-widget.hpp @@ -27,7 +27,7 @@ #define TIMELINE_WIDGET_HPP #include "../gtk-lumiera.hpp" -#include "timeline/header-container.hpp" +#include "timeline/timeline-header-container.hpp" #include "timeline/timeline-body.hpp" #include "timeline/timeline-ruler.hpp" #include "timeline/timeline-tool.hpp" @@ -228,7 +228,7 @@ protected: std::vector tracks; // Child Widgets - timeline::HeaderContainer *headerContainer; + timeline::TimelineHeaderContainer *headerContainer; timeline::TimelineBody *body; timeline::TimelineRuler *ruler; @@ -257,7 +257,7 @@ protected: static const double ZoomIncrement; friend class timeline::TimelineBody; - friend class timeline::HeaderContainer; + friend class timeline::TimelineHeaderContainer; friend class timeline::TimelineRuler; friend class timeline::Tool; friend class timeline::ArrowTool; diff --git a/src/gui/widgets/timeline/header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp similarity index 88% rename from src/gui/widgets/timeline/header-container.cpp rename to src/gui/widgets/timeline/timeline-header-container.cpp index 27812ccd1..ba8323aab 100644 --- a/src/gui/widgets/timeline/header-container.cpp +++ b/src/gui/widgets/timeline/timeline-header-container.cpp @@ -1,5 +1,6 @@ /* - header-container.cpp - Implementation of the header container widget + timeline-header-container.cpp - Implementation of the timeline + header container widget Copyright (C) Lumiera.org 2008, Joel Holdsworth @@ -22,7 +23,7 @@ #include -#include "header-container.hpp" +#include "timeline-header-container.hpp" #include "track.hpp" #include "../timeline-widget.hpp" @@ -33,9 +34,9 @@ namespace gui { namespace widgets { namespace timeline { -HeaderContainer::HeaderContainer(gui::widgets::TimelineWidget +TimelineHeaderContainer::TimelineHeaderContainer(gui::widgets::TimelineWidget *timeline_widget) : - Glib::ObjectBase("HeaderContainer"), + Glib::ObjectBase("TimelineHeaderContainer"), timelineWidget(timeline_widget), margin(-1) { @@ -49,14 +50,14 @@ HeaderContainer::HeaderContainer(gui::widgets::TimelineWidget // Connect to the timeline widget's vertical scroll event, // so that we get notified when the view shifts timelineWidget->verticalAdjustment.signal_value_changed().connect( - sigc::mem_fun(this, &HeaderContainer::on_scroll) ); + sigc::mem_fun(this, &TimelineHeaderContainer::on_scroll) ); // Install style properties register_styles(); } void -HeaderContainer::update_headers() +TimelineHeaderContainer::update_headers() { REQUIRE(timelineWidget != NULL); @@ -83,7 +84,7 @@ HeaderContainer::update_headers() } void -HeaderContainer::on_realize() +TimelineHeaderContainer::on_realize() { set_flags(Gtk::NO_WINDOW); @@ -119,7 +120,7 @@ HeaderContainer::on_realize() } void -HeaderContainer::on_unrealize() +TimelineHeaderContainer::on_unrealize() { // Unreference any window we may have created gdkWindow.clear(); @@ -129,7 +130,7 @@ HeaderContainer::on_unrealize() } void -HeaderContainer::on_size_request (Requisition* requisition) +TimelineHeaderContainer::on_size_request (Requisition* requisition) { // Initialize the output parameter: *requisition = Gtk::Requisition(); @@ -148,7 +149,7 @@ HeaderContainer::on_size_request (Requisition* requisition) } void -HeaderContainer::on_size_allocate (Allocation& allocation) +TimelineHeaderContainer::on_size_allocate (Allocation& allocation) { // Use the offered allocation for this container: set_allocation(allocation); @@ -162,7 +163,7 @@ HeaderContainer::on_size_allocate (Allocation& allocation) } void -HeaderContainer::forall_vfunc(gboolean /* include_internals */, +TimelineHeaderContainer::forall_vfunc(gboolean /* include_internals */, GtkCallback callback, gpointer callback_data) { BOOST_FOREACH( RootHeader &header, rootHeaders ) @@ -173,7 +174,7 @@ HeaderContainer::forall_vfunc(gboolean /* include_internals */, } bool -HeaderContainer::on_expose_event(GdkEventExpose *event) +TimelineHeaderContainer::on_expose_event(GdkEventExpose *event) { if(gdkWindow) { @@ -211,7 +212,7 @@ HeaderContainer::on_expose_event(GdkEventExpose *event) } void -HeaderContainer::on_scroll() +TimelineHeaderContainer::on_scroll() { // If the scroll has changed, we will have to shift all the // header widgets @@ -219,7 +220,7 @@ HeaderContainer::on_scroll() } void -HeaderContainer::layout_headers() +TimelineHeaderContainer::layout_headers() { ASSERT(timelineWidget != NULL); @@ -261,7 +262,7 @@ HeaderContainer::layout_headers() } void -HeaderContainer::register_styles() const +TimelineHeaderContainer::register_styles() const { GtkWidgetClass *klass = GTK_WIDGET_CLASS(G_OBJECT_GET_CLASS(gobj())); @@ -273,7 +274,7 @@ HeaderContainer::register_styles() const } void -HeaderContainer::read_styles() +TimelineHeaderContainer::read_styles() { if(margin <= 0) get_style_property("heading_margin", margin); diff --git a/src/gui/widgets/timeline/header-container.hpp b/src/gui/widgets/timeline/timeline-header-container.hpp similarity index 90% rename from src/gui/widgets/timeline/header-container.hpp rename to src/gui/widgets/timeline/timeline-header-container.hpp index 84f15116d..480ab6cde 100644 --- a/src/gui/widgets/timeline/header-container.hpp +++ b/src/gui/widgets/timeline/timeline-header-container.hpp @@ -1,5 +1,6 @@ /* - header-container.hpp - Declaration of the header container widget + timeline-header-container.cpp - Declaration of the timeline + header container widget Copyright (C) Lumiera.org 2008, Joel Holdsworth @@ -19,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/** @file header-container.hpp +/** @file timeline-header-container.hpp ** This file contains the definition of the header container ** widget */ @@ -40,11 +41,11 @@ namespace timeline { class Track; /** - * A helper class for the TimelineWidget. HeaderContainer is - * container widget for all the left-hand-side header widgets + * A helper class for the TimelineWidget. TimelineHeaderContainer + * is container widget for all the left-hand-side header widgets * associated with timeline tracks. */ -class HeaderContainer : public Gtk::Container +class TimelineHeaderContainer : public Gtk::Container { public: /** @@ -52,7 +53,7 @@ public: * * @param[in] timeline_widget A pointer to the owner timeline widget */ - HeaderContainer(gui::widgets::TimelineWidget* timeline_widget); + TimelineHeaderContainer(gui::widgets::TimelineWidget* timeline_widget); /** * Attaches the header all the header widgets of root