Merge lp:~ubuntu-branches/ubuntu/raring/labyrinth/raring-201211110411 into lp:ubuntu/raring/labyrinth

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/raring/labyrinth reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/labyrinth/raring-201211110411. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

13. By Andrew Starr-Bochicchio on 2012-11-11

Merge lp:~takluyver/ubuntu/raring/labyrinth/0.6

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2012-11-11 04:19:21 +0000
@@ -0,0 +1,3 @@
+*.pyc
+build/
+*.mo

=== renamed file '.gitignore' => '.gitignore.moved'
=== added directory '.tx'
=== renamed directory '.tx' => '.tx.moved'
=== added file '.tx/config'
--- .tx/config	1970-01-01 00:00:00 +0000
+++ .tx/config	2012-11-11 04:19:21 +0000
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[labyrinth.master]
+file_filter = po/<lang>.po
+source_file = po/labyrinth.pot
+source_lang = en
+type = PO

=== added file 'README.rst'
--- README.rst	1970-01-01 00:00:00 +0000
+++ README.rst	2012-11-11 04:19:21 +0000
@@ -0,0 +1,113 @@
+Labyrinth
+=========
+
+Labyrinth is a lightweight mind-mapping tool, written in Python using Gtk and
+Cairo to do the drawing.  It is intended to be as light and intuitive as
+possible, but still provide a wide range of powerful features.
+
+A mind-map is a diagram used to represent words, ideas, tasks or other items
+linked to and arranged radially around a central key word or idea. It is used
+to generate, visualise, structure and classify ideas, and as an aid in study,
+organisation, problem solving, and decision making. (From wikipedia)
+
+Currently, Labyrinth provides 3 different types of thoughts, or nodes - Text,
+Image and Drawing.  Text is the basic standard text node.  Images allow you to
+insert and scale any supported image file (png, jpeg, svg).  Drawings are for
+those times when you want to illustrate something, but don't want to fire up
+a separate drawing program.  It allows you to quickly and easily sketch very
+simple line diagrams.
+
+License
+-------
+
+This software is released under the GNU GPL v2 (or later) license.  All source
+files are included in this, unless explicitly stated in the source file itself.
+For copyright owners, please refer to the source files individually.
+
+The "labyrinth" icon (``data/labyrinth.svg`` and ``data/labyrinth-*.png``) is
+copyright Josef Vybíral and is released under the GNU GPL v2 license.
+
+Please refer to the "COPYING" file for a complete copy of the GNU GPL v2
+license.
+
+All documentation (This file, anything in the docs directory) released with
+this package is released as public domain.  The documentation, you can do with
+as you please.
+
+Requirements
+------------
+
+* Python >= 2.6
+* gtk+
+* pygtk
+* pygobject
+* pycairo
+* PyXDG
+
+The minimum required versions are unknown, but any reasonably recent packages
+should work.
+
+How to use it
+-------------
+
+From the top directory of the package, run the command::
+
+    ./labyrinth
+
+You can also install Labyrinth with ``python setup.py install``, and
+``./install_data_files.sh`` for icons and translations. It can then be run as
+``labyrinth``.
+
+This will open a browser window, showing you all the maps currently available
+and allow you to modify / delete them and create new maps.  The title is
+(currently) the primary thought text(truncated to 27 characters long).  This is
+usually the first thought created in a new map.
+
+In a new map, single click somewhere to create a new "thought".  This is your
+root.  Add your main thought to this.  Click somewhere else will create a new
+thought, linked to the first.  To move thoughts around, single-click and drag.
+To edit a current thought, double click on it (text thoughts only).
+
+Drawing and Image thoughts can be resized using their corners / sides.
+
+Links between thoughts can be created, strengthened and weakened.  To create a
+new link, in edit mode, click and drag from the "parent" thought to the "child"
+thought while holding down the ctrl key.  Doing this with a link already in
+place will strengthen the link by 1 and dragging from child to parent will
+weaken the link by 1.  If the link goes to 0 strength (it starts at 2),
+the link is deleted.  Links can also be created / deleted by selecting both
+thoughts (hold down the shift key to select > 1 thought) and choosing
+"Edit->(Un)Link Thoughts" from the menu (shortcut: Ctrl-L).
+
+Loading and saving of maps is in the tomboy style - they are automatically
+saved, you shouldn't have to worry about them.  For reference anyway, the maps
+are saved in ``~/.gnome2/labyrinth/<longstring>.map``.
+
+Future Plans
+------------
+
+In ``doc/TheFuture``, there are a list of goals for a 1.0 release and for the next
+release. Releases are feature-based at this stage. Once all the required
+features are in place, a release is made.
+
+However a release may also be made without all the changes if it is deemed
+that this is in the best interest.
+
+Getting the Latest Development Code
+-----------------------------------
+
+Development happens on Github. See https://github.com/labyrinth-team/labyrinth
+
+Helping Out and Questions
+-------------------------
+
+If you have any questions about Labyrinth or just want to be part of our gang,
+the mailing list address is [e-mail]
+
+If you want to help out with developing labyrinth, please let us know on the
+mailing list.  We aren't just looking for coders.  We're looking for packagers,
+artists, doc writers, interface designers, web developers, and just about
+anyone else.
+
+Translations now take place `on Transifex <https://www.transifex.com/projects/p/labyrinth/>`_.
+If you want to use Transifex in your language, it's very easy to get started.

=== renamed file 'README.rst' => 'README.rst.moved'
=== added file 'data/labyrinth.desktop'
--- data/labyrinth.desktop	1970-01-01 00:00:00 +0000
+++ data/labyrinth.desktop	2012-11-11 04:19:21 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Labyrinth Mind-mapping
+GenericName=Mind-mapping
+Comment=Map your mind
+Exec=labyrinth
+Icon=labyrinth
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;Office;

=== renamed file 'data/labyrinth.desktop' => 'data/labyrinth.desktop.moved'
=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-11-11 04:19:21 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added directory 'help'
=== renamed directory 'help' => 'help.moved'
=== added directory 'help/C'
=== added directory 'help/C/figures'
=== added file 'help/C/figures/lab_alignment.png'
Binary files help/C/figures/lab_alignment.png	1970-01-01 00:00:00 +0000 and help/C/figures/lab_alignment.png	2012-11-11 04:19:21 +0000 differ
=== added file 'help/C/figures/lab_browser_start.png'
Binary files help/C/figures/lab_browser_start.png	1970-01-01 00:00:00 +0000 and help/C/figures/lab_browser_start.png	2012-11-11 04:19:21 +0000 differ
=== added file 'help/C/figures/lab_map_start.png'
Binary files help/C/figures/lab_map_start.png	1970-01-01 00:00:00 +0000 and help/C/figures/lab_map_start.png	2012-11-11 04:19:21 +0000 differ
=== added file 'help/C/labyrinth.xml'
--- help/C/labyrinth.xml	1970-01-01 00:00:00 +0000
+++ help/C/labyrinth.xml	2012-11-11 04:19:21 +0000
@@ -0,0 +1,449 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+  <!ENTITY legal SYSTEM "legal.xml">
+  <!ENTITY appversion "0.5.0">
+  <!ENTITY manrevision "1.0">
+  <!ENTITY date "April 2008">
+  <!ENTITY app "<application>Labyrinth</application>">
+]>
+<!-- 
+      (Do not remove this comment block.)
+  Maintained by the GNOME Documentation Project
+  http://developer.gnome.org/projects/gdp
+  Template version: 2.0 beta
+  Template last modified Apr 11, 2002
+-->
+<!-- =============Document Header ============================= -->
+<article id="index" lang="en">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+  <articleinfo> 
+    <title>&app; Manual V&manrevision;</title>       
+
+    <copyright> 
+      <year>2008</year> 
+      <holder>Matthias Vogelgesang</holder> 
+    </copyright> 
+<!-- translators: uncomment this:
+
+  <copyright>
+   <year>2002</year>
+   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+  </copyright>
+
+   -->
+<!-- An address can be added to the publisher information.  If a role is 
+     not specified, the publisher/author is the same for all versions of the 
+     document.  -->
+    <publisher> 
+      <publishername> GNOME Documentation Project </publishername> 
+    </publisher> 
+
+   &legal;
+   <!-- This file  contains link to license for the documentation (GNU FDL), and 
+        other legal stuff such as "NO WARRANTY" statement. Please do not change 
+	any of this. -->
+
+    <authorgroup> 
+      <author> 
+		<firstname>Documentation</firstname> 
+		<surname>Writer 2</surname> 
+		<affiliation> 
+	  		<orgname>GNOME Documentation Project</orgname> 
+	  		<address> <email>[e-mail]</email> </address> 
+		</affiliation> 
+      </author> 
+      <author> 
+		<firstname>Documentation</firstname> 
+		<surname>Writer 1</surname> 
+		<affiliation> 
+	  		<orgname>GNOME Documentation Project</orgname> 
+	  		<address> <email>[e-mail]</email> </address> 
+		</affiliation> 
+      </author> 
+      
+<!-- This is appropriate place for other contributors: translators,
+     maintainers,  etc. Commented out by default.
+     
+      <othercredit role="translator">
+		<firstname>Latin</firstname> 
+		<surname>Translator 1</surname> 
+		<affiliation> 
+	  		<orgname>Latin Translation Team</orgname> 
+	  		<address> <email>[e-mail]</email> </address> 
+		</affiliation>
+		<contrib>Latin translation</contrib>
+      </othercredit>
+-->
+    </authorgroup>
+
+
+<!-- According to GNU FDL, revision history is mandatory if you are -->
+<!-- modifying/reusing someone else's document.  If not, you can omit it. -->
+<!-- Remember to remove the &manrevision; entity from the revision entries other
+-->
+<!-- than the current revision. -->
+<!-- The revision numbering system for GNOME manuals is as follows: -->
+<!-- * the revision number consists of two components -->
+<!-- * the first component of the revision number reflects the release version of the GNOME desktop. -->
+<!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. -->
+<!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
+<!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
+<!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
+<!-- to V3.0, and so on. -->  
+    <releaseinfo>This manual describes version &appversion; of Labyrinth
+    </releaseinfo> 
+    <legalnotice> 
+      <title>Feedback</title> 
+      <para>To report a bug or make a suggestion regarding the &app; application or
+      this manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
+	  type="help">GNOME Feedback Page</ulink>. 
+      </para>
+<!-- Translators may also add here feedback address for translations -->
+    </legalnotice> 
+  </articleinfo> 
+
+  <indexterm zone="index"> 
+    <primary>MY-GNOME-APP</primary> 
+  </indexterm> 
+  <indexterm zone="index"> 
+    <primary>mygnomeapp</primary> 
+  </indexterm>
+
+<!-- ============= Document Body ============================= -->
+<!-- ============= Introduction ============================== -->
+  <sect1 id="myapp-introduction"> 
+    <title>Introduction</title> 
+    <para>&app; is a light-weight mind-mapping tool to structure one's thoughts.
+    &app; provides the following features:</para> 
+    <itemizedlist> 
+      <listitem> 
+		<para>Export maps as:</para> 
+		<itemizedlist> 
+	  		<listitem> 
+	    	<para>PDF - Portable Document Format</para> 
+	  		</listitem> 
+	  		<listitem> 
+	    	<para>SVG - Scalable Vector Graphics</para> 
+	  		</listitem> 
+	  		<listitem> 
+	    	<para>JPEG - Joint Photographic Experts Group</para> 
+	  		</listitem> 
+	  		<listitem> 
+	    	<para>PNG - Portable Network Graphics </para> 
+	  		</listitem> 
+		</itemizedlist> 
+      </listitem> 
+    </itemizedlist> 
+  </sect1>
+
+<!-- =========== Getting Started ============================== -->
+  <sect1 id="myapp-getting-started"> 
+    <title>Getting Started</title> 
+
+    <sect2 id="myapp-start">
+    <title>To Start &app;</title>
+    <para>You can start <application>&app;</application> in the following ways:
+    </para> 
+    <variablelist>
+    	<varlistentry>
+    		<term><guimenu>Applications</guimenu> menu</term>
+    		<listitem>
+    		<para>Choose 
+    		<menuchoice>
+    		<guisubmenu>Office</guisubmenu>
+    		<guimenuitem>Labyrinth</guimenuitem>
+    		</menuchoice>. </para>
+    		</listitem>
+    	</varlistentry>
+    	<varlistentry>
+    		<term>Command line</term>
+    		<listitem>
+    		<para>To start <application>&app;</application> from a command line, type the following command, 
+    		then press <keycap>Return</keycap>:</para>
+    		<para> 
+			<command>labyrinth</command>
+    		</para>
+    		</listitem>
+    	</varlistentry>
+    </variablelist>
+    </sect2>
+
+    <sect2 id="myapp-when-start">
+    <title>When You Start &app;</title>
+    <para>When you start <application>&app;</application>, the following window is displayed.</para>
+
+    <!-- ==== Figure ==== -->
+    <figure id="browserwindow-fig"> 
+	<title>&app; Start Up Window</title> 
+	<screenshot> 
+	  <mediaobject> 
+	    <imageobject><imagedata
+		fileref="figures/lab_browser_start.png" format="PNG"/> 
+	    </imageobject>
+	    <!-- EPS versions of the figures are not required at the moment. -->
+            <!-- 
+		    <imageobject>
+      		<imagedata fileref="figures/image.eps" format="EPS"/>
+    		    </imageobject>
+	    -->
+	    <textobject> 
+	      <phrase>Shows &app; browser window. Contains titlebar, menubar, toolbar and the map list area. Menubar contains File and Help menus.</phrase> 
+	    </textobject> 
+	  </mediaobject> 
+	</screenshot> 
+      </figure>
+    <!-- ==== End of Figure ==== -->
+
+    <!-- Include any descriptions of the GUI immediately after the screenshot of the main UI, -->
+    <!-- for example, the items on the menubar and on the toolbar. This section is optional. -->
+
+    <para>The &app; browser window contains the following elements:
+    </para>
+      <variablelist>
+	<varlistentry>
+	<term>Menubar. </term>
+	<listitem>
+	<para>The menus on the menubar contain all of the commands you need to work with files in 
+	<application>&app;</application>.</para>
+	</listitem>
+	</varlistentry>
+	<varlistentry>
+	<term>Toolbar. </term>
+	<listitem>
+	<para> The toolbar contains a subset of the commands that you can access from the menubar.</para>
+	</listitem>
+	</varlistentry>
+	</variablelist>
+    </sect2>
+  </sect1>
+<!-- ================ Usage ================================ -->
+<!-- Use this section to describe how to use the application to perform the tasks for 
+  which the application is designed. -->
+  <sect1 id="myapp-usage"> 
+    <title>Basic Usage</title> 
+    <para>You can use the &app; application to perform the following tasks:</para>
+    <!-- ================ Usage Subsection ================================ -->
+    <sect2 id="labyrinth-new-map"> 
+      <title>To Create a new Map</title> 
+      <para>To create a new map, choose 
+	<menuchoice> 
+	  <guimenu>File</guimenu> 
+	  <guimenuitem>New</guimenuitem> 
+	</menuchoice> or click on <guimenuitem>New</guimenuitem> from the toolbar. A
+	new empty map window appears:
+	</para>
+	<screenshot> 
+	  <mediaobject> 
+	    <imageobject><imagedata
+		fileref="figures/lab_map_start.png" format="PNG"/> 
+	    </imageobject>
+	    <textobject> 
+	      <phrase>Shows &app; map window. Contains titlebar, menubar, toolbar and the map canvas area. Menubar contains File, Edit, View and Mode menus.</phrase> 
+	    </textobject> 
+	  </mediaobject> 
+	</screenshot> 
+	</sect2>
+    <!-- ================ Usage Subsection ================================ -->
+	 <sect2 id="labyrinth-manipulate-view"> 
+      <title>To Manipulate the View of the Map</title> 
+      <para>You can use the following methods to resize the view of the Map in
+	the &app; window:</para> 
+      <itemizedlist> 
+	<listitem> 
+	  <para>To enlarge the view, choose
+	    <menuchoice> 
+	      <guimenu>View</guimenu> 
+	      <guimenuitem>Zoom In</guimenuitem> 
+	    </menuchoice>.</para> 
+	</listitem> 
+	<listitem> 
+	  <para>To shrink the view, choose 
+	    <menuchoice> 
+	      <guimenu>View</guimenu> 
+	      <guimenuitem>Zoom Out</guimenuitem> 
+	    </menuchoice>.</para> 
+	</listitem> 
+      </itemizedlist>
+     <para>To move the map around you have several options:</para>
+     	<itemizedlist>
+     		<listitem><para>Use the scroll arrows around the white canvas.</para></listitem>
+     		<listitem><para>Hold the middle button of your mouse and move the
+     			canvas while still holding the button.</para></listitem>
+     	</itemizedlist>
+    </sect2> 
+    <!-- ================ Usage Subsection ================================ -->
+    <sect2 id="labyrinth-export"> 
+      <title>To Export a Map</title> 
+      <para>To export the map, you can use the following methods:</para> 
+      <itemizedlist> 
+	<listitem> 
+	  <para>To export the map for further loading, choose
+	  	<menuchoice>
+	  		<guimenu>File</guimenu>
+	  		<guimenuitem>Export Map...</guimenuitem>
+	  	</menuchoice>.</para> 
+	</listitem> 
+	<listitem> 
+	  <para>To export the map as an image, choose
+  	  	<menuchoice>
+	  		<guimenu>File</guimenu>
+	  		<guimenuitem>Export as Image</guimenuitem>
+	  	</menuchoice> and use the file dialog to choose the format you would like
+	  	to save the map and an appropriate file name. At the time of writing you
+	  	can export the map as PDF, SVG, PNG and JPG.</para> 
+	</listitem> 
+      </itemizedlist>
+    <tip><para>Use a vector format like PDF or SVG for high quality printing purposes and
+    	a bitmap format like PNG or JPG for the web.</para></tip>
+    </sect2>
+  </sect1>
+  
+  <sect1 id="labyrinth-work">
+  	<title>Working with the Map</title>
+  	<para>The most common work you will do with &app; are:</para>
+
+
+	<sect2 id="labyrinth-create-thoughts">
+		<title>To Create a Thought</title>
+		<para>In &app; a thought can be:</para>
+		<itemizedlist>
+			<listitem><para>Pure Text</para></listitem>
+			<listitem><para>An Image</para></listitem>
+			<listitem><para>A Drawing</para></listitem>
+			<listitem><para>A Resource like an URL</para></listitem>
+		</itemizedlist>
+		<para>What you are going to create depends on the mode that is activated.
+		The most common mode is the Edit Mode which can be activated by choosing
+		<menuchoice><guimenu>Mode</guimenu><guimenuitem>Edit Mode</guimenuitem></menuchoice>.
+		By clicking anywhere on the white map you create a new thought. You then
+		have to type some text which you can further <link linkend="labyrinth-format-thoughts">format</link> for your thought.</para>
+		
+		<para>An image thought is created in Image Mode which can be activated by
+		choosing <menuchoice><guimenu>Mode</guimenu><guimenuitem>Add Image</guimenuitem></menuchoice>.
+		After creating the thought a dialog pops up asking for the image to load.</para>
+		
+		<para>In Drawing Mode (choose <menuchoice><guimenu>Mode</guimenu>
+			<guimenuitem>Drawing Mode</guimenuitem></menuchoice>.) you can freely
+			make some sketches by dragging the mouse over the canvas.</para>
+			
+		<para>A resource thought can be added by choosing <menuchoice><guimenu>Mode</guimenu>
+			<guimenuitem>Add Resource</guimenuitem></menuchoice>. If you click
+			somewhere on the map you are asked to enter a URL and can then proceed
+			to edit the thought's text. If you double-click on a created
+			resource thought the URL is loaded in a webbrowser.</para>
+	</sect2>
+	
+	<sect2 id="labyrinth-manipulate-thoughts">
+		<title>To Manipulate Thoughts</title>
+		<para>Selecting a thought for moving or <link linkend="labyrinth-align-thoughts">alignment</link> 
+			can be done by:</para>
+	  	<itemizedlist> 
+		<listitem><para>Clicking on individual thoughts</para></listitem>
+		<listitem><para>Shift-Clicking to select more than one thought</para></listitem>
+		<listitem><para>Using a selection box by holding the <mousebutton>left</mousebutton> mouse button and dragging
+		  	the mouse while holding that button.</para></listitem>
+		</itemizedlist>
+		<para>Selected thoughts can be moved around by left-dragging them with
+			the mouse and <link linkend="labyrinth-format-thoughts">formatted</link> all at once.</para>.
+	</sect2>
+	
+	<sect2 id="labyrinth-working-with-links">
+		<title>Working with Links</title>
+		<para>Links are created automatically between a selected parent thought and a newly
+			created thought. If there is no thought selected, a connection is made between
+			the last selected - as a last resort the root - and the new thought. You can
+			create new links between existing thoughts by choosing 
+			<menuchoice><guimenu>Edit</guimenu><guimenuitem>Link Thoughts</guimenuitem></menuchoice> or
+			pressing <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo>.</para>
+		<para>A link can be strengthened or weakened by selecting it with the <mousebutton>left</mousebutton>
+			mouse button and using <keycap>+</keycap> respectively <keycap>-</keycap>. The strength
+			of a link is visualised by the thickness of the line. A link with a strength of
+			zero is automatically deleted.</para>
+		<tip><para>You can customize the look of the links by choosing either
+			<menuchoice><guimenu>View</guimenu><guimenuitem>Use Curves</guimenuitem></menuchoice> for
+			curved links or
+			<menuchoice><guimenu>View</guimenu><guimenuitem>Use Lines</guimenuitem></menuchoice> for
+			straight lined links.</para></tip>
+	</sect2>
+	
+	<sect2 id="labyrinth-format-thoughts">
+		<title>Format a Thought's Text</title>
+		<para>A text and a resource thought can be formatted by using the tools of the lower
+			format toolbar. For editing a thoughts text either:</para>
+		<itemizedlist>
+			<listitem><para>Double-Click on a text thought</para></listitem>
+			<listitem><para>Use <menuchoice><guimenu>context menu</guimenu>
+				<guimenuitem>Edit Text</guimenuitem></menuchoice></para></listitem>
+		</itemizedlist>
+		<para>You can then mark text by:</para>
+		<itemizedlist>
+			<listitem><para>Double-Click on text to select all</para></listitem>
+			<listitem><para>Press <shortcut><keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo></shortcut>
+				to select all</para></listitem>
+			<listitem><para>Drag the mouse to select parts of the text</para></listitem>
+		</itemizedlist>
+		<para>Now you are able to format the selected text just like in a word processor.
+		You can use the tools in the lower toolbar to change:</para>
+		<itemizedlist>
+			<listitem><para>characters to bold letters</para></listitem>
+			<listitem><para>characters to italized letters</para></listitem>
+			<listitem><para>characters to underlined letter</para></listitem>
+			<listitem><para>the font of the letters</para></listitem>
+			<listitem><para>the letter's color</para></listitem>
+			<listitem><para>the background's color</para></listitem>
+		</itemizedlist>
+	</sect2>
+	<sect2 id="labyrinth-align-thoughts">
+		<title>Align Thoughts</title>
+		<para>In order to organize your maps you can align the 
+		<link linkend="labyrinth-manipulate-thoughts">selected</link> thoughts
+			on your map by using the alignment tools in the lower toolbar:</para>
+		<screenshot> 
+		  <mediaobject> 
+			<imageobject><imagedata
+			fileref="figures/lab_alignment.png" format="PNG"/> 
+			</imageobject>
+			<textobject> 
+			  <phrase>Shows &app; alignment window containing tools for aligning vertically,
+			  	horizontally and all four edges.</phrase> 
+			</textobject> 
+		  </mediaobject> 
+		</screenshot>
+		<note><para>All thoughts are aligned to the first selected thought.</para></note>
+	</sect2>
+  </sect1>
+<!-- ============= Bugs ================================== -->
+<!-- This section is optional and is commented out by default. 
+     You can use it to describe known bugs and limitations of the 
+	  program if there are any - please be frank and list all
+     problems you know of. 
+  
+  <sect1 id="mayapp-bugs">
+  <title>Known Bugs and Limitations</title>
+  <para> </para>
+ </sect1>
+-->
+<!-- ============= About ================================== -->
+  <sect1 id="myapp-about"> 
+    <title>About &app;</title> 
+    <para> &app; was written by Don Scorgio, Martin Schaaf and Matthias Vogelgesang.
+    	To find more information about &app;, please visit the 
+      <ulink url="http://www.gnome.org/~dscorgie/labyrinth.html" type="http">Labyrinth Web
+	page</ulink>. </para>
+    <para>
+      To report a bug or make a suggestion regarding this application or
+      this manual, follow the directions in this 
+      <ulink url="ghelp:gnome-feedback" type="help">document</ulink>.
+    </para>
+
+    <para> This program is distributed under the terms of the GNU
+      General Public license as published by the Free Software
+      Foundation; either version 2 of the License, or (at your option)
+      any later version. A copy of this license can be found at this
+      <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+      COPYING included with the source code of this program. </para>
+
+  </sect1> 
+</article>

