3 files changed, 176 insertions, 157 deletions

diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index ed2fe042f466..dfbadf2b26e1 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	treeline
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	deskutils python
-MASTER_SITES=	http://www.bellz.org/treeline/ \
-		http://depot.fsck.ch/mirror/distfiles/
+MASTER_SITES=	${MASTER_SITE_BERLIOS}:treeline \
+		http://treeline.bellz.org/plugins/:plugins \
+		http://depot.fsck.ch/mirror/distfiles/:treeline,plugins
+MASTER_SITE_SUBDIR=treeline
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:treeline
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@fsck.ch
 COMMENT=	TreeLine is a structured information storage program
 
-BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
 OPTIONS=	ASPELL "install with aspell support" off \
 		ISPELL "install with ispell support" off \
 		PYXML "use pythons py-xml instead of textproc/expat2" on \
-		HTTPLOAD "install httpLoad plugin" off \
-		TYPESEARCH "install typesearch plugin" off
+		HTTPLOAD "install httpLoad plugin" off
 
 WRKSRC=		${WRKDIR}/TreeLine
-USE_QT_VER=	3
+USE_QT_VER=	4
 USE_PYTHON=	2.3+
 NO_BUILD=	yes
 
@@ -45,27 +45,17 @@ LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 .endif
 
 .if defined(WITH_HTTPLOAD)
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} httpload.py
+DISTFILES+=	httpload2.py:plugins
 PLIST_SUB+=	HTTPLOAD=""
 .else
 PLIST_SUB+=	HTTPLOAD="@comment "
 .endif
 
-.if defined(WITH_TYPESEARCH)
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} typesearch.py
-PLIST_SUB+=	TYPESEARCH=""
-.else
-PLIST_SUB+=	TYPESEARCH="@comment "
-.endif
-
 do-install:
 	@cd ${WRKSRC} && ${PYTHON_CMD} install.py \
 	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -x
 .if defined(WITH_HTTPLOAD)
-	@${INSTALL_DATA} ${DISTDIR}/httpload.py ${PREFIX}/lib/${PORTNAME}/plugins/
-.endif
-.if defined(WITH_TYPESEARCH)
-	@${INSTALL_DATA} ${DISTDIR}/typesearch.py ${PREFIX}/lib/${PORTNAME}/plugins/
+	@${INSTALL_DATA} ${DISTDIR}/httpload2.py ${PREFIX}/lib/${PORTNAME}/plugins/
 .endif
 
 post-install:
diff --git a/deskutils/treeline/distinfo b/deskutils/treeline/distinfo
index 6241b2c3cf72..88ff39b8490f 100644
--- a/deskutils/treeline/distinfo
+++ b/deskutils/treeline/distinfo
@@ -1,9 +1,6 @@
-MD5 (treeline-1.0.2.tar.gz) = a37be34ae9e495364547485233b4c75d
-SHA256 (treeline-1.0.2.tar.gz) = df6cc44842eadfd01e73037a6b611088bc19f44cbbe4e78844ad9638fbda4104
-SIZE (treeline-1.0.2.tar.gz) = 332001
-MD5 (httpload.py) = 9680667db5496366c9fc040edab44618
-SHA256 (httpload.py) = f3da52451a415d4f445ba9179f54ddf73175bdc583d892f70ed0db4b6e897922
-SIZE (httpload.py) = 1735
-MD5 (typesearch.py) = c8e3b1db30ba30ccb24bcb6b4617446b
-SHA256 (typesearch.py) = 3c71751703f4a7d3f47c2354c6a4bda5df826fe41b08a5a8b90c016748ee3ef2
-SIZE (typesearch.py) = 2962
+MD5 (treeline-1.2.0.tar.gz) = baf89251c10c23bf6e983cc2a0d16961
+SHA256 (treeline-1.2.0.tar.gz) = efed034d575df872786eca42fac14adfabef96aa4ffc3de955bd0074b9fbc6a3
+SIZE (treeline-1.2.0.tar.gz) = 477621
+MD5 (httpload2.py) = 6038083a5e6aa80672325fbe53ca7a33
+SHA256 (httpload2.py) = 30f243207369f294eb0442bfd752dd104f82f158791b97223bbc20a6fd266593
+SIZE (httpload2.py) = 3206
diff --git a/deskutils/treeline/pkg-plist b/deskutils/treeline/pkg-plist
index 1374dea8d153..4856b3e6499b 100644
--- a/deskutils/treeline/pkg-plist
+++ b/deskutils/treeline/pkg-plist
@@ -3,6 +3,8 @@ lib/treeline/cmdline.py
 lib/treeline/cmdline.pyc
 lib/treeline/conditional.py
 lib/treeline/conditional.pyc
