Joel Holdsworth
3ad2230864
Added synchronisation between multiple views of the track title
2009-01-31 23:45:32 +00:00
e78383b044
WIP continue with the skeleton of a DisplayService within the GUI
2009-02-01 00:43:21 +01:00
cc585dd0d6
comment, rename guinotification-facade
2009-02-01 00:02:50 +01:00
Joel Holdsworth
946a26f574
Merge commit 'ichthyo/guistart' into merge
2009-01-31 21:26:10 +00:00
Joel Holdsworth
9e585ab591
Removed stupid WindowManager singleton
2009-01-31 21:17:05 +00:00
Joel Holdsworth
852377c1f1
Implemented New Window command
2009-01-31 21:14:53 +00:00
Joel Holdsworth
cef0e0e074
Added WindowManager::new_window, and used it as the standard way of
...
creaing the workspaces
2009-01-31 21:14:52 +00:00
Joel Holdsworth
1084a12e8a
Added theme icons support, and a New Window menu command
2009-01-31 21:14:52 +00:00
Joel Holdsworth
4a2e5c2762
Fixed the resources menu item
2009-01-31 21:14:52 +00:00
cbd27b0418
Completely reworked the design of the DummyPlayer API, now using the handle
...
this allows the C++ version to provide automatic lifecycle management for
the play process, while both versions of the API (C and C++) impose only
one level of indirection.
2009-01-28 02:49:20 +01:00
a8285878ac
fix some logging flags after merge
2009-01-25 03:27:16 +01:00
50625039d0
merge NoBug changes from master to bring this devel branch up-to-date
...
Next things to do will be reworking the draft/dummy to support multiple playback processes and a display callback
2009-01-25 02:10:03 +01:00
5eea58986f
merge: ... bring in latest GUI additions from joel
2009-01-25 00:54:12 +01:00
10597beeba
mass rename: relocate basic Logging conf. from liblumieracommon to liblumiera
2009-01-25 00:24:42 +01:00
Joel Holdsworth
e5665f3820
Fixed a headers issue introduced by a proc merge
2009-01-24 21:36:50 +00:00
Christian Thaeter
9aefc2e971
WIP: deploy new logging flags in gui
2009-01-24 22:30:25 +01:00
Joel Holdsworth
51f05ebb3e
Merge branch 'guistart' of git://git.lumiera.org/lumiera/ichthyo into gui
2009-01-24 21:28:45 +00:00
e524e8c528
Fix the most obvious lockups ... but the design still doesn't feel right for me!
2009-01-24 21:33:41 +01:00
Joel Holdsworth
c938526a94
Renamed panel-assets icon to panel-resources
2009-01-24 18:40:20 +00:00
Joel Holdsworth
2f335a87d1
Added an initial resources notebook
2009-01-24 18:31:26 +00:00
Joel Holdsworth
9d9f7c40e9
Renamed Assets to Resources
2009-01-24 18:18:41 +00: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
b48c5e0cc0
Added some ParentTrack documentation
2009-01-24 13:00:56 +00:00
Joel Holdsworth
0689e0256c
Refactored ParentTrack::remove_descendant_track
2009-01-24 12:59:56 +00:00
Joel Holdsworth
ed1f4abfea
Refactored find_branch_parent
2009-01-24 12:50:49 +00:00
Joel Holdsworth
e2992c62ef
Documented model::GroupTrack
2009-01-24 12:31:03 +00:00
Joel Holdsworth
f0c7d85a1f
Documented model::Sequence
2009-01-24 12:30:07 +00:00
Joel Holdsworth
2f12e5b239
Reorganized test code
2009-01-24 12:26:50 +00:00
Joel Holdsworth
c0d0081677
Documented model::ParentTrack
2009-01-24 12:25:02 +00:00
Joel Holdsworth
e7481afc3d
Renamed remove_child_track -> remove_descendant_track
2009-01-24 12:23:18 +00:00
Joel Holdsworth
41f394a57b
Excised ObservableList::to_list
2009-01-24 12:18:12 +00:00
Joel Holdsworth
53297cccd6
Tidied and documented Track::find_parent
2009-01-24 12:02:09 +00:00
Joel Holdsworth
c88aec9c03
Added some documentation to model::Track
2009-01-24 11:45:47 +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
58512e8a34
First version working again. Thread handling is not stable and stop hangs though
2009-01-23 20:23:24 +01:00
48a632434a
switch from Glib::Mutex to an object monitor (using LumieraMutex)
2009-01-23 19:57:12 +01:00
6c3492396c
Refactoring: switch gui::PlaybackController to use the player service
2009-01-23 04:15:58 +01:00
49a865fa57
merge latest GUI additions (and fixes from master) for colaboration on the Player mockup
...
this branch still corresponds to joel/gui
2009-01-22 23:26:08 +01:00
Joel Holdsworth
69253909e3
Initial drop code added
2009-01-21 23:48:56 +00:00
Joel Holdsworth
f18c039074
Replaced an errant Glib::ustring with std::string
2009-01-21 22:18:55 +00:00
Joel Holdsworth
5eadcfb56a
Added boost and std namespaces to model/track.cpp
2009-01-21 22:15:50 +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
f6e28febdb
Removed static App* constants in GtkLumiera - replaced with static
...
functions
2009-01-19 19:25:06 +00:00
Joel Holdsworth
977cbf9e64
Fixed track drag raise behaviour
2009-01-19 18:14:52 +00:00
60d41ea017
WIP (unfinished, doesn't compile) flesh out some impl details
2009-01-19 12:43:28 +01:00
198d6bde73
better make GuiNotification an experimental interface (Version=0)
2009-01-19 02:21:41 +01:00
Joel Holdsworth
1be33426e4
Reduced the hack level in the test card
2009-01-18 23:26:41 +00:00
63565ebd97
merge latest work from Joel for colaboration on the Player mockup, adjusting build-dependencies
2009-01-18 22:13:17 +01:00
Joel Holdsworth
20b2cb1ee5
Implemented a funky test card generator
2009-01-18 17:41:55 +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
ebe91793c5
WIP: Corrected some compile problems
2009-01-17 16:53:01 +00:00
Joel Holdsworth
bbbda188e2
Merge branch 'master' of git.lumiera.org:/git/LUMIERA into gui
2009-01-17 16:34:19 +00:00
Joel Holdsworth
d3f94730b5
Removed a spurious include
2009-01-17 16:17:42 +00:00
Joel Holdsworth
d166238922
Added the new controller classes
2009-01-17 16:12:11 +00:00
Joel Holdsworth
ebb552e323
Transitioned to references of project instead of pointers
2009-01-17 15:38:39 +00:00
Joel Holdsworth
47296381a8
WIP: Added keep-above code
2009-01-17 15:05:19 +00:00
054c652571
improve error handling when starting the GUI thread
2009-01-17 14:31:40 +01:00
Joel Holdsworth
7a939e5d87
Added header dragging scroll slide animation
2009-01-17 11:09:44 +00:00
Christian Thaeter
bb8ad9fbd5
move threads back into the backend
2009-01-16 02:18:58 +01: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
bf2c1f1e45
Merge branch 'master' of git.lumiera.org:/git/LUMIERA into gui
2009-01-14 23:56:43 +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
aa8896a79f
merge resolution of some build/dependency problems
2009-01-14 12:31:20 +01:00
9cfa0e5522
push starting of the GUI thread down into the gui plugin
2009-01-14 12:28:24 +01:00
Christian Thaeter
d37bb17566
Add a context string to the error system
...
lumiera_error_set() now takes an optional extra string which can be used
to pass context relevant data along. This string gets copied into the
error state so one can easily create it by the tmpbuf_snprintf() facility.
Also a lot of places which define errors get fixed according to this.
2009-01-13 21:23:37 +01:00
Joel Holdsworth
fade287745
Merge branch 'master' of git.lumiera.org:/git/LUMIERA into join
...
Conflicts:
src/gui/Makefile.am
2009-01-11 00:15:01 +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
ba9b72bce4
Fixes after merge
2009-01-10 21:35:43 +01:00
e64e9a19b6
Merge GUI loading and startup, incl opening of facade interface
2009-01-10 19:12:48 +01:00
f75bb233ba
fix warnings and problems detected by gcc 4.3 / Lenny
2009-01-10 17:01:09 +00:00
b6fb135398
change error notification at subsystem shutdown to use just a string*
...
(this allows to memoize the error message and call the termination
handler outside the catch block)
2009-01-10 16:15:17 +01:00
3da9586824
Rewrite the GuiNotification service to operate in sync with bringing up the GUI
2009-01-10 15:29:11 +01: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
8d4bc62fbe
WIP start drafting a better InterfaceProxy handling
2009-01-04 15:21:04 +01: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
e8229623bc
Integration: complete GTK-GUI loaded from main Lumiera App. !Yay!
2009-01-03 16:57:51 +01:00
Joel Holdsworth
2d4a341123
Transition TimelineHeaderContainer::draw_header_decoration to use the
...
layout tree
2009-01-03 15:21:04 +00:00
edb01ec8c6
Integration: Thread/sync, GUI-Plugin invoked in separate thread
2009-01-03 16:05:04 +01: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