=== added file 'help/C/legal.xml'
--- help/C/legal.xml	1970-01-01 00:00:00 +0000
+++ help/C/legal.xml	2012-11-11 04:19:21 +0000
@@ -0,0 +1,76 @@
+  <legalnotice id="legalnotice">
+	<para>
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
+	  a copy of the GFDL at this <ulink type="help"
+	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+	  distributed with this manual.
+         </para>
+         <para> This manual is part of a collection of GNOME manuals
+          distributed under the GFDL.  If you want to distribute this
+          manual separately from the collection, you can do so by
+          adding a copy of the license to the manual, as described in
+          section 6 of the license.
+	</para>
+
+	<para>
+	  Many of the names used by companies to distinguish their
+	  products and services are claimed as trademarks. Where those
+	  names appear in any GNOME documentation, and the members of
+	  the GNOME Documentation Project are made aware of those
+	  trademarks, then the names are in capital letters or initial
+	  capital letters.
+	</para>
+
+	<para>
+	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+	  WITH THE FURTHER UNDERSTANDING THAT:
+
+	  <orderedlist>
+		<listitem>
+		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+                    EXCEPT UNDER THIS DISCLAIMER; AND
+		  </para>
+		</listitem>
+		<listitem>
+		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+                       THE POSSIBILITY OF SUCH DAMAGES.
+		  </para>
+		</listitem>
+	  </orderedlist>
+	</para>
+  </legalnotice>
+

=== added file 'help/ChangeLog'
=== added file 'help/Makefile.am'
--- help/Makefile.am	1970-01-01 00:00:00 +0000
+++ help/Makefile.am	2012-11-11 04:19:21 +0000
@@ -0,0 +1,11 @@
+include $(top_srcdir)/gnome-doc-utils.make
+
+DOC_LINGUAS = de
+
+DOC_MODULE = labyrinth
+
+DOC_ENTITIES = \
+	legal.xml
+
+dist-hook: doc-dist-hook
+

=== added directory 'help/de'
=== added file 'help/de/de.po'
--- help/de/de.po	1970-01-01 00:00:00 +0000
+++ help/de/de.po	2012-11-11 04:19:21 +0000
@@ -0,0 +1,327 @@
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Labyrinth 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-12 00:12+0200\n"
+"PO-Revision-Date: 2008-05-12 00:17+0200\n"
+"Last-Translator: Matthias Vogelgesang <[e-mail]>\n"
+"Language-Team: Project-Id-Version: gtranslator 1.1.5"
+"Report-Msgid-Bugs-To: "
+"POT-Creation-Date: 2004-08-31 20:57+0200"
+"PO-Revision-Date: 2004-08-31 20:58+0200"
+"Last-Translator: Hendrik Brandt <[e-mail]>"
+"Language-Team: German <[e-mail]>"
+"MIME-Version: 1.0"
+"Content-Type: text/plain; charset=UTF-8"
+"Content-Transfer-Encoding: 8bit"
+"Plural-Forms: nplurals=2; plural=(n != 1); <Project-Id-Version: gtranslator 1.1.5"
+"Report-Msgid-Bugs-To: "
+"POT-Creation-Date: 2004-08-31 20:57+0200"
+"PO-Revision-Date: 2004-08-31 20:58+0200"
+"Last-Translator: Hendrik Brandt <[e-mail]>"
+"Language-Team: German <[e-mail]>"
+"MIME-Version: 1.0"
+"Content-Type: text/plain; charset=UTF-8"
+"Content-Transfer-Encoding: 8bit"
+"Plural-Forms: nplurals=2; plural=(n != 1);>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: labyrinth.xml:206(None) 
+msgid "@@image: 'figures/myapp_start_window.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#: labyrinth.xml:22(title) 
+msgid "<application>Labyrinth</application> Manual V1.0"
+msgstr "<application>Labyrinth</application> Manual V1.0"
+
+#: labyrinth.xml:25(year) 
+msgid "2008"
+msgstr "2008"
+
+#: labyrinth.xml:26(holder) 
+msgid "Matthias Vogelgesang"
+msgstr "Matthias Vogelgesang"
+
+#: labyrinth.xml:40(publishername) labyrinth.xml:53(orgname) labyrinth.xml:61(orgname) labyrinth.xml:103(para) labyrinth.xml:113(para) 
+msgid "GNOME Documentation Project"
+msgstr ""
+
+#: labyrinth.xml:50(firstname) labyrinth.xml:58(firstname) 
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: labyrinth.xml:51(surname) 
+msgid "Writer 2"
+msgstr ""
+
+#: labyrinth.xml:54(email) 
+msgid "[e-mail]"
+msgstr ""
+
+#: labyrinth.xml:59(surname) 
+msgid "Writer 1"
+msgstr ""
+
+#: labyrinth.xml:62(email) 
+msgid "[e-mail]"
+msgstr ""
+
+#: labyrinth.xml:97(revnumber) 
+msgid "Labyrinth Manual V1.0"
+msgstr "Labyrinth Manual V1.0"
+
+#: labyrinth.xml:100(para) 
+msgid "Documentation Writer 2 <email>[e-mail]</email>"
+msgstr ""
+
+#: labyrinth.xml:107(revnumber) 
+msgid "Full title of previous manual."
+msgstr ""
+
+#: labyrinth.xml:108(date) 
+msgid "Release date of previous manual."
+msgstr ""
+
+#: labyrinth.xml:110(para) 
+msgid "Documentation Writer 1 <email>[e-mail]</email>"
+msgstr ""
+
+#: labyrinth.xml:118(releaseinfo) 
+msgid "This manual describes version 0.5.0 of Labyrinth"
+msgstr "Dieses Manual beschreibt Labyrinth Version 0.5.0"
+
+#: labyrinth.xml:121(title) 
+msgid "Feedback"
+msgstr ""
+
+#: labyrinth.xml:122(para) 
+msgid "To report a bug or make a suggestion regarding the <application>Labyrinth</application> application or this manual, follow the directions in the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr ""
+
+#: labyrinth.xml:131(primary) 
+msgid "MY-GNOME-APP"
+msgstr ""
+
+#: labyrinth.xml:134(primary) 
+msgid "mygnomeapp"
+msgstr ""
+
+#: labyrinth.xml:140(title) 
+msgid "Introduction"
+msgstr ""
+
+#: labyrinth.xml:141(para) 
+msgid "<application>Labyrinth</application> is a light-weight mind-mapping tool to structure one's thoughts. <application>Labyrinth</application> provides the following features:"
+msgstr ""
+
+#: labyrinth.xml:145(para) 
+msgid "Export maps as:"
+msgstr "Exportiert Maps als:"
+
+#: labyrinth.xml:148(para) 
+msgid "PDF - Portable Document Format"
+msgstr "PDF - Portable Document Format"
+
+#: labyrinth.xml:151(para) 
+msgid "SVG - Scalable Vector Graphics"
+msgstr "SVG - Scalable Vector Graphics"
+
+#: labyrinth.xml:154(para) 
+msgid "JPEG - Joint Photographic Experts Group"
+msgstr "JPEG - Joint Photographic Experts Group"
+
+#: labyrinth.xml:157(para) 
+msgid "PNG - Portable Network Graphics"
+msgstr "PNG - Portable Network Graphics"
+
+#: labyrinth.xml:166(title) 
+msgid "Getting Started"
+msgstr ""
+
+#: labyrinth.xml:169(title) 
+msgid "To Start <application>Labyrinth</application>"
+msgstr "<application>Labyrinth</application> starten"
+
+#: labyrinth.xml:170(para) 
+msgid "You can start <application><application>Labyrinth</application></application> in the following ways:"
+msgstr ""
+
+#: labyrinth.xml:174(term) 
+msgid "<guimenu>Applications</guimenu> menu"
+msgstr ""
+
+#: labyrinth.xml:176(para) 
+msgid "Choose <menuchoice><guisubmenu>Office</guisubmenu><guimenuitem>Labyrinth</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:184(term) 
+msgid "Command line"
+msgstr ""
+
+#: labyrinth.xml:186(para) 
+msgid "To start <application><application>Labyrinth</application></application> from a command line, type the following command, then press <keycap>Return</keycap>:"
+msgstr ""
+
+#: labyrinth.xml:189(command) 
+msgid "labyrinth"
+msgstr ""
+
+#: labyrinth.xml:197(title) 
+msgid "When You Start <application>Labyrinth</application>"
+msgstr ""
+
+#: labyrinth.xml:198(para) 
+msgid "When you start <application><application>Labyrinth</application></application>, the following window is displayed."
+msgstr ""
+
+#: labyrinth.xml:202(title) 
+msgid "<application>Labyrinth</application> Start Up Window"
+msgstr ""
+
+#: labyrinth.xml:215(phrase) 
+msgid "Shows <application>Labyrinth</application> main window. Contains titlebar, menubar, toolbar, display area, and scrollbars. Menubar contains File, View, Settings, and Help menus."
+msgstr ""
+
+#. for example, the items on the menubar and on the toolbar. This section is optional.
+#: labyrinth.xml:226(para) 
+msgid "The <application>Labyrinth</application> browser window contains the following elements:"
+msgstr ""
+
+#: labyrinth.xml:230(term) 
+msgid "Menubar."
+msgstr ""
+
+#: labyrinth.xml:232(para) 
+msgid "The menus on the menubar contain all of the commands you need to work with files in <application><application>Labyrinth</application></application>."
+msgstr ""
+
+#: labyrinth.xml:237(term) 
+msgid "Toolbar."
+msgstr ""
+
+#: labyrinth.xml:239(para) 
+msgid "The toolbar contains a subset of the commands that you can access from the menubar."
+msgstr ""
+
+#: labyrinth.xml:249(title) 
+msgid "Usage"
+msgstr ""
+
+#: labyrinth.xml:250(para) 
+msgid "You can use the <application>Labyrinth</application> application to perform the following tasks: <placeholder-1/>"
+msgstr ""
+
+#: labyrinth.xml:272(title) 
+msgid "To Open an Image"
+msgstr ""
+
+#: labyrinth.xml:273(para) 
+msgid "To open an image, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open Image</guimenuitem></menuchoice>. The <guilabel>Open Image</guilabel> dialog is displayed. Select the file that you want to open, then click <guibutton>OK</guibutton>. To open another image in a new window, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create New Window</guimenuitem></menuchoice>. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open Image</guimenuitem></menuchoice> to select the file that you want to open. You can also drag an image from another application such as a file manager to the <application>Labyrinth</application> window. If the <application>Labyrinth</application> window is empty, the application displays the image in the window. If the window is not empty, the application starts a new window to display the file. The application displays the name of the image file and the size of the image in pixels in the titlebar of the window."
+msgstr ""
+
+#: labyrinth.xml:297(para) 
+msgid "If you try to open an image file format that <application>Labyrinth</application> does not recognize, the application displays an error message."
+msgstr ""
+
+#: labyrinth.xml:303(para) 
+msgid "This is a caution."
+msgstr ""
+
+#: labyrinth.xml:308(title) 
+msgid "To Manipulate the View of an Image"
+msgstr ""
+
+#: labyrinth.xml:309(para) 
+msgid "You can use the following methods to resize the view of an image in the <application>Labyrinth</application> window:"
+msgstr ""
+
+#: labyrinth.xml:313(para) 
+msgid "To enlarge the view of an image, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Zoom In</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:320(para) 
+msgid "To shrink the view of an image, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Zoom Out</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:327(para) 
+msgid "To view the image at its actual size, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Zoom 1:1</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:334(para) 
+msgid "To enlarge or shrink the view of an image so that the image fits the <application>Labyrinth</application> window, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Fit to Window</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:342(para) 
+msgid "To enlarge or shrink the image to a specific zoom factor, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Zoom factor</guimenuitem></menuchoice>, then choose the appropriate zoom factor from the drop-down list."
+msgstr ""
+
+#: labyrinth.xml:351(para) 
+msgid "To display the image in full screen mode, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Full Screen</guimenuitem></menuchoice>. Full screen mode displays the image in a window that fills the full screen. The window does not contain a window frame, titlebar, menubar, or toolbar. To exit from this mode, press the <keycap>Esc</keycap> key or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>."
+msgstr ""
+
+#: labyrinth.xml:368(para) 
+msgid "This is a tip."
+msgstr ""
+
+#: labyrinth.xml:373(title) 
+msgid "To Scroll an Image"
+msgstr ""
+
+#: labyrinth.xml:374(para) 
+msgid "To scroll around an image that is larger than the image window or full screen window, you can use the following methods:"
+msgstr ""
+
+#: labyrinth.xml:378(para) 
+msgid "Use the arrow keys on the keyboard."
+msgstr ""
+
+#: labyrinth.xml:381(para) 
+msgid "Drag the image in the opposite direction to the direction in which you want to scroll. For example, if you want to scroll down the image, drag the image upwards in the window."
+msgstr ""
+
+#: labyrinth.xml:387(para) 
+msgid "Use the scrollbars on the window."
+msgstr ""
+
+#: labyrinth.xml:393(title) 
+msgid "To Close an Image"
+msgstr ""
+
+#: labyrinth.xml:394(para) 
+msgid "To close an image, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Close This Window</guimenuitem></menuchoice>. If the window is the last <application>Labyrinth</application> window open, the application exits."
+msgstr ""
+
+#: labyrinth.xml:400(para) 
+msgid "To quit <application>Labyrinth</application> and close all of the windows that you opened in the current session, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Exit</guimenuitem></menuchoice>."
+msgstr ""
+
+#: labyrinth.xml:407(para) 
+msgid "This is a warning."
+msgstr ""
+
+#: labyrinth.xml:424(title) 
+msgid "About <application>Labyrinth</application>"
+msgstr ""
+
+#: labyrinth.xml:425(para) 
+msgid "<application>Labyrinth</application> was written by Don Scorgio, Martin Schaaf and Matthias Vogelgesang. (<email>[e-mail]</email>). To find more information about <application>Labyrinth</application>, please visit the <ulink url=\"http://www.gnome.org/~dscorgie/labyrinth.html\" type=\"http\">Labyrinth Web page</ulink>."
+msgstr ""
+
+#: labyrinth.xml:430(para) 
+msgid "To report a bug or make a suggestion regarding this application or this manual, follow the directions in this <ulink url=\"ghelp:gnome-feedback\" type=\"help\">document</ulink>."
+msgstr ""
+
+#: labyrinth.xml:436(para) 
+msgid "This program is distributed under the terms of the GNU General Public license as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found at this <ulink url=\"ghelp:gpl\" type=\"help\">link</ulink>, or in the file COPYING included with the source code of this program."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: labyrinth.xml:0(None) 
+msgid "translator-credits"
+msgstr ""
+

=== added file 'install_data_files.sh'
--- install_data_files.sh	1970-01-01 00:00:00 +0000
+++ install_data_files.sh	2012-11-11 04:19:21 +0000
@@ -0,0 +1,18 @@
+# Run this to install Labyrinth's optional data files - language packs, icons,
+# and the .desktop file.
+#
+# Set the $DESTDIR environment variable to install somewhere other than root.
+set -e
+
+echo "Installing icons"
+for size in 16x16 22x22 24x24 scalable; do install -d $DESTDIR/usr/share/icons/hicolor/$size/apps; done
+install -m 644 data/labyrinth-16.png $DESTDIR/usr/share/icons/hicolor/16x16/apps/labyrinth.png
+install -m 644 data/labyrinth-22.png $DESTDIR/usr/share/icons/hicolor/22x22/apps/labyrinth.png
+install -m 644 data/labyrinth-24.png $DESTDIR/usr/share/icons/hicolor/24x24/apps/labyrinth.png
+install -m 644 data/labyrinth.svg $DESTDIR/usr/share/icons/hicolor/scalable/apps/labyrinth.svg
+
+echo "Installing .desktop file"
+install -D -m 755 data/labyrinth.desktop $DESTDIR/usr/share/applications/labyrinth.desktop
+
+echo "Installing translations"
+make -C po localedir=$DESTDIR/usr/share/locale install

=== renamed file 'install_data_files.sh' => 'install_data_files.sh.moved'
=== added file 'labyrinth'
--- labyrinth	1970-01-01 00:00:00 +0000
+++ labyrinth	2012-11-11 04:19:21 +0000
@@ -0,0 +1,93 @@
+#!/usr/bin/python
+# labyrinth
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+# Copyright (C) 2008 - Labyrinth-Dev-Team
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import pygtk
+import gettext, locale
+import optparse
+import sys, os
+import os.path as osp
+
+if os.name != 'nt':
+    pygtk.require('2.0')
+
+import gtk
+
+from labyrinth_lib import utils
+from labyrinth_lib import Browser
+try:
+    from labyrinth_lib import defs
+    localedir = osp.abspath(osp.join(defs.DATA_DIR, "locale"))
+except:
+    localedir = "/usr/share/locale"
+
+gettext.bindtextdomain('labyrinth', localedir)
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('labyrinth','UTF-8')
+
+gettext.textdomain('labyrinth')
+
+if hasattr(locale, 'bindtextdomain'):
+    if not os.name == 'nt':
+        locale.bindtextdomain('labyrinth', localedir)
+        if hasattr(locale, 'bind_textdomain_codeset'):
+            locale.bind_textdomain_codeset('labyrinth','UTF-8')
+        locale.textdomain('labyrinth')
+
+
+gtk.glade.bindtextdomain('labyrinth')
+gtk.glade.textdomain('labyrinth')
+
+
+def main():
+    parser = optparse.OptionParser()
+    parser.add_option("--use-tray-icon", dest="tray_icon",
+            action="store_true", default=False)
+    parser.add_option("--no-tray-icon", dest="tray_icon", action="store_false")
+    parser.add_option("--hide-main-window", action="store_true", default=False)
+    parser.add_option("-m", "--map", action="store", type="string", dest="filename",
+            help="Open a map from a given filename (from internal database)")
+    parser.add_option("-o", "--open", action="store", type="string",
+            dest="filepath", help="Open a map from a given filename (including path)")
+
+    (options, args) = parser.parse_args()
+    if not options.tray_icon:
+        options.hide_main_window=False
+
+    MapBrowser = Browser.Browser (
+            start_hidden = options.hide_main_window,
+            tray_icon = options.tray_icon
+    )
+
+    if options.filename != None:
+        MapBrowser.open_map_filename (os.path.join (utils.get_save_dir(), options.filename))
+    elif options.filepath != None:
+        MapBrowser.open_map_filename (options.filepath)
+
+    try:
+        gtk.main()
+    except:
+        print "Exception caught while running. Dying a death."
+        sys.exit(1)
+
+if __name__ == '__main__':
+    main()