+lib/treeline/configdialog.py
+lib/treeline/configdialog.pyc
 lib/treeline/fieldformat.py
 lib/treeline/fieldformat.pyc
 lib/treeline/genboolean.py
@@ -19,8 +21,6 @@ lib/treeline/helpview.py
 lib/treeline/helpview.pyc
 lib/treeline/icondict.py
 lib/treeline/icondict.pyc
-lib/treeline/immoduletr.py
-lib/treeline/immoduletr.pyc
 lib/treeline/nodeformat.py
 lib/treeline/nodeformat.pyc
 lib/treeline/numbering.py
@@ -37,26 +37,29 @@ lib/treeline/p3.py
 lib/treeline/p3.pyc
 lib/treeline/plugininterface.py
 lib/treeline/plugininterface.pyc
-lib/treeline/printpreview.py
-lib/treeline/printpreview.pyc
+lib/treeline/printdata.py
+lib/treeline/printdata.pyc
+lib/treeline/printdialogs.py
+lib/treeline/printdialogs.pyc
 lib/treeline/recentfiles.py
 lib/treeline/recentfiles.pyc
+lib/treeline/setup.py
+lib/treeline/setup.pyc
 lib/treeline/spellcheck.py
 lib/treeline/spellcheck.pyc
-lib/treeline/textedit2.py
-lib/treeline/textedit2.pyc
-lib/treeline/textedit3.py
-lib/treeline/textedit3.pyc
-lib/treeline/tmpcontrol.py
-lib/treeline/tmpcontrol.pyc
 lib/treeline/treedialogs.py
 lib/treeline/treedialogs.pyc
 lib/treeline/treedoc.py
 lib/treeline/treedoc.pyc
+lib/treeline/treeeditviews.py
+lib/treeline/treeeditviews.pyc
+lib/treeline/treeflatview.py
+lib/treeline/treeflatview.pyc
 lib/treeline/treeformats.py
 lib/treeline/treeformats.pyc
 lib/treeline/treeitem.py
 lib/treeline/treeitem.pyc
+lib/treeline/treeline.pro
 lib/treeline/treeline.py
 lib/treeline/treeline.pyc
 lib/treeline/treemainwin.py
@@ -65,128 +68,152 @@ lib/treeline/treerightviews.py
 lib/treeline/treerightviews.pyc
 lib/treeline/treeselection.py
 lib/treeline/treeselection.pyc
-lib/treeline/treestates.py
-lib/treeline/treestates.pyc
 lib/treeline/treeview.py
 lib/treeline/treeview.pyc
 lib/treeline/treexmlparse.py
 lib/treeline/treexmlparse.pyc
 lib/treeline/undo.py
 lib/treeline/undo.pyc
