Commit graph

348 commits

Author SHA1 Message Date
Joel Holdsworth
932697b836 Made animation parabolic 2009-01-03 17:22:12 +00:00
Joel Holdsworth
dc9dd3fbd7 WIP: Initial track tree expand animation 2009-01-03 16:06:30 +00:00
Joel Holdsworth
2d4a341123 Transition TimelineHeaderContainer::draw_header_decoration to use the
layout tree
2009-01-03 15:21:04 +00:00
Joel Holdsworth
1d376e4292 Wrapped TimelineBody::track in a scoped_ptr 2009-01-02 16:47:29 +00:00
Joel Holdsworth
cd94bf9765 Transitioned TimelineBody and timeline tools to having reference to
TimelineWidget not pointers
2009-01-02 16:32:40 +00:00
Joel Holdsworth
6bfef606a0 Transition TimelineRuler to have a reference to TimelineWidget not a
pointer
2009-01-02 16:21:52 +00:00
Joel Holdsworth
9581fc6779 Corrected a small mistake in timeline-header-container.cpp 2009-01-02 16:18:29 +00:00
Joel Holdsworth
fa60ea76dd Small correction to timeline-header-container.hpp 2009-01-02 16:17:10 +00:00
Joel Holdsworth
bf0cfc295e Transitioned TimelineHeaderContainer to having a reference to
TimelineWidget, not a pointer
2009-01-02 16:15:42 +00:00
Joel Holdsworth
eb6f364084 Merge branch 'newlayout' into gui 2009-01-02 16:07:58 +00:00
Joel Holdsworth
dfbe3764cd Added documentation to timeline-layout-helper.hpp 2009-01-02 15:54:32 +00:00
Joel Holdsworth
a28a901539 Added an extra const of consistency 2009-01-02 15:47:56 +00:00
Joel Holdsworth
643e1c9be1 Fixed an undefined constant 2009-01-02 15:26:12 +00:00
Joel Holdsworth
8ad308e679 Fixed the find functions so they're offset by the scroll position, not
absolute
2009-01-02 15:25:45 +00:00
Joel Holdsworth
2a9f1764c8 Tidied TimelineLayoutHelper 2009-01-02 13:18:09 +00:00
Joel Holdsworth
1c685a2d61 Added a new layout update infrastructure 2009-01-02 13:03:00 +00:00
Joel Holdsworth
a501616a87 Transitioned TimelineLayoutHelper::get_track_header_rect to return
weak_ptr
2009-01-02 12:43:21 +00:00
Joel Holdsworth
e135cb18cb Removed TimelineBody::track_from_point 2009-01-02 12:41:30 +00:00
Joel Holdsworth
86947936a5 Tidied TimelineBody::draw_track somewhat 2009-01-02 12:20:43 +00:00
Joel Holdsworth
bcd5dababe Transitioned TimelineBody drawing code to use the TimelineLayoutHelper 2009-01-02 12:17:19 +00:00
Joel Holdsworth
9fac0b8b46 Renamed some local variables for greater consistency 2009-01-02 11:53:32 +00:00
Joel Holdsworth
c05f0fbbfb Added a comment 2009-01-02 11:39:45 +00:00
Joel Holdsworth
325a2101e7 Moved read_styles to occur earlier in the creation of
TimelineHeaderContainer
2009-01-02 00:47:09 +00:00
Joel Holdsworth
e3a7b896d0 Removed debug g_message calls 2009-01-02 00:45:20 +00:00
Joel Holdsworth
8285daec39 Added more strictness to the use of read_styles 2009-01-02 00:44:10 +00:00
Joel Holdsworth
85d6a19dd4 Fixed a bug caused by TimelineHeaderContainer::read_styles being called
at the wrong time
2009-01-02 00:33:40 +00:00
Joel Holdsworth
afb5b7298f WIP: Applying new layout system 2009-01-01 18:43:46 +00:00
Joel Holdsworth
ac28251915 Added layout code from TimelineHeaderContainer 2009-01-01 13:31:34 +00:00
Joel Holdsworth
8d44b90a8b Removed a spurious lumiera:: 2008-12-31 17:29:57 +00:00
Joel Holdsworth
8d092d3b85 Added TimelineLayoutHelper::clone_tree_from_sequence 2008-12-31 17:05:32 +00:00
Joel Holdsworth
78a9ebb258 Added a track tree object to the layout helper 2008-12-30 23:07:59 +00:00
Joel Holdsworth
77c056266f Added empty timeline layout helper class 2008-12-30 22:27:09 +00:00
Joel Holdsworth
c32ae85a38 Small comment correction in timeline-header-container.hpp 2008-12-30 22:10:24 +00:00
Joel Holdsworth
4af80c78d8 Reimplemented nested track deleting so it work correctly 2008-12-30 21:50:18 +00:00
Joel Holdsworth
910bf4b4e4 Added "Remove" to the track dropdown menu 2008-12-30 15:20:19 +00:00
Joel Holdsworth
8cb48a7298 Squished a whole load of warnings 2008-12-30 12:35:58 +00:00
Joel Holdsworth
e17cf45b08 Added an arrow to the MenuButton class 2008-12-29 16:29:30 +00:00
Joel Holdsworth
b4ce796c94 Added track name setting 2008-12-27 22:02:18 +00:00
Joel Holdsworth
7a838fc4eb Added a name dialog for track 2008-12-26 19:51:41 +00:00
Joel Holdsworth
33afd58b8e Converted all ASSERTs to REQUIREs 2008-12-26 18:58:29 +00:00
Joel Holdsworth
58d2f05db4 Added some documentation to menu-bbutton.hpp 2008-12-26 18:14:45 +00:00
Joel Holdsworth
be8d7644ed Added the MenuButton class for buttons with popup menus 2008-12-26 18:10:28 +00:00
Joel Holdsworth
125db978ba WIP: Experimenting with track headers 2008-12-22 11:36:46 +00:00
Joel Holdsworth
992cd4d77b Added remove track feature 2008-12-20 14:31:11 +00:00
Joel Holdsworth
bc2fdc40e9 Transitioned TimelineHeaderContainer::headerBoxes from using shared_ptr
to weak_ptr
2008-12-20 13:00:48 +00:00
Joel Holdsworth
3dd30c848d Added a const 2008-12-20 11:51:54 +00:00
Joel Holdsworth
aafa600422 Modified trackMap to map shared_ptr<model::Track> not model::Track* 2008-12-20 11:45:23 +00:00
Joel Holdsworth
715f76bc8d Made the header's context menu localizable 2008-12-20 11:27:48 +00:00
Joel Holdsworth
6cb533f564 Corrected some source-formatting mistakes 2008-12-20 11:07:20 +00:00
Joel Holdsworth
cf6e174d85 Tidied TimelineHeaderContainer declaration, and relocated context menu
setup there
2008-12-17 18:55:38 +00:00
Joel Holdsworth
f3351d1380 Removed a redundant include 2008-12-17 18:48:04 +00:00
Joel Holdsworth
8e551acb60 Added more documentation to timeline-header-container.hpp 2008-12-17 18:47:07 +00:00
Joel Holdsworth
396b2b889f Tidied and added some documentation to timeline-header-container.hpp 2008-12-17 18:32:28 +00:00
Joel Holdsworth
0c55dfb85f Tidied set_parent_recursive 2008-12-17 18:20:52 +00:00
Joel Holdsworth
3914de5866 Silenced a GTK parenting warning 2008-12-17 18:18:37 +00:00
Joel Holdsworth
35cfe48dfc Added a context menu with an "Add Track" command 2008-12-17 00:03:30 +00:00
Joel Holdsworth
1ecccb5925 Fixed set_icon_size for temporary Debian Etch compatibility 2008-12-16 22:55:32 +00:00
Joel Holdsworth
8b5733c293 Merge branch 'sharedlib' of git.lumiera.org:/git/lumiera/ct into gui
Conflicts:

	src/gui/Makefile.am