=== renamed file 'labyrinth' => 'labyrinth.moved'
=== added directory 'labyrinth_lib'
=== renamed directory 'labyrinth_lib' => 'labyrinth_lib.moved'
=== added file 'labyrinth_lib/BaseThought.py'
--- labyrinth_lib/BaseThought.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/BaseThought.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,341 @@
+# BaseThought.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import gobject
+import gtk
+import utils
+import pango
+
+import TextBufferMarkup
+
+MODE_EDITING = 0
+MODE_IMAGE = 1
+MODE_DRAW = 2
+
+class BaseThought (gobject.GObject):
+    ''' The basic class to derive other thoughts from. \
+            Instructions for creating derivative thought types are  \
+            given as comments'''
+    # These are general signals.  They are available to all thoughts to
+    # emit.  If you emit other signals, the chances are they'll be ignored
+    # by the MMapArea.  It's you're responsiblity to catch and handle them.
+    # All these signals are handled correctly by the MMapArea.
+    __gsignals__ = dict (select_thought      = (gobject.SIGNAL_RUN_FIRST,
+                                                                                        gobject.TYPE_NONE,
+                                                                                        (gobject.TYPE_PYOBJECT,)),
+                                             begin_editing       = (gobject.SIGNAL_RUN_FIRST,
+                                                                                        gobject.TYPE_NONE,
+                                                                                        ()),
+                                             popup_requested     = (gobject.SIGNAL_RUN_FIRST,
+                                                                                        gobject.TYPE_NONE,
+                                                                                        (gobject.TYPE_PYOBJECT, gobject.TYPE_INT)),
+                                             claim_unending_link = (gobject.SIGNAL_RUN_FIRST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            ()),
+                                             update_view             = (gobject.SIGNAL_RUN_LAST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            ()),
+                                             create_link             = (gobject.SIGNAL_RUN_FIRST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            (gobject.TYPE_PYOBJECT,)),
+                                             title_changed       = (gobject.SIGNAL_RUN_LAST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            (gobject.TYPE_STRING,)),
+                                             finish_editing          = (gobject.SIGNAL_RUN_FIRST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            ()),
+                                             delete_thought          = (gobject.SIGNAL_RUN_LAST,
+                                                                                            gobject.TYPE_NONE,
+                                                                                            ()),
+                                             text_selection_changed = (gobject.SIGNAL_RUN_LAST,
+                                                                                               gobject.TYPE_NONE,
+                                                                                               (gobject.TYPE_INT, gobject.TYPE_INT, gobject.TYPE_STRING)),
+                                             change_mouse_cursor    = (gobject.SIGNAL_RUN_FIRST,
+                                                                                               gobject.TYPE_NONE,
+                                                                                               (gobject.TYPE_INT,)),
+                                             update_links                   = (gobject.SIGNAL_RUN_LAST,
+                                                                                               gobject.TYPE_NONE,
+                                                                                               ()),
+                                             grab_focus                             = (gobject.SIGNAL_RUN_FIRST,
+                                                                                               gobject.TYPE_NONE,
+                                                                                               (gobject.TYPE_BOOLEAN,)),
+                                             update_attrs                   = (gobject.SIGNAL_RUN_FIRST,
+                                                                                               gobject.TYPE_NONE,
+                                                                                               (gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, pango.FontDescription)))
+
+    # The first thing that should be called is this constructor
+    # It sets some basic properties of all thoughts and should be called
+    # before you start doing you're own thing with thoughts
+    # save: the save document passed into the derived constructor
+    # elem_type: a string representing the thought type (e.g. "image_thought")
+    def __init__ (self, save, elem_type, undo, background_color, foreground_color):
+        # Note: Once the thought has been successfully initialised (i.e. at the end
+        # of the constructor) you MUST set all_okay to True
+        # Otherwise, bad things will happen.
+        self.all_okay = False
+        super (BaseThought, self).__init__()
+        self.ul = self.lr = None
+        self.am_primary = False
+        self.am_selected = False
+        self.sensitive = 5
+        self.editing = False
+        self.identity = -1
+        self.index = 0
+        self.end_index = 0
+        self.text = ""
+        self.want_move = False
+        self.undo = undo
+        self.background_color = background_color
+        self.foreground_color = foreground_color
+        self.model_iter = None
+        extended_elem = save.createElement ("Extended")
+        self.extended_buffer = TextBufferMarkup.ExtendedBuffer (self.undo, extended_elem, save)
+        self.extended_buffer.set_text("")
+        self.extended_buffer.connect ("set_focus", self.focus_buffer)
+        self.extended_buffer.connect ("set_attrs", self.set_extended_attrs)
+        self.element = save.createElement (elem_type)
+        self.element.appendChild (extended_elem)
+
+    # These are self-explanitory.  You probably don't want to
+    # overwrite these methods, unless you have a very good reason
+    def get_save_element (self):
+        return self.element
+
+    def make_primary (self):
+        self.am_primary = True
+
+    def select (self):
+        self.am_selected = True
+
+    def unselect (self):
+        self.am_selected = False
+
+    def get_max_area (self):
+        if not self.ul or not self.lr:
+            return 999,999,-999,-999
+        return self.ul[0], self.ul[1], self.lr[0], self.lr[1]
+
+    def okay (self):
+        return self.all_okay
+
+    def move_by (self, x, y):
+        self.ul = (self.ul[0]+x, self.ul[1]+y)
+        self.recalc_position ()
+        self.emit ("update_links")
+        self.emit ("update_view")
+
+    def focus_buffer (self, buf):
+        self.emit ("select_thought", None)
+        self.emit ("grab_focus", True)
+
+    def set_extended_attrs(self, buf, bold, underline, italics, pango_font):
+        self.emit("update_attrs", bold, underline, italics, pango_font)
+
+    def can_be_parent (self):
+        return True
+
+    # This, you may want to change.  Though, doing so will only affect
+    # thoughts that are "parents"
+    def find_connection (self, other):
+        if self.editing or other.editing:
+            return None, None
+        if not self.ul or not self.lr or not other.ul \
+        or not other.lr:
+            return None, None
+
+        if utils.use_bezier_curves:
+            if other.ul[0] > self.lr[0]:
+                xfrom = self.lr[0]
+                xto = other.ul[0]
+            else:
+                xfrom = self.ul[0]
+                xto = other.lr[0]
+        else:
+            xfrom = self.ul[0]-((self.ul[0]-self.lr[0]) / 2.)
+            xto = other.ul[0]-((other.ul[0]-other.lr[0]) / 2.)
+
+        yfrom = self.ul[1]-((self.ul[1]-self.lr[1]) / 2.)
+        yto = other.ul[1]-((other.ul[1]-other.lr[1]) / 2.)
+        return (xfrom, yfrom), (xto, yto)
+
+    # All the rest of these should be handled within your thought
+    # type, supposing you actually want to handle them.
+    # You almost certianly do want to ;)
+    def process_button_down (self, event, mode, transformed):
+        return False
+
+    def process_button_release (self, event, unending_link, mode, transformed):
+        return False
+
+    def process_key_press (self, event, mode):
+        return False
+
+    def handle_motion (self, event, mode, transformed):
+        pass
+
+    def includes (self, coords, mode):
+        pass
+
+    def begin_editing (self):
+        return False
+
+    def finish_editing (self):
+        pass
+
+    def draw (self, context):
+        pass
+
+    def load (self, node):
+        pass
+
+    def update_save (self):
+        pass
+
+    def copy_text (self, clip):
+        pass
+
+    def cut_text (self, clip):
+        pass
+
+    def paste_text (self, clip):
+        pass
+
+    def export (self, context, move_x, move_y):
+        pass
+
+    def commit_text (self, im_context, string, mode):
+        pass
+
+    def want_motion (self):
+        return False
+
+    def recalc_edges (self):
+        pass
+
+    def recalc_position (self):
+        pass
+
+    def delete_surroundings(self, imcontext, offset, n_chars, mode):
+        pass
+
+    def preedit_changed (self, imcontext, mode):
+        pass
+
+    def preedit_end (self, imcontext, mode):
+        pass
+
+    def preedit_start (self, imcontext, mode):
+        pass
+
+    def retrieve_surroundings (self, imcontext, mode):
+        pass
+
+    def set_bold (self, active):
+        pass
+
+    def get_popup_menu_items(self):
+        pass
+
+
+class ResizableThought (BaseThought):
+    ''' A resizable thought base class.  This allows the sides and corners \
+        of the thought to be dragged around.  It only provides the very basic \
+        functionality.  Other stuff must be done within the derived classes'''
+
+    # Possible types of resizing - where the user selected to resize
+    RESIZE_NONE = 0
+    RESIZE_LEFT = 1
+    RESIZE_RIGHT = 2
+    RESIZE_TOP = 3
+    RESIZE_BOTTOM = 4
+    RESIZE_UL = 5
+    RESIZE_UR = 6
+    RESIZE_LL = 7
+    RESIZE_LR = 8
+
+    def __init__ (self, save, elem_type, undo, background_color, foreground_color):
+        super (ResizableThought, self).__init__(save, elem_type, undo, background_color, foreground_color)
+        self.resizing = False
+        self.button_down = False
+
+    def includes (self, coords, mode):
+        if not self.ul or not self.lr or not coords:
+            return False
+
+        inside = (coords[0] < self.lr[0] + self.sensitive) and \
+                         (coords[0] > self.ul[0] - self.sensitive) and \
+                     (coords[1] < self.lr[1] + self.sensitive) and \
+                     (coords[1] > self.ul[1] - self.sensitive)
+
+        self.resizing = self.RESIZE_NONE
+        self.motion_coords = coords
+
+        if inside and (mode != MODE_EDITING or self.button_down):
+            self.emit ("change_mouse_cursor", gtk.gdk.LEFT_PTR)
+            return inside
+
+        if inside:
+            # 2 cases: 1. The click was within the main area
+            #                  2. The click was near the border
+            # In the first case, we handle as normal
+            # In the second case, we want to intercept all the fun thats
+            # going to happen so we can resize the thought
+            if abs (coords[0] - self.ul[0]) < self.sensitive:
+                # its near the top edge somewhere
+                if abs (coords[1] - self.ul[1]) < self.sensitive:
+                # Its in the ul corner
+                    self.resizing = self.RESIZE_UL
+                    self.emit ("change_mouse_cursor", gtk.gdk.TOP_LEFT_CORNER)
+                elif abs (coords[1] - self.lr[1]) < self.sensitive:
+                # Its in the ll corner
+                    self.resizing = self.RESIZE_LL
+                    self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_LEFT_CORNER)
+                elif coords[1] < self.lr[1] and coords[1] > self.ul[1]:
+                #anywhere else along the left edge
+                    self.resizing = self.RESIZE_LEFT
+                    self.emit ("change_mouse_cursor", gtk.gdk.LEFT_SIDE)
+            elif abs (coords[0] - self.lr[0]) < self.sensitive:
+                if abs (coords[1] - self.ul[1]) < self.sensitive:
+                # Its in the UR corner
+                    self.resizing = self.RESIZE_UR
+                    self.emit ("change_mouse_cursor", gtk.gdk.TOP_RIGHT_CORNER)
+                elif abs (coords[1] - self.lr[1]) < self.sensitive:
+                # Its in the lr corner
+                    self.resizing = self.RESIZE_LR
+                    self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_RIGHT_CORNER)
+                elif coords[1] < self.lr[1] and coords[1] > self.ul[1]:
+                #anywhere else along the right edge
+                    self.resizing = self.RESIZE_RIGHT
+                    self.emit ("change_mouse_cursor", gtk.gdk.RIGHT_SIDE)
+            elif abs (coords[1] - self.ul[1]) < self.sensitive and \
+                     (coords[0] < self.lr[0] and coords[0] > self.ul[0]):
+                # Along the top edge somewhere
+                self.resizing = self.RESIZE_TOP
+                self.emit ("change_mouse_cursor", gtk.gdk.TOP_SIDE)
+            elif abs (coords[1] - self.lr[1]) < self.sensitive and \
+                     (coords[0] < self.lr[0] and coords[0] > self.ul[0]):
+                # Along the bottom edge somewhere
+                self.resizing = self.RESIZE_BOTTOM
+                self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_SIDE)
+            else:
+                self.emit ("change_mouse_cursor", gtk.gdk.LEFT_PTR)
+        self.want_move = (self.resizing != self.RESIZE_NONE)
+        return inside

