Commit 8004d54f authored by Barak A. Pearlmutter's avatar Barak A. Pearlmutter

New upstream version 0.4.8.2016

parent 0ba2ac50
......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
......
Version 0.4.8.2016 (July 20, 2017 bugfix release):
* Bug fixes:
- pen and touchscreen input handling bugfixes (bug #136 and others)
- fix a minor bug with save file paths in Windows (D. German)
- use GDK macros (not WIN32) to disable X11-specific code (T. Schoonjans)
- export to PDF and printing: fix resolution loss on some pdf backgrounds
- disable xinput during modal dialog boxes (bug #159)
- avoid data corruption when exporting to overwrite a PDF
- fix path search order for toolbar bitmaps
- text and image tools activate on button release instead of button press
to avoid subsequent confusion between clicks in toolbar and drawing area
- fix "pen disable touch" when touchscreen sends prox events (A. Kittenberger)
- fix crash when pasting text or images via xclip (bug #171)
- updated Italian translation (Marco Ciampa)
* Features:
- add space and shift-space bindings to page down/up (D. German)
- add A5 paper (D. German)
- config option to export successive layers to separate PDF pages
- config option to create new file when trying to open non-existent .xoj
Version 0.4.8 (June 30, 2014):
* Features:
- option to auto-save documents and recover auto-saves (after Edward Yang, Aiwarrior, Timo Kluck)
- new Export to PDF code using cairo (and config option to enable legacy code)
- option to auto-save documents and recover auto-saves
(after Edward Yang, Aiwarrior, Timo Kluck)
- new Export to PDF code using cairo (with option to use legacy code)
- horizontal view mode
- improved touchscreen handling
- pencil cursor option (patch by Luciano Siqueira)
......
......@@ -47,6 +47,9 @@ desktop-install:
if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; \
fi; \
if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/application-x-xoj.svg; then \
ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/application-x-xoj.svg; \
fi; \
$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)/usr/share/mimelnk/application; \
......
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -78,15 +88,12 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in mkinstalldirs COPYING ar-lib \
config.guess config.sub depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
......@@ -150,6 +157,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
COPYING ChangeLog INSTALL NEWS README ar-lib compile \
config.guess config.sub depcomp install-sh missing \
mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -227,6 +238,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -338,7 +350,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -359,8 +370,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then rm -f stamp-h1; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
......@@ -547,7 +558,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -563,11 +574,17 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -585,7 +602,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -595,22 +612,23 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -785,6 +803,8 @@ uninstall-am:
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am
.PRECIOUS: Makefile
install-data-local:
@$(NORMAL_INSTALL)
......@@ -826,6 +846,9 @@ desktop-install:
if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; \
fi; \
if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/application-x-xoj.svg; then \
ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/application-x-xoj.svg; \
fi; \
$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)/usr/share/mimelnk/application; \
......
Version 0.4.8 (June 30, 2014)
Version 0.4.8.2016 (July 20, 2017 bugfix update)
Installation: see INSTALL
User's manual: see html-doc/manual.html
......
Version 0.4.8 (June 30, 2014)
Version 0.4.8.2016 (July 20, 2017 bugfix update)
Installation: see INSTALL
User's manual: see html-doc/manual.html
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(xournal, 0.4.8)
AM_INIT_AUTOMAKE(xournal, 0.4.8.2016)
AC_CONFIG_HEADERS(config.h)
AM_MAINTAINER_MODE
......@@ -30,6 +30,15 @@ esac
AC_MSG_RESULT([$os_win32])
AM_CONDITIONAL(WIN32, test "$os_win32" = "yes")
dnl test for Linux, so we can add -lX11 manually for broken distributions
case "$host" in
*-*-linux*)
os_linux=yes;;
*)
os_linux=no;;
esac
AM_CONDITIONAL(LINUX, test "$os_linux" = "yes")
GETTEXT_PACKAGE=xournal
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
......
......@@ -753,6 +753,31 @@ Bug reports and suggestions can also be submitted on Xournal's
<a name="changelog"></a>
<h2 class="subtitle">Version history</h2>
<p>
Version 0.4.8.2016 (July 20, 2017 bugfix release):
<ul>
<li>Bug fixes:
<ul><li>pen and touchscreen input handling bugfixes (bug #136 and others)
</li><li>fix a minor bug with save file paths in Windows (D. German)
</li><li>use GDK macros (not WIN32) to disable X11-specific code (T. Schoonjans)
</li><li>export to PDF and printing: fix resolution loss on some pdf backgrounds
</li><li>disable xinput during modal dialog boxes (bug #159)
</li><li>avoid data corruption when exporting to overwrite a PDF
</li><li>fix path search order for toolbar bitmaps
</li><li>text and image tools activate on button release instead of button press
to avoid subsequent confusion between clicks in toolbar and drawing area
</li><li>fix "pen disable touch" when touchscreen sends prox events (A. Kittenberger)
</li><li>fix crash when pasting text or images via xclip (bug #171)
</li><li>updated Italian translation (Marco Ciampa)
</li></ul>
</li><li>Features:
<ul><li>add space and shift-space bindings to page down/up (D. German)
</li><li>add A5 paper (D. German)
</li><li>config option to export successive layers to separate PDF pages
</li><li>config option to create new file when trying to open non-existent .xoj
</li></ul>
</li></ul>
</p>
<p>
Version 0.4.8 (June 30, 2014):
<ul>
<li>Features:
......
- updated Italian translation (Marco Ciampa)
Version 0.4.8:
- added Chinese (simplified) translation (by Mutse)
- updated German translation (Stefan Holtzhauer)
......
......@@ -93,7 +93,7 @@ all-yes: $(CATALOGS)
all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --from-code=UTF-8 \
--msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \
--add-comments --keyword=_ --keyword=N_ \
--keyword=C_:1c,2 \
......
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
......@@ -31,6 +31,10 @@ if WIN32
xournal_LDFLAGS = -mwindows
xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
else
if LINUX
xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
else
xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm
endif
endif
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -80,12 +90,11 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xournal$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -99,8 +108,12 @@ am_xournal_OBJECTS = main.$(OBJEXT) xo-misc.$(OBJEXT) \
xo-callbacks.$(OBJEXT) xo-shapes.$(OBJEXT)
xournal_OBJECTS = $(am_xournal_OBJECTS)
am__DEPENDENCIES_1 =
@WIN32_FALSE@xournal_DEPENDENCIES = ttsubset/libttsubset.a \
@WIN32_FALSE@ $(am__DEPENDENCIES_1)
@LINUX_FALSE@@WIN32_FALSE@xournal_DEPENDENCIES = \
@LINUX_FALSE@@WIN32_FALSE@ ttsubset/libttsubset.a \
@LINUX_FALSE@@WIN32_FALSE@ $(am__DEPENDENCIES_1)
@LINUX_TRUE@@WIN32_FALSE@xournal_DEPENDENCIES = \
@LINUX_TRUE@@WIN32_FALSE@ ttsubset/libttsubset.a \
@LINUX_TRUE@@WIN32_FALSE@ $(am__DEPENDENCIES_1)
@WIN32_TRUE@xournal_DEPENDENCIES = win32/xournal.res \
@WIN32_TRUE@ ttsubset/libttsubset.a $(am__DEPENDENCIES_1)
xournal_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xournal_LDFLAGS) \
......@@ -176,6 +189,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = ttsubset win32
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
$(top_srcdir)/mkinstalldirs TODO
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
......@@ -237,6 +252,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -345,7 +361,8 @@ xournal_SOURCES = \
xo-shapes.c xo-shapes.h
@WIN32_TRUE@xournal_LDFLAGS = -mwindows
@WIN32_FALSE@xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
@LINUX_FALSE@@WIN32_FALSE@xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm
@LINUX_TRUE@@WIN32_FALSE@xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
@WIN32_TRUE@xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
all: all-recursive
......@@ -363,7 +380,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -452,14 +468,14 @@ distclean-compile:
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
......@@ -738,6 +754,8 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-binPROGRAMS
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -20,6 +20,7 @@
#include <sys/stat.h>
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include "xournal.h"
......@@ -57,7 +58,7 @@ void init_stuff (int argc, char *argv[])
// initialize config file names
tmppath = g_build_filename(g_get_home_dir(), CONFIG_DIR, NULL);
mkdir(tmppath, 0700); // safer (MRU data may be confidential)
g_mkdir(tmppath, 0700); // safer (MRU data may be confidential)
ui.mrufile = g_build_filename(tmppath, MRU_FILE, NULL);
ui.configfile = g_build_filename(tmppath, CONFIG_FILE, NULL);
g_free(tmppath);
......@@ -242,6 +243,10 @@ void init_stuff (int argc, char *argv[])
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsPrintRuling")), ui.print_ruling);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLegacyPDFExport")), ui.exportpdf_prefer_legacy);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLayersPDFExport")), ui.exportpdf_layers);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoloadPdfXoj")), ui.autoload_pdf_xoj);
gtk_check_menu_item_set_active(
......@@ -326,7 +331,7 @@ void init_stuff (int argc, char *argv[])
if (!success) {
w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]);
gtk_dialog_run(GTK_DIALOG(w));
wrapper_gtk_dialog_run(GTK_DIALOG(w));
gtk_widget_destroy(w);
}
}
......@@ -346,16 +351,16 @@ main (int argc, char *argv[])
gtk_set_locale ();
gtk_init (&argc, &argv);
add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
path = g_path_get_dirname(argv[0]);
path1 = g_build_filename(path, "pixmaps", NULL);
path2 = g_build_filename(path, "..", "pixmaps", NULL);
add_pixmap_directory (path1);
add_pixmap_directory (path2);
add_pixmap_directory (path);
add_pixmap_directory (path2);
add_pixmap_directory (path1);
g_free(path);
g_free(path1);
g_free(path2);
add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
/*
* The following code was added by Glade to create one of each component
......
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,12 +89,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/ttsubset
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -153,6 +162,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
$(top_srcdir)/mkinstalldirs README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -189,6 +200,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -300,7 +312,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ttsubset/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/ttsubset/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -342,14 +353,14 @@ distclean-compile:
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
......@@ -551,6 +562,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
This diff is collapsed.
......@@ -702,3 +702,7 @@ on_optionsAutosaveXoj_activate (GtkMenuItem *menuitem,
void
on_optionsLegacyPDFExport_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_optionsLayersPDFExport_activate (GtkMenuItem *menuitem,
gpointer user_data);
......@@ -27,6 +27,7 @@
#include "xo-misc.h"
#include "xo-paint.h"
#include "xo-image.h"
#include "xo-selection.h"
// the various formats in which we might present clipboard data
#define TARGET_XOURNAL 1
......@@ -401,10 +402,9 @@ void clipboard_paste(void)
sel_data = gtk_clipboard_wait_for_contents(
clipboard,
gdk_atom_intern(XOURNAL_TARGET_ATOM, FALSE));
#ifdef WIN32 // avoid a win32 bug showing images as xournal data
// avoid a bug (mostly win32, also xclip?) presenting images as xournal data
if (gtk_selection_data_get_data_type(sel_data)!=gdk_atom_intern(XOURNAL_TARGET_ATOM, FALSE))
{ gtk_selection_data_free(sel_data); sel_data = NULL; }
#endif
ui.cur_item_type = ITEM_NONE;
if (sel_data != NULL) {
clipboard_paste_from_xournal(sel_data);
......
This diff is collapsed.
......@@ -24,6 +24,7 @@
#include "xournal.h"
#include "xo-support.h"
#include "xo-image.h"
#include "xo-misc.h"
// create pixbuf from buffer, or return NULL on failure
GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen)
......@@ -124,7 +125,7 @@ void insert_image(GdkEvent *event)
if (ui.default_image != NULL) gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.default_image);
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
if (wrapper_gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
gtk_widget_destroy(dialog);
return;
}
......@@ -143,7 +144,7 @@ void insert_image(GdkEvent *event)
if(pixbuf==NULL) { /* open failed */
dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening image '%s'"), filename);
gtk_dialog_run(GTK_DIALOG(dialog));
wrapper_gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
g_free(filename);
ui.cur_item = NULL;
......
......@@ -255,6 +255,7 @@ create_winMain (void)
GtkWidget *optionsProgressiveBG;
GtkWidget *optionsPrintRuling;
GtkWidget *optionsLegacyPDFExport;
GtkWidget *optionsLayersPDFExport;
GtkWidget *optionsAutoloadPdfXoj;
GtkWidget *optionsAutosaveXoj;
GtkWidget *optionsLeftHanded;
......@@ -1433,6 +1434,10 @@ create_winMain (void)
gtk_widget_show (optionsLegacyPDFExport);
gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLegacyPDFExport);
optionsLayersPDFExport = gtk_check_menu_item_new_with_mnemonic (_("Layers in PDF Export"));
gtk_widget_show (optionsLayersPDFExport);
gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLayersPDFExport);
optionsAutoloadPdfXoj = gtk_check_menu_item_new_with_mnemonic (_("Autoload pdf.xoj"));
gtk_widget_show (optionsAutoloadPdfXoj);
gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAutoloadPdfXoj);
......@@ -2453,6 +2458,9 @@ create_winMain (void)
g_signal_connect ((gpointer) optionsLegacyPDFExport, "activate",
G_CALLBACK (on_optionsLegacyPDFExport_activate),
NULL);
g_signal_connect ((gpointer) optionsLayersPDFExport, "activate",
G_CALLBACK (on_optionsLayersPDFExport_activate),
NULL);
g_signal_connect ((gpointer) optionsAutoloadPdfXoj, "activate",
G_CALLBACK (on_optionsAutoloadPdfXoj_activate),
NULL);
......@@ -2842,6 +2850,7 @@ create_winMain (void)
GLADE_HOOKUP_OBJECT (winMain, optionsProgressiveBG, "optionsProgressiveBG");
GLADE_HOOKUP_OBJECT (winMain, optionsPrintRuling, "optionsPrintRuling");
GLADE_HOOKUP_OBJECT (winMain, optionsLegacyPDFExport, "optionsLegacyPDFExport");
GLADE_HOOKUP_OBJECT (winMain, optionsLayersPDFExport, "optionsLayersPDFExport");
GLADE_HOOKUP_OBJECT (winMain, optionsAutoloadPdfXoj, "optionsAutoloadPdfXoj");
GLADE_HOOKUP_OBJECT (winMain, optionsAutosaveXoj, "optionsAutosaveXoj");
GLADE_HOOKUP_OBJECT (winMain, optionsLeftHanded, "optionsLeftHanded");
......@@ -2982,6 +2991,7 @@ create_papersizeDialog (void)
gtk_box_pack_start (GTK_BOX (hbox2), comboStdSizes, TRUE, TRUE, 5);
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("A4"));
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("A4 (landscape)"));
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("A5"));
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("US Letter"));
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("US Letter (landscape)"));
gtk_combo_box_append_text (GTK_COMBO_BOX (comboStdSizes), _("Custom"));
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment