Commit graph

57 commits

Author SHA1 Message Date
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
be8d7644ed Added the MenuButton class for buttons with popup menus 2008-12-26 18:10:28 +00: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
Michael Ploujnikov
8bbcc57f48 set per-target CPPFLAGS for lumigui instead of global AM_CPPFLAGS
this prevents strange (_CPPFLAGS) dependencies such as the one that was identified and fixed in admin/Makefile.am
Also, make sure to include the global $(AM_CPPFLAGS) flags in the per-target ones
2008-08-30 11:49:31 -04:00
Michael Ploujnikov
bbab414f66 replace INCLUDES with AM_CPPFLAGS
INCLUDES is deprecated (http://www.gnu.org/software/automake/manual/automake.html#Program-variables)
2008-08-25 21:37:06 -04:00
Joel Holdsworth
c12e134981 Corrected some tabs, missing dependancies in src/gui/Makefile.am 2008-08-09 22:26:36 +01:00
Joel Holdsworth
04320ae794 Added code to render icons as part of the build process 2008-08-04 12:06:24 +01:00
Joel Holdsworth
17d0883d09 Added basic support for multiple tools in the timeline view 2008-07-30 00:12:37 +01:00
Joel Holdsworth
ecf392968b Implemented new icon workflow 2008-07-28 23:45:20 +01:00
Joel Holdsworth
e3d6026d0b Retired VideoTrack - all tracks are the same 2008-07-17 19:35:49 +01:00
Joel Holdsworth
3cc0f72389 Trivial timeline now works - more work coming 2008-06-18 23:57:47 +01:00
Joel Holdsworth
0ac09411bc Basic timeline with scrolling headers now works + Tidying work 2008-06-05 20:27:53 +01:00
Joel Holdsworth
7e2092825e Simple scrolling and drawing added 2008-05-31 13:22:15 +01:00
Joel Holdsworth
8437450767 More work on icons 2008-05-16 19:23:12 +01:00
Joel Holdsworth
a51d91d7b5 Corrected the makefile 2008-05-16 18:53:45 +01:00