Merge lp:~beutlin/zim/table-plugin into lp:~jaap.karssenberg/zim/pyzim

[Tobias Haupenthal]

Hello,
currently I've created a table plugin for zim and wish to get this into the main branch.
Please have a look at it.

Tobias Haupenthal

[Murat Güven (murat-gueven)]

Hi,

could you provide your plugin for testing?

Regards,
Murat

-----Ursprüngliche Nachricht-----
Von: <email address hidden> [mailto:<email address hidden>] Im Auftrag von Tobias Haupenthal
Gesendet: Mittwoch, 4. März 2015 00:58
An: <email address hidden>; Jaap Karssenberg
Betreff: [Merge] lp:~beutlin/zim/table-plugin into lp:zim

Tobias Haupenthal has proposed merging lp:~beutlin/zim/table-plugin into lp:zim.

Requested reviews:
  Jaap Karssenberg (jaap.karssenberg)

For more details, see:
https://code.launchpad.net/~beutlin/zim/table-plugin/+merge/251673

Hello,
currently I've created a table plugin for zim and wish to get this into the main branch.
Please have a look at it.

Tobias Haupenthal
--
You are subscribed to branch lp:zim.

[Jaap Karssenberg (jaap.karssenberg)]

Hi Tobias,

Just checked out your branch, and my first reaction is that I'm highly impressed with the work you put into this - it really looks very polished.

I have a few minor change requests that I will come back on soon. In the mean time I will start testing and reviewing the code.

I feel this feature alone is reason enough to publish a new release asap.

Regards,

Jaap

[Jaap Karssenberg (jaap.karssenberg)]

Hi Tobias,

After studying the code in more detail I think it can be merged right away.

My only point of discussion is the format of tables in the default wiki format. I wonder of the choice of using the "{{{table ... }}}" object syntax is the right choice. Especially sine you build the table format more as a core structure into the parser and only the widget is in the plugin.

My proposal then would be to support tables in the native wiki syntax without the "{{{ ... }}}" object wrapper. I would propose to use the same format as in markdown [1] and possibly also support the wiki creole syntax [2]. Fine to allow reading the object syntax, but when writing we should just use the native format.

Wanted to make the change myself and then merge. But I don't know what to do with the "wraps" attribute. What would be a logical syntax to add that in a markdown like table format ?

Regards,

Jaap

[1] https://help.github.com/articles/github-flavored-markdown/
[2] http://www.wikicreole.org/wiki/Creole1.0#Tables

review: Needs Information

[Tobias Haupenthal (beutlin)]

Hi Jaap,
thank you for your feedback.

One of the most important aspects is indeed the syntax for the table.
A futural feature might be including external files directly. With the object-oriented form I could use {{{table file="./data.csv"}}}. But with a simple markdown syntax it could be nearly impossible.
Do you have any good idea to circumvent that issue? Maybe using a different plugin?

Wrapping mode can be implemented with two colons, whereas normal mode is one colon.
center - left - right alignment

| h1 | h2 | h3 |
|::-:|::--|--::|

vs.
| h1 | h2 | h3 |
|:--:|:---|---:|

Regards,
Tobias

[Jaap Karssenberg (jaap.karssenberg)]

Hi Tobias,

Using markdown syntax now for inline tables will not prevent you from using
object syntax later for extensions line including CSV files. In fact, I
would highly encourage going that way :)

In my vision, at some point of time there will be two table widgets. One
for "data", and one for "grid" tables. The widget you wrote based on the
gtk Treeview is a very good start for a "data" table. It would be perfect
for rendering CSV, and you could extend it by e.g. defining data types per
column (boolean checkboxes, integers with spinner, etc.).

The "grid" table will be really text driven and could allow things like
row-span and col-span which a "data" table will not have. I think the
inline markdown format is really a "grid" table. However since we only have
your widget for now, we use that for all tables. (Later on it could still
be a user preference what table rendering to use by default.)

So I would support inline markdown tables and use that as the default for
"all text" tables. For CSV and similar data, definitely the object syntax
is the right thing to do. I would recommend to use the object type
"data-table" instead of "table", so we can differentiate later. I can even
imagine:

  {{{data-tabel format=csv
  head1,head2,head3
  ..., ..., ...
  }}}

The plugin could just define both "table" and "data-table" and write back
in a different format depending on the object type originally defined.

For the wrapping I was thinking to annotate the header line, that keeps the
format backward compatible with markdown rendering.

E.g.

  | h1 < | h2 | h3 |
  |:-:|:--|--:|

Where the "<" after a heading means wrap. Maybe you even want to go with
"<10" for wrapping at (approximately) 10 characters width.

My rationale for this is that I have plans to support Markdown as native
format as well, so I try to do stuff in a more or less compatible way. With
this syntax a markdown parser will still render the table, be it with the
annotation still visible in the heading.

Does that make sense - or am I making things to complicated?

Regards,

Jaap

On Mon, Mar 23, 2015 at 7:39 PM, Tobias Haupenthal <email address hidden>
wrote:

> Hi Jaap,
> thank you for your feedback.
>
> One of the most important aspects is indeed the syntax for the table.
> A futural feature might be including external files directly. With the
> object-oriented form I could use {{{table file="./data.csv"}}}. But with a
> simple markdown syntax it could be nearly impossible.
> Do you have any good idea to circumvent that issue? Maybe using a
> different plugin?
>
> Wrapping mode can be implemented with two colons, whereas normal mode is
> one colon.
> center - left - right alignment
>
> | h1 | h2 | h3 |
> |::-:|::--|--::|
>
> vs.
> | h1 | h2 | h3 |
> |:--:|:---|---:|
>
>
> Regards,
> Tobias
>
> --
> https://code.launchpad.net/~beutlin/zim/table-plugin/+merge/251673
> You are reviewing the proposed merge of lp:~beutlin/zim/table-plugin into
> lp:zim.
>

[Tobias Haupenthal (beutlin)]

Hello Jaap,
your mail sounds well thought-out. I like your vision.
Please give me any indication if you prefer that I do these syntax changes.

Many thanks for your code review!

Tobias

[Jaap Karssenberg (jaap.karssenberg)]

Hi Tobias,

I was going to do a quick patch myself, but didn't get around it. Will be
offline for the next few days. So if you happen to have some time, please
go ahead and make the patch. Otherwise I'll get back to it in a week or two.

Regards,

Jaap

On Tue, Mar 24, 2015 at 11:14 PM, Tobias Haupenthal <email address hidden>
wrote:

> Hello Jaap,
> your mail sounds well thought-out. I like your vision.
> Please give me any indication if you prefer that I do these syntax changes.
>
> Many thanks for your code review!
>
> Tobias
> --
> https://code.launchpad.net/~beutlin/zim/table-plugin/+merge/251673
> You are reviewing the proposed merge of lp:~beutlin/zim/table-plugin into
> lp:zim.
>

[lp:~beutlin/zim/table-plugin]

759. By Tobias Haupenthal <email address hidden> on 2015-04-04

sourcecode of table now markdown-like; wrapping and alignment syntax changed

[Tobias Haupenthal (beutlin)]

Hi Jaap,
the branch was updated for the new markdown related syntax.
Maybe you can have a look at it again.

Regards,
Tobias

review: Needs Resubmitting

[Jaap Karssenberg (jaap.karssenberg)]

Done

On Tue, Apr 14, 2015 at 8:43 PM, Tobias Haupenthal <email address hidden>
wrote:

> Review: Resubmit
>
> Hi Jaap,
> the branch was updated for the new markdown related syntax.
> Maybe you can have a look at it again.
>
> Regards,
> Tobias
> --
> https://code.launchpad.net/~beutlin/zim/table-plugin/+merge/251673
> You are reviewing the proposed merge of lp:~beutlin/zim/table-plugin into
> lp:zim.
>

=== modified file 'data/manual/Plugins.txt'
--- data/manual/Plugins.txt	2014-10-10 19:35:17 +0000
+++ data/manual/Plugins.txt	2015-04-04 11:26:41 +0000
@@ -27,6 +27,7 @@
 * [[+Sequence Diagram Editor|Sequence Diagram Editor]]
 * [[+Source View|Source View]]
 * [[+Spell Checker|Spell Checker]]
+* [[+Table Editor|Table Editor]]
 * [[+Table Of Contents|Table Of Contents]]
 * [[+Tags|Tags]]
 * [[+Task List|Task List]]

=== modified file 'data/manual/Plugins/Journal.txt'
--- data/manual/Plugins/Journal.txt	2014-08-28 13:08:14 +0000
+++ data/manual/Plugins/Journal.txt	2015-04-04 11:26:41 +0000
@@ -15,7 +15,7 @@
 This plugin has the following options:
 
 The option **Show calendar in sidepane instead of as dialog** does just that; if enabled the calendar widget is embedded at the top of the side pane. Otherwise the calendar is shown in a separate dialog when you click the toolbar button. If the calendar is embedded in the side pane, the option **Position in the window** determines in which side pane the calendar is shown.
-
+The option **Expand journal page in index when opened** expands the index-tree if a date is opened.
 The option **Use a page for each: ...** allows you to set the calendar to either use a separate page for each day, each week, each month or even each year.
 
 The **Section** controls where the calendar pages are stored.

=== added directory 'data/manual/Plugins/Table_Editor'
=== added file 'data/manual/Plugins/Table_Editor.txt'
--- data/manual/Plugins/Table_Editor.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Table_Editor.txt	2015-04-04 11:26:41 +0000
@@ -0,0 +1,21 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+
+====== Table Editor ======
+
+{{./table_demo.png}}[Only a picture]
+This plugin allows you to integrate a table into the zim editor. 
+**Dependencies:** This plugin has no additional dependencies
+
+===== Options =====
+Before you can use this plugin, it must be enabled in **Insert->Preferences** on the tab Plugins.
+Here you can configure it with these options:
+
+**Show helper toolbar**: Displays a menu with buttons beneath the table, if it is selected.
+{{./table_toolbar.png}}{{./table_footer.png}}
+**Grid lines**: Enables or disables lines between table cells
+{{./with_borders.png}}{{./without_borders.png}}
+
+===== Read more =====
+[[+Basic Table Operations|Basic Table Operations]]
+[[+Superior Table Operations|Superior Table Operations]]

=== added directory 'data/manual/Plugins/Table_Editor/Basic_Table_Operations'
=== added file 'data/manual/Plugins/Table_Editor/Basic_Table_Operations.txt'
--- data/manual/Plugins/Table_Editor/Basic_Table_Operations.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Table_Editor/Basic_Table_Operations.txt	2015-04-04 11:26:41 +0000
@@ -0,0 +1,41 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+
+====== Basic Table Operations ======
+
+===== Insertion of a table =====
+
+==== Insert directly within textarea ====
+
+'''
+|Header 1|Header 2|Header 3|
+|Data 1a|Data 2a|Data 3a|
+|Data 1b|Data 2b|Data 2b|
+
+Text after table. Table has to end with a blank line.
+'''
+
+Press CTRL+R or open menu item **View->reload**, so that the table can be displayed as widget.
+
+==== Use the insert-table button ====
+{{./insert-table.png}} or press the menu item **Insert -> Table**
+After this step you can define the table titles with following Options:
+**Title**:  Column title
+**Alignment**: Alignment of the cell (left, center, right)
+**Automatic Wrapping**: Column Cells with long text should be **automatic wrapped** to new lines.
+{{./table_settings_dialog.png}}
+
+==== Add row / Change table layout ====
+Press the right button on the area of the table - but not on the header - and select in the popup menu some item.
+{{./table_popup.png}}
+
+===== Enter text in a cell =====
+1. Click one time on a cell, wait one second.
+2. Click again on the cell.
+3. Now it opens a textfield where you can fill the cell.
+4. Press <ENTER> and the text will be fixed. 
+	 or Press <ESC> and the inserted text will be ignored.
+
+
+===== Sorting =====
+Click one time on the column title, which you want to sort.

=== added file 'data/manual/Plugins/Table_Editor/Basic_Table_Operations/insert-table.png'
Binary files data/manual/Plugins/Table_Editor/Basic_Table_Operations/insert-table.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/Basic_Table_Operations/insert-table.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_popup.png'
Binary files data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_popup.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_popup.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_settings_dialog.png'
Binary files data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_settings_dialog.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/Basic_Table_Operations/table_settings_dialog.png	2015-04-04 11:26:41 +0000 differ
=== added directory 'data/manual/Plugins/Table_Editor/Superior_Table_Operations'
=== added file 'data/manual/Plugins/Table_Editor/Superior_Table_Operations.txt'
--- data/manual/Plugins/Table_Editor/Superior_Table_Operations.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Table_Editor/Superior_Table_Operations.txt	2015-04-04 11:26:41 +0000
@@ -0,0 +1,46 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+
+====== Superior Table Operations ======
+
+===== Markup in a cell =====
+The main toolbar buttons for formatting are disabled. You have to know the special syntax and insert it directly within the textbox.
+While editing:		{{./cell_editing_with_text_formatting.png}}
+After formatting: 	{{./cell_after_text_formatting.png}}
+
+==== Common formats ====
+**bold**, //italic//, __highlight__, ~~strike through and~~ and ''verbatim''
+
+'''
+**bold**, //italic//, __highlight__, ~~strike through~~ and ''verbatim''
+'''
+
+
+==== Special characters ====
+\\n		Newline
+\|		| Character
+
+==== Links in a  cell ====
+'''
+[[http://www.python.org]]
+[[[e-mail]]]
+[[foo]]		Internal Link
+'''
+
+Note:	Only **one link per cell** can be opened. The first one is taken.
+		You can not use a special link text. The link text is the url, the mail-address or the Title of the linked page.
+A link can be accessed with:
+* ''RIGHT MOUSE-BUTTON-CLICK'' on cell with the link  and selection of the menu item //Open cell in content link//
+* ''CTRL + LEFT MOUSE-BUTTON-CLICK'' on a cell
+
+See also:	[[:Help:Links|Syntax for Links]]
+
+===== Exporting: =====
+Exporting filters for Plain, HTML, Markdown, reStructuredText, Latex have been also adjusted for the table plugin.
+
+===== Limits of widget's integration =====
+* search / replacing:
+	* no highlighting
+	* only first location is found and after that the next one within the main text
+* Undo / Redo not supported at all
+* There can not be any element right or left to the table. The table must stand alone. 

=== added file 'data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_after_text_formatting.png'
Binary files data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_after_text_formatting.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_after_text_formatting.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_editing_with_text_formatting.png'
Binary files data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_editing_with_text_formatting.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/Superior_Table_Operations/cell_editing_with_text_formatting.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/table_demo.png'
Binary files data/manual/Plugins/Table_Editor/table_demo.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/table_demo.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/table_footer.png'
Binary files data/manual/Plugins/Table_Editor/table_footer.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/table_footer.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/table_toolbar.png'
Binary files data/manual/Plugins/Table_Editor/table_toolbar.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/table_toolbar.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/with_borders.png'
Binary files data/manual/Plugins/Table_Editor/with_borders.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/with_borders.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/manual/Plugins/Table_Editor/without_borders.png'
Binary files data/manual/Plugins/Table_Editor/without_borders.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Table_Editor/without_borders.png	2015-04-04 11:26:41 +0000 differ
=== added file 'data/pixmaps/insert-table.png'
Binary files data/pixmaps/insert-table.png	1970-01-01 00:00:00 +0000 and data/pixmaps/insert-table.png	2015-04-04 11:26:41 +0000 differ
=== modified file 'tests/__init__.py'
--- tests/__init__.py	2014-08-20 09:46:08 +0000
+++ tests/__init__.py	2015-04-04 11:26:41 +0000
@@ -55,7 +55,7 @@
 	'calendar', 'printtobrowser', 'versioncontrol', 'inlinecalculator',
 	'tasklist', 'tags', 'imagegenerators', 'tableofcontents',
 	'quicknote', 'attachmentbrowser', 'insertsymbol',
-	'sourceview',
+	'sourceview', 'tableeditor',
 	'ipc'
 ]
 

=== modified file 'tests/data/formats/export.html'
--- tests/data/formats/export.html	2014-09-04 17:56:31 +0000
+++ tests/data/formats/export.html	2015-04-04 11:26:41 +0000
@@ -268,8 +268,33 @@
 </pre>
 </div>
 
+<h2>A table</h2>
+
 <br>
 
+<table>
+<thead><tr>
+  <th align="center">H1</th>
+  <th align="right">H2 h2</th>
+  <th align="left">H3</th>
+</tr></thead>
+<tr>
+  <td align="center">Column A1</td>
+  <td align="right">Column A2</td>
+  <td align="left">a</td>
+</tr>
+<tr>
+  <td align="center">a very long cell</td>
+  <td align="right"><b>bold text</b></td>
+  <td align="left">b</td>
+</tr>
+<tr>
+  <td align="center">hyperlinks</td>
+  <td align="right"><a href="interwiki:wp?wiki" title="wp?wiki" class="interwiki">wp?wiki</a></td>
+  <td align="left"><a href="http://x.org" title="Xorg" class="http">Xorg</a></td>
+</tr>
+</table>
+
 <p>
 ====<br>
 This is not a header

=== modified file 'tests/data/formats/export.markdown'
--- tests/data/formats/export.markdown	2014-05-04 19:17:46 +0000
+++ tests/data/formats/export.markdown	2015-04-04 11:26:41 +0000
@@ -165,6 +165,14 @@
 	brought countless ills upon
 	the Achaeans.
 
+A table
+-------
+
+|        H1        |                        H2 h2 | H3                   |
+|:----------------:|-----------------------------:|:---------------------|
+|    Column A1     |                    Column A2 | a                    |
+| a very long cell |                **bold text** | b                    |
+|    hyperlinks    | [wp?wiki](interwiki:wp?wiki) | [Xorg](http://x.org) |
 
 ====
 This is not a header

=== modified file 'tests/data/formats/export.rst'
--- tests/data/formats/export.rst	2014-05-04 19:17:46 +0000
+++ tests/data/formats/export.rst	2015-04-04 11:26:41 +0000
@@ -192,6 +192,18 @@
 	brought countless ills upon
 	the Achaeans.
 
+A table
+-------
+
++------------------+--------------------------------+------------------------+
+|        H1        |                          H2 h2 | H3                     |
++==================+================================+========================+
+|    Column A1     |                      Column A2 | a                      |
++------------------+--------------------------------+------------------------+
+| a very long cell |                  **bold text** | b                      |
++------------------+--------------------------------+------------------------+
+|    hyperlinks    | `wp?wiki <interwiki:wp?wiki>`_ | `Xorg <http://x.org>`_ |
++------------------+--------------------------------+------------------------+
 
 ====
 This is not a header

=== modified file 'tests/data/formats/export.tex'
--- tests/data/formats/export.tex	2014-05-04 19:17:46 +0000
+++ tests/data/formats/export.tex	2015-04-04 11:26:41 +0000
@@ -301,6 +301,22 @@
 \end{lstlisting}
 
 
+\section{A table}
+
+
+
+\begin{tabular}{ |c|r|l| }
+\hline
+ H1 & H2 h2 & H3 \tabularnewline
+\hline
+\hline
+ Column A1 & Column A2 & a \tabularnewline
+\hline
+ a very long cell & \textbf{bold text} & b \tabularnewline
+\hline
+ hyperlinks & \href{interwiki:wp?wiki}{wp?wiki} & \href{http://x.org}{Xorg} \tabularnewline
+\hline
+\end{tabular}
 
 
 ====

=== modified file 'tests/data/formats/parsetree.xml'
--- tests/data/formats/parsetree.xml	2012-11-06 18:20:37 +0000
+++ tests/data/formats/parsetree.xml	2015-04-04 11:26:41 +0000
@@ -125,7 +125,9 @@
 brought countless ills upon
 the Achaeans.
 </object>
+<h level="2">A table</h>
 
+<table aligns="center,right,left" wraps="1,0,1"><thead><th>H1</th><th>H2 h2</th><th>H3</th></thead><trow><td>Column A1</td><td>Column A2</td><td>a</td></trow><trow><td>a very long cell</td><td><strong>bold text</strong></td><td>b</td></trow><trow><td>hyperlinks</td><td><link href="wp?wiki">wp?wiki</link></td><td><link href="http://x.org">Xorg</link></td></trow></table>
 <p>====
 This is not a header
 </p>

=== modified file 'tests/data/formats/plain.txt'
--- tests/data/formats/plain.txt	2012-11-06 18:20:37 +0000
+++ tests/data/formats/plain.txt	2015-04-04 11:26:41 +0000
@@ -155,6 +155,18 @@
 brought countless ills upon
 the Achaeans.
 
+A table
+-------
+
++------------------+-----------+------+
+|        H1        |     H2 h2 | H3   |
++==================+===========+======+
+|    Column A1     | Column A2 | a    |
++------------------+-----------+------+
+| a very long cell | bold text | b    |
++------------------+-----------+------+
+|    hyperlinks    |   wp?wiki | Xorg |
++------------------+-----------+------+
 
 ====
 This is not a header

=== modified file 'tests/data/formats/wiki.txt'
--- tests/data/formats/wiki.txt	2014-02-02 21:21:24 +0000
+++ tests/data/formats/wiki.txt	2015-04-04 11:26:41 +0000
@@ -161,6 +161,13 @@
 the Achaeans.
 }}}
 
