ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3251 commits 3 branches 12 tags 71 MiB
Commit graph

321 commits

Author SHA1 Message Date
Joel Holdsworth
ec01a51302 Misc fixes, and added default icon size to MiniButton 2009-03-23 22:23:38 +00:00
Joel Holdsworth
2a66789773 Divorced ButtonBar from Toolbar 2009-03-23 22:23:38 +00:00
Joel Holdsworth
77022b3bcb Added initial ButtonBar implementation 2009-03-23 22:23:37 +00:00
Joel Holdsworth
249380fed0 Factored the state out of the timeline widget 2009-03-23 22:22:14 +00:00
Joel Holdsworth
6f7fa0613e Set titleMenuButton so that it can't be focussed 2009-03-14 09:19:31 +00:00
Joel Holdsworth
b4e4f6c4b7 Correction to a comment 2009-03-06 11:55:29 +00:00
Joel Holdsworth
1eec9df897 Correction to menu-button.hpp documentation 2009-03-06 11:55:29 +00:00
Joel Holdsworth
7e46bc504f Removed spurious add_events call 2009-03-06 11:55:29 +00:00
Joel Holdsworth
4683b120c5 Ion Fixes: Corrected the timeline header dragging cursors 2009-02-03 23:33:26 +00:00
Joel Holdsworth
17c1942c68 Removed some redundant name setting code 2009-02-01 00:05:15 +00:00
Joel Holdsworth
3ad2230864 Added synchronisation between multiple views of the track title 2009-01-31 23:45:32 +00:00
Ichthyostega
5eea58986f merge: ... bring in latest GUI additions from joel 2009-01-25 00:54:12 +01:00
Ichthyostega
10597beeba mass rename: relocate basic Logging conf. from liblumieracommon to liblumiera 2009-01-25 00:24:42 +01:00
Christian Thaeter
9aefc2e971 WIP: deploy new logging flags in gui 2009-01-24 22:30:25 +01:00
Joel Holdsworth
0355c83f0e Added handling for when the user drags beyond the end of the tree 2009-01-24 17:50:18 +00:00
Joel Holdsworth
ce37fa649d Added a comment 2009-01-24 17:04:31 +00:00
Joel Holdsworth
28c758b032 Tidied and documented TimelineHeaderWidget 2009-01-24 15:54:19 +00:00
Joel Holdsworth
4bdee16230 Fixed a more flaw in drop logic 2009-01-24 15:42:45 +00:00
Joel Holdsworth
5740a3687e Removed spurious curlies 2009-01-24 15:39:30 +00:00
Joel Holdsworth
64a7941002 Fixed a bug related to the scroll slide timer not being correctly 
terminated
 2009-01-24 15:28:54 +00:00
Joel Holdsworth
73f7380506 Removed some debug messages 2009-01-24 15:15:38 +00:00
Joel Holdsworth
ec78f73ca9 Timeline scroll is updated as the layout changes 2009-01-24 14:41:32 +00:00
Joel Holdsworth
f327dcab7a Tidyups 2009-01-24 14:34:26 +00:00
Joel Holdsworth
aa5cf0ea3a Made a track expand when the dragging track is going to be dragged 
inside
 2009-01-24 14:33:49 +00:00
