Merge lp:~paolorotolo/pinta/fix-for-1093971 into lp:pinta

[Paolo Rotolo]

Add gnome-icon-theme-full to depends (LP: #1093971)

[Cameron White (cameronwhite91)]

I'm not sure this is right place to merge these changes. This repository is just a mirror of Pinta's Github repository, and is only used for the daily builds PPA. Based on Marc's comment on the bug report, I think you should be proposing this change to the raring branch of lp:ubuntu/pinta

Unmerged revisions

14. By Paolo Rotolo on 2013-01-05

* Add gnome-icon-theme-full to depends (LP: #1093971)

13. By Iain Lane on 2012-04-25

* [2c6b414] Imported Upstream version 1.2
  - Individual layers can now be rotated arbitrarily
  - Added specific mouse cursors for tools (pencil, paintbucket, etc)
  - Autocrop of image
  - Gradient tool now takes advantage of multiple cores to speed up
    rendering time
  - Added image preview to the images pad
  - Added white text background option
  - Show image previews in the Open File dialog
* [7e1f9e8] Update BDs to require Mono 2.8 per upstream

12. By Jo Shields on 2012-01-20

* [236a231] Update debian/rules for DH8-compatible "--with cli"
* [51033d9] Fix typo in clean override rule
* [87189a7] Add a get-out so "make cleanall" doesn't fail the build on a
  pristine tree

11. By Iain Lane on 2011-11-16

* [a2af0ce] Imported Upstream version 1.1
* [6b57160] Wrap too-long changelog line — silence, Lintian!
* [1e6d30f] Update copyright to newer DEP5ness
* [3879389] Update watch file for new upstream download location
* Remove upstreamed patches
  + [16a2b1b] remove-targetversion patch
  + [0114794] unversion-lib-references
* Add new build dependencies required by this release
  + [1cc97d9] mono-addins
  + [b698368] intltool
* [b698368] Remove references to other programs in long description
* [bd76c1d] BD on intltool for required by upstream

10. By Iain Lane on 2011-09-12

[92d659c] Depend on gnome-icon-theme since Pinta will crash without the icons
(LP: #846396)

9. By Jo Shields on 2011-06-17

No change rebuild against Mono's CLR 4.0 class library

8. By Iain Lane on 2011-06-01

* Upload to unstable
* [1b878e8] Update to use my d.o email address
* [22d952c] Alter BDs and patches so we can build against both 2.0 and 4.0

7. By Rico Tzschichholz on 2011-03-11

New upstream release version 0.7

6. By Maia Everett on 2010-07-27

* Add myself to uploaders.
* Add cairo_1.9_flush_markdirty.patch:
  - Fix rendering with Cairo 1.9 (Closes: #588886)
* Add tools_exceptions_and_history_corruption.patch:
  - Fix exceptions and data loss when clicking two mouse buttons
    while drawing
* Add double_save_exception.patch:
  - Fix exception when trying to save after doing "save as"
* Add tool_toolbar_fixed_size.patch:
  - Force tool toolbar to fixed size
* Bump Standards-Version to 3.9.1, no changes needed.

5. By Jo Shields on 2010-07-06

[ Jo Shields ]
* New upstream release
* +DFSG release of Pinta 0.4. Deleted files:
  + ./Pinta.Gui.Widgets/bin/Debug/Pinta.Gui.Widgets.dll
* debian/rules:
  + Switch to entirely minimal DH7 rules file, since the Automake
    wrapper for xbuild handles things we were having to do by hand
* debian/pinta.sh,
  debian/pinta.desktop,
  debian/pinta.xpm,
  debian/pinta.install:
  + Upstream now takes care of providing an icon and a .desktop file,
    and DH7 takes care of putting everything where it should be, so
    all these files have been deleted
* debian/copyright:
  + Updated (thanks to Maia Kozheva <email address hidden>)

[ Iain Lane ]
* [a8be0d2] Remove BD on libglade2.0-cil-dev; no longer necessary
* [41bfc27] debian/watch: Mangle version for +dfsg
* [9c1ad07] Standards-Version → 3.9.0, no changes required
* [0232079] Work around buggy upstream make clean target, fixing
  double build

=== added file 'Makefile.am'
--- Makefile.am	1970-01-01 00:00:00 +0000
+++ Makefile.am	2013-01-23 15:01:21 +0000
@@ -0,0 +1,117 @@
+SUBDIRS = xdg
+
+BINDIR = $(srcdir)/bin
+
+PINTA_ASSEMBLY_PC = $(srcdir)/$(PACKAGE_NAME).pc
+
+BINFILES = \
+	$(BINDIR)/Pinta.exe \
+	$(BINDIR)/Pinta.Core.dll \
+	$(BINDIR)/Pinta.Gui.Widgets.dll \
+	$(BINDIR)/Pinta.Resources.dll \
+	$(BINDIR)/Pinta.Effects.dll \
+	$(BINDIR)/Pinta.Tools.dll
+
+RELEASE_FILE = $(PACKAGE)-$(VERSION)
+
+#magic automake variables
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(PINTA_ASSEMBLY_PC)
+
+#end
+
+# target: all - Default target: build
+all: build
+
+# target: run - Launch the uninstalled copy
+run:
+	$(MONO) bin/Pinta.exe
+	
+# target: help - Display callable targets.
+help:
+	egrep "^# target:" Makefile | sed 's/^# target:/make/'
+
+# target: build - Build Pinta.
+build: Pinta.sln
+	cd $(srcdir) && $(XBUILD) Pinta.sln
+	cd $(srcdir) && $(XBUILD) Pinta.Install.proj /target:CompileTranslations
+
+# target: list - List source files.
+list:
+	if ! git status > /dev/null 2> /dev/null ;\
+	then \
+		find . -type f -name *.cs | sed 's|./||' ;\
+	else \
+		git ls-files | grep '\.cs' ;\
+	fi
+
+#target: updatepot - update the messages.pot file
+updatepot: build
+	find . -type f -name *.cs | sed 's|./||' > files.list
+	grep -v System.ComponentModel.Composition files.list > files2.list
+	xgettext --from-code=UTF-8 -f files2.list -o po/messages.pot
+	cat po/messages.in >> po/messages.pot
+	rm files.list
+	rm files2.list
+
+# target: clean - Default clean command: cleanobj and cleanbin
+clean: cleanobj cleanbin
+
+# target: distclean - Removes configure files. 
+distclean: clean
+	rm -f Makefile pinta config.status config.cache config.log configure.lineno config.status.lineno pinta.pc
+
+# target: cleanall - Removes build files. 
+cleanall: distclean
+	rm -rf autom4te.cache
+	rm -f configure aclocal.m4 missing install-sh Makefile.in
+
+# target: cleanbin - Removes built files. 
+cleanbin: 
+	rm -rvf $(BINDIR)/*
+
+# target: cleanobj - Removes temporary build files. 
+cleanobj:
+	find $(srcdir)/ -type d -name obj | xargs rm -rvf
+	
+# target: install - Installs Pinta. 
+install: pinta $(BINFILES)
+	cd $(srcdir) && $(XBUILD) /target:Install /property:InstallPrefix=$(DESTDIR)$(prefix) \
+		/property:BinDir=$(DESTDIR)$(bindir) /property:LibDir=$(DESTDIR)$(libdir) \
+		/property:DataRootDir=$(DESTDIR)$(datarootdir) /property:ManDir=$(DESTDIR)$(mandir) \
+		/property:LocaleDir=$(DESTDIR)$(localedir) Pinta.Install.proj
+	$(INSTALL_SCRIPT) pinta $(DESTDIR)$(bindir)/$(PACKAGE)
+
+# target: uninstall - Uninstalls Pinta.
+uninstall: 
+	$(XBUILD) /target:Uninstall /property:InstallPrefix=$(DESTDIR)$(prefix) Pinta.Install.proj
+
+# target: release - Default release type: releasetar
+release: releasetar
+
+# target: releasetar - Make a release tarball.
+releasetar: $(BINFILES)
+	cd $(BINDIR) && tar -czf ../$(RELEASE_FILE).tgz --exclude=*mdb *
+
+# target: releasezip - Make a release zip file.
+releasezip: $(BINFILES)
+	cd $(BINDIR) && zip -r ../$(RELEASE_FILE).zip * -x "*.mdb"
+
+EXTRA_DIST = Pinta Pinta.Core Pinta.Effects Pinta.Gui.Widgets Pinta.Resources Pinta.Tools po xdg license-mit.txt \
+           license-pdn.txt todo.txt Pinta.sln Pinta.Install.proj pinta.pc.in readme.md intltool-extract.in \
+           intltool-merge.in intltool-update.in
+
+CLEANFILES = \
+       intltool-extract \
+       intltool-update \
+       intltool-merge
+
+DISTCLEANFILES = intltool-extract \
+                 intltool-merge \
+                 intltool-update \
+                 po/.intltool-merge-cache
+
+
+
+.PHONY: install uninstall cleanall cleanbin cleanobj release releasetar releasezip

=== renamed file 'Makefile.am' => 'Makefile.am.moved'
=== added file 'Makefile.in'
--- Makefile.in	1970-01-01 00:00:00 +0000
+++ Makefile.in	2013-01-23 15:01:21 +0000
@@ -0,0 +1,849 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = .
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/pinta.in $(srcdir)/pinta.pc.in \
+	$(top_srcdir)/configure install-sh missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = pinta.pc pinta
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
+GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
+GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONO_CAIRO_CFLAGS = @MONO_CAIRO_CFLAGS@
+MONO_CAIRO_LIBS = @MONO_CAIRO_LIBS@
+MONO_CFLAGS = @MONO_CFLAGS@
+MONO_LIBS = @MONO_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XBUILD = @XBUILD@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pintalocaledir = @pintalocaledir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = xdg
+BINDIR = $(srcdir)/bin
+PINTA_ASSEMBLY_PC = $(srcdir)/$(PACKAGE_NAME).pc
+BINFILES = \
+	$(BINDIR)/Pinta.exe \
+	$(BINDIR)/Pinta.Core.dll \
+	$(BINDIR)/Pinta.Gui.Widgets.dll \
+	$(BINDIR)/Pinta.Resources.dll \
+	$(BINDIR)/Pinta.Effects.dll \
+	$(BINDIR)/Pinta.Tools.dll
+
+RELEASE_FILE = $(PACKAGE)-$(VERSION)
+
+#magic automake variables
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(PINTA_ASSEMBLY_PC)
+EXTRA_DIST = Pinta Pinta.Core Pinta.Effects Pinta.Gui.Widgets Pinta.Resources Pinta.Tools po xdg license-mit.txt \
+           license-pdn.txt todo.txt Pinta.sln Pinta.Install.proj pinta.pc.in readme.md intltool-extract.in \
+           intltool-merge.in intltool-update.in
+
+CLEANFILES = \
+       intltool-extract \
+       intltool-update \
+       intltool-merge
+
+DISTCLEANFILES = intltool-extract \
+                 intltool-merge \
+                 intltool-update \
+                 po/.intltool-merge-cache
+
+all: all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+pinta.pc: $(top_builddir)/config.status $(srcdir)/pinta.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+pinta: $(top_builddir)/config.status $(srcdir)/pinta.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -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
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(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" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic mostlyclean-am
+
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgconfigDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgconfigDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-pkgconfigDATA
+
+
+#end
+
+# target: all - Default target: build
+all: build
+
+# target: run - Launch the uninstalled copy
+run:
+	$(MONO) bin/Pinta.exe
+
+# target: help - Display callable targets.
+help:
+	egrep "^# target:" Makefile | sed 's/^# target:/make/'
+
+# target: build - Build Pinta.
+build: Pinta.sln
+	cd $(srcdir) && $(XBUILD) Pinta.sln
+	cd $(srcdir) && $(XBUILD) Pinta.Install.proj /target:CompileTranslations
+
+# target: list - List source files.
+list:
+	if ! git status > /dev/null 2> /dev/null ;\
+	then \
+		find . -type f -name *.cs | sed 's|./||' ;\
+	else \
+		git ls-files | grep '\.cs' ;\
+	fi
+
+#target: updatepot - update the messages.pot file
+updatepot: build
+	find . -type f -name *.cs | sed 's|./||' > files.list
+	grep -v System.ComponentModel.Composition files.list > files2.list
+	xgettext --from-code=UTF-8 -f files2.list -o po/messages.pot
+	cat po/messages.in >> po/messages.pot
+	rm files.list
+	rm files2.list
+
+# target: clean - Default clean command: cleanobj and cleanbin
+clean: cleanobj cleanbin
+
+# target: distclean - Removes configure files. 
+distclean: clean
+	rm -f Makefile pinta config.status config.cache config.log configure.lineno config.status.lineno pinta.pc
+
+# target: cleanall - Removes build files. 
+cleanall: distclean
+	rm -rf autom4te.cache
+	rm -f configure aclocal.m4 missing install-sh Makefile.in
+
+# target: cleanbin - Removes built files. 
+cleanbin: 
+	rm -rvf $(BINDIR)/*
+
+# target: cleanobj - Removes temporary build files. 
+cleanobj:
+	find $(srcdir)/ -type d -name obj | xargs rm -rvf
+
+# target: install - Installs Pinta. 
+install: pinta $(BINFILES)
+	cd $(srcdir) && $(XBUILD) /target:Install /property:InstallPrefix=$(DESTDIR)$(prefix) \
+		/property:BinDir=$(DESTDIR)$(bindir) /property:LibDir=$(DESTDIR)$(libdir) \
+		/property:DataRootDir=$(DESTDIR)$(datarootdir) /property:ManDir=$(DESTDIR)$(mandir) \
+		/property:LocaleDir=$(DESTDIR)$(localedir) Pinta.Install.proj
+	$(INSTALL_SCRIPT) pinta $(DESTDIR)$(bindir)/$(PACKAGE)
+
+# target: uninstall - Uninstalls Pinta.
+uninstall: 
+	$(XBUILD) /target:Uninstall /property:InstallPrefix=$(DESTDIR)$(prefix) Pinta.Install.proj
+
+# target: release - Default release type: releasetar
+release: releasetar
+
+# target: releasetar - Make a release tarball.
+releasetar: $(BINFILES)
+	cd $(BINDIR) && tar -czf ../$(RELEASE_FILE).tgz --exclude=*mdb *
+
+# target: releasezip - Make a release zip file.
+releasezip: $(BINFILES)
+	cd $(BINDIR) && zip -r ../$(RELEASE_FILE).zip * -x "*.mdb"
+
+.PHONY: install uninstall cleanall cleanbin cleanobj release releasetar releasezip
+
+# 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.
+.NOEXPORT:

=== added directory 'Pinta'
=== added directory 'Pinta.Core'
=== renamed directory 'Pinta.Core' => 'Pinta.Core.moved'
=== added file 'Pinta.Core/.gitignore'
--- Pinta.Core/.gitignore	1970-01-01 00:00:00 +0000
+++ Pinta.Core/.gitignore	2013-01-23 15:01:21 +0000
@@ -0,0 +1,3 @@
+/bin/
+/obj/
+*.user
\ No newline at end of file

=== added directory 'Pinta.Core/Actions'
=== added file 'Pinta.Core/Actions/AdjustmentsActions.cs'
--- Pinta.Core/Actions/AdjustmentsActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/AdjustmentsActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,57 @@
+// 
+// AdjustmentsActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Cairo;
+
+namespace Pinta.Core
+{
+	public class AdjustmentsActions
+	{
+		public List<Gtk.Action> Actions { get; private set; }
+		
+		public AdjustmentsActions ()
+		{
+			Actions = new List<Gtk.Action> ();
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+		}
+		#endregion
+
+		#region Public Methods
+		public void ToggleActionsSensitive (bool sensitive)
+		{
+			foreach (Gtk.Action a in Actions)
+				a.Sensitive = sensitive;
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/EditActions.cs'
--- Pinta.Core/Actions/EditActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/EditActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,433 @@
+// 
+// EditActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gtk;
+using Cairo;
+using Mono.Unix;
+
+namespace Pinta.Core
+{
+	public class EditActions
+	{
+		public Gtk.Action Undo { get; private set; }
+		public Gtk.Action Redo { get; private set; }
+		public Gtk.Action Cut { get; private set; }
+		public Gtk.Action Copy { get; private set; }
+		public Gtk.Action Paste { get; private set; }
+		public Gtk.Action PasteIntoNewLayer { get; private set; }
+		public Gtk.Action PasteIntoNewImage { get; private set; }
+		public Gtk.Action EraseSelection { get; private set; }
+		public Gtk.Action FillSelection { get; private set; }
+		public Gtk.Action InvertSelection { get; private set; }
+		public Gtk.Action SelectAll { get; private set; }
+		public Gtk.Action Deselect { get; private set; }
+		public Gtk.Action LoadPalette { get; private set; }
+		public Gtk.Action SavePalette { get; private set; }
+		public Gtk.Action ResetPalette { get; private set; }
+		public Gtk.Action ResizePalette { get; private set; }
+		
+		private string lastPaletteDir = null;
+		
+		public EditActions ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Menu.Edit.Deselect.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Edit.Deselect.png")));
+			fact.Add ("Menu.Edit.EraseSelection.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Edit.EraseSelection.png")));
+			fact.Add ("Menu.Edit.FillSelection.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Edit.FillSelection.png")));
+			fact.Add ("Menu.Edit.InvertSelection.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Edit.InvertSelection.png")));
+			fact.Add ("Menu.Edit.SelectAll.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Edit.SelectAll.png")));
+			fact.AddDefault ();
+			
+			Undo = new Gtk.Action ("Undo", Catalog.GetString ("Undo"), null, Stock.Undo);
+			Redo = new Gtk.Action ("Redo", Catalog.GetString ("Redo"), null, Stock.Redo);
+			Cut = new Gtk.Action ("Cut", Catalog.GetString ("Cut"), null, Stock.Cut);
+			Copy = new Gtk.Action ("Copy", Catalog.GetString ("Copy"), null, Stock.Copy);
+			Paste = new Gtk.Action ("Paste", Catalog.GetString ("Paste"), null, Stock.Paste);
+			PasteIntoNewLayer = new Gtk.Action ("PasteIntoNewLayer", Catalog.GetString ("Paste Into New Layer"), null, Stock.Paste);
+			PasteIntoNewImage = new Gtk.Action ("PasteIntoNewImage", Catalog.GetString ("Paste Into New Image"), null, Stock.Paste);
+			EraseSelection = new Gtk.Action ("EraseSelection", Catalog.GetString ("Delete Selection"), null, "Menu.Edit.EraseSelection.png");
+			FillSelection = new Gtk.Action ("FillSelection", Catalog.GetString ("Fill Selection"), null, "Menu.Edit.FillSelection.png");
+			InvertSelection = new Gtk.Action ("InvertSelection", Catalog.GetString ("Invert Selection"), null, "Menu.Edit.InvertSelection.png");
+			SelectAll = new Gtk.Action ("SelectAll", Catalog.GetString ("Select All"), null, Stock.SelectAll);
+			Deselect = new Gtk.Action ("Deselect", Catalog.GetString ("Deselect All"), null, "Menu.Edit.Deselect.png");
+			
+			LoadPalette = new Gtk.Action ("LoadPalette", Catalog.GetString ("Open..."), null, Stock.Open);
+			SavePalette = new Gtk.Action ("SavePalette", Catalog.GetString ("Save As..."), null, Stock.Save);
+			ResetPalette = new Gtk.Action ("ResetPalette", Catalog.GetString ("Reset to Default"), null, Stock.RevertToSaved);
+			ResizePalette = new Gtk.Action ("ResizePalette", Catalog.GetString ("Set Number of Colors"), null, "Menu.Image.Resize.png");
+			
+			Undo.IsImportant = true;
+			Undo.Sensitive = false;
+			Redo.Sensitive = false;
+			InvertSelection.Sensitive = false;
+			Deselect.Sensitive = false;
+			EraseSelection.Sensitive = false;
+			FillSelection.Sensitive = false;
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			menu.Append (Undo.CreateAcceleratedMenuItem (Gdk.Key.Z, Gdk.ModifierType.ControlMask));
+
+			ImageMenuItem redo = Redo.CreateAcceleratedMenuItem (Gdk.Key.Z, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask);
+			redo.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.Y, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			menu.Append (redo);
+
+			menu.AppendSeparator ();
+			menu.Append (Cut.CreateAcceleratedMenuItem (Gdk.Key.X, Gdk.ModifierType.ControlMask));
+			menu.Append (Copy.CreateAcceleratedMenuItem (Gdk.Key.C, Gdk.ModifierType.ControlMask));
+			menu.Append (Paste.CreateAcceleratedMenuItem (Gdk.Key.V, Gdk.ModifierType.ControlMask));
+			menu.Append (PasteIntoNewLayer.CreateAcceleratedMenuItem (Gdk.Key.V, Gdk.ModifierType.ShiftMask | Gdk.ModifierType.ControlMask));
+			menu.Append (PasteIntoNewImage.CreateAcceleratedMenuItem (Gdk.Key.V, Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.ControlMask));
+			
+			menu.AppendSeparator ();
+			menu.Append (SelectAll.CreateAcceleratedMenuItem (Gdk.Key.A, Gdk.ModifierType.ControlMask));
+
+			ImageMenuItem deslect = Deselect.CreateAcceleratedMenuItem (Gdk.Key.A, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask);
+			deslect.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.D, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			menu.Append (deslect);
+
+			menu.AppendSeparator ();
+			menu.Append (EraseSelection.CreateAcceleratedMenuItem (Gdk.Key.Delete, Gdk.ModifierType.None));
+			menu.Append (FillSelection.CreateAcceleratedMenuItem (Gdk.Key.BackSpace, Gdk.ModifierType.None));
+			//menu.Append (InvertSelection.CreateAcceleratedMenuItem (Gdk.Key.I, Gdk.ModifierType.ControlMask));
+			
+			menu.AppendSeparator ();
+			Gtk.Action menu_action = new Gtk.Action ("Palette", Mono.Unix.Catalog.GetString ("Palette"), null, null);
+			Menu palette_menu = (Menu) menu.AppendItem (menu_action.CreateSubMenuItem ()).Submenu;
+			palette_menu.Append (LoadPalette.CreateMenuItem ());
+			palette_menu.Append (SavePalette.CreateMenuItem ());
+			palette_menu.Append (ResetPalette.CreateMenuItem ());
+			palette_menu.Append (ResizePalette.CreateMenuItem ());
+		}
+
+		public void CreateHistoryWindowToolBar (Gtk.Toolbar toolbar)
+		{
+			toolbar.AppendItem (Undo.CreateToolBarItem ());
+			toolbar.AppendItem (Redo.CreateToolBarItem ());
+		}
+
+		public void RegisterHandlers ()
+		{
+			Deselect.Activated += HandlePintaCoreActionsEditDeselectActivated;
+			EraseSelection.Activated += HandlePintaCoreActionsEditEraseSelectionActivated;
+			SelectAll.Activated += HandlePintaCoreActionsEditSelectAllActivated;
+			FillSelection.Activated += HandlePintaCoreActionsEditFillSelectionActivated;
+			Paste.Activated += HandlerPintaCoreActionsEditPasteActivated;
+			Copy.Activated += HandlerPintaCoreActionsEditCopyActivated;
+			Undo.Activated += HandlerPintaCoreActionsEditUndoActivated;
+			Redo.Activated += HandlerPintaCoreActionsEditRedoActivated;
+			Cut.Activated += HandlerPintaCoreActionsEditCutActivated;
+			LoadPalette.Activated += HandlerPintaCoreActionsEditLoadPaletteActivated;
+			SavePalette.Activated += HandlerPintaCoreActionsEditSavePaletteActivated;
+			ResetPalette.Activated += HandlerPintaCoreActionsEditResetPaletteActivated;
+
+			PintaCore.Workspace.ActiveDocumentChanged += WorkspaceActiveDocumentChanged;
+		}
+		#endregion
+
+		#region Action Handlers
+		private void HandlePintaCoreActionsEditFillSelectionActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			Cairo.ImageSurface old = doc.CurrentLayer.Surface.Clone ();
+
+			using (var g = new Cairo.Context (doc.CurrentLayer.Surface)) {
+				g.AppendPath (doc.SelectionPath);
+				g.FillRule = FillRule.EvenOdd;
+
+				g.Color = PintaCore.Palette.PrimaryColor;
+				g.Fill ();
+			}
+
+			doc.Workspace.Invalidate ();
+			doc.History.PushNewItem (new SimpleHistoryItem ("Menu.Edit.FillSelection.png", Catalog.GetString ("Fill Selection"), old, doc.CurrentLayerIndex));
+		}
+
+		private void HandlePintaCoreActionsEditSelectAllActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			SelectionHistoryItem hist = new SelectionHistoryItem (Stock.SelectAll, Catalog.GetString ("Select All"));
+			hist.TakeSnapshot ();
+
+			doc.ResetSelectionPath ();
+			doc.ShowSelection = true;
+
+			doc.History.PushNewItem (hist);
+			doc.Workspace.Invalidate ();
+		}
+
+		private void HandlePintaCoreActionsEditEraseSelectionActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			Cairo.ImageSurface old = doc.CurrentLayer.Surface.Clone ();
+
+			using (var g = new Cairo.Context (doc.CurrentLayer.Surface)) {
+				g.AppendPath (doc.SelectionPath);
+				g.FillRule = FillRule.EvenOdd;
+
+				g.Operator = Cairo.Operator.Clear;
+				g.Fill ();
+			}
+
+			doc.Workspace.Invalidate ();
+
+			if (sender is string && (sender as string) == "Cut")
+				doc.History.PushNewItem (new SimpleHistoryItem (Stock.Cut, Catalog.GetString ("Cut"), old, doc.CurrentLayerIndex));
+			else
+				doc.History.PushNewItem (new SimpleHistoryItem ("Menu.Edit.EraseSelection.png", Catalog.GetString ("Erase Selection"), old, doc.CurrentLayerIndex));
+		}
+
+		private void HandlePintaCoreActionsEditDeselectActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			SelectionHistoryItem hist = new SelectionHistoryItem ("Menu.Edit.Deselect.png", Catalog.GetString ("Deselect"));
+			hist.TakeSnapshot ();
+
+			doc.ResetSelectionPath ();
+
+			doc.History.PushNewItem (hist);
+			doc.Workspace.Invalidate ();
+		}
+
+		private void HandlerPintaCoreActionsEditPasteActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			Gtk.Clipboard cb = Gtk.Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
+			
+			Path p;
+
+			// Don't dispose this, as we're going to give it to the history
+			Gdk.Pixbuf image = cb.WaitForImage ();
+
+			if (image == null)
+				return;
+
+			Gdk.Size canvas_size = PintaCore.Workspace.ImageSize;
+
+			// If the image being pasted is larger than the canvas size, allow the user to optionally resize the canvas
+			if (image.Width > canvas_size.Width || image.Height > canvas_size.Height)
+			{
+				string message = Catalog.GetString ("The image being pasted is larger than the canvas size. What would you like to do?");
+
+				var enlarge_dialog = new MessageDialog (PintaCore.Chrome.MainWindow, DialogFlags.Modal, MessageType.Question, ButtonsType.None, message);
+				enlarge_dialog.AddButton (Catalog.GetString ("Expand canvas"), ResponseType.Accept);
+				enlarge_dialog.AddButton (Catalog.GetString ("Don't change canvas size"), ResponseType.Reject);
+				enlarge_dialog.AddButton (Stock.Cancel, ResponseType.Cancel);
+				enlarge_dialog.DefaultResponse = ResponseType.Accept;
+
+				ResponseType response = (ResponseType)enlarge_dialog.Run ();
+				enlarge_dialog.Destroy ();
+
+				if (response == ResponseType.Accept)
+				{
+					PintaCore.Workspace.ResizeCanvas (image.Width, image.Height, Pinta.Core.Anchor.Center);
+					PintaCore.Actions.View.UpdateCanvasScale ();
+				}
+				else if (response == ResponseType.Cancel || response == ResponseType.DeleteEvent)
+				{
+					return;
+				}
+			}
+
+			// Copy the paste to the temp layer
+			doc.CreateSelectionLayer ();
+			doc.ShowSelectionLayer = true;
+
+			using (Cairo.Context g = new Cairo.Context (doc.SelectionLayer.Surface)) {
+				g.DrawPixbuf (image, new Cairo.Point (0, 0));
+				p = g.CreateRectanglePath (new Rectangle (0, 0, image.Width, image.Height));
+			}
+
+			PintaCore.Tools.SetCurrentTool (Catalog.GetString ("Move Selected Pixels"));
+			
+			Path old_path = doc.SelectionPath;
+			bool old_show_selection = doc.ShowSelection;
+
+			doc.SelectionPath = p;
+			doc.ShowSelection = true;
+
+			doc.Workspace.Invalidate ();
+
+			doc.History.PushNewItem (new PasteHistoryItem (image, old_path, old_show_selection));
+		}
+
+		private void HandlerPintaCoreActionsEditCopyActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			ImageSurface src = doc.GetClippedLayer (doc.CurrentLayerIndex);
+
+			Gdk.Rectangle rect = doc.GetSelectedBounds (true);
+			
+			ImageSurface dest = new ImageSurface (Format.Argb32, rect.Width, rect.Height);
+
+			using (Context g = new Context (dest)) {
+				g.SetSourceSurface (src, -rect.X, -rect.Y);
+				g.Paint ();
+			}
+			
+			Gtk.Clipboard cb = Gtk.Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
+			cb.Image = dest.ToPixbuf ();
+
+			(src as IDisposable).Dispose ();
+			(dest as IDisposable).Dispose ();
+		}
+		
+		private void HandlerPintaCoreActionsEditCutActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			
+			// Copy selection
+			HandlerPintaCoreActionsEditCopyActivated (sender, e);
+
+			// Erase selection
+			HandlePintaCoreActionsEditEraseSelectionActivated ("Cut", e);
+		}
+
+		private void HandlerPintaCoreActionsEditUndoActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			doc.History.Undo ();
+		}
+
+		private void HandlerPintaCoreActionsEditRedoActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			doc.History.Redo ();
+		}
+
+		private void HandlerPintaCoreActionsEditLoadPaletteActivated (object sender, EventArgs e)
+		{
+			var fcd = new Gtk.FileChooserDialog (Catalog.GetString ("Open Palette File"), PintaCore.Chrome.MainWindow,
+													FileChooserAction.Open, Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
+													Gtk.Stock.Open, Gtk.ResponseType.Ok);
+
+			FileFilter ff = new FileFilter ();
+			ff.AddPattern ("*.txt");
+			ff.AddPattern ("*.gpl");
+			ff.Name = Catalog.GetString ("Palette files (*.txt, *.gpl)");
+			fcd.AddFilter (ff);
+			
+			FileFilter ff2 = new FileFilter ();
+			ff2.Name = Catalog.GetString ("All files");
+			ff2.AddPattern ("*.*");
+			fcd.AddFilter (ff2);
+			
+			fcd.AlternativeButtonOrder = new int[] { (int) ResponseType.Ok, (int) ResponseType.Cancel };
+
+			if (lastPaletteDir != null)
+				fcd.SetCurrentFolder (lastPaletteDir);
+			
+			int response = fcd.Run ();
+		
+			if (response == (int) Gtk.ResponseType.Ok) {
+				try {
+					lastPaletteDir = fcd.CurrentFolder;
+					PintaCore.Palette.CurrentPalette.Load (fcd.Filename);
+				} catch {
+					MessageDialog md = new MessageDialog (PintaCore.Chrome.MainWindow, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, Catalog.GetString ("Could not open palette file: {0}.\nPlease verify that you are trying to open a valid GIMP or Paint.NET palette."), fcd.Filename);
+					md.Title = Catalog.GetString ("Error");
+					
+					md.Run ();
+					md.Destroy ();
+				}
+			}
+
+			fcd.Destroy ();
+		}
+
+		private void HandlerPintaCoreActionsEditSavePaletteActivated (object sender, EventArgs e)
+		{
+			var fcd = new Gtk.FileChooserDialog (Catalog.GetString ("Save Palette File"), PintaCore.Chrome.MainWindow,
+													FileChooserAction.Save, Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
+													Gtk.Stock.Save, Gtk.ResponseType.Ok);
+
+			FileFilter ffPDN = new FileFilter ();
+			ffPDN.AddPattern ("*.txt");
+			ffPDN.Name = Catalog.GetString ("Paint.NET palette (*.txt)");
+			fcd.AddFilter (ffPDN);
+			
+			FileFilter ffGIMP = new FileFilter ();
+			ffGIMP.AddPattern ("*.gpl");
+			ffGIMP.Name = Catalog.GetString ("GIMP palette (*.gpl)");
+			fcd.AddFilter (ffGIMP);
+			
+			fcd.AlternativeButtonOrder = new int[] { (int) ResponseType.Ok, (int) ResponseType.Cancel };
+
+			if (lastPaletteDir != null)
+				fcd.SetCurrentFolder (lastPaletteDir);
+			
+			int response = fcd.Run ();
+		
+			if (response == (int) Gtk.ResponseType.Ok) {
+				Palette.FileFormat format = (fcd.Filter == ffPDN) ? Palette.FileFormat.PDN : Palette.FileFormat.GIMP;
+				PintaCore.Palette.CurrentPalette.Save (fcd.Filename, format);
+			}
+
+			fcd.Destroy ();
+		}
+
+		private void HandlerPintaCoreActionsEditResetPaletteActivated (object sender, EventArgs e)
+		{
+			PintaCore.Palette.CurrentPalette.LoadDefault ();
+		}
+
+		private void WorkspaceActiveDocumentChanged (object sender, EventArgs e)
+		{
+			if (!PintaCore.Workspace.HasOpenDocuments) {
+				Undo.Sensitive = false;
+				Redo.Sensitive = false;
+				return;
+			}
+
+			Redo.Sensitive = PintaCore.Workspace.ActiveWorkspace.History.CanRedo;
+			Undo.Sensitive = PintaCore.Workspace.ActiveWorkspace.History.CanUndo;
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/EffectsActions.cs'
--- Pinta.Core/Actions/EffectsActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/EffectsActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,93 @@
+// 
+// EffectsActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gtk;
+using System.Collections.Generic;
+
+namespace Pinta.Core
+{
+	public class EffectsActions
+	{
+		private Menu effects_menu;
+		private Dictionary<Gtk.Action, MenuItem> menu_items;
+
+		public Dictionary<string, Gtk.Menu> Menus { get; private set; }
+		public List<Gtk.Action> Actions { get; private set; }
+
+		public EffectsActions ()
+		{
+			Actions = new List<Gtk.Action> ();
+			Menus = new Dictionary<string,Menu> ();
+			menu_items = new Dictionary<Gtk.Action, MenuItem> ();
+		}
+		
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			effects_menu = menu;
+		}
+
+		public void AddEffect (string category, Gtk.Action action)
+		{
+			if (!Menus.ContainsKey (category)) {
+				Gtk.Action menu_action = new Gtk.Action (category, Mono.Unix.Catalog.GetString (category), null, null);
+				Menu category_menu = (Menu)effects_menu.AppendMenuItemSorted ((MenuItem)(menu_action.CreateSubMenuItem ())).Submenu;
+				
+				Menus.Add (category, category_menu);
+			}
+			
+			Actions.Add (action);
+			var menu_item = (MenuItem)action.CreateMenuItem ();
+
+			Menu m = Menus[category];
+			m.AppendMenuItemSorted (menu_item);
+
+			menu_items.Add (action, menu_item);
+		}
+
+		// TODO: Remove menu category if empty
+		internal void RemoveEffect (string category, Gtk.Action action)
+		{
+			if (!Menus.ContainsKey (category))
+				return;
+			if (!menu_items.ContainsKey (action))
+				return;
+
+			var menu = Menus[category];
+			menu.Remove (menu_items[action]);
+		}
+		#endregion
+
+		#region Public Methods
+		public void ToggleActionsSensitive (bool sensitive)
+		{
+			foreach (Gtk.Action a in Actions)
+				a.Sensitive = sensitive;
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/FileActions.cs'
--- Pinta.Core/Actions/FileActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/FileActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,131 @@
+// 
+// FileActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Gdk;
+using Gtk;
+using Mono.Unix;
+
+namespace Pinta.Core
+{
+	public class FileActions
+	{
+		public Gtk.Action New { get; private set; }
+		public Gtk.Action NewScreenshot { get; private set; }
+		public Gtk.Action Open { get; private set; }
+		public Gtk.RecentAction OpenRecent { get; private set; }
+		public Gtk.Action Close { get; private set; }
+		public Gtk.Action Save { get; private set; }
+		public Gtk.Action SaveAs { get; private set; }
+		public Gtk.Action Print { get; private set; }
+		public Gtk.Action Exit { get; private set; }
+		
+		public event EventHandler BeforeQuit;
+		public event EventHandler<ModifyCompressionEventArgs> ModifyCompression;
+		public event EventHandler<DocumentCancelEventArgs> SaveDocument;
+		
+		public FileActions ()
+		{
+			New = new Gtk.Action ("New", Catalog.GetString ("New..."), null, Stock.New);
+			NewScreenshot = new Gtk.Action ("NewScreenshot", Catalog.GetString ("New Screenshot..."), null, Stock.Fullscreen);
+			Open = new Gtk.Action ("Open", Catalog.GetString ("Open..."), null, Stock.Open);
+			OpenRecent = new RecentAction ("OpenRecent", Catalog.GetString ("Open Recent"), null, Stock.Open, RecentManager.Default);
+			
+			RecentFilter recentFilter = new RecentFilter ();
+			recentFilter.AddApplication ("Pinta");
+			
+			(OpenRecent as RecentAction).AddFilter (recentFilter);
+			
+			Close = new Gtk.Action ("Close", Catalog.GetString ("Close"), null, Stock.Close);
+			Save = new Gtk.Action ("Save", Catalog.GetString ("Save"), null, Stock.Save);
+			SaveAs = new Gtk.Action ("SaveAs", Catalog.GetString ("Save As..."), null, Stock.SaveAs);
+			Print = new Gtk.Action ("Print", Catalog.GetString ("Print"), null, Stock.Print);
+			Exit = new Gtk.Action ("Exit", Catalog.GetString ("Quit"), null, Stock.Quit);
+
+			New.ShortLabel = Catalog.GetString ("New");
+			Open.ShortLabel = Catalog.GetString ("Open");
+			Open.IsImportant = true;
+			Save.IsImportant = true;
+			
+			Close.Sensitive = false;
+			Print.Sensitive = false;
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			menu.Append (New.CreateAcceleratedMenuItem (Gdk.Key.N, Gdk.ModifierType.ControlMask));
+			menu.Append (NewScreenshot.CreateMenuItem ());
+			menu.Append (Open.CreateAcceleratedMenuItem (Gdk.Key.O, Gdk.ModifierType.ControlMask));
+			menu.Append (OpenRecent.CreateMenuItem ());
+			menu.AppendSeparator ();
+			menu.Append (Save.CreateAcceleratedMenuItem (Gdk.Key.S, Gdk.ModifierType.ControlMask));
+			menu.Append (SaveAs.CreateAcceleratedMenuItem (Gdk.Key.S, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.AppendSeparator ();
+			//menu.Append (Print.CreateAcceleratedMenuItem (Gdk.Key.P, Gdk.ModifierType.ControlMask));
+			//menu.AppendSeparator ();
+			menu.Append (Close.CreateAcceleratedMenuItem (Gdk.Key.W, Gdk.ModifierType.ControlMask));
+			menu.Append (Exit.CreateAcceleratedMenuItem (Gdk.Key.Q, Gdk.ModifierType.ControlMask));
+		}
+		
+		public void RegisterHandlers ()
+		{
+		}
+		#endregion
+
+		#region Event Invokers
+		public void RaiseBeforeQuit ()
+		{
+			if (BeforeQuit != null)
+				BeforeQuit (this, EventArgs.Empty);
+		}
+
+		internal bool RaiseSaveDocument (Document document, bool saveAs)
+		{
+			DocumentCancelEventArgs e = new DocumentCancelEventArgs (document, saveAs);
+
+			if (SaveDocument == null)
+				throw new InvalidOperationException ("GUI is not handling PintaCore.Workspace.SaveDocument");
+			else
+				SaveDocument (this, e);
+
+			return !e.Cancel;
+		}
+
+		internal int RaiseModifyCompression (int defaultCompression)
+		{
+			ModifyCompressionEventArgs e = new ModifyCompressionEventArgs (defaultCompression);
+			
+			if (ModifyCompression != null)
+				ModifyCompression (this, e);
+				
+			return e.Cancel ? -1 : e.Quality;
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/HelpActions.cs'
--- Pinta.Core/Actions/HelpActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/HelpActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,93 @@
+// 
+// HelpActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using Gtk;
+using Mono.Unix;
+
+namespace Pinta.Core
+{
+	public class HelpActions
+	{
+		public Gtk.Action ExtensionManager { get; private set; }
+		public Gtk.Action Website { get; private set; }
+		public Gtk.Action Bugs { get; private set; }
+		public Gtk.Action Translate { get; private set; }
+		public Gtk.Action About { get; private set; }
+
+		public HelpActions ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Menu.Help.Bug.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Help.Bug.png")));
+			fact.Add ("Menu.Help.Website.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Help.Website.png")));
+			fact.Add ("Menu.Help.Translate.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Help.Translate.png")));
+			fact.Add ("Menu.Help.Extensions.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Help.Extensions.png")));
+			fact.AddDefault ();
+
+			ExtensionManager = new Gtk.Action ("ExtensionManager", Catalog.GetString ("Extension Manager"), null, "Menu.Help.Extensions.png");
+			Website = new Gtk.Action ("Website", Catalog.GetString ("Pinta Website"), null, "Menu.Help.Website.png");
+			Bugs = new Gtk.Action ("Bugs", Catalog.GetString ("File a Bug"), null, "Menu.Help.Bug.png");
+			Translate = new Gtk.Action ("Translate", Catalog.GetString ("Translate This Application"), null, "Menu.Help.Translate.png");
+			About = new Gtk.Action ("About", Catalog.GetString ("About"), null, Stock.About);
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			menu.Append (ExtensionManager.CreateMenuItem ());
+			menu.Append (Website.CreateMenuItem ());
+			menu.Append (Bugs.CreateMenuItem ());
+			menu.Append (Translate.CreateMenuItem ());
+			menu.AppendSeparator ();
+			menu.Append (About.CreateMenuItem ());
+		}
+		
+		public void RegisterHandlers ()
+		{
+			Website.Activated += new EventHandler (Website_Activated);
+			Bugs.Activated += new EventHandler (Bugs_Activated);
+			Translate.Activated += Translate_Activated;
+		}
+
+		private void Bugs_Activated (object sender, EventArgs e)
+		{
+			Process.Start ("https://bugs.launchpad.net/pinta");
+		}
+
+		private void Translate_Activated (object sender, EventArgs e)
+		{
+			Process.Start ("https://translations.launchpad.net/pinta");
+		}
+
+		private void Website_Activated (object sender, EventArgs e)
+		{
+			Process.Start ("http://www.pinta-project.com");
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/ImageActions.cs'
--- Pinta.Core/Actions/ImageActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/ImageActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,301 @@
+// 
+// ImageActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.Unix;
+
+namespace Pinta.Core
+{
+	public class ImageActions
+	{
+		public Gtk.Action CropToSelection { get; private set; }
+		public Gtk.Action AutoCrop { get; private set; }
+		public Gtk.Action Resize { get; private set; }
+		public Gtk.Action CanvasSize { get; private set; }
+		public Gtk.Action FlipHorizontal { get; private set; }
+		public Gtk.Action FlipVertical { get; private set; }
+		public Gtk.Action RotateCW { get; private set; }
+		public Gtk.Action RotateCCW { get; private set; }
+		public Gtk.Action Rotate180 { get; private set; }
+		public Gtk.Action Flatten { get; private set; }
+
+		public ImageActions ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Menu.Image.CanvasSize.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.CanvasSize.png")));
+			fact.Add ("Menu.Image.Crop.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Crop.png")));
+			fact.Add ("Menu.Image.Flatten.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Flatten.png")));
+			fact.Add ("Menu.Image.FlipHorizontal.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.FlipHorizontal.png")));
+			fact.Add ("Menu.Image.FlipVertical.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.FlipVertical.png")));
+			fact.Add ("Menu.Image.Resize.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Resize.png")));
+			fact.Add ("Menu.Image.Rotate180CW.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Rotate180CW.png")));
+			fact.Add ("Menu.Image.Rotate90CCW.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Rotate90CCW.png")));
+			fact.Add ("Menu.Image.Rotate90CW.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Image.Rotate90CW.png")));
+			fact.AddDefault ();
+			
+			CropToSelection = new Gtk.Action ("CropToSelection", Catalog.GetString ("Crop to Selection"), null, "Menu.Image.Crop.png");
+			AutoCrop = new Gtk.Action ("AutoCrop", Catalog.GetString ("Auto Crop"), null, "Menu.Image.Crop.png");
+			Resize = new Gtk.Action ("Resize", Catalog.GetString ("Resize Image..."), null, "Menu.Image.Resize.png");
+			CanvasSize = new Gtk.Action ("CanvasSize", Catalog.GetString ("Resize Canvas..."), null, "Menu.Image.CanvasSize.png");
+			FlipHorizontal = new Gtk.Action ("FlipHorizontal", Catalog.GetString ("Flip Horizontal"), null, "Menu.Image.FlipHorizontal.png");
+			FlipVertical = new Gtk.Action ("FlipVertical", Catalog.GetString ("Flip Vertical"), null, "Menu.Image.FlipVertical.png");
+			RotateCW = new Gtk.Action ("RotateCW", Catalog.GetString ("Rotate 90° Clockwise"), null, "Menu.Image.Rotate90CW.png");
+			RotateCCW = new Gtk.Action ("RotateCCW", Catalog.GetString ("Rotate 90° Counter-Clockwise"), null, "Menu.Image.Rotate90CCW.png");
+			Rotate180 = new Gtk.Action ("Rotate180", Catalog.GetString ("Rotate 180°"), null, "Menu.Image.Rotate180CW.png");
+			Flatten = new Gtk.Action ("Flatten", Catalog.GetString ("Flatten"), null, "Menu.Image.Flatten.png");
+			
+			CropToSelection.Sensitive = false;
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			menu.Append (CropToSelection.CreateAcceleratedMenuItem (Gdk.Key.X, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (AutoCrop.CreateAcceleratedMenuItem (Gdk.Key.X, Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.ControlMask));
+			menu.Append (Resize.CreateAcceleratedMenuItem (Gdk.Key.R, Gdk.ModifierType.ControlMask));
+			menu.Append (CanvasSize.CreateAcceleratedMenuItem (Gdk.Key.R, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.AppendSeparator ();
+			menu.Append (FlipHorizontal.CreateMenuItem ());
+			menu.Append (FlipVertical.CreateMenuItem ());
+			menu.AppendSeparator ();
+			menu.Append (RotateCW.CreateAcceleratedMenuItem (Gdk.Key.H, Gdk.ModifierType.ControlMask));
+			menu.Append (RotateCCW.CreateAcceleratedMenuItem (Gdk.Key.G, Gdk.ModifierType.ControlMask));
+			menu.Append (Rotate180.CreateAcceleratedMenuItem (Gdk.Key.J, Gdk.ModifierType.ControlMask));
+			menu.AppendSeparator ();
+			menu.Append (Flatten.CreateAcceleratedMenuItem (Gdk.Key.F, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+		}
+				
+		public void RegisterHandlers ()
+		{
+			FlipHorizontal.Activated += HandlePintaCoreActionsImageFlipHorizontalActivated;
+			FlipVertical.Activated += HandlePintaCoreActionsImageFlipVerticalActivated;
+			Rotate180.Activated += HandlePintaCoreActionsImageRotate180Activated;
+			Flatten.Activated += HandlePintaCoreActionsImageFlattenActivated;
+			RotateCW.Activated += HandlePintaCoreActionsImageRotateCWActivated;
+			RotateCCW.Activated += HandlePintaCoreActionsImageRotateCCWActivated;
+			CropToSelection.Activated += HandlePintaCoreActionsImageCropToSelectionActivated;
+			AutoCrop.Activated += HandlePintaCoreActionsImageAutoCropActivated;
+		}
+		#endregion
+
+		#region Action Handlers
+		private void HandlePintaCoreActionsImageRotateCCWActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			doc.RotateImageCCW ();
+
+			doc.ResetSelectionPath ();
+
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.Rotate90CCW));
+		}
+
+		private void HandlePintaCoreActionsImageRotateCWActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			doc.RotateImageCW ();
+
+			doc.ResetSelectionPath ();
+
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.Rotate90CW));
+		}
+
+		private void HandlePintaCoreActionsImageFlattenActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			CompoundHistoryItem hist = new CompoundHistoryItem ("Menu.Image.Flatten.png", Catalog.GetString ("Flatten"));
+			SimpleHistoryItem h1 = new SimpleHistoryItem (string.Empty, string.Empty, doc.Layers[0].Surface.Clone (), 0);
+
+			hist.Push (h1);
+
+			for (int i = 1; i < doc.Layers.Count; i++)
+				hist.Push (new DeleteLayerHistoryItem (string.Empty, string.Empty, doc.Layers[i], i));
+
+			doc.FlattenImage ();
+
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsImageRotate180Activated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			doc.RotateImage180 ();
+
+			doc.ResetSelectionPath ();
+
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.Rotate180));
+		}
+
+		private void HandlePintaCoreActionsImageFlipVerticalActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			doc.FlipImageVertical ();
+
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.FlipVertical));
+		}
+
+		private void HandlePintaCoreActionsImageFlipHorizontalActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+			doc.FlipImageHorizontal ();
+
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.FlipHorizontal));
+		}
+
+		private void HandlePintaCoreActionsImageCropToSelectionActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			Gdk.Rectangle rect = doc.GetSelectedBounds (true);
+
+			CropImageToRectangle (doc, rect);
+		}
+
+		private void HandlePintaCoreActionsImageAutoCropActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+
+			PintaCore.Tools.Commit ();
+
+			Cairo.ImageSurface image = doc.CurrentLayer.Surface;
+			Gdk.Rectangle rect = image.GetBounds ();
+
+			Cairo.Color borderColor = image.GetPixel (0, 0);
+			bool cropSide = true;
+			int depth = -1;
+
+			//From the top down
+			while (cropSide) {
+				depth++;
+				for (int i = 0; i < image.Width; i++) {
+					if (!borderColor.Equals(image.GetPixel (i, depth))) {
+						cropSide = false;
+						break;
+					}
+				}
+				//Check if the image is blank/mono-coloured, only need to do it on this scan
+				if (depth == image.Height)
+					return;
+			}
+
+			rect = new Gdk.Rectangle (rect.X, rect.Y + depth, rect.Width, rect.Height - depth);
+
+			depth = image.Height;
+			cropSide = true;
+			//From the bottom up
+			while (cropSide) {
+				depth--;
+				for (int i = 0; i < image.Width; i++) {
+					if (!borderColor.Equals(image.GetPixel (i, depth))) {
+						cropSide = false;
+						break;
+					}
+				}
+
+			}
+
+			rect = new Gdk.Rectangle (rect.X, rect.Y, rect.Width, depth - rect.Y);
+
+			depth = 0;
+			cropSide = true;
+			//From left to right
+			while (cropSide) {
+				depth++;
+				for (int i = 0; i < image.Height; i++) {
+					if (!borderColor.Equals(image.GetPixel (depth, i))) {
+						cropSide = false;
+						break;
+					}
+				}
+
+			}
+
+			rect = new Gdk.Rectangle (rect.X + depth, rect.Y, rect.Width - depth, rect.Height);
+
+			depth = image.Width;
+			cropSide = true;
+			//From right to left
+			while (cropSide) {
+				depth--;
+				for (int i = 0; i < image.Height; i++) {
+					if (!borderColor.Equals(image.GetPixel (depth, i))) {
+						cropSide = false;
+						break;
+					}
+				}
+
+			}
+
+			rect = new Gdk.Rectangle (rect.X, rect.Y, depth - rect.X, rect.Height);
+
+			CropImageToRectangle (doc, rect);
+		}
+		#endregion
+
+		static void CropImageToRectangle (Document doc, Gdk.Rectangle rect)
+		{
+			ResizeHistoryItem hist = new ResizeHistoryItem (doc.ImageSize);
+			
+			hist.Icon = "Menu.Image.Crop.png";
+			hist.Text = Catalog.GetString ("Crop to Selection");
+			hist.TakeSnapshotOfImage ();
+			hist.RestorePath = doc.SelectionPath.Clone ();
+			
+			PintaCore.Chrome.Canvas.GdkWindow.FreezeUpdates ();
+			
+			double original_scale = doc.Workspace.Scale;
+			doc.ImageSize = rect.Size;
+			doc.Workspace.CanvasSize = rect.Size;
+			doc.Workspace.Scale = original_scale;
+			
+			PintaCore.Actions.View.UpdateCanvasScale ();
+			
+			PintaCore.Chrome.Canvas.GdkWindow.ThawUpdates ();
+			
+			foreach (var layer in doc.Layers)
+				layer.Crop (rect, doc.SelectionPath);
+			
+			doc.History.PushNewItem (hist);
+			doc.ResetSelectionPath ();
+			
+			doc.Workspace.Invalidate ();
+		}
+	}
+}

=== added file 'Pinta.Core/Actions/LayerActions.cs'
--- Pinta.Core/Actions/LayerActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/LayerActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,292 @@
+// 
+// LayerActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gdk;
+using Gtk;
+using Mono.Unix;
+using System.IO;
+
+namespace Pinta.Core
+{
+	public class LayerActions
+	{
+		public Gtk.Action AddNewLayer { get; private set; }
+		public Gtk.Action DeleteLayer { get; private set; }
+		public Gtk.Action DuplicateLayer { get; private set; }
+		public Gtk.Action MergeLayerDown { get; private set; }
+		public Gtk.Action ImportFromFile { get; private set; }
+		public Gtk.Action FlipHorizontal { get; private set; }
+		public Gtk.Action FlipVertical { get; private set; }
+		public Gtk.Action RotateZoom { get; private set; }
+		public Gtk.Action MoveLayerUp { get; private set; }
+		public Gtk.Action MoveLayerDown { get; private set; }
+		public Gtk.Action Properties { get; private set; }
+		
+		public LayerActions ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Menu.Layers.AddNewLayer.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.AddNewLayer.png")));
+			fact.Add ("Menu.Layers.DeleteLayer.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.DeleteLayer.png")));
+			fact.Add ("Menu.Layers.DuplicateLayer.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.DuplicateLayer.png")));
+			fact.Add ("Menu.Layers.MergeLayerDown.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.MergeLayerDown.png")));
+			fact.Add ("Menu.Layers.MoveLayerDown.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.MoveLayerDown.png")));
+			fact.Add ("Menu.Layers.MoveLayerUp.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.MoveLayerUp.png")));
+			fact.Add ("Menu.Layers.FlipHorizontal.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.FlipHorizontal.png")));
+			fact.Add ("Menu.Layers.FlipVertical.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.FlipVertical.png")));
+			fact.Add ("Menu.Layers.ImportFromFile.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.ImportFromFile.png")));
+			fact.Add ("Menu.Layers.LayerProperties.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.LayerProperties.png")));
+			fact.Add ("Menu.Layers.RotateZoom.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.Layers.RotateZoom.png")));
+			fact.AddDefault ();
+			
+			AddNewLayer = new Gtk.Action ("AddNewLayer", Catalog.GetString ("Add New Layer"), null, "Menu.Layers.AddNewLayer.png");
+			DeleteLayer = new Gtk.Action ("DeleteLayer", Catalog.GetString ("Delete Layer"), null, "Menu.Layers.DeleteLayer.png");
+			DuplicateLayer = new Gtk.Action ("DuplicateLayer", Catalog.GetString ("Duplicate Layer"), null, "Menu.Layers.DuplicateLayer.png");
+			MergeLayerDown = new Gtk.Action ("MergeLayerDown", Catalog.GetString ("Merge Layer Down"), null, "Menu.Layers.MergeLayerDown.png");
+			ImportFromFile = new Gtk.Action ("ImportFromFile", Catalog.GetString ("Import from File..."), null, "Menu.Layers.ImportFromFile.png");
+			FlipHorizontal = new Gtk.Action ("FlipHorizontal", Catalog.GetString ("Flip Horizontal"), null, "Menu.Layers.FlipHorizontal.png");
+			FlipVertical = new Gtk.Action ("FlipVertical", Catalog.GetString ("Flip Vertical"), null, "Menu.Layers.FlipVertical.png");
+			RotateZoom = new Gtk.Action ("RotateZoom", Catalog.GetString ("Rotate / Zoom Layer..."), null, "Menu.Layers.RotateZoom.png");
+			MoveLayerUp = new Gtk.Action ("MoveLayerUp", Catalog.GetString ("Move Layer Up"), null, "Menu.Layers.MoveLayerUp.png");
+			MoveLayerDown = new Gtk.Action ("MoveLayerDown", Catalog.GetString ("Move Layer Down"), null, "Menu.Layers.MoveLayerDown.png");
+			Properties = new Gtk.Action ("Properties", Catalog.GetString ("Layer Properties..."), null, "Menu.Layers.LayerProperties.png");
+
+			RotateZoom.Sensitive = false;
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			menu.Append (AddNewLayer.CreateAcceleratedMenuItem (Gdk.Key.N, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (DeleteLayer.CreateAcceleratedMenuItem (Gdk.Key.Delete, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (DuplicateLayer.CreateAcceleratedMenuItem (Gdk.Key.D, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (MergeLayerDown.CreateAcceleratedMenuItem (Gdk.Key.M, Gdk.ModifierType.ControlMask));
+			menu.Append (ImportFromFile.CreateMenuItem ());
+			menu.AppendSeparator ();
+			menu.Append (FlipHorizontal.CreateMenuItem ());
+			menu.Append (FlipVertical.CreateMenuItem ());
+			menu.Append (RotateZoom.CreateMenuItem ());
+			menu.AppendSeparator ();
+			menu.Append (Properties.CreateAcceleratedMenuItem (Gdk.Key.F4, Gdk.ModifierType.None));
+		}
+
+		public void CreateLayerWindowToolBar (Gtk.Toolbar toolbar)
+		{
+			toolbar.AppendItem (AddNewLayer.CreateToolBarItem ());
+			toolbar.AppendItem (DeleteLayer.CreateToolBarItem ());
+			toolbar.AppendItem (DuplicateLayer.CreateToolBarItem ());
+			toolbar.AppendItem (MergeLayerDown.CreateToolBarItem ());
+			toolbar.AppendItem (MoveLayerUp.CreateToolBarItem ());
+			toolbar.AppendItem (MoveLayerDown.CreateToolBarItem ());
+			toolbar.AppendItem (Properties.CreateToolBarItem ());
+		}
+		
+		public void RegisterHandlers ()
+		{
+			AddNewLayer.Activated += HandlePintaCoreActionsLayersAddNewLayerActivated;
+			DeleteLayer.Activated += HandlePintaCoreActionsLayersDeleteLayerActivated;
+			DuplicateLayer.Activated += HandlePintaCoreActionsLayersDuplicateLayerActivated;
+			MergeLayerDown.Activated += HandlePintaCoreActionsLayersMergeLayerDownActivated;
+			MoveLayerDown.Activated += HandlePintaCoreActionsLayersMoveLayerDownActivated;
+			MoveLayerUp.Activated += HandlePintaCoreActionsLayersMoveLayerUpActivated;
+			FlipHorizontal.Activated += HandlePintaCoreActionsLayersFlipHorizontalActivated;
+			FlipVertical.Activated += HandlePintaCoreActionsLayersFlipVerticalActivated;
+			ImportFromFile.Activated += HandlePintaCoreActionsLayersImportFromFileActivated;
+			
+			PintaCore.Layers.LayerAdded += EnableOrDisableLayerActions;
+			PintaCore.Layers.LayerRemoved += EnableOrDisableLayerActions;
+			PintaCore.Layers.SelectedLayerChanged += EnableOrDisableLayerActions;
+			
+			EnableOrDisableLayerActions (null, EventArgs.Empty);
+		}
+		#endregion
+
+		#region Action Handlers
+		private void EnableOrDisableLayerActions (object sender, EventArgs e)
+		{
+			if (PintaCore.Workspace.HasOpenDocuments && PintaCore.Workspace.ActiveDocument.Layers.Count > 1) {
+				PintaCore.Actions.Layers.DeleteLayer.Sensitive = true;
+				PintaCore.Actions.Image.Flatten.Sensitive = true;
+			} else {
+				PintaCore.Actions.Layers.DeleteLayer.Sensitive = false;
+				PintaCore.Actions.Image.Flatten.Sensitive = false;
+			}
+
+			if (PintaCore.Workspace.HasOpenDocuments && PintaCore.Workspace.ActiveDocument.CurrentLayerIndex > 0) {
+				PintaCore.Actions.Layers.MergeLayerDown.Sensitive = true;
+				PintaCore.Actions.Layers.MoveLayerDown.Sensitive = true;
+			} else {
+				PintaCore.Actions.Layers.MergeLayerDown.Sensitive = false;
+				PintaCore.Actions.Layers.MoveLayerDown.Sensitive = false;
+			}
+
+			if (PintaCore.Workspace.HasOpenDocuments && PintaCore.Workspace.ActiveDocument.CurrentLayerIndex < PintaCore.Workspace.ActiveDocument.Layers.Count - 1)
+				PintaCore.Actions.Layers.MoveLayerUp.Sensitive = true;
+			else
+				PintaCore.Actions.Layers.MoveLayerUp.Sensitive = false;
+		}
+
+		private void HandlePintaCoreActionsLayersImportFromFileActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog (Catalog.GetString ("Open Image File"), null, FileChooserAction.Open, Gtk.Stock.Cancel, Gtk.ResponseType.Cancel, Gtk.Stock.Open, Gtk.ResponseType.Ok);
+			
+			fcd.SetCurrentFolder (PintaCore.System.LastDialogDirectory);
+			fcd.AlternativeButtonOrder = new int[] { (int) ResponseType.Ok, (int) ResponseType.Cancel };
+
+			fcd.AddImagePreview ();
+
+			int response = fcd.Run ();
+			
+			if (response == (int)Gtk.ResponseType.Ok) {
+				
+				string file = fcd.Filename;
+				PintaCore.System.LastDialogDirectory = fcd.CurrentFolder;
+				
+				// Open the image and add it to the layers
+				Layer layer = doc.AddNewLayer (System.IO.Path.GetFileName (file));
+
+				using (var fs = new FileStream (file, FileMode.Open))
+					using (Pixbuf bg = new Pixbuf (fs))
+						using (Cairo.Context g = new Cairo.Context (layer.Surface)) {
+							CairoHelper.SetSourcePixbuf (g, bg, 0, 0);
+							g.Paint ();
+						}
+
+				doc.SetCurrentLayer (layer);
+
+				AddLayerHistoryItem hist = new AddLayerHistoryItem ("Menu.Layers.ImportFromFile.png", Catalog.GetString ("Import From File"), doc.Layers.IndexOf (layer));
+				doc.History.PushNewItem (hist);
+
+				doc.Workspace.Invalidate ();
+			}
+			
+			fcd.Destroy ();
+		}
+
+		private void HandlePintaCoreActionsLayersFlipVerticalActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			doc.CurrentLayer.FlipVertical ();
+			doc.Workspace.Invalidate ();
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.FlipLayerVertical, doc.CurrentLayerIndex));
+		}
+
+		private void HandlePintaCoreActionsLayersFlipHorizontalActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			doc.CurrentLayer.FlipHorizontal ();
+			doc.Workspace.Invalidate ();
+			doc.History.PushNewItem (new InvertHistoryItem (InvertType.FlipLayerHorizontal, doc.CurrentLayerIndex));
+		}
+
+		private void HandlePintaCoreActionsLayersMoveLayerUpActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			SwapLayersHistoryItem hist = new SwapLayersHistoryItem ("Menu.Layers.MoveLayerUp.png", Catalog.GetString ("Move Layer Up"), doc.CurrentLayerIndex, doc.CurrentLayerIndex + 1);
+
+			doc.MoveCurrentLayerUp ();
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsLayersMoveLayerDownActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			SwapLayersHistoryItem hist = new SwapLayersHistoryItem ("Menu.Layers.MoveLayerDown.png", Catalog.GetString ("Move Layer Down"), doc.CurrentLayerIndex, doc.CurrentLayerIndex - 1);
+
+			doc.MoveCurrentLayerDown ();
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsLayersMergeLayerDownActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			CompoundHistoryItem hist = new CompoundHistoryItem ("Menu.Layers.MergeLayerDown.png", Catalog.GetString ("Merge Layer Down"));
+			DeleteLayerHistoryItem h1 = new DeleteLayerHistoryItem (string.Empty, string.Empty, doc.CurrentLayer, doc.CurrentLayerIndex);
+			SimpleHistoryItem h2 = new SimpleHistoryItem (string.Empty, string.Empty, doc.Layers[doc.CurrentLayerIndex - 1].Surface.Clone (), doc.CurrentLayerIndex - 1);
+			
+			hist.Push (h1);
+			hist.Push (h2);
+
+			doc.MergeCurrentLayerDown ();
+
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsLayersDuplicateLayerActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			Layer l = doc.DuplicateCurrentLayer ();
+			
+			// Make new layer the current layer
+			doc.SetCurrentLayer (l);
+
+			AddLayerHistoryItem hist = new AddLayerHistoryItem ("Menu.Layers.DuplicateLayer.png", Catalog.GetString ("Duplicate Layer"), doc.Layers.IndexOf (l));
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsLayersDeleteLayerActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			DeleteLayerHistoryItem hist = new DeleteLayerHistoryItem ("Menu.Layers.DeleteLayer.png", Catalog.GetString ("Delete Layer"), doc.CurrentLayer, doc.CurrentLayerIndex);
+
+			doc.DeleteLayer (doc.CurrentLayerIndex, false);
+
+			doc.History.PushNewItem (hist);
+		}
+
+		private void HandlePintaCoreActionsLayersAddNewLayerActivated (object sender, EventArgs e)
+		{
+			Document doc = PintaCore.Workspace.ActiveDocument;
+			PintaCore.Tools.Commit ();
+
+			Layer l = doc.AddNewLayer (string.Empty);
+
+			// Make new layer the current layer
+			doc.SetCurrentLayer (l);
+
+			AddLayerHistoryItem hist = new AddLayerHistoryItem ("Menu.Layers.AddNewLayer.png", Catalog.GetString ("Add New Layer"), doc.Layers.IndexOf (l));
+			doc.History.PushNewItem (hist);
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Actions/ViewActions.cs'
--- Pinta.Core/Actions/ViewActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/ViewActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,276 @@
+// 
+// ViewActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.Unix;
+using Gtk;
+
+namespace Pinta.Core
+{
+	public class ViewActions
+	{
+		public Gtk.Action ZoomIn { get; private set; }
+		public Gtk.Action ZoomOut { get; private set; }
+		public Gtk.Action ZoomToWindow { get; private set; }
+		public Gtk.Action ZoomToSelection { get; private set; }
+		public Gtk.Action ActualSize { get; private set; }
+		public Gtk.ToggleAction ToolBar { get; private set; }
+		public Gtk.ToggleAction PixelGrid { get; private set; }
+		public Gtk.ToggleAction Rulers { get; private set; }
+		public Gtk.RadioAction Pixels { get; private set; }
+		public Gtk.RadioAction Inches { get; private set; }
+		public Gtk.RadioAction Centimeters { get; private set; }
+		public Gtk.Action Fullscreen { get; private set; }
+
+		public ToolBarComboBox ZoomComboBox { get; private set; }
+		public string[] ZoomCollection { get; private set; }
+
+		private string old_zoom_text = "";
+		private bool zoom_to_window_activated = false;
+
+		public bool ZoomToWindowActivated { 
+			get { return zoom_to_window_activated; }
+			set
+			{
+				zoom_to_window_activated = value;
+				old_zoom_text = ZoomComboBox.ComboBox.ActiveText;
+			}
+		}
+		
+		public ViewActions ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Menu.View.ActualSize.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.ActualSize.png")));
+			fact.Add ("Menu.View.Grid.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.Grid.png")));
+			fact.Add ("Menu.View.Rulers.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.Rulers.png")));
+			fact.Add ("Menu.View.ZoomIn.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.ZoomIn.png")));
+			fact.Add ("Menu.View.ZoomOut.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.ZoomOut.png")));
+			fact.Add ("Menu.View.ZoomToSelection.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.ZoomToSelection.png")));
+			fact.Add ("Menu.View.ZoomToWindow.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Menu.View.ZoomToWindow.png")));
+			fact.AddDefault ();
+			
+			ZoomIn = new Gtk.Action ("ZoomIn", Catalog.GetString ("Zoom In"), null, Stock.ZoomIn);
+			ZoomOut = new Gtk.Action ("ZoomOut", Catalog.GetString ("Zoom Out"), null, Stock.ZoomOut);
+			ZoomToWindow = new Gtk.Action ("ZoomToWindow", Catalog.GetString ("Best Fit"), null, Stock.ZoomFit);
+			ZoomToSelection = new Gtk.Action ("ZoomToSelection", Catalog.GetString ("Zoom to Selection"), null, "Menu.View.ZoomToSelection.png");
+			ActualSize = new Gtk.Action ("ActualSize", Catalog.GetString ("Normal Size"), null, Stock.Zoom100);
+			ToolBar = new Gtk.ToggleAction ("Toolbar", Catalog.GetString ("Toolbar"), null, null);
+			PixelGrid = new Gtk.ToggleAction ("PixelGrid", Catalog.GetString ("Pixel Grid"), null, "Menu.View.Grid.png");
+			Rulers = new Gtk.ToggleAction ("Rulers", Catalog.GetString ("Rulers"), null, "Menu.View.Rulers.png");
+			Pixels = new Gtk.RadioAction ("Pixels", Catalog.GetString ("Pixels"), null, null, 0);
+			Inches = new Gtk.RadioAction ("Inches", Catalog.GetString ("Inches"), null, null, 1);
+			Centimeters = new Gtk.RadioAction ("Centimeters", Catalog.GetString ("Centimeters"), null, null, 2);
+			Fullscreen = new Gtk.Action ("Fullscreen", Catalog.GetString ("Fullscreen"), null, Stock.Fullscreen);
+
+			ZoomCollection = new string[] { "3600%", "2400%", "1600%", "1200%", "800%", "700%", "600%", "500%", "400%", "300%", "200%", "175%", "150%", "125%", "100%", "66%", "50%", "33%", "25%", "16%", "12%", "8%", "5%", Catalog.GetString ("Window") };
+			ZoomComboBox = new ToolBarComboBox (75, DefaultZoomIndex(), true, ZoomCollection);
+
+			// Make sure these are the same group so only one will be selected at a time
+			Inches.Group = Pixels.Group;
+			Centimeters.Group = Pixels.Group;
+		}
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			MenuItem show_pad = (MenuItem)menu.Children[0];
+			menu.Remove (show_pad);
+			
+			menu.Append (ToolBar.CreateMenuItem ());
+			menu.Append (PixelGrid.CreateMenuItem ());
+			menu.Append (Rulers.CreateMenuItem ());
+			menu.AppendSeparator ();
+
+			ImageMenuItem zoomin = ZoomIn.CreateAcceleratedMenuItem (Gdk.Key.plus, Gdk.ModifierType.ControlMask);
+			zoomin.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.equal, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			zoomin.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.KP_Add, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			menu.Append (zoomin);
+			
+			ImageMenuItem zoomout = ZoomOut.CreateAcceleratedMenuItem (Gdk.Key.minus, Gdk.ModifierType.ControlMask);
+			zoomout.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.underscore, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			zoomout.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.KP_Subtract, Gdk.ModifierType.ControlMask, AccelFlags.Visible));
+			menu.Append (zoomout);
+			
+			ImageMenuItem actualsize = ActualSize.CreateAcceleratedMenuItem (Gdk.Key.Key_0, Gdk.ModifierType.ControlMask);
+			actualsize.AddAccelerator ("activate", PintaCore.Actions.AccelGroup, new AccelKey (Gdk.Key.A, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask, AccelFlags.Visible));
+			menu.Append (actualsize);
+			menu.Append (ZoomToWindow.CreateAcceleratedMenuItem (Gdk.Key.B, Gdk.ModifierType.ControlMask));
+			//menu.Append (ZoomToSelection.CreateAcceleratedMenuItem (Gdk.Key.B, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (Fullscreen.CreateAcceleratedMenuItem (Gdk.Key.F11, Gdk.ModifierType.None));
+
+			menu.AppendSeparator ();
+
+			Gtk.Action unit_action = new Gtk.Action ("RulerUnits", Mono.Unix.Catalog.GetString ("Ruler Units"), null, null);
+			Menu unit_menu = (Menu)menu.AppendItem (unit_action.CreateSubMenuItem ()).Submenu;
+			unit_menu.Append (Pixels.CreateMenuItem ());
+			unit_menu.Append (Inches.CreateMenuItem ());
+			unit_menu.Append (Centimeters.CreateMenuItem ());
+
+			menu.AppendSeparator ();
+			menu.Append (show_pad);
+		}
+		
+		public void CreateToolBar (Gtk.Toolbar toolbar)
+		{
+			toolbar.AppendItem (new Gtk.SeparatorToolItem ());
+			toolbar.AppendItem (ZoomOut.CreateToolBarItem ());
+			toolbar.AppendItem (ZoomComboBox);
+			toolbar.AppendItem (ZoomIn.CreateToolBarItem ());
+		}
+		
+		public void RegisterHandlers ()
+		{
+			ZoomIn.Activated += HandlePintaCoreActionsViewZoomInActivated;
+			ZoomOut.Activated += HandlePintaCoreActionsViewZoomOutActivated;
+			ZoomComboBox.ComboBox.Changed += HandlePintaCoreActionsViewZoomComboBoxComboBoxChanged;
+			(ZoomComboBox.ComboBox as Gtk.ComboBoxEntry).Entry.FocusOutEvent += new Gtk.FocusOutEventHandler (ComboBox_FocusOutEvent);
+			(ZoomComboBox.ComboBox as Gtk.ComboBoxEntry).Entry.FocusInEvent += new Gtk.FocusInEventHandler (Entry_FocusInEvent);
+			ActualSize.Activated += HandlePintaCoreActionsViewActualSizeActivated;
+
+			PixelGrid.Toggled += delegate (object sender, EventArgs e) {
+				PintaCore.Workspace.Invalidate ();
+			};
+
+			var isFullscreen = false;
+
+			Fullscreen.Activated += (foo, bar) => {
+				if (!isFullscreen)
+					PintaCore.Chrome.MainWindow.Fullscreen ();
+				else
+					PintaCore.Chrome.MainWindow.Unfullscreen ();
+
+				isFullscreen = !isFullscreen;
+			};
+		}
+
+		private string temp_zoom;
+		private bool suspend_zoom_change;
+		
+		private void Entry_FocusInEvent (object o, Gtk.FocusInEventArgs args)
+		{
+			temp_zoom = PintaCore.Actions.View.ZoomComboBox.ComboBox.ActiveText;
+		}
+
+		private void ComboBox_FocusOutEvent (object o, Gtk.FocusOutEventArgs args)
+		{
+			string text = PintaCore.Actions.View.ZoomComboBox.ComboBox.ActiveText;
+			double percent;
+
+			if (!TryParsePercent (text, out percent)) {
+				(PintaCore.Actions.View.ZoomComboBox.ComboBox as Gtk.ComboBoxEntry).Entry.Text = temp_zoom;
+				return;
+			}
+			
+			if (percent > 3600)
+				PintaCore.Actions.View.ZoomComboBox.ComboBox.Active = 0;
+		}
+		#endregion
+
+		/// <summary>
+		/// Converts the string representation of a percent (with or without a '%' sign) to a numeric value
+		/// </summary>
+		public static bool TryParsePercent (string text, out double percent)
+		{
+			return double.TryParse (text.Trim ('%'), out percent);
+		}
+
+		public void SuspendZoomUpdate ()
+		{
+			suspend_zoom_change = true;
+		}
+
+		public void ResumeZoomUpdate ()
+		{
+			suspend_zoom_change = false;
+		}
+
+		public void UpdateCanvasScale ()
+		{
+			string text = PintaCore.Actions.View.ZoomComboBox.ComboBox.ActiveText;
+
+			// stay in "Zoom to Window" mode if this function was called without the zoom level being changed by the user (e.g. if the 
+			// image was rotated or cropped) and "Zoom to Window" mode is active
+			if (text == Catalog.GetString ("Window") || (ZoomToWindowActivated && old_zoom_text == text))
+			{
+				PintaCore.Actions.View.ZoomToWindow.Activate ();
+				ZoomToWindowActivated = true;
+				return;
+			}
+			else
+			{
+				ZoomToWindowActivated = false;
+			}
+
+			double percent;
+
+			if (!TryParsePercent (text, out percent))
+				return;
+
+			percent = Math.Min (percent, 3600);
+			percent = percent / 100.0;
+
+			PintaCore.Workspace.Scale = percent;
+		}
+		
+		#region Action Handlers
+		private void HandlePintaCoreActionsViewActualSizeActivated (object sender, EventArgs e)
+		{
+			int default_zoom = DefaultZoomIndex ();
+			if (ZoomComboBox.ComboBox.Active != default_zoom)
+			{
+				ZoomComboBox.ComboBox.Active = default_zoom;
+				UpdateCanvasScale ();
+			}
+		}
+
+		private void HandlePintaCoreActionsViewZoomComboBoxComboBoxChanged (object sender, EventArgs e)
+		{
+			if (suspend_zoom_change)
+				return;
+
+			PintaCore.Workspace.ActiveDocument.Workspace.ZoomManually ();
+		}
+
+		private void HandlePintaCoreActionsViewZoomOutActivated (object sender, EventArgs e)
+		{
+			PintaCore.Workspace.ActiveDocument.Workspace.ZoomOut ();
+		}
+
+		private void HandlePintaCoreActionsViewZoomInActivated (object sender, EventArgs e)
+		{
+			PintaCore.Workspace.ActiveDocument.Workspace.ZoomIn ();
+		}
+		#endregion
+
+		/// <summary>
+		/// Returns the index in the ZoomCollection of the default zoom level
+		/// </summary>
+		private int DefaultZoomIndex()
+		{
+			return Array.IndexOf(ZoomCollection, "100%");
+		}
+	}
+}
\ No newline at end of file

=== added file 'Pinta.Core/Actions/WindowActions.cs'
--- Pinta.Core/Actions/WindowActions.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Actions/WindowActions.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,153 @@
+// 
+// WindowActions.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using Gtk;
+using Mono.Unix;
+using System.Collections.Generic;
+
+namespace Pinta.Core
+{
+	public class WindowActions
+	{
+		private Menu window_menu;
+		private Dictionary<RadioAction, CheckMenuItem> action_menu_items;
+
+		public Gtk.Action SaveAll { get; private set; }
+		public Gtk.Action CloseAll { get; private set; }
+
+		public WindowActions ()
+		{
+			SaveAll = new Gtk.Action ("SaveAll", Catalog.GetString ("Save All"), null, Stock.Save);
+			CloseAll = new Gtk.Action ("CloseAll", Catalog.GetString ("Close All"), null, Stock.Close);
+
+			OpenWindows = new List<RadioAction> ();
+			action_menu_items = new Dictionary<RadioAction,CheckMenuItem> ();
+		}
+
+		public List<RadioAction> OpenWindows { get; private set; }
+
+		#region Initialization
+		public void CreateMainMenu (Gtk.Menu menu)
+		{
+			window_menu = menu;
+
+			menu.Append (SaveAll.CreateAcceleratedMenuItem (Gdk.Key.L, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.Append (CloseAll.CreateAcceleratedMenuItem (Gdk.Key.W, Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask));
+			menu.AppendSeparator ();
+		}
+		#endregion
+
+		#region Public Methods
+		public RadioAction AddDocument (Document doc)
+		{
+			RadioAction action = new RadioAction (doc.Guid.ToString (), doc.Filename, string.Empty, null, 0);
+			
+			// Tie these all together as a radio group
+			if (OpenWindows.Count > 0)
+				action.Group = OpenWindows[0].Group;
+
+			action.Active = true;
+			action.Activated += (o, e) => { if ((o as Gtk.ToggleAction).Active) PintaCore.Workspace.SetActiveDocumentInternal (doc); };
+			
+			OpenWindows.Add (action);
+			CheckMenuItem menuitem;
+
+			// We only assign accelerators up to Alt-9
+			if (OpenWindows.Count < 10)
+				menuitem = action.CreateAcceleratedMenuItem (IntegerToNumKey (OpenWindows.Count), Gdk.ModifierType.Mod1Mask);
+			else
+				menuitem = (CheckMenuItem)action.CreateMenuItem ();
+
+			action_menu_items.Add (action, menuitem);
+			window_menu.Add (menuitem);
+
+			doc.Renamed += (o, e) => { UpdateMenuLabel (action, o as Document); };
+			doc.IsDirtyChanged += (o, e) => { UpdateMenuLabel (action, o as Document); };
+
+			return action;
+		}
+
+		public void RemoveDocument (Document doc)
+		{
+			// Remove from our list of actions
+			RadioAction act = OpenWindows.Where (p => p.Name == doc.Guid.ToString ()).FirstOrDefault ();
+			OpenWindows.Remove (act);
+
+			// Remove all the menu items from the menu
+			foreach (var item in action_menu_items.Values) {
+				window_menu.Remove (item);
+				item.Dispose ();
+			}
+
+			action_menu_items.Clear ();
+
+			// Recreate all of our menu items
+			// I tried simply changing the accelerators, but could
+			// no get it to work.
+			CheckMenuItem menuitem;
+
+			for (int i = 0; i < OpenWindows.Count; i++) {
+				RadioAction action = OpenWindows[i];
+
+				if (i < 9)
+					menuitem = action.CreateAcceleratedMenuItem (IntegerToNumKey (i + 1), Gdk.ModifierType.Mod1Mask);
+				else
+					menuitem = (CheckMenuItem)action.CreateMenuItem ();
+
+				action_menu_items.Add (action, menuitem);
+				window_menu.Add (menuitem);
+			}
+		}
+		#endregion
+
+		#region Private Methods
+		private Gdk.Key IntegerToNumKey (int i)
+		{
+			switch (i) {
+				case 1: return Gdk.Key.Key_1;
+				case 2: return Gdk.Key.Key_2;
+				case 3: return Gdk.Key.Key_3;
+				case 4: return Gdk.Key.Key_4;
+				case 5: return Gdk.Key.Key_5;
+				case 6: return Gdk.Key.Key_6;
+				case 7: return Gdk.Key.Key_7;
+				case 8: return Gdk.Key.Key_8;
+				case 9: return Gdk.Key.Key_9;
+			}
+
+			throw new ArgumentOutOfRangeException (string.Format ("IntegerToNumKey does not support: {0}", i));
+		}
+
+		private void UpdateMenuLabel (RadioAction action, Document doc)
+		{
+			action.Label = string.Format ("{0}{1}", doc.Filename, doc.IsDirty ? "*" : string.Empty);
+			PintaCore.Workspace.ResetTitle ();
+		}
+		#endregion
+	}
+}

=== added directory 'Pinta.Core/Classes'
=== added file 'Pinta.Core/Classes/Anchor.cs'
--- Pinta.Core/Classes/Anchor.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/Anchor.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,43 @@
+// 
+// Anchor.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace Pinta.Core
+{
+	public enum Anchor
+	{
+		NW,
+		N,
+		NE,
+		E,
+		SE,
+		S,
+		SW,
+		W,
+		Center
+	}
+}

=== added file 'Pinta.Core/Classes/AsyncEffectRenderer.cs'
--- Pinta.Core/Classes/AsyncEffectRenderer.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/AsyncEffectRenderer.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,361 @@
+// 
+// AsyncEffectRenderer.cs
+//  
+// Author:
+//       Greg Lowe <[e-mail]>
+// 
+// Copyright (c) 2010 Greg Lowe
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#if (!LIVE_PREVIEW_DEBUG && DEBUG)
+#undef DEBUG
+#endif
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Debug = System.Diagnostics.Debug;
+
+namespace Pinta.Core
+{
+	
+	// Only call methods on this class from a single thread (The UI thread).
+	internal abstract class AsyncEffectRenderer
+	{
+		Settings settings;
+		
+		internal struct Settings {
+			internal int ThreadCount { get; set; }
+			internal int TileWidth { get; set; }
+			internal int TileHeight { get; set; }
+			internal int UpdateMillis { get; set; }
+			internal ThreadPriority ThreadPriority { get; set; }
+		}		
+		
+		BaseEffect effect;
+		Cairo.ImageSurface source_surface;
+		Cairo.ImageSurface dest_surface;
+		Gdk.Rectangle render_bounds;
+		
+		bool is_rendering;
+		bool cancel_render_flag;
+		bool restart_render_flag;
+		int render_id;
+		int current_tile;
+		int total_tiles;		
+		List<Exception> render_exceptions;
+		
+		uint timer_tick_id;
+		
+		object updated_lock;
+		bool is_updated;
+		int updated_x1;
+		int updated_y1;
+		int updated_x2;
+		int updated_y2;
+		
+		internal AsyncEffectRenderer (Settings settings)
+		{
+			if (settings.ThreadCount < 1)
+				settings.ThreadCount = 1;
+			
+			if (settings.TileWidth < 1)
+				throw new ArgumentException ("EffectRenderSettings.TileWidth");
+			
+			if (settings.TileHeight < 1)
+				throw new ArgumentException ("EffectRenderSettings.TileHeight");			
+			
+			if (settings.UpdateMillis <= 0)
+				settings.UpdateMillis = 100;
+			
+			effect = null;
+			source_surface = null;
+			dest_surface = null;
+			this.settings = settings;
+			
+			is_rendering = false;
+			render_id = 0;
+			updated_lock = new object ();
+			is_updated = false;
+			render_exceptions = new List<Exception> ();	
+			
+			timer_tick_id = 0;
+		}		
+		
+		internal bool IsRendering {
+			get { return is_rendering; }
+		}
+		
+		internal double Progress {
+			get {
+				if (total_tiles == 0 || current_tile < 0)
+					return 0;
+				else if (current_tile < total_tiles)
+					return (double)current_tile / (double)total_tiles;
+				else
+					return 1;
+			}
+		}
+		
+		internal void Start (BaseEffect effect,
+		                     Cairo.ImageSurface source,
+		                     Cairo.ImageSurface dest,
+		                     Gdk.Rectangle renderBounds)
+		{
+			Debug.WriteLine ("AsyncEffectRenderer.Start ()");
+			
+			if (effect == null)
+				throw new ArgumentNullException ("effect");
+			
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			
+			if (dest == null)
+				throw new ArgumentNullException ("dest");
+			
+			if (renderBounds.IsEmpty)
+				throw new ArgumentException ("renderBounds.IsEmpty");
+			
+			// It is important the effect's properties don't change during rendering.
+			// So a copy is made for the render.
+			this.effect = effect.Clone();
+			
+			this.source_surface = source;
+			this.dest_surface = dest;
+			this.render_bounds = renderBounds;
+			
+			// If a render is already in progress, then cancel it,
+			// and start a new render.
+			if (IsRendering) {
+				cancel_render_flag = true;
+				restart_render_flag = true;
+				return;
+			}
+			
+			StartRender ();
+		}
+		
+		internal void Cancel ()
+		{
+			Debug.WriteLine ("AsyncEffectRenderer.Cancel ()");
+			cancel_render_flag = true;
+			restart_render_flag = false;			
+			
+			if (!IsRendering)
+				HandleRenderCompletion ();
+		}
+		
+		protected abstract void OnUpdate (double progress, Gdk.Rectangle updatedBounds);
+		
+		protected abstract void OnCompletion (bool canceled, Exception[] exceptions);
+		
+		internal void Dispose ()
+		{
+			if (timer_tick_id > 0)
+				GLib.Source.Remove (timer_tick_id);
+		}
+		
+		void StartRender ()
+		{
+			is_rendering = true;			
+			cancel_render_flag = false;			
+			restart_render_flag = false;
+			is_updated = false;
+			
+			render_id++;
+			render_exceptions.Clear ();
+			
+			current_tile = -1;
+			
+			total_tiles = CalculateTotalTiles ();
+			
+			Debug.WriteLine ("AsyncEffectRenderer.Start () Render " + render_id + " starting.");			
+			
+			// Copy the current render id.
+			int renderId = render_id;
+			
+			// Start slave render threads.
+			int threadCount = settings.ThreadCount;
+			var slaves = new Thread[threadCount - 1];
+			for (int threadId = 1; threadId < threadCount; threadId++)
+				slaves[threadId - 1] = StartSlaveThread (renderId, threadId);			
+			
+			// Start the master render thread.
+			var master = new Thread (() => {
+				
+				// Do part of the rendering on the master thread.
+				Render (renderId, 0);
+				
+				// Wait for slave threads to complete.
+				foreach (var slave in slaves)
+					slave.Join ();
+				
+				// Change back to the UI thread to notify of completion.
+				Gtk.Application.Invoke ((o,e) => HandleRenderCompletion ());
+			});
+			
+			master.Priority = settings.ThreadPriority;
+			master.Start ();
+			
+			// Start timer used to periodically fire update events on the UI thread.
+			timer_tick_id = GLib.Timeout.Add((uint) settings.UpdateMillis, HandleTimerTick);			
+		}
+		
+		Thread StartSlaveThread (int renderId, int threadId)
+		{
+			var slave = new Thread(() => {
+				Render (renderId, threadId);
+			});
+			
+			slave.Priority = settings.ThreadPriority;
+			slave.Start ();
+			
+			return slave;
+		}
+		
+		// Runs on a background thread.
+		void Render (int renderId, int threadId)
+		{
+			// Fetch the next tile index and render it.
+			for (;;) {
+				
+				int tileIndex = Interlocked.Increment (ref current_tile);
+				
+				if (tileIndex >= total_tiles || cancel_render_flag)
+					return;
+				
+				RenderTile (renderId, threadId, tileIndex);
+ 			}
+		}
+		
+		// Runs on a background thread.
+		void RenderTile (int renderId, int threadId, int tileIndex)
+		{
+			Exception exception = null;
+			Gdk.Rectangle bounds = new Gdk.Rectangle ();
+			
+			try {
+				
+				bounds = GetTileBounds (tileIndex);
+				
+				if (!cancel_render_flag) {
+					dest_surface.Flush ();
+					effect.Render (source_surface, dest_surface, new [] { bounds });
+					dest_surface.MarkDirty (bounds.ToCairoRectangle ());
+				}
+				
+			} catch (Exception ex) {		
+				exception = ex;
+				Debug.WriteLine ("AsyncEffectRenderer Error while rendering effect: " + effect.Name + " exception: " + ex.Message + "\n" + ex.StackTrace);
+			}
+			
+			// Ignore completions of tiles after a cancel or from a previous render.
+			if (!IsRendering || renderId != render_id)
+				return;
+			
+			// Update bounds to be shown on next expose.
+			lock (updated_lock) {
+				if (is_updated) {				
+					updated_x1 = Math.Min (bounds.X, updated_x1);
+					updated_y1 = Math.Min (bounds.Y, updated_y1);
+					updated_x2 = Math.Max (bounds.X + bounds.Width, updated_x2);
+					updated_y2 = Math.Max (bounds.Y + bounds.Height, updated_y2);
+				} else {
+					is_updated = true;
+					updated_x1 = bounds.X;
+					updated_y1 = bounds.Y;
+					updated_x2 = bounds.X + bounds.Width;
+					updated_y2 = bounds.Y + bounds.Height;
+				}
+			}
+			
+			if (exception != null) {
+				lock (render_exceptions) {
+					render_exceptions.Add (exception);
+				}
+			}
+		}
+		
+		// Runs on a background thread.
+		Gdk.Rectangle GetTileBounds (int tileIndex)
+		{
+			int horizTileCount = (int)Math.Ceiling((float)render_bounds.Width 
+			                                       / (float)settings.TileWidth);
+			
+            int x = ((tileIndex % horizTileCount) * settings.TileWidth) + render_bounds.X;
+            int y = ((tileIndex / horizTileCount) * settings.TileHeight) + render_bounds.Y;
+            int w = Math.Min(settings.TileWidth, render_bounds.Right - x);
+            int h = Math.Min(settings.TileHeight, render_bounds.Bottom - y);
+			
+			return new Gdk.Rectangle (x, y, w, h);			
+		}
+		
+		int CalculateTotalTiles ()
+		{
+			return (int)(Math.Ceiling((float)render_bounds.Width / (float)settings.TileWidth)
+                                * Math.Ceiling((float)render_bounds.Height / (float)settings.TileHeight));
+		}
+		
+		// Called on the UI thread.
+		bool HandleTimerTick ()
+		{			
+			Debug.WriteLine (DateTime.Now.ToString("HH:mm:ss:ffff") + " Timer tick.");
+			
+			Gdk.Rectangle bounds;
+			
+			lock (updated_lock) {
+				
+				if (!is_updated)
+					return true;
+			
+				is_updated = false;
+				
+				bounds = new Gdk.Rectangle (updated_x1,
+			    	                        updated_y1,
+				    	                    updated_x2 - updated_x1,
+				        	                updated_y2 - updated_y1);
+			}
+			
+			if (IsRendering && !cancel_render_flag)
+				OnUpdate (Progress, bounds);
+			
+			return true;
+		}
+		
+		void HandleRenderCompletion ()
+		{
+			var exceptions = (render_exceptions == null || render_exceptions.Count == 0)
+			                  ? null
+			                  : render_exceptions.ToArray ();
+			
+			HandleTimerTick ();
+			
+			if (timer_tick_id > 0)
+				GLib.Source.Remove (timer_tick_id);
+			
+			OnCompletion (cancel_render_flag, exceptions);
+			
+			if (restart_render_flag)
+				StartRender ();
+			else
+				is_rendering = false;
+		}
+	}
+}

=== added file 'Pinta.Core/Classes/BaseExtension.cs'
--- Pinta.Core/Classes/BaseExtension.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/BaseExtension.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,41 @@
+// 
+// BaseExtension.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+
+namespace Pinta.Core
+{
+	public class BaseExtension
+	{
+		/// <summary>
+		/// Called during startup, perform any necessary initialization here
+		/// </summary>
+		public virtual void Initialize ()
+		{
+		}
+	}
+}

=== added file 'Pinta.Core/Classes/BasePaintBrush.cs'
--- Pinta.Core/Classes/BasePaintBrush.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/BasePaintBrush.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,42 @@
+//
+// BasePaintBrush.cs
+//  
+// Author:
+//       Aaron Bockover <[e-mail]>
+// 
+// Copyright (c) 2010 Novell, Inc.
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.Addins;
+
+namespace Pinta.Core
+{
+	[TypeExtensionPoint]
+	public abstract class BasePaintBrush
+	{
+		public abstract string Name { get; }
+		
+		public virtual int Priority {
+			get { return 0; }
+		}
+	}
+}
+

=== added file 'Pinta.Core/Classes/BaseTool.cs'
--- Pinta.Core/Classes/BaseTool.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/BaseTool.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,276 @@
+// 
+// BaseTool.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Cairo;
+using Gtk;
+using System.IO;
+using Mono.Unix;
+using Mono.Addins;
+
+namespace Pinta.Core
+{
+	public delegate void MouseHandler (double x, double y, Gdk.ModifierType state);
+
+	[TypeExtensionPoint]
+	public abstract class BaseTool
+	{
+		protected const int DEFAULT_BRUSH_WIDTH = 2;
+	    
+		protected static Point point_empty = new Point (-500, -500);
+	    
+		protected ToggleToolButton tool_item;
+		protected ToolItem tool_label;
+		protected ToolItem tool_image;
+		protected ToolItem tool_sep;
+		protected ToolBarDropDownButton antialiasing_button;
+		protected ToolBarDropDownButton alphablending_button;
+		public event MouseHandler MouseMoved;
+		public event MouseHandler MousePressed;
+		public event MouseHandler MouseReleased;
+
+		protected BaseTool ()
+		{
+		}
+
+		static BaseTool ()
+		{
+			Gtk.IconFactory fact = new Gtk.IconFactory ();
+			fact.Add ("Toolbar.AntiAliasingEnabledIcon.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Toolbar.AntiAliasingEnabledIcon.png")));
+			fact.Add ("Toolbar.AntiAliasingDisabledIcon.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Toolbar.AntiAliasingDisabledIcon.png")));
+			fact.Add ("Toolbar.BlendingEnabledIcon.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Toolbar.BlendingEnabledIcon.png")));
+			fact.Add ("Toolbar.BlendingOverwriteIcon.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Toolbar.BlendingOverwriteIcon.png")));
+			fact.Add ("Tools.FreeformShape.png", new Gtk.IconSet (PintaCore.Resources.GetIcon ("Tools.FreeformShape.png")));
+			fact.AddDefault ();
+		}
+
+		public virtual string Name { get { throw new ApplicationException ("Tool didn't override Name"); } }
+		public virtual string Icon { get { throw new ApplicationException ("Tool didn't override Icon"); } }		
+		public virtual string ToolTip { get { throw new ApplicationException ("Tool didn't override ToolTip"); } }
+		public virtual string StatusBarText { get { return string.Empty; } }
+		public virtual ToggleToolButton ToolItem { get { if (tool_item == null) tool_item = CreateToolButton (); return tool_item; } }
+		public virtual bool Enabled { get { return true; } }
+		public virtual Gdk.Cursor DefaultCursor { get { return null; } }
+		public virtual Gdk.Key ShortcutKey { get { return (Gdk.Key)0; } }
+		public virtual bool UseAntialiasing { get { return ShowAntialiasingButton && (bool)antialiasing_button.SelectedItem.Tag; } }
+		public virtual bool UseAlphaBlending { get { return ShowAlphaBlendingButton && (bool)alphablending_button.SelectedItem.Tag; } }
+		public virtual int Priority { get { return 75; } }
+
+		protected virtual bool ShowAntialiasingButton { get { return false; } }
+		protected virtual bool ShowAlphaBlendingButton { get { return false; } }
+		
+		#region Public Methods
+		public void DoMouseMove (object o, MotionNotifyEventArgs args, Cairo.PointD point)
+		{
+			if (MouseMoved != null)
+				MouseMoved (point.X, point.Y, args.Event.State);
+			OnMouseMove (o, args, point);
+		}
+
+		public void DoBuildToolBar (Toolbar tb)
+		{
+			OnBuildToolBar (tb);
+			BuildRasterizationToolItems (tb);
+		}
+
+		public void DoClearToolBar (Toolbar tb)
+		{
+			OnClearToolBar (tb);
+		}
+
+		public void DoMouseDown (DrawingArea canvas, ButtonPressEventArgs args, Cairo.PointD point)
+		{
+			if (MousePressed != null)
+				MousePressed (point.X, point.Y, args.Event.State);
+			OnMouseDown (canvas, args, point);
+		}
+
+		public void DoMouseUp (DrawingArea canvas, ButtonReleaseEventArgs args, Cairo.PointD point)
+		{
+			if (MouseReleased != null)
+				MouseReleased (point.X, point.Y, args.Event.State);
+			OnMouseUp (canvas, args, point);
+		}
+
+		public void DoCommit ()
+		{
+			OnCommit ();
+		}
+
+		public void DoActivated ()
+		{
+			OnActivated ();
+		}
+		
+		public void DoDeactivated ()
+		{
+			OnDeactivated ();
+		}		
+		
+		// Return true if the key was consumed.
+		public void DoKeyPress (DrawingArea canvas, KeyPressEventArgs args)
+		{
+			OnKeyDown (canvas, args);
+		}
+
+		public void DoKeyRelease (DrawingArea canvas, KeyReleaseEventArgs args)
+		{
+			OnKeyUp (canvas, args);
+		}
+		#endregion
+
+		#region Protected Methods
+		protected virtual void OnMouseMove (object o, Gtk.MotionNotifyEventArgs args, Cairo.PointD point)
+		{
+		}
+
+		protected virtual void BuildRasterizationToolItems (Toolbar tb)
+		{
+			if (ShowAlphaBlendingButton || ShowAntialiasingButton)
+				tb.AppendItem (new SeparatorToolItem ());
+			
+			if (ShowAntialiasingButton)
+				BuildAntialiasingTool (tb);
+			if (ShowAlphaBlendingButton)
+				BuildAlphaBlending (tb);			
+		}
+
+		protected virtual void OnBuildToolBar (Toolbar tb)
+		{
+			if (tool_label == null)
+				tool_label = new ToolBarLabel (string.Format (" {0}:  ", Catalog.GetString ("Tool")));
+			
+			tb.AppendItem (tool_label);
+			
+			if (tool_image == null)
+				tool_image = new ToolBarImage (Icon);
+			
+			tb.AppendItem (tool_image);
+			
+			if (tool_sep == null)
+				tool_sep = new SeparatorToolItem ();
+			
+			tb.AppendItem (tool_sep);
+		}
+
+		protected virtual void OnClearToolBar (Toolbar tb)
+		{
+			while (tb.NItems > 0)
+				tb.Remove (tb.Children[tb.NItems - 1]);
+		}
+
+		protected virtual void OnMouseDown (DrawingArea canvas, Gtk.ButtonPressEventArgs args, Cairo.PointD point)
+		{
+		}
+
+		protected virtual void OnMouseUp (DrawingArea canvas, Gtk.ButtonReleaseEventArgs args, Cairo.PointD point)
+		{
+		}
+		
+		protected virtual void OnKeyDown (DrawingArea canvas, Gtk.KeyPressEventArgs args)
+		{
+		}
+
+		protected virtual void OnKeyUp (DrawingArea canvas, Gtk.KeyReleaseEventArgs args)
+		{
+		}
+		
+		/// <summary>
+		/// This is called whenever a menu option is called, for
+		/// tools that are in a temporary state while being used, and
+		/// need to commit their work when another option is selected.
+		/// </summary>
+		protected virtual void OnCommit ()
+		{
+		}
+
+		protected virtual void OnActivated ()
+		{
+			SetCursor (DefaultCursor);
+		}
+		
+		protected virtual void OnDeactivated ()
+		{
+			SetCursor (null);
+		}
+
+		protected virtual ToggleToolButton CreateToolButton ()
+		{
+			Image i2 = new Image (PintaCore.Resources.GetIcon (Icon));
+			i2.Show ();
+			
+			ToggleToolButton tool_item = new ToggleToolButton ();
+			tool_item.IconWidget = i2;
+			tool_item.Show ();
+			tool_item.Label = Name;
+			
+			if (ShortcutKey != (Gdk.Key)0)
+				tool_item.TooltipText = string.Format ("{0}\n{2}: {1}\n\n{3}", Name, ShortcutKey.ToString ().ToUpperInvariant (), Catalog.GetString ("Shortcut key"), StatusBarText);
+			else
+				tool_item.TooltipText = Name;
+			
+			return tool_item;
+		}
+		
+		protected void SetCursor (Gdk.Cursor cursor)
+		{
+			PintaCore.Chrome.Canvas.GdkWindow.Cursor = cursor;
+		}
+		#endregion
+
+		#region Private Methods
+		private void BuildAlphaBlending (Toolbar tb)
+		{
+			if (alphablending_button != null) {
+				tb.AppendItem (alphablending_button);
+				return;
+			}
+
+			alphablending_button = new ToolBarDropDownButton ();
+
+			alphablending_button.AddItem (Catalog.GetString ("Normal Blending"), "Toolbar.BlendingEnabledIcon.png", true);
+			alphablending_button.AddItem (Catalog.GetString ("Overwrite"), "Toolbar.BlendingOverwriteIcon.png", false);
+
+			tb.AppendItem (alphablending_button);
+		}
+
+		private void BuildAntialiasingTool (Toolbar tb)
+		{
+			if (antialiasing_button != null) {
+				tb.AppendItem (antialiasing_button);
+				return;
+			}
+
+			antialiasing_button = new ToolBarDropDownButton ();
+
+			antialiasing_button.AddItem (Catalog.GetString ("Antialiasing On"), "Toolbar.AntiAliasingEnabledIcon.png", true);
+			antialiasing_button.AddItem (Catalog.GetString ("Antialiasing Off"), "Toolbar.AntiAliasingDisabledIcon.png", false);
+
+			tb.AppendItem (antialiasing_button);
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Classes/Document.cs'
--- Pinta.Core/Classes/Document.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/Document.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,735 @@
+// 
+// Document.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using Mono.Unix;
+using Gdk;
+using System.Collections.Generic;
+using Cairo;
+using System.ComponentModel;
+
+namespace Pinta.Core
+{
+	// The differentiation between Document and DocumentWorkspace is
+	// somewhat arbitrary.  In general:
+	// Document - Data about the image itself
+	// Workspace - Data about Pinta's state for the image
+	public class Document
+	{
+		private string filename;
+		private bool is_dirty;
+		private int layer_name_int = 2;
+		private int current_layer = -1;
+
+		// The layer for tools to use until their output is committed
+		private Layer tool_layer;
+		// The layer used for selections
+		private Layer selection_layer;
+
+		private int selection_layer_index;
+		private Path selection_path;
+		private bool show_selection;
+
+		public Document (Gdk.Size size)
+		{
+			Guid = Guid.NewGuid ();
+			
+			Workspace = new DocumentWorkspace (this);
+			IsDirty = false;
+			HasFile = false;
+			ImageSize = size;
+			
+			Layers = new List<Layer> ();
+
+			tool_layer = CreateLayer ("Tool Layer");
+			tool_layer.Hidden = true;
+
+			selection_layer = CreateLayer ("Selection Layer");
+			selection_layer.Hidden = true;
+
+			ResetSelectionPath ();
+		}
+
+		#region Public Properties
+		public Layer CurrentLayer {
+			get { return Layers[current_layer]; }
+		}
+
+		public int CurrentLayerIndex {
+			get { return current_layer; }
+		}
+		
+		/// <summary>
+		/// Just the file name, like "dog.jpg".
+		/// </summary>
+		public string Filename { 
+			get { return filename; }
+			set {
+				if (filename != value) {
+					filename = value;
+					OnRenamed ();
+				}
+			}
+		}
+		
+		public Guid Guid { get; private set; }
+		
+		public bool HasFile { get; set; }
+		
+		public DocumentWorkspaceHistory History { get { return Workspace.History; } }
+
+		public Gdk.Size ImageSize { get; set; }
+		
+		public bool IsDirty {
+			get { return is_dirty; }
+			set {
+				if (is_dirty != value) {
+					is_dirty = value;
+					OnIsDirtyChanged ();
+				}
+			}
+		}
+		
+		public List<Layer> Layers { get; private set; }
+
+		/// <summary>
+		/// Just the directory name, like "C:\MyPictures".
+		/// </summary>
+		public string Pathname { get; set; }
+
+		/// <summary>
+		/// Directory and file name, like "C:\MyPictures\dog.jpg".
+		/// </summary>
+		public string PathAndFileName {
+			get { return System.IO.Path.Combine (Pathname, Filename); }
+			set {
+				if (string.IsNullOrEmpty (value)) {
+					Pathname = string.Empty;
+					Filename = string.Empty;
+				} else {
+					Pathname = System.IO.Path.GetDirectoryName (value);
+					Filename = System.IO.Path.GetFileName (value);
+				}
+			}
+		}
+
+		public Layer SelectionLayer {
+			get { return selection_layer; }
+		}
+		
+		public Path SelectionPath {
+			get { return selection_path; }
+			set {
+				if (selection_path == value)
+					return;
+
+				selection_path = value;
+			}
+		}
+
+		public bool ShowSelection {
+			get { return show_selection; }
+			set {
+				show_selection = value;
+				PintaCore.Actions.Edit.Deselect.Sensitive = show_selection;
+				PintaCore.Actions.Edit.EraseSelection.Sensitive = show_selection;
+				PintaCore.Actions.Edit.FillSelection.Sensitive = show_selection;
+				PintaCore.Actions.Image.CropToSelection.Sensitive = show_selection;
+			}
+		}
+
+		public bool ShowSelectionLayer { get; set; }
+
+		public Layer ToolLayer {
+			get {
+				if (tool_layer.Surface.Width != ImageSize.Width || tool_layer.Surface.Height != ImageSize.Height) {
+					(tool_layer.Surface as IDisposable).Dispose ();
+					tool_layer = CreateLayer ("Tool Layer");
+					tool_layer.Hidden = true;
+				}
+
+				return tool_layer;
+			}
+		}
+
+		public DocumentWorkspace Workspace { get; private set; }
+		#endregion
+
+		#region Public Methods
+		// Adds a new layer above the current one
+		public Layer AddNewLayer (string name)
+		{
+			Layer layer;
+
+			if (string.IsNullOrEmpty (name))
+				layer = CreateLayer ();
+			else
+				layer = CreateLayer (name);
+
+			Layers.Insert (current_layer + 1, layer);
+
+			if (Layers.Count == 1)
+				current_layer = 0;
+
+			layer.PropertyChanged += RaiseLayerPropertyChangedEvent;
+
+			PintaCore.Layers.OnLayerAdded ();
+			return layer;
+		}
+
+		public Gdk.Rectangle ClampToImageSize (Gdk.Rectangle r)
+		{
+			int x = Utility.Clamp (r.X, 0, ImageSize.Width);
+			int y = Utility.Clamp (r.Y, 0, ImageSize.Height);
+			int width = Math.Min (r.Width, ImageSize.Width - x);
+			int height = Math.Min (r.Height, ImageSize.Height - y);
+
+			return new Gdk.Rectangle (x, y, width, height);
+		}
+
+		public void Clear ()
+		{
+			while (Layers.Count > 0) {
+				Layer l = Layers[Layers.Count - 1];
+				Layers.RemoveAt (Layers.Count - 1);
+				(l.Surface as IDisposable).Dispose ();
+			}
+
+			current_layer = -1;
+			PintaCore.Layers.OnLayerRemoved ();
+		}
+		
+		// Clean up any native resources we had
+		public void Close ()
+		{
+			// Dispose all of our layers
+			while (Layers.Count > 0) {
+				Layer l = Layers[Layers.Count - 1];
+				Layers.RemoveAt (Layers.Count - 1);
+				(l.Surface as IDisposable).Dispose ();
+			}
+
+			current_layer = -1;
+
+			if (tool_layer != null)
+				(tool_layer.Surface as IDisposable).Dispose ();
+
+			if (selection_layer != null)
+				(selection_layer.Surface as IDisposable).Dispose ();
+
+			if (selection_path != null)
+				(selection_path as IDisposable).Dispose ();
+		}
+
+		public Context CreateClippedContext ()
+		{
+			Context g = new Context (CurrentLayer.Surface);
+
+			g.AppendPath (SelectionPath);
+			g.FillRule = Cairo.FillRule.EvenOdd;
+			g.Clip ();
+
+			return g;
+		}
+
+		public Context CreateClippedContext (bool antialias)
+		{
+			Context g = new Context (CurrentLayer.Surface);
+
+			g.AppendPath (SelectionPath);
+			g.FillRule = Cairo.FillRule.EvenOdd;
+			g.Clip ();
+
+			g.Antialias = antialias ? Antialias.Subpixel : Antialias.None;
+
+			return g;
+		}
+
+		public Context CreateClippedToolContext ()
+		{
+			Context g = new Context (ToolLayer.Surface);
+
+			g.AppendPath (SelectionPath);
+			g.FillRule = Cairo.FillRule.EvenOdd;
+			g.Clip ();
+
+			return g;
+		}
+
+		public Context CreateClippedToolContext (bool antialias)
+		{
+			Context g = new Context (ToolLayer.Surface);
+
+			g.AppendPath (SelectionPath);
+			g.FillRule = Cairo.FillRule.EvenOdd;
+			g.Clip ();
+
+			g.Antialias = antialias ? Antialias.Subpixel : Antialias.None;
+
+			return g;
+		}
+
+		public Layer CreateLayer ()
+		{
+			return CreateLayer (string.Format ("{0} {1}", Catalog.GetString ("Layer"), layer_name_int++));
+		}
+
+		public Layer CreateLayer (string name)
+		{
+			return CreateLayer (name, ImageSize.Width, ImageSize.Height);
+		}
+
+		public Layer CreateLayer (string name, int width, int height)
+		{
+			Cairo.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height);
+			Layer layer = new Layer (surface) { Name = name };
+
+			return layer;
+		}
+
+		public void CreateSelectionLayer ()
+		{
+			Layer old = selection_layer;
+
+			selection_layer = CreateLayer ();
+			selection_layer_index = current_layer + 1;
+
+			if (old != null)
+				(old.Surface as IDisposable).Dispose ();
+		}
+
+		// Delete the current layer
+		public void DeleteCurrentLayer ()
+		{
+			Layer layer = CurrentLayer;
+
+			Layers.RemoveAt (current_layer);
+
+			// Only change this if this wasn't already the bottom layer
+			if (current_layer > 0)
+				current_layer--;
+
+			layer.PropertyChanged -= RaiseLayerPropertyChangedEvent;
+
+			PintaCore.Layers.OnLayerRemoved ();
+		}
+
+		// Delete the layer
+		public void DeleteLayer (int index, bool dispose)
+		{
+			Layer layer = Layers[index];
+
+			Layers.RemoveAt (index);
+
+			if (dispose)
+				(layer.Surface as IDisposable).Dispose ();
+
+			// Only change this if this wasn't already the bottom layer
+			if (current_layer > 0)
+				current_layer--;
+
+			layer.PropertyChanged -= RaiseLayerPropertyChangedEvent;
+
+			PintaCore.Layers.OnLayerRemoved ();
+		}
+		
+		public void DestroySelectionLayer ()
+		{
+			ShowSelectionLayer = false;
+			SelectionLayer.Clear ();
+			SelectionLayer.Offset = new PointD (0, 0);
+		}
+
+		// Duplicate current layer
+		public Layer DuplicateCurrentLayer ()
+		{
+			Layer source = CurrentLayer;
+			Layer layer = CreateLayer (string.Format ("{0} {1}", source.Name, Catalog.GetString ("copy")));
+
+			using (Cairo.Context g = new Cairo.Context (layer.Surface)) {
+				g.SetSource (source.Surface);
+				g.Paint ();
+			}
+
+			layer.Hidden = source.Hidden;
+			layer.Opacity = source.Opacity;
+			layer.Tiled = source.Tiled;
+
+			Layers.Insert (++current_layer, layer);
+
+			layer.PropertyChanged += RaiseLayerPropertyChangedEvent;
+
+			PintaCore.Layers.OnLayerAdded ();
+
+			return layer;
+		}
+
+		public void FinishSelection ()
+		{
+			// We don't have an uncommitted layer, abort
+			if (!ShowSelectionLayer)
+				return;
+
+			FinishPixelsHistoryItem hist = new FinishPixelsHistoryItem ();
+			hist.TakeSnapshot ();
+
+			Layer layer = SelectionLayer;
+
+			using (Cairo.Context g = new Cairo.Context (CurrentLayer.Surface)) {
+				g.Save ();
+
+				g.SetSourceSurface (layer.Surface, (int)layer.Offset.X, (int)layer.Offset.Y);
+				g.PaintWithAlpha (layer.Opacity);
+
+				g.Restore ();
+			}
+
+			DestroySelectionLayer ();
+			Workspace.Invalidate ();
+
+			Workspace.History.PushNewItem (hist);
+		}
+		
+		// Flatten image
+		public void FlattenImage ()
+		{
+			if (Layers.Count < 2)
+				throw new InvalidOperationException ("Cannot flatten image because there is only one layer.");
+
+			Layer dest = Layers[0];
+
+			using (Cairo.Context g = new Cairo.Context (dest.Surface)) {
+				for (int i = 1; i < Layers.Count; i++) {
+					Layer source = Layers[i];
+					g.SetSource (source.Surface);
+					g.PaintWithAlpha (source.Opacity);
+				}
+			}
+
+			current_layer = 0;
+
+			while (Layers.Count > 1) {
+				Layer l = Layers[1];
+
+				Layers.RemoveAt (1);
+			}
+
+			PintaCore.Layers.OnLayerRemoved ();
+			Workspace.Invalidate ();
+		}
+
+		// Flip image horizontally
+		public void FlipImageHorizontal ()
+		{
+			foreach (var layer in Layers)
+				layer.FlipHorizontal ();
+
+			Workspace.Invalidate ();
+		}
+
+		// Flip image vertically
+		public void FlipImageVertical ()
+		{
+			foreach (var layer in Layers)
+				layer.FlipVertical ();
+
+			Workspace.Invalidate ();
+		}
+		
+		public ImageSurface GetClippedLayer (int index)
+		{
+			Cairo.ImageSurface surf = new Cairo.ImageSurface (Cairo.Format.Argb32, ImageSize.Width, ImageSize.Height);
+
+			using (Cairo.Context g = new Cairo.Context (surf)) {
+				g.AppendPath (SelectionPath);
+				g.Clip ();
+
+				g.SetSource (Layers[index].Surface);
+				g.Paint ();
+			}
+
+			return surf;
+		}
+
+		public ImageSurface GetFlattenedImage ()
+		{
+			Cairo.ImageSurface surf = new Cairo.ImageSurface (Cairo.Format.Argb32, ImageSize.Width, ImageSize.Height);
+
+			using (Cairo.Context g = new Cairo.Context (surf)) {
+				foreach (var layer in GetLayersToPaint ()) {
+					g.SetSource (layer.Surface);
+					g.PaintWithAlpha (layer.Opacity);
+				}
+			}
+
+			return surf;
+		}
+
+		public List<Layer> GetLayersToPaint ()
+		{
+			List<Layer> paint = new List<Layer> ();
+
+			foreach (var layer in Layers) {
+				if (!layer.Hidden)
+					paint.Add (layer);
+
+				if (layer == CurrentLayer) {
+					if (!tool_layer.Hidden)
+						paint.Add (tool_layer);
+
+					if (ShowSelectionLayer)
+						paint.Add (selection_layer);
+				}
+			}
+
+			return paint;
+		}
+
+		/// <param name="canvasOnly">false for the whole selection, true for the part only on our canvas</param>
+		public Gdk.Rectangle GetSelectedBounds (bool canvasOnly)
+		{
+			var bounds = SelectionPath.GetBounds ();
+
+			if (canvasOnly)
+				bounds = ClampToImageSize (bounds);
+
+			return bounds;
+		}
+
+		public int IndexOf (Layer layer)
+		{
+			return Layers.IndexOf (layer);
+		}
+
+		// Adds a new layer above the current one
+		public void Insert (Layer layer, int index)
+		{
+			Layers.Insert (index, layer);
+
+			if (Layers.Count == 1)
+				current_layer = 0;
+
+			layer.PropertyChanged += RaiseLayerPropertyChangedEvent;
+
+			PintaCore.Layers.OnLayerAdded ();
+		}
+		
+		// Flatten current layer
+		public void MergeCurrentLayerDown ()
+		{
+			if (current_layer == 0)
+				throw new InvalidOperationException ("Cannot flatten layer because current layer is the bottom layer.");
+
+			Layer source = CurrentLayer;
+			Layer dest = Layers[current_layer - 1];
+
+			using (Cairo.Context g = new Cairo.Context (dest.Surface)) {
+				g.SetSource (source.Surface);
+				g.PaintWithAlpha (source.Opacity);
+			}
+
+			DeleteCurrentLayer ();
+		}
+		
+		// Move current layer down
+		public void MoveCurrentLayerDown ()
+		{
+			if (current_layer == 0)
+				throw new InvalidOperationException ("Cannot move layer down because current layer is the bottom layer.");
+
+			Layer layer = CurrentLayer;
+			Layers.RemoveAt (current_layer);
+			Layers.Insert (--current_layer, layer);
+
+			PintaCore.Layers.OnSelectedLayerChanged ();
+
+			Workspace.Invalidate ();
+		}
+
+		// Move current layer up
+		public void MoveCurrentLayerUp ()
+		{
+			if (current_layer == Layers.Count)
+				throw new InvalidOperationException ("Cannot move layer up because current layer is the top layer.");
+
+			Layer layer = CurrentLayer;
+			Layers.RemoveAt (current_layer);
+			Layers.Insert (++current_layer, layer);
+
+			PintaCore.Layers.OnSelectedLayerChanged ();
+
+			Workspace.Invalidate ();
+		}
+		
+		public void ResetSelectionPath ()
+		{
+			Path old = SelectionPath;
+
+			using (Cairo.Context g = new Cairo.Context (selection_layer.Surface))
+				SelectionPath = g.CreateRectanglePath (new Cairo.Rectangle (0, 0, ImageSize.Width, ImageSize.Height));
+
+			if (old != null)
+				(old as IDisposable).Dispose ();
+
+			ShowSelection = false;
+		}
+
+		public void ResizeCanvas (int width, int height, Anchor anchor)
+		{
+			double scale;
+
+			if (ImageSize.Width == width && ImageSize.Height == height)
+				return;
+
+			PintaCore.Tools.Commit ();
+
+			ResizeHistoryItem hist = new ResizeHistoryItem (ImageSize);
+			hist.Icon = "Menu.Image.CanvasSize.png";
+			hist.Text = Catalog.GetString ("Resize Canvas");
+			hist.TakeSnapshotOfImage ();
+
+			scale = Workspace.Scale;
+
+			ImageSize = new Gdk.Size (width, height);
+
+			foreach (var layer in Layers)
+				layer.ResizeCanvas (width, height, anchor);
+
+			Workspace.History.PushNewItem (hist);
+
+			ResetSelectionPath ();
+
+			Workspace.Scale = scale;
+		}
+		
+		public void ResizeImage (int width, int height)
+		{
+			double scale;
+
+			if (ImageSize.Width == width && ImageSize.Height == height)
+				return;
+
+			PintaCore.Tools.Commit ();
+
+			ResizeHistoryItem hist = new ResizeHistoryItem (ImageSize);
+			hist.TakeSnapshotOfImage ();
+
+			scale = Workspace.Scale;
+
+			ImageSize = new Gdk.Size (width, height);
+
+			foreach (var layer in Layers)
+				layer.Resize (width, height);
+
+			Workspace.History.PushNewItem (hist);
+
+			ResetSelectionPath ();
+
+			Workspace.Scale = scale;
+		}
+		
+		// Rotate image 180 degrees (flip H+V)
+		public void RotateImage180 ()
+		{
+			RotateImage (180);
+		}
+
+		public void RotateImageCW ()
+		{
+			RotateImage (90);
+		}
+
+		public void RotateImageCCW ()
+		{
+			RotateImage (-90);
+		}
+
+		/// <summary>
+		/// Rotates the image by the specified angle (in degrees)
+		/// </summary>
+		private void RotateImage (double angle)
+		{
+			foreach (var layer in Layers)
+			{
+				layer.Rotate (angle);
+			}
+
+			ImageSize = Layer.RotateDimensions (ImageSize, angle);
+			Workspace.CanvasSize = Layer.RotateDimensions (Workspace.CanvasSize, angle);
+
+			PintaCore.Actions.View.UpdateCanvasScale ();
+			Workspace.Invalidate ();
+		}
+
+		// Returns true if successful, false if canceled
+		public bool Save (bool saveAs)
+		{
+			return PintaCore.Actions.File.RaiseSaveDocument (this, saveAs);
+		}
+
+		public void SetCurrentLayer (int i)
+		{
+			current_layer = i;
+
+			PintaCore.Layers.OnSelectedLayerChanged ();
+		}
+
+		public void SetCurrentLayer (Layer layer)
+		{
+			current_layer = Layers.IndexOf (layer);
+
+			PintaCore.Layers.OnSelectedLayerChanged ();
+		}
+		#endregion
+
+		#region Protected Methods
+		protected void OnIsDirtyChanged ()
+		{
+			if (IsDirtyChanged != null)
+				IsDirtyChanged (this, EventArgs.Empty);
+		}
+
+		protected void OnRenamed ()
+		{
+			if (Renamed != null)
+				Renamed (this, EventArgs.Empty);
+		}
+		#endregion
+
+		#region Private Methods
+		private void RaiseLayerPropertyChangedEvent (object sender, PropertyChangedEventArgs e)
+		{
+			PintaCore.Layers.RaiseLayerPropertyChangedEvent (sender, e);
+		}
+		#endregion
+
+		#region Public Events
+		public event EventHandler IsDirtyChanged;
+		public event EventHandler Renamed;
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Classes/DocumentWorkspace.cs'
--- Pinta.Core/Classes/DocumentWorkspace.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/DocumentWorkspace.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,273 @@
+//
+// DocumentWorkspace.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gdk;
+using Mono.Unix;
+
+namespace Pinta.Core
+{
+	public class DocumentWorkspace
+	{
+		private Document document;
+		private Size canvas_size;
+		private enum ZoomType
+		{
+			ZoomIn,
+			ZoomOut,
+			ZoomManually
+		}
+
+		internal DocumentWorkspace (Document document)
+		{
+			this.document = document;
+			History = new DocumentWorkspaceHistory (document, this);
+		}
+
+		#region Public Properties
+		public bool CanvasFitsInWindow {
+			get {
+				Gtk.Viewport view = (Gtk.Viewport)PintaCore.Chrome.Canvas.Parent;
+				
+				int window_x = view.Allocation.Width;
+				int window_y = view.Children[0].Allocation.Height;
+				
+				if (CanvasSize.Width <= window_x && CanvasSize.Height <= window_y)
+					return true;
+				
+				return false;
+			}
+		}
+
+		public Size CanvasSize {
+			get { return canvas_size; }
+			set {
+				if (canvas_size.Width != value.Width || canvas_size.Height != value.Height) {
+					canvas_size = value;
+					PintaCore.Workspace.OnCanvasSizeChanged ();
+				}
+			}
+		}
+
+		public DocumentWorkspaceHistory History { get; private set; }
+
+		public bool ImageFitsInWindow {
+			get {
+				Gtk.Viewport view = (Gtk.Viewport)PintaCore.Chrome.Canvas.Parent;
+				
+				int window_x = view.Allocation.Width;
+				int window_y = view.Children[0].Allocation.Height;
+				
+				if (document.ImageSize.Width <= window_x && document.ImageSize.Height <= window_y)
+					return true;
+				
+				return false;
+			}
+		}
+
+		public Cairo.PointD Offset {
+			get { return new Cairo.PointD ((PintaCore.Chrome.Canvas.Allocation.Width - canvas_size.Width) / 2, (PintaCore.Chrome.Canvas.Allocation.Height - canvas_size.Height) / 2); }
+		}
+
+		public double Scale {
+			get { return (double)CanvasSize.Width / (double)document.ImageSize.Width; }
+			set {
+				if (value != (double)CanvasSize.Width / (double)document.ImageSize.Width || value != (double)CanvasSize.Height / (double)document.ImageSize.Height) {
+					int new_x = Math.Max ((int)(document.ImageSize.Width * value), 1);
+					int new_y = Math.Max ((int)((new_x * document.ImageSize.Height) / document.ImageSize.Width), 1);
+
+					CanvasSize = new Gdk.Size (new_x, new_y);
+					Invalidate ();
+				}
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+		public void Invalidate ()
+		{
+			PintaCore.Workspace.OnCanvasInvalidated (new CanvasInvalidatedEventArgs ());
+		}
+
+		public void Invalidate (Gdk.Rectangle rect)
+		{
+			rect = new Gdk.Rectangle ((int)((rect.X) * Scale + Offset.X), (int)((rect.Y) * Scale + Offset.Y), (int)(rect.Width * Scale), (int)(rect.Height * Scale));
+			PintaCore.Workspace.OnCanvasInvalidated (new CanvasInvalidatedEventArgs (rect));
+		}
+
+		public bool PointInCanvas (Cairo.PointD point)
+		{
+			if (point.X < 0 || point.Y < 0)
+				return false;
+			
+			if (point.X >= document.ImageSize.Width || point.Y >= document.ImageSize.Height)
+				return false;
+			
+			return true;
+		}
+
+		public void RecenterView (double x, double y)
+		{
+			Gtk.Viewport view = (Gtk.Viewport)PintaCore.Chrome.Canvas.Parent;
+			
+			view.Hadjustment.Value = Utility.Clamp (x * Scale - view.Hadjustment.PageSize / 2, view.Hadjustment.Lower, view.Hadjustment.Upper);
+			view.Vadjustment.Value = Utility.Clamp (y * Scale - view.Vadjustment.PageSize / 2, view.Vadjustment.Lower, view.Vadjustment.Upper);
+		}
+
+		public void ScrollCanvas (int dx, int dy)
+		{
+			Gtk.Viewport view = (Gtk.Viewport)PintaCore.Chrome.Canvas.Parent;
+			
+			view.Hadjustment.Value = Utility.Clamp (dx + view.Hadjustment.Value, view.Hadjustment.Lower, view.Hadjustment.Upper - view.Hadjustment.PageSize);
+			view.Vadjustment.Value = Utility.Clamp (dy + view.Vadjustment.Value, view.Vadjustment.Lower, view.Vadjustment.Upper - view.Vadjustment.PageSize);
+		}
+
+		public Cairo.PointD WindowPointToCanvas (double x, double y)
+		{
+			return new Cairo.PointD (Math.Floor ((x - Offset.X) / PintaCore.Workspace.Scale), Math.Floor ((y - Offset.Y) / PintaCore.Workspace.Scale));
+		}
+
+		public void ZoomIn ()
+		{
+			ZoomAndRecenterView (ZoomType.ZoomIn, new Cairo.PointD (-1, -1)); // Zoom in relative to the center of the viewport.
+		}
+
+		public void ZoomOut ()
+		{
+			ZoomAndRecenterView (ZoomType.ZoomOut, new Cairo.PointD (-1, -1)); // Zoom out relative to the center of the viewport.
+		}
+
+		public void ZoomInFromMouseScroll (Cairo.PointD point)
+		{
+			ZoomAndRecenterView (ZoomType.ZoomIn, point); // Zoom in relative to mouse position.
+		}
+
+		public void ZoomOutFromMouseScroll (Cairo.PointD point)
+		{
+			ZoomAndRecenterView (ZoomType.ZoomOut, point); // Zoom out relative to mouse position.
+		}
+
+		public void ZoomManually ()
+		{
+			ZoomAndRecenterView (ZoomType.ZoomManually, new Cairo.PointD (-1, -1));
+		}
+
+		public void ZoomToRectangle (Cairo.Rectangle rect)
+		{
+			double ratio;
+			
+			if (document.ImageSize.Width / rect.Width <= document.ImageSize.Height / rect.Height)
+				ratio = document.ImageSize.Width / rect.Width;
+			else
+				ratio = document.ImageSize.Height / rect.Height;
+			
+			(PintaCore.Actions.View.ZoomComboBox.ComboBox as Gtk.ComboBoxEntry).Entry.Text = String.Format ("{0:F}%", ratio * 100.0);
+			Gtk.Main.Iteration (); //Force update of scrollbar upper before recenter
+			RecenterView (rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
+		}
+		#endregion
+
+		#region Private Methods
+		private void ZoomAndRecenterView (ZoomType zoomType, Cairo.PointD point)
+		{
+			if (zoomType == ZoomType.ZoomOut && (CanvasSize.Width == 1 || CanvasSize.Height ==1))
+				return; //Can't zoom in past a 1x1 px canvas
+
+			double zoom;
+			
+			if (!ViewActions.TryParsePercent (PintaCore.Actions.View.ZoomComboBox.ComboBox.ActiveText, out zoom))
+				zoom = Scale * 100;
+			
+			zoom = Math.Min (zoom, 3600);
+			
+			PintaCore.Chrome.Canvas.GdkWindow.FreezeUpdates ();
+			PintaCore.Actions.View.SuspendZoomUpdate ();
+			
+			Gtk.Viewport view = (Gtk.Viewport)PintaCore.Chrome.Canvas.Parent;
+			
+			bool adjustOnMousePosition = point.X >= 0.0 && point.Y >= 0.0;
+			
+			double center_x = adjustOnMousePosition ?
+				point.X : view.Hadjustment.Value + (view.Hadjustment.PageSize / 2.0);
+			double center_y = adjustOnMousePosition ?
+				point.Y : view.Vadjustment.Value + (view.Vadjustment.PageSize / 2.0);
+			
+			center_x = (center_x - Offset.X) / Scale;
+			center_y = (center_y - Offset.Y) / Scale;
+
+			if (zoomType == ZoomType.ZoomIn || zoomType == ZoomType.ZoomOut) {
+				int i = 0;
+				
+				Predicate<string> UpdateZoomLevel = zoomInList =>
+				{
+					switch (zoomType) {
+					case ZoomType.ZoomIn:
+						if (zoomInList == Catalog.GetString ("Window") || int.Parse (zoomInList.Trim ('%')) <= zoom) {
+							PintaCore.Actions.View.ZoomComboBox.ComboBox.Active = i - 1;
+							return true;
+						}
+						
+						break;
+					
+					case ZoomType.ZoomOut:
+						if (zoomInList == Catalog.GetString ("Window"))
+							return true;
+						
+						if (int.Parse (zoomInList.Trim ('%')) < zoom) {
+							PintaCore.Actions.View.ZoomComboBox.ComboBox.Active = i;
+							return true;
+						}
+						
+						break;
+					}
+					
+					return false;
+				};
+				
+				foreach (string item in PintaCore.Actions.View.ZoomCollection) {
+					if (UpdateZoomLevel (item))
+						break;
+					
+					i++;
+				}
+			}
+
+			PintaCore.Actions.View.UpdateCanvasScale ();
+			
+			// Quick fix : need to manually update Upper limit because the value is not changing after updating the canvas scale.
+			// TODO : I think there is an event need to be fired so that those values updated automatically.
+			view.Hadjustment.Upper = CanvasSize.Width < view.Hadjustment.PageSize ? view.Hadjustment.PageSize : CanvasSize.Width;
+			view.Vadjustment.Upper = CanvasSize.Height < view.Vadjustment.PageSize ? view.Vadjustment.PageSize : CanvasSize.Height;
+			
+			RecenterView (center_x, center_y);
+			
+			PintaCore.Actions.View.ResumeZoomUpdate ();
+			PintaCore.Chrome.Canvas.GdkWindow.ThawUpdates ();
+		}
+		#endregion
+	}
+}

=== added file 'Pinta.Core/Classes/DocumentWorkspaceHistory.cs'
--- Pinta.Core/Classes/DocumentWorkspaceHistory.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/DocumentWorkspaceHistory.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,172 @@
+// 
+// DocumentWorkspace.cs
+//  
+// Author:
+//       Jonathan Pobst <[e-mail]>
+// 
+// Copyright (c) 2010 Jonathan Pobst
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using Gtk;
+
+namespace Pinta.Core
+{
+	public class DocumentWorkspaceHistory
+	{
+		private Document document;
+		private DocumentWorkspace workspace;
+		List<BaseHistoryItem> history = new List<BaseHistoryItem> ();
+		int historyPointer = -1;
+
+		internal DocumentWorkspaceHistory (Document document, DocumentWorkspace workspace)
+		{
+			this.document = document;
+			this.workspace = workspace;
+			ListStore = new ListStore (typeof (BaseHistoryItem));
+		}
+
+		public Gtk.ListStore ListStore { get; private set; }
+		
+		public int Pointer {
+			get { return historyPointer; }
+		}
+		
+		public BaseHistoryItem Current {
+			get { 
+				if (historyPointer > -1 && historyPointer < history.Count)
+					return history[historyPointer]; 
+				else
+					return null;
+			}
+		}
+		
+		public void PushNewItem (BaseHistoryItem newItem)
+		{
+			
+			//Remove all old redos starting from the end of the list
+			for (int i = history.Count - 1; i >= 0; i--) {
+			
+				BaseHistoryItem item = history[i];
+				
+				if (item.State == HistoryItemState.Redo) {
+					history.RemoveAt(i);
+					item.Dispose();
+					//Remove from ListStore
+					ListStore.Remove (ref item.Id);
+					
+				} else if (item.State == HistoryItemState.Undo) {
+					break;
+				}
+			}
+		
+			//Add new undo to ListStore
+			newItem.Id = ListStore.AppendValues (newItem);
+			history.Add (newItem);
+			historyPointer = history.Count - 1;
+			
+			if (newItem.CausesDirty)
+				document.IsDirty = true;
+				
+			if (history.Count > 1) {
+				PintaCore.Actions.Edit.Undo.Sensitive = true;
+				CanUndo = true;
+			}
+				
+			PintaCore.Actions.Edit.Redo.Sensitive = false;
+			CanRedo = false;
+			PintaCore.History.OnHistoryItemAdded (newItem);
+		}
+		
+		public void Undo ()
+		{
+			// ensure that the current tool's modifications are added to the history first (e.g. editing text)
+			PintaCore.Tools.CurrentTool.DoCommit ();
+
+			if (historyPointer < 0) {
+				throw new InvalidOperationException ("Undo stack is empty");
+			} else {
+				BaseHistoryItem item = history[historyPointer];
+				item.Undo ();
+				item.State = HistoryItemState.Redo;
+				ListStore.SetValue (item.Id, 0, item);
+				history[historyPointer] = item;
+				historyPointer--;
+			}	
+			
+			if (historyPointer == 0) {
+				document.IsDirty = false;
+				PintaCore.Actions.Edit.Undo.Sensitive = false;
+				CanUndo = false;
+			}
+			
+			PintaCore.Actions.Edit.Redo.Sensitive = true;
+			CanRedo = true;
+			PintaCore.History.OnActionUndone ();
+		}
+		
+		public void Redo ()
+		{
+			if (historyPointer >= history.Count - 1)
+				throw new InvalidOperationException ("Redo stack is empty");
+
+			historyPointer++;
+			BaseHistoryItem item = history[historyPointer];
+			item.Redo ();
+			item.State = HistoryItemState.Undo;
+			ListStore.SetValue (item.Id, 0, item);
+			history[historyPointer] = item;
+
+			if (historyPointer == history.Count - 1) {
+				PintaCore.Actions.Edit.Redo.Sensitive = false;
+				CanRedo = false;
+			}
+				
+			if (item.CausesDirty)
+				document.IsDirty = true;
+
+			if (history.Count > 1) {
+				PintaCore.Actions.Edit.Undo.Sensitive = true;
+				CanUndo = true;
+			}
+
+			PintaCore.History.OnActionRedone ();
+		}
+		
+		public void Clear ()
+		{
+			history.ForEach (delegate(BaseHistoryItem item) { item.Dispose (); } );
+			history.Clear();	
+			ListStore.Clear ();	
+			historyPointer = -1;
+
+			document.IsDirty = false;
+			PintaCore.Actions.Edit.Redo.Sensitive = false;
+			PintaCore.Actions.Edit.Undo.Sensitive = false;
+			
+			CanRedo = false;
+			CanUndo = false;
+		}
+		
+		public bool CanRedo { get; private set; }
+		public bool CanUndo { get; private set; }
+	}
+}

=== added file 'Pinta.Core/Classes/GradientRenderer.cs'
--- Pinta.Core/Classes/GradientRenderer.cs	1970-01-01 00:00:00 +0000
+++ Pinta.Core/Classes/GradientRenderer.cs	2013-01-23 15:01:21 +0000
@@ -0,0 +1,229 @@
+/////////////////////////////////////////////////////////////////////////////////
+// Paint.NET                                                                   //
+// Copyright (C) dotPDN LLC, Rick Brewster, Tom Jackson, and contributors.     //
+// Portions Copyright (C) Microsoft Corporation. All Rights Reserved.          //
+// See license-pdn.txt for full licensing and attribution details.             //
+/////////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Cairo;
+using Rectangle = Gdk.Rectangle;
+
+namespace Pinta.Core
+{
+	public abstract class GradientRenderer
+	{
+		private BinaryPixelOp normalBlendOp;
+		private ColorBgra startColor;
+		private ColorBgra endColor;
+		private PointD startPoint;
+		private PointD endPoint;
+		private bool alphaBlending;
+		private bool alphaOnly;
+
+		private bool lerpCacheIsValid = false;
+		private byte[] lerpAlphas;
+		private ColorBgra[] lerpColors;
+
+		public ColorBgra StartColor {
+			get { return this.startColor; }
+
+			set {
+				if (this.startColor != value) {
+					this.startColor = value;
+					this.lerpCacheIsValid = false;
+				}
+			}
+		}
+
+		public ColorBgra EndColor {
+			get { return this.endColor; }
+
+			set {
+				if (this.endColor != value) {
+					this.endColor = value;
+					this.lerpCacheIsValid = false;
+				}
+			}
+		}
+
+		public PointD StartPoint {
+			get { return this.startPoint; }
+
+			set { this.startPoint = value; }
+		}
+
+		public PointD EndPoint {
+			get { return this.endPoint; }
+
+			set { this.endPoint = value; }
+		}
+
+		public bool AlphaBlending {
+			get { return this.alphaBlending; }
+
+			set { this.alphaBlending = value; }
+		}
+
+		public bool AlphaOnly {
+			get { return this.alphaOnly; }
+
+			set { this.alphaOnly = value; }
+		}
+
+		public virtual void BeforeRender ()
+		{
+			if (!this.lerpCacheIsValid) {
+				byte startAlpha;
+				byte endAlpha;
+				
+				if (this.alphaOnly) {
+					ComputeAlphaOnlyValuesFromColors (this.startColor, this.endColor, out startAlpha, out endAlpha);
+				} else {
+					startAlpha = this.startColor.A;
+					endAlpha = this.endColor.A;
+				}
+				
+				this.lerpAlphas = new byte[256];
+				this.lerpColors = new ColorBgra[256];
+				
+				for (int i = 0; i < 256; ++i) {
+					byte a = (byte)i;
+					this.lerpColors[a] = ColorBgra.Blend (this.startColor, this.endColor, a);
+					this.lerpAlphas[a] = (byte)(startAlpha + ((endAlpha - startAlpha) * a) / 255);
+				}
+				
+				this.lerpCacheIsValid = true;
+			}
+		}
+
+		public abstract byte ComputeByteLerp(int x, int y);
+
+		public virtual void AfterRender ()
+		{
+		}
+
+		private static void ComputeAlphaOnlyValuesFromColors (ColorBgra startColor, ColorBgra endColor, out byte startAlpha, out byte endAlpha)
+		{
+			startAlpha = startColor.A;
+			endAlpha = (byte)(255 - endColor.A);
+		}
+
+		unsafe public void Render (ImageSurface surface, Gdk.Rectangle[] rois)
+		{
+			byte startAlpha;
+			byte endAlpha;
+			
+			if (this.alphaOnly) {
+				ComputeAlphaOnlyValuesFromColors (this.startColor, this.endColor, out startAlpha, out endAlpha);
+			} else {
+				startAlpha = this.startColor.A;
+				endAlpha = this.endColor.A;
+			}
+			
+			surface.Flush ();
+			
+			ColorBgra* src_data_ptr = (ColorBgra*)surface.DataPtr;
+			int src_width = surface.Width;
+			
+			for (int ri = 0; ri < rois.Length; ++ri) {
+				Gdk.Rectangle rect = rois[ri];
+				
+				if (this.startPoint.X == this.endPoint.X && this.startPoint.Y == this.endPoint.Y) {
+					// Start and End point are the same ... fill with solid color.
+					for (int y = rect.Top; y < rect.Bottom; ++y) {
+						ColorBgra* pixelPtr = surface.GetPointAddress(rect.Left, y);
+						
+						for (int x = rect.Left; x < rect.Right; ++x) {
+							ColorBgra result;
+							
+							if (this.alphaOnly && this.alphaBlending) {
+								byte resultAlpha = (byte)Utility.FastDivideShortByByte ((ushort)(pixelPtr->A * endAlpha), 255);
+								result = *pixelPtr;
+								result.A = resultAlpha;
+							} else if (this.alphaOnly && !this.alphaBlending) {
+								result = *pixelPtr;