Commit 310db6e0 authored by Matteo F. Vescovi's avatar Matteo F. Vescovi

Imported Upstream version 0.5.0

parent 1339048e
2012-12-16 Daniel P. Berrange <berrange@redhat.com>
Update for 0.5.0 release
Fix man page target name
Fix docs generation
Add LibRaw to list of deps in README
Refresh translations
Add hack to delete both images when exiting preview
Since there is no way to exit preview mode, we must take a
shot and then delete it. If the capture mode is raw+jpeg
we must take care to delete both images that are captured
Fix session filename generation to cope with dual-format capture
When the camera captures raw+jpeg formats at the same time, both
images must be saved with the same filename prefix
Rewrite overlay display to be more efficient
Instead of creating one cairo surface per image and overlaying
them during the draw event, overlay the images directly into a
single cairo surface.
2012-12-09 Daniel P. Berrange <berrange@redhat.com>
Tweak debugging in event logging
Fix updating of range controls
Fix typo which continually reset range controls back to their
original value
2012-12-05 Daniel P. Berrange <berrange@redhat.com>
Add support for onion skin preferences
Add ability to render an "onion skin" from a list of images
Extend the image display widget to take a list of images. Then
render an "onion skin" overlay with partial opacity. In the
case of a list with 1 entry, the behaviour is as before.
Change way image pixbufs are cleared
Instead of trying to track which image is used in popups,
just make use of the ref counting in the image loader. Add
"unload" signals to the image loader to enable detection
of when last use is released.
Sort images by name instead of modified date
Ensure camera is disconnected on window close/app exit
When hiding a camera manager window, disassociate the
camera, so it gets closed cleanly, otherwise some Canon
cameras will hang.
2012-11-28 Daniel P. Berrange <berrange@redhat.com>
Reindent to normalize whitespace
2012-11-22 Daniel P. Berrange <berrange@redhat.com>
Fix deadlock unmounting camera at startup
The startup code should be using gdk_threads_{enter,leave}
since we make use of threads. When umounting a camera we
entered a recursive main loop. This caused GDK to try to
unlock a mutex that was never locked, corrupting mutex
state. The result was a later hang next time GDK tried to
lock the mutex.
We can't acquire the mutex in the activate callback, since
that can be called from scenarios where the lock is already
held. Thus we move our code into the startup method instead
and just make activate do a window show.
2012-11-21 Daniel P. Berrange <berrange@redhat.com>
Fix mistake in function prototype name
2012-09-18 Daniel P. Berrange <berrange@redhat.com>
Refresh translations
2012-09-16 Daniel P. Berrange <berrange@redhat.com>
Add preference to control use of embedded image preview for raw files
Load raw files using LibRaw
Add support for using LibRaw to load raw files. Use the
embedded preview, rather than processing the entire RAW
data.
Add some more comments to thumbnail loader code
2012-09-12 Daniel P. Berrange <berrange@redhat.com>
Fix typo in man page name
2012-09-06 Daniel P. Berrange <berrange@redhat.com>
Update NEWS for 0.4.1 release
......
......@@ -248,6 +248,9 @@ LIBPEAS_LIBS = @LIBPEAS_LIBS@
LIBPEAS_REQUIRED = @LIBPEAS_REQUIRED@
LIBPEAS_UI_CFLAGS = @LIBPEAS_UI_CFLAGS@
LIBPEAS_UI_LIBS = @LIBPEAS_UI_LIBS@
LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
LIBRAW_LIBS = @LIBRAW_LIBS@
LIBRAW_REQUIRED = @LIBRAW_REQUIRED@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......
Entangle News
=============
Release 0.5.0 - "Z Boson" - 2012-12-16
--------------------------------------
* Switch to using LibRaw for loading raw images
* Allowing loading image preview from raw files
* Fix deadlock unmounting camera at startup
* Ensure camera is disconnected before exiting
* Sort image list by name instead of date
* Add support for rendering "onion skin" of image sequence
* Fix updating of range control values
* Fix filename generation for dual-format capture modes
* Fix deletion of dual-format images when exiting preview
* Refresh translations
Release 0.4.1 - "Gluon" - 2012-09-06
------------------------------------
......@@ -59,6 +75,7 @@ Release 0.3.3 - "Muon neutrino" - 2012-04-25
* Refresh translations
* Fix check for glib-compile-schemas binary
Release 0.3.2 - "Muon" - 2012-04-03
-----------------------------------
......
......@@ -44,6 +44,7 @@ be present
lcms >= 1.18
libpeas >= 0.5.5
gexiv2 >= 0.2.2
LibRaw >= 0.9.0
Communication
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for entangle 0.4.1.
# Generated by GNU Autoconf 2.68 for entangle 0.5.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='entangle'
PACKAGE_TARNAME='entangle'
PACKAGE_VERSION='0.4.1'
PACKAGE_STRING='entangle 0.4.1'
PACKAGE_VERSION='0.5.0'
PACKAGE_STRING='entangle 0.5.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -689,6 +689,8 @@ GTKDOC_REBASE
GTKDOC_CHECK
XEXT_LIBS
XEXT_CFLAGS
LIBRAW_LIBS
LIBRAW_CFLAGS
GEXIV2_LIBS
GEXIV2_CFLAGS
LCMS_LIBS
......@@ -754,6 +756,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
LIBRAW_REQUIRED
XEXT_REQUIRED
GEXIV2_REQUIRED
LIBPEAS_REQUIRED
......@@ -893,6 +896,8 @@ LCMS_CFLAGS
LCMS_LIBS
GEXIV2_CFLAGS
GEXIV2_LIBS
LIBRAW_CFLAGS
LIBRAW_LIBS
XEXT_CFLAGS
XEXT_LIBS
GTKDOC_DEPS_CFLAGS
......@@ -1445,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures entangle 0.4.1 to adapt to many kinds of systems.
\`configure' configures entangle 0.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1515,7 +1520,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of entangle 0.4.1:";;
short | recursive ) echo "Configuration of entangle 0.5.0:";;
esac
cat <<\_ACEOF
......@@ -1598,6 +1603,9 @@ Some influential environment variables:
GEXIV2_CFLAGS
C compiler flags for GEXIV2, overriding pkg-config
GEXIV2_LIBS linker flags for GEXIV2, overriding pkg-config
LIBRAW_CFLAGS
C compiler flags for LIBRAW, overriding pkg-config
LIBRAW_LIBS linker flags for LIBRAW, overriding pkg-config
XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
XEXT_LIBS linker flags for XEXT, overriding pkg-config
GTKDOC_DEPS_CFLAGS
......@@ -1684,7 +1692,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
entangle configure 0.4.1
entangle configure 0.5.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2049,7 +2057,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by entangle $as_me 0.4.1, which was
It was created by entangle $as_me 0.5.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -2876,7 +2884,7 @@ fi
# Define the identity of the package.
PACKAGE='entangle'
VERSION='0.4.1'
VERSION='0.5.0'
cat >>confdefs.h <<_ACEOF
......@@ -3066,6 +3074,8 @@ GEXIV2_REQUIRED=0.2.2
XEXT_REQUIRED=1.3.0
LIBRAW_REQUIRED=0.9.0
DEPDIR="${am__leading_dot}deps"
......@@ -13151,6 +13161,100 @@ fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRAW" >&5
$as_echo_n "checking for LIBRAW... " >&6; }
if test -n "$LIBRAW_CFLAGS"; then
pkg_cv_LIBRAW_CFLAGS="$LIBRAW_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw_r >= \$LIBRAW_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw_r >= $LIBRAW_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBRAW_CFLAGS=`$PKG_CONFIG --cflags "libraw_r >= $LIBRAW_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$LIBRAW_LIBS"; then
pkg_cv_LIBRAW_LIBS="$LIBRAW_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libraw_r >= \$LIBRAW_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libraw_r >= $LIBRAW_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBRAW_LIBS=`$PKG_CONFIG --libs "libraw_r >= $LIBRAW_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBRAW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libraw_r >= $LIBRAW_REQUIRED" 2>&1`
else
LIBRAW_PKG_ERRORS=`$PKG_CONFIG --print-errors "libraw_r >= $LIBRAW_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBRAW_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (libraw_r >= $LIBRAW_REQUIRED) were not met:
$LIBRAW_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables LIBRAW_CFLAGS
and LIBRAW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables LIBRAW_CFLAGS
and LIBRAW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
LIBRAW_CFLAGS=$pkg_cv_LIBRAW_CFLAGS
LIBRAW_LIBS=$pkg_cv_LIBRAW_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
$as_echo_n "checking for XEXT... " >&6; }
......@@ -16549,7 +16653,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by entangle $as_me 0.4.1, which was
This file was extended by entangle $as_me 0.5.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -16619,7 +16723,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
entangle config.status 0.4.1
entangle config.status 0.5.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......@@ -18508,8 +18612,8 @@ $as_echo "$as_me: WARNING: If you continue with this install location for schema
$as_echo "$as_me: WARNING: should set the following environment variable:" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:" >&5
$as_echo "$as_me: WARNING:" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XDG_DATA_DIRS=$rawdatadir" >&5
$as_echo "$as_me: WARNING: XDG_DATA_DIRS=$rawdatadir" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XDG_DATA_DIRS=$rawdatadir:$searchdirs" >&5
$as_echo "$as_me: WARNING: XDG_DATA_DIRS=$rawdatadir:$searchdirs" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:" >&5
$as_echo "$as_me: WARNING:" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: If XDG_DATA_DIRS is not set, Entangle will attempt to enable" >&5
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([entangle], [0.4.1])
AC_INIT([entangle], [0.5.0])
AC_CONFIG_SRCDIR([src/entangle-main.c])
AM_CONFIG_HEADER([config.h])
dnl Make automake keep quiet about wildcards & other GNUmake-isms
......@@ -44,6 +44,8 @@ GEXIV2_REQUIRED=0.2.2
AC_SUBST(GEXIV2_REQUIRED)
XEXT_REQUIRED=1.3.0
AC_SUBST(XEXT_REQUIRED)
LIBRAW_REQUIRED=0.9.0
AC_SUBST(LIBRAW_REQUIRED)
dnl *******************************************************************************
dnl Setup core compilers / build helpers
......@@ -107,6 +109,10 @@ PKG_CHECK_MODULES([GEXIV2], [gexiv2 >= $GEXIV2_REQUIRED])
AC_SUBST(GEXIV2_CFLAGS)
AC_SUBST(GEXIV2_LIBS)
PKG_CHECK_MODULES([LIBRAW], [libraw_r >= $LIBRAW_REQUIRED])
AC_SUBST(LIBRAW_CFLAGS)
AC_SUBST(LIBRAW_LIBS)
PKG_CHECK_MODULES([XEXT], [xext >= $XEXT_REQUIRED],
[have_xext=yes], [have_xext=no])
AC_SUBST(XEXT_CFLAGS)
......@@ -207,7 +213,7 @@ then
AC_MSG_NOTICE([WARNING: If you continue with this install location for schemas, you])
AC_MSG_NOTICE([WARNING: should set the following environment variable:])
AC_MSG_NOTICE([WARNING:])
AC_MSG_NOTICE([WARNING: XDG_DATA_DIRS=$rawdatadir])
AC_MSG_NOTICE([WARNING: XDG_DATA_DIRS=$rawdatadir:$searchdirs])
AC_MSG_NOTICE([WARNING:])
AC_MSG_NOTICE([WARNING: If XDG_DATA_DIRS is not set, Entangle will attempt to enable])
AC_MSG_NOTICE([WARNING: a workaround on startup to avoid crashes])
......
......@@ -225,6 +225,9 @@ LIBPEAS_LIBS = @LIBPEAS_LIBS@
LIBPEAS_REQUIRED = @LIBPEAS_REQUIRED@
LIBPEAS_UI_CFLAGS = @LIBPEAS_UI_CFLAGS@
LIBPEAS_UI_LIBS = @LIBPEAS_UI_LIBS@
LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
LIBRAW_LIBS = @LIBRAW_LIBS@
LIBRAW_REQUIRED = @LIBRAW_REQUIRED@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......
......@@ -225,6 +225,9 @@ LIBPEAS_LIBS = @LIBPEAS_LIBS@
LIBPEAS_REQUIRED = @LIBPEAS_REQUIRED@
LIBPEAS_UI_CFLAGS = @LIBPEAS_UI_CFLAGS@
LIBPEAS_UI_LIBS = @LIBPEAS_UI_LIBS@
LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
LIBRAW_LIBS = @LIBRAW_LIBS@
LIBRAW_REQUIRED = @LIBRAW_REQUIRED@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......
man1_SOURCES = entangle.pod
man1_MANS = $(man1_SOURCES:%.pod=%.1)
man1_SRC = entangle.pod
man1_MANS = $(man1_SRC:%.pod=%.1)
POD2MAN = pod2man -c "User Commands" -r "$(PACKAGE)-$(VERSION)"
EXTRA_DIST = $(man1_SOURCES) $(man1_MANS)
EXTRA_DIST = $(man1_SRC) $(man1_MANS)
entangle.1: entangle.pod
$(AM_V_GEN)$(POD2MAN) --name ENTANGLE $< $(srcdir)/$@
......
......@@ -216,6 +216,9 @@ LIBPEAS_LIBS = @LIBPEAS_LIBS@
LIBPEAS_REQUIRED = @LIBPEAS_REQUIRED@
LIBPEAS_UI_CFLAGS = @LIBPEAS_UI_CFLAGS@
LIBPEAS_UI_LIBS = @LIBPEAS_UI_LIBS@
LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
LIBRAW_LIBS = @LIBRAW_LIBS@
LIBRAW_REQUIRED = @LIBRAW_REQUIRED@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......@@ -316,10 +319,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
man1_SOURCES = entangle.pod
man1_MANS = $(man1_SOURCES:%.pod=%.1)
man1_SRC = entangle.pod
man1_MANS = $(man1_SRC:%.pod=%.1)
POD2MAN = pod2man -c "User Commands" -r "$(PACKAGE)-$(VERSION)"
EXTRA_DIST = $(man1_SOURCES) $(man1_MANS)
EXTRA_DIST = $(man1_SRC) $(man1_MANS)
MAINTAINERCLEANFILES = $(man1_MANS)
all: all-am
......
......@@ -124,13 +124,13 @@
.\" ========================================================================
.\"
.IX Title "ENTANGLE 1"
.TH ENTANGLE 1 "2012-09-06" "entangle-0.4.1" "User Commands"
.TH ENTANGLE 1 "2012-12-16" "entangle-0.5.0" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
.SH "NAME"
entangle \- thethered camera control & capture
entangle \- tethered camera control & capture
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
entangle [\s-1OPTION\s0...]
......
=head1 NAME
entangle - thethered camera control & capture
entangle - tethered camera control & capture
=head1 SYNOPSIS
......
......@@ -16,47 +16,46 @@
<chapter>
<title>Entangle Backend</title>
<xi:include href="xml/app.xml"/>
<xi:include href="xml/camera.xml"/>
<xi:include href="xml/camera-list.xml"/>
<xi:include href="xml/colour-profile.xml"/>
<!-- <xi:include href="xml/colour-profile-enums.xml"/> -->
<xi:include href="xml/control.xml"/>
<xi:include href="xml/control-button.xml"/>
<xi:include href="xml/control-choice.xml"/>
<xi:include href="xml/control-date.xml"/>
<xi:include href="xml/control-group.xml"/>
<xi:include href="xml/control-range.xml"/>
<xi:include href="xml/control-text.xml"/>
<xi:include href="xml/control-toggle.xml"/>
<xi:include href="xml/device-manager.xml"/>
<xi:include href="xml/image.xml"/>
<xi:include href="xml/image-loader.xml"/>
<xi:include href="xml/params.xml"/>
<xi:include href="xml/pixbuf-loader.xml"/>
<xi:include href="xml/plugin.xml"/>
<xi:include href="xml/plugin-javascript.xml"/>
<xi:include href="xml/plugin-manager.xml"/>
<xi:include href="xml/plugin-native.xml"/>
<xi:include href="xml/preferences.xml"/>
<xi:include href="xml/preferences-gconf.xml"/>
<xi:include href="xml/progress.xml"/>
<xi:include href="xml/session.xml"/>
<xi:include href="xml/thumbnail-loader.xml"/>
<xi:include href="xml/debug.xml"/>
<xi:include href="xml/entangle-camera.xml"/>
<xi:include href="xml/entangle-camera-file.xml"/>
<xi:include href="xml/entangle-camera-list.xml"/>
<xi:include href="xml/entangle-colour-profile.xml"/>
<!-- <xi:include href="xml/entangle-colour-profile-enums.xml"/> -->
<xi:include href="xml/entangle-control.xml"/>
<xi:include href="xml/entangle-control-button.xml"/>
<xi:include href="xml/entangle-control-choice.xml"/>
<xi:include href="xml/entangle-control-date.xml"/>
<xi:include href="xml/entangle-control-group.xml"/>
<xi:include href="xml/entangle-control-range.xml"/>
<xi:include href="xml/entangle-control-text.xml"/>
<xi:include href="xml/entangle-control-toggle.xml"/>
<xi:include href="xml/entangle-device-manager.xml"/>
<xi:include href="xml/entangle-image.xml"/>
<xi:include href="xml/entangle-image-loader.xml"/>
<xi:include href="xml/entangle-pixbuf.xml"/>
<xi:include href="xml/entangle-pixbuf-loader.xml"/>
<xi:include href="xml/entangle-preferences.xml"/>
<xi:include href="xml/entangle-progress.xml"/>
<xi:include href="xml/entangle-session.xml"/>
<xi:include href="xml/entangle-thumbnail-loader.xml"/>
<xi:include href="xml/entangle-debug.xml"/>
</chapter>
<chapter>
<title>Entangle Frontend</title>
<xi:include href="xml/app-display.xml"/>
<xi:include href="xml/camera-info.xml"/>
<xi:include href="xml/camera-manager.xml"/>
<xi:include href="xml/camera-picker.xml"/>
<xi:include href="xml/control-panel.xml"/>
<xi:include href="xml/help-about.xml"/>
<xi:include href="xml/image-display.xml"/>
<xi:include href="xml/image-polaroid.xml"/>
<xi:include href="xml/preferences-display.xml"/>
<xi:include href="xml/session-browser.xml"/>
<xi:include href="xml/entangle-application.xml"/>
<xi:include href="xml/entangle-camera-info.xml"/>
<xi:include href="xml/entangle-camera-manager.xml"/>
<xi:include href="xml/entangle-camera-picker.xml"/>
<xi:include href="xml/entangle-camera-support.xml"/>
<xi:include href="xml/entangle-control-panel.xml"/>
<xi:include href="xml/entangle-dpms.xml"/>
<xi:include href="xml/entangle-help-about.xml"/>
<xi:include href="xml/entangle-image-display.xml"/>
<xi:include href="xml/entangle-image-histogram.xml"/>
<xi:include href="xml/entangle-image-popup.xml"/>
<xi:include href="xml/entangle-image-statusbar.xml"/>
<xi:include href="xml/entangle-preferences-display.xml"/>
<xi:include href="xml/entangle-session-browser.xml"/>
</chapter>
<chapter id="object-tree">
<title>Object Hierarchy</title>
......
......@@ -582,6 +582,7 @@ entangle_image_display_get_autoscale
entangle_image_display_get_focus_point
entangle_image_display_get_grid_display
entangle_image_display_get_image
entangle_image_display_get_image_list
entangle_image_display_get_mask_enabled
entangle_image_display_get_mask_opacity
entangle_image_display_get_scale
......@@ -591,6 +592,7 @@ entangle_image_display_set_autoscale
entangle_image_display_set_focus_point
entangle_image_display_set_grid_display
entangle_image_display_set_image
entangle_image_display_set_image_list
entangle_image_display_set_mask_enabled
entangle_image_display_set_mask_opacity
entangle_image_display_set_scale
......@@ -637,8 +639,10 @@ entangle_image_histogram_get_type
EntangleImageLoader
EntangleImageLoaderClass
entangle_image_loader_add
entangle_image_loader_get_embedded_preview
entangle_image_loader_new
entangle_image_loader_remove
entangle_image_loader_set_embedded_preview
<SUBSECTION Standard>
ENTANGLE_IMAGE_LOADER
ENTANGLE_IMAGE_LOADER_CLASS
......@@ -646,6 +650,7 @@ ENTANGLE_IMAGE_LOADER_GET_CLASS
ENTANGLE_IS_IMAGE_LOADER
ENTANGLE_IS_IMAGE_LOADER_CLASS
ENTANGLE_TYPE_IMAGE_LOADER
EntangleImageLoaderPrivate
entangle_image_loader_get_type
</SECTION>
......@@ -691,6 +696,13 @@ EntangleImageStatusbarPrivate
entangle_image_statusbar_get_type
</SECTION>
<SECTION>
<FILE>entangle-pixbuf</FILE>
EntanglePixbufImageSlot
entangle_pixbuf_auto_rotate
entangle_pixbuf_open_image
</SECTION>
<SECTION>
<FILE>entangle-pixbuf-loader</FILE>
<TITLE>EntanglePixbufLoader</TITLE>
......@@ -704,6 +716,7 @@ entangle_pixbuf_loader_is_ready
entangle_pixbuf_loader_load
entangle_pixbuf_loader_set_colour_transform
entangle_pixbuf_loader_set_workers
entangle_pixbuf_loader_trigger_reload
entangle_pixbuf_loader_unload
<SUBSECTION Standard>
ENTANGLE_IS_PIXBUF_LOADER
......@@ -740,15 +753,21 @@ entangle_preferences_cms_set_monitor_profile
entangle_preferences_cms_set_rendering_intent
entangle_preferences_cms_set_rgb_profile
entangle_preferences_img_get_aspect_ratio
entangle_preferences_img_get_embedded_preview
entangle_preferences_img_get_focus_point
entangle_preferences_img_get_grid_lines
entangle_preferences_img_get_mask_enabled
entangle_preferences_img_get_mask_opacity
entangle_preferences_img_get_onion_layers
entangle_preferences_img_get_onion_skin
entangle_preferences_img_set_aspect_ratio
entangle_preferences_img_set_embedded_preview
entangle_preferences_img_set_focus_point
entangle_preferences_img_set_grid_lines
entangle_preferences_img_set_mask_enabled
entangle_preferences_img_set_mask_opacity
entangle_preferences_img_set_onion_layers
entangle_preferences_img_set_onion_skin
entangle_preferences_interface_add_plugin
entangle_preferences_interface_get_auto_connect
entangle_preferences_interface_get_plugins
......@@ -833,6 +852,7 @@ entangle_session_get_type
<TITLE>EntangleSessionBrowser</TITLE>
EntangleSessionBrowser
EntangleSessionBrowserClass
entangle_session_browser_earlier_images
entangle_session_browser_get_image_at_coords
entangle_session_browser_get_session
entangle_session_browser_get_thumbnail_loader
......
......@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
DOC_SOURCE_DIR=../../src
DOC_SOURCE_DIR=$(top_srcdir)/src
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
......@@ -89,6 +89,7 @@ GTKDOC_CFLAGS= \
$(GTK_CFLAGS) \
$(LIBPEAS_CFLAGS) \
$(GLADE2_CFLAGS) \
$(LIBRAW_CFLAGS) \
$(UNIQUE_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/src/libentangle_backend.la $(top_builddir)/src/libentangle_frontend.la
......
......@@ -192,6 +192,9 @@ LIBPEAS_LIBS = @LIBPEAS_LIBS@
LIBPEAS_REQUIRED = @LIBPEAS_REQUIRED@
LIBPEAS_UI_CFLAGS = @LIBPEAS_UI_CFLAGS@
LIBPEAS_UI_LIBS = @LIBPEAS_UI_LIBS@
LIBRAW_CFLAGS = @LIBRAW_CFLAGS@
LIBRAW_LIBS = @LIBRAW_LIBS@