-%%HTTPLOAD%%lib/treeline/plugins/httpload.py
-%%TYPESEARCH%%lib/treeline/plugins/typesearch.py
-%%DATADIR%%/icons/anchor.png
-%%DATADIR%%/icons/arrow_1.png
-%%DATADIR%%/icons/arrow_2.png
-%%DATADIR%%/icons/arrow_3.png
-%%DATADIR%%/icons/arrow_4.png
-%%DATADIR%%/icons/arrow_5.png
-%%DATADIR%%/icons/bell.png
-%%DATADIR%%/icons/book_1.png
-%%DATADIR%%/icons/book_2.png
-%%DATADIR%%/icons/book_3.png
-%%DATADIR%%/icons/bookmark.png
-%%DATADIR%%/icons/bulb.png
-%%DATADIR%%/icons/bullet_1.png
-%%DATADIR%%/icons/bullet_2.png
-%%DATADIR%%/icons/bullet_3.png
-%%DATADIR%%/icons/check_1.png
-%%DATADIR%%/icons/check_2.png
-%%DATADIR%%/icons/check_3.png
-%%DATADIR%%/icons/clock.png
-%%DATADIR%%/icons/colors.png
-%%DATADIR%%/icons/dataconf.png
-%%DATADIR%%/icons/datafilter.png
-%%DATADIR%%/icons/dataset.png
-%%DATADIR%%/icons/datasort.png
-%%DATADIR%%/icons/date_1.png
-%%DATADIR%%/icons/date_2.png
-%%DATADIR%%/icons/default.png
-%%DATADIR%%/icons/disk.png
-%%DATADIR%%/icons/doc.png
-%%DATADIR%%/icons/editadd.png
-%%DATADIR%%/icons/editcopy.png
-%%DATADIR%%/icons/editcut.png
-%%DATADIR%%/icons/editdel.png
-%%DATADIR%%/icons/editindent.png
-%%DATADIR%%/icons/editinsertafter.png
-%%DATADIR%%/icons/editinsertbefore.png
-%%DATADIR%%/icons/editmovedown.png
-%%DATADIR%%/icons/editmoveup.png
-%%DATADIR%%/icons/editpaste.png
-%%DATADIR%%/icons/editredo.png
-%%DATADIR%%/icons/editundo.png
-%%DATADIR%%/icons/editunindent.png
-%%DATADIR%%/icons/euro.png
-%%DATADIR%%/icons/filenew.png
-%%DATADIR%%/icons/fileopen.png
-%%DATADIR%%/icons/fileprint.png
-%%DATADIR%%/icons/filequit.png
-%%DATADIR%%/icons/filesave.png
-%%DATADIR%%/icons/filesaveas.png
-%%DATADIR%%/icons/folder_1.png
-%%DATADIR%%/icons/folder_2.png
-%%DATADIR%%/icons/folder_3.png
-%%DATADIR%%/icons/gear.png
-%%DATADIR%%/icons/gnu.png
-%%DATADIR%%/icons/hand.png
-%%DATADIR%%/icons/heart.png
-%%DATADIR%%/icons/helpback.png
-%%DATADIR%%/icons/helpcontents.png
-%%DATADIR%%/icons/helpforward.png
-%%DATADIR%%/icons/helphome.png
-%%DATADIR%%/icons/home.png
-%%DATADIR%%/icons/lock_1.png
-%%DATADIR%%/icons/lock_2.png
-%%DATADIR%%/icons/mag.png
-%%DATADIR%%/icons/mail.png
-%%DATADIR%%/icons/minus.png
-%%DATADIR%%/icons/misc.png
-%%DATADIR%%/icons/move.png
-%%DATADIR%%/icons/music.png
-%%DATADIR%%/icons/note.png
-%%DATADIR%%/icons/pencil.png
-%%DATADIR%%/icons/person.png
-%%DATADIR%%/icons/plus.png
-%%DATADIR%%/icons/print.png
-%%DATADIR%%/icons/question.png
-%%DATADIR%%/icons/rocket.png
-%%DATADIR%%/icons/smiley_1.png
-%%DATADIR%%/icons/smiley_2.png
-%%DATADIR%%/icons/smiley_3.png
-%%DATADIR%%/icons/smiley_4.png
-%%DATADIR%%/icons/smiley_5.png
-%%DATADIR%%/icons/sphere.png
-%%DATADIR%%/icons/star.png
-%%DATADIR%%/icons/sum.png
-%%DATADIR%%/icons/table.png
-%%DATADIR%%/icons/task_1.png
-%%DATADIR%%/icons/task_2.png
-%%DATADIR%%/icons/term.png
-%%DATADIR%%/icons/text.png
-%%DATADIR%%/icons/toolsbackcolor.png
-%%DATADIR%%/icons/toolscollapse.png
-%%DATADIR%%/icons/toolsexpand.png
-%%DATADIR%%/icons/toolsfind.png
-%%DATADIR%%/icons/toolsoptions.png
-%%DATADIR%%/icons/toolsspell.png
-%%DATADIR%%/icons/toolstextcolor.png
-%%DATADIR%%/icons/trash.png
-%%DATADIR%%/icons/treeline.png
-%%DATADIR%%/icons/tux_1.png
-%%DATADIR%%/icons/tux_2.png
-%%DATADIR%%/icons/viewchild.png
-%%DATADIR%%/icons/viewselect.png
-%%DATADIR%%/icons/warning.png
-%%DATADIR%%/icons/wrench.png
-%%DATADIR%%/icons/write.png
-%%DATADIR%%/icons/x_1.png
-%%DATADIR%%/icons/x_2.png
-%%DATADIR%%/icons/x_3.png
-%%PORTDOCS%%%%DOCSDIR%%/condition_dlg.png
-%%PORTDOCS%%%%DOCSDIR%%/config_dlg.png
-%%PORTDOCS%%%%DOCSDIR%%/field_dlg.png
+%%HTTPLOAD%%lib/treeline/plugins/httpload2.py
+%%DATADIR%%/icons/toolbar/32x32/dataconfigtype.png
+%%DATADIR%%/icons/toolbar/32x32/datafiltercond.png
+%%DATADIR%%/icons/toolbar/32x32/datafiltertext.png
+%%DATADIR%%/icons/toolbar/32x32/datasetdescendtype.png
+%%DATADIR%%/icons/toolbar/32x32/datasort.png
+%%DATADIR%%/icons/toolbar/32x32/editaddchild.png
+%%DATADIR%%/icons/toolbar/32x32/editcopy.png
+%%DATADIR%%/icons/toolbar/32x32/editcut.png
+%%DATADIR%%/icons/toolbar/32x32/editdelete.png
+%%DATADIR%%/icons/toolbar/32x32/editindent.png
+%%DATADIR%%/icons/toolbar/32x32/editinsertafter.png
+%%DATADIR%%/icons/toolbar/32x32/editinsertbefore.png
+%%DATADIR%%/icons/toolbar/32x32/editmovedown.png
+%%DATADIR%%/icons/toolbar/32x32/editmovefirst.png
+%%DATADIR%%/icons/toolbar/32x32/editmovelast.png
+%%DATADIR%%/icons/toolbar/32x32/editmoveup.png
+%%DATADIR%%/icons/toolbar/32x32/editpaste.png
+%%DATADIR%%/icons/toolbar/32x32/editredo.png
+%%DATADIR%%/icons/toolbar/32x32/editrename.png
+%%DATADIR%%/icons/toolbar/32x32/editundo.png
+%%DATADIR%%/icons/toolbar/32x32/editunindent.png
+%%DATADIR%%/icons/toolbar/32x32/filenew.png
+%%DATADIR%%/icons/toolbar/32x32/fileopen.png
+%%DATADIR%%/icons/toolbar/32x32/fileprint.png
+%%DATADIR%%/icons/toolbar/32x32/fileprintpreview.png
+%%DATADIR%%/icons/toolbar/32x32/filequit.png
+%%DATADIR%%/icons/toolbar/32x32/filesave.png
+%%DATADIR%%/icons/toolbar/32x32/filesaveas.png
+%%DATADIR%%/icons/toolbar/32x32/helpabout.png
+%%DATADIR%%/icons/toolbar/32x32/helpback.png
+%%DATADIR%%/icons/toolbar/32x32/helpcontents.png
+%%DATADIR%%/icons/toolbar/32x32/helpforward.png
+%%DATADIR%%/icons/toolbar/32x32/helphome.png
+%%DATADIR%%/icons/toolbar/32x32/textaddboldtag.png
+%%DATADIR%%/icons/toolbar/32x32/textaddcolortag.png
+%%DATADIR%%/icons/toolbar/32x32/textadditalicstag.png
+%%DATADIR%%/icons/toolbar/32x32/textaddsizetag.png
+%%DATADIR%%/icons/toolbar/32x32/textaddunderlinetag.png
+%%DATADIR%%/icons/toolbar/32x32/toolsbackcolor.png
+%%DATADIR%%/icons/toolbar/32x32/toolscollapse.png
+%%DATADIR%%/icons/toolbar/32x32/toolsexpand.png
+%%DATADIR%%/icons/toolbar/32x32/toolsfileoptions.png
+%%DATADIR%%/icons/toolbar/32x32/toolsfind.png
+%%DATADIR%%/icons/toolbar/32x32/toolsgenoptions.png
+%%DATADIR%%/icons/toolbar/32x32/toolsshortcuts.png
+%%DATADIR%%/icons/toolbar/32x32/toolsspellcheck.png
+%%DATADIR%%/icons/toolbar/32x32/toolstextcolor.png
+%%DATADIR%%/icons/toolbar/32x32/viewflat.png
+%%DATADIR%%/icons/toolbar/32x32/viewnextselect.png
+%%DATADIR%%/icons/toolbar/32x32/viewpreviousselect.png
+%%DATADIR%%/icons/toolbar/32x32/viewshowchild.png
+%%DATADIR%%/icons/toolbar/32x32/viewshowdescend.png
+%%DATADIR%%/icons/toolbar/32x32/viewtree.png
+%%DATADIR%%/icons/tree/anchor.png
+%%DATADIR%%/icons/tree/arrow_1.png
+%%DATADIR%%/icons/tree/arrow_2.png
+%%DATADIR%%/icons/tree/arrow_3.png
+%%DATADIR%%/icons/tree/arrow_4.png
+%%DATADIR%%/icons/tree/arrow_5.png
+%%DATADIR%%/icons/tree/bell.png
+%%DATADIR%%/icons/tree/book_1.png
+%%DATADIR%%/icons/tree/book_2.png
+%%DATADIR%%/icons/tree/book_3.png
+%%DATADIR%%/icons/tree/bookmark.png
+%%DATADIR%%/icons/tree/bulb.png
+%%DATADIR%%/icons/tree/bullet_1.png
+%%DATADIR%%/icons/tree/bullet_2.png
+%%DATADIR%%/icons/tree/bullet_3.png
+%%DATADIR%%/icons/tree/check_1.png
+%%DATADIR%%/icons/tree/check_2.png
+%%DATADIR%%/icons/tree/check_3.png
+%%DATADIR%%/icons/tree/clock.png
+%%DATADIR%%/icons/tree/colors.png
+%%DATADIR%%/icons/tree/date_1.png
+%%DATADIR%%/icons/tree/date_2.png
+%%DATADIR%%/icons/tree/default.png
+%%DATADIR%%/icons/tree/disk.png
+%%DATADIR%%/icons/tree/doc.png
+%%DATADIR%%/icons/tree/euro.png
+%%DATADIR%%/icons/tree/folder_1.png
+%%DATADIR%%/icons/tree/folder_2.png
+%%DATADIR%%/icons/tree/folder_3.png
+%%DATADIR%%/icons/tree/gear.png
+%%DATADIR%%/icons/tree/gnu.png
+%%DATADIR%%/icons/tree/hand.png
+%%DATADIR%%/icons/tree/heart.png
+%%DATADIR%%/icons/tree/home.png
+%%DATADIR%%/icons/tree/lock_1.png
+%%DATADIR%%/icons/tree/lock_2.png
+%%DATADIR%%/icons/tree/mag.png
+%%DATADIR%%/icons/tree/mail.png
+%%DATADIR%%/icons/tree/minus.png
+%%DATADIR%%/icons/tree/misc.png
+%%DATADIR%%/icons/tree/move.png
+%%DATADIR%%/icons/tree/music.png
+%%DATADIR%%/icons/tree/note.png
+%%DATADIR%%/icons/tree/pencil.png
+%%DATADIR%%/icons/tree/person.png
+%%DATADIR%%/icons/tree/plus.png
+%%DATADIR%%/icons/tree/print.png
+%%DATADIR%%/icons/tree/question.png
+%%DATADIR%%/icons/tree/rocket.png
+%%DATADIR%%/icons/tree/round_minus.png
+%%DATADIR%%/icons/tree/round_plus.png
+%%DATADIR%%/icons/tree/smiley_1.png
+%%DATADIR%%/icons/tree/smiley_2.png
+%%DATADIR%%/icons/tree/smiley_3.png
+%%DATADIR%%/icons/tree/smiley_4.png
+%%DATADIR%%/icons/tree/smiley_5.png
+%%DATADIR%%/icons/tree/sphere.png
+%%DATADIR%%/icons/tree/star.png
+%%DATADIR%%/icons/tree/sum.png
+%%DATADIR%%/icons/tree/table.png
+%%DATADIR%%/icons/tree/task_1.png
+%%DATADIR%%/icons/tree/task_2.png
+%%DATADIR%%/icons/tree/term.png
+%%DATADIR%%/icons/tree/text.png
+%%DATADIR%%/icons/tree/trash.png
+%%DATADIR%%/icons/tree/treeline.png
+%%DATADIR%%/icons/tree/tux_1.png
+%%DATADIR%%/icons/tree/tux_2.png
+%%DATADIR%%/icons/tree/warning.png
+%%DATADIR%%/icons/tree/wrench.png
+%%DATADIR%%/icons/tree/write.png
+%%DATADIR%%/icons/tree/x_1.png
+%%DATADIR%%/icons/tree/x_2.png
+%%DATADIR%%/icons/tree/x_3.png
+%%DATADIR%%/templates/110en_Long_Plain_Text.trl
+%%DATADIR%%/templates/120en_Long_HTML_Text.trl
+%%DATADIR%%/templates/210en_Contact_List.trl
+%%DATADIR%%/templates/220en_Book_List.trl
+%%DATADIR%%/templates/230en_ToDo_List.trl
 %%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_condition.png
