Commit graph

69 commits

Author SHA1 Message Date
Joel Holdsworth
9d9f7c40e9 Renamed Assets to Resources 2009-01-24 18:18:41 +00:00
Joel Holdsworth
d166238922 Added the new controller classes 2009-01-17 16:12:11 +00:00
Joel Holdsworth
4a8f5629f6 WIP: Restructured track headers for more refined drag support 2009-01-14 23:20:43 +00: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
ba9b72bce4 Fixes after merge 2009-01-10 21:35:43 +01:00
Joel Holdsworth
77c056266f Added empty timeline layout helper class 2008-12-30 22:27:09 +00: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
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
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
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
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
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
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
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
Joel Holdsworth
6cbd4282c1 Restructured model track tree, and improved child access 2008-12-13 16:58:41 +00:00
Joel Holdsworth
7c1046e162 Unified Sequence and Track together as TrackBase 2008-12-10 18:04:02 +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
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
16c48f69c4 Implemented a sequence name chooser dialog 2008-11-24 22:16:51 +00:00
Joel Holdsworth
f8fb24ff62 Added dialog.hpp for global layout constants 2008-11-24 21:37:46 +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
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
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
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
Christian Thaeter
ca0cea1c16 no, it doesn't end ... 2008-10-22 03:50:00 +02:00
Christian Thaeter
a95a40613c Fix: oops some more liblumi to liblumiera renames 2008-10-21 06:48:59 +02:00
Joel Holdsworth
1e3df80288 Added linkage to the proc layer 2008-10-20 19:28:29 +01:00
Joel Holdsworth
6396323e9e Added the backend as a lib, and included the interface header 2008-10-20 18:51:46 +01:00
Joel Holdsworth
d89e979aa0 Renamed HeaderContainer to TimelineHeaderContainer 2008-10-18 11:20:02 +01:00
Joel Holdsworth
ab609407a5 Fixed a bug exposed by make distcheck 2008-10-17 23:39:02 +01:00
Michael Ploujnikov
387ba8c321 find and configure NoBug by using pkg-config 2008-08-30 13:28:24 -04:00
Michael Ploujnikov
8bdab41ea0 factor out -I$(top_srcdir)/src/ to a top-level AM_CPPFLAGS
also remove a related unnecesary comment in src/gui/Makefile.am
2008-08-30 12:05:21 -04:00