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
8c501a3d7c
first rough draft implementation of calling through a layer separation interface
2008-12-15 13:36:41 +01:00
3518235b57
Stub implementation of the various subsystem facades
2008-12-15 13:33:05 +01:00
b14d711146
refactor Appconfig, split off lifecycle interface
2008-12-15 13:33:05 +01:00
Christian Thaeter
52a9c7fb27
lumiera is alive...
...
This starts the proposed changes in
http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/ApplicationStructure
* Moving all necessary files from src/backend to src/lumiera
* create a small helloworld main app
* setup the buildsystem to build it all
* fix include paths at many places
The testsuite is not yet fixed here, that will be the next commit
2008-12-15 13:33:03 +01: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
fa16c5f137
Updated sequence test code
2008-12-10 16:54:43 +00:00
Joel Holdsworth
528d02931a
Converted timeline::Track* to boost::shared_ptr<timeline::Track>
2008-12-08 22:30:54 +00:00
Joel Holdsworth
48dd2055f5
Converted model::Project to use observable_list
2008-12-06 23:48:45 +00:00
Joel Holdsworth
0799a4d297
Fixed problems when the notebook is empty
2008-12-06 20:05:14 +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
2ebd768d88
Corrected some indentation
2008-12-06 19:12:18 +00:00
Joel Holdsworth
aa9048fa68
Added more STL slickness
2008-12-06 18:15:08 +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
f54595b17e
Replace TimelineWidget* with shared_ptr<TimelineWidget>
2008-12-05 20:27:15 +00:00
Joel Holdsworth
da3d14da72
Replaced Sequence* with boost::shared_ptr<Sequence>
2008-12-05 20:17:56 +00:00
Joel Holdsworth
e3e639a2db
Corrected "New Track" to "New Sequence"
2008-12-05 18:39:23 +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
d74a9e687f
Tidied up trailing backslashes
2008-11-25 22:16:37 +00:00
Joel Holdsworth
14df5bbb8d
Created a model for tracks
2008-11-25 22:11: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
c58bc861ff
Made some corrections in the documentation
2008-11-25 21:00:12 +00:00
Joel Holdsworth
164fff2359
Ditched some test code
2008-11-24 23:02:13 +00:00
Joel Holdsworth
16c48f69c4
Implemented a sequence name chooser dialog
2008-11-24 22:16:51 +00:00
Joel Holdsworth
a9ee81b57f
Added documentation to dialog.hpp
2008-11-24 21:43:34 +00:00
Joel Holdsworth
f2f41ee99b
Correct RENDER_H -> RENDER_HPP
2008-11-24 21:39:47 +00:00
Joel Holdsworth
f8fb24ff62
Added dialog.hpp for global layout constants
2008-11-24 21:37:46 +00:00
Joel Holdsworth
7ae08aa608
Corrected some mistakes in old dialog headers
2008-11-24 17:38:26 +00:00
Joel Holdsworth
37123f84b6
Corrected some indentation
2008-11-24 17:12:47 +00:00
Joel Holdsworth
3d35f2e535
Added add/remove of sequences
2008-11-22 19:08:12 +00:00
Joel Holdsworth
952d7b5599
Added some refinement to the notebook
2008-11-22 16:43:24 +00:00
Joel Holdsworth
9d11081ff7
Added sequences, and tabs in the timeline view to display them
2008-11-22 16:34:49 +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
Christian Thaeter
28a5c5257a
Merge commit 'joel/gui' into master
...
* commit 'joel/gui':
Correct a liblumi to liblumiera
Added track tree support and added widgets to headers
Corrected a selection rendering bug in TimelineBody
Added linkage to the proc layer
Made GtkLumiera and WindowManager boost::noncopyable
Added the backend as a lib, and included the interface header
Showed some love to viewer panel
Changed the "delete" variable name to "del" to satisfy the C++ compiler
Renamed HeaderContainer to TimelineHeaderContainer
Conflicts:
src/gui/Makefile.am
2008-10-27 06:00:32 +01:00
Christian Thaeter
ab3d3823f6
autotools fixes for the plugin system
...
don't link the tests with -ldl
Renamed GTK_LUMIERA_* to LUMIERA_GUI_* and include all gui relevant config
results here.
Set it explicit, don't add the results to CFLAGS or LIBS, the default
behaviour linked all LIBS in, even in plugins, that was not intended.
2008-10-27 05:10:01 +01:00
Joel Holdsworth
7dcfa84d6a
Correct a liblumi to liblumiera
2008-10-23 00:38:47 +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