=== added file 'labyrinth_lib/Browser.py'
--- labyrinth_lib/Browser.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/Browser.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,340 @@
+# Browser.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#                    - Andreas Sliwka <[e-mail]>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+# Standard library
+import tarfile
+import os
+import gettext
+_ = gettext.gettext
+
+# Gtk stuff
+import gtk
+if os.name != 'nt':
+    import gconf
+import gtk.glade
+import pango
+import gobject
+
+# Local imports
+import utils
+import MainWindow
+from MapList import MapList
+import TrayIcon
+from . import __version__
+
+AUTHORS = ['Don Scorgie <[e-mail]>',
+                   'Martin Schaaf <[e-mail]>',
+                   'Matthias Vogelgesang <[e-mail]>',
+                   'Andreas Sliwka <[e-mail]>']
+
+class Browser (gtk.Window):
+    COL_ID = 0
+    COL_TITLE = 1
+    COL_MODTIME = 2
+
+    def __init__(self, start_hidden, tray_icon):
+        super(Browser, self).__init__()
+        self.glade=gtk.glade.XML(utils.get_data_file_name('labyrinth.glade'))
+        self.view = self.glade.get_widget ('MainView')
+        self.populate_view ()
+        self.view.connect ('row-activated', self.open_row_cb)
+        self.view.connect ('cursor-changed', self.cursor_change_cb)
+
+        self.view_dependants = []
+
+        self.open_button = self.glade.get_widget('OpenButton')
+        self.delete_button = self.glade.get_widget('DeleteButton')
+        self.open_menu = self.glade.get_widget('open1')
+        self.delete_menu = self.glade.get_widget('delete1')
+
+        self.view_dependants.append (self.open_button)
+        self.view_dependants.append (self.delete_button)
+        self.view_dependants.append (self.open_menu)
+        self.view_dependants.append (self.delete_menu)
+
+        self.open_button.connect ('clicked', self.open_clicked)
+        self.glade.get_widget('NewButton').connect ('clicked', self.new_clicked)
+        self.delete_button.connect ('clicked', self.delete_clicked)
+
+        self.open_menu.connect ('activate', self.open_clicked)
+        self.glade.get_widget('new1').connect ('activate', self.new_clicked)
+        self.delete_menu.connect ('activate', self.delete_clicked)
+        self.glade.get_widget('import1').connect ('activate', self.import_clicked)
+        self.glade.get_widget('quit1').connect ('activate', self.quit_clicked)
+        self.glade.get_widget('about1').connect ('activate', self.about_clicked)
+        self.glade.get_widget('showhelp').connect ('activate', self.show_help_clicked)
+
+        for x in self.view_dependants:
+            x.set_sensitive(False)
+
+        self.main_window = self.glade.get_widget ('MapBrowser')
+
+        # set remembered size
+        if os.name != 'nt':
+            self.config_client = gconf.client_get_default()
+            self.config_client.add_dir ("/apps/labyrinth", gconf.CLIENT_PRELOAD_NONE)
+
+            width = self.config_client.get_int ('/apps/labyrinth/width')
+            height = self.config_client.get_int ('/apps/labyrinth/height')
+            utils.use_bezier_curves = self.config_client.get_bool ('/apps/labyrinth/curves')
+            if width == 0 or height == 0:
+                width = 400
+                height = 300
+        else:
+            width = 400
+            height = 300
+
+        view_sortable = self.view.get_model ()
+        view_sortable.connect ('sort-column-changed', self.sort_column_changed_cb)
+        if os.name != 'nt':
+            sort_order = self.config_client.get_int('/apps/labyrinth/map_sort_order')
+            column_id = self.config_client.get_int('/apps/labyrinth/map_sort_order_column')
+            view_sortable.set_sort_column_id (column_id, sort_order)
+
+        self.main_window.resize (width, height)
+
+        if os.name != 'nt':
+            try:
+                self.main_window.set_icon_name ('labyrinth')
+            except:
+                self.main_window.set_icon_from_file(utils.get_data_file_name('labyrinth.svg'))
+        else:
+            self.main_window.set_icon_from_file('images\\labyrinth-24.png')
+        if tray_icon:
+            self.main_window.connect ('delete_event', self.toggle_main_window, None)
+            traymenu = gtk.Menu()
+            quit_item = gtk.MenuItem("Quit")
+            quit_item.connect("activate",self.quit_clicked)
+            traymenu.add(quit_item)
+            traymenu.show_all()
+            self.traymenu = traymenu
+            self.trayicon = TrayIcon.TrayIcon(
+                                            icon_name="labyrinth",
+                                            menu=traymenu,
+                                            activate=self.toggle_main_window)
+        else:
+            self.main_window.connect('delete_event', self.quit_clicked, None)
+        if start_hidden:
+            self.main_window.hide ()
+        else:
+            self.main_window.show_all ()
+
+    def toggle_main_window(self,*args):
+        if self.main_window.get_property("visible"):
+            self.main_window.hide()
+        else:
+            self.main_window.show()
+        return True
+
+    def map_title_cb (self, mobj, new_title, mobj1):
+        map = MapList.get_by_window(mobj)
+        if not map:
+            raise AttributeError ("What a mess, can't find the map")
+        map.title = new_title
+
+    def get_selected_map(self):
+        sel = self.view.get_selection ()
+        (model, it) = sel.get_selected ()
+        if it:
+            (num,) = MapList.tree_view_model.get (it, self.COL_ID)
+            return MapList.get_by_index(num)
+        return None
+
+    def cursor_change_cb (self, treeview):
+        sensitive = bool(self.get_selected_map())
+        for x in self.view_dependants:
+            x.set_sensitive(sensitive)
+
+    def open_map_filename (self, fname):
+        win = MainWindow.LabyrinthWindow (fname)
+        win.show ()
+
+    def open_map (self, map, imported=False):
+        win = MainWindow.LabyrinthWindow (map.filename, imported)
+        win.connect ("title-changed", self.map_title_cb)
+        win.connect ("window_closed", self.remove_map_cb)
+        win.connect ("file_saved", self.file_save_cb)
+        win.show ()
+        map.window = win
+        return (MapList.index(map), win)
+
+    def open_selected_map(self):
+        map = self.get_selected_map()
+        if map is None:
+            raise ValueError("you clicked the 'open' button but had no map selected")
+        if map.window:
+            print "Window for map '%s' is already open" % map.title
+            # may be the window should be raised?
+        else:
+            self.open_map (map)
+
+    def show_help_clicked(self, arg):
+        try:
+            gtk.show_uri(None, 'help:labyrinth', 0)
+        except gobject.GError, e:
+            print _('Unable to display help: %s') % str(e)
+
+    def about_clicked (self, arg):
+        about_dialog = gtk.AboutDialog ()
+        about_dialog.set_name ("Labyrinth")
+        about_dialog.set_version (__version__)
+        if os.name != 'nt':
+            try:
+                about_dialog.set_logo_icon_name("labyrinth")
+            except:
+                pass
+        else:
+            about_dialog.set_logo (gtk.gdk.pixbuf_new_from_file("images\\labyrinth-24.png"))
+        about_dialog.set_license (
+"Labyrinth is free software; you can redistribute it and/or modify "
+"it under the terms of the GNU General Public Licence as published by "
+"the Free Software Foundation; either version 2 of the Licence, or "
+"(at your option) any later version."
+"\n\n"
+"Labyrinth is distributed in the hope that it will be useful, "
+"but WITHOUT ANY WARRANTY; without even the implied warranty of "
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+"GNU General Public Licence for more details."
+"\n\n"
+"You should have received a copy of the GNU General Public Licence "
+"along with Labyrinth; if not, write to the Free Software Foundation, Inc., "
+"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA")
+        about_dialog.set_wrap_license (True)
+        about_dialog.set_copyright ("2006-2008 Don Scorgie et. al")
+        about_dialog.set_authors (AUTHORS)
+        about_dialog.set_website ("http://code.google.com/p/labyrinth")
+        about_dialog.set_translator_credits (_("Translation by Don Scorgie"))
+        about_dialog.run ()
+        about_dialog.hide ()
+        del (about_dialog)
+        return
+
+    def open_clicked (self, button):
+        self.open_selected_map()
+
+    def open_row_cb (self, view, path, col):
+        self.open_selected_map ()
+
+    def new_clicked (self, button):
+        map = MapList.create_empty_map()
+        self.open_map(map)
+
+    def delete_clicked (self, button):
+        map = self.get_selected_map ()
+        if not map:
+            raise ValueError("You clicked on delete but had no map selected")
+        error_message = ""
+        if map.window:
+            error_message =  _("The map cannot be deleted right now. Is it open?")
+        elif not map.filename:
+            error_message = _("The map has no associated filename.")
+        if error_message:
+            dialog = gtk.MessageDialog (self, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK,
+                                                            _("Cannot delete this map"))
+            dialog.format_secondary_text (error_message)
+            dialog.run ()
+            dialog.hide ()
+            del (dialog)
+            return
+        dialog = gtk.MessageDialog (self, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_YES_NO,
+                                                                _("Do you really want to delete this Map?"))
+        resp = dialog.run ()
+        dialog.hide ()
+        del (dialog)
+        if resp != gtk.RESPONSE_YES:
+            return
+        MapList.delete (map)
+        self.view.emit ('cursor-changed')
+
+    def remove_map_cb (self, mobj, a):
+        map = MapList.get_by_window(mobj)
+        if map:
+            MapList.delete(map)
+            self.view.emit ('cursor-changed')
+            return
+        raise ValueError("Cant remove map of window %s" % mobj)
+
+    def file_save_cb (self, mobj, new_fname, mobj1):
+        map = MapList.get_by_window(mobj)
+        if map:
+            map.window = None
+            map.filename = new_fname
+        return
+
+    def import_clicked(self, button, other=None, *data):
+        chooser = gtk.FileChooserDialog(title=_("Open File"), action=gtk.FILE_CHOOSER_ACTION_OPEN, \
+                                                                        buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+
+        filtr = gtk.FileFilter ()
+        filtr.set_name(_('MAPZ Compressed Map (*.mapz)'))
+        filtr.add_pattern('*.mapz')
+        chooser.add_filter(filtr)
+
+        response = chooser.run()
+        if response == gtk.RESPONSE_OK:
+            filename = chooser.get_filename()
+            tf = tarfile.open(filename)
+            mapname = os.path.join (utils.get_save_dir (), tf.getnames()[0])
+            tf.extractall(utils.get_save_dir())
+            tf.close()
+            map = MapList.new_from_file(mapname)
+            map.filename = mapname
+
+        chooser.destroy()
+
+    def quit_clicked (self, button, other=None, *data):
+        for map in MapList.get_open_windows():
+            map.window.close_window_cb (None)
+
+        width, height = self.main_window.get_size()
+
+        if os.name != 'nt':
+            self.config_client.set_int('/apps/labyrinth/width', width)
+            self.config_client.set_int('/apps/labyrinth/height', height)
+
+        gtk.main_quit ()
+
+    def populate_view (self):
+        cellrenderer = gtk.CellRendererText()
+        cellrenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+        column = gtk.TreeViewColumn(_("Map Name"), cellrenderer,
+                                                                text=self.COL_TITLE)
+        column.set_resizable(True)
+        column.set_expand (True)
+        column.set_sort_column_id (1)
+        self.view.append_column(column)
+
+        col1 = gtk.TreeViewColumn (_("Last Modified"), gtk.CellRendererText(),
+                                                           text=self.COL_MODTIME)
+        col1.set_resizable(True)
+        col1.set_sort_column_id (2)
+        self.view.append_column(col1)
+
+        self.view.set_model (MapList.get_TreeViewModel())
+        self.view.set_search_column(self.COL_TITLE)
+        self.view.set_enable_search (True)
+
+    def sort_column_changed_cb (self, data):
+        column_id, sort_order = data.get_sort_column_id ()
+        if os.name != 'nt':
+            self.config_client.set_int('/apps/labyrinth/map_sort_order', sort_order)
+            self.config_client.set_int('/apps/labyrinth/map_sort_order_column', column_id)

=== added file 'labyrinth_lib/DrawingThought.py'
--- labyrinth_lib/DrawingThought.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/DrawingThought.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,619 @@
+# DrawingThought.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <Don@Scorgieorg>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import gtk
+import xml.dom
+import gettext
+_ = gettext.gettext
+import math
+
+import BaseThought
+import utils
+import UndoManager
+
+STYLE_CONTINUE=0
+STYLE_END=1
+STYLE_BEGIN=2
+ndraw =0
+
+MODE_EDITING = 0
+MODE_IMAGE = 1
+MODE_DRAW = 2
+
+UNDO_RESIZE = 0
+UNDO_DRAW = 1
+UNDO_ERASE = 2
+
+class DrawingThought (BaseThought.ResizableThought):
+    class DrawingPoint (object):
+        def __init__ (self, coords, style=STYLE_CONTINUE, color = gtk.gdk.Color(0,0,0), width = 2):
+            self.x, self.y = coords
+            self.style = style
+            if color == None:
+                color = gtk.gdk.Color(0,0,0)
+            self.color = color
+            self.width = 1
+        def move_by (self, x, y):
+            self.x += x
+            self.y += y
+
+    def __init__ (self, coords, pango_context, thought_number, save, undo, loading, background_color, foreground_color):
+        global ndraw
+        super (DrawingThought, self).__init__(save, "drawing_thought", undo, background_color, foreground_color)
+        ndraw+=1
+        self.identity = thought_number
+        self.want_move = False
+        self.points = []
+        self.text = _("Drawing #%d" % ndraw)
+        self.drawing = 0
+        if not loading:
+            margin = utils.margin_required (utils.STYLE_NORMAL)
+            self.ul = (coords[0]-margin[0], coords[1]-margin[1])
+            self.lr = (coords[0]+100+margin[2], coords[1]+100+margin[3])
+            self.min_x = coords[0]+90
+            self.max_x = coords[0]+15
+            self.min_y = coords[1]+90
+            self.max_y = coords[1]+15
+            self.width = 100
+            self.height = 100
+
+        self.all_okay = True
+
+    def draw (self, context):
+        if len (self.extended_buffer.get_text()) == 0:
+            utils.draw_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_NORMAL)
+        else:
+            utils.draw_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_EXTENDED_CONTENT)
+        cwidth = context.get_line_width ()
+        context.set_line_width (2)
+        if len (self.points) > 0:
+            for p in self.points:
+                if p.style == STYLE_BEGIN:
+                    context.move_to (p.x, p.y)
+                    r,g,b = utils.gtk_to_cairo_color(self.foreground_color)
+                    context.set_source_rgb (r, g, b)
+                elif p.style == STYLE_END:
+                    context.line_to (p.x, p.y)
+                    context.stroke()
+                else:
+                    context.line_to (p.x, p.y)
+
+        context.set_line_width (cwidth)
+        context.stroke ()
+        return
+
+    def want_motion (self):
+        return self.want_move
+
+    def recalc_edges (self):
+        self.lr = (self.ul[0]+self.width, self.ul[1]+self.height)
+
+    def undo_resize (self, action, mode):
+        self.undo.block ()
+        choose = 1
+        if mode == UndoManager.UNDO:
+            choose = 0
+        self.ul = action.args[choose][0]
+        self.width = action.args[choose][1]
+        self.height = action.args[choose][2]
+        self.recalc_edges ()
+        self.emit ("update_links")
+        self.emit ("update_view")
+        self.undo.unblock ()
+
+    def undo_drawing (self, action, mode):
+        self.undo.block ()
+        if mode == UndoManager.UNDO:
+            choose = 1
+            for p in action.args[0]:
+                self.points.remove (p)
+        else:
+            choose = 2
+            for p in action.args[0]:
+                self.points.append (p)
+
+        self.ul = action.args[choose][0]
+        self.width = action.args[choose][1]
+        self.height = action.args[choose][2]
+        self.recalc_edges ()
+        self.emit ("update_links")
+        self.emit ("update_view")
+        self.undo.unblock ()
+
+    def process_button_down (self, event, mode, transformed):
+        modifiers = gtk.accelerator_get_default_mod_mask ()
+        self.button_down = True
+        if event.button == 1:
+            if event.type == gtk.gdk.BUTTON_PRESS:
+                self.emit ("select_thought", event.state & modifiers)
+                self.emit ("update_view")
+            if mode == MODE_EDITING and self.resizing != self.RESIZE_NONE:
+                self.want_move = True
+                self.drawing = 0
+                self.orig_size = (self.ul, self.width, self.height)
+                return True
+            elif mode == MODE_DRAW:
+                self.want_move = True
+                self.drawing = 2
+                if not event.state & gtk.gdk.SHIFT_MASK:
+                    self.drawing = 1
+                self.orig_size = (self.ul, self.width, self.height)
+                self.ins_points = []
+                self.del_points = []
+                return True
+        elif event.button == 3:
+            self.emit ("popup_requested", event, 1)
+        self.emit ("update_view")
+
+    def process_button_release (self, event, unending_link, mode, transformed):
+        self.button_down = False
+        if unending_link:
+            unending_link.set_child (self)
+            self.emit ("claim_unending_link")
+        if len(self.points) > 0:
+            self.points[-1].style=STYLE_END
+        self.emit ("update_view")
+        if self.want_move and self.drawing == 0:
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_RESIZE, self.undo_resize, \
+                                                                                                    self.orig_size, (self.ul, self.width, self.height)))
+        elif self.want_move and self.drawing == 1:
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_DRAW, self.undo_drawing, \
+                                                                                                    self.ins_points, self.orig_size, \
+                                                                                                    (self.ul, self.width, self.height)))
+        elif self.want_move and self.drawing == 2:
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_ERASE, self.undo_erase, \
+                                                                                                    self.ins_points))
+        self.drawing = 0
+        self.want_move = False
+
+    def undo_erase (self, action, mode):
+        self.undo.block ()
+        action.args[0].reverse ()
+        if mode == UndoManager.UNDO:
+            for x in action.args[0]:
+                if x[0] == 0:
+                    self.points.remove (x[2])
+                else:
+                    self.points.insert (x[1],x[2])
+        else:
+            for x in action.args[0]:
+                if x[0] == 0:
+                    self.points.insert (x[1], x[2])
+                else:
+                    self.points.remove (x[2])
+        self.undo.unblock ()
+        self.emit ("update_view")
+
+    def handle_motion (self, event, mode, transformed):
+        if (self.resizing == self.RESIZE_NONE or not self.want_move or not event.state & gtk.gdk.BUTTON1_MASK) \
+           and mode != MODE_DRAW:
+            if not event.state & gtk.gdk.BUTTON1_MASK or mode != MODE_EDITING:
+                return False
+            else:
+                self.emit ("create_link", \
+                 (self.ul[0]-((self.ul[0]-self.lr[0]) / 2.), self.ul[1]-((self.ul[1]-self.lr[1]) / 2.)))
+        diffx = transformed[0] - self.motion_coords[0]
+        diffy = transformed[1] - self.motion_coords[1]
+        change = (len(self.points) == 0)
+        tmp = self.motion_coords
+        self.motion_coords = transformed
+        if self.resizing != self.RESIZE_NONE:
+            if self.resizing == self.RESIZE_LEFT:
+                if self.ul[0] + diffx > self.min_x:
+                    self.motion_coords = tmp
+                    return True
+                self.ul = (self.ul[0]+diffx, self.ul[1])
+                if change:
+                    self.max_x += diffx
+            elif self.resizing == self.RESIZE_RIGHT:
+                if self.lr[0] + diffx < self.max_x:
+                    self.motion_coords = tmp
+                    return True
+                self.lr = (self.lr[0]+diffx, self.lr[1])
+                if change:
+                    self.min_x += diffx
+            elif self.resizing == self.RESIZE_TOP:
+                if self.ul[1] + diffy > self.min_y:
+                    self.motion_coords = tmp
+                    return True
+                self.ul = (self.ul[0], self.ul[1]+diffy)
+                if change:
+                    self.max_y += diffy
+            elif self.resizing == self.RESIZE_BOTTOM:
+                if self.lr[1] + diffy < self.max_y:
+                    self.motion_coords = tmp
+                    return True
+                self.lr = (self.lr[0], self.lr[1]+diffy)
+                if change:
+                    self.min_y += diffy
+            elif self.resizing == self.RESIZE_UL:
+                if self.ul[1] + diffy > self.min_y or self.ul[0] + diffx > self.min_x:
+                    self.motion_coords = tmp
+                    return True
+                self.ul = (self.ul[0]+diffx, self.ul[1]+diffy)
+                if change:
+                    self.max_x += diffx
+                    self.max_y += diffy
+            elif self.resizing == self.RESIZE_UR:
+                if self.ul[1] + diffy > self.min_y or self.lr[0] + diffx < self.max_x:
+                    self.motion_coords = tmp
+                    return True
+                self.ul = (self.ul[0], self.ul[1]+diffy)
+                self.lr = (self.lr[0]+diffx, self.lr[1])
+                if change:
+                    self.min_x += diffx
+                    self.max_y += diffy
+            elif self.resizing == self.RESIZE_LL:
+                if self.lr[1] + diffy < self.max_y or self.ul[0] + diffx > self.min_x:
+                    self.motion_coords = tmp
+                    return True
+                self.ul = (self.ul[0]+diffx, self.ul[1])
+                self.lr = (self.lr[0], self.lr[1]+diffy)
+                if change:
+                    self.max_x += diffx
+                    self.min_y += diffy
+            elif self.resizing == self.RESIZE_LR:
+                if self.lr[1] + diffy < self.max_y:
+                    self.motion_coords = tmp
+                    return True
+                if self.lr[0] + diffx < self.max_x:
+                    self.motion_coords = tmp
+                    return True
+                self.lr = (self.lr[0]+diffx, self.lr[1]+diffy)
+                if change:
+                    self.min_x += diffx
+                    self.min_y += diffy
+            self.width = self.lr[0] - self.ul[0]
+            self.height = self.lr[1] - self.ul[1]
+            self.emit ("update_links")
+            self.emit ("update_view")
+            return True
+
+        elif self.drawing == 1:
+            if transformed[0] < self.ul[0]+5:
+                self.ul = (transformed[0]-5, self.ul[1])
+            elif transformed[0] > self.lr[0]-5:
+                self.lr = (transformed[0]+5, self.lr[1])
+            if transformed[1] < self.ul[1]+5:
+                self.ul = (self.ul[0], transformed[1]-5)
+            elif transformed[1] > self.lr[1]-5:
+                self.lr = (self.lr[0], transformed[1]+5)
+
+            if transformed[0] < self.min_x:
+                self.min_x = transformed[0]-10
+            elif transformed[0] > self.max_x:
+                self.max_x = transformed[0]+5
+            if transformed[1] < self.min_y:
+                self.min_y = transformed[1]-10
+            elif transformed[1] > self.max_y:
+                self.max_y = transformed[1]+5
+            self.width = self.lr[0] - self.ul[0]
+            self.height = self.lr[1] - self.ul[1]
+            if len(self.points) == 0 or self.points[-1].style == STYLE_END:
+                p = self.DrawingPoint (transformed, STYLE_BEGIN, self.foreground_color)
+            else:
+                p = self.DrawingPoint (transformed, STYLE_CONTINUE)
+            self.points.append (p)
+            self.ins_points.append (p)
+        elif self.drawing == 2 and len (self.points) > 0:
+            out = self.points[0]
+            loc = []
+            handle = []
+            ins_point = -1
+
+            for x in self.points:
+                ins_point += 1
+                dist = (x.x - transformed[0])**2 + (x.y - transformed[1])**2
+
+                if dist < 16:
+                    if x == self.points[0]:
+                        out = None
+                    loc.append ((ins_point, x, dist))
+                else:
+                    if len(loc) != 0:
+                        handle.append ((loc, out, x))
+                        loc = []
+                    elif x.style != STYLE_BEGIN:
+                        x1 = x.x - out.x
+                        y1 = x.y - out.y
+                        d_rsqr = x1**2 + y1 **2
+                        d = ((out.x-transformed[0])*(x.y-transformed[1]) - (x.x-transformed[0])*(out.y-transformed[1]))
+                        det = (d_rsqr*16) - d**2
+                        if det > 0:
+                            xt = -99999
+                            yt = -99999
+                            xalt = -99999
+                            yalt = -99999
+                            if y1 < 0:
+                                sgn = -1
+                            else:
+                                sgn = 1
+                            xt = (((d*y1) + sgn*x1 * math.sqrt (det)) / d_rsqr) +transformed[0]
+                            xalt = (((d*y1) - sgn*x1 * math.sqrt (det)) / d_rsqr) +transformed[0]
+                            yt = (((-d*x1) + abs(y1)*math.sqrt(det)) / d_rsqr) + transformed[1]
+                            yalt = (((-d*x1) - abs(y1)*math.sqrt(det)) / d_rsqr) +transformed[1]
+                            x1_inside = (xt > x.x and xt < out.x) or (xt > out.x and xt < x.x)
+                            x2_inside = (xalt > x.x and xalt < out.x) or (xalt > out.x and xalt < x.x)
+                            y1_inside = (yt > x.y and yt < out.y) or (yt > out.y and yt < x.y)
+                            y2_inside = (yalt > x.y and yalt < out.y) or (yalt > out.y and yalt < x.y)
+
+
+                            if (x1_inside and x2_inside and y1_inside and y2_inside):
+                                if abs (xalt - x.x) < abs (xt - x.x):
+                                    handle.append ((None, out, x, ins_point, xt, xalt, yt, yalt))
+                                else:
+                                    handle.append ((None, out, x, ins_point, xalt, xt, yalt, yt))
+                            elif x.x == out.x and y1_inside and y2_inside:
+                                if abs (yalt - x.y) < abs (yt - x.y):
+                                    handle.append ((None, out, x, ins_point, xt, xalt, yt, yalt))
+                                else:
+                                    handle.append ((None, out, x, ins_point, xalt, xt, yalt, yt))
+                            elif x.y == out.y and x1_inside and x2_inside:
+                                if abs (xalt - x.x) < abs (xt - x.x):
+                                    handle.append ((None, out, x, ins_point, xt, xalt, yt, yalt))
+                                else:
+                                    handle.append ((None, out, x, ins_point, xalt, xt, yalt, yt))
+
+                    out = x
+            if loc:
+                handle.append ((loc, out, None))
+            appends = []
+            dels = []
+            for l in handle:
+                inside = l[0]
+                prev = l[1]
+                next = l[2]
+                if not inside:
+                    ins = l[3]
+                    x1 = l[4]
+                    x2 = l[5]
+                    y1 = l[6]
+                    y2 = l[7]
+                    p1 = self.DrawingPoint ((x1,y1), STYLE_END)
+                    p2 = self.DrawingPoint ((x2,y2), STYLE_BEGIN)
+                    appends.append ((p1, ins))
+                    appends.append ((p2, ins))
+                else:
+                    first = inside[0][1]
+                    last = inside[-1][1]
+                    done_ins = 0
+                    if last.style != STYLE_END:
+                        end_dist = math.sqrt (inside[-1][2]) - 4
+                        alpha = math.atan2 ((last.y-next.y), (last.x-next.x))
+                        new_x = end_dist * math.cos(alpha) + last.x
+                        new_y = end_dist * math.sin(alpha) + last.y
+                        p = self.DrawingPoint ((new_x, new_y), STYLE_BEGIN)
+                        appends.append ((p, inside[-1][0]))
+                        done_ins = 1
+                    if first.style != STYLE_BEGIN:
+                        start_dist = math.sqrt (inside[0][2]) - 4
+                        alpha = math.atan2 ((first.y-prev.y),(first.x-prev.x))
+                        new_x = start_dist * math.cos (alpha) + first.x
+                        new_y = start_dist * math.sin (alpha) + first.y
+                        p = self.DrawingPoint ((new_x, new_y), STYLE_END)
+                        appends.append ((p, inside[0][0]-done_ins))
+                    for i in inside:
+                        dels.append (i[1])
+            inserts = 0
+            for x in appends:
+                self.points.insert (x[1]+inserts, x[0])
+                self.ins_points.append ((0, x[1]+inserts, x[0]))
+                inserts+=1
+            for x in dels:
+                self.ins_points.append ((1, self.points.index (x), x))
+                self.points.remove (x)
+
+        self.emit ("update_links")
+        self.emit ("update_view")
+        return True
+
+    def move_by (self, x, y):
+        self.ul = (self.ul[0]+x, self.ul[1]+y)
+        self.min_x += x
+        self.min_y += y
+        self.max_x += x
+        self.max_y += y
+        for p in self.points:
+            p.move_by(x, y)
+        self.recalc_edges ()
+        self.emit ("update_links")
+
+    def update_save (self):
+        next = self.element.firstChild
+        while next:
+            m = next.nextSibling
+            if next.nodeName == "point":
+                self.element.removeChild (next)
+                next.unlink ()
+            next = m
+        text = self.extended_buffer.get_text ()
+        if text:
+            self.extended_buffer.update_save()
+        else:
+            try:
+                self.element.removeChild(self.extended_buffer.element)
+            except xml.dom.NotFoundErr:
+                pass
+        self.element.setAttribute ("ul-coords", str(self.ul))
+        self.element.setAttribute ("lr-coords", str(self.lr))
+        self.element.setAttribute ("identity", str(self.identity))
+        self.element.setAttribute ("background-color", self.background_color.to_string())
+        self.element.setAttribute ("foreground-color", self.foreground_color.to_string())
+        self.element.setAttribute ("min_x", str(self.min_x))
+        self.element.setAttribute ("min_y", str(self.min_y))
+        self.element.setAttribute ("max_x", str(self.max_x))
+        self.element.setAttribute ("max_y", str(self.max_y))
+
+        if self.am_selected:
+            self.element.setAttribute ("current_root", "true")
+        else:
+            try:
+                self.element.removeAttribute ("current_root")
+            except xml.dom.NotFoundErr:
+                pass
+        if self.am_primary:
+            self.element.setAttribute ("primary_root", "true");
+        else:
+            try:
+                self.element.removeAttribute ("primary_root")
+            except xml.dom.NotFoundErr:
+                pass
+        doc = self.element.ownerDocument
+        for p in self.points:
+            elem = doc.createElement ("point")
+            self.element.appendChild (elem)
+            elem.setAttribute ("coords", str((p.x,p.y)))
+            elem.setAttribute ("type", str(p.style))
+            elem.setAttribute ("color", p.color.to_string())
+        return
+
+    def load (self, node):
+        tmp = node.getAttribute ("ul-coords")
+        self.ul = utils.parse_coords (tmp)
+        tmp = node.getAttribute ("lr-coords")
+        self.lr = utils.parse_coords (tmp)
+        self.identity = int (node.getAttribute ("identity"))
+        try:
+            tmp = node.getAttribute ("background-color")
+            self.background_color = gtk.gdk.color_parse(tmp)
+            tmp = node.getAttribute ("foreground-color")
+            self.foreground_color = gtk.gdk.color_parse(tmp)
+        except ValueError:
+            pass
+        self.min_x = float(node.getAttribute ("min_x"))
+        self.min_y = float(node.getAttribute ("min_y"))
+        self.max_x = float(node.getAttribute ("max_x"))
+        self.max_y = float(node.getAttribute ("max_y"))
+
+        self.width = self.lr[0] - self.ul[0]
+        self.height = self.lr[1] - self.ul[1]
+
+        self.am_selected = node.hasAttribute ("current_root")
+        self.am_primary = node.hasAttribute ("primary_root")
+
+        for n in node.childNodes:
+            if n.nodeName == "Extended":
+                self.extended_buffer.load(n)
+            elif n.nodeName == "point":
+                style = int (n.getAttribute ("type"))
+                tmp = n.getAttribute ("coords")
+                c = utils.parse_coords (tmp)
+                col = None
+                try:
+                    tmp = n.getAttribute ("color")
+                    col = gtk.gdk.color_parse (tmp)
+                except ValueError:
+                    pass
+                self.points.append (self.DrawingPoint (c, style, col))
+            else:
+                print "Unknown node type: "+str(n.nodeName)
+
+    def export (self, context, move_x, move_y):
+        utils.export_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_NORMAL,
+                                                                  (move_x, move_y))
+        cwidth = context.get_line_width ()
+        context.set_line_width (1)
+        if len (self.points) > 0:
+            for p in self.points:
+                if p.style == STYLE_BEGIN:
+                    context.move_to (p.x+move_x, p.y+move_y)
+                else:
+                    context.line_to (p.x+move_x,p.y+move_y)
+
+        context.set_line_width (cwidth)
+        r,g,b = utils.gtk_to_cairo_color(self.foreground_color)
+        context.set_source_rgb (r, g, b)
+        context.stroke ()
+        return
+
+    def includes (self, coords, mode):
+        if not self.ul or not self.lr or not coords:
+            return False
+
+        if self.want_move and mode == MODE_DRAW:
+            self.emit ("change_mouse_cursor", gtk.gdk.PENCIL)
+            return True
+
+        inside = (coords[0] < self.lr[0] + self.sensitive) and \
+                         (coords[0] > self.ul[0] - self.sensitive) and \
+                     (coords[1] < self.lr[1] + self.sensitive) and \
+                     (coords[1] > self.ul[1] - self.sensitive)
+
+        self.resizing = self.RESIZE_NONE
+        self.motion_coords = coords
+
+        if inside and (mode != MODE_EDITING or self.button_down):
+            if mode == MODE_DRAW:
+                self.emit ("change_mouse_cursor", gtk.gdk.PENCIL)
+            else:
+                self.emit ("change_mouse_cursor", gtk.gdk.LEFT_PTR)
+            return inside
+
+        if inside:
+            # 2 cases: 1. The click was within the main area
+            #                  2. The click was near the border
+            # In the first case, we handle as normal
+            # In the second case, we want to intercept all the fun thats
+            # going to happen so we can resize the thought
+            if abs (coords[0] - self.ul[0]) < self.sensitive:
+                # its near the top edge somewhere
+                if abs (coords[1] - self.ul[1]) < self.sensitive:
+                # Its in the ul corner
+                    self.resizing = self.RESIZE_UL
+                    self.emit ("change_mouse_cursor", gtk.gdk.TOP_LEFT_CORNER)
+                elif abs (coords[1] - self.lr[1]) < self.sensitive:
+                # Its in the ll corner
+                    self.resizing = self.RESIZE_LL
+                    self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_LEFT_CORNER)
+                elif coords[1] < self.lr[1] and coords[1] > self.ul[1]:
+                #anywhere else along the left edge
+                    self.resizing = self.RESIZE_LEFT
+                    self.emit ("change_mouse_cursor", gtk.gdk.LEFT_SIDE)
+            elif abs (coords[0] - self.lr[0]) < self.sensitive:
+                if abs (coords[1] - self.ul[1]) < self.sensitive:
+                # Its in the UR corner
+                    self.resizing = self.RESIZE_UR
+                    self.emit ("change_mouse_cursor", gtk.gdk.TOP_RIGHT_CORNER)
+                elif abs (coords[1] - self.lr[1]) < self.sensitive:
+                # Its in the lr corner
+                    self.resizing = self.RESIZE_LR
+                    self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_RIGHT_CORNER)
+                elif coords[1] < self.lr[1] and coords[1] > self.ul[1]:
+                #anywhere else along the right edge
+                    self.resizing = self.RESIZE_RIGHT
+                    self.emit ("change_mouse_cursor", gtk.gdk.RIGHT_SIDE)
+            elif abs (coords[1] - self.ul[1]) < self.sensitive and \
+                     (coords[0] < self.lr[0] and coords[0] > self.ul[0]):
+                # Along the top edge somewhere
+                self.resizing = self.RESIZE_TOP
+                self.emit ("change_mouse_cursor", gtk.gdk.TOP_SIDE)
+            elif abs (coords[1] - self.lr[1]) < self.sensitive and \
+                     (coords[0] < self.lr[0] and coords[0] > self.ul[0]):
+                # Along the bottom edge somewhere
+                self.resizing = self.RESIZE_BOTTOM
+                self.emit ("change_mouse_cursor", gtk.gdk.BOTTOM_SIDE)
+            else:
+                self.emit ("change_mouse_cursor", gtk.gdk.LEFT_PTR)
+        self.want_move = (self.resizing != self.RESIZE_NONE)
+        return inside
+
+    def get_popup_menu_items(self):
+        return []

