Joel Holdsworth
8cb48a7298
Squished a whole load of warnings
2008-12-30 12:35:58 +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
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