+%%PORTDOCS%%%%DOCSDIR%%/doc_edit.png
+%%PORTDOCS%%%%DOCSDIR%%/doc_fieldconf.png
+%%PORTDOCS%%%%DOCSDIR%%/doc_filter.png
+%%PORTDOCS%%%%DOCSDIR%%/doc_main.png
+%%PORTDOCS%%%%DOCSDIR%%/doc_output.png
 %%PORTDOCS%%%%DOCSDIR%%/readme.trl
 %%PORTDOCS%%%%DOCSDIR%%/sample_basic_booklist.trl
 %%PORTDOCS%%%%DOCSDIR%%/sample_basic_contacts.trl
@@ -198,8 +225,13 @@ lib/treeline/undo.pyc
 %%PORTDOCS%%%%DOCSDIR%%/sample_intern_links.trl
 %%PORTDOCS%%%%DOCSDIR%%/sample_other_fields.trl
 %%PORTDOCS%%%%DOCSDIR%%/sample_table_booklist.trl
-@dirrm lib/treeline/plugins
-@dirrm lib/treeline
+@dirrm %%DATADIR%%/icons/toolbar/16x16
+@dirrm %%DATADIR%%/icons/toolbar/32x32
+@dirrm %%DATADIR%%/icons/toolbar
+@dirrm %%DATADIR%%/icons/tree
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
+@dirrm lib/treeline/plugins
+@dirrm lib/treeline
 %%PORTDOCS%%@dirrm %%DOCSDIR%%