=== added file 'labyrinth_lib/ImageThought.py'
--- labyrinth_lib/ImageThought.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/ImageThought.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,342 @@
+# ImageThought.py
+# This file is part of labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#
+# labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+# Standard library
+import os.path
+import xml.dom
+import gettext
+_ = gettext.gettext
+
+# Gtk stuff
+import gtk
+import cairo
+
+# Local imports
+import BaseThought
+import utils
+import UndoManager
+
+MODE_EDITING = 0
+MODE_IMAGE = 1
+MODE_DRAW = 2
+
+UNDO_RESIZE = 0
+
+class ImageThought (BaseThought.ResizableThought):
+    def __init__ (self, coords, pango_context, thought_number, save, undo, loading, background_color):
+        super (ImageThought, self).__init__(save, "image_thought", undo, background_color, None)
+
+        self.identity = thought_number
+        margin = utils.margin_required (utils.STYLE_NORMAL)
+        self.want_move = False
+        if coords:
+            self.ul = (coords[0]-margin[0], coords[1] - margin[1])
+            self.pic_location = coords
+        else:
+            self.ul = None
+        self.button_press = False
+
+        if not loading:
+            self.all_okay = self.open_image ()
+        else:
+            self.all_okay = True
+
+    def open_image (self, filename = None):
+        # Present a dialog for the user to choose an image here
+        if not filename:
+            fil = gtk.FileFilter ()
+            fil.set_name("Images")
+            fil.add_pixbuf_formats ()
+            dialog = gtk.FileChooserDialog (_("Choose image to insert"), None, gtk.FILE_CHOOSER_ACTION_OPEN, \
+                                     (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+            dialog.add_filter (fil)
+            res = dialog.run ()
+            dialog.hide ()
+            if res != gtk.RESPONSE_OK:
+                return False
+            else:
+                fname = dialog.get_filename()
+        else:
+            fname = filename
+
+        try:
+            self.orig_pic = gtk.gdk.pixbuf_new_from_file (fname)
+        except:
+            try:
+                # lets see if file was imported and is already extracted
+                fname = os.path.join (utils.get_images_dir (), + os.path.basename(filename))
+                self.orig_pic = gtk.gdk.pixbuf_new_from_file (fname)
+            except:
+                return False
+
+        self.filename = fname
+
+        if not filename:
+            self.width = self.orig_pic.get_width ()
+            self.height = self.orig_pic.get_height ()
+            margin = utils.margin_required (utils.STYLE_NORMAL)
+
+            self.lr = (self.pic_location[0]+self.width+margin[2], self.pic_location[1]+self.height+margin[3])
+            self.pic = self.orig_pic
+        self.text = fname[fname.rfind('/')+1:fname.rfind('.')]
+        return True
+
+    def draw (self, context):
+        if len (self.extended_buffer.get_text()) == 0:
+            utils.draw_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_NORMAL)
+        else:
+            utils.draw_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_EXTENDED_CONTENT)
+
+        if self.pic:
+            context.set_source_pixbuf (self.pic, self.pic_location[0], self.pic_location[1])
+            context.rectangle (self.pic_location[0], self.pic_location[1], self.width, self.height)
+            context.fill ()
+        context.set_source_rgb (0,0,0)
+
+    def export (self, context, move_x, move_y):
+        utils.export_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_NORMAL,
+                                                                  (move_x, move_y))
+        if self.pic:
+            if hasattr(context, "set_source_pixbuf"):
+                context.set_source_pixbuf (self.pic, self.pic_location[0]+move_x, self.pic_location[1]+move_y)
+            elif hasattr(context, "set_source_surface"):
+                pixel_array = utils.pixbuf_to_cairo (self.pic.get_pixels_array())
+                image_surface = cairo.ImageSurface.create_for_data(pixel_array, cairo.FORMAT_ARGB32, self.width, self.height, -1)
+                context.set_source_surface (image_surface, self.pic_location[0]+move_x, self.pic_location[1]+move_y)
+            context.rectangle (self.pic_location[0]+move_x, self.pic_location[1]+move_y, self.width, self.height)
+            context.fill ()
+        context.set_source_rgb (0,0,0)
+
+    def want_motion (self):
+        return self.want_move
+
+    def recalc_edges (self):
+        margin = utils.margin_required (utils.STYLE_NORMAL)
+        self.pic_location = (self.ul[0]+margin[0], self.ul[1]+margin[1])
+        self.lr = (self.pic_location[0]+self.width+margin[2], self.pic_location[1]+self.height+margin[3])
+
+    def recalc_position (self):
+        self.recalc_edges ()
+
+    def undo_resize (self, action, mode):
+        self.undo.block ()
+        if mode == UndoManager.UNDO:
+            choose = 0
+        else:
+            choose = 1
+        self.ul = action.args[choose][0]
+        self.width = action.args[choose][1]
+        self.height = action.args[choose][2]
+        self.pic = self.orig_pic.scale_simple (int(self.width), int(self.height), gtk.gdk.INTERP_HYPER)
+        self.recalc_edges ()
+        self.emit ("update_links")
+        self.emit ("update_view")
+        self.undo.unblock ()
+
+    def process_button_down (self, event, mode, transformed):
+        modifiers = gtk.accelerator_get_default_mod_mask ()
+        self.button_down = True
+        if event.button == 1:
+            if event.type == gtk.gdk.BUTTON_PRESS:
+                self.emit ("select_thought", event.state & modifiers)
+                self.emit ("update_view")
+            if mode == MODE_EDITING and self.resizing != self.RESIZE_NONE:
+                self.orig_size = (self.ul, self.width, self.height)
+                self.want_move = True
+                return True
+        elif event.button == 3:
+            self.emit ("popup_requested", event, 1)
+        self.emit ("update_view")
+
+    def process_button_release (self, event, unending_link, mode, transformed):
+        self.button_down = False
+        if unending_link:
+            unending_link.set_child (self)
+            self.emit ("claim_unending_link")
+        if self.orig_pic:
+            self.pic = self.orig_pic.scale_simple (int(self.width), int(self.height), gtk.gdk.INTERP_HYPER)
+        self.emit ("update_view")
+        if self.want_move:
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_RESIZE, self.undo_resize, \
+                                                                                                    self.orig_size, (self.ul, self.width, self.height)))
+            self.want_move = False
+
+    def handle_motion (self, event, mode, transformed):
+        if self.resizing == self.RESIZE_NONE or not self.want_move or not event.state & gtk.gdk.BUTTON1_MASK:
+            if not event.state & gtk.gdk.BUTTON1_MASK:
+                return False
+            elif mode == MODE_EDITING:
+                self.emit ("create_link", \
+                 (self.ul[0]-((self.ul[0]-self.lr[0]) / 2.), self.ul[1]-((self.ul[1]-self.lr[1]) / 2.)))
+            return True
+        diffx = transformed[0] - self.motion_coords[0]
+        diffy = transformed[1] - self.motion_coords[1]
+        tmp = self.motion_coords
+        self.motion_coords = transformed
+        if self.resizing == self.RESIZE_LEFT:
+            if self.width - diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.ul = (self.ul[0]+diffx, self.ul[1])
+            self.pic_location = (self.pic_location[0]+diffx, self.pic_location[1])
+            self.width -= diffx
+        elif self.resizing == self.RESIZE_RIGHT:
+            if self.width + diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.lr = (self.lr[0]+diffx, self.lr[1])
+            self.width += diffx
+        elif self.resizing == self.RESIZE_TOP:
+            if self.height - diffy < 10:
+                self.motion_coords = tmp
+                return True
+            self.ul = (self.ul[0], self.ul[1]+diffy)
+            self.pic_location = (self.pic_location[0], self.pic_location[1]+diffy)
+            self.height -= diffy
+        elif self.resizing == self.RESIZE_BOTTOM:
+            if self.height + diffy < 10:
+                self.motion_coords = tmp
+                return True
+            self.lr = (self.lr[0], self.lr[1]+diffy)
+            self.height += diffy
+        elif self.resizing == self.RESIZE_UL:
+            if self.height - diffy < 10 or self.width - diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.ul = (self.ul[0]+diffx, self.ul[1]+diffy)
+            self.pic_location = (self.pic_location[0]+diffx, self.pic_location[1]+diffy)
+            self.width -= diffx
+            self.height -= diffy
+        elif self.resizing == self.RESIZE_UR:
+            if self.height - diffy < 10 or self.width + diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.ul = (self.ul[0], self.ul[1]+diffy)
+            self.lr = (self.lr[0]+diffx, self.lr[1])
+            self.pic_location = (self.pic_location[0], self.pic_location[1]+diffy)
+            self.width += diffx
+            self.height -= diffy
+        elif self.resizing == self.RESIZE_LL:
+            if self.height + diffy < 10 or self.width - diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.ul = (self.ul[0]+diffx, self.ul[1])
+            self.lr = (self.lr[0], self.lr[1]+diffy)
+            self.pic_location = (self.pic_location[0]+diffx, self.pic_location[1])
+            self.width -= diffx
+            self.height += diffy
+        elif self.resizing == self.RESIZE_LR:
+            if self.height + diffy < 10:
+                self.motion_coords = tmp
+                return True
+            if self.width + diffx < 10:
+                self.motion_coords = tmp
+                return True
+            self.lr = (self.lr[0]+diffx, self.lr[1]+diffy)
+            self.width += diffx
+            self.height += diffy
+        if self.orig_pic:
+            self.pic = self.orig_pic.scale_simple (int(self.width), int(self.height), gtk.gdk.INTERP_NEAREST)
+        self.emit ("update_links")
+        self.emit ("update_view")
+        return True
+
+    def update_save (self):
+        text = self.extended_buffer.get_text ()
+        if text:
+            self.extended_buffer.update_save()
+        else:
+            try:
+                self.element.removeChild(self.extended_buffer.element)
+            except xml.dom.NotFoundErr:
+                pass
+        self.element.setAttribute ("ul-coords", str(self.ul))
+        self.element.setAttribute ("lr-coords", str(self.lr))
+        self.element.setAttribute ("identity", str(self.identity))
+        self.element.setAttribute ("background-color", self.background_color.to_string())
+        self.element.setAttribute ("file", str(self.filename))
+        self.element.setAttribute ("image_width", str(self.width))
+        self.element.setAttribute ("image_height", str(self.height))
+        if self.am_selected:
+            self.element.setAttribute ("current_root", "true")
+        else:
+            try:
+                self.element.removeAttribute ("current_root")
+            except xml.dom.NotFoundErr:
+                pass
+        if self.am_primary:
+            self.element.setAttribute ("primary_root", "true")
+        else:
+            try:
+                self.element.removeAttribute ("primary_root")
+            except xml.dom.NotFoundErr:
+                pass
+        return
+
+    def load (self, node):
+        tmp = node.getAttribute ("ul-coords")
+        self.ul = utils.parse_coords (tmp)
+        tmp = node.getAttribute ("lr-coords")
+        self.lr = utils.parse_coords (tmp)
+        self.filename = node.getAttribute ("file")
+        self.identity = int (node.getAttribute ("identity"))
+        try:
+            tmp = node.getAttribute ("background-color")
+            self.background_color = gtk.gdk.color_parse(tmp)
+        except ValueError:
+            pass
+        self.width = float(node.getAttribute ("image_width"))
+        self.height = float(node.getAttribute ("image_height"))
+        self.am_selected = node.hasAttribute ("current_root")
+        self.am_primary = node.hasAttribute ("primary_root")
+
+        for n in node.childNodes:
+            if n.nodeName == "Extended":
+                self.extended_buffer.load(n)
+            else:
+                print "Unknown: "+n.nodeName
+        margin = utils.margin_required (utils.STYLE_NORMAL)
+        self.pic_location = (self.ul[0]+margin[0], self.ul[1]+margin[1])
+        self.okay = self.open_image (self.filename)
+        self.lr = (self.pic_location[0]+self.width+margin[2], self.pic_location[1]+self.height+margin[3])
+        if not self.okay:
+            dialog = gtk.MessageDialog (None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                                                                    gtk.MESSAGE_WARNING, gtk.BUTTONS_CLOSE,
+                                                                    _("Error loading file"))
+            dialog.format_secondary_text (_("%s could not be found.  Associated thought will be empty."%self.filename))
+            dialog.run ()
+            dialog.hide ()
+            self.pic = None
+            self.orig_pic = None
+        else:
+            self.pic = self.orig_pic.scale_simple (int(self.width), int(self.height), gtk.gdk.INTERP_HYPER)
+        return
+
+    def change_image_cb(self, widget):
+        self.open_image()
+
+    def get_popup_menu_items(self):
+        image = gtk.Image()
+        image.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_MENU)
+        item = gtk.ImageMenuItem(_('Change Image'))
+        item.set_image(image)
+        item.connect('activate', self.change_image_cb)
+        return [item]

=== added file 'labyrinth_lib/Links.py'
--- labyrinth_lib/Links.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/Links.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,281 @@
+# Link.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import math
+import gettext
+_ = gettext.gettext
+
+import gobject
+import gtk
+
+import BaseThought
+import utils
+
+
+def norm(x, y):
+    mod = math.sqrt(abs((x[0]**2 - y[0]**2) + (x[1]**2 - y[1]**2)))
+    return [abs(x[0]-y[0]) / (mod), abs(x[1] - y[1]) / (mod)]
+
+class Link (gobject.GObject):
+    __gsignals__ = dict (select_link = (gobject.SIGNAL_RUN_FIRST,
+                                        gobject.TYPE_NONE,
+                                        (gobject.TYPE_PYOBJECT,)),
+                         update_view = (gobject.SIGNAL_RUN_LAST,
+                                        gobject.TYPE_NONE,
+                                        ()),
+                         popup_requested = (gobject.SIGNAL_RUN_FIRST,
+                                            gobject.TYPE_NONE,
+                                            (gobject.TYPE_PYOBJECT, gobject.TYPE_INT)))
+
+    def __init__ (self, save, parent = None, child = None, start_coords = None, end_coords = None, strength = 2):
+        super (Link, self).__init__()
+        self.parent = parent
+        self.child = child
+        self.end = end_coords
+        self.start = start_coords
+        self.strength = strength
+        self.element = save.createElement ("link")
+        self.selected = False
+        self.color = utils.gtk_to_cairo_color(gtk.gdk.color_parse("black"))
+
+        if not self.start and parent and parent.lr:
+            self.start = (parent.ul[0]-((parent.ul[0]-parent.lr[0]) / 2.), \
+                                      parent.ul[1]-((parent.ul[1]-parent.lr[1]) / 2.))
+
+        if parent and child:
+            self.find_ends ()
+
+    def get_save_element (self):
+        return self.element
+
+    def includes (self, coords, mode):
+        # TODO: Change this to make link selection work.  Also needs
+        # some fairly large changes in MMapArea
+        if not self.start or not self.end or not coords:
+            return False
+
+        mag = (math.sqrt(((self.end[0] - self.start[0]) ** 2) + \
+                     ((self.end[1] - self.start[1]) ** 2)))
+
+        U = (((coords[0] - self.start[0]) * (self.end[0] - self.start[0])) + \
+        ((coords[1] - self.start[1]) * (self.end[1] - self.start[1]))) / \
+        (mag**2)
+
+        inter = [self.start[0] + U*(self.end[0] - self.start[0]),
+                         self.start[1] + U*(self.end[1] - self.start[1])]
+        dist = math.sqrt(((coords[0] - inter[0]) ** 2) + \
+                     ((coords[1] - inter[1]) ** 2))
+        if dist < (3+self.strength) and dist > -(3+self.strength):
+            if self.start[0] < self.end[0] and coords[0] > self.start[0] and coords[0] < self.end[0]:
+                return True
+            elif coords[0] < self.start[0] and coords[0] > self.end[0]:
+                return True
+
+        return False
+
+    def connects (self, thought, thought2):
+        return (self.parent == thought and self.child == thought2) or \
+                        (self.child == thought and self.parent == thought2)
+
+    def set_end (self, coords):
+        self.end = coords
+
+    def set_strength (self, strength):
+        self.strength = strength
+
+    def change_strength (self, thought, thought2):
+        if not self.connects (thought, thought2):
+            return False
+        if self.parent == thought:
+            self.strength += 1
+        else:
+            self.strength -= 1
+        return self.strength != 0
+
+    def set_child (self, child):
+        self.child = child
+        self.find_ends ()
+
+    def uses (self, thought):
+        return self.parent == thought or self.child == thought
+
+    def find_ends (self):
+        (self.start, self.end) = self.parent.find_connection (self.child)
+
+    def draw (self, context):
+        if not self.start or not self.end:
+            return
+        cwidth = context.get_line_width ()
+        context.set_line_width (self.strength)
+        context.move_to (self.start[0], self.start[1])
+
+        if utils.use_bezier_curves:
+            dx = self.end[0] - self.start[0]
+            x2 = self.start[0] + dx / 2.0
+            x3 = self.end[0] - dx / 2.0
+            context.curve_to(x2, self.start[1], x3, self.end[1], self.end[0], self.end[1])
+        else:
+            context.line_to (self.end[0], self.end[1])
+
+        if self.selected:
+            color = utils.selected_colors["bg"]
+            context.set_source_rgb (color[0], color[1], color[2])
+        else:
+            context.set_source_rgb (self.color[0], self.color[1], self.color[2])
+        context.stroke ()
+        context.set_line_width (cwidth)
+        context.set_source_rgb (0.0, 0.0, 0.0)
+
+    def export (self, context, move_x, move_y):
+        rem = False
+        if not self.start or not self.end:
+            # Probably shouldn't do this, but its safe now
+            self.start = (self.parent.ul[0]-((self.parent.ul[0]-self.parent.lr[0]) / 2.), \
+                                      self.parent.ul[1]-((self.parent.ul[1]-self.parent.lr[1]) / 2.))
+            self.end = (self.child.ul[0]-((self.child.ul[0]-self.child.lr[0]) / 2.), \
+                                    self.child.ul[1]-((self.child.ul[1]-self.child.lr[1]) / 2.))
+            rem = True
+        cwidth = context.get_line_width ()
+        context.set_line_width (self.strength)
+        context.move_to (self.start[0]+move_x, self.start[1]+move_y)
+        context.line_to (self.end[0]+move_x, self.end[1]+move_y)
+        context.stroke ()
+        context.set_line_width (cwidth)
+        if rem:
+            self.start = self.end = None
+
+    def set_parent_child (self, parent, child):
+        self.parent = parent
+        self.child = child
+        if self.parent and self.child:
+            self.find_ends ()
+
+    def update_save (self):
+        self.element.setAttribute ("start", str(self.start))
+        self.element.setAttribute ("end", str(self.end))
+        self.element.setAttribute ("strength", str(self.strength))
+        self.element.setAttribute ("color", str(self.color))
+        if self.child:
+            self.element.setAttribute ("child", str(self.child.identity))
+        else:
+            self.element.setAttribute ("child", "None")
+        if self.parent:
+            self.element.setAttribute ("parent", str(self.parent.identity))
+        else:
+            self.element.setAttribute ("parent", "None")
+
+    def load (self, node):
+        self.parent_number = self.child_number = -1
+        tmp = node.getAttribute ("end")
+        if not tmp:
+            print "No tmp found"
+            return
+        self.end = utils.parse_coords (tmp)
+        tmp = node.getAttribute ("start")
+        if not tmp:
+            print "No start found"
+            return
+        self.start = utils.parse_coords (tmp)
+        self.strength = int(node.getAttribute ("strength"))
+        try:
+            colors = node.getAttribute ("color").split()
+            self.color = (float(colors[0].strip('(,)')), float(colors[1].strip('(,)')), float(colors[2].strip('(,)')))
+        except:
+            pass
+        if node.hasAttribute ("parent"):
+            tmp = node.getAttribute ("parent")
+            if tmp == "None":
+                self.parent_number = -1
+            else:
+                self.parent_number = int (tmp)
+        if node.hasAttribute ("child"):
+            tmp = node.getAttribute ("child")
+            if tmp == "None":
+                self.child_number = -1
+            else:
+                self.child_number = int (tmp)
+
+    def process_button_down (self, event, mode, transformed):
+        modifiers = gtk.accelerator_get_default_mod_mask ()
+        self.button_down = True
+        if event.button == 1:
+            if event.type == gtk.gdk.BUTTON_PRESS:
+                self.emit ("select_link", event.state & modifiers)
+                self.emit ("update_view")
+        elif event.button == 3:
+            self.emit ("popup_requested", event, 2)
+        self.emit ("update_view")
+        return False
+
+    def process_button_release (self, event, unending_link, mode, transformed):
+        return False
+
+    def process_key_press (self, event, mode):
+        if mode != BaseThought.MODE_EDITING or event.keyval == gtk.keysyms.Delete:
+            return False
+        if event.keyval == gtk.keysyms.plus or \
+           event.keyval == gtk.keysyms.KP_Add:
+            self.strength += 1
+        elif (event.keyval == gtk.keysyms.minus or \
+                  event.keyval == gtk.keysyms.KP_Subtract) and \
+                 self.strength > 1:
+            self.strength -= 1
+        elif event.keyval == gtk.keysyms.Escape:
+            self.unselect()
+        self.emit("update_view")
+        return True
+
+    def handle_motion (self, event, mode, transformed):
+        pass
+
+    def want_motion (self):
+        return False
+
+    def select(self):
+        self.selected = True
+
+    def unselect(self):
+        self.selected = False
+
+    def move_by (self, x,y):
+        pass
+
+    def can_be_parent (self):
+        return False
+
+    def set_color_cb(self, widget):
+        dialog = gtk.ColorSelectionDialog(_('Choose Color'))
+        dialog.connect('response', self.color_selection_ok_cb)
+        self.color_sel = dialog.colorsel
+        dialog.run()
+
+    def color_selection_ok_cb(self, dialog, response_id):
+        if response_id == gtk.RESPONSE_OK:
+            self.color = utils.gtk_to_cairo_color(self.color_sel.get_current_color())
+        dialog.destroy()
+
+    def get_popup_menu_items(self):
+        image = gtk.Image()
+        image.set_from_stock(gtk.STOCK_COLOR_PICKER, gtk.ICON_SIZE_MENU)
+        item = gtk.ImageMenuItem(_('Set Color'))
+        item.set_image(image)
+        item.connect('activate', self.set_color_cb)
+        return [item]