Joel Holdsworth
1951324726 Corrected a typo 2009-01-24 14:17:20 +00:00
Joel Holdsworth
7a066cdd72 Fixed bug in measure branch height 2009-01-24 14:16:33 +00:00
Joel Holdsworth
523eecfc24 Fixed drag by expander bug 2009-01-24 14:12:13 +00:00
Joel Holdsworth
ed1f4abfea Refactored find_branch_parent 2009-01-24 12:50:49 +00:00
Joel Holdsworth
e7481afc3d Renamed remove_child_track -> remove_descendant_track 2009-01-24 12:23:18 +00:00
Joel Holdsworth
53297cccd6 Tidied and documented Track::find_parent 2009-01-24 12:02:09 +00:00
Joel Holdsworth
9879aef3dd Tidied and documented TimelineLayoutHelper 2009-01-24 10:58:54 +00:00
Joel Holdsworth
1908ff08a0 Removed extraneous TimelineLayoutHelper::draggingTrack member 2009-01-24 10:37:04 +00:00
Joel Holdsworth
e15adf1afb Reorganized attempt_drop_* functions 2009-01-24 10:15:58 +00:00
Joel Holdsworth
69253909e3 Initial drop code added 2009-01-21 23:48:56 +00:00
Joel Holdsworth
355da88630 Added a dragging cursor 2009-01-21 18:40:13 +00:00
Joel Holdsworth
1472a2ebe4 Improved track drop code 2009-01-21 18:20:11 +00:00
Joel Holdsworth
78e0f9bbe6 WIP: Gave dragging a more immediate feeling 2009-01-21 00:20:33 +00:00
Joel Holdsworth
d209e0e2f2 Made drop targets more sensible 2009-01-20 23:31:40 +00:00
Joel Holdsworth
b0f56c070d WIP: Initial commit of prototype real drop hit test code 2009-01-20 21:39:33 +00:00
Joel Holdsworth
977cbf9e64 Fixed track drag raise behaviour 2009-01-19 18:14:52 +00:00
Joel Holdsworth
b0db84ec14 Implemented intial playback controller thread 2009-01-18 16:17:39 +00:00
Joel Holdsworth
9197aa2ddf WIP: PlaybackController can now push frames to the Viewer 2009-01-17 17:37:06 +00:00
Joel Holdsworth
47296381a8 WIP: Added keep-above code 2009-01-17 15:05:19 +00:00
Joel Holdsworth
7a939e5d87 Added header dragging scroll slide animation 2009-01-17 11:09:44 +00:00
Joel Holdsworth
c9d269872e Fixed a bug with dragging when the timeline is scrolled down 2009-01-15 18:57:58 +00:00
Joel Holdsworth
0b5fb555b6 Added dragging of whole branches 2009-01-15 18:54:13 +00:00
Joel Holdsworth
75d2890ab7 WIP: Added new header code 2009-01-14 23:22:04 +00:00
Joel Holdsworth
4a8f5629f6 WIP: Restructured track headers for more refined drag support 2009-01-14 23:20:43 +00:00
Joel Holdsworth
d2d27abe4a Added pt_in_rect function 2009-01-10 21:43:24 +00:00
Joel Holdsworth
542af7cc80 WIP: Added preliminary track dragging support 2009-01-10 21:25:05 +00:00
Joel Holdsworth
27ffbd1875 Retire expander_from_point 2009-01-10 12:58:58 +00:00
Joel Holdsworth
baa88abad0 Further tidied and simplified update_headers 2009-01-10 11:11:30 +00:00
Joel Holdsworth
c9420126f1 Retired iteration through the model tree in header container 2009-01-10 11:08:48 +00:00
Joel Holdsworth
ab900e6b28 Tidied TimelineHeaderContainer::update_headers 2009-01-10 11:03:12 +00:00
Joel Holdsworth
fcd5cd8117 Tidied up update_headers 2009-01-10 11:02:29 +00:00
Joel Holdsworth
dbc36cf727 Reorganised set_parent in header container 2009-01-10 10:50:44 +00:00
Joel Holdsworth
d02ce9b283 Fixed minor bug in expander animation 2009-01-09 23:28:51 +00:00
Joel Holdsworth
0697d2a83e Retired TimelineHeaderContainer::size_request_recursive 2009-01-09 20:16:54 +00:00
Joel Holdsworth
1f73978dd4 Added is_animating function 2009-01-09 20:03:55 +00:00
Joel Holdsworth
06f2abb6fa Transitioned TimelineWidget to use on_layout_changed 2009-01-09 20:02:09 +00:00
Joel Holdsworth
6d730ee3ae Added on_layout_changed event handler 2009-01-09 20:00:04 +00:00
Joel Holdsworth
98568c8669 Fixed a minor formatting error 2009-01-09 19:59:13 +00:00
Joel Holdsworth
57d73eca1e Removed an obselete constant 2009-01-09 19:49:57 +00:00
Joel Holdsworth
b48d8fc49b Tidied up, simplified and documented expand animation code 2009-01-05 20:03:52 +00:00
Joel Holdsworth
22c9e8b082 Merge branch 'master' of git.lumiera.org:/git/LUMIERA into gui 2009-01-05 17:59:23 +00:00
Christian Thaeter
9749178a06 Add some missing semicolons, the upcoming NoBug will be picky about that 2009-01-05 08:33:15 +01:00
Joel Holdsworth
43897d214d Made animation time based not tick based 2009-01-05 00:05:14 +00:00
Joel Holdsworth
8db54f1179 Removed some debug messages 2009-01-04 23:32:29 +00:00
Joel Holdsworth
05b17a7148 Simplified the layout animation a little 2009-01-04 21:16:45 +00:00
Joel Holdsworth
f3339a538b Tweaked the documentation for the layout_headers_recursive 2009-01-04 20:29:54 +00:00
Joel Holdsworth
e74e55df98 Tidied up TimelineLayoutHelper::layout_headers_recursive 2009-01-04 20:29:05 +00:00
Joel Holdsworth
c401207dba Refactored creating Track::get_expander_style() 2009-01-03 21:57:24 +00:00
Joel Holdsworth
18d7290c61 Added expander button animation 2009-01-03 17:36:33 +00:00
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
Ichthyostega
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