2008-12-16 20:44:33 +00:00
eb14eaa376 temporary fix to make it compile on Etch 2008-12-15 01:08:30 +01:00
Joel Holdsworth
6cbd4282c1 Restructured model track tree, and improved child access 2008-12-13 16:58:41 +00:00
Joel Holdsworth
fdb75fdd2a Corrected some problems that emerged on the build server 2008-12-13 13:57:19 +00:00
Joel Holdsworth
d61daa0b2f Misc tidy-ups 2008-12-10 18:09:01 +00:00
Joel Holdsworth
7c1046e162 Unified Sequence and Track together as TrackBase 2008-12-10 18:04:02 +00:00
Joel Holdsworth
22f425a25c Added some documentation to timeline-widget.hpp 2008-12-10 17:22:49 +00:00
Joel Holdsworth
528d02931a Converted timeline::Track* to boost::shared_ptr<timeline::Track> 2008-12-08 22:30:54 +00:00
Joel Holdsworth
b27545e105 Corrected a header layout problem when adding the first timeline widget
to the Notebook
2008-12-06 19:58:43 +00:00
Joel Holdsworth
b8e5900067 Corrected a bug in create_timeline_tracks_from_branch 2008-12-06 19:26:46 +00:00
Joel Holdsworth
418bd87419 Made use of util::contains to reduce the volume of boilerplate 2008-12-06 14:52:59 +00:00
Joel Holdsworth
619c5b0769 Corrected an ENSURE condition 2008-12-06 14:48:52 +00:00
Joel Holdsworth
d75261ea23 Corrected some REQUIRE(model_track != NULL) to REQUIRE(model_track) 2008-12-06 14:36:29 +00:00
Joel Holdsworth
19c97fd52a Replaced model::Track* with boost::shared_ptr<Track> 2008-12-06 14:08:03 +00:00
Joel Holdsworth
da3d14da72 Replaced Sequence* with boost::shared_ptr<Sequence> 2008-12-05 20:17:56 +00:00
Joel Holdsworth
e1f752f55d Tidied up create_timeline_tracks 2008-11-29 17:02:27 +00:00
Joel Holdsworth
7a86c08ec8 Added some documentation 2008-11-29 16:40:50 +00:00
Joel Holdsworth
ed37bed4c6 Fixed a memory leak 2008-11-29 16:33:24 +00:00
Joel Holdsworth
0ef3917553 Added an error condition for unknown track types 2008-11-29 16:30:45 +00:00
Joel Holdsworth
4f4234b62c Made the timeline view model driven 2008-11-29 16:13:58 +00:00
Joel Holdsworth
cf4898e70f Removed a spurious timeline:: 2008-11-25 21:44:33 +00:00
Joel Holdsworth
4470baf8f5 Renamed some timeline widget helper class files to avoid file name
collisions with the Model
2008-11-25 21:31:45 +00:00
Joel Holdsworth
b9d62c9be9 Removed spurious timeline:: in group-track 2008-11-25 21:19:30 +00:00
Joel Holdsworth
25dc64575e Corrected some mistakes in clip-track documentation 2008-11-25 21:12:56 +00:00
Joel Holdsworth
3d35f2e535 Added add/remove of sequences 2008-11-22 19:08:12 +00:00
Joel Holdsworth
10d256f833 Added dummy clip boxes 2008-11-22 13:36:46 +00:00
Joel Holdsworth
34e67cd01e Made TrackPadding insert between tracks, rather than shortening tracks 2008-11-22 12:33:58 +00:00
Joel Holdsworth
f0ab871cb3 The other half of the previous commit 2008-11-19 22:56:46 +00:00
Joel Holdsworth
aed6b09572 Refactored timeline view window code into a helper, and added dummy
track drawing code
2008-11-19 22:42:38 +00:00
Joel Holdsworth
b3aac4bc90 Changed the bounding box for the expander button 2008-11-19 18:07:10 +00:00
Joel Holdsworth
7dfbd0e848 Fixed a comment 2008-11-19 17:49:06 +00:00
Joel Holdsworth
5b9c4fa42d Fixed a headers layout bug 2008-11-19 17:44:57 +00:00
Joel Holdsworth
b2fad8d9a5 Fixed the problem with Etch support for 16x16 icons 2008-11-18 22:06:31 +00:00
Joel Holdsworth
7b52ff247e Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui 2008-11-15 23:37:21 +00:00
Joel Holdsworth
bfc34f8b1c Refactored Track to distinguish GroupTracks, and added expand/collapse
functionality
2008-11-15 23:36:22 +00:00
Joel Holdsworth
6c50182db1 Added support for highlighting the hovering track 2008-11-15 15:17:26 +00:00
9f8f0c7c20 temp. fix to make it compile on Etch based system 2008-10-28 01:56:51 +01:00
Joel Holdsworth
efd9ab771b Added track tree support and added widgets to headers 2008-10-22 23:11:23 +01:00
Joel Holdsworth
a3030515be Corrected a selection rendering bug in TimelineBody 2008-10-22 22:23:04 +01:00
Joel Holdsworth
d89e979aa0 Renamed HeaderContainer to TimelineHeaderContainer 2008-10-18 11:20:02 +01:00
Joel Holdsworth
58e4920048 Corrected namespaces from lumiera::gui:: to gui:: 2008-10-18 00:13:27 +01:00
Joel Holdsworth
c2d43aba2b Advanced code in the HeaderContainer 2008-10-17 23:36:37 +01:00
Joel Holdsworth
094ce0654d Added playback support in the timeline 2008-10-07 21:17:29 +01:00
Joel Holdsworth
430ef04bc5 Fixed hyperactive scroll wheel zoom 2008-09-02 22:42:10 +01:00
Joel Holdsworth
708aea87bd Fixed a bug with body redrawing and added some documentation 2008-09-02 22:39:53 +01:00
Joel Holdsworth
b0b436cb92 Added some documentation to body and ruler 2008-08-30 23:10:00 +01:00
Joel Holdsworth
49f87b28bb Added support for audacity style playback period, and added some
documentation
2008-08-30 22:34:26 +01:00
Joel Holdsworth
4e5e298bbb Added a time indicator widget 2008-08-16 22:06:46 +01:00
Joel Holdsworth
a845b625b4 Added more documentation 2008-08-16 17:41:57 +01:00
Joel Holdsworth
1532bc40e0 Added and corrected documentation 2008-08-16 16:44:52 +01:00
Joel Holdsworth
57aed7b40d Added resizing of selection area, and some documentation 2008-08-16 16:02:12 +01:00
Joel Holdsworth
39bd8aac74 Rerouted some dependancies on gtk-mm 2008-08-16 12:38:35 +01:00
Joel Holdsworth
9760b0fff0 Further tidied up tools and added some documentation 2008-08-16 12:32:26 +01:00
Joel Holdsworth
94cd88a92a Tidied up IBeam tool code 2008-08-16 12:17:28 +01:00
Joel Holdsworth
a186b7e507 Added out of bounds scrolling during I-Beam dragging 2008-08-15 22:40:57 +01:00
Joel Holdsworth
1b89b61370 Made the selection marquee stylable 2008-08-13 23:47:47 +01:00
Joel Holdsworth
2082f0843b Initial implementation of I-Beam tool. Needs more work 2008-08-07 20:27:41 +01:00
Joel Holdsworth
45ca590c38 Reinstated a small efficiency 2008-08-04 16:40:38 +01:00
Joel Holdsworth
2ee6f6be62 Tidied and simplified video display widget, and added cursor support to
the ibeam and arrow tool
2008-08-04 16:39:36 +01:00
Joel Holdsworth
17d0883d09 Added basic support for multiple tools in the timeline view 2008-07-30 00:12:37 +01:00
Joel Holdsworth
9bad04751f Fixed scroll layout loop bug. 2008-07-23 23:23:48 +01:00
Joel Holdsworth
4907b19cce Set the page size of the horizontal timeline scroll bar 2008-07-19 16:35:56 +01:00
Joel Holdsworth
e3d6026d0b Retired VideoTrack - all tracks are the same 2008-07-17 19:35:49 +01:00
Joel Holdsworth
8689d0dced Refactored widget mouse movement handling, removed some Glib::RefPtrs, and tidied a few things 2008-07-17 19:07:38 +01:00
Joel Holdsworth
063a22fcd5 Added zoom toolbar buttons and middle click view shifting to the
timeline
2008-07-16 22:33:42 +01:00
Joel Holdsworth
b2df771149 Converted mouse chevron to use pixels not time values 2008-07-15 18:36:43 +01:00
Joel Holdsworth
6e0abf0e44 Added code to keep the mouse chevron in synch as the timeline view window changes 2008-07-15 18:25:21 +01:00
Joel Holdsworth
ec6c20149c Fixed broken timeline scrollwheel, added a const 2008-07-14 20:16:11 +01:00
Joel Holdsworth
8d63d7adb4 Added a mouse chevron to the ruler 2008-06-25 20:23:53 +01:00
Joel Holdsworth
7752130d99 Added my name to copyright in configure.ac, and corrected some
indentation
2008-06-23 21:21:29 +01:00
Joel Holdsworth
3a5482a141 Tidied styles. Made min_division_width stylable 2008-06-23 21:18:20 +01:00
Joel Holdsworth
56291f6c40 Made ruler more stylable, and added minor ticks 2008-06-23 21:01:29 +01:00
Joel Holdsworth
38a9a1c892 Added minor tick-marks 2008-06-23 17:48:48 +01:00
Joel Holdsworth
a7aff05dd3 Styled timeline text 2008-06-23 17:07:57 +01:00
Joel Holdsworth
8e940b879d Added auto selection of major tick values to timeline ruler 2008-06-23 15:42:14 +01:00
Joel Holdsworth
4275c7cf8c Added zooming of the timeline with Ctrl+Scroll 2008-06-23 11:17:19 +01:00
Joel Holdsworth
6e944c1412 Added scroll wheel scrolling to the timeline. Corrected some indentation 2008-06-23 10:54:37 +01:00
Joel Holdsworth
e18b0a1d5f Added scrolling and major timeline-ruler ticks 2008-06-19 23:35:53 +01:00
Joel Holdsworth
25f28ee586 Corrected some indentation 2008-06-19 21:57:53 +01:00
Joel Holdsworth
f8a2291118 Corrected some indentation 2008-06-19 21:37:36 +01:00
Joel Holdsworth
3cc0f72389 Trivial timeline now works - more work coming 2008-06-18 23:57:47 +01:00
Joel Holdsworth
3b9d05a67d Made use of boost and nobug, added some documentation, and tidied code 2008-06-07 13:53:17 +01:00
Joel Holdsworth
98df76e919 Added some documentation, and made a minor code correction in
layout_headers
2008-06-07 12:09:22 +01:00
Joel Holdsworth
3952e27a8f Removed RefPtrs to make code more elegant 2008-06-06 00:30:31 +01:00
Joel Holdsworth
85730b889e Fixed to assertion failures, and move the frame ownership to
HeaderContainer
2008-06-05 23:57:04 +01:00
Joel Holdsworth
0ac09411bc Basic timeline with scrolling headers now works + Tidying work 2008-06-05 20:27:53 +01:00
Joel Holdsworth
e9747b360c Track backgrounds are now painted from the style 2008-05-31 18:21:05 +01:00
Joel Holdsworth
71b45acf54 Styles for custom widgets now load 2008-05-31 17:44:44 +01:00
Joel Holdsworth
7e2092825e Simple scrolling and drawing added 2008-05-31 13:22:15 +01:00
Joel Holdsworth
fe975a701d Added some scroll bars 2008-05-22 19:19:04 +01:00
Joel Holdsworth
ae2c74ff42 Tied gui into main lumiera build 2008-05-14 00:26:00 +01:00