Commit 4186d63d authored by Matteo F. Vescovi's avatar Matteo F. Vescovi

Imported Upstream version 0.7.0

parent fbe132c0
SUBDIRS = src po docs
SUBDIRS = src po docs help
ACLOCAL_AMFLAGS = -I m4
......
......@@ -276,6 +276,7 @@ GUDEV_LIBS = @GUDEV_LIBS@
GUDEV_REQUIRED = @GUDEV_REQUIRED@
G_IR_COMPILER = @G_IR_COMPILER@
G_IR_SCANNER = @G_IR_SCANNER@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -292,6 +293,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
ITSTOOL = @ITSTOOL@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS2_REQUIRED = @LCMS2_REQUIRED@
......@@ -347,11 +349,13 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XEXT_REQUIRED = @XEXT_REQUIRED@
XGETTEXT = @XGETTEXT@
XMLLINT = @XMLLINT@
YELP_LC_DIST = @YELP_LC_DIST@
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -407,7 +411,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src po docs
SUBDIRS = src po docs help
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
$(PACKAGE).spec \
......
Entangle News
=============
Release 0.7.0 - "Charm" - 2015-03-17
------------------------------------
* Require GLib >= 2.36
* Import new logo design
* Switch to using zanata.org for translations
* Set default window icon
* Introduce an initial help manual via yelp
* Use shared library for core engine to ensure all symbols
are exported to plugins
* Add framework for scripting capture operations
* Workaround camera busy problems with Nikon cameras
* Add a plugin for repeated capture sequences
* Replace progress bar with spinner icon
Release 0.6.1 - "Strange" - 2015-02-05
--------------------------------------
......
......@@ -68,7 +68,7 @@ they can be reported to
The latest entangle code can be found in GIT at:
https://gitorious.org/entangle/entangle
https://gitlab.com/entangle/entangle
For further information visit
......
......@@ -788,6 +788,220 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
AC_DEFUN([YELP_HELP_INIT],
[
AC_REQUIRE([AC_PROG_LN_S])
m4_pattern_allow([AM_V_at])
m4_pattern_allow([AM_V_GEN])
m4_pattern_allow([AM_DEFAULT_VERBOSITY])
YELP_LC_MEDIA_LINKS=true
YELP_LC_DIST=true
for yelpopt in [$1]; do
case $yelpopt in
lc-media-links) YELP_LC_MEDIA_LINKS=true ;;
no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
lc-dist) YELP_LC_DIST=true ;;
no-lc-dist) YELP_LC_DIST= ;;
*) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;;
esac
done;
AC_SUBST([YELP_LC_MEDIA_LINKS])
AC_SUBST([YELP_LC_DIST])
AC_ARG_WITH([help-dir],
AS_HELP_STRING([--with-help-dir=DIR],
[path where help files are installed]),,
[with_help_dir='${datadir}/help'])
HELP_DIR="$with_help_dir"
AC_SUBST(HELP_DIR)
AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
if test x"$ITSTOOL" = x; then
AC_MSG_ERROR([itstool not found])
fi
AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
if test x"$XMLLINT" = x; then
AC_MSG_ERROR([xmllint not found])
fi
YELP_HELP_RULES='
HELP_ID ?=
HELP_POT ?=
HELP_FILES ?=
HELP_EXTRA ?=
HELP_MEDIA ?=
HELP_LINGUAS ?=
_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@);
all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
.PHONY: pot
pot: $(_HELP_POTFILE)
$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
$(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
.PHONY: repo
repo: $(_HELP_POTFILE)
$(AM_V_at)for po in $(_HELP_POFILES); do \
if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \
msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
done
$(_HELP_POFILES):
$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
$(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi
$(AM_V_GEN)if ! test -f "[$]@"; then \
(cd "$(dir [$]@)" && \
$(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \
else \
(cd "$(dir [$]@)" && \
$(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \
rm "$(notdir [$]@).tmp"); \
fi
$(_HELP_MOFILES): %.mo: %.po
$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
$(AM_V_GEN)msgfmt -o "[$]@" "$<"
$(_HELP_LC_FILES): $(_HELP_LINGUAS)
$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
$(_HELP_LC_STAMPS): %.stamp: %.mo
$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \
if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
(cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
touch "[$]@"
.PHONY: clean-help
mostlyclean-am: $(if $(HELP_ID),clean-help)
clean-help:
rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
EXTRA_DIST ?=
EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
distdir: distdir-help-files
distdir-help-files: $(_HELP_LC_FILES)
@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
$(MKDIR_P) "$(distdir)/$$lc"; \
for file in $(HELP_FILES); do \
if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
done; \
done; \
.PHONY: check-help
check: check-help
check-help:
for lc in C $(_HELP_LINGUAS); do \
if test -d "$$lc"; \
then d=; \
xmlpath="$$lc"; \
else \
d="$(srcdir)/"; \
xmlpath="$$lc:$(srcdir)/$$lc"; \
fi; \
for page in $(HELP_FILES); do \
echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
$(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
done; \
done
.PHONY: install-help
install-data-am: $(if $(HELP_ID),install-help)
install-help: $(_HELP_LC_FILES)
@for lc in C $(_HELP_LINGUAS); do \
$(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
done
@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
$(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
done; done
@for f in $(_HELP_C_EXTRA); do \
lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
$(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
done
@for f in $(HELP_MEDIA); do \
for lc in C $(_HELP_LINGUAS); do \
if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
mdir=`dirname "$$f"`; \
if test "x$mdir" = "x."; then mdir=""; fi; \
if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
if test -f "$$d$$lc/$$f"; then \
echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
$(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
elif test "x$$lc" != "xC"; then \
if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
$(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
fi; \
fi; \
done; \
done
.PHONY: uninstall-help
uninstall-am: $(if $(HELP_ID),uninstall-help)
uninstall-help:
for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
echo "rm -f $$helpdir`basename $$f`"; \
rm -f "$$helpdir`basename $$f`"; \
done; done
@for f in $(_HELP_C_EXTRA); do \
lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
echo "rm -f $$helpdir`basename $$f`"; \
rm -f "$$helpdir`basename $$f`"; \
done
@for f in $(HELP_MEDIA); do \
for lc in C $(_HELP_LINGUAS); do \
helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
echo "rm -f $$helpdir$$f"; \
rm -f "$$helpdir$$f"; \
done; \
done;
'
AC_SUBST([YELP_HELP_RULES])
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
])
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
......
......@@ -144,8 +144,10 @@ exclude_file_name_regexp--sc_prohibit_strcmp = ^*/*.[ch]
# Due to enum rules - fixme
exclude_file_name_regexp--sc_makefile_at_at_check = ^src/Makefile.am
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^(docs|src)/.*\.png
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^.*\.png
exclude_file_name_regexp--sc_prohibit_test_minus_ao = git.mk
exclude_file_name_regexp--sc_trailing_blank = (src|docs)/.*\.(ep|png|icc)
exclude_file_name_regexp--sc_makefile_at_at_check = src/Makefile\.am|help/Makefile\.am
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT([entangle], [0.6.1])
AC_INIT([entangle], [0.7.0])
AC_CONFIG_SRCDIR([src/entangle-main.c])
AM_CONFIG_HEADER([config.h])
dnl Make automake keep quiet about wildcards & other GNUmake-isms
......@@ -18,11 +18,11 @@ dnl ****************************************************************************
dnl Declare required library versions
dnl *******************************************************************************
GLIB_REQUIRED=2.26.0
GLIB_REQUIRED=2.36.0
AC_SUBST(GLIB_REQUIRED)
GIO_REQUIRED=2.26.0
GIO_REQUIRED=2.36.0
AC_SUBST(GIO_REQUIRED)
GTHREAD_REQUIRED=2.26.0
GTHREAD_REQUIRED=2.36.0
AC_SUBST(GTHREAD_REQUIRED)
GDK_PIXBUF_REQUIRED=2.12.0
AC_SUBST(GDK_PIXBUF_REQUIRED)
......@@ -136,6 +136,8 @@ GLIB_GSETTINGS
GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
YELP_HELP_INIT
PKG_CHECK_MODULES([GOBJECT_INTROSPECTION],
[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
......@@ -186,11 +188,13 @@ AC_CONFIG_FILES(
src/Makefile
src/plugins/Makefile
src/plugins/photobox/Makefile
src/plugins/shooter/Makefile
po/Makefile.in
docs/Makefile
docs/man/Makefile
docs/man/en/Makefile
docs/reference/Makefile
help/Makefile
)
AC_OUTPUT
......
......@@ -252,6 +252,7 @@ GUDEV_LIBS = @GUDEV_LIBS@
GUDEV_REQUIRED = @GUDEV_REQUIRED@
G_IR_COMPILER = @G_IR_COMPILER@
G_IR_SCANNER = @G_IR_SCANNER@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -268,6 +269,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
ITSTOOL = @ITSTOOL@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS2_REQUIRED = @LCMS2_REQUIRED@
......@@ -323,11 +325,13 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XEXT_REQUIRED = @XEXT_REQUIRED@
XGETTEXT = @XGETTEXT@
XMLLINT = @XMLLINT@
YELP_LC_DIST = @YELP_LC_DIST@
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
......@@ -252,6 +252,7 @@ GUDEV_LIBS = @GUDEV_LIBS@
GUDEV_REQUIRED = @GUDEV_REQUIRED@
G_IR_COMPILER = @G_IR_COMPILER@
G_IR_SCANNER = @G_IR_SCANNER@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -268,6 +269,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
ITSTOOL = @ITSTOOL@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS2_REQUIRED = @LCMS2_REQUIRED@
......@@ -323,11 +325,13 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XEXT_REQUIRED = @XEXT_REQUIRED@
XGETTEXT = @XGETTEXT@
XMLLINT = @XMLLINT@
YELP_LC_DIST = @YELP_LC_DIST@
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
......@@ -223,6 +223,7 @@ GUDEV_LIBS = @GUDEV_LIBS@
GUDEV_REQUIRED = @GUDEV_REQUIRED@
G_IR_COMPILER = @G_IR_COMPILER@
G_IR_SCANNER = @G_IR_SCANNER@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -239,6 +240,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
ITSTOOL = @ITSTOOL@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS2_REQUIRED = @LCMS2_REQUIRED@
......@@ -294,11 +296,13 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XEXT_REQUIRED = @XEXT_REQUIRED@
XGETTEXT = @XGETTEXT@
XMLLINT = @XMLLINT@
YELP_LC_DIST = @YELP_LC_DIST@
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "ENTANGLE 1"
.TH ENTANGLE 1 "2015-02-05" "entangle-0.6.1" "User Commands"
.TH ENTANGLE 1 "2015-03-17" "entangle-0.7.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
......
......@@ -205,6 +205,8 @@ entangle_camera_list_get_type
<FILE>entangle-camera-manager</FILE>
<TITLE>EntangleCameraManager</TITLE>
entangle_camera_manager_new
entangle_camera_manager_add_script
entangle_camera_manager_remove_script
entangle_camera_manager_capture
entangle_camera_manager_preview_begin
entangle_camera_manager_preview_cancel
......@@ -868,6 +870,66 @@ EntangleProgress
entangle_progress_get_type
</SECTION>
<SECTION>
<FILE>entangle-script</FILE>
<TITLE>EntangleScript</TITLE>
entangle_script_get_title
entangle_script_get_config_widget
entangle_script_execute_async
entangle_script_execute_finish
<SUBSECTION Standard>
ENTANGLE_IS_SCRIPT
ENTANGLE_IS_SCRIPT_CLASS
ENTANGLE_SCRIPT
ENTANGLE_SCRIPT_CLASS
ENTANGLE_SCRIPT_GET_CLASS
ENTANGLE_TYPE_SCRIPT
EntangleScript
EntangleScriptClass
EntangleScriptPrivate
entangle_script_get_type
</SECTION>
<SECTION>
<FILE>entangle-script-config</FILE>
<TITLE>EntangleScriptConfig</TITLE>
entangle_script_config_new
entangle_script_config_add_script
entangle_script_config_remove_script
entangle_script_config_has_scripts
entangle_script_config_get_selected
<SUBSECTION Standard>
ENTANGLE_IS_SCRIPT_CONFIG
ENTANGLE_IS_SCRIPT_CONFIG_CLASS
ENTANGLE_SCRIPT_CONFIG
ENTANGLE_SCRIPT_CONFIG_CLASS
ENTANGLE_SCRIPT_CONFIG_GET_CLASS
ENTANGLE_TYPE_SCRIPT_CONFIG
EntangleScriptConfig
EntangleScriptConfigClass
EntangleScriptConfigPrivate
entangle_script_config_get_type
</SECTION>
<SECTION>
<FILE>entangle-script-simple</FILE>
<TITLE>EntangleScriptSimple</TITLE>
entangle_script_simple_return_task_error
entangle_script_simple_init_task_data
entangle_script_simple_get_task_data
<SUBSECTION Standard>
ENTANGLE_IS_SCRIPT_SIMPLE
ENTANGLE_IS_SCRIPT_SIMPLE_CLASS
ENTANGLE_SCRIPT_SIMPLE
ENTANGLE_SCRIPT_SIMPLE_CLASS
ENTANGLE_SCRIPT_SIMPLE_GET_CLASS
ENTANGLE_TYPE_SCRIPT_SIMPLE
EntangleScriptSimple
EntangleScriptSimpleClass
EntangleScriptSimplePrivate
entangle_script_simple_get_type
</SECTION>
<SECTION>
<FILE>entangle-session</FILE>
<TITLE>EntangleSession</TITLE>
......
......@@ -33,6 +33,9 @@ entangle_pixbuf_loader_get_type
entangle_preferences_display_get_type
entangle_preferences_get_type
entangle_progress_get_type
entangle_script_config_get_type
entangle_script_get_type
entangle_script_simple_get_type
entangle_session_browser_get_type
entangle_session_get_type
entangle_thumbnail_loader_get_type
......
......@@ -199,6 +199,7 @@ GUDEV_LIBS = @GUDEV_LIBS@
GUDEV_REQUIRED = @GUDEV_REQUIRED@
G_IR_COMPILER = @G_IR_COMPILER@
G_IR_SCANNER = @G_IR_SCANNER@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -215,6 +216,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
ITSTOOL = @ITSTOOL@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS2_REQUIRED = @LCMS2_REQUIRED@
......@@ -270,11 +272,13 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WARN_LDFLAGS = @WARN_LDFLAGS@
XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XEXT_REQUIRED = @XEXT_REQUIRED@
XGETTEXT = @XGETTEXT@
XMLLINT = @XMLLINT@
YELP_LC_DIST = @YELP_LC_DIST@
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
......@@ -363,6 +363,8 @@
<keyword type="property" name="The “preferences” property" link="EntangleApplication.html#EntangleApplication--preferences"/>
<keyword type="property" name="The “supported-cameras” property" link="EntangleApplication.html#EntangleApplication--supported-cameras"/>
<keyword type="function" name="entangle_camera_manager_new ()" link="EntangleCameraManager.html#entangle-camera-manager-new"/>
<keyword type="function" name="entangle_camera_manager_add_script ()" link="EntangleCameraManager.html#entangle-camera-manager-add-script"/>
<keyword type="function" name="entangle_camera_manager_remove_script ()" link="EntangleCameraManager.html#entangle-camera-manager-remove-script"/>
<keyword type="function" name="entangle_camera_manager_capture ()" link="EntangleCameraManager.html#entangle-camera-manager-capture"/>
<keyword type="function" name="entangle_camera_manager_preview_begin ()" link="EntangleCameraManager.html#entangle-camera-manager-preview-begin"/>
<keyword type="function" name="entangle_camera_manager_preview_cancel ()" link="EntangleCameraManager.html#entangle-camera-manager-preview-cancel"/>
......
......@@ -611,42 +611,42 @@
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-connected" title="The “camera-connected” signal">camera-connected</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-controls-changed" title="The “camera-controls-changed” signal">camera-controls-changed</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-disconnected" title="The “camera-disconnected” signal">camera-disconnected</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-file-added" title="The “camera-file-added” signal">camera-file-added</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-file-captured" title="The “camera-file-captured” signal">camera-file-captured</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-file-deleted" title="The “camera-file-deleted” signal">camera-file-deleted</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-file-downloaded" title="The “camera-file-downloaded” signal">camera-file-downloaded</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
<tr>
<td class="signal_type"><span class="returnvalue">void</span></td>
<td class="signal_name"><a class="link" href="EntangleCamera.html#EntangleCamera-camera-file-previewed" title="The “camera-file-previewed” signal">camera-file-previewed</a></td>
<td class="signal_flags">Run First</td>
<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></td>
</tr>
</tbody>
</table></div>
......@@ -2730,7 +2730,7 @@ entangle_camera_unmount_async.</p>
<pre class="programlisting"><span class="returnvalue">void</span>
user_function (<a class="link" href="EntangleCamera.html" title="EntangleCamera"><span class="type">EntangleCamera</span></a> *entanglecamera,
<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data)</pre>
<p>Flags: Run First</p>
<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS">Run First</a></p>
</div>