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
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
5e8620135c
Added stringifying debug methods to track tree classes, and added a big
...
tree to the sequence
2008-12-30 17:16:29 +00:00
Joel Holdsworth
a117fe99e5
Removed spurious add_child_track
2008-12-30 16:13:09 +00:00
Joel Holdsworth
910bf4b4e4
Added "Remove" to the track dropdown menu
2008-12-30 15:20:19 +00:00
Joel Holdsworth
cdf26d3fe6
Tidied up the displayer code and added some documentation
2008-12-30 13:06:08 +00:00
Joel Holdsworth
8cb48a7298
Squished a whole load of warnings
2008-12-30 12:35:58 +00:00
71aa88df62
add some error checking
...
makes the dummy Gui plugin "work" again, but now with enabled locking.
2008-12-30 08:19:33 +01:00
075b3c8d6a
fix some warnings...
2008-12-30 07:28:34 +01:00
Joel Holdsworth
1802512371
Reinstated -Werror and fixed the ftruncate warning
2008-12-29 20:41:47 +00:00
Joel Holdsworth
90d14d12f7
Merged in LUMIERA master and gui branches
2008-12-29 19:13:58 +00:00
Joel Holdsworth
ad957ef9e3
Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui
...
Conflicts:
src/gui/Makefile.am
2008-12-29 18:46:06 +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
9354c7e6ca
Stopped the stylesheet from forcing the font
2008-12-26 20:47:54 +00:00
Joel Holdsworth
7a838fc4eb
Added a name dialog for track
2008-12-26 19:51:41 +00:00
Joel Holdsworth
ea89f27668
Tidied up name-chooser.hpp
2008-12-26 19:10:31 +00:00
Joel Holdsworth
33afd58b8e
Converted all ASSERTs to REQUIREs
2008-12-26 18:58:29 +00:00
Joel Holdsworth
b75e6a982b
Converted to the SequenceName dialog to a generic name chooser dialog:
...
NameChooser
2008-12-26 18:49:28 +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
Christian Thaeter
8e1f64a284
gui Makefile rework, remove _DEPENDENCIES vars
...
_DEPENDENCIES supresses all automatic generated dependencies which is not
what we wanted here, instead use dist_pkgdata_DATA which looks right.
Add some clean rules to cleanup generated/copied data.
I am not sure if this is completely right now, but looks (and works) much
better than before.
2008-12-23 07:24:55 +01:00
Joel Holdsworth
125db978ba
WIP: Experimenting with track headers
2008-12-22 11:36:46 +00:00
Christian Thaeter
4fb8f5b69d
Makefile.am makeover, add CFLAGS and CXXFLAGS everywhere
2008-12-22 02:24:19 +01:00
Christian Thaeter
34077ca41c
rename gtkgui.lum to gtk_gui.lum
2008-12-21 18:22:19 +01:00
a0a0e456a5
oops, merge with the other merge...
2008-12-21 07:38:26 +01:00
c8465a1a38
Merge latest GUI model additions
2008-12-21 07:10:46 +01:00
Joel Holdsworth
c536915b2e
Corrected errors introduced by the merge
2008-12-20 15:55:46 +00:00
Joel Holdsworth
94a07a1464
Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui
...
Conflicts:
src/backend/Makefile.am
src/gui/Makefile.am
src/gui/gtk-lumiera.hpp
2008-12-20 15:03:24 +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
Christian Thaeter
27815e815d
including $(top_sourcedir) with a handcrafted .la doesnt solve the gdl
...
problem
2008-12-18 21:20:01 +01:00
Christian Thaeter
32a8dcd6ae
Reorganized the gui/Makefile.am (broken)
...
* still building lumigui for now
* base for building gtkgui.lum the final gui module
* build libgui.la as convenience library holding all gui code
Does not build on non gnome systems because pita dependencies of libgdl
2008-12-18 20:26:46 +01:00
1b29b382ee
WIP: try to build the GUI into a shared module, similar to SCons...
2008-12-18 11:10:32 +01:00
5f94b3ba68
Autotools adjustments
2008-12-18 10:26:38 +01:00
6d66476383
move config, interfaces and pluginsystem to liblumieracommon
2008-12-18 08:54:33 +01:00
7bde9aa538
start refactoring: liblumieracommon.so (application core services)
2008-12-18 08:12:40 +01:00
357c7f0d9f
further Makefile.am tweaks to make the tests compile again
2008-12-18 07:44:06 +01:00
598994c0cb
further Makefile.am tweaks to make it compile again
...
explanation: via the unresolved problems with the hig-level model,
probably a dependency to AssetManager and from there to the core systems
"bubbled" into the liblumiera.so, forcing us to link these things for now
2008-12-18 06:47:54 +01:00
fcfc80182a
Autotools fixes
2008-12-18 05:11:47 +01:00
e8d76cd022
rename error.cpp to exception.cpp and fix remaining problems
2008-12-18 04:51:58 +01: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
Christian Thaeter
3654473b75
WIP: Merge common into lib
...
* breaks lumigui linking
* test non functional yet
* tools cant not be linked because of cross dependency problems
2008-12-17 17:53:32 +01:00
Joel Holdsworth
35cfe48dfc
Added a context menu with an "Add Track" command
2008-12-17 00:03:30 +00:00
Christian Thaeter
84339a0f87
moved the config system and interfaces/plugins back to lib
...
in preparation for the shared lib transistion doing next
2008-12-16 23:56:28 +01:00
Joel Holdsworth
1ecccb5925
Fixed set_icon_size for temporary Debian Etch compatibility
2008-12-16 22:55:32 +00:00
Joel Holdsworth
081b630a9c
Fixed some problems introduced during merging
2008-12-16 20:56:47 +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
Joel Holdsworth
f3ea24260d
Added a stub menu item for add track
2008-12-16 20:31:04 +00:00
Christian Thaeter
9a1a1890e2
post rebase fixes
...
tests are still broken and will be fixed for the shared lib transistion
2008-12-16 19:54:48 +01:00
feebc502e5
implementation of GuiStarterPlugin
2008-12-15 13:36:41 +01:00
7cad095675
WIP let the GuiFacade trigger loading of the GuiStarterPlugin
2008-12-15 13:36:41 +01:00
e8639b8319
WIP work out further how to handle start/stop of layer separation interfaces
2008-12-15 13:36:41 +01:00
b841ab3139
definitions for creating my first Interface instance :-)
2008-12-15 13:36:41 +01:00