=== added file 'labyrinth_lib/MMapArea.py'
--- labyrinth_lib/MMapArea.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/MMapArea.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,1368 @@
+#! /usr/bin/env python
+# MMapArea.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import math
+
+import gtk
+import pango
+import gobject
+import gettext
+import copy
+_ = gettext.gettext
+
+import xml.dom.minidom as dom
+
+import Links
+import TextThought
+import ImageThought
+import DrawingThought
+import ResourceThought
+import UndoManager
+import utils
+
+RAD_UP = (- math.pi / 2.)
+RAD_DOWN = (math.pi / 2.)
+RAD_LEFT = (math.pi)
+RAD_RIGHT = (0)
+
+MODE_EDITING = 0
+MODE_IMAGE = 1
+MODE_DRAW = 2
+MODE_RESOURCE = 3
+# Until all references of MODE_MOVING are removed...
+MODE_MOVING = 999
+
+VIEW_LINES = 0
+VIEW_BEZIER = 1
+
+TYPE_TEXT = 0
+TYPE_IMAGE = 1
+TYPE_DRAWING = 2
+TYPE_RESOURCE = 3
+
+# TODO: Need to expand to support popup menus
+MENU_EMPTY_SPACE = 0
+
+# UNDO actions
+UNDO_MOVE = 0
+UNDO_CREATE = 1
+UNDO_DELETE = 2
+UNDO_DELETE_SINGLE = 3
+UNDO_COMBINE_DELETE_NEW = 4
+UNDO_DELETE_LINK = 5
+UNDO_STRENGTHEN_LINK = 6
+UNDO_CREATE_LINK = 7
+UNDO_ALIGN = 8
+
+# Note: This is (atm) very broken.  It will allow you to create new canvases, but not
+# create new thoughts or load existing maps.
+# To get it working either fix the TODO list at the bottom of the class, implement the
+# necessary features within all the thought types.  If you do, please send a patch ;)
+# OR: Change this class to MMapAreaNew and MMapAreaOld to MMapArea
+
+class MMapArea (gtk.DrawingArea):
+    '''A MindMapArea Widget.  A blank canvas with a collection of child thoughts.\
+       It is responsible for processing signals and such from the whole area and \
+       passing these on to the correct child.  It also informs things when to draw'''
+
+    __gsignals__ = dict (title_changed             = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_STRING, )),
+                         doc_save                  = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
+                         doc_delete                = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      ()),
+                         change_mode               = (gobject.SIGNAL_RUN_LAST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_INT, )),
+                         change_buffer             = (gobject.SIGNAL_RUN_LAST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_OBJECT, )),
+                         text_selection_changed    = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_INT, gobject.TYPE_INT, gobject.TYPE_STRING)),
+                         thought_selection_changed = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
+                         set_focus                 = (gobject.SIGNAL_RUN_FIRST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN)),
+                         set_attrs                 = (gobject.SIGNAL_RUN_LAST,
+                                                      gobject.TYPE_NONE,
+                                                      (gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, pango.FontDescription)))
+
+    def __init__(self, undo):
+        super (MMapArea, self).__init__()
+
+        self.thoughts = []
+        self.links = []
+        self.selected = []
+        self.num_selected = 0
+        self.primary = None
+        self.editing = None
+        self.pango_context = self.create_pango_context()
+        self.undo = undo
+        self.scale_fac = 1.0
+        self.translate = False
+        self.translation = [0.0,0.0]
+        self.timeout = -1
+        self.current_cursor = None
+        self.do_filter = True
+        self.is_bbox_selecting = False
+
+        self.unending_link = None
+        self.nthoughts = 0
+
+        impl = dom.getDOMImplementation()
+        self.save = impl.createDocument("http://www.donscorgie.blueyonder.co.uk/labns", "MMap", None)
+        self.element = self.save.documentElement
+        self.im_context = gtk.IMMulticontext ()
+
+        self.mode = MODE_EDITING
+        self.old_mode = MODE_EDITING
+
+        self.connect ("expose_event", self.expose)
+        self.connect ("button_release_event", self.button_release)
+        self.connect ("button_press_event", self.button_down)
+        self.connect ("motion_notify_event", self.motion_event)
+        self.connect ("key_press_event", self.key_press)
+        self.connect ("key_release_event", self.key_release)
+        self.connect ("scroll_event", self.scroll)
+        self.commit_handler = None
+        self.title_change_handler = None
+        self.moving = False
+        self.move_origin = None
+        self.move_origin_new = None
+        self.motion = None
+        self.move_action = None
+        self.current_root = []
+        self.rotation = 0
+
+        self.set_events (gtk.gdk.KEY_PRESS_MASK |
+                         gtk.gdk.KEY_RELEASE_MASK |
+                         gtk.gdk.BUTTON_PRESS_MASK |
+                         gtk.gdk.BUTTON_RELEASE_MASK |
+                         gtk.gdk.POINTER_MOTION_MASK |
+                         gtk.gdk.SCROLL_MASK)
+
+        self.set_flags (gtk.CAN_FOCUS)
+
+        # set theme colors
+        w = gtk.Window()
+        w.realize()
+        style = w.get_style()
+        self.pango_context.set_font_description(style.font_desc)
+        self.font_name = style.font_desc.to_string()
+        utils.default_font = self.font_name
+
+        utils.default_colors["text"] = utils.gtk_to_cairo_color(style.text[gtk.STATE_NORMAL])
+        utils.default_colors["base"] = utils.gtk_to_cairo_color(style.base[gtk.STATE_NORMAL])
+        self.background_color = style.base[gtk.STATE_NORMAL]
+        self.foreground_color = style.text[gtk.STATE_NORMAL]
+        utils.default_colors["bg"] = utils.gtk_to_cairo_color(style.bg[gtk.STATE_NORMAL])
+        utils.default_colors["fg"] = utils.gtk_to_cairo_color(style.fg[gtk.STATE_NORMAL])
+
+        utils.selected_colors["text"] = utils.gtk_to_cairo_color(style.text[gtk.STATE_SELECTED])
+        utils.selected_colors["bg"] = utils.gtk_to_cairo_color(style.bg[gtk.STATE_SELECTED])
+        utils.selected_colors["fg"] = utils.gtk_to_cairo_color(style.fg[gtk.STATE_SELECTED])
+        utils.selected_colors["fill"] = utils.gtk_to_cairo_color(style.base[gtk.STATE_SELECTED])
+
+    def transform_coords(self, loc_x, loc_y):
+        if hasattr(self, "transform"):
+            return self.transform.transform_point(loc_x, loc_y)
+
+    def untransform_coords(self, loc_x, loc_y):
+        if hasattr(self, "untransform"):
+            return self.untransform.transform_point(loc_x, loc_y)
+
+    def button_down (self, widget, event):
+        coords = self.transform_coords (event.get_coords()[0], event.get_coords()[1])
+
+        ret = False
+        obj = self.find_object_at (coords)
+        if event.button == 2:
+            self.set_cursor (gtk.gdk.FLEUR)
+            self.original_translation = self.translation
+            self.origin_x = event.x
+            self.origin_y = event.y
+            return
+        if obj and obj.want_motion ():
+            self.motion = obj
+            ret = obj.process_button_down (event, self.mode, coords)
+            if event.button == 1 and self.mode == MODE_EDITING:
+                self.moving = not (event.state & gtk.gdk.CONTROL_MASK)
+                self.move_origin = (coords[0], coords[1])
+                self.move_origin_new = self.move_origin
+            return ret
+        if obj:
+            if event.button == 1 and self.mode == MODE_EDITING:
+                self.moving = not (event.state & gtk.gdk.CONTROL_MASK)
+                self.move_origin = (coords[0], coords[1])
+                self.move_origin_new = self.move_origin
+            ret = obj.process_button_down (event, self.mode, coords)
+        elif event.button == 1 and self.mode == MODE_EDITING and not self.editing:
+            self.bbox_origin = coords
+            self.is_bbox_selecting = True
+        elif event.button == 3:
+            ret = self.create_popup_menu (None, event, MENU_EMPTY_SPACE)
+        return ret
+
+    def undo_move (self, action, mode):
+        self.undo.block ()
+        move_thoughts = action.args[1]
+        old_coords = action.args[0]
+        new_coords = action.args[2]
+        move_x = old_coords[0] - new_coords[0]
+        move_y = old_coords[1] - new_coords[1]
+        if mode == UndoManager.REDO:
+            move_x = -move_x
+            move_y = -move_y
+        self.unselect_all ()
+        for t in move_thoughts:
+            self.select_thought (t, -1)
+            t.move_by (move_x, move_y)
+        self.undo.unblock ()
+        self.invalidate ((old_coords[0], old_coords[1], new_coords[0], new_coords[1]))
+
+    def button_release (self, widget, event):
+        coords = self.transform_coords (event.get_coords()[0], event.get_coords()[1])
+
+        if self.mode == MODE_EDITING:
+            self.set_cursor(gtk.gdk.LEFT_PTR)
+        else:
+            self.set_cursor(gtk.gdk.CROSSHAIR)
+
+        ret = False
+        if self.is_bbox_selecting:
+            self.is_bbox_selecting = False
+            self.invalidate ()
+            try:
+                if abs(self.bbox_origin[0] - coords[0]) > 2.0:
+                    return True
+            except AttributeError:  # no bbox_current
+                pass
+
+        if self.translate:
+            self.translate = False
+            return True
+        if self.moving and self.move_action:
+            self.move_action.add_arg (coords)
+            self.undo.add_undo (self.move_action)
+            self.move_action = None
+
+        self.motion = None
+        self.moving = False
+        self.move_origin = None
+
+        obj = self.find_object_at (coords)
+        if event.button == 2:
+            self.undo.add_undo (UndoManager.UndoAction (self, UndoManager.TRANSFORM_CANVAS,
+                self.undo_transform_cb,
+                self.scale_fac, self.scale_fac,
+                self.original_translation,
+                self.translation))
+
+        if obj:
+            ret = obj.process_button_release (event, self.unending_link, self.mode, coords)
+            if len(self.selected) != 1:
+                self.invalidate()       # does not invalidate correctly with obj.get_max_area()
+                return ret
+        elif self.unending_link or event.button == 1:
+            sel = self.selected
+            thought = self.create_new_thought (coords)
+            if not thought:
+                return True
+            if not self.primary:
+                self.make_primary (thought)
+                self.select_thought (thought, None)
+            else:
+                self.emit ("change_buffer", thought.extended_buffer)
+                self.hookup_im_context (thought)
+                # Creating links adds an undo action.  Block it here
+                self.undo.block ()
+                for x in self.current_root:
+                    self.create_link (x, None, thought)
+                for x in self.selected:
+                    x.unselect ()
+                self.selected = [thought]
+                thought.select ()
+
+            if self.unending_link:
+                self.unending_link.set_child (thought)
+                self.links.append (self.unending_link)
+                element = self.unending_link.get_save_element ()
+                self.element.appendChild (element)
+                self.unending_link = None
+
+            self.undo.unblock ()
+            thought.foreground_color = self.foreground_color
+            thought.background_color = self.background_color
+            act = UndoManager.UndoAction (self, UNDO_CREATE, self.undo_create_cb, thought, sel, \
+                    self.mode, self.old_mode, event.get_coords())
+            for l in self.links:
+                if l.uses (thought):
+                    act.add_arg (l)
+            if self.undo.peak ().undo_type == UNDO_DELETE_SINGLE:
+                last_action = self.undo.pop ()
+                action = UndoManager.UndoAction (self, UNDO_COMBINE_DELETE_NEW, self.undo_joint_cb, \
+                    last_action, act)
+                self.undo.add_undo (action)
+            else:
+                self.undo.add_undo (act)
+            self.begin_editing (thought)
+
+        self.invalidate ()
+        return ret
+
+    def undo_transform_cb (self, action, mode):
+        if mode == UndoManager.UNDO:
+            self.scale_fac = action.args[0]
+            self.translation = action.args[2]
+        else:
+            self.scale_fac = action.args[1]
+            self.translation = action.args[3]
+        self.invalidate ()
+
+    def scroll (self, widget, event):
+        scale = self.scale_fac
+        if event.direction == gtk.gdk.SCROLL_UP:
+            if self.scale_fac > 10:
+                return  # Limit zoom in to 10x
+            self.scale_fac*=1.2
+
+            # Zoom based on where cursor is located.
+            coords = self.transform_coords(event.x, event.y)
+            geom = self.window.get_geometry()
+            middle = self.transform_coords(geom[2]/2.0, geom[3]/2.0)
+
+            # Without the /4.0, the window jumps to where the cursor is
+            # centred, which is very awkward and hard to use. This method makes
+            # the centre move smoothly towards the cursor's location.
+            self.translation[0] -= (coords[0] - middle[0])/4.0
+            self.translation[1] -= (coords[1] - middle[1])/4.0
+        elif event.direction == gtk.gdk.SCROLL_DOWN:
+            if self.scale_fac <= 0.1:
+                return  # Limit zoom out to 1/10th scale
+            self.scale_fac/=1.2
+
+        self.undo.add_undo (UndoManager.UndoAction (self, UndoManager.TRANSFORM_CANVAS, \
+            self.undo_transform_cb,
+            scale, self.scale_fac, self.translation,
+            self.translation))
+        self.invalidate()
+
+    def undo_joint_cb (self, action, mode):
+        delete = action.args[0]
+        create = action.args[1]
+
+        if mode == UndoManager.UNDO:
+            self.undo_create_cb (create, mode)
+            self.undo_deletion (delete, mode)
+        else:
+            self.undo_deletion (delete, mode)
+            self.undo_create_cb (create, mode)
+        self.invalidate ()
+
+    def key_press (self, widget, event):
+        if not self.do_filter or not self.im_context.filter_keypress (event):
+            if self.editing:
+                if not self.editing.process_key_press (event, self.mode):
+                    return self.global_key_handler (event)
+                return True
+            if len(self.selected) != 1 or not self.selected[0].process_key_press (event, self.mode):
+                return self.global_key_handler (event)
+        return True
+
+    def key_release (self, widget, event):
+        self.im_context.filter_keypress (event)
+        return True
+
+    def motion_event(self, widget, event):
+        coords = self.transform_coords (event.get_coords()[0], event.get_coords()[1])
+
+        if self.motion:
+            if self.motion.handle_motion (event, self.mode, coords):
+                return True
+        obj = self.find_object_at (coords)
+        if self.unending_link and not self.is_bbox_selecting:
+            self.unending_link.set_end (coords)
+            self.invalidate ()
+            return True
+        elif event.state & gtk.gdk.BUTTON1_MASK and self.is_bbox_selecting:
+            self.bbox_current = coords
+            self.invalidate()
+
+            ul = [ self.bbox_origin[0], self.bbox_origin[1] ]
+            lr = [ coords[0], coords[1] ]
+            if self.bbox_origin[0] > coords[0]:
+                if self.bbox_origin[1] < coords[1]:
+                    ul[0] = coords[0]
+                    ul[1] = self.bbox_origin[1]
+                    lr[0] = self.bbox_origin[0]
+                    lr[1] = coords[1]
+                else:
+                    ul = coords
+                    lr = self.bbox_origin
+            elif self.bbox_origin[1] > coords[1]:
+                ul[0] = self.bbox_origin[0]
+                ul[1] = coords[1]
+                lr[0] = coords[0]
+                lr[1] = self.bbox_origin[1]
+
+            # FIXME: O(n) runtime is bad
+            for t in self.thoughts:
+                if t.lr[0] > ul[0] and t.ul[1] < lr[1] and t.ul[0] < lr[0] and t.lr[1] > ul[1] :
+                    if t not in self.selected:
+                        self.select_thought(t, gtk.gdk.SHIFT_MASK)
+                else:
+                    if t in self.selected:
+                        t.unselect()
+                        self.selected.remove(t)
+
+            return True
+        elif self.moving and not self.editing and not self.unending_link:
+            self.set_cursor(gtk.gdk.FLEUR)
+            if not self.move_action:
+                self.move_action = UndoManager.UndoAction (self, UNDO_MOVE, self.undo_move, self.move_origin,
+                                                                                                   self.selected)
+            for t in self.selected:
+                t.move_by (coords[0] - self.move_origin_new[0], coords[1] - self.move_origin_new[1])
+            self.move_origin_new = (coords[0], coords[1])
+            self.invalidate ()
+            return True
+        elif self.editing and event.state & gtk.gdk.BUTTON1_MASK and not obj and not self.is_bbox_selecting:
+            # We were too quick with the movement.  We really actually want to
+            # create the unending link
+            self.create_link (self.editing)
+            self.finish_editing ()
+        elif event.state & gtk.gdk.BUTTON2_MASK:
+            self.translate = True
+            self.translation[0] -= (self.origin_x - event.x) / self.scale_fac
+            self.translation[1] -= (self.origin_y - event.y) / self.scale_fac
+            self.origin_x = event.x
+            self.origin_y = event.y
+            self.invalidate()
+            return True
+
+        if obj:
+            obj.handle_motion (event, self.mode, coords)
+        elif self.mode == MODE_IMAGE or self.mode == MODE_DRAW:
+            self.set_cursor(gtk.gdk.CROSSHAIR)
+        else:
+            self.set_cursor(gtk.gdk.LEFT_PTR)
+
+    def find_object_at (self, coords):
+        for x in reversed(self.thoughts):
+            if x.includes (coords, self.mode):
+                return x
+        for x in self.links:
+            if x.includes (coords, self.mode):
+                return x
+        return None
+
+    def realize_cb (self, widget):
+        self.disconnect (self.realize_handle)
+        if self.mode == MODE_IMAGE or self.mode == MODE_DRAW:
+            self.set_cursor (gtk.gdk.CROSSHAIR)
+        else:
+            self.set_cursor (gtk.gdk.LEFT_PTR)
+        return False
+
+    def set_cursor(self, kind):
+        new_cursor = CursorFactory().get_cursor(kind)
+        if self.current_cursor != new_cursor:
+            self.current_cursor = new_cursor
+            self.window.set_cursor(self.current_cursor)
+
+    def set_mode (self, mode):
+        if mode == self.mode:
+            return
+        self.old_mode = self.mode
+        self.mode = mode
+        self.finish_editing ()
+        self.hookup_im_context ()
+
+        if self.window:
+            if mode == MODE_IMAGE or mode == MODE_DRAW:
+                self.set_cursor (gtk.gdk.CROSSHAIR)
+            else:
+                self.set_cursor (gtk.gdk.LEFT_PTR)
+        else:
+            self.realize_handle = self.connect ("realize", self.realize_cb)
+        self.mode = mode
+        if self.window:
+            self.invalidate ()
+
+    def title_changed_cb (self, widget, new_title):
+        self.emit ("title_changed", new_title)
+
+    def make_primary (self, thought):
+        if self.primary:
+            print "Warning: Already have a primary root"
+            if self.title_change_handler:
+                self.primary.disconnect (self.title_change_handler)
+        self.title_change_handler = thought.connect ("title_changed", self.title_changed_cb)
+        self.emit ("title_changed", thought.text)
+        self.primary = thought
+        thought.make_primary ()
+
+    def hookup_im_context (self, thought = None):
+        if self.commit_handler:
+            self.im_context.disconnect (self.commit_handler)
+            self.im_context.disconnect (self.delete_handler)
+            self.im_context.disconnect (self.preedit_changed_handler)
+            self.im_context.disconnect (self.preedit_end_handler)
+            self.im_context.disconnect (self.preedit_start_handler)
+            self.im_context.disconnect (self.retrieve_handler)
+            self.commit_handler = None
+        if thought:
+            try:
+                self.commit_handler = self.im_context.connect ("commit", thought.commit_text, self.mode, self.font_name)
+                self.delete_handler = self.im_context.connect ("delete-surrounding", thought.delete_surroundings, self.mode)
+                self.preedit_changed_handler = self.im_context.connect ("preedit-changed", thought.preedit_changed, self.mode)
+                self.preedit_end_handler = self.im_context.connect ("preedit-end", thought.preedit_end, self.mode)
+                self.preedit_start_handler = self.im_context.connect ("preedit-start", thought.preedit_start, self.mode)
+                self.retrieve_handler = self.im_context.connect ("retrieve-surrounding", thought.retrieve_surroundings, \
+                                                                                                                 self.mode)
+                self.do_filter = True
+            except AttributeError:
+                self.do_filter = False
+        else:
+            self.do_filter = False
+
+    def unselect_all (self):
+        self.hookup_im_context ()
+        for t in self.selected:
+            t.unselect ()
+        self.selected = []
+
+    def select_link (self, link, modifiers):
+        if modifiers and modifiers & gtk.gdk.SHIFT_MASK and len (self.selected) > 1 and self.selected.count (link) > 0:
+            self.selected.remove (link)
+            link.unselect ()
+            return
+
+        self.hookup_im_context()
+        if self.editing:
+            self.finish_editing ()
+        if modifiers and (modifiers & gtk.gdk.SHIFT_MASK or modifiers == -1):
+            if self.selected.count (link) == 0:
+                self.selected.append (link)
+        else:
+            for t in self.selected:
+                t.unselect()
+            self.selected = [link]
+        link.select()
+        self.emit("change_buffer", None)
+
+    def select_thought (self, thought, modifiers):
+        self.hookup_im_context ()
+        if self.editing:
+            self.finish_editing ()
+
+        if thought in self.selected and self.moving:
+            return
+
+        if thought not in self.thoughts:
+            self.thoughts.append(thought)
+
+        if modifiers and (modifiers & gtk.gdk.SHIFT_MASK or modifiers == -1):
+            if self.selected.count (thought) == 0:
+                self.selected.append (thought)
+        else:
+            for x in self.selected:
+                x.unselect()
+            self.selected = [thought]
+        self.current_root = []
+        for x in self.selected:
+            if x.can_be_parent():
+                self.current_root.append(x)
+        thought.select ()
+        if len(self.selected) == 1:
+            self.emit ("thought_selection_changed", thought.background_color, thought.foreground_color)
+            self.background_color = thought.background_color
+            # Image thoughts don't have a foreground colour, so we shouldn't
+            # copy it.
+            if thought.foreground_color is not None:
+                self.foreground_color = thought.foreground_color
+            try:
+                self.emit ("change_buffer", thought.extended_buffer)
+            except AttributeError:
+                self.emit ("change_buffer", None)
+            self.hookup_im_context (thought)
+        else:
+            self.emit ("change_buffer", None)
+
+    def begin_editing (self, thought):
+        if self.editing and thought != self.editing:
+            self.finish_editing ()
+        if thought.begin_editing ():
+            self.editing = thought
+            self.invalidate()
+
+    def undo_link_action (self, action, mode):
+        self.undo.block ()
+        if self.editing:
+            self.finish_editing ()
+        link = action.args[0]
+        if action.undo_type == UNDO_CREATE_LINK:
+            if mode == UndoManager.REDO:
+                self.element.appendChild (link.element)
+                self.links.append (link)
+            else:
+                self.delete_link (link)
+        elif action.undo_type == UNDO_DELETE_LINK:
+            if mode == UndoManager.UNDO:
+                self.element.appendChild (link.element)
+                self.links.append (link)
+            else:
+                self.delete_link (link)
+        elif action.undo_type == UNDO_STRENGTHEN_LINK:
+            if mode == UndoManager.UNDO:
+                link.set_strength (action.args[1])
+            else:
+                link.set_strength (action.args[2])
+
+        self.undo.unblock ()
+        self.invalidate ()
+
+    def connect_link (self, link):
+        link.connect ("select_link", self.select_link)
+        link.connect ("update_view", self.update_view)
+        link.connect ("popup_requested", self.create_popup_menu)
+
+    def create_link (self, thought, thought_coords = None, child = None, child_coords = None, strength = 2):
+        if child:
+            for x in self.links:
+                if x.connects (thought, child):
+                    if x.change_strength (thought, child):
+                        self.delete_link (x)
+                    return
+            link = Links.Link (self.save, parent = thought, child = child, strength = strength)
+            self.connect_link (link)
+            element = link.get_save_element ()
+            self.element.appendChild (element)
+            self.links.append (link)
+            return link
+        else:
+            if self.unending_link:
+                del self.unending_link
+            self.unending_link = Links.Link (self.save, parent = thought, start_coords = thought_coords,
+                    end_coords = child_coords, strength = strength)
+
+    def set_mouse_cursor_cb (self, thought, cursor_type):
+        if not self.moving:
+            self.set_cursor (cursor_type)
+
+    def update_all_links(self):
+        for l in self.links:
+            l.find_ends()
+
+    def update_links_cb (self, thought):
+        for x in self.links:
+            if x.uses (thought):
+                x.find_ends ()
+
+    def claim_unending_link (self, thought):
+        if not self.unending_link:
+            return
+        
+        if self.unending_link.parent == thought:
+            del self.unending_link
+            self.unending_link = None
+            return
+        for x in self.links:
+            if x.connects (self.unending_link.parent, thought):
+                old_strength = x.strength
+                x.change_strength (self.unending_link.parent, thought)
+                new_strength = x.strength
+                self.undo.add_undo (UndoManager.UndoAction (self, UNDO_STRENGTHEN_LINK, self.undo_link_action, x, \
+                        old_strength, new_strength))
+                del self.unending_link
+                self.unending_link = None
+                return
+
+        self.undo.add_undo (UndoManager.UndoAction (self, UNDO_CREATE_LINK, self.undo_link_action, self.unending_link))
+        self.unending_link.set_child (thought)
+        self.links.append (self.unending_link)
+        self.connect_link(self.unending_link)
+        element = self.unending_link.get_save_element ()
+        self.element.appendChild (element)
+        self.unending_link = None
+
+    def create_popup_menu (self, thought, event, menu_type):
+        menu = gtk.Menu()
+        undo_item = gtk.ImageMenuItem(gtk.STOCK_UNDO)
+        undo_item.connect('activate', self.undo.undo_action)
+        undo_item.set_sensitive(self.undo.exists_undo_action())
+        redo_item = gtk.ImageMenuItem(gtk.STOCK_REDO)
+        redo_item.connect('activate', self.undo.redo_action)
+        redo_item.set_sensitive(self.undo.exists_redo_action())
+        sep_item = gtk.SeparatorMenuItem()
+        menu.append(undo_item)
+        menu.append(redo_item)
+        menu.append(sep_item)
+        undo_item.show()
+        redo_item.show()
+        sep_item.show()
+
+        if thought:
+            for item in thought.get_popup_menu_items():
+                menu.append(item)
+                item.show()
+
+        menu.popup(None, None, None, event.button, event.get_time())
+
+    def finish_editing (self, thought = None):
+        if not self.editing or (thought and thought != self.editing):
+            return
+
+        self.editing.finish_editing ()
+        thought = self.editing
+        self.editing = None
+
+    def update_view (self, thought):
+        if not self.editing:
+            self.invalidate ()
+        else:
+            x,y,w,h = thought.get_max_area()
+            w += 10
+            h += 10
+            self.invalidate ((x,y,w,h))
+
+    def invalidate (self, transformed_area = None):
+        '''Helper function to invalidate the entire screen, forcing a redraw'''
+        rect = None
+        if not transformed_area:
+            alloc = self.get_allocation ()
+            rect = gtk.gdk.Rectangle (0, 0, alloc.width, alloc.height)
+        else:
+            ul = self.untransform_coords(transformed_area[0], transformed_area[1])
+            lr = self.untransform_coords(transformed_area[2], transformed_area[3])
+            rect = gtk.gdk.Rectangle (int(ul[0]), int(ul[1]), int(lr[0]-ul[0]), int(lr[1]-ul[1]))
+        if self.window:
+            self.window.invalidate_rect (rect, True)
+
+    def expose (self, widget, event):
+        '''Expose event.  Calls the draw function'''
+        context = self.window.cairo_create ()
+        self.draw (event, context)
+        return False
+
+    def draw (self, event, context):
+        '''Draw the map and all the associated thoughts'''
+        area = event.area
+        context.rectangle (area.x, area.y, area.width, area.height)
+        context.clip ()
+        context.set_source_rgb (1.0,1.0,1.0)
+        context.move_to (area.x, area.y)
+        context.paint ()
+        context.set_source_rgb (0.0,0.0,0.0)
+
+        alloc = self.get_allocation ()
+        context.translate(alloc.width/2., alloc.height/2.)
+        context.scale(self.scale_fac, self.scale_fac)
+        context.translate(-alloc.width/2., -alloc.height/2.)
+        context.translate(self.translation[0], self.translation[1])
+
+        for l in self.links:
+            l.draw (context)
+
+        if self.unending_link:
+            self.unending_link.draw (context)
+
+        self.untransform = context.get_matrix()
+        self.transform = context.get_matrix()
+        self.transform.invert()
+
+        ax, ay = self.transform_coords(area.x, area.y)
+        width  = area.width / self.scale_fac
+        height = area.height / self.scale_fac
+        for t in self.thoughts:
+            try:
+                if max(t.ul[0],ax)<=min(t.lr[0],ax+width) and max(t.ul[1],ay)<=min(t.lr[1],ay+height):
+                    t.draw (context)
+            except:
+                t.draw(context)
+
+        if self.is_bbox_selecting:
+            xs = self.bbox_origin[0]
+            ys = self.bbox_origin[1]
+            xe = self.bbox_current[0] - xs
+            ye = self.bbox_current[1] - ys
+
+            xs,ys = context.user_to_device(xs, ys)
+            xe,ye = context.user_to_device_distance(xe, ye)
+            xs = int(xs) + 0.5
+            ys = int(ys) + 0.5
+            xe = int(xe)
+            ye = int(ye)
+            xs,ys = context.device_to_user(xs, ys)
+            xe,ye = context.device_to_user_distance(xe, ye)
+
+            color = utils.selected_colors["border"]
+            context.set_line_width(1.0)
+            context.set_source_rgb(color[0], color[1], color[2])
+            context.rectangle(xs, ys, xe, ye)
+            context.stroke()
+
+            color = utils.selected_colors["fill"]
+            context.set_source_rgba(color[0], color[1], color[2], 0.3)
+            context.rectangle(xs, ys, xe, ye)
+            context.fill()
+            context.set_line_width(2.0)
+            context.set_source_rgba(0.0, 0.0, 0.0, 1.0)
+
+    def undo_create_cb (self, action, mode):
+        self.undo.block ()
+        if mode == UndoManager.UNDO:
+            if action.args[0] == self.editing:
+                self.editing = None
+            self.unselect_all ()
+            for t in action.args[1]:
+                self.select_thought (t, -1)
+            self.delete_thought (action.args[0])
+            self.emit ("change_mode", action.args[3])
+        else:
+            self.emit ("change_mode", action.args[2])
+            thought = action.args[0]
+            self.thoughts.append (thought)
+            for t in action.args[1]:
+                self.unselect_all ()
+                self.select_thought (t, -1)
+            self.hookup_im_context (thought)
+            self.emit ("change_buffer", thought.extended_buffer)
+            self.element.appendChild (thought.element)
+            for l in action.args[5:]:
+                self.links.append (l)
+                self.element.appendChild (l.element)
+
+            self.begin_editing (thought)
+        self.emit ("set_focus", None, False)
+        self.undo.unblock ()
+        self.invalidate ()
+
+    def create_new_thought (self, coords, thought_type = None, loading = False):
+        if self.editing:
+            self.editing.finish_editing ()
+        if thought_type != None:
+            type = thought_type
+        else:
+            type = self.mode
+
+        if type == TYPE_TEXT:
+            thought = TextThought.TextThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color, self.foreground_color)
+        elif type == TYPE_IMAGE:
+            thought = ImageThought.ImageThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color)
+        elif type == TYPE_DRAWING:
+            thought = DrawingThought.DrawingThought (coords, self.pango_context, self.nthoughts, self.save, self.undo,      \
+                                                                                             loading,self.background_color, self.foreground_color)
+        elif type == TYPE_RESOURCE:
+            thought = ResourceThought.ResourceThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color, self.foreground_color)
+        if not thought.okay ():
+            return None
+
+        if type == TYPE_IMAGE:
+            self.emit ("change_mode", self.old_mode)
+        self.nthoughts += 1
+        self.element.appendChild (thought.element)
+        thought.connect ("select_thought", self.select_thought)
+        thought.connect ("begin_editing", self.begin_editing)
+        thought.connect ("popup_requested", self.create_popup_menu)
+        thought.connect ("create_link", self.create_link)
+        thought.connect ("claim_unending_link", self.claim_unending_link)
+        thought.connect ("update_view", self.update_view)
+        thought.connect ("finish_editing", self.finish_editing)
+        thought.connect ("delete_thought", self.delete_thought)
+        thought.connect ("text_selection_changed", self.text_selection_cb)
+        thought.connect ("change_mouse_cursor", self.set_mouse_cursor_cb)
+        thought.connect ("update_links", self.update_links_cb)
+        thought.connect ("grab_focus", self.regain_focus_cb)
+        thought.connect ("update-attrs", self.update_attr_cb)
+        self.thoughts.append (thought)
+        return thought
+
+    def regain_focus_cb (self, thought, ext):
+        self.emit ("set_focus", None, ext)
+
+    def update_attr_cb (self, widget, bold, italics, underline, pango_font):
+        self.emit ("set_attrs", bold, italics, underline, pango_font)
+
+    def delete_thought (self, thought):
+        action = UndoManager.UndoAction (self, UNDO_DELETE_SINGLE, self.undo_deletion, [thought])
+        if thought.element in self.element.childNodes:
+            self.element.removeChild (thought.element)
+        self.thoughts.remove (thought)
+        try:
+            self.selected.remove (thought)
+        except:
+            pass
+        if self.editing == thought:
+            self.hookup_im_context ()
+            self.editing = None
+        if self.primary == thought:
+            thought.disconnect (self.title_change_handler)
+            self.title_change_handler = None
+            self.primary = None
+            if self.thoughts:
+                self.make_primary (self.thoughts[0])
+        rem_links = []
+        for l in self.links:
+            if l.uses (thought):
+                action.add_arg (l)
+                rem_links.append (l)
+        for l in rem_links:
+            self.delete_link (l)
+        self.undo.add_undo (action)
+        return True
+
+    def undo_deletion (self, action, mode):
+        self.undo.block ()
+        if mode == UndoManager.UNDO:
+            self.unselect_all ()
+            for l in action.args[1:]:
+                self.links.append (l)
+                self.element.appendChild (l.element)
+            for t in action.args[0]:
+                self.thoughts.append (t)
+                self.select_thought (t, -1)
+                self.element.appendChild (t.element)
+            if action.undo_type == UNDO_DELETE_SINGLE:
+                self.begin_editing (action.args[0][0])
+                self.emit ("change_buffer", action.args[0][0].extended_buffer)
+                if not self.primary:
+                    self.make_primary (action.args[0][0])
+            else:
+                self.emit ("change_buffer", None)
+        else:
+            for t in action.args[0]:
+                self.delete_thought (t)
+            for l in action.args[1:]:
+                self.delete_link (l)
+        self.emit ("set_focus", None, False)
+        self.undo.unblock ()
+        self.invalidate ()
+
+    def delete_selected_elements (self):
+        if len(self.selected) == 0:
+            return
+        action = UndoManager.UndoAction (self, UNDO_DELETE, self.undo_deletion, copy.copy(self.selected))
+        # delete_thought as a callback adds it's own undo action.  Block that here
+        self.undo.block ()
+        tmp = self.selected
+        t = tmp.pop()
+        while t:
+            if t in self.thoughts:
+                for l in self.links:
+                    if l.uses (t):
+                        action.add_arg (l)
+                self.delete_thought (t)
+            if t in self.links:
+                self.delete_link (t)
+            if len (tmp) == 0:
+                t = None
+            else:
+                t = tmp.pop()
+        self.undo.unblock ()
+        self.undo.add_undo (action)
+        self.invalidate ()
+
+    def delete_link (self, link):
+        if link.element in self.element.childNodes:
+            self.element.removeChild (link.element)
+        #link.element.unlink ()
+        self.links.remove (link)
+
+    def popup_menu_key (self, event):
+        print "Popup Menu Key"
+
+    def find_related_thought (self, radians):
+        # Find thought within angle
+        best = None
+        bestangle = 1000.
+        bestdist = 10000.
+        def do_find (one, two, currentangle, curdist, sensitivity):
+            init_x = (one.ul[0] + one.lr[0]) / 2.
+            init_y = (one.ul[1] + one.lr[1]) / 2.
+            other_x = (two.ul[0] + two.lr[0]) / 2.
+            other_y = (two.ul[1] + two.lr[1]) / 2.
+            angle = math.atan2 ((other_y - init_y), (other_x - init_x))
+            while angle > math.pi:
+                angle -= math.pi
+            while angle < -math.pi:
+                angle += math.pi
+            # We have to special-case left due to stupidity of tan's
+            # We shift it by pi radians
+            if radians == RAD_LEFT:
+                relangle = abs((angle+math.pi) - (radians+math.pi))
+                if relangle > math.pi*2.:
+                    relangle -= math.pi*2.
+            else:
+                relangle = abs(angle - radians)
+            newdist = math.sqrt ((init_x - other_x)**2 + (init_y - other_y)**2)
+            magicnum = newdist + (50. * relangle)
+# Used for debugging.  Spits out lots of useful info
+# to determine interesting things about the thought relations
+#print "angle: "+str(angle)+" rel: "+str(magicnum)+" rads: "+str(radians),
+#print " , "+str(math.pi / 3.0)+" , "+str(currentangle)+"\n: "+str(relangle)
+            if (relangle < sensitivity) and \
+               (magicnum < currentangle):
+                return (magicnum, newdist)
+            return (currentangle, curdist)
+
+        if len(self.selected) != 1:
+            return None
+        initial = self.selected[0]
+        for x in self.links:
+            if x.parent == initial:
+                other = x.child
+            elif x.child == initial:
+                other = x.parent
+            else:
+                continue
+            (curr, dist) = do_find (initial, other, bestangle, bestdist, math.pi/3.)
+            if curr < bestangle:
+                bestangle = curr
+                best = other
+                bestdist = dist
+        if not best:
+            for x in self.thoughts:
+                if x == self.selected[0]:
+                    continue
+                (curr, dist) = do_find (initial, x, bestangle, bestdist, math.pi/4.)
+                if curr < bestangle:
+                    best = x
+                    bestangle = curr
+                    bestdist = dist
+        return best
+
+    def undo_align(self, action, mode):
+        self.undo.block ()
+        dic = action.args[0]
+        if mode == UndoManager.UNDO:
+            for t in dic:
+                t.move_by(-dic[t][0], -dic[t][1])
+        else:
+            for t in dic:
+                t.move_by(dic[t][0], dic[t][1])
+        self.undo.unblock ()
+
+    def align_top_left(self, vertical=True):
+        dic = {}
+        if len(self.selected) != 0:
+            x = self.selected[0].ul[0]
+            y = self.selected[0].ul[1]
+            for t in self.selected:
+                if vertical:
+                    vec = (-(t.ul[0]-x), 0)
+                else:
+                    vec = (0, -(t.ul[1]-y))
+                t.move_by(vec[0], vec[1])
+                dic[t] = vec
+        self.undo.add_undo (UndoManager.UndoAction (self, UNDO_ALIGN, self.undo_align, dic))
+
+    def align_bottom_right(self, vertical=True):
+        dic = {}
+        if len(self.selected) != 0:
+            x = self.selected[0].lr[0]
+            y = self.selected[0].lr[1]
+            for t in self.selected:
+                if vertical:
+                    vec = (-(t.lr[0]-x), 0)
+                else:
+                    vec = (0, -(t.lr[1]-y))
+                t.move_by(vec[0], vec[1])
+                dic[t] = vec
+        self.undo.add_undo (UndoManager.UndoAction (self, UNDO_ALIGN, self.undo_align, dic))
+
+    def align_centered(self, vertical=True):
+        dic = {}
+        if len(self.selected) != 0:
+            x = self.selected[0].ul[0] + (self.selected[0].lr[0] - self.selected[0].ul[0]) / 2.0
+            y = self.selected[0].ul[1] + (self.selected[0].lr[1] - self.selected[0].ul[1]) / 2.0
+            for t in self.selected:
+                if vertical:
+                    vec = (-((t.ul[0] + (t.lr[0]-t.ul[0])/2.0)-x), 0)
+                else:
+                    vec = (0, -((t.ul[1] + (t.lr[1]-t.ul[1])/2.0)-y))
+                t.move_by(vec[0], vec[1])
+                dic[t] = vec
+        self.undo.add_undo (UndoManager.UndoAction (self, UNDO_ALIGN, self.undo_align, dic))
+
+    def global_key_handler (self, event):
+        thought = None
+        if event.keyval == gtk.keysyms.Up:
+            thought = self.find_related_thought (RAD_UP)
+        elif event.keyval == gtk.keysyms.Down:
+            thought = self.find_related_thought (RAD_DOWN)
+        elif event.keyval == gtk.keysyms.Left:
+            thought = self.find_related_thought (RAD_LEFT)
+        elif event.keyval == gtk.keysyms.Right:
+            thought = self.find_related_thought (RAD_RIGHT)
+        elif event.keyval == gtk.keysyms.Delete:
+            self.delete_selected_elements ()
+        elif event.keyval == gtk.keysyms.BackSpace:
+            self.delete_selected_elements ()
+        elif event.keyval == gtk.keysyms.Menu:
+            self.popup_menu_key (event)
+        elif event.keyval == gtk.keysyms.Escape:
+            self.unselect_all ()
+        elif event.keyval == gtk.keysyms.a and event.state & gtk.gdk.CONTROL_MASK:
+            self.unselect_all ()
+            for t in self.thoughts:
+                t.select ()
+                self.selected.append (t)
+        else:
+            return False
+
+        if thought:
+            self.select_thought (thought, None)
+        self.invalidate ()
+        return True
+
+    def load_thought (self, node, type):
+        thought = self.create_new_thought (None, type, loading = True)
+        thought.load (node)
+
+    def load_link (self, node):
+        link = Links.Link (self.save)
+        self.connect_link (link)
+        link.load (node)
+        self.links.append (link)
+        element = link.get_save_element ()
+        self.element.appendChild (element)
+
+    def load_thyself (self, top_element, doc):
+        for node in top_element.childNodes:
+            if node.nodeName == "thought":
+                self.load_thought (node, TYPE_TEXT)
+            elif node.nodeName == "image_thought":
+                self.load_thought (node, TYPE_IMAGE)
+            elif node.nodeName == "drawing_thought":
+                self.load_thought (node, TYPE_DRAWING)
+            elif node.nodeName == "res_thought":
+                self.load_thought (node, TYPE_RESOURCE)
+            elif node.nodeName == "link":
+                self.load_link (node)
+            else:
+                print "Warning: Unknown element type.  Ignoring: "+node.nodeName
+
+        self.finish_loading ()
+
+    def finish_loading (self):
+        # Possible TODO: This all assumes we've been given a proper,
+        # consistant file.  It should fallback nicely, but...
+        # First, find the primary root:
+        for t in self.thoughts:
+            if t.am_primary:
+                self.make_primary (t)
+            if t.am_selected:
+                self.selected.append (t)
+                t.select ()
+            if t.editing:
+                self.begin_editing (t)
+            if t.identity >= self.nthoughts:
+                self.nthoughts = t.identity + 1
+        if self.selected:
+            self.current_root = self.selected
+        else:
+            self.current_root = [self.primary]
+        if len(self.selected) == 1:
+            self.emit ("change_buffer", self.selected[0].extended_buffer)
+            self.hookup_im_context (self.selected[0])
+            self.emit ("thought_selection_changed", self.selected[0].background_color, \
+                       self.selected[0].foreground_color)
+        else:
+            self.emit ("change_buffer", None)
+        del_links = []
+        for l in self.links:
+            if (l.parent_number == -1 and l.child_number == -1) or \
+               (l.parent_number == l.child_number):
+                del_links.append (l)
+                continue
+            parent = child = None
+            for t in self.thoughts:
+                if t.identity == l.parent_number:
+                    parent = t
+                elif t.identity == l.child_number:
+                    child = t
+                if parent and child:
+                    break
+            l.set_parent_child (parent, child)
+            if not l.parent or not l.child:
+                del_links.append (l)
+        for l in del_links:
+            self.delete_link (l)
+
+    def prepare_save(self):
+        for t in self.thoughts:
+            t.update_save ()
+        for l in self.links:
+            l.update_save ()
+
+    def save_thyself (self):
+        self.prepare_save()
+        if len(self.thoughts) > 0:
+            self.emit ("doc_save", self.save, self.element)
+        else:
+            self.emit ("doc_delete")
+
+    def text_selection_cb (self, thought, start, end, text):
+        self.emit ("text_selection_changed", start, end, text)
+
+    def copy_clipboard (self, clip):
+        if len (self.selected) != 1:
+            return
+        self.selected[0].copy_text (clip)
+
+    def cut_clipboard (self, clip):
+        if len (self.selected) != 1:
+            return
+        self.selected[0].cut_text (clip)
+
+    def paste_clipboard (self, clip):
+        if len (self.selected) != 1:
+            return
+        self.selected[0].paste_text (clip)
+
+    def export (self, context, width, height, native):
+        context.rectangle (0, 0, width, height)
+        context.clip ()
+        context.set_source_rgb (1.0,1.0,1.0)
+        context.move_to (0,0)
+        context.paint ()
+        context.set_source_rgb (0.0,0.0,0.0)
+        if not native:
+            move_x = self.move_x
+            move_y = self.move_y
+        else:
+            move_x = 0
+            move_y = 0
+        for l in self.links:
+            l.export (context, move_x, move_y)
+        for t in self.thoughts:
+            t.export (context, move_x, move_y)
+
+    def get_max_area (self):
+        minx = 999
+        maxx = -999
+        miny = 999
+        maxy = -999
+
+        for t in self.thoughts:
+            mx,my,mmx,mmy = t.get_max_area ()
+            if mx < minx:
+                minx = mx
+            if my < miny:
+                miny = my
+            if mmx > maxx:
+                maxx = mmx
+            if mmy > maxy:
+                maxy = mmy
+        # Add a 10px border around all
+        self.move_x = 10-minx
+        self.move_y = 10-miny
+        maxx = maxx-minx+20
+        maxy = maxy-miny+20
+        return (maxx,maxy)
+
+    def get_selection_bounds (self):
+        if len (self.selected) == 1:
+            try:
+                return self.selected[0].index, self.selected[0].end_index
+            except AttributeError:
+                return None, None
+        else:
+            return None, None
+
+    def thoughts_are_linked (self):
+        if len (self.selected) != 2:
+            return False
+        for l in self.links:
+            if l.connects (self.selected[0], self.selected[1]):
+                return True
+        return False
+
+    def link_menu_cb (self):
+        if len (self.selected) != 2:
+            return
+        lnk = None
+        for l in self.links:
+            if l.connects (self.selected[0], self.selected[1]):
+                lnk = l
+                break
+        if lnk:
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_DELETE_LINK, self.undo_link_action, lnk))
+            self.delete_link (lnk)
+        else:
+            lnk = self.create_link (self.selected[0], None, self.selected[1])
+            self.undo.add_undo (UndoManager.UndoAction (self, UNDO_CREATE_LINK, self.undo_link_action, lnk))
+        self.invalidate ()
+
+    def set_bold (self, active):
+        if len(self.selected) != 1:
+            return
+        self.selected[0].set_bold (active)
+        self.invalidate()
+
+    def set_italics (self, active):
+        if len(self.selected) != 1:
+            return
+        self.selected[0].set_italics (active)
+        self.invalidate()
+
+    def set_underline (self, active):
+        if len(self.selected) != 1:
+            return
+        self.selected[0].set_underline (active)
+        self.invalidate()
+
+    def set_background_color(self, color):
+        for s in self.selected:
+            s.background_color = color
+            self.background_color = color
+        if len(self.selected) > 1:
+            self.invalidate()
+
+    def set_foreground_color(self, color):
+        for s in self.selected:
+            s.foreground_color = color
+            self.foreground_color = color
+        if len(self.selected) > 1:
+            self.invalidate()
+
+    def set_font(self, font_name):
+        if len (self.selected) == 1 and hasattr(self.selected[0], "set_font"):
+            self.selected[0].set_font(font_name)
+            self.font_name = font_name
+            self.invalidate()
+
+class CursorFactory:
+    # Shared state
+    cursors = {}
+
+    def get_cursor(self, cur_type):
+        if cur_type not in self.cursors:
+            self.cursors[cur_type] = gtk.gdk.Cursor(cur_type)
+        return self.cursors[cur_type]