+===== A table =====
+
+|        H1       <|         H2 h2 | H3                    <|
+|:----------------:|--------------:|:-----------------------|
+|    Column A1     |     Column A2 | a                      |
+| a very long cell | **bold text** | b                      |
+|    hyperlinks    |   [[wp?wiki]] | [[http://x.org\|Xorg]] |
 
 ====
 This is not a header

=== modified file 'tests/objectmanager.py'
--- tests/objectmanager.py	2014-11-09 11:07:20 +0000
+++ tests/objectmanager.py	2015-04-04 11:26:41 +0000
@@ -48,7 +48,7 @@
 		from zim.plugins.sourceview import SourceViewPlugin
 		self.assertEqual(
 			manager.find_plugin('code'),
-			('sourceview', 'Source View', True, SourceViewPlugin)
+			('sourceview', 'Source View', True, SourceViewPlugin, None)
 		)
 
 

=== added file 'tests/tableeditor.py'
--- tests/tableeditor.py	1970-01-01 00:00:00 +0000
+++ tests/tableeditor.py	2015-04-04 11:26:41 +0000
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+import tests
+
+from tests.pageview import setUpPageView
+
+from zim.config import ConfigDict
+from zim.formats import ParseTree, StubLinker
+from zim.formats.html import Dumper as HtmlDumper
+
+from zim.plugins.tableeditor import *
+
+class TestMainWindowExtension(tests.TestCase):
+
+	def runTest(self):
+		window = tests.MockObject()
+		window.pageview = setUpPageView()
+		window.ui = tests.MockObject()
+		window.ui.uimanager = tests.MockObject()
+		window.ui.uistate = ConfigDict()
+		window.ui.mainwindow = window # XXX
+
+		plugin = TableEditorPlugin()
+		extension = MainWindowExtension(plugin, window)
+
+		with tests.DialogContext(self.checkInsertTableDialog):
+			extension.insert_table()
+
+		tree = window.pageview.get_parsetree()
+		#~ print tree.tostring()
+		obj = tree.find('table')
+		
+		self.assertTrue(obj.attrib['aligns'] == 'left')
+		self.assertTrue(obj.attrib['wraps'] == '0')
+
+		# Parses tree to a table object
+		tabledata = tree.tostring().replace("<?xml version='1.0' encoding='utf-8'?>", '')\
+			.replace('<zim-tree>', '').replace('</zim-tree>', '')\
+			.replace('<td> </td>', '<td>text</td>')
+
+		table = plugin.create_table({'type': 'table'}, ElementTree.fromstring(tabledata))
+
+		self.assertTrue(isinstance(table, TableViewObject))
+
+	def checkInsertTableDialog(self, dialog):
+		self.assertIsInstance(dialog, EditTableDialog)
+		dialog.assert_response_ok()
+
+class TestEditTableExtension(tests.TestCase):
+	def checkUpdateTableDialog(self, dialog):
+		self.assertIsInstance(dialog, EditTableDialog)
+		dialog.assert_response_ok()
+
+	def testChangeTable(self):
+		window = tests.MockObject()
+		window.pageview = setUpPageView()
+		window.ui = tests.MockObject()
+		window.ui.uimanager = tests.MockObject()
+		window.ui.uistate = ConfigDict()
+		window.ui.mainwindow = window # XXX
+		plugin = TableEditorPlugin()
+		extension = MainWindowExtension(plugin, window)
+		obj = plugin.create_table({'aligns': 'normal,normal', 'wraps': '0,0'}, (('h1', 'h2'),('t1', 't2')))
+		obj.get_widget()
+
+		with tests.DialogContext(self.checkUpdateTableDialog):
+			extension.do_edit_object(obj)
+
+		self.assertTrue(isinstance(obj.get_widget().treeview, gtk.TreeView))
+
+class TestTableFunctions(tests.TestCase):
+	def testCellFormater(self):
+		self.assertEqual(CellFormatReplacer.input_to_cell('**hello**', with_pango=True), '<b>hello</b>')
+		self.assertEqual(CellFormatReplacer.cell_to_input('<span background="yellow">highlight</span>', with_pango=True),
+						 '__highlight__')
+		self.assertEqual(CellFormatReplacer.zim_to_cell('<link href="./alink">hello</link>'),
+						 '<span foreground="blue">hello<span size="0">./alink</span></span>')
+		self.assertEqual(CellFormatReplacer.cell_to_zim('<tt>code-block</tt>'), '<code>code-block</code>')
+
+class TestColumnSorting(tests.TestCase):
+	def testSorting(self):
+		pass
\ No newline at end of file

=== modified file 'translations/zim.pot'
--- translations/zim.pot	2014-09-04 19:38:24 +0000
+++ translations/zim.pot	2015-04-04 11:26:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-04 21:38+0200\n"
+"POT-Creation-Date: 2015-04-04 12:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -56,7 +56,7 @@
 
 #. message for FileNotFoundError | 
 #. Error message in template lookup
-#: zim/fs.py:476 zim/templates/__init__.py:126
+#: zim/fs.py:476 zim/templates/__init__.py:125
 #, python-format
 msgid "No such file: %s"
 msgstr ""
@@ -146,10 +146,10 @@
 #. label for properties dialog | 
 #. label for file name
 #: zim/gui/applications.py:804 zim/gui/customtools.py:157
-#: zim/gui/__init__.py:3352 zim/gui/notebookdialog.py:413
-#: zim/gui/pageview.py:6857 zim/gui/preferencesdialog.py:244
-#: zim/gui/templateeditordialog.py:157 zim/notebook.py:838
-#: zim/plugins/attachmentbrowser.py:726
+#: zim/gui/__init__.py:3378 zim/gui/notebookdialog.py:413
+#: zim/gui/pageview.py:7042 zim/gui/preferencesdialog.py:247
+#: zim/gui/templateeditordialog.py:158 zim/notebook.py:838
+#: zim/plugins/attachmentbrowser.py:727
 msgid "Name"
 msgstr ""
 
@@ -189,7 +189,7 @@
 
 #. Input in "Edit Custom Tool" dialog | 
 #. Heading in plugins tab of preferences dialog
-#: zim/gui/customtools.py:158 zim/gui/preferencesdialog.py:246
+#: zim/gui/customtools.py:158 zim/gui/preferencesdialog.py:249
 msgid "Description"
 msgstr ""
 
@@ -231,58 +231,58 @@
 msgstr ""
 
 #. dialog title
-#: zim/gui/exportdialog.py:27
+#: zim/gui/exportdialog.py:31
 msgid "Export"
 msgstr ""
 
 #. Title of progressbar dialog
-#: zim/gui/exportdialog.py:43 zim/gui/__init__.py:2105
+#: zim/gui/exportdialog.py:51 zim/gui/__init__.py:2130
 msgid "Updating index"
 msgstr ""
 
 #. Title for progressbar window
-#: zim/gui/exportdialog.py:51
+#: zim/gui/exportdialog.py:60
 msgid "Exporting notebook"
 msgstr ""
 
 #. message heading
-#: zim/gui/exportdialog.py:136
+#: zim/gui/exportdialog.py:146
 #, python-format
 msgid "Folder exists: %s"
 msgstr ""
 
 #. detailed message, answers are Yes and No
-#: zim/gui/exportdialog.py:137
+#: zim/gui/exportdialog.py:147
 msgid ""
 "Folder already exists and has content, exporting to this folder may "
 "overwrite existing files. Do you want to continue?"
 msgstr ""
 
 #. message heading
-#: zim/gui/exportdialog.py:150
+#: zim/gui/exportdialog.py:160
 msgid "File exists"
 msgstr ""
 
 #. detailed message, answers are Yes and No
-#: zim/gui/exportdialog.py:151
+#: zim/gui/exportdialog.py:161
 msgid ""
 "This file already exists.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
 #. title of step in export dialog
-#: zim/gui/exportdialog.py:162
+#: zim/gui/exportdialog.py:172
 msgid "Select the pages to export"
 msgstr ""
 
 #. Option in export dialog to export complete notebook | 
 #. Option in versions dialog to show version for complete notebook
-#: zim/gui/exportdialog.py:168 zim/plugins/versioncontrol/__init__.py:934
+#: zim/gui/exportdialog.py:178 zim/plugins/versioncontrol/__init__.py:934
 msgid "Complete _notebook"
 msgstr ""
 
 #. Option in export dialog to export selection
-#: zim/gui/exportdialog.py:173
+#: zim/gui/exportdialog.py:183
 msgid "Single _page"
 msgstr ""
 
@@ -291,586 +291,586 @@
 #. Column header | 
 #. Column header search dialog | 
 #. Column header Task List dialog
-#: zim/gui/exportdialog.py:176 zim/gui/pageview.py:6754
-#: zim/gui/recentchangesdialog.py:54 zim/gui/searchdialog.py:150
-#: zim/plugins/quicknote.py:221 zim/plugins/tasklist.py:943
+#: zim/gui/exportdialog.py:186 zim/gui/pageview.py:6939
+#: zim/gui/recentchangesdialog.py:54 zim/gui/searchdialog.py:151
+#: zim/plugins/quicknote.py:221 zim/plugins/tasklist.py:947
 msgid "Page"
 msgstr ""
 
 #. Input field in export dialog
-#: zim/gui/exportdialog.py:177
+#: zim/gui/exportdialog.py:187
 msgid "Include subpages"
 msgstr ""
 
 #. title of step in export dialog
-#: zim/gui/exportdialog.py:204
+#: zim/gui/exportdialog.py:214
 msgid "Select the export format"
 msgstr ""
 
 #. Option in drop down menu to specify another file
-#: zim/gui/exportdialog.py:206
+#: zim/gui/exportdialog.py:216
 msgid "Other..."
 msgstr ""
 
 #. Input label in the export dialog | 
 #. label in "insert date" dialog
-#: zim/gui/exportdialog.py:218 zim/gui/pageview.py:6031
+#: zim/gui/exportdialog.py:228 zim/gui/pageview.py:6216
 msgid "Format"
 msgstr ""
 
 #. Input label in the export dialog
-#: zim/gui/exportdialog.py:219
+#: zim/gui/exportdialog.py:229
 msgid "Template"
 msgstr ""
 
 #. radio option in export dialog
-#: zim/gui/exportdialog.py:222
+#: zim/gui/exportdialog.py:232
 msgid "Link files under document root with full file path"
 msgstr ""
 
 #. radio option in export dialog
-#: zim/gui/exportdialog.py:223
+#: zim/gui/exportdialog.py:233
 msgid "Map document root to URL"
 msgstr ""
 
 #. label for button with URL
-#: zim/gui/exportdialog.py:233 zim/gui/templateeditordialog.py:70
+#: zim/gui/exportdialog.py:244 zim/gui/templateeditordialog.py:71
 msgid "Get more templates online"
 msgstr ""
 
 #. title of step in export dialog
-#: zim/gui/exportdialog.py:307
+#: zim/gui/exportdialog.py:318
 msgid "Select the output file or folder"
 msgstr ""
 
 #. Label for option in export dialog
-#: zim/gui/exportdialog.py:313
+#: zim/gui/exportdialog.py:324
 msgid "Export each page to a separate file"
 msgstr ""
 
 #. Label for option in export dialog
-#: zim/gui/exportdialog.py:315
+#: zim/gui/exportdialog.py:326
 msgid "Export all pages to a single file"
 msgstr ""
 
 #. Label for folder selection in export dialog
-#: zim/gui/exportdialog.py:318
+#: zim/gui/exportdialog.py:329
 msgid "Output folder"
 msgstr ""
 
 #. Label for setting a name for the index of exported pages
-#: zim/gui/exportdialog.py:320
+#: zim/gui/exportdialog.py:331
 msgid "Index page"
 msgstr ""
 
 #. Label for file selection in export dialog
-#: zim/gui/exportdialog.py:323
+#: zim/gui/exportdialog.py:334
 msgid "Output file"
 msgstr ""
 
 #. label in export dialog
-#: zim/gui/exportdialog.py:412
+#: zim/gui/exportdialog.py:423
 #, python-format
-msgid "%(n_errors)i errors and %(n_warnings)i warnings occurred, see log"
+msgid "%(n_error)i errors and %(n_warning)i warnings occurred, see log"
 msgstr ""
 
 #. label in export dialog
-#: zim/gui/exportdialog.py:415
+#: zim/gui/exportdialog.py:426
 #, python-format
 msgid "%i errors occurred, see log"
 msgstr ""
 
 #. label in export dialog
-#: zim/gui/exportdialog.py:418
+#: zim/gui/exportdialog.py:429
 #, python-format
 msgid "%i warnings occurred, see log"
 msgstr ""
 
 #. label in export dialog
-#: zim/gui/exportdialog.py:423
+#: zim/gui/exportdialog.py:434
 msgid "Export completed"
 msgstr ""
 
 #. button in export dialog | 
 #. button in e.g. equation editor dialog
-#: zim/gui/exportdialog.py:426 zim/plugins/base/imagegenerator.py:286
+#: zim/gui/exportdialog.py:437 zim/plugins/base/imagegenerator.py:286
 msgid "View _Log"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:61
+#: zim/gui/__init__.py:63
 msgid "_File"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:62
+#: zim/gui/__init__.py:64
 msgid "_Edit"
 msgstr ""
 
 #. Menu title | 
 #. button label
-#: zim/gui/__init__.py:63 zim/gui/templateeditordialog.py:42
+#: zim/gui/__init__.py:65 zim/gui/templateeditordialog.py:42
 msgid "_View"
 msgstr ""
 
 #. Menu title | 
 #. Button label
-#: zim/gui/__init__.py:64 zim/gui/pageview.py:6021
+#: zim/gui/__init__.py:66 zim/gui/pageview.py:6206
 #: zim/plugins/insertsymbol.py:138
 msgid "_Insert"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:65
+#: zim/gui/__init__.py:67
 msgid "_Search"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:66
+#: zim/gui/__init__.py:68
 msgid "For_mat"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:67
+#: zim/gui/__init__.py:69
 msgid "_Tools"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:68
+#: zim/gui/__init__.py:70
 msgid "_Go"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:69
+#: zim/gui/__init__.py:71
 msgid "_Help"
 msgstr ""
 
 #. Menu title
-#: zim/gui/__init__.py:70
+#: zim/gui/__init__.py:72
 msgid "P_athbar"
 msgstr ""
 
 #. Menu title | 
 #. Menu item
-#: zim/gui/__init__.py:71 zim/gui/__init__.py:141 zim/gui/__init__.py:151
+#: zim/gui/__init__.py:73 zim/gui/__init__.py:143 zim/gui/__init__.py:153
 msgid "_Toolbar"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:74
+#: zim/gui/__init__.py:76
 msgid "_New Page..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:75
+#: zim/gui/__init__.py:77
 msgid "New S_ub Page..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:76
+#: zim/gui/__init__.py:78
 msgid "_Open Another Notebook..."
 msgstr ""
 
 #. Menu item | 
 #. menu item to open a link
-#: zim/gui/__init__.py:77 zim/gui/pageview.py:5405
+#: zim/gui/__init__.py:79 zim/gui/pageview.py:5558
 #: zim/plugins/backlinkpane.py:120
 msgid "Open in New _Window"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:78
+#: zim/gui/__init__.py:80
 msgid "_Import Page..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:79
+#: zim/gui/__init__.py:81
 msgid "_Save"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:80
+#: zim/gui/__init__.py:82
 msgid "Save A _Copy..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:81
+#: zim/gui/__init__.py:83
 msgid "E_xport..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:82
+#: zim/gui/__init__.py:84
 msgid "_Send To..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:83
+#: zim/gui/__init__.py:85
 msgid "_Move Page..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:84
+#: zim/gui/__init__.py:86
 msgid "_Rename Page..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:85
+#: zim/gui/__init__.py:87
 msgid "_Delete Page"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:86
+#: zim/gui/__init__.py:88
 msgid "Proper_ties"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:87
+#: zim/gui/__init__.py:89
 msgid "_Close"
 msgstr ""
 
 #. Menu item | 
 #. menu item in tray icon menu
-#: zim/gui/__init__.py:88 zim/plugins/trayicon.py:126
+#: zim/gui/__init__.py:90 zim/plugins/trayicon.py:126
 msgid "_Quit"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:89
+#: zim/gui/__init__.py:91
 msgid "_Search..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:90
+#: zim/gui/__init__.py:92
 msgid "Search _Backlinks..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:91
+#: zim/gui/__init__.py:93
 msgid "Recent Changes..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:92
+#: zim/gui/__init__.py:94
 msgid "Copy _Location"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:93
+#: zim/gui/__init__.py:95
 msgid "_Templates"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:94
+#: zim/gui/__init__.py:96
 msgid "Pr_eferences"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:95
+#: zim/gui/__init__.py:97
 msgid "_Reload"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:96
+#: zim/gui/__init__.py:98
 msgid "Open Attachments _Folder"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:97
+#: zim/gui/__init__.py:99
 msgid "Open _Notebook Folder"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:98
+#: zim/gui/__init__.py:100
 msgid "Open _Document Root"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:99
+#: zim/gui/__init__.py:101
 msgid "Open _Document Folder"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:100
+#: zim/gui/__init__.py:102
 msgid "Attach _File"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:100
+#: zim/gui/__init__.py:102
 msgid "Attach external file"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:101
+#: zim/gui/__init__.py:103
 msgid "Edit _Source"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:102
+#: zim/gui/__init__.py:104
 msgid "Start _Web Server"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:103
+#: zim/gui/__init__.py:105
 msgid "Update Index"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:104
+#: zim/gui/__init__.py:106
 msgid "Custom _Tools"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:105
+#: zim/gui/__init__.py:107
 msgid "_Back"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:105
+#: zim/gui/__init__.py:107
 msgid "Go page back"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:106
+#: zim/gui/__init__.py:108
 msgid "_Forward"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:106
+#: zim/gui/__init__.py:108
 msgid "Go page forward"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:107
+#: zim/gui/__init__.py:109
 msgid "_Parent"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:107
+#: zim/gui/__init__.py:109
 msgid "Go to parent page"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:108
+#: zim/gui/__init__.py:110
 msgid "_Child"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:108
+#: zim/gui/__init__.py:110
 msgid "Go to child page"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:109
+#: zim/gui/__init__.py:111
 msgid "_Previous in index"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:109
+#: zim/gui/__init__.py:111
 msgid "Go to previous page"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:110
+#: zim/gui/__init__.py:112
 msgid "_Next in index"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:110
+#: zim/gui/__init__.py:112
 msgid "Go to next page"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:111
+#: zim/gui/__init__.py:113
 msgid "_Home"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:111
+#: zim/gui/__init__.py:113
 msgid "Go home"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:112
+#: zim/gui/__init__.py:114
 msgid "_Jump To..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:113
+#: zim/gui/__init__.py:115
 msgid "_Contents"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:114
+#: zim/gui/__init__.py:116
 msgid "_FAQ"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:115
+#: zim/gui/__init__.py:117
 msgid "_Keybindings"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:116
+#: zim/gui/__init__.py:118
 msgid "_Bugs"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:117
+#: zim/gui/__init__.py:119
 msgid "_About"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:135
+#: zim/gui/__init__.py:137
 msgid "_All Panes"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:135
+#: zim/gui/__init__.py:137
 msgid "Show All Panes"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:142 zim/gui/__init__.py:152
+#: zim/gui/__init__.py:144 zim/gui/__init__.py:154
 msgid "_Statusbar"
 msgstr ""
 
 #. Menu item # FIXME review text
-#: zim/gui/__init__.py:143 zim/gui/__init__.py:153
+#: zim/gui/__init__.py:145 zim/gui/__init__.py:155
 msgid "_Side Panes"
 msgstr ""
 
 #. Menu item # FIXME review text
-#: zim/gui/__init__.py:143 zim/gui/__init__.py:153
+#: zim/gui/__init__.py:145 zim/gui/__init__.py:155
 msgid "Show Side Panes"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:144 zim/gui/__init__.py:154
+#: zim/gui/__init__.py:146 zim/gui/__init__.py:156
 msgid "_Fullscreen"
 msgstr ""
 
 #. menu item
-#: zim/gui/__init__.py:145 zim/gui/__init__.py:155
+#: zim/gui/__init__.py:147 zim/gui/__init__.py:157
 msgid "Notebook _Editable"
 msgstr ""
 
 #. menu item
-#: zim/gui/__init__.py:145 zim/gui/__init__.py:155
+#: zim/gui/__init__.py:147 zim/gui/__init__.py:157
 msgid "Toggle notebook editable"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:161
+#: zim/gui/__init__.py:163
 msgid "_None"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:162
+#: zim/gui/__init__.py:164
 msgid "_Recent pages"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:163
+#: zim/gui/__init__.py:165
 msgid "Recently _Changed pages"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:164
+#: zim/gui/__init__.py:166
 msgid "_History"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:165
+#: zim/gui/__init__.py:167
 msgid "_Page Hierarchy"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:178
+#: zim/gui/__init__.py:180
 msgid "Icons _And Text"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:179
+#: zim/gui/__init__.py:181
 msgid "_Icons Only"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:180
+#: zim/gui/__init__.py:182
 msgid "_Text Only"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:186
+#: zim/gui/__init__.py:188
 msgid "_Large Icons"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:187
+#: zim/gui/__init__.py:189
 msgid "_Small Icons"
 msgstr ""
 
 #. Menu item
-#: zim/gui/__init__.py:188
+#: zim/gui/__init__.py:190
 msgid "_Tiny Icons"
 msgstr ""
 
 #. Option in the preferences dialog
-#: zim/gui/__init__.py:202
+#: zim/gui/__init__.py:204
 msgid "Add 'tearoff' strips to the menus"
 msgstr ""
 
 #. Option in the preferences dialog
-#: zim/gui/__init__.py:204
+#: zim/gui/__init__.py:206
 msgid "Use <Ctrl><Space> to switch to the side pane"
 msgstr ""
 
 #. Option in the preferences dialog
-#: zim/gui/__init__.py:208
+#: zim/gui/__init__.py:210
 msgid "Remove links when deleting pages"
 msgstr ""
 
 #. Option in the preferences dialog
-#: zim/gui/__init__.py:210
+#: zim/gui/__init__.py:212
 msgid "Always use last cursor position when opening a page"
 msgstr ""
 
 #. Error description for "no such file or folder"
-#: zim/gui/__init__.py:272
+#: zim/gui/__init__.py:274
 msgid ""
 "The file or folder you specified does not exist.\n"
 "Please check if you the path is correct."
 msgstr ""
 
 #. Error message, %s will be the file path
-#: zim/gui/__init__.py:279
+#: zim/gui/__init__.py:281
 #, python-format
 msgid "No such file or folder: %s"
 msgstr ""
 
 #. Error description
-#: zim/gui/__init__.py:291
+#: zim/gui/__init__.py:293
 msgid "Page has un-saved changes"
 msgstr ""
 
 #. Dialog title | 
 #. input label
-#: zim/gui/__init__.py:594 zim/gui/searchdialog.py:24
+#: zim/gui/__init__.py:596 zim/gui/searchdialog.py:24
 #: zim/gui/searchdialog.py:31
 msgid "Search"
 msgstr ""
 
 #. label in search entry
-#: zim/gui/__init__.py:598
+#: zim/gui/__init__.py:601
 msgid "Search Pages..."
 msgstr ""
 
 #. Short question for question prompt
-#: zim/gui/__init__.py:665
+#: zim/gui/__init__.py:676
 msgid "Upgrade Notebook?"
 msgstr ""
 
 #. Explanation for question to upgrade notebook
-#: zim/gui/__init__.py:666
+#: zim/gui/__init__.py:677
 msgid ""
 "This notebook was created by an older of version of zim.\n"
 "Do you want to upgrade it to the latest version now?\n"
@@ -884,12 +884,12 @@
 msgstr ""
 
 #. Title of progressbar dialog
-#: zim/gui/__init__.py:678
+#: zim/gui/__init__.py:689
 msgid "Upgrading notebook"
 msgstr ""
 
 #. question dialog text
-#: zim/gui/__init__.py:1676
+#: zim/gui/__init__.py:1701
 msgid ""
 "The index is still busy updating. Until this is finished links can not be "
 "updated correctly. Performing this action now could break links, do you want "
@@ -897,22 +897,22 @@
 msgstr ""
 
 #. Title of progressbar dialog
-#: zim/gui/__init__.py:1687
+#: zim/gui/__init__.py:1712
 msgid "Updating Links"
 msgstr ""
 
 #. Title of progressbar dialog
-#: zim/gui/__init__.py:1714 zim/gui/__init__.py:3451
+#: zim/gui/__init__.py:1739 zim/gui/__init__.py:3477
 msgid "Removing Links"
 msgstr ""
 
 #. Heading in a question dialog for creating a folder
-#: zim/gui/__init__.py:1822 zim/gui/pageview.py:5715
+#: zim/gui/__init__.py:1847 zim/gui/pageview.py:5871
 msgid "Create folder?"
 msgstr ""
 
 #. Text in a question dialog for creating a folder, %s will be the folder base name
-#: zim/gui/__init__.py:1824
+#: zim/gui/__init__.py:1849
 #, python-format
 msgid ""
 "The folder \"%s\" does not yet exist.\n"
@@ -920,51 +920,51 @@
 msgstr ""
 
 #. error when external application fails
-#: zim/gui/__init__.py:1944 zim/gui/__init__.py:2062
+#: zim/gui/__init__.py:1969 zim/gui/__init__.py:2087
 #, python-format
 msgid "Could not open: %s"
 msgstr ""
 
 #. Error message
-#: zim/gui/__init__.py:1959
+#: zim/gui/__init__.py:1984
 msgid "This page does not have an attachments folder"
 msgstr ""
 
 #. main text for dialog for editing external files
-#: zim/gui/__init__.py:2053
+#: zim/gui/__init__.py:2078
 #, python-format
 msgid "Editing file: %s"
 msgstr ""
 
 #. description for dialog for editing external files
-#: zim/gui/__init__.py:2055
+#: zim/gui/__init__.py:2080
 msgid ""
 "You are editing a file in an external application. You can close this dialog "
 "when you are done"
 msgstr ""
 
 #. General description of zim itself
-#: zim/gui/__init__.py:2259
+#: zim/gui/__init__.py:2284
 msgid "A desktop wiki"
 msgstr ""
 
 #. This string needs to be translated with names of the translators for this language
-#: zim/gui/__init__.py:2267
+#: zim/gui/__init__.py:2292
 msgid "translator-credits"
 msgstr ""
 
 #. Label for pageindex tab
-#: zim/gui/__init__.py:2365
+#: zim/gui/__init__.py:2390
 msgid "Index"
 msgstr ""
 
 #. page status in statusbar
-#: zim/gui/__init__.py:2440
+#: zim/gui/__init__.py:2465
 msgid "readonly"
 msgstr ""
 
 #. Label for button with backlinks in statusbar
-#: zim/gui/__init__.py:2962
+#: zim/gui/__init__.py:2987
 #, python-format
 msgid "%i _Backlink..."
 msgid_plural "%i _Backlinks..."
@@ -972,13 +972,13 @@
 msgstr[1] ""
 
 #. Heading of error dialog
-#: zim/gui/__init__.py:3073
+#: zim/gui/__init__.py:3098
 #, python-format
 msgid "Could not save page: %s"
 msgstr ""
 
 #. text in error dialog when saving page failed
-#: zim/gui/__init__.py:3077
+#: zim/gui/__init__.py:3102
 msgid ""
 "To continue you can save a copy of this page or discard\n"
 "any changes. If you save a copy changes will be also\n"
@@ -986,85 +986,85 @@
 msgstr ""
 
 #. Button in error dialog
-#: zim/gui/__init__.py:3108
+#: zim/gui/__init__.py:3133
 msgid "_Discard Changes"
 msgstr ""
 
 #. Button in error dialog
-#: zim/gui/__init__.py:3113
+#: zim/gui/__init__.py:3138
 msgid "_Save Copy"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3150
+#: zim/gui/__init__.py:3176
 msgid "Jump to"
 msgstr ""
 
 #. Label for page input
-#: zim/gui/__init__.py:3155
+#: zim/gui/__init__.py:3181
 msgid "Jump to Page"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3174
+#: zim/gui/__init__.py:3200
 msgid "New Sub Page"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3175
+#: zim/gui/__init__.py:3201
 msgid "New Page"
 msgstr ""
 
 #. Dialog text in 'new page' dialog
-#: zim/gui/__init__.py:3179
+#: zim/gui/__init__.py:3205
 msgid ""
 "Please note that linking to a non-existing page\n"
 "also creates a new page automatically."
 msgstr ""
 
 #. Input label
-#: zim/gui/__init__.py:3194
+#: zim/gui/__init__.py:3220
 msgid "Page Name"
 msgstr ""
 
 #. Choice label
-#: zim/gui/__init__.py:3195
+#: zim/gui/__init__.py:3221
 msgid "Page Template"
 msgstr ""
 
 #. Error when creating new page
-#: zim/gui/__init__.py:3213
+#: zim/gui/__init__.py:3239
 msgid "Page exists"
 msgstr ""
 
 #. Dialog title of file save dialog
-#: zim/gui/__init__.py:3228
+#: zim/gui/__init__.py:3254
 msgid "Save Copy"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3252
+#: zim/gui/__init__.py:3278
 msgid "Import Page"
 msgstr ""
 
 #. File filter for '*.txt'
-#: zim/gui/__init__.py:3253
+#: zim/gui/__init__.py:3279
 msgid "Text Files"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3281
+#: zim/gui/__init__.py:3307
 msgid "Move Page"
 msgstr ""
 
 #. Heading in 'move page' dialog - %s is the page name
-#: zim/gui/__init__.py:3286
+#: zim/gui/__init__.py:3312
 #, python-format
 msgid "Move page \"%s\""
 msgstr ""
 
 #. label in MovePage dialog - %i is number of backlinks
-#: zim/gui/__init__.py:3297 zim/gui/__init__.py:3346
+#: zim/gui/__init__.py:3323 zim/gui/__init__.py:3372
 #, python-format
 msgid "Update %i page linking to this page"
 msgid_plural "Update %i pages linking to this page"
@@ -1073,39 +1073,39 @@
 
 #. Input label for the section to move a page to | 
 #. input label
-#: zim/gui/__init__.py:3302 zim/plugins/calendar.py:101
+#: zim/gui/__init__.py:3328 zim/plugins/calendar.py:101
 msgid "Section"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3331
+#: zim/gui/__init__.py:3357
 msgid "Rename Page"
 msgstr ""
 
 #. label in 'rename page' dialog - %s is the page name
-#: zim/gui/__init__.py:3335
+#: zim/gui/__init__.py:3361
 #, python-format
 msgid "Rename page \"%s\""
 msgstr ""
 
 #. Option in the 'rename page' dialog
-#: zim/gui/__init__.py:3354
+#: zim/gui/__init__.py:3380
 msgid "Update the heading of this page"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3389
+#: zim/gui/__init__.py:3415
 msgid "Delete Page"
 msgstr ""
 
 #. Heading in 'delete page' dialog - %s is the page name
-#: zim/gui/__init__.py:3402
+#: zim/gui/__init__.py:3428
 #, python-format
 msgid "Delete page \"%s\"?"
 msgstr ""
 
 #. Text in 'delete page' dialog - %s is the page name
-#: zim/gui/__init__.py:3404
+#: zim/gui/__init__.py:3430
 #, python-format
 msgid ""
 "Page \"%s\" and all of it's\n"
@@ -1113,7 +1113,7 @@
 msgstr ""
 
 #. label in DeletePage dialog - %i is number of backlinks
-#: zim/gui/__init__.py:3417
+#: zim/gui/__init__.py:3443
 #, python-format
 msgid "Remove links from %i page linking to this page"
 msgid_plural "Remove links from %i pages linking to this page"
@@ -1121,7 +1121,7 @@
 msgstr[1] ""
 
 #. label in the DeletePage dialog to warn user of attachments being deleted
-#: zim/gui/__init__.py:3436
+#: zim/gui/__init__.py:3462
 #, python-format
 msgid "%i file will be deleted"
 msgid_plural "%i files will be deleted"
@@ -1129,25 +1129,25 @@
 msgstr[1] ""
 
 #. Dialog title
-#: zim/gui/__init__.py:3465
+#: zim/gui/__init__.py:3491
 msgid "Attach File"
 msgstr ""
 
 #. Error dialog - %s is the full page name
-#: zim/gui/__init__.py:3472
+#: zim/gui/__init__.py:3498
 #, python-format
 msgid "Page \"%s\" does not have a folder for attachments"
 msgstr ""
 
 #. checkbox in the "Attach File" dialog
-#: zim/gui/__init__.py:3477
+#: zim/gui/__init__.py:3503
 msgid "Insert images as link"
 msgstr ""
 
 #. Column heading in 'open notebook' dialog | 
 #. Field in web server gui | 
 #. Field to select Notebook from drop down list
-#: zim/gui/notebookdialog.py:175 zim/gui/server.py:97
+#: zim/gui/notebookdialog.py:175 zim/gui/server.py:98
 #: zim/plugins/quicknote.py:428
 msgid "Notebook"
 msgstr ""
@@ -1177,394 +1177,405 @@
 msgid "Folder"
 msgstr ""
 
+#. Label for object manager
+#: zim/gui/objectmanager.py:144
+msgid "No plugin is available to display this object."
+msgstr ""
+
+#. Label for object manager
+#: zim/gui/objectmanager.py:151
+#, python-format
+msgid "Plugin %s is required to display this object."
+msgstr ""
+
 #. statusbar message
-#: zim/gui/pageindex.py:758
+#: zim/gui/pageindex.py:745
 msgid "Updating index..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:113
+#: zim/gui/pageview.py:119
 msgid "_Undo"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:114
+#: zim/gui/pageview.py:120
 msgid "_Redo"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:116
+#: zim/gui/pageview.py:122
 msgid "Cu_t"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:117
+#: zim/gui/pageview.py:123
 msgid "_Copy"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:118
+#: zim/gui/pageview.py:124
 msgid "_Paste"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:119
+#: zim/gui/pageview.py:125
 msgid "_Delete"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:120
+#: zim/gui/pageview.py:126
 msgid "Toggle Checkbox 'V'"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:121
+#: zim/gui/pageview.py:127
 msgid "Toggle Checkbox 'X'"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:122
+#: zim/gui/pageview.py:128
 msgid "_Edit Link or Object..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:123 zim/gui/pageview.py:5327
+#: zim/gui/pageview.py:129 zim/gui/pageview.py:5480
 msgid "_Remove Link"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:124
+#: zim/gui/pageview.py:130
 msgid "_Date and Time..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:125
+#: zim/gui/pageview.py:131
 msgid "_Image..."
 msgstr ""
 
 #. Menu item | 
 #. Menu item,
-#: zim/gui/pageview.py:126 zim/gui/pageview.py:129
+#: zim/gui/pageview.py:132 zim/gui/pageview.py:135
 msgid "Bulle_t List"
 msgstr ""
 
 #. Menu item | 
 #. Menu item,
-#: zim/gui/pageview.py:127 zim/gui/pageview.py:130
+#: zim/gui/pageview.py:133 zim/gui/pageview.py:136
 msgid "_Numbered List"
 msgstr ""
 
 #. Menu item,
-#: zim/gui/pageview.py:128 zim/gui/pageview.py:131
+#: zim/gui/pageview.py:134 zim/gui/pageview.py:137
 msgid "Checkbo_x List"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:132
+#: zim/gui/pageview.py:138
 msgid "Text From _File..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:133
+#: zim/gui/pageview.py:139
 msgid "_Link..."
 msgstr ""
 
 #. Menu item | 
 #. Dialog title
-#: zim/gui/pageview.py:133 zim/gui/pageview.py:6354
+#: zim/gui/pageview.py:139 zim/gui/pageview.py:6539
 msgid "Insert Link"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:134
+#: zim/gui/pageview.py:140
 msgid "_Clear Formatting"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:135
+#: zim/gui/pageview.py:141
 msgid "_Find..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:137
+#: zim/gui/pageview.py:143
 msgid "Find Ne_xt"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:139
+#: zim/gui/pageview.py:145
 msgid "Find Pre_vious"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:141
+#: zim/gui/pageview.py:147
 msgid "_Replace..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:142
+#: zim/gui/pageview.py:148
 msgid "Word Count..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:143
+#: zim/gui/pageview.py:149
 msgid "_Zoom In"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:145
+#: zim/gui/pageview.py:151
 msgid "Zoom _Out"
 msgstr ""
 
 #. Menu item to reset zoom
-#: zim/gui/pageview.py:146
+#: zim/gui/pageview.py:152
 msgid "_Normal Size"
 msgstr ""
 
 #. Menu title
-#: zim/gui/pageview.py:149
+#: zim/gui/pageview.py:155
 msgid "New _Attachment"
 msgstr ""
 
 #. Menu item in "Insert > New File Attachment" submenu
-#: zim/gui/pageview.py:152
+#: zim/gui/pageview.py:158
 msgid "File _Templates..."
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:157
+#: zim/gui/pageview.py:163
 msgid "Heading _1"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:157
+#: zim/gui/pageview.py:163
 msgid "Heading 1"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:158
+#: zim/gui/pageview.py:164
 msgid "Heading _2"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:158
+#: zim/gui/pageview.py:164
 msgid "Heading 2"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:159
+#: zim/gui/pageview.py:165
 msgid "Heading _3"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:159
+#: zim/gui/pageview.py:165
 msgid "Heading 3"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:160
+#: zim/gui/pageview.py:166
 msgid "Heading _4"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:160
+#: zim/gui/pageview.py:166
 msgid "Heading 4"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:161
+#: zim/gui/pageview.py:167
 msgid "Heading _5"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:161
+#: zim/gui/pageview.py:167
 msgid "Heading 5"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:162 zim/gui/pageview.py:173
+#: zim/gui/pageview.py:168 zim/gui/pageview.py:179
 msgid "_Strong"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:162 zim/gui/pageview.py:173
+#: zim/gui/pageview.py:168 zim/gui/pageview.py:179
 msgid "Strong"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:163 zim/gui/pageview.py:174
+#: zim/gui/pageview.py:169 zim/gui/pageview.py:180
 msgid "_Emphasis"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:163 zim/gui/pageview.py:174
+#: zim/gui/pageview.py:169 zim/gui/pageview.py:180
 msgid "Emphasis"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:164 zim/gui/pageview.py:175
+#: zim/gui/pageview.py:170 zim/gui/pageview.py:181
 msgid "_Mark"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:164 zim/gui/pageview.py:175
+#: zim/gui/pageview.py:170 zim/gui/pageview.py:181
 msgid "Mark"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:165 zim/gui/pageview.py:176
+#: zim/gui/pageview.py:171 zim/gui/pageview.py:182
 msgid "_Strike"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:165 zim/gui/pageview.py:176
+#: zim/gui/pageview.py:171 zim/gui/pageview.py:182
 msgid "Strike"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:166
+#: zim/gui/pageview.py:172
 msgid "_Subscript"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:167
+#: zim/gui/pageview.py:173
 msgid "_Superscript"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:168
+#: zim/gui/pageview.py:174
 msgid "_Verbatim"
 msgstr ""
 
 #. Menu item
-#: zim/gui/pageview.py:168
+#: zim/gui/pageview.py:174
 msgid "Verbatim"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:183
+#: zim/gui/pageview.py:189
 msgid ""
 "Use the <Enter> key to follow links\n"
 "(If disabled you can still use <Alt><Enter>)"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:186
+#: zim/gui/pageview.py:192
 msgid "Show the cursor also for pages that can not be edited"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:189
+#: zim/gui/pageview.py:195
 msgid "Automatically turn \"CamelCase\" words into links"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:192
+#: zim/gui/pageview.py:198
 msgid "Automatically turn file paths into links"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:195
+#: zim/gui/pageview.py:201
 msgid "Automatically select the current word when you apply formatting"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:198
+#: zim/gui/pageview.py:204
 msgid ""
 "Unindent on <BackSpace>\n"
 "(If disabled you can still use <Shift><Tab>)"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:201
+#: zim/gui/pageview.py:207
 msgid "Repeated clicking a checkbox cyles through the checkbox states"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:204
+#: zim/gui/pageview.py:210
 msgid "(Un-)Indenting a list item also change any sub-items"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:207
+#: zim/gui/pageview.py:213
 msgid "Checking a checkbox also change any sub-items"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:210
+#: zim/gui/pageview.py:216
 msgid "Reformat wiki markup on the fly"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:213
+#: zim/gui/pageview.py:219
 msgid "Default format for copying text to the clipboard"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/pageview.py:216
+#: zim/gui/pageview.py:222
 msgid "Folder with templates for attachment files"
 msgstr ""
 
 #. error when unknown interwiki link is clicked
-#: zim/gui/pageview.py:5216
+#: zim/gui/pageview.py:5369
 #, python-format
 msgid "No such wiki defined: %s"
 msgstr ""
 
 #. menu item for context menu of editor
-#: zim/gui/pageview.py:5269
+#: zim/gui/pageview.py:5422
 msgid "Copy _As..."
 msgstr ""
 
 #. Context menu item for pageview to move selected text to new/other page
-#: zim/gui/pageview.py:5276
+#: zim/gui/pageview.py:5429
 msgid "Move Selected Text..."
 msgstr ""
 
 #. menu item in context menu for image
-#: zim/gui/pageview.py:5334
+#: zim/gui/pageview.py:5487
 msgid "_Edit Properties"
 msgstr ""
 
 #. menu item in context menu
-#: zim/gui/pageview.py:5336
+#: zim/gui/pageview.py:5489
 msgid "_Edit Link"
 msgstr ""
 
 #. context menu item
-#: zim/gui/pageview.py:5356 zim/gui/pageview.py:5360 zim/gui/pageview.py:5367
+#: zim/gui/pageview.py:5509 zim/gui/pageview.py:5513 zim/gui/pageview.py:5520
 msgid "Copy _Link"
 msgstr ""
 
 #. context menu item
-#: zim/gui/pageview.py:5364
+#: zim/gui/pageview.py:5517
 msgid "Copy Email Address"
 msgstr ""
 
 #. menu item to open containing folder of files
-#: zim/gui/pageview.py:5375
+#: zim/gui/pageview.py:5528
 msgid "Open Folder"
 msgstr ""
 
 #. menu item for sub menu with applications | 
 #. menu item
-#: zim/gui/pageview.py:5384 zim/gui/pageview.py:5395
-#: zim/plugins/attachmentbrowser.py:687
+#: zim/gui/pageview.py:5537 zim/gui/pageview.py:5548
+#: zim/plugins/attachmentbrowser.py:688
 msgid "Open With..."
 msgstr ""
 
 #. menu item to open a link or file | 
 #. menu item to open file or folder
-#: zim/gui/pageview.py:5415 zim/plugins/attachmentbrowser.py:693
+#: zim/gui/pageview.py:5568 zim/plugins/attachmentbrowser.py:694
 msgid "_Open"
 msgstr ""
 
 #. message when no file templates are found in ~/Templates
-#: zim/gui/pageview.py:5654
+#: zim/gui/pageview.py:5810
 msgid "No templates installed"
 msgstr ""
 
 #. Text in a question dialog for creating a folder, %s is the folder path
-#: zim/gui/pageview.py:5717
+#: zim/gui/pageview.py:5873
 #, python-format
 msgid ""
 "The folder\n"
@@ -1574,317 +1585,317 @@
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6020
+#: zim/gui/pageview.py:6205
 msgid "Insert Date and Time"
 msgstr ""
 
 #. expander label in "insert date" dialog
-#: zim/gui/pageview.py:6049
+#: zim/gui/pageview.py:6234
 msgid "_Calendar"
 msgstr ""
 
 #. check box in InsertDate dialog
-#: zim/gui/pageview.py:6063
+#: zim/gui/pageview.py:6248
 msgid "_Link to date"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6156
+#: zim/gui/pageview.py:6341
 msgid "Insert Image"
 msgstr ""
 
 #. checkbox in the "Insert Image" dialog
-#: zim/gui/pageview.py:6163
+#: zim/gui/pageview.py:6348
 msgid "Attach image first"
 msgstr ""
 
 #. Error message when trying to insert a not supported file as image
-#: zim/gui/pageview.py:6178
+#: zim/gui/pageview.py:6363
 #, python-format
 msgid "File type not supported: %s"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6206
+#: zim/gui/pageview.py:6391
 msgid "Edit Image"
 msgstr ""
 
 #. Input in 'edit image' dialog
-#: zim/gui/pageview.py:6225
+#: zim/gui/pageview.py:6410
 msgid "Location"
 msgstr ""
 
 #. Input in 'edit image' dialog | 
 #. Input in 'insert link' dialog
-#: zim/gui/pageview.py:6226 zim/gui/pageview.py:6360
+#: zim/gui/pageview.py:6411 zim/gui/pageview.py:6545
 msgid "Link to"
 msgstr ""
 
 #. Input in 'edit image' dialog
-#: zim/gui/pageview.py:6227
+#: zim/gui/pageview.py:6412
 msgid "Width"
 msgstr ""
 
 #. Input in 'edit image' dialog
-#: zim/gui/pageview.py:6228
+#: zim/gui/pageview.py:6413
 msgid "Height"
 msgstr ""
 
 #. Button in 'edit image' dialog
-#: zim/gui/pageview.py:6236
+#: zim/gui/pageview.py:6421
 msgid "_Reset Size"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6331
+#: zim/gui/pageview.py:6516
 msgid "Insert Text From File"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6353
+#: zim/gui/pageview.py:6538
 msgid "Edit Link"
 msgstr ""
 
 #. Dialog button
-#: zim/gui/pageview.py:6357
+#: zim/gui/pageview.py:6542
 msgid "_Link"
 msgstr ""
 
 #. Input in 'insert link' dialog
-#: zim/gui/pageview.py:6361
+#: zim/gui/pageview.py:6546
 msgid "Text"
 msgstr ""
 
 #. button in find bar and find & replace dialog
-#: zim/gui/pageview.py:6460
+#: zim/gui/pageview.py:6645
 msgid "_Next"
 msgstr ""
 
 #. button in find bar and find & replace dialog
-#: zim/gui/pageview.py:6466
+#: zim/gui/pageview.py:6651
 msgid "_Previous"
 msgstr ""
 
 #. checkbox option in find bar and find & replace dialog
-#: zim/gui/pageview.py:6472
+#: zim/gui/pageview.py:6657
 msgid "Match _case"
 msgstr ""
 
 #. checkbox option in find bar and find & replace dialog
-#: zim/gui/pageview.py:6477
+#: zim/gui/pageview.py:6662
 msgid "Whole _word"
 msgstr ""
 
 #. checkbox option in find bar and find & replace dialog
-#: zim/gui/pageview.py:6482
+#: zim/gui/pageview.py:6667
 msgid "_Regular expression"
 msgstr ""
 
 #. checkbox option in find bar and find & replace dialog
-#: zim/gui/pageview.py:6487
+#: zim/gui/pageview.py:6672
 msgid "_Highlight"
 msgstr ""
 
 #. label for input in find bar on bottom of page
-#: zim/gui/pageview.py:6573
+#: zim/gui/pageview.py:6758
 msgid "Find"
 msgstr ""
 
 #. Options button
-#: zim/gui/pageview.py:6603
+#: zim/gui/pageview.py:6788
 msgid "Options"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6648
+#: zim/gui/pageview.py:6833
 msgid "Find and Replace"
 msgstr ""
 
 #. input label in find & replace dialog
-#: zim/gui/pageview.py:6658
+#: zim/gui/pageview.py:6843
 msgid "Find what"
 msgstr ""
 
 #. input label in find & replace dialog
-#: zim/gui/pageview.py:6668
+#: zim/gui/pageview.py:6853
 msgid "Replace with"
 msgstr ""
 
 #. Button in search & replace dialog
-#: zim/gui/pageview.py:6680
+#: zim/gui/pageview.py:6865
 msgid "_Replace"
 msgstr ""
 
 #. Button in search & replace dialog
-#: zim/gui/pageview.py:6685
+#: zim/gui/pageview.py:6870
 msgid "Replace _All"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6712
+#: zim/gui/pageview.py:6897
 msgid "Word Count"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6755
+#: zim/gui/pageview.py:6940
 msgid "Paragraph"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6756
+#: zim/gui/pageview.py:6941
 msgid "Selection"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6757
+#: zim/gui/pageview.py:6942
 msgid "Words"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6758
+#: zim/gui/pageview.py:6943
 msgid "Lines"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6759
+#: zim/gui/pageview.py:6944
 msgid "Characters"
 msgstr ""
 
 #. label in word count dialog
-#: zim/gui/pageview.py:6760
+#: zim/gui/pageview.py:6945
 msgid "Characters excluding spaces"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6799
+#: zim/gui/pageview.py:6984
 msgid "Move Text to Other Page"
 msgstr ""
 
 #. Button label
-#: zim/gui/pageview.py:6800
+#: zim/gui/pageview.py:6985
 msgid "_Move"
 msgstr ""
 
 #. Input in 'move text' dialog
-#: zim/gui/pageview.py:6815
+#: zim/gui/pageview.py:7000
 msgid "Move text to"
 msgstr ""
 
 #. Input in 'move text' dialog
-#: zim/gui/pageview.py:6816
+#: zim/gui/pageview.py:7001
 msgid "Leave link to new page"
 msgstr ""
 
 #. Input in 'move text' dialog
-#: zim/gui/pageview.py:6817
+#: zim/gui/pageview.py:7002
 msgid "Open new page"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/pageview.py:6855
+#: zim/gui/pageview.py:7040
 msgid "New File"
 msgstr ""
 
 #. Tab in preferences dialog
+#: zim/gui/preferencesdialog.py:20
+msgid "Interface"
+msgstr ""
+
+#. Tab in preferences dialog
 #: zim/gui/preferencesdialog.py:21
-msgid "Interface"
-msgstr ""
-
-#. Tab in preferences dialog
-#: zim/gui/preferencesdialog.py:22
 msgid "Editing"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/preferencesdialog.py:32
+#: zim/gui/preferencesdialog.py:31
 msgid "Preferences"
 msgstr ""
 
 #. Heading in preferences dialog
-#: zim/gui/preferencesdialog.py:78
+#: zim/gui/preferencesdialog.py:77
 msgid "Plugins"
 msgstr ""
 
 #. Heading in preferences dialog
-#: zim/gui/preferencesdialog.py:88
+#: zim/gui/preferencesdialog.py:87
 msgid "Applications"
 msgstr ""
 
 #. option in preferences dialog
-#: zim/gui/preferencesdialog.py:95
+#: zim/gui/preferencesdialog.py:94
 msgid "Use a custom font"
 msgstr ""
 
 #. Button in plugin tab
-#: zim/gui/preferencesdialog.py:209
+#: zim/gui/preferencesdialog.py:208
 msgid "_More"
 msgstr ""
 
 #. Button in plugin tab
-#: zim/gui/preferencesdialog.py:214
+#: zim/gui/preferencesdialog.py:213
 msgid "C_onfigure"
 msgstr ""
 
 #. label for button with URL
-#: zim/gui/preferencesdialog.py:223
+#: zim/gui/preferencesdialog.py:226
 msgid "Get more plugins online"
 msgstr ""
 
 #. Heading in plugins tab of preferences dialog
-#: zim/gui/preferencesdialog.py:248
+#: zim/gui/preferencesdialog.py:251
 msgid "Dependencies"
 msgstr ""
 
 #. label in plugin info in preferences dialog
-#: zim/gui/preferencesdialog.py:252
+#: zim/gui/preferencesdialog.py:255
 msgid "No dependencies"
 msgstr ""
 
 #. dependency is OK
-#: zim/gui/preferencesdialog.py:258
+#: zim/gui/preferencesdialog.py:261
 msgid "OK"
 msgstr ""
 
 #. dependency failed
-#: zim/gui/preferencesdialog.py:260 zim/gui/preferencesdialog.py:263
+#: zim/gui/preferencesdialog.py:263 zim/gui/preferencesdialog.py:266
 msgid "Failed"
 msgstr ""
 
 #. optional dependency
-#: zim/gui/preferencesdialog.py:264
+#: zim/gui/preferencesdialog.py:267
 msgid "Optional"
 msgstr ""
 
 #. Heading in plugins tab of preferences dialog | 
 #. Column header versions dialog
-#: zim/gui/preferencesdialog.py:268
+#: zim/gui/preferencesdialog.py:271
 #: zim/plugins/versioncontrol/__init__.py:1180
 msgid "Author"
 msgstr ""
 
 #. Column in plugin tab
-#: zim/gui/preferencesdialog.py:349
+#: zim/gui/preferencesdialog.py:353
 msgid "Enabled"
 msgstr ""
 
 #. Column in plugin tab
-#: zim/gui/preferencesdialog.py:352
+#: zim/gui/preferencesdialog.py:356
 msgid "Plugin"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/preferencesdialog.py:359
+#: zim/gui/preferencesdialog.py:363
 msgid "Configure Plugin"
 msgstr ""
 
 #. Heading for 'configure plugin' dialog - %s is the plugin name
-#: zim/gui/preferencesdialog.py:364
+#: zim/gui/preferencesdialog.py:368
 #, python-format
 msgid "Options for plugin %s"
 msgstr ""
 
 #. button in preferences dialog to change default text editor
-#: zim/gui/preferencesdialog.py:398
+#: zim/gui/preferencesdialog.py:402
 msgid "Set default text editor"
 msgstr ""
 
@@ -1926,12 +1937,12 @@
 msgstr ""
 
 #. checkbox option in search dialog
-#: zim/gui/searchdialog.py:58
+#: zim/gui/searchdialog.py:59
 msgid "Limit search to the current page and sub-pages"
 msgstr ""
 
 #. Column header search dialog
-#: zim/gui/searchdialog.py:151
+#: zim/gui/searchdialog.py:152
 msgid "Score"
 msgstr ""
 
@@ -1946,22 +1957,22 @@
 msgstr ""
 
 #. Checkbox in web server gui
-#: zim/gui/server.py:81
+#: zim/gui/server.py:82
 msgid "Allow public access"
 msgstr ""
 
 #. Field in web server gui for HTTP port (e.g. port 80)
-#: zim/gui/server.py:99
+#: zim/gui/server.py:100
 msgid "Port"
 msgstr ""
 
 #. Status in web server gui
-#: zim/gui/server.py:158
+#: zim/gui/server.py:159
 msgid "Server started"
 msgstr ""
 
 #. Status in web server gui
-#: zim/gui/server.py:199
+#: zim/gui/server.py:200
 msgid "Server stopped"
 msgstr ""
 
@@ -1977,114 +1988,114 @@
 msgstr ""
 
 #. Dialog title
-#: zim/gui/templateeditordialog.py:155
+#: zim/gui/templateeditordialog.py:156
 msgid "Copy Template"
 msgstr ""
 
 #. dialog title
-#: zim/gui/widgets.py:572 zim/gui/widgets.py:1753
+#: zim/gui/widgets.py:573 zim/gui/widgets.py:1759
 msgid "Select File"
 msgstr ""
 
 #. menu item in context menu
-#: zim/gui/widgets.py:710
+#: zim/gui/widgets.py:712
 msgid "Expand _All"
 msgstr ""
 
 #. menu item in context menu
-#: zim/gui/widgets.py:712
+#: zim/gui/widgets.py:714
 msgid "_Collapse All"
 msgstr ""
 
 #. tooltip for the inline icon to clear a text entry widget
-#: zim/gui/widgets.py:1555
+#: zim/gui/widgets.py:1561
 msgid "Clear"
 msgstr ""
 
 #. dialog title
-#: zim/gui/widgets.py:1749
+#: zim/gui/widgets.py:1755
 msgid "Select Folder"
 msgstr ""
 
 #. dialog title
-#: zim/gui/widgets.py:1751
+#: zim/gui/widgets.py:1757
 msgid "Select Image"
 msgstr ""
 
 #. default text for empty page section selection
-#: zim/gui/widgets.py:1884
+#: zim/gui/widgets.py:1890
 msgid "<Top>"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2178
+#: zim/gui/widgets.py:2184
 msgid "Left Side Pane"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2179
+#: zim/gui/widgets.py:2185
 msgid "Right Side Pane"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2180
+#: zim/gui/widgets.py:2186
 msgid "Bottom Pane"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2181
+#: zim/gui/widgets.py:2187
 msgid "Top Pane"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2185
+#: zim/gui/widgets.py:2191
 msgid "Top Left"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2186
+#: zim/gui/widgets.py:2192
 msgid "Bottom Left"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2187
+#: zim/gui/widgets.py:2193
 msgid "Top Right"
 msgstr ""
 
 #. Option for placement of plugin widgets
-#: zim/gui/widgets.py:2188
+#: zim/gui/widgets.py:2194
 msgid "Bottom Right"
 msgstr ""
 
 #. generic error dialog text
-#: zim/gui/widgets.py:3231
+#: zim/gui/widgets.py:3241
 msgid ""
 "When reporting this bug please include\n"
 "the information from the text box below"
 msgstr ""
 
 #. Filter in open file dialog, shows all files (*)
-#: zim/gui/widgets.py:3552
+#: zim/gui/widgets.py:3562
 msgid "All Files"
 msgstr ""
 
 #. Filter in open file dialog, shows image files only
-#: zim/gui/widgets.py:3579
+#: zim/gui/widgets.py:3589
 msgid "Images"
 msgstr ""
 
 #. dialog title for log view dialog - e.g. for Equation Editor
-#: zim/gui/widgets.py:3775
+#: zim/gui/widgets.py:3785
 msgid "Log file"
 msgstr ""
 
 #. Dialog title
-#: zim/gui/widgets.py:4246
+#: zim/gui/widgets.py:4256
 msgid "File Exists"
 msgstr ""
 
 #. Dialog text in 'new filename' dialog
-#: zim/gui/widgets.py:4247
+#: zim/gui/widgets.py:4257
 #, python-format
 msgid ""
 "A file with the name <b>\"%s\"</b> already exists.\n"
@@ -2092,17 +2103,17 @@
 msgstr ""
 
 #. Input label
-#: zim/gui/widgets.py:4256
+#: zim/gui/widgets.py:4266
 msgid "Filename"
 msgstr ""
 
 #. Button label
-#: zim/gui/widgets.py:4265
+#: zim/gui/widgets.py:4275
 msgid "_Browse"
 msgstr ""
 
 #. Button label
-#: zim/gui/widgets.py:4270
+#: zim/gui/widgets.py:4280
 msgid "Overwrite"
 msgstr ""
 
@@ -2192,27 +2203,6 @@
 msgid "Profile"
 msgstr ""
 
-#. Label for object manager
-#: zim/objectmanager.py:211
-#, python-format
-msgid "Plugin %s is required to display this object."
-msgstr ""
-
-#. Label for object manager
-#: zim/objectmanager.py:216
-msgid "Enable plugin"
-msgstr ""
-
-#. Label for object manager
-#: zim/objectmanager.py:228
-msgid "Show plugin details"
-msgstr ""
-
-#. Label for object manager
-#: zim/objectmanager.py:232
-msgid "No plugin is available to display this object."
-msgstr ""
-
 #. placeholder for unknown file name
 #: zim/parser.py:269
 msgid "<Unknown>"
@@ -2284,37 +2274,37 @@
 msgstr[1] ""
 
 #. unspecified value for file modification time
-#: zim/plugins/attachmentbrowser.py:712
+#: zim/plugins/attachmentbrowser.py:713
 msgid "Unknown"
 msgstr ""
 
 #. label for file type
-#: zim/plugins/attachmentbrowser.py:727
+#: zim/plugins/attachmentbrowser.py:728
 msgid "Type"
 msgstr ""
 
 #. label for file size
-#: zim/plugins/attachmentbrowser.py:728
+#: zim/plugins/attachmentbrowser.py:729
 msgid "Size"
 msgstr ""
 
 #. label for file modification date
-#: zim/plugins/attachmentbrowser.py:729
+#: zim/plugins/attachmentbrowser.py:730
 msgid "Modified"
 msgstr ""
 
 #. popup menu action on drag-drop of a file
-#: zim/plugins/attachmentbrowser.py:764
+#: zim/plugins/attachmentbrowser.py:765
 msgid "_Move Here"
 msgstr ""
 
 #. popup menu action on drag-drop of a file
-#: zim/plugins/attachmentbrowser.py:768
+#: zim/plugins/attachmentbrowser.py:769
 msgid "_Copy Here"
 msgstr ""
 
 #. popup menu action on drag-drop of a file
-#: zim/plugins/attachmentbrowser.py:773
+#: zim/plugins/attachmentbrowser.py:774
 msgid "Cancel"
 msgstr ""
 
@@ -2392,33 +2382,38 @@
 msgid "Use a page for each"
 msgstr ""
 
+#. preferences option
+#: zim/plugins/calendar.py:102
+msgid "Expand journal page in index when opened"
+msgstr ""
+
 #. menu item
-#: zim/plugins/calendar.py:229
+#: zim/plugins/calendar.py:232
 msgid "To_day"
 msgstr ""
 
 #. menu item
-#: zim/plugins/calendar.py:266
+#: zim/plugins/calendar.py:269
 msgid "Calen_dar"
 msgstr ""
 
 #. menu item
-#: zim/plugins/calendar.py:266
+#: zim/plugins/calendar.py:269
 msgid "Show calendar"
 msgstr ""
 
 #. strftime format for current date label
-#: zim/plugins/calendar.py:419
+#: zim/plugins/calendar.py:423
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. dialog title
-#: zim/plugins/calendar.py:471
+#: zim/plugins/calendar.py:475
 msgid "Calendar"
 msgstr ""
 
 #. button label
-#: zim/plugins/calendar.py:481
+#: zim/plugins/calendar.py:485
 msgid "_Today"
 msgstr ""
 
@@ -2745,7 +2740,7 @@
 msgstr ""
 
 #. text entry field
-#: zim/plugins/quicknote.py:224
+#: zim/plugins/quicknote.py:224 zim/plugins/tableeditor.py:999
 msgid "Title"
 msgstr ""
 
@@ -2869,64 +2864,64 @@
 msgstr ""
 
 #. plugin name
-#: zim/plugins/sourceview.py:37
+#: zim/plugins/sourceview.py:43
 msgid "Source View"
 msgstr ""
 
 #. plugin description
-#: zim/plugins/sourceview.py:38
+#: zim/plugins/sourceview.py:44
 msgid ""
 "This plugin allows inserting 'Code Blocks' in the page. These will be\n"
 "shown as emdedded widgets with syntax highlighting, line numbers etc.\n"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:49
+#: zim/plugins/sourceview.py:55
 msgid "Auto indenting"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:51
+#: zim/plugins/sourceview.py:57
 msgid "Smart Home key"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:53
+#: zim/plugins/sourceview.py:59
 msgid "Highlight current line"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:55
+#: zim/plugins/sourceview.py:61
 msgid "Show right margin"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:57
+#: zim/plugins/sourceview.py:63
 msgid "Right margin position"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:59
+#: zim/plugins/sourceview.py:65
 msgid "Tab width"
 msgstr ""
 
 #. menu item
-#: zim/plugins/sourceview.py:108
+#: zim/plugins/sourceview.py:112
 msgid "Code Block"
 msgstr ""
 
 #. dialog title
-#: zim/plugins/sourceview.py:123
+#: zim/plugins/sourceview.py:127
 msgid "Insert Code Block"
 msgstr ""
 
 #. input label
-#: zim/plugins/sourceview.py:126 zim/plugins/sourceview.py:361
+#: zim/plugins/sourceview.py:130 zim/plugins/sourceview.py:344
 msgid "Syntax"
 msgstr ""
 
 #. preference option for sourceview plugin
-#: zim/plugins/sourceview.py:351
+#: zim/plugins/sourceview.py:334
 msgid "Show Line Numbers"
 msgstr ""
 
@@ -2960,6 +2955,194 @@
 "dictionaries installed"
 msgstr ""
 
+#. alignment option
+#: zim/plugins/tableeditor.py:56 zim/plugins/tableeditor.py:943
+msgid "Left"
+msgstr ""
+
+#. alignment option
+#: zim/plugins/tableeditor.py:57
+msgid "Center"
+msgstr ""
+
+#. alignment option
+#: zim/plugins/tableeditor.py:58
+msgid "Right"
+msgstr ""
+
+#. alignment option
+#: zim/plugins/tableeditor.py:59
+msgid "Unspecified"
+msgstr ""
+
+#. plugin name
+#: zim/plugins/tableeditor.py:90
+msgid "Table Editor"
+msgstr ""
+
+#. plugin description
+#: zim/plugins/tableeditor.py:91
+msgid ""
+"With this plugin you can embed a 'Table' into the wiki page. Tables will be "
+"shown as GTK TreeView widgets.\n"
+"Exporting them to various formats (i.e. HTML/LaTeX) completes the feature "
+"set.\n"
+msgstr ""
+
+#. option value
+#: zim/plugins/tableeditor.py:101
+msgid "with lines"
+msgstr ""
+
+#. option value
+#: zim/plugins/tableeditor.py:102
+msgid "no grid lines"
+msgstr ""
+
+#. option value
+#: zim/plugins/tableeditor.py:103
+msgid "horizontal lines"
+msgstr ""
+
+#. option value
+#: zim/plugins/tableeditor.py:104
+msgid "vertical lines"
+msgstr ""
+
+#. preference description
+#: zim/plugins/tableeditor.py:110
+msgid "Show helper toolbar"
+msgstr ""
+
+#. preference description
+#: zim/plugins/tableeditor.py:113
+msgid "Grid lines"
+msgstr ""
+
+#. menu item
+#: zim/plugins/tableeditor.py:252
+msgid "Table"
+msgstr ""
+
+#. tooltip on mouse hover | 
+#. menu item
+#: zim/plugins/tableeditor.py:547 zim/plugins/tableeditor.py:759
+msgid "Add row"
+msgstr ""
+
+#. tooltip on mouse hover
+#: zim/plugins/tableeditor.py:548
+msgid "Remove row"
+msgstr ""
+
+#. tooltip on mouse hover | 
+#. menu item
+#: zim/plugins/tableeditor.py:549 zim/plugins/tableeditor.py:761
+msgid "Clone row"
+msgstr ""
+
+#. tooltip on mouse hover | 
+#. menu item
+#: zim/plugins/tableeditor.py:551 zim/plugins/tableeditor.py:765
+msgid "Row up"
+msgstr ""
+
+#. tooltip on mouse hover | 
+#. menu item
+#: zim/plugins/tableeditor.py:552 zim/plugins/tableeditor.py:766
+msgid "Row down"
+msgstr ""
+
+#. tooltip on mouse hover | 
+#. menu item
+#: zim/plugins/tableeditor.py:554 zim/plugins/tableeditor.py:768
+msgid "Change columns"
+msgstr ""
+
+#. tooltip on mouse hover
+#: zim/plugins/tableeditor.py:556
+msgid "Open help"
+msgstr ""
+
+#. menu item
+#: zim/plugins/tableeditor.py:760
+msgid "Delete row"
+msgstr ""
+
+#. menu item
+#: zim/plugins/tableeditor.py:763
+msgid "Open cell content link"
+msgstr ""
+
+#. Popup dialog
+#: zim/plugins/tableeditor.py:826
+msgid ""
+"The table must consist of at least on row!\n"
+" No deletion done."
+msgstr ""
+
+#. Popup dialog
+#: zim/plugins/tableeditor.py:909 zim/plugins/tableeditor.py:1157
+msgid "Please select a row, before you push the button."
+msgstr ""
+
+#. Dialog title
+#: zim/plugins/tableeditor.py:938
+msgid "Insert Table"
+msgstr ""
+
+#. Dialog title
+#: zim/plugins/tableeditor.py:938
+msgid "Edit Table"
+msgstr ""
+
+#. Description of "Table-Insert" Dialog
+#: zim/plugins/tableeditor.py:948
+msgid "Managing table columns"
+msgstr ""
+
+#. Initial data for column title in table
+#: zim/plugins/tableeditor.py:974
+msgid "Column 1"
+msgstr ""
+
+#. table header
+#: zim/plugins/tableeditor.py:1008
+msgid ""
+"Auto\n"
+"Wrap"
+msgstr ""
+
+#. table header
+#: zim/plugins/tableeditor.py:1018
+msgid "Align"
+msgstr ""
+
+#. hoover tooltip
+#: zim/plugins/tableeditor.py:1046
+msgid "Add column"
+msgstr ""
+
+#. hoover tooltip
+#: zim/plugins/tableeditor.py:1047
+msgid "Remove column"
+msgstr ""
+
+#. hoover tooltip
+#: zim/plugins/tableeditor.py:1048
+msgid "Move column ahead"
+msgstr ""
+
+#. hoover tooltip
+#: zim/plugins/tableeditor.py:1049
+msgid "Move column backward"
+msgstr ""
+
+#. popup dialog
+#: zim/plugins/tableeditor.py:1131
+msgid "A table needs to have at least one column."
+msgstr ""
+
 #. plugin name
 #: zim/plugins/tableofcontents.py:66
 msgid "Table of Contents"
@@ -3001,7 +3184,7 @@
 
 #. plugin name | 
 #. Column header for tag list in Task List dialog
-#: zim/plugins/tags.py:30 zim/plugins/tags.py:70 zim/plugins/tasklist.py:736
+#: zim/plugins/tags.py:30 zim/plugins/tags.py:70 zim/plugins/tasklist.py:739
 msgid "Tags"
 msgstr ""
 
@@ -3013,25 +3196,30 @@
 msgstr ""
 
 #. menu option
-#: zim/plugins/tags.py:125
+#: zim/plugins/tags.py:139
+msgid "Show full page name"
+msgstr ""
+
+#. menu option
+#: zim/plugins/tags.py:144
 msgid "Sort pages by tags"
 msgstr ""
 
 #. label for untagged pages in side pane
-#: zim/plugins/tags.py:250
+#: zim/plugins/tags.py:270
 msgid "untagged"
 msgstr ""
 
 #. Context menu item for tag cloud
-#: zim/plugins/tags.py:997
+#: zim/plugins/tags.py:1008
 msgid "Sort alphabetically"
 msgstr ""
 
 #. plugin name | 
 #. menu item | 
 #. dialog title
-#: zim/plugins/tasklist.py:82 zim/plugins/tasklist.py:405
-#: zim/plugins/tasklist.py:631
+#: zim/plugins/tasklist.py:82 zim/plugins/tasklist.py:408
+#: zim/plugins/tasklist.py:634
 msgid "Task List"
 msgstr ""
 
@@ -3091,12 +3279,12 @@
 msgstr ""
 
 #. Short message text on first time use of task list plugin
-#: zim/plugins/tasklist.py:409
+#: zim/plugins/tasklist.py:412
 msgid "Need to index the notebook"
 msgstr ""
 
 #. Long message text on first time use of task list plugin
-#: zim/plugins/tasklist.py:411
+#: zim/plugins/tasklist.py:414
 msgid ""
 "This is the first time the task list is opened.\n"
 "Therefore the index needs to be rebuild.\n"
@@ -3106,17 +3294,17 @@
 msgstr ""
 
 #. Input label
-#: zim/plugins/tasklist.py:661
+#: zim/plugins/tasklist.py:664
 msgid "Filter"
 msgstr ""
 
 #. Checkbox in task list
-#: zim/plugins/tasklist.py:681
+#: zim/plugins/tasklist.py:684
 msgid "Only Show Actionable Tasks"
 msgstr ""
 
 #. Label for statistics in Task List, %i is the number of tasks
-#: zim/plugins/tasklist.py:694
+#: zim/plugins/tasklist.py:697
 #, python-format
 msgid "%i open item"
 msgid_plural "%i open items"
@@ -3124,23 +3312,23 @@
 msgstr[1] ""
 
 #. "tag" for showing all tasks
-#: zim/plugins/tasklist.py:795
+#: zim/plugins/tasklist.py:798
 msgid "All Tasks"
 msgstr ""
 
 #. label in tasklist plugins for tasks without a tag
-#: zim/plugins/tasklist.py:806
+#: zim/plugins/tasklist.py:809
 msgid "Untagged"
 msgstr ""
 
 #. Column header Task List dialog
-#: zim/plugins/tasklist.py:890
+#: zim/plugins/tasklist.py:893
 msgid "Task"
 msgstr ""
 
 #. Column header Task List dialog | 
 #. Column header versions dialog
-#: zim/plugins/tasklist.py:935 zim/plugins/versioncontrol/__init__.py:1179
+#: zim/plugins/tasklist.py:939 zim/plugins/versioncontrol/__init__.py:1179
 msgid "Date"
 msgstr ""
 
@@ -3375,7 +3563,7 @@
 msgstr ""
 
 #. Error message in template lookup
-#: zim/templates/__init__.py:122
+#: zim/templates/__init__.py:121
 #, python-format
 msgid "Could not find template \"%s\""
 msgstr ""

=== modified file 'zim/formats/__init__.py'
--- zim/formats/__init__.py	2014-11-11 20:26:12 +0000
+++ zim/formats/__init__.py	2015-04-04 11:26:41 +0000
@@ -37,6 +37,13 @@
 	- link for links, attribute href gives the target
 	- img for images, attributes src, width, height an optionally href and alt
 		- type can be used to control plugin functionality, e.g. type=equation
+	- table for tables, attributes
+			* aligns - comma separated values: right,left,center
+			* wraps - 0 for not wrapped, 1 for auto-wrapped line display
+		- thead for table header row
+			- th for table header cell
+		- trow for table row
+			- td for table data cell
 
 Unlike html we respect line breaks and other whitespace as is.
 When rendering as html use the "white-space: pre" CSS definition to
@@ -128,7 +135,13 @@
 TAG = 'tag'
 ANCHOR = 'anchor'
 
-BLOCK_LEVEL = (PARAGRAPH, HEADING, VERBATIM_BLOCK, BLOCK, OBJECT, IMAGE, LISTITEM)
+TABLE = 'table'
+HEADROW = 'thead'
+HEADDATA = 'th'
+TABLEROW = 'trow'
+TABLEDATA = 'td'
+
+BLOCK_LEVEL = (PARAGRAPH, HEADING, VERBATIM_BLOCK, BLOCK, OBJECT, IMAGE, LISTITEM, TABLE)
 
 
 _letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -891,6 +904,7 @@
 		self._tail = True
 
 		if len(self._stack) > 1 and not (tag == 'img' or tag == 'object'
+		or tag == HEADDATA or tag == TABLEDATA
 		or (self._last.text and not self._last.text.isspace())
 		or self._last.getchildren() ):
 			# purge empty tags
@@ -1146,6 +1160,10 @@
 		if not tag or tag != self.context[-1].tag:
 			raise AssertionError, 'Unexpected tag closed: %s' % tag
 		_, attrib, strings = self.context.pop()
+
+		if tag in (TABLEDATA, HEADDATA) and not isinstance(strings, basestring):
+			strings = [''.join(strings)] # child elements of td and th are concated to string
+
 		if tag in self.TAGS:
 			assert strings, 'Can not append empty %s element' % tag
 			start, end = self.TAGS[tag]
@@ -1484,3 +1502,151 @@
 		self.attrib = None
 		if content:
 			self.extend(content)
+
+
+class TableParser():
+	'''Common functions for converting a table from its' xml structure to another format'''
+
+	@staticmethod
+	def width2dim(lines):
+		'''
+		Calculates the characters on each column and return list of widths
+		:param lines: 2-dim multiline rows
+		:return: the number of characters of the longest cell-value by column
+		'''
+		widths = [max(map(len, line)) for line in zip(*lines)]
+		return widths
+
+	@staticmethod
+	def width3dim(lines):
+		'''
+		Calculates the characters on each column and return list of widths
+		:param lines: 3-dim multiline rows
+		:return: the number of characters of the longest cell-value by column
+		'''
+		lines = reduce(lambda x, y: x+y, lines)
+		widths = [max(map(len, line)) for line in zip(*lines)]
+		return widths
+
+	@staticmethod
+	def convert_to_multiline_cells(rows):
+		'''
+		Each cell of a list of list is splitted by "\n" and a 3-dimensional list is returned,
+		whereas each tuple represents a line and multiple lines represents a row and multiple rows represents the table
+		c11a = Cell in Row 1 in Column 1 in first = a line
+		:param strings: format like (('c11a \n c11b', 'c12a \n c12b'), ('c21', 'c22a \n 22b'))
+		:return: format like (((c11a, c12a), (c11b, c12b)), ((c21, c22a), ('', c22b)))
+		'''
+		multi_rows = [map(lambda cell: cell.split("\n"), row) for row in rows]
+
+		# grouping by line, not by row
+		strings = [map(lambda *line: map(lambda val: val if val is not None else '', line), *row) for row in multi_rows]
+		return strings
+
+	@staticmethod
+	def get_options(attrib):
+		'''
+		Lists the attributes as tuple
+		:param attrib:
+		:return: tuple of attributes
+		'''
+		aligns = attrib['aligns'].split(',')
+		wraps = map(int, attrib['wraps'].split(','))
+
+		return aligns, wraps
+
+	@staticmethod
+	def rowsep(maxwidths, x='+', y='-'):
+		'''
+		Displays a row separator
+		example: rowsep((3,0), '-', '+') -> +-----+--+
+		:param maxwidths: list of column lengths
+		:param x: point-separator
+		:param y: line-separator
+		:return: a textline
+		'''
+		return x + x.join(map(lambda width: (width+2) * y, maxwidths)) + x
+
+	@staticmethod
+	def headsep(maxwidths, aligns, x='|', y='-'):
+		'''
+		Displays a header separation with alignment infos
+		example: rowsep((3,0), '-', '+') -> +-----+--+
+		:param maxwidths: list of column lengths
+		:param aligns:  list of alignments
+		:param x: point-separator
+		:param y: line-separator
+		:return: a textline
+		'''
+		cells = []
+		for width, align in zip(maxwidths, aligns):
+			line = width * y
+			if align == 'left':
+				cell = ':' + line + y
+			elif align == 'right':
+				cell = y + line + ':'
+			elif align == 'center':
+				cell = ':' + line + ':'
+			else:
+				cell = y + line + y
+			cells.append(cell)
+		return x + x.join(cells) + x
+
+	@staticmethod
+	def headline(row, maxwidths, aligns, wraps, x='|', y=' '):
+		'''
+		Displays a headerline line in text format
+		:param row: tuple of cells
+		:param maxwidths: list of column length
+		:param aligns:  list of alignments
+		:param x:  point-separator
+		:param y: space-separator
+		:return: a textline
+		'''
+		row = TableParser.alignrow(row, maxwidths, aligns, y)
+		cells = []
+		for val, wrap in zip(row, wraps):
+			if wrap == 1:
+				val = val[:-1]+'<'
+			cells.append(val)
+		return x + x.join(cells) + x
+
+	@staticmethod
+	def rowline(row, maxwidths, aligns, x='|', y=' '):
+		'''
+		Displays a normal column line in text format
+		example: rowline((3,0), (left, left), '+','-') -> +-aa--+--+
+		:param row: tuple of cells
+		:param maxwidths: list of column length
+		:param aligns:  list of alignments
+		:param x:  point-separator
+		:param y: space-separator
+		:return: a textline
+		'''
+		cells = TableParser.alignrow(row, maxwidths, aligns, y)
+		return x + x.join(cells) + x
+
+	@staticmethod
+	def alignrow(row, maxwidths, aligns, y=' '):
+		'''
+		Formats a row with the right alignments
+		:param row: tuple of cells
+		:param maxwidths: list of column length
+		:param aligns:  list of alignments
+		:param x:  point-separator
+		:param y: space-separator
+		:return: a textline
+		'''
+		cells = []
+		for val, align, maxwidth in zip(row, aligns, maxwidths):
+			if align == 'left':
+				(lspace, rspace) = (1, maxwidth - len(val) + 1)
+			elif align == 'right':
+				(lspace, rspace) = (maxwidth - len(val) + 1, 1)
+			elif align == 'center':
+				lspace = (maxwidth - len(val)) / 2 + 1
+				rspace = (maxwidth - lspace - len(val) + 2)
+			else:
+				(lspace, rspace) = (1, maxwidth - len(val) + 1)
+			cells.append(lspace * y + val + rspace * y)
+		return cells
\ No newline at end of file

=== modified file 'zim/formats/html.py'
--- zim/formats/html.py	2014-11-11 20:26:12 +0000
+++ zim/formats/html.py	2015-04-04 11:26:41 +0000
@@ -220,3 +220,48 @@
 
 		# TODO put content in attrib, use text for caption (with full recursion)
 		# See img
+
+	def dump_table(self, tag, attrib, strings):
+		aligns = attrib['aligns'].split(',')
+		tdcount = 0
+
+		def align(pos):
+			if pos == 'left' or pos == 'right' or pos == 'center':
+				return ' align="' + pos + '"'
+			return ''
+
+		for i, string in enumerate(strings):
+			if '<tr' in string:
+				tdcount = 0
+			elif '<th' in string:
+				strings[i] = string.replace('<th', '<th' + align(aligns[tdcount]))
+				tdcount += 1
+			elif '<td' in string:
+				strings[i] = string.replace('<td', '<td' + align(aligns[tdcount]))
+				tdcount += 1
+
+		strings.insert(0, '<table>\n')
+		strings.append('</table>\n')
+		return strings
+
+	def dump_thead(self, tag, attrib, strings):
+		strings.insert(0, '<thead><tr>\n')
+		strings.append('</tr></thead>\n')
+		return strings
+
+	def dump_th(self, tag, attrib, strings):
+		strings.insert(0, '  <th>')
+		strings.append('</th>\n')
+		return strings
+
+	def dump_trow(self, tag, attrib, strings):
+		strings.insert(0, '<tr>\n')
+		strings.append('</tr>\n')
+		return strings
+
+	def dump_td(self, tag, attrib, strings):
+		if strings == [" "]:
+			strings = ["&nbsp;"]
+		strings.insert(0, '  <td>')
+		strings.append('</td>\n')
+		return strings

=== modified file 'zim/formats/latex.py'
--- zim/formats/latex.py	2014-08-22 20:18:49 +0000
+++ zim/formats/latex.py	2015-04-04 11:26:41 +0000
@@ -227,3 +227,27 @@
 			assert False, 'Found no suitable delimiter for verbatim text: %s' % element
 
 	dump_object_fallback = dump_pre
+
+	def dump_table(self, tag, attrib, strings):
+		table = []  # result table
+		rows = strings
+
+		aligns, _wraps = TableParser.get_options(attrib)
+		rowline = lambda row: '&'.join([' ' + cell + ' ' for cell in row]) + '\\tabularnewline\n\hline'
+		aligns = map(lambda a: 'l' if a == 'left' else 'r' if a == 'right' else 'c' if a == 'center' else 'l', aligns)
+
+		for i, row in enumerate(rows):
+			for j, (cell, align) in enumerate(zip(row, aligns)):
+				if '\n' in cell:
+					rows[i][j] = '\shortstack[' + align + ']{' + cell.replace("\n", "\\") + '}'
+
+		# print table
+		table.append('\\begin{tabular}{ |' + '|'.join(aligns) + '| }')
+		table.append('\hline')
+
+		table += [rowline(rows[0])]
+		table.append('\hline')
+		table += [rowline(row) for row in rows[1:]]
+
+		table.append('\end{tabular}')
+		return map(lambda line: line+"\n", table)

=== modified file 'zim/formats/markdown.py'
--- zim/formats/markdown.py	2014-05-04 19:17:46 +0000
+++ zim/formats/markdown.py	2015-04-04 11:26:41 +0000
@@ -108,4 +108,31 @@
 		# dump object as verbatim block
 		return self.prefix_lines('\t', strings)
 
-
+	def dump_table(self, tag, attrib, strings):
+		table = []  # result table
+		rows = strings
+
+		aligns, _wraps = TableParser.get_options(attrib)
+		maxwidths = TableParser.width2dim(rows)
+		headsep = TableParser.headsep(maxwidths, aligns, x='|', y='-')
+		rowline = lambda row: TableParser.rowline(row, maxwidths, aligns)
+
+		# print table
+		table += [rowline(rows[0])]
+		table.append(headsep)
+		table += [rowline(row) for row in rows[1:]]
+		return map(lambda line: line+"\n", table)
+
+	def dump_thead(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_th(self, tag, attrib, strings):
+		strings = [s.replace('\n', '<br>').replace('|', '∣') for s in strings]
+		return strings
+
+	def dump_trow(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_td(self, tag, attrib, strings):
+		strings = [s.replace('\n', '<br>').replace('|', '∣') for s in strings]
+		return strings

=== modified file 'zim/formats/plain.py'
--- zim/formats/plain.py	2014-05-04 19:17:46 +0000
+++ zim/formats/plain.py	2015-04-04 11:26:41 +0000
@@ -188,3 +188,36 @@
 
 	def dump_object_fallback(self, tag, attrib, strings):
 		return strings
+
+	def dump_table(self, tag, attrib, strings):
+		table = []  # result table
+
+		aligns, _wraps = TableParser.get_options(attrib)
+		rows = TableParser.convert_to_multiline_cells(strings)
+		maxwidths = TableParser.width3dim(rows)
+		rowsep = lambda y: TableParser.rowsep(maxwidths, x='+', y=y)
+		rowline = lambda row: TableParser.rowline(row, maxwidths, aligns)
+
+		# print table
+		table.append(rowsep('-'))
+		table += [rowline(line) for line in rows[0]]
+		table.append(rowsep('='))
+		for row in rows[1:]:
+			table += [rowline(line) for line in row]
+			table.append(rowsep('-'))
+
+		return map(lambda line: line+"\n", table)
+
+	def dump_thead(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_th(self, tag, attrib, strings):
+		strings = [s.replace('|', '∣') for s in strings]
+		return strings
+
+	def dump_trow(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_td(self, tag, attrib, strings):
+		strings = [s.replace('|', '∣') for s in strings]
+		return strings

=== modified file 'zim/formats/rst.py'
--- zim/formats/rst.py	2014-05-04 19:17:46 +0000
+++ zim/formats/rst.py	2015-04-04 11:26:41 +0000
@@ -93,3 +93,36 @@
 		# can be done using "figure" directive
 
 	dump_object_fallback = dump_pre
+
+	def dump_table(self, tag, attrib, strings):
+		table = []  # result table
+
+		aligns, _wraps = TableParser.get_options(attrib)
+		rows = TableParser.convert_to_multiline_cells(strings)
+		maxwidths = TableParser.width3dim(rows)
+		rowsep = lambda y: TableParser.rowsep(maxwidths, x='+', y=y)
+		rowline = lambda row: TableParser.rowline(row, maxwidths, aligns)
+
+		# print table
+		table.append(rowsep('-'))
+		table += [rowline(line) for line in rows[0]]
+		table.append(rowsep('='))
+		for row in rows[1:]:
+			table += [rowline(line) for line in row]
+			table.append(rowsep('-'))
+
+		return map(lambda line: line+"\n", table)
+
+	def dump_thead(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_th(self, tag, attrib, strings):
+		strings = [s.replace('|', '∣') for s in strings]
+		return strings
+
+	def dump_trow(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_td(self, tag, attrib, strings):
+		strings = [s.replace('|', '∣') for s in strings]
+		return strings

=== modified file 'zim/formats/wiki.py'
--- zim/formats/wiki.py	2014-11-09 11:07:20 +0000
+++ zim/formats/wiki.py	2015-04-04 11:26:41 +0000
@@ -163,6 +163,15 @@
 				r'^( ==+ [\ \t]+ \S.*? ) [\ \t]* =* \n', # "==== heading ===="
 				process=self.parse_heading
 			),
+			# standard table format
+			Rule(TABLE, r'''
+				^(\|.*\|)$\n								# starting and ending with |
+				^( (?:\| [ \|\-:]+ \|$\n)? )				# column align
+				( (?:^\|.*\|$\n)+ )							# multi-lines: starting and ending with |
+				^(?= \s*? \n)							# empty line / only spaces
+				''',
+				process=self.parse_table
+			)
 		)
 		p.process_unmatched = self.parse_para
 		return p
@@ -195,8 +204,7 @@
 
 		builder.append(VERBATIM_BLOCK, attrib, text)
 
-	@staticmethod
-	def parse_object(builder, indent, header, body):
+	def parse_object(self, builder, indent, header, body):
 		'''Custom object'''
 		type, param = header.split(':', 1)
 		type = type.strip().lower()
@@ -216,9 +224,91 @@
 		if indent:
 			body = _remove_indent(body, indent)
 			attrib['indent'] = len(indent)
-
 		builder.append(OBJECT, attrib, body)
 
+	def check_multi_attribute(self, attrib, key, default, list_length):
+		'''
+		Correct multi-attributes, so they do fit with column length of table
+		:param attrib: key-value store
+		:param key: key to select of attribute
+		:param default: default value for one list entry
+		:param list_length: required length of selected attribute
+		:return: attribute-value as list of different options
+		'''
+		if attrib and key in attrib and attrib[key]:
+			values = attrib[key].split(',')
+		else:
+			values = []
+
+		while len(values) > list_length:
+			values.pop()
+		while len(values) < list_length:
+			values.append(default)
+		return ','.join(values)
+
+	def parse_table(self, builder, headerrow, alignstyle, body):
+		'''Table parsing'''
+		body = body.replace('\\|', '#124;')  # escaping
+		rows = body.split('\n')[:-1]
+		# get maximum number of columns - each columns must have same size
+		nrcols = max([headerrow.count('|')]+[row.count('|') for row in rows])-1
+
+		# transform header separator line into alignment definitions
+		aligns = []
+		while alignstyle.count('|') < nrcols+1:
+			alignstyle += '|'  # fill cells thus they match with nr of headers
+		for celltext in alignstyle.split('|')[1:-1]:
+			celltext = celltext.strip()
+			if celltext.startswith(':') and celltext.endswith(':'):
+				alignment = 'center'
+			elif celltext.startswith(':'):
+				alignment = 'left'
+			elif celltext.endswith(':'):
+				alignment = 'right'
+			else:
+				alignment = 'normal'
+			aligns.append(alignment)
+		
+		# collect wrap settings from first table row
+		headers = []
+		wraps = []
+		for celltext in headerrow.split('|')[1:-1]:
+			if celltext.rstrip().endswith('<'):
+				celltext = celltext.rstrip().rstrip('<')
+				wraps.append(1)
+			else:
+				wraps.append(0)
+			headers.append(celltext)
+
+		attrib = {'aligns': ','.join(aligns), 'wraps': ','.join(map(str, wraps))}
+
+
+		# build table
+		builder.start(TABLE, attrib)
+
+		builder.start(HEADROW)
+		for celltext in headers:
+			celltext = celltext.replace('#124;', '|').replace('\\n', '\n').strip()
+			if not celltext:
+				celltext = ' '  # celltext must contain at least one character
+			builder.append(HEADDATA, {}, celltext)
+		builder.end(HEADROW)
+
+		for bodyrow in rows:
+			while bodyrow.count('|') < nrcols+1:
+				bodyrow += '|'  # fill cells thus they match with nr of headers
+			builder.start(TABLEROW)
+			for celltext in bodyrow.split('|')[1:-1]:
+				builder.start(TABLEDATA)
+				celltext = celltext.replace('#124;', '|').replace('\\n', '\n').strip()  # cleanup cell
+				if not celltext:
+					celltext = ' '  # celltext must contain at least one character
+				self.inline_parser(builder, celltext)
+				builder.end(TABLEDATA)
+			builder.end(TABLEROW)
+
+		builder.end(TABLE)
+
 	def parse_para(self, builder, text):
 		'''Split a text into paragraphs and empty lines'''
 		if text.isspace():
@@ -454,3 +544,35 @@
 
 		# TODO put content in attrib, use text for caption (with full recursion)
 		# See img
+
+	def dump_table(self, tag, attrib, strings):
+		# logger.debug("Dumping table: %s, %s", attrib, strings)
+
+		table = []  # result table
+		rows = strings
+
+		aligns, wraps = TableParser.get_options(attrib)
+		maxwidths = TableParser.width2dim(rows)
+		headsep = TableParser.headsep(maxwidths, aligns, x='|', y='-')
+		rowline = lambda row: TableParser.rowline(row, maxwidths, aligns)
+
+		# print table
+		table += [TableParser.headline(rows[0], maxwidths, aligns, wraps)]
+		table.append(headsep)
+		table += [rowline(row) for row in rows[1:]]
+		return map(lambda line: line+"\n", table)
+
+	def dump_thead(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_th(self, tag, attrib, strings):
+		strings = map(lambda s: s.replace('\n', '\\n').replace('|', '\\|'), strings)
+		return strings
+
+	def dump_trow(self, tag, attrib, strings):
+		return [strings]
+
+	def dump_td(self, tag, attrib, strings):
+		strings = map(lambda s: s.replace('\n', '\\n').replace('|', '\\|'), strings)
+		strings = map(lambda s: s.replace('<br>', '\\n'), strings)
+		return strings

=== modified file 'zim/gui/objectmanager.py'
--- zim/gui/objectmanager.py	2014-11-09 11:07:20 +0000
+++ zim/gui/objectmanager.py	2015-04-04 11:26:41 +0000
@@ -145,7 +145,7 @@
 			self.vbox.pack_start(label)
 
 	def _add_load_plugin_bar(self, plugin):
-		key, name, activatable, klass = plugin
+		key, name, activatable, klass, _winextension = plugin
 
 		hbox = gtk.HBox(False, 5)
 		label = gtk.Label(_("Plugin %s is required to display this object.") % name)

=== modified file 'zim/gui/pageview.py'
--- zim/gui/pageview.py	2014-11-11 20:26:12 +0000
+++ zim/gui/pageview.py	2015-04-04 11:26:41 +0000
@@ -43,9 +43,12 @@
 from zim.gui.applications import OpenWithMenu
 from zim.gui.clipboard import Clipboard, SelectionClipboard, \
 	PARSETREE_ACCEPT_TARGETS, parsetree_from_selectiondata
-from zim.objectmanager import ObjectManager, CustomObjectClass
+from zim.objectmanager import ObjectManager, CustomObjectClass, FallbackObject
 from zim.gui.objectmanager import CustomObjectWidget, POSITION_BEGIN, POSITION_END
 from zim.utils import WeakSet
+from zim.formats import get_dumper
+from zim.formats.wiki import Dumper as WikiDumper
+from zim.plugins import PluginManager
 
 
 logger = logging.getLogger('zim.gui.pageview')
@@ -515,6 +518,9 @@
 	@ivar user_action: A L{UserActionContext} context manager
 	@ivar finder: A L{TextFinder} for this buffer
 
+	@signal: C{reload-page ()}:
+	Emitted when plugin is activated and current page should be reloaded
+	to display object properly 
 	@signal: C{begin-insert-tree ()}:
 	Emitted at the begin of a complex insert
 	@signal: C{end-insert-tree ()}:
@@ -523,6 +529,8 @@
 	Gives inserted tree after inserting it
 	@signal: C{textstyle-changed (style)}:
 	Emitted when textstyle at the cursor changes
+	@signal: C{link-clicked ()}:
+	Emitted when a link is clicked; for example within a table cell
 	@signal: C{clear ()}:
 	emitted to clear the whole buffer before destruction
 	@signal: C{undo-save-cursor (iter)}:
@@ -530,6 +538,12 @@
 	lock the current cursor position
 	@signal: C{insert-object (object_element)}: request inserting of
 	custom object
+	@signal: C{edit-object (object_element)}: request editing of 
+	custom object
+	@signal: C{insert-table (table_element)}: request inserting of
+	table object
+	@signal: C{edit-table (table_element)}: request editing of 
+	table object
 
 	@todo: document tag styles that are supported
 	'''
@@ -551,6 +565,11 @@
 		'clear': (gobject.SIGNAL_RUN_LAST, None, ()),
 		'undo-save-cursor': (gobject.SIGNAL_RUN_LAST, None, (object,)),
 		'insert-object': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+		'edit-object': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+		'insert-table': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+		'edit-table': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+		'link-clicked': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+		'reload-page': (gobject.SIGNAL_RUN_LAST, None, (object,)),
 	}
 
 	# style attributes
@@ -919,6 +938,8 @@
 					self.insert_at_cursor(element.text)
 				self.set_textstyle(None)
 				set_indent(None)
+			elif element.tag == 'table':
+				self.emit('insert-table', element)
 			elif element.tag == 'object':
 				if 'indent' in element.attrib:
 					set_indent(int(element.attrib['indent']))
@@ -2323,11 +2344,16 @@
 					continue
 				if hasattr(anchor, 'manager'):
 					attrib = anchor.manager.get_attrib()
-					data = anchor.manager.get_data()
-					logger.debug("Anchor with CustomObject: %s", anchor.manager)
-					builder.start('object', attrib)
-					builder.data(data)
-					builder.end('object')
+					if attrib and attrib['type'] == 'table':
+						self.build_parsetree_of_table(builder, anchor.manager, iter)
+					else:
+						# general object related parsing
+						data = anchor.manager.get_data()
+						logger.debug("Anchor with CustomObject: %s", anchor.manager)
+						builder.start('object', attrib)
+						builder.data(data)
+						builder.end('object')
+
 					anchor.manager.set_modified(False)
 				iter.forward_char()
 			else:
@@ -2413,6 +2439,55 @@
 
 		return tree
 
+	def build_parsetree_of_table(self, builder, anchormanager, iter):
+			logger.debug("Anchor with TableObject: %s", anchormanager)
+			attrib = anchormanager.get_attrib()
+			del attrib['type']
+			tabledata = anchormanager.get_data()
+
+			# inserts a newline before and after table-object
+			bound = iter.copy()
+			bound.backward_char()
+			char_before_table = bound.get_slice(iter)
+			need_newline_infront = char_before_table.decode('utf-8') != "\n".decode('utf-8')
+			bound = iter.copy()
+			bound.forward_char()
+			iter2 = bound.copy()
+			bound.forward_char()
+			char_after_table = iter2.get_slice(bound)
+			need_newline_behind = char_after_table.decode('utf-8') != "\n".decode('utf-8')
+
+			# table-editor plugin is not activated -> handle table-object like a fallback-object
+			if isinstance(tabledata, basestring):
+				if need_newline_infront:
+					builder.data('\n')
+				builder.data(tabledata)
+				if need_newline_behind:
+					builder.data('\n')
+				return
+
+			headers, rows, attrib = tabledata
+			if need_newline_infront:
+				builder.data('\n')
+
+			builder.start('table', attrib)
+			builder.start('thead')
+			for header in headers:
+				builder.start('th')
+				builder.data(header)
+				builder.end('th')
+			builder.end('thead')
+			for row in rows:
+				builder.start('trow')
+				for cell in row:
+					builder.start('td')
+					builder.data(cell)
+					builder.end('td')
+				builder.end('trow')
+			builder.end('table')
+			if need_newline_behind:
+				builder.data('\n')
+
 	def select_line(self):
 		'''Selects the current line
 
@@ -3290,6 +3365,14 @@
 			start = self.buffer.get_iter_at_line(line)
 			if start.ends_line():
 				continue
+
+			# search within external widgets
+			if start.get_child_anchor() is not None:
+				result = self._search_in_widget(start, step)
+				if result:
+					yield (start, start, result[2])
+				else:
+					continue
 			end = start.copy()
 			end.forward_to_line_end()
 			text = start.get_slice(end)
@@ -3304,6 +3387,34 @@
 					line, match.end() )
 				yield startiter, enditer, match
 
+
+	def _search_in_widget(self, start, step):
+		'''
+		Search within a widget
+		:param start: position-of-widget
+		:param step: search direction (up / down): -1 / 1
+		:return: tuple (startiter, enditer, match)
+		'''
+		if start.get_child_anchor() is None or len(start.get_child_anchor().get_widgets()) < 1:
+			return
+		widgets = start.get_child_anchor().get_widgets()
+		if isinstance(widgets[0], zim.plugins.tableeditor.TableViewWidget):
+			table = widgets[0]
+			liststore = table.get_liststore()
+			iter = liststore.get_iter_root()
+			while iter is not None:
+				for col in range(liststore.get_n_columns()):
+					text = liststore.get_value(iter, col)
+					matches = self.regex.finditer(text)
+					if step == -1:
+						matches = list(matches)
+						matches.reverse()
+					for match in matches:
+						startiter = iter
+						enditer = iter
+						return startiter, enditer, match
+				iter = liststore.iter_next(iter)
+
 	def replace(self, string):
 		'''Replace current match
 
@@ -3326,11 +3437,14 @@
 					string = match.expand(string)
 
 				offset = start.get_offset()
-				with self.buffer.user_action:
-					self.buffer.select_range(start, end) # ensure editmode logic is used
-					self.buffer.delete(start, end)
-					self.buffer.insert_at_cursor(string)
 
+				if start.get_child_anchor() is not None:
+					self._replace_in_widget(start, self.regex, string)  # replace within external widgets
+				else:
+					with self.buffer.user_action:
+						self.buffer.select_range(start, end) # ensure editmode logic is used
+						self.buffer.delete(start, end)
+						self.buffer.insert_at_cursor(string)
 				start = self.buffer.get_iter_at_offset(offset)
 				end = self.buffer.get_iter_at_offset(offset+len(string))
 				self.buffer.select_range(start, end)
@@ -3341,6 +3455,36 @@
 
 		self._update_highlight()
 
+	'''
+	Replace within a widget
+	:param start: position-of-widget
+	:param regex: regular expression pattern
+	:param text: substituation text
+	:param replaceall: boolean if all matches should be replaced
+	:return: True / False - a replacement was done / no replaces 
+	'''
+	def _replace_in_widget(self, start, regex, string, replaceall=False):
+		if start.get_child_anchor() is None or len(start.get_child_anchor().get_widgets()) < 1:
+			return
+		widgets = start.get_child_anchor().get_widgets()
+		if isinstance(widgets[0], zim.plugins.tableeditor.TableViewWidget):
+			table = widgets[0]
+			liststore = table.get_liststore()
+			iter = liststore.get_iter_root()
+			has_replaced = False
+			while iter is not None:
+				for col in range(liststore.get_n_columns()):
+					text = liststore.get_value(iter, col)
+					if(regex.search(text)):
+						newtext = regex.sub(string, text)
+						liststore.set_value(iter, col, newtext)
+						if(not replaceall):
+							return True
+						else:
+							has_replaced = True
+				iter = liststore.iter_next(iter)
+		return has_replaced
+
 	def replace_all(self, string):
 		'''Replace all matched
 
@@ -3366,9 +3510,12 @@
 				for start, end, string in matches:
 					start = self.buffer.get_iter_at_offset(start)
 					end = self.buffer.get_iter_at_offset(end)
-					self.buffer.select_range(start, end) # ensure editmode logic is used
-					self.buffer.delete(start, end)
-					self.buffer.insert(start, string)
+					if start.get_child_anchor() is not None:
+						self._replace_in_widget(start, self.regex, string, True)
+					else:
+						self.buffer.select_range(start, end) # ensure editmode logic is used
+						self.buffer.delete(start, end)
+						self.buffer.insert(start, string)
 
 		self._update_highlight()
 
@@ -4875,6 +5022,7 @@
 			self.page = page
 			buffer = TextBuffer(self.ui.notebook, self.page)
 			buffer.connect('insert-object', self.on_insert_object)
+			buffer.connect('insert-table', self.on_insert_table)
 			self.view.set_buffer(buffer)
 			tree = page.get_parsetree()
 
@@ -5428,6 +5576,9 @@
 
 		menu.show_all()
 
+	def do_reload_page(self):
+		self.ui.reload_page()
+
 	def undo(self):
 		'''Menu action to undo a single step'''
 		self.undostack.undo()
@@ -5909,6 +6060,75 @@
 
 		widget.show_all()
 
+	def insert_table_at_cursor(self, obj):
+		'''Inserts a table object in the page
+		@param obj: an object implementing L{CustomerObjectClass}
+		'''
+		assert isinstance(obj, CustomObjectClass)
+		self.on_insert_table(self.view.get_buffer(), obj)
+
+	def on_insert_table(self, buffer, obj, interactive=False):
+		#  adopted from on_insert_object, with some changes:
+		# - 'type=table' added to xml-element
+		# - content of fallback-object is like a plaintext table
+		# - content of table-widget is not text, but a xml table tree
+		# - callbacks for 'link-clicked' and 'edit-object'
+		logger.debug("Insert table(%s, %s)", buffer, obj)
+
+		obj.attrib['type'] = 'table'
+		if not isinstance(obj, CustomObjectClass):
+			# assume obj is a parsetree element
+			element = obj
+			if not 'type' in element.attrib:
+				return None
+			obj = ObjectManager.get_object(element.attrib['type'], element.attrib, element)
+			if not hasattr(obj, 'attr'):
+				obj.attr = dict()
+				obj.attr['type'] = 'table'
+
+			if isinstance(obj, FallbackObject):
+				# if table plugin is not loaded - show table as plain text
+				tree = ParseTree(element)
+				text = get_dumper('wiki').dump(tree)
+				lines = "".join(text)
+				obj._data = lines
+
+		def on_modified_changed(obj):
+			if obj.get_modified() and not buffer.get_modified():
+				buffer.set_modified(True)
+
+		def on_edit_object(pageview, obj):
+			plugin = ObjectManager.find_plugin(obj._attrib['type'])
+			window_extension = plugin[4]
+
+			if window_extension:
+				window_extension.do_edit_object(obj)
+
+		obj.connect('modified-changed', on_modified_changed)
+		obj.connect_object('link-clicked', PageView.do_link_clicked, self)
+		obj.connect_object('edit-object', on_edit_object, self)
+
+		iter = buffer.get_insert_iter()
+
+		def on_release_cursor(widget, position, anchor):
+			myiter = buffer.get_iter_at_child_anchor(anchor)
+			if position == POSITION_END:
+				myiter.forward_char()
+			buffer.place_cursor(myiter)
+			self.view.grab_focus()
+
+		anchor = ObjectAnchor(obj)
+		buffer.insert_child_anchor(iter, anchor)
+		widget = obj.get_widget()
+		assert isinstance(widget, CustomObjectWidget)
+		widget.connect('release-cursor', on_release_cursor, anchor)
+		self.view.add_child_at_anchor(widget, anchor)
+		self._object_widgets.add(widget)
+
+		widget.show_all()
+		if not isinstance(obj, FallbackObject):
+			widget.toolbar_hide()
+
 	def on_view_size_allocate(self, textview, allocation):
 		for widget in self._object_widgets:
 			if widget._resize:

=== modified file 'zim/objectmanager.py'
--- zim/objectmanager.py	2014-11-09 11:07:20 +0000
+++ zim/objectmanager.py	2015-04-04 11:26:41 +0000
@@ -23,11 +23,13 @@
 	def __init__(self):
 		self.factories = {}
 		self.objects = {'fallback': WeakSet()}
+		self.window_extensions = {}
 
-	def register_object(self, type, factory):
+	def register_object(self, type, factory, window_extension=None):
 		'''Register a factory method or class for a specific object type.
 		@param type: the object type as string (unique name)
 		@param factory: can be either an object class or a method,
+		@param window_extension: dictionary - the plugin related window_extension
 		should callable and return objects. When constructing objects
 		this factory will be called as::
 
@@ -44,6 +46,7 @@
 		old = self.factories.get(type)
 		self.factories[type] = factory
 		self.objects[type] = WeakSet()
+		self.window_extensions[type] = window_extension
 		return old
 
 	def unregister_object(self, type):
@@ -97,8 +100,8 @@
 		'''Find a plugin to handle a specific object type. Intended to
 		suggest plugins to the user that can be loaded.
 		@param type: object type as string
-		@returns: a 3-tuple of the plugin name, a boolean for the
-		dependency check, and the plugin class, or C{None}.
+		@returns: a 5-tuple of the plugin name, a boolean for the
+		dependency check, the plugin class, or C{None} and the related plugin window_extension
 		'''
 		for name in zim.plugins.PluginManager.list_installed_plugins(): # XXX
 			try:
@@ -106,7 +109,8 @@
 				types = klass.plugin_info.get('object_types')
 				if types and type in types:
 					activatable = klass.check_dependencies_ok()
-					return (name, klass.plugin_info['name'], activatable, klass)
+					win_ext = self.window_extensions[type] if type in self.window_extensions else None
+					return (name, klass.plugin_info['name'], activatable, klass, win_ext)
 			except:
 				logger.exception('Could not load plugin %s', name)
 				continue

=== added file 'zim/plugins/tableeditor.py'
--- zim/plugins/tableeditor.py	1970-01-01 00:00:00 +0000
+++ zim/plugins/tableeditor.py	2015-04-04 11:26:41 +0000
@@ -0,0 +1,1159 @@
+# -*- coding: utf-8 -*-
+
+# Author: Tobias Haupenthal
+# Plugin created: 2015
+#
+#
+# This plugin includes a whole featureset. Please be familiar with the documentation in 'Plugins:Table Editor',
+# before you do here any code change.
+#
+# - Suggestions for the future:
+# better column sort-algorithm "sort-by-number-or-string"
+# undo / redo - not trivial, because currently only position in textview is saved
+# 				ideas: save everytime the whole table OR save a tuple (position in textview, row, column)
+
+
+import gobject
+import gtk
+import logging
+from xml.etree import ElementTree
+import re
+import pango
+
+logger = logging.getLogger('zim.plugin.tableeditor')
+
+from zim.actions import action
+from zim.plugins import PluginClass, extends, WindowExtension
+from zim.utils import WeakSet
+from zim.objectmanager import ObjectManager, CustomObjectClass
+from zim.config import String
+from zim.main import get_zim_application
+from zim.gui.widgets import Dialog, ScrolledWindow, IconButton, InputEntry
+from zim.gui.objectmanager import CustomObjectWidget
+
+OBJECT_TYPE = 'table'
+
+SYNTAX_CELL_INPUT = [
+	('&amp;', '&'), ('&gt;', '>'), ('&lt;', '<'), ('&quot;', '"'), ('&apos;', "'"), ('\n', '\\n')
+]
+
+# Regex replacement strings: Wiki-Parsetree -> Pango (Table cell) -> Input (Table cell editing)
+# the target pattern is easier to read, the source pattern is generated out of it
+# With this syntax text can be format within a table-cell
+SYNTAX_WIKI_PANGO2 = [
+	(r'<strong>\1</strong>', r'<b>\1</b>', r'**\1**'),
+	(r'<mark>\1</mark>', r'<span background="yellow">\1</span>', r'__\1__'),
+	(r'<code>\1</code>', r'<tt>\1</tt>', r"''\1''"),
+	(r'<strike>\1</strike>', r'<s>\1</s>', r'~~\1~~'),
+	# Link url without link text  - Link url has always size = 0
+	(r'<link href="\1">\1</link>', r'<span foreground="blue">\1<span size="0">\1</span></span>', r'[[\1]]'),
+	# Link url with link text  - Link url has always size = 0
+	(r'<link href="\1">\2</link>', r'<span foreground="blue">\2<span size="0">\1</span></span>', r'[[\2|\1]]'),
+	(r'<emphasis>\1</emphasis>', r'<i>\1</i>', r'//\1//')
+]
+
+# Possible alignments in edit-table-dialog
+COLUMNS_ALIGNMENTS = {'left': ['left', gtk.STOCK_JUSTIFY_LEFT, _('Left')],  # T: alignment option
+					  'center': ['center', gtk.STOCK_JUSTIFY_CENTER, _('Center')],  # T: alignment option
+					  'right': ['right', gtk.STOCK_JUSTIFY_RIGHT, _('Right')],  # T: alignment option
+					  'normal': ['normal', None, _('Unspecified')],}  # T: alignment option
+
+
+def reg_replace(string):
+	'''
+	Target pattern is translated into source regex pattern
+	:param string: target pattern
+	:return:source pattern
+	'''
+	string = string.replace('*', '\*').replace('[', '\[').replace(']', '\]') \
+		.replace(r'\1', '(.+?)', 1).replace(r'\2', '(.+?)', 1).replace('|', '\|')
+	return re.compile(string)
+
+# Regex compiled search patterns
+SYNTAX_WIKI_PANGO = [tuple(map(reg_replace, expr_list)) for expr_list in SYNTAX_WIKI_PANGO2]
+
+
+class TableEditorPlugin(PluginClass):
+	'''
+	This is the plugin for displaying tables within the wiki.
+	A table consists always of a header with at least one header-cell and at least one or several rows.
+	The number of cells in a row must be equal to the header.
+	Currently there are two attributes, which have a tuple format, so they can describe all columns:
+	- aligns: left, center, right
+	- wraps: 0 	/ display text in a row		1 / long text will be broken and wrapped
+
+	Most other files which are linked to this plugin are:
+	- zim.gui.pageview
+	- zim.formats.wiki
+	'''
+	plugin_info = {
+		'name': _('Table Editor'),  # T: plugin name
+		'description': _('''\
+With this plugin you can embed a 'Table' into the wiki page. Tables will be shown as GTK TreeView widgets.
+Exporting them to various formats (i.e. HTML/LaTeX) completes the feature set.
+'''),  # T: plugin description
+		'object_types': (OBJECT_TYPE, ),
+		'help': 'Plugins:Table Editor',
+		'author': 'Tobias Haupenthal',
+	}
+
+	global LINES_NONE, LINES_HORIZONTAL, LINES_VERTICAL, LINES_BOTH # Hack - to make sure translation is loaded
+	LINES_BOTH = _('with lines') # T: option value
+	LINES_NONE = _('no grid lines') # T: option value
+	LINES_HORIZONTAL = _('horizontal lines') # T: option value
+	LINES_VERTICAL = _('vertical lines') # T: option value
+
+
+
+	plugin_preferences = (
+		# key, type, label, default
+		('show_helper_toolbar', 'bool', _('Show helper toolbar'), True),   # T: preference description
+
+		# option for displaying grid-lines within the table
+		('grid_lines', 'choice', _('Grid lines'), LINES_BOTH, (LINES_BOTH, LINES_NONE, LINES_HORIZONTAL, LINES_VERTICAL)),
+		# T: preference description
+	)
+
+	def __init__(self, config=None):
+		''' Constructor '''
+		PluginClass.__init__(self, config)
+		self.connectto(self.preferences, 'changed', self.on_preferences_changed)
+
+	def create_table(self, attrib, text):
+		'''
+		Automatic way for displaying the table-object as a table within the wiki,
+		:param attrib:  {type: 'table', wraps:'1,0,1' , aligns:'left,right,center' }
+		:param text: XML - formated as a zim-tree table-object OR tuple of [header], [row1], [row2]
+		:return: a TableViewObject
+		'''
+		if ElementTree.iselement(text) and attrib.get('type') == 'table':
+			(header, rows) = self._tabledom_to_list(text)
+		else:
+			# parameters in case of the Table-Insert-Dialog
+			header = text[0]
+			rows = [len(text[0]) * [' ']]
+
+		'''Factory method for Table objects'''
+		obj = TableViewObject(attrib, header, rows, self.preferences)
+		return obj
+
+	def _tabledom_to_list(self, tabledata):
+		'''
+		Extracts necessary data out of a xml-table into a list structure
+
+		:param tabledata: XML - formated as a zim-tree table-object
+		:return: tuple of header-list and list of row lists -  ([h1,h2],[[r11,r12],[r21,r22])
+		'''
+		header = map(lambda head: head.text.decode('utf-8'), tabledata.findall('thead/th'))
+		header = map(CellFormatReplacer.zim_to_cell, header)
+
+		rows = []
+		for trow in tabledata.findall('trow'):
+			row = trow.findall('td')
+			row = [ElementTree.tostring(r, 'utf-8').replace('<td>', '').replace('</td>', '') for r in row]
+			row = map(CellFormatReplacer.zim_to_cell, row)
+			rows.append(row)
+		return header, rows
+
+	def on_preferences_changed(self, preferences):
+		'''Update preferences on open table objects'''
+		for obj in ObjectManager.get_active_objects(OBJECT_TYPE):
+			obj.preferences_changed()
+
+
+class CellFormatReplacer:
+	'''
+	Static class for converting formated text from one into the other format:
+	- cell:	in a wiki pageview the table-cell must be of this format
+	- input: if a user is editing the cell, this format is used
+	- zimtree: Format for zimtree xml structure
+	'''
+	@staticmethod
+	def cell_to_input(text, with_pango=False):
+		''' Displayed table-cell will converted to gtk-entry input text '''
+		if with_pango:
+			for pattern, replace in zip(SYNTAX_WIKI_PANGO, SYNTAX_WIKI_PANGO2):
+				text = pattern[1].sub(replace[2], text)
+		for k, v in SYNTAX_CELL_INPUT:
+			text = text.replace(k, v)
+		return text
+
+	@staticmethod
+	def input_to_cell(text, with_pango=False):
+		for k, v in SYNTAX_CELL_INPUT:
+			text = text.replace(v, k)
+		if with_pango:
+			# Links without text are handled as [[link]] and not as [[link|text]], therefore reverse order of replacements
+			for pattern, replace in zip(reversed(SYNTAX_WIKI_PANGO), reversed(SYNTAX_WIKI_PANGO2)):
+				text = pattern[2].sub(replace[1], text)
+		return text
+
+	@staticmethod
+	def zim_to_cell(text):
+		for pattern, replace in zip(SYNTAX_WIKI_PANGO, SYNTAX_WIKI_PANGO2):
+			text = pattern[0].sub(replace[1], text)
+		return text
+
+	@staticmethod
+	def cell_to_zim(text):
+		for pattern, replace in zip(SYNTAX_WIKI_PANGO, SYNTAX_WIKI_PANGO2):
+			text = pattern[1].sub(replace[0], text)
+		return text
+
+@extends('MainWindow')
+class MainWindowExtension(WindowExtension):
+	'''
+	Connector between the zim application with its toolbar and menu and the tableview-object
+	In GTK there is no native table symbol. So this image is needed: data/pixmaps/insert-table.png
+	'''
+	uimanager_xml = '''
+		<ui>
+		<menubar name='menubar'>
+			<menu action='insert_menu'>
+				<placeholder name='plugin_items'>
+					<menuitem action='insert_table'/>
+				</placeholder>
+			</menu>
+		</menubar>
+		<toolbar name='toolbar'>
+				<placeholder name='format'>
+					<toolitem action='insert_table'/>
+				</placeholder>
+			</toolbar>
+		</ui>
+	'''
+
+	''' static reference to window object, necessary for access to pageview '''
+	window = None
+
+	def __init__(self, plugin, window):
+		''' Constructor '''
+		WindowExtension.__init__(self, plugin, window)
+		MainWindowExtension.window = window
+
+		ObjectManager.register_object(OBJECT_TYPE, self.plugin.create_table, self)
+
+		# reload tables on current page after plugin activation
+		if self.window.ui.page:
+			self.window.ui.reload_page()
+
+	def teardown(self):
+		''' Deconstructor '''
+		ObjectManager.unregister_object(OBJECT_TYPE)
+		self.window.ui.reload_page()
+
+	@staticmethod
+	def get_geometry():
+		'''Returns tuple of geometry data from wiki textview window. Useful for setting width of object'''
+		win = MainWindowExtension.window.pageview.view.get_window(gtk.TEXT_WINDOW_TEXT)
+		geometry = win.get_geometry() if hasattr(win, 'get_geometry') else None
+		return geometry
+
+	@action(_('Table'), stock='zim-insert-table', readonly=False)  # T: menu item
+	def insert_table(self):
+		'''Run the InsertTableDialog'''
+		col_model = EditTableDialog(self.window, self.plugin, self.window.pageview).run()
+		if not col_model:
+			return
+
+		_ids, headers, aligns, wraps = ([], [], [], [])
+
+		for model in col_model:
+			headers.append(model[1])
+			aligns.append(model[3])
+			wraps.append(model[2])
+
+		attrs = {'aligns': aligns, 'wraps': wraps}
+
+		obj = self.plugin.create_table(attrs, [headers])
+		obj.attrib = {'type': OBJECT_TYPE}
+		pageview = self.window.pageview
+		pageview.insert_table_at_cursor(obj)
+
+	def do_edit_object(self, obj):
+		'''
+		With the right button press a context-menu is opened and a table can then be edited
+		'''
+		self.do_edit_table(obj)
+
+	def do_edit_table(self, obj):
+		'''Run the EditTableDialog '''
+
+		aligns = obj.get_aligns()
+		wraps = obj.get_wraps()
+		titles = [col.get_title() for col in obj.treeview.get_columns()]
+		old_model = []
+		for i in range(len(titles)):
+			old_model.append([i, titles[i], aligns[i], wraps[i]])
+		new_model = EditTableDialog(self.window, self.plugin, self.window.pageview, old_model).run()
+
+		if new_model:
+			self._update_table_view(obj, new_model)
+
+	def _update_table_view(self, obj, new_model):
+		'''
+		Replaces liststore of currently displayed treeview with updated data and fixes references to attributes
+		:param obj: tableview object
+		:param new_model: tuple of lists for ([id], [header], [warps], [aligns])
+		'''
+		# prepare results out of dialog-window
+		id_mapping, headers, aligns, wraps = ({}, [], [], [])
+		for i, model in enumerate(new_model):
+			if model[0] != -1:
+				id_mapping[i] = model[0]
+			header = model[1] if model[1] else ' '
+			headers.append(header)
+			aligns.append(model[3])
+			wraps.append(model[2])
+
+		# creation of new table-view widget
+		attrs = {'aligns': aligns, 'wraps': wraps}
+		newrows = self._calculate_new_liststore(obj.treeview.get_model(), id_mapping, len(headers))
+		widget = TableViewWidget(obj, headers, newrows, attrs)
+		new_treeview = widget.get_treeview()
+		new_model = new_treeview.get_model()
+
+		# update of displayed table(=treeview) and its structure (=liststore)
+		obj.treeview.set_model(new_model)
+		# remove all old columns and move new columns to original treeview
+		for col in obj.treeview.get_columns():
+			obj.treeview.remove_column(col)
+		for i, col in enumerate(new_treeview.get_columns()):
+			new_treeview.remove_column(col)
+			obj.treeview.append_column(col)
+			title_label = TableViewWidget.create_headerlabel(headers[i])
+			col.set_widget(title_label)
+
+		geometry = MainWindowExtension.get_geometry()[2] if  MainWindowExtension.get_geometry() else 600
+		TableViewWidget.wrap_columns(obj.treeview, geometry, wraps)
+
+		obj.set_aligns(aligns)
+		obj.set_wraps(wraps)
+		obj.set_modified(True)
+
+	def _calculate_new_liststore(self, liststore, id_mapping, nr_cols):
+		''' Old value of cells are used in the new table, but only if its column is not deleted '''
+		new_rows = []
+		for oldrow in liststore:
+				newrow = [' ']*nr_cols
+				for v, k in id_mapping.iteritems():
+					newrow[v] = oldrow[k]
+				new_rows.append(newrow)
+		return new_rows
+
+
+class TableViewObject(CustomObjectClass):
+	'''data presenter of an inserted table within a page'''
+	OBJECT_ATTR = {
+		'type': String('table'),
+		'aligns': String(''),  # i.e. String(left,right,center)
+		'wraps': String('')	  # i.e. String(0,1,0)
+	}
+
+	def __init__(self, attrib, header, rows, preferences):
+		'''
+		Creates a new object which can displayed within the page
+		:param attrib: aligns, wraps
+		:param header: titles of the table as list
+		:param rows: body-rows of the table as list of lists
+		:param preferences: optionally some preferences
+		'''
+		_attrib = {}
+		for k, v in attrib.iteritems():
+			if isinstance(v, list):
+				v = ','.join(map(str, v))
+			_attrib[k] = v
+		CustomObjectClass.__init__(self, _attrib, [header]+rows)
+
+		self._tableattrib = attrib
+		self._header = header
+		self._rows = rows
+		self.modified = False
+		self.preferences = preferences
+		self.treeview = None
+		self._widgets = WeakSet()
+		self.textview_geometry = None
+
+	# getters and setters for attributes
+	def get_aligns(self):
+		''' get the list of align-attributes '''
+		return self._attrib['aligns'].split(',')
+
+	def set_aligns(self, data):
+		''' Set list of align attributes for the current table. Each item belongs to a column.'''
+		assert(isinstance(data, list))
+		self._attrib['aligns'] = ','.join(data)
+
+	def get_wraps(self):
+		''' get the list of wrap-attributes '''
+		return map(int, self._attrib['wraps'].split(','))
+
+	def set_wraps(self, data):
+		''' Set list of wrap attributes for the current table. Each item belongs to a column.'''
+		assert(isinstance(data, list))
+		self._attrib['wraps'] = ','.join(str(item) for item in data)
+
+	def get_widget(self):
+		''' Creates a new table-widget which can displayed on the wiki-page '''
+		attrib = {'aligns': self.get_aligns(), 'wraps': self.get_wraps()}
+		widget = TableViewWidget(self, self._header, self._rows, attrib)
+		treeview = widget.get_treeview()
+		self.treeview = treeview
+		liststore = treeview.get_model()
+		liststore.connect('row-changed', self.on_modified_changed)
+
+		self._widgets.add(widget)
+		widget.set_preferences(self.preferences)
+		return widget
+
+	def preferences_changed(self):
+		'''	Updates all created table-widgets, if preferences have changed '''
+		for widget in self._widgets:
+			widget.set_preferences(self.preferences)
+
+	def on_sort_column_changed(self, liststore):
+		''' Trigger after a column-header is clicked and therefore its sort order has changed '''
+		self.set_modified(True)
+
+	def on_modified_changed(self, liststore, path, treeiter):
+		''' Trigger after a table cell content is changed by the user '''
+		self.set_modified(True)
+
+	def get_data(self):
+		'''Returns table-object into textual data, for saving it as text.'''
+		liststore = self.treeview.get_model()
+		headers = []
+		rows = []
+
+		# parsing table header and attributes
+		for column in self.treeview.get_columns():
+			title = column.get_title() if column.get_title() else ' '
+			headers.append(title)
+		attrs = {'aligns': self._attrib['aligns'], 'wraps': self._attrib['wraps']}
+
+		# parsing rows
+		treeiter = liststore.get_iter_first()
+		while treeiter is not None:
+			row = []
+			for colid in range(len(self.treeview.get_columns())):
+				val = liststore.get_value(treeiter, colid) if liststore.get_value(treeiter, colid) else ' '
+				row.append(val)
+			rows.append(row)
+			treeiter = liststore.iter_next(treeiter)
+		rows = [map(lambda cell: CellFormatReplacer.cell_to_input(cell, True), row) for row in rows]
+
+		# logger.debug("Table as get-data: : %s, %s, %s", headers, rows, attrs)
+		return headers, rows, attrs
+
+
+	def dump(self, format, dumper, linker=None):
+		''' Dumps currently structure for table into textual format - mostly used for debugging / testing purposes '''
+		return CustomObjectClass.dump(self, format, dumper, linker)
+
+
+class TableViewWidget(CustomObjectWidget):
+
+	def __init__(self, obj, headers, rows, attrs):
+		'''
+		This is a group of GTK Gui elements which are directly displayed within the wiki textarea
+		On initilizing also some signals are registered and a toolbar is initialized
+		:param obj: a Table-View-Object
+		:param headers: list of titles
+		:param rows: list of list of cells
+		:param attrs: table settings, like alignment and wrapping
+		:return:
+		'''
+		self.textarea_width = 0
+
+		# used in pageview
+		self._resize = True  # attribute, that triggers resizing
+		self._has_cursor = False  # Skip table object, if someone moves cursor around in textview
+
+		# used here
+		self.obj = obj
+		self._timer = None  # NONE or number of current gobject.timer, which is running
+		self._keep_toolbar_open = False  # a cell is currently edited, toolbar should not be hidden
+		self._cellinput_canceled = None  # cell changes should be skipped
+		self._toolbar_enabled = True  # sets if toolbar should be shown beneath a selected table
+
+		gtk.EventBox.__init__(self)
+		self.set_border_width(5)
+
+		# Add vbox and wrap it to have a shadow around it
+		self.vbox = gtk.VBox() #: C{gtk.VBox} to contain widget contents
+
+		# Toolbar for table actions
+		toolbar = self.create_toolbar()
+		self.obj.toolbar = toolbar
+
+		# Actual gtk table object
+		self.treeview = self.create_treeview(headers, rows, attrs)
+
+		# Hook up signals & set options
+		self.treeview.connect('button-press-event', self.on_button_press_event)
+		self.treeview.connect('focus-in-event', self.on_focus_in, toolbar)
+		self.treeview.connect('focus-out-event', self.on_focus_out, toolbar)
+		self.treeview.connect('move-cursor', self.on_move_cursor)
+
+		# Set options
+		self.treeview.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)
+		self.treeview.set_receives_default(True)
+		self.treeview.set_size_request(-1, -1)
+		self.treeview.set_border_width(2)
+
+		# disable interactive column search
+		self.treeview.set_enable_search(False)
+		gtk.binding_entry_remove(gtk.TreeView, gtk.keysyms.f, gtk.gdk.CONTROL_MASK)
+		self.treeview.set_search_column(-1)
+
+		# package gui elements
+		self.vbox.pack_end(toolbar)
+		self.add(self.vbox)
+		win = ScrolledWindow(self.treeview, gtk.POLICY_NEVER, gtk.POLICY_NEVER, gtk.SHADOW_OUT)
+		self.vbox.pack_start(win)
+
+	def on_focus_in(self, treeview, event, toolbar):
+		'''After a table is selected, this function will be triggered'''
+
+		self._keep_toolbar_open = False
+		if self._timer:
+			gobject.source_remove(self._timer)
+		if self._toolbar_enabled:
+			toolbar.show()
+
+	def on_focus_out(self, treeview, event, toolbar):
+		'''After a table is deselected, this function will be triggered'''
+		def receive_alarm():
+			if self._keep_toolbar_open:
+				self._timer = None
+			if self._timer:
+				self._timer = None
+				treeview.get_selection().unselect_all()
+				if self._toolbar_enabled:
+					toolbar.hide()
+			return False
+
+		self._timer = gobject.timeout_add(500, receive_alarm)
+
+	def create_toolbar(self):
+		'''This function creates a toolbar which is displayed next to the table'''
+		toolbar = gtk.Toolbar()
+		toolbar.set_orientation(gtk.ORIENTATION_HORIZONTAL)
+		toolbar.set_style(gtk.TOOLBAR_ICONS)
+		toolbar.set_border_width(1)
+
+		tooltips = gtk.Tooltips()
+		for pos, stock, handler, data, tooltip in (
+			(0, gtk.STOCK_ADD, self.on_add_row, None, _('Add row')),  # T: tooltip on mouse hover
+			(1, gtk.STOCK_DELETE, self.on_delete_row, None, _('Remove row')),  # T: tooltip on mouse hover
+			(2, gtk.STOCK_COPY, self.on_clone_row, None, _('Clone row')),  # T: tooltip on mouse hover
+			(3, None, None, None, None),
+			(4, gtk.STOCK_GO_UP, self.on_move_row, -1, _('Row up')),  # T: tooltip on mouse hover
+			(5, gtk.STOCK_GO_DOWN, self.on_move_row, 1, _('Row down')),  # T: tooltip on mouse hover
+			(6, None, None, None, None),
+			(7, gtk.STOCK_PREFERENCES, self.on_change_columns, None, _('Change columns')),  # T: tooltip on mouse hover
+			(8, None, None, None, None),
+			(9, gtk.STOCK_HELP, self.on_open_help, None, _('Open help')),  # T: tooltip on mouse hover
+		):
+			if stock is None:
+				toolbar.insert(gtk.SeparatorToolItem(), pos)
+			else:
+				button = gtk.ToolButton(stock)
+				if data:
+					button.connect('clicked', handler, data)
+				else:
+					button.connect('clicked', handler)
+				tooltips.set_tip(button, tooltip)
+				toolbar.insert(button, pos)
+
+		toolbar.set_size_request(300,-1)
+		toolbar.set_icon_size(gtk.ICON_SIZE_MENU)
+
+		return toolbar
+
+	def toolbar_hide(self):
+		''' Hide toolbar of the table (moving rows around, etc.) '''
+		self.obj.toolbar.hide()
+
+	def resize_to_textview(self, view):
+		''' Overriding - on resizing the table should not expanded to 100% width'''
+		win = view.get_window(gtk.TEXT_WINDOW_TEXT)
+		if not win or win.get_geometry()[2] == self.textarea_width:
+			return
+
+		self.textarea_width = win.get_geometry()[2]
+		self.wrap_columns(self.treeview, self.textarea_width, self.obj.get_wraps())
+
+	def wrap_columns(self, treeview, textarea_width, wraps):
+		TableViewWidget.wrap_columns(treeview, textarea_width, wraps)
+
+	@staticmethod
+	def wrap_columns(treeview, textarea_width, wraps):
+		''' Wrap all columns, which should be wrapped '''
+		nrcols = len(treeview.get_columns())
+
+		if wraps == [1] * nrcols: # in case all columns are wrapped
+			max_width = textarea_width - 38 - nrcols * 10 if textarea_width else -1
+		else:
+			max_width = textarea_width - 40
+		if (not gtk.gtk_version >= (2, 8)) or max_width <= 0 or not textarea_width:
+			return
+
+		for column, wrap in zip(treeview.get_columns(), wraps):
+			cell = column.get_cell_renderers()[0]
+			cell.set_property('yalign', 0.0)  # no vertical alignment, text starts on the top
+			if wrap == 1:
+				cell.set_property('wrap-width', max_width//nrcols)
+				cell.set_property('wrap-mode', pango.WRAP_WORD)
+
+			column.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)  # allow column shrinks
+			column.set_max_width(0)	 # shrink column
+			column.set_max_width(-1)  # reset value
+			column.set_sizing(gtk.TREE_VIEW_COLUMN_GROW_ONLY)  # reset value
+
+	def _column_alignment(self, aligntext):
+		''' The column alignment must be converted from numeric to keywords '''
+		if aligntext == 'left':
+			align = 0.0
+		elif aligntext == 'center':
+			align = 0.5
+		elif aligntext == 'right':
+			align = 1.0
+		else:
+			align = None
+		return align
+
+	def create_treeview(self, headers, rows, attrs):
+		'''
+		Initializes a treeview with its model (liststore) and all its columns
+		:param headers: a list of title values for the column-headers
+		:param rows: a list of list of cells, for the table body
+		:param attrs: some more attributes, which define the layout of a column
+		:return: gtk.treeview
+		'''
+		nrcols = len(headers)
+
+		cols = [str]*nrcols
+
+		liststore = gtk.ListStore(*cols)
+		treeview = gtk.TreeView(liststore)
+		for trow in rows:
+			liststore.append(trow)
+
+		for i, headcol in enumerate(headers):
+			cell = gtk.CellRendererText()
+			tview_column = gtk.TreeViewColumn(headcol, cell)
+			treeview.append_column(tview_column)
+
+			# set title as label
+			header_label = self.create_headerlabel(headcol)
+			tview_column.set_widget(header_label)
+
+			# set properties of column
+			tview_column.set_attributes(cell, markup=i)
+			cell.set_property('editable', True)
+			tview_column.set_sort_column_id(i)
+			# set sort function
+			liststore.set_sort_func(i, self.sort_by_number_or_string, i)
+			# set alignment - left center right
+			align = self._column_alignment(attrs['aligns'][i])
+			if align:
+				tview_column.set_alignment(align)
+				cell.set_alignment(align, 0.0)
+
+			# callbacks after an action
+			cell.connect('edited', self.on_cell_changed, treeview.get_model(), i)
+			cell.connect('editing-started', self.on_cell_editing_started, treeview.get_model(), i)
+			cell.connect('editing-canceled', self.on_cell_editing_canceled)
+
+		return treeview
+
+	def create_headerlabel(self, title):
+		return TableViewWidget.create_headerlabel(title)
+
+	@staticmethod
+	def create_headerlabel(title):
+		''' Sets options for the treeview header'''
+		col_widget = gtk.VBox()
+		col_widget.show()
+
+
+		col_label = gtk.Label('<u>'+title+'</u>')
+		col_label.set_use_markup(True)
+		col_label.show()
+		col_widget.pack_start(col_label)
+		#col_align.add(col_label)
+
+		'''col_entry = InputEntry()
+		col_entry.set_name('treeview-header-entry')
+		col_entry.show()
+		col_widget.pack_start(col_entry)'''
+
+		return col_widget
+
+	def get_treeview(self):
+		# treeview of current table
+		return self.treeview
+
+	def set_preferences(self, preferences):
+		self._toolbar_enabled = preferences['show_helper_toolbar']
+
+		''' Sets general plugin settings for this object'''
+		grid_option = self.pref_gridlines(preferences['grid_lines'])
+		self.treeview.set_grid_lines(grid_option)
+		pass
+
+	def pref_gridlines(self, option):
+		if option == LINES_BOTH:
+			return gtk.TREE_VIEW_GRID_LINES_BOTH
+		elif option == LINES_NONE:
+			return gtk.TREE_VIEW_GRID_LINES_NONE
+		elif option == LINES_HORIZONTAL:
+			return gtk.TREE_VIEW_GRID_LINES_HORIZONTAL
+		elif option == LINES_VERTICAL:
+			return gtk.TREE_VIEW_GRID_LINES_VERTICAL
+
+	def on_move_cursor(self, view, step_size, count):
+		''' If you try to move the cursor out of the tableditor release the cursor to the parent textview '''
+		return None  # let parent handle this signal
+
+	def fetch_cell_by_event(self, event, treeview):
+		'''	Looks for the cell where the mouse clicked on it '''
+		liststore = treeview.get_model()
+		(xpos, ypos) = event.get_coords()
+		(treepath, treecol, xrel, yrel) = treeview.get_path_at_pos(int(xpos), int(ypos))
+		treeiter = liststore.get_iter(treepath)
+		cellvalue = liststore.get_value(treeiter, treeview.get_columns().index(treecol))
+		return cellvalue
+
+	def get_linkurl(self, celltext):
+		'''	Checks a cellvalue if it contains a link and returns only the link value '''
+		linkregex = r'<span foreground="blue">.*?<span.*?>(.*?)</span></span>'
+		matches = re.match(linkregex, celltext)
+		linkvalue = matches.group(1) if matches else None
+		return linkvalue
+
+	def on_button_press_event(self, treeview, event):
+		'''
+		Displays a context-menu on right button click
+		Opens the link of a tablecell on CTRL pressed and left button click
+		'''
+		if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1 and event.get_state() &  gtk.gdk.CONTROL_MASK:
+			# With CTRL + LEFT-Mouse-Click link of cell is opened
+			cellvalue = self.fetch_cell_by_event(event, treeview)
+			linkvalue = self.get_linkurl(cellvalue)
+			if linkvalue:
+				self.obj.emit('link-clicked', {'href': linkvalue})
+			return
+
+		if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
+			# Right button opens context menu
+			self._keep_toolbar_open = True
+			cellvalue = self.fetch_cell_by_event(event, treeview)
+			linkvalue = self.get_linkurl(cellvalue)
+			linkitem_is_activated = (linkvalue is not None)
+
+			menu = gtk.Menu()
+
+			for stock, handler, data, tooltip in (
+				(gtk.STOCK_ADD, self.on_add_row, None, _('Add row')),  # T: menu item
+				(gtk.STOCK_DELETE, self.on_delete_row, None, _('Delete row')),  # T: menu item
+				(gtk.STOCK_COPY, self.on_clone_row, None, _('Clone row')),  # T: menu item
+				(None, None, None, None),  # T: menu item
+				(gtk.STOCK_JUMP_TO, self.on_open_link, linkvalue, _('Open cell content link')),  # T: menu item
+				(None, None, None, None),
+				(gtk.STOCK_GO_UP, self.on_move_row, -1, _('Row up')),  # T: menu item
+				(gtk.STOCK_GO_DOWN, self.on_move_row, 1, _('Row down')),  # T: menu item
+				(None, None, None, None),
+				(gtk.STOCK_PREFERENCES, self.on_change_columns, None, _('Change columns'))  # T: menu item
+			):
+
+				if stock is None:
+					menu.append(gtk.SeparatorMenuItem())
+				else:
+					item = gtk.ImageMenuItem(stock)
+					item.set_always_show_image(True)
+					item.set_label(_(tooltip))
+					if data:
+						item.connect_after('activate', handler, data)
+					else:
+						item.connect_after('activate', handler)
+					if handler == self.on_open_link:
+						item.set_sensitive(linkitem_is_activated)
+					menu.append(item)
+
+			menu.show_all()
+			menu.popup(None, None, None, event.button, event.time)
+
+	def on_add_row(self, action):
+		''' Context menu: Add a row '''
+		selection = self.treeview.get_selection()
+		model, treeiter = selection.get_selected()
+		if not treeiter:  # no selected item
+			self.selection_info()
+			return
+
+		row = len(self.treeview.get_columns())*['']
+		path = model.insert_after(treeiter, row)
+		self.obj.set_modified(True)
+
+	def on_clone_row(self, action):
+		''' Context menu: Clone a row '''
+		selection = self.treeview.get_selection()
+		model, treeiter = selection.get_selected()
+		if not treeiter:  # no selected item
+			self.selection_info()
+			return
+
+		path = model.get_path(treeiter)
+		row = model[path[0]]
+		model.insert_after(treeiter, row)
+		self.obj.set_modified(True)
+
+	def on_delete_row(self, action):
+		''' Context menu: Delete a row '''
+		selection = self.treeview.get_selection()
+		model, treeiter = selection.get_selected()
+		if not treeiter:  # no selected item
+			self.selection_info()
+			return
+
+		if len(model) > 1:
+			model.remove(treeiter)
+			self.obj.set_modified(True)
+		else:
+			md = gtk.MessageDialog(None, gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_WARNING, gtk.BUTTONS_CLOSE,
+									_("The table must consist of at least on row!\n No deletion done."))
+									# T: Popup dialog
+			md.run()
+			md.destroy()
+
+	def on_move_row(self, action, direction):
+		''' Trigger for moving a row one position up/down '''
+		selection = self.treeview.get_selection()
+		model, treeiter = selection.get_selected()