=== added file 'labyrinth_lib/MainWindow.py'
--- labyrinth_lib/MainWindow.py	1970-01-01 00:00:00 +0000
+++ labyrinth_lib/MainWindow.py	2012-11-11 04:19:21 +0000
@@ -0,0 +1,770 @@
+# MainWindow.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2006 - Don Scorgie <[e-mail]>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+# Standard library
+import hashlib
+import os
+import tarfile
+import gettext
+_ = gettext.gettext
+import xml.dom.minidom as dom
+
+# Gtk stuff
+import gtk
+import cairo, pangocairo
+import gobject
+if os.name != 'nt':
+    import gconf
+
+# Local imports
+import MMapArea
+import UndoManager
+import PeriodicSaveThread
+import ImageThought
+import utils
+
+# UNDO varieties for us
+UNDO_MODE = 0
+UNDO_SHOW_EXTENDED = 1
+
+class LabyrinthWindow (gobject.GObject):
+    __gsignals__ = dict (title_changed = (gobject.SIGNAL_RUN_FIRST,
+                                          gobject.TYPE_NONE,
+                                          (gobject.TYPE_STRING, gobject.TYPE_OBJECT)),
+                         doc_save      = (gobject.SIGNAL_RUN_FIRST,
+                                          gobject.TYPE_NONE,
+                                          (gobject.TYPE_STRING, gobject.TYPE_OBJECT)),
+                         file_saved    = (gobject.SIGNAL_RUN_FIRST,
+                                          gobject.TYPE_NONE,
+                                          (gobject.TYPE_STRING, gobject.TYPE_OBJECT)),
+                         window_closed = (gobject.SIGNAL_RUN_FIRST,
+                                          gobject.TYPE_NONE,
+                                          (gobject.TYPE_OBJECT, )))
+
+    def __init__ (self, filename, imported=False):
+        super(LabyrinthWindow, self).__init__()
+
+        # FIXME:  This can go when we move entirely to gtk 2.10
+        # pygtk 2.8 doesn't have the correct function :(
+        self.set_val = gtk.gtk_version[1] > 8
+
+        # First, construct the MainArea and connect it all up
+        self.undo = UndoManager.UndoManager (self)
+        self.undo.block ()
+        self.MainArea = MMapArea.MMapArea (self.undo)
+        self.MainArea.connect ("title_changed", self.title_changed_cb)
+        self.MainArea.connect ("doc_save", self.doc_save_cb)
+        self.MainArea.connect ("doc_delete", self.doc_del_cb)
+        self.MainArea.connect ("change_mode", self.mode_request_cb)
+        self.MainArea.connect ("button-press-event", self.main_area_focus_cb)
+        self.MainArea.connect ("change_buffer", self.switch_buffer_cb)
+        self.MainArea.connect ("thought_selection_changed", self.thought_selected_cb)
+        self.MainArea.connect ("set_focus", self.main_area_focus_cb)
+        self.MainArea.connect ("set_attrs", self.attrs_cb)
+        if os.name != 'nt':
+            self.MainArea.connect ("text_selection_changed", self.selection_changed_cb)
+            self.config_client = gconf.client_get_default()
+
+        glade = gtk.glade.XML(utils.get_data_file_name('labyrinth.glade'))
+        self.main_window = glade.get_widget ('MapWindow')
+        self.main_window.set_focus_child (self.MainArea)
+        if os.name != 'nt':
+            try:
+                self.main_window.set_icon_name ('labyrinth')
+            except:
+                self.main_window.set_icon_from_file(utils.get_data_file_name('labyrinth.svg'))
+        else:
+            self.main_window.set_icon_from_file('images\\labyrinth-24.png')
+
+        # insert menu, toolbar and map
+        self.create_menu()
+        glade.get_widget ('main_area_insertion').pack_start(self.MainArea)
+        vbox = glade.get_widget ('map_window_vbox')
+        menubar = self.ui.get_widget('/MenuBar')
+        menubar.show_all()
+        vbox.pack_start(menubar)
+        vbox.reorder_child(menubar, 0)
+        vbox.set_child_packing(menubar, 0, 0, 0, gtk.PACK_START)
+
+        toolbar = self.ui.get_widget('/ToolBar')
+        toolbar.show_all()
+        vbox.pack_start(toolbar)
+        vbox.reorder_child(toolbar, 1)
+        vbox.set_child_packing(toolbar, 0, 0, 0, gtk.PACK_START)
+
+        # TODO: Bold, Italics etc.
+        self.bold_widget = glade.get_widget('tool_bold')
+        self.bold_widget.connect('toggled', self.bold_toggled)
+        self.bold_block = False
+        self.bold_state = False
+        self.italic_widget = glade.get_widget('tool_italic')
+        self.italic_widget.connect('toggled', self.italic_toggled)
+        self.italic_block = False
+        self.italic_state = False
+        self.underline_widget = glade.get_widget('tool_underline')
+        self.underline_widget.connect('toggled', self.underline_toggled)
+        self.underline_block = False
+        self.underline_state = False
+
+        self.font_widget = glade.get_widget('font_button')
+        self.font_widget.connect ("font-set", self.font_change_cb)
+        self.background_widget = glade.get_widget('background_color_button')
+        self.background_widget.connect ("color-set", self.background_change_cb)
+        self.foreground_widget = glade.get_widget('foreground_color_button')
+        self.foreground_widget.connect ("color-set", self.foreground_change_cb)
+
+        self.cut = self.ui.get_widget ('/MenuBar/EditMenu/Cut')
+        self.copy = self.ui.get_widget ('/MenuBar/EditMenu/Copy')
+        self.paste = self.ui.get_widget ('/MenuBar/EditMenu/Paste')
+        self.link = self.ui.get_widget ('/MenuBar/EditMenu/LinkThoughts')
+        self.delete = self.ui.get_widget ('/MenuBar/EditMenu/DeleteNodes')
+
+        self.ui.get_widget('/MenuBar/EditMenu').connect ('activate', self.edit_activated_cb)
+        self.cut.set_sensitive (False)
+        self.copy.set_sensitive (False)
+
+        # get toolbars and activate corresponding menu entries
+        self.main_toolbar = self.ui.get_widget ('/ToolBar')
+        self.format_toolbar = glade.get_widget ('format_toolbar')
+        self.ui.get_widget('/MenuBar/ViewMenu/ShowToolbars/ShowMainToolbar').set_active(True)
+        self.ui.get_widget('/MenuBar/ViewMenu/ShowToolbars/ShowFormatToolbar').set_active(True)
+        self.ui.get_widget('/MenuBar/ViewMenu/UseBezier').set_active(utils.use_bezier_curves)
+
+        # Add in the extended info view
+        self.extended_window = glade.get_widget('extended_window')
+        self.extended = glade.get_widget('extended')
+        self.invisible_buffer = gtk.TextBuffer ()
+
+        # Connect all our signals
+        self.main_window.connect ("configure_event", self.configure_cb)
+        self.main_window.connect ("window-state-event", self.window_state_cb)
+        self.main_window.connect ("destroy", self.close_window_cb)
+
+        # Deal with loading the map
+        if not filename:
+            self.MainArea.set_size_request (400, 400)
+            # TODO: This shouldn't be set to a hard-coded number.  Fix.
+            self.pane_pos = 500
+            self.title_cp = _("Untitled Map")
+            self.mode = MMapArea.MODE_EDITING
+            self.extended_visible = False
+        else:
+            self.parse_file (filename)
+
+        up_box = glade.get_widget('up_box')
+        up_box.connect("button-press-event", self.translate, "Up")
+        up_box.connect("button-release-event", self.finish_translate)
+        down_box = glade.get_widget('down_box')
+        down_box.connect("button-press-event", self.translate, "Down")
+        down_box.connect("button-release-event", self.finish_translate)
+        right_box = glade.get_widget('right_box')
+        right_box.connect("button-press-event", self.translate, "Right")
+        right_box.connect("button-release-event", self.finish_translate)
+        left_box = glade.get_widget('left_box')
+        left_box.connect("button-press-event", self.translate, "Left")
+        left_box.connect("button-release-event", self.finish_translate)
+
+        panes = glade.get_widget('vpaned1')
+        panes.connect ("button-release-event", self.pos_changed)
+        panes.set_position (self.pane_pos)
+
+        # Other stuff
+        self.width, self.height = self.main_window.get_size ()
+
+        # if we import, we dump the old filename to create a new hashed one
+        self.save_file = None
+        if not imported:
+            self.save_file = filename
+
+        self.maximised = False
+        self.view_type = 0
+        if self.set_val:
+            self.act.set_current_value (self.mode)
+
+        self.undo.unblock ()
+        self.start_timer ()
+
+    def show(self):
+        self.main_window.show_all()
+        self.ext_act.set_active(self.extended_visible)
+        if not self.extended_visible:
+            self.extended_window.hide()
+
+    def create_menu (self):
+        actions = [
+                ('FileMenu', None, _('File')),
+                ('Export', None, _('Export as Image'), None,
+                 _("Export your map as an image"), self.export_cb),
+                ('ExportMap', gtk.STOCK_SAVE_AS, _('Export Map...'), '<control>S',
+                 _("Export your map as XML"), self.export_map_cb),
+                ('Close', gtk.STOCK_CLOSE, None, '<control>W',
+                 _('Close the current window'), self.close_window_cb),
+                ('EditMenu', None, _('_Edit')),
+                ('ViewMenu', None, _('_View')),
+                ('ShowToolbars', None, _('_Toolbar')),
+                ('Undo', gtk.STOCK_UNDO, None, '<control>Z', None),
+                ('Redo', gtk.STOCK_REDO, None, '<control><shift>Z', None),
+                ('Cut', gtk.STOCK_CUT, None, '<control>X',
+                 None, self.cut_text_cb),
+                ('Copy', gtk.STOCK_COPY, None, '<control>C',
+                 None, self.copy_text_cb),
+                ('Paste', gtk.STOCK_PASTE, None, '<control>V',
+                 None, self.paste_text_cb),
+                ('LinkThoughts', None, _("Link Thoughts"), '<control>L',
+                _("Link the selected thoughts"), self.link_thoughts_cb),
+                ('ModeMenu', None, _('_Mode')),
+                ('ZoomIn', gtk.STOCK_ZOOM_IN, None, '<control>plus',
+                 None, self.zoomin_cb),
+                ('ZoomOut', gtk.STOCK_ZOOM_OUT, None, '<control>minus',
+                 None, self.zoomout_cb),
+                ('Zoom100', gtk.STOCK_ZOOM_100, None, '<control>0',
+                 None, self.zoom100_cb)]
+        self.radio_actions = [
+                ('Edit', gtk.STOCK_EDIT, _('_Edit Mode'), '<control>E',
+                 _('Turn on edit mode'), MMapArea.MODE_EDITING),
+                 ('AddImage', gtk.STOCK_ADD, _('_Add Image'), None,
+                 _('Add an image to selected thought'), MMapArea.MODE_IMAGE),
+                 ('Drawing', gtk.STOCK_COLOR_PICKER, _('_Drawing Mode'), None,
+                 _('Make a pretty drawing'), MMapArea.MODE_DRAW)]
+        self.view_radio_actions = [
+                ('UseBezier', None, _('Use _Curves'), None,
+                 _('Use curves as links'), MMapArea.VIEW_BEZIER),
+                 ('UseLines', None, _('Use _Lines'), None,
+                 _('Use straight lines as links'), MMapArea.VIEW_LINES)]
+        self.toggle_actions = [
+                ('ViewExtend', None, _('_Extended Information'), None,
+                 _('Show extended information for thoughts'), self.view_extend_cb),
+                ('ShowMainToolbar', None, _('_Main'), None,
+                 _('Show main toolbar'), self.show_main_toolbar_cb),
+                ('ShowFormatToolbar', None, _('_Format'), None,
+                 _('Show format toolbar'), self.show_format_toolbar_cb)]
+
+        ag = gtk.ActionGroup ('WindowActions')
+        ag.set_translation_domain(gettext.textdomain())
+        ag.add_actions (actions)
+        ag.add_radio_actions (self.radio_actions)
+        ag.add_radio_actions (self.view_radio_actions)
+        ag.add_toggle_actions (self.toggle_actions)
+        self.act = ag.get_action ('Edit')
+        self.ext_act = ag.get_action ('ViewExtend')
+        self.act.connect ("changed", self.mode_change_cb)
+        self.undo.set_widgets (ag.get_action ('Undo'), ag.get_action ('Redo'))
+
+        self.view_action = ag.get_action('UseBezier')
+        self.view_action.connect ("changed", self.view_change_cb)
+
+        self.ui = gtk.UIManager ()
+        self.ui.insert_action_group (ag, 0)
+        self.ui.add_ui_from_file (utils.get_data_file_name('labyrinth-ui.xml'))
+        self.main_window.add_accel_group (self.ui.get_accel_group ())
+
+    def align_cb(self, widget, direction):
+        if direction == "vl" or direction == "ht":
+            self.MainArea.align_top_left(direction == "vl")
+        elif direction == "vr" or direction == "hb":
+            self.MainArea.align_bottom_right(direction == "vr")
+        else:
+            self.MainArea.align_centered(direction == "vc")
+
+        if widget != self.align_button:
+            self.align_button.disconnect(self.align_handler_id)
+            self.align_handler_id = self.align_button.connect('clicked', self.align_cb, direction)
+            self.align_button.set_icon_name(widget.get_image().get_icon_name()[0])
+
+    def link_thoughts_cb (self, arg):
+        self.MainArea.link_menu_cb ()
+
+    def undo_show_extended (self, action, mode):
+        self.undo.block ()
+        self.ext_act.set_active (not self.ext_act.get_active ())
+        self.undo.unblock ()
+
+    def view_extend_cb (self, arg):
+        self.undo.add_undo (UndoManager.UndoAction (self, UNDO_SHOW_EXTENDED, self.undo_show_extended))
+        self.extended_visible = arg.get_active ()
+        if self.extended_visible:
+            self.extended_window.show ()
+            self.view_type = 1
+        else:
+            self.extended_window.hide ()
+            self.view_type = 0
+
+    def show_main_toolbar_cb(self, arg):
+        if arg.get_active():
+            self.main_toolbar.show()
+        else:
+            self.main_toolbar.hide()
+
+    def show_format_toolbar_cb(self, arg):
+        if arg.get_active():
+            self.format_toolbar.show()
+        else:
+            self.format_toolbar.hide()
+
+    def view_change_cb(self, base, activated):
+        utils.use_bezier_curves = activated.get_current_value() == MMapArea.VIEW_BEZIER
+        if os.name != 'nt':
+            self.config_client.set_bool('/apps/labyrinth/curves', utils.use_bezier_curves)
+        self.MainArea.update_all_links()
+        self.MainArea.invalidate()
+
+    def attrs_cb (self, widget, bold, italics, underline, pango_font):
+        # Yes, there is a block method for signals
+        # but I don't currently know how to
+        # implement it for action-based signals
+        # without messyness
+        if bold != self.bold_state:
+            self.bold_block = True
+            self.bold_widget.set_active(bold)
+        if italics != self.italic_state:
+            self.italic_block = True
+            self.italic_widget.set_active(italics)
+        if underline != self.underline_state:
+            self.underline_block = True
+            self.underline_widget.set_active(underline)
+        if pango_font:
+            font_name = pango_font.to_string()
+            self.font_widget.set_font_name (font_name)
+            self.MainArea.set_font(font_name)
+        else:
+            self.font_widget.set_font_name (utils.default_font)
+
+    def translate (self, box, arg1, direction):
+        self.orig_translate = [self.MainArea.translation[0], self.MainArea.translation[1]]
+        if direction == "Up":
+            translation_x = 0
+            translation_y = 5
+        elif direction == "Down":
+            translation_x = 0
+            translation_y = -5
+        elif direction == "Right":
+            translation_x = -5
+            translation_y = 0
+        elif direction == "Left":
+            translation_x = 5
+            translation_y = 0
+        else:
+            print "Error"
+            return
+        gobject.timeout_add (20, self.translate_timeout, translation_x, translation_y)
+        self.tr_to = True
+
+    def translate_timeout (self, addition_x, addition_y):
+        if not self.tr_to:
+            return False
+        self.MainArea.translation[0] += addition_x / self.MainArea.scale_fac
+        self.MainArea.translation[1] += addition_y / self.MainArea.scale_fac
+        self.MainArea.invalidate()
+        return self.tr_to
+
+    def finish_translate (self, box, arg1):
+        self.undo.add_undo (UndoManager.UndoAction (self.MainArea, UndoManager.TRANSFORM_CANVAS, \
+                self.MainArea.undo_transform_cb,
+                self.MainArea.scale_fac,
+                self.MainArea.scale_fac,
+                self.orig_translate,
+                self.MainArea.translation))
+        self.tr_to = False
+
+    def pos_changed (self, panes, arg2):
+        self.pane_pos = panes.get_position ()
+
+    def bold_toggled (self, action):
+        self.bold_state = (not self.bold_state)
+        if self.bold_block:
+            self.bold_block = False
+            return
+        if self.extended.is_focus ():
+            self.extended.get_buffer().set_bold(action.get_active())
+        else:
+            self.MainArea.set_bold (action.get_active())
+
+    def italic_toggled (self, action):
+        self.italic_state = (not self.italic_state)
+        if self.italic_block:
+            self.italic_block = False
+            return
+        if self.extended.is_focus ():
+            self.extended.get_buffer().set_italics(action.get_active())
+        else:
+            self.MainArea.set_italics (action.get_active())
+
+    def underline_toggled (self, action):
+        self.underline_state = (not self.underline_state)
+        if self.underline_block:
+            self.underline_block = False
+            return
+        if self.extended.is_focus ():
+            self.extended.get_buffer().set_underline(action.get_active())
+        else:
+            self.MainArea.set_underline (action.get_active())
+
+    def foreground_change_cb (self, button):
+        if not self.extended.is_focus ():
+            self.MainArea.set_foreground_color (button.get_color())
+
+    def background_change_cb (self, button):
+        if not self.extended.is_focus ():
+            self.MainArea.set_background_color (button.get_color())
+
+    def font_change_cb (self, button):
+        if not self.extended.is_focus ():
+            self.MainArea.set_font (button.get_font_name ())
+
+    def zoomin_cb(self, arg):
+        if self.MainArea.scale_fac < 10:
+            self.MainArea.scale_fac *= 1.2
+            self.MainArea.invalidate()
+
+    def zoomout_cb(self, arg):
+        if self.MainArea.scale_fac > 0.1:
+            self.MainArea.scale_fac /= 1.2
+            self.MainArea.invalidate()
+
+    def zoom100_cb(self, arg):
+        self.MainArea.scale_fac = 1.0
+        self.MainArea.translation = [0.0, 0.0]
+        self.MainArea.invalidate()
+
+    def switch_buffer_cb (self, arg, new_buffer):
+        if new_buffer:
+            self.extended.set_editable (True)
+            self.extended.set_buffer (new_buffer)
+        else:
+            self.extended.set_buffer (self.invisible_buffer)
+            self.extended.set_editable (False)
+
+    def thought_selected_cb (self, arg, background_color, foreground_color):
+        if background_color:
+            self.background_widget.set_color(background_color)
+        if foreground_color:
+            self.foreground_widget.set_color(foreground_color)
+
+    def main_area_focus_cb (self, arg, event, extended = False):
+        if not extended:
+            self.MainArea.grab_focus ()
+        else:
+            self.extended.grab_focus ()
+
+    def revert_mode (self, action, mode):
+        self.undo.block ()
+        if mode == UndoManager.UNDO:
+            self.mode_request_cb (None, action.args[0])
+        else:
+            self.mode_request_cb (None, action.args[1])
+        self.undo.unblock ()
+
+    def mode_change_cb (self, base, activated):
+        self.MainArea.set_mode (activated.get_current_value ())
+        self.mode = activated.get_current_value ()
+
+    def mode_request_cb (self, widget, mode):
+        if self.set_val:
+            self.act.set_current_value (mode)
+
+    def title_changed_cb (self, widget, new_title):
+        self.title_cp = self.title_cp = _('Untitled Map')
+        if new_title != '':
+            split = new_title.splitlines ()
+            self.title_cp = reduce(lambda x,y : x + ' ' + y, split)
+