Update to 1.0.0

Changelog:
Version 1.0.0:
- toolbar with color, brush selector and brush settings dropdown
- tool windows can be docked instead of floating
- locked alpha brush mode
- basic layer compositing modes
- new scratchpad area
- lots of other improvements (about 500 commits)

3 files changed, 199 insertions, 28 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index f0ad3edcf5f..2927d4f0e2c 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/05/04 11:16:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/23 11:00:55 ryoon Exp $
 #
 
-DISTNAME=	mypaint-0.9.1
-PKGREVISION=	2
+DISTNAME=	mypaint-1.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/mypaint/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/mypaint/PLIST b/graphics/mypaint/PLIST
index e2be87b4421..8b666a34ce2 100644
--- a/graphics/mypaint/PLIST
+++ b/graphics/mypaint/PLIST
@@ -1,15 +1,91 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/23 11:45:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/11/23 11:00:55 ryoon Exp $
 bin/mypaint
 lib/mypaint/_mypaintlib.so
 share/applications/mypaint.desktop
+share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png
+share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
+share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
+share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
+share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
+share/icons/hicolor/16x16/actions/mypaint-tool-layers.png
+share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
 share/icons/hicolor/16x16/apps/mypaint.png
+share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png
+share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
+share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
+share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
+share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
+share/icons/hicolor/22x22/actions/mypaint-tool-layers.png
+share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
 share/icons/hicolor/22x22/apps/mypaint.png
+share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png
+share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png
+share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png
+share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/24x24/actions/mypaint-tool-brush.png
+share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
+share/icons/hicolor/24x24/actions/mypaint-tool-layers.png
+share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png
 share/icons/hicolor/24x24/apps/mypaint.png
+share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png
+share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
+share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
+share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
+share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
+share/icons/hicolor/32x32/actions/mypaint-tool-layers.png
+share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
 share/icons/hicolor/32x32/apps/mypaint.png
+share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
+share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
+share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
+share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
+share/icons/hicolor/48x48/actions/mypaint-tool-layers.png
+share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
 share/icons/hicolor/48x48/apps/mypaint.png
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-mods-active.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-mods-inactive.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-brush.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-color-triangle.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-layers.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-scratchpad.svg
 share/icons/hicolor/scalable/apps/mypaint.svg
 share/locale/cs/LC_MESSAGES/mypaint.mo
 share/locale/de/LC_MESSAGES/mypaint.mo
+share/locale/en_CA/LC_MESSAGES/mypaint.mo
 share/locale/es/LC_MESSAGES/mypaint.mo
 share/locale/fr/LC_MESSAGES/mypaint.mo
 share/locale/hu/LC_MESSAGES/mypaint.mo
@@ -20,6 +96,7 @@ share/locale/ko/LC_MESSAGES/mypaint.mo
 share/locale/nb/LC_MESSAGES/mypaint.mo
 share/locale/nn_NO/LC_MESSAGES/mypaint.mo
 share/locale/pl/LC_MESSAGES/mypaint.mo
+share/locale/pt_BR/LC_MESSAGES/mypaint.mo
 share/locale/ru/LC_MESSAGES/mypaint.mo
 share/locale/sl/LC_MESSAGES/mypaint.mo
 share/locale/sv/LC_MESSAGES/mypaint.mo
@@ -46,6 +123,33 @@ share/mypaint/backgrounds/canvas3_1.png
 share/mypaint/backgrounds/canvas3_2.png
 share/mypaint/backgrounds/canvas3_3.png
 share/mypaint/backgrounds/default.png
+share/mypaint/backgrounds/mrmamurk/MrMamurk_readme.txt
+share/mypaint/backgrounds/mrmamurk/mamurk_a_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_a_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_3.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_4.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_5.png
+share/mypaint/backgrounds/mrmamurk/mamurk_b_6.png
+share/mypaint/backgrounds/mrmamurk/mamurk_c_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_c_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_c_3.png
+share/mypaint/backgrounds/mrmamurk/mamurk_c_4.png
+share/mypaint/backgrounds/mrmamurk/mamurk_d_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_d_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_d_3.png
+share/mypaint/backgrounds/mrmamurk/mamurk_d_4.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_3.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_4.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_5.png
+share/mypaint/backgrounds/mrmamurk/mamurk_e_6.png
+share/mypaint/backgrounds/mrmamurk/mamurk_f_1.png
+share/mypaint/backgrounds/mrmamurk/mamurk_f_2.png
+share/mypaint/backgrounds/mrmamurk/mamurk_f_3.png
+share/mypaint/backgrounds/mrmamurk/mamurk_f_4.png
 share/mypaint/backgrounds/paper1_1.png
 share/mypaint/backgrounds/paper1_10.png
 share/mypaint/backgrounds/paper1_11.png
@@ -92,6 +196,18 @@ share/mypaint/backgrounds/paper7_7.png
 share/mypaint/backgrounds/paper7_8.png
 share/mypaint/backgrounds/paper7_9.png
 share/mypaint/backgrounds/pattern2.png
+share/mypaint/backgrounds/ramon/HR_Canvas 01.png
+share/mypaint/backgrounds/ramon/HR_Canvas 02.png
+share/mypaint/backgrounds/ramon/HR_Cork.png
+share/mypaint/backgrounds/ramon/HR_DecoPaper.png
+share/mypaint/backgrounds/ramon/HR_PastelPaper 01.png
+share/mypaint/backgrounds/ramon/HR_PastelPaper 02.png
+share/mypaint/backgrounds/ramon/HR_RoughPaper.png
+share/mypaint/backgrounds/ramon/HR_SketchPaper 02.png
+share/mypaint/backgrounds/ramon/HR_SketchPaper.png
+share/mypaint/backgrounds/ramon/HR_Wall_Paper.png
+share/mypaint/backgrounds/ramon/HR_WaterColor.png
+share/mypaint/backgrounds/ramon/readme_papers.txt
 share/mypaint/backgrounds/squares2.png
 share/mypaint/backgrounds/squares2_blue.png
 share/mypaint/brushes/FX_blender_prev
@@ -165,54 +281,79 @@ share/mypaint/brushes/classic/textured_ink.myb
 share/mypaint/brushes/classic/textured_ink_prev.png
 share/mypaint/brushes/classic/wet_knife.myb
 share/mypaint/brushes/classic/wet_knife_prev.png
-share/mypaint/brushes/deevad/G-pen.myb
-share/mypaint/brushes/deevad/G-pen_prev.png
+share/mypaint/brushes/deevad/2B.myb
+share/mypaint/brushes/deevad/2B_prev.png
+share/mypaint/brushes/deevad/4H.myb
+share/mypaint/brushes/deevad/4H_prev.png
 share/mypaint/brushes/deevad/airbrush.myb
 share/mypaint/brushes/deevad/airbrush_prev.png
+share/mypaint/brushes/deevad/artpen.myb
+share/mypaint/brushes/deevad/artpen_prev.png
 share/mypaint/brushes/deevad/ballpen.myb
 share/mypaint/brushes/deevad/ballpen_prev.png
 share/mypaint/brushes/deevad/blending.myb
-share/mypaint/brushes/deevad/blending1.myb
-share/mypaint/brushes/deevad/blending1_prev.png
 share/mypaint/brushes/deevad/blending2.myb
 share/mypaint/brushes/deevad/blending2_prev.png
 share/mypaint/brushes/deevad/blending_prev.png
-share/mypaint/brushes/deevad/bright.myb
-share/mypaint/brushes/deevad/bright_prev.png
 share/mypaint/brushes/deevad/brush.myb
 share/mypaint/brushes/deevad/brush_prev.png
 share/mypaint/brushes/deevad/chalk.myb
 share/mypaint/brushes/deevad/chalk_prev.png
 share/mypaint/brushes/deevad/charcoal.myb
 share/mypaint/brushes/deevad/charcoal_prev.png
-share/mypaint/brushes/deevad/eraser.myb
-share/mypaint/brushes/deevad/eraser_prev.png
+share/mypaint/brushes/deevad/detail1.myb
+share/mypaint/brushes/deevad/detail1_prev.png
+share/mypaint/brushes/deevad/detail2.myb
+share/mypaint/brushes/deevad/detail2_prev.png
+share/mypaint/brushes/deevad/detail3.myb
+share/mypaint/brushes/deevad/detail3_prev.png
+share/mypaint/brushes/deevad/detail4.myb
+share/mypaint/brushes/deevad/detail4_prev.png
+share/mypaint/brushes/deevad/digital.myb
+share/mypaint/brushes/deevad/digital_prev.png
 share/mypaint/brushes/deevad/fill.myb
 share/mypaint/brushes/deevad/fill_prev.png
-share/mypaint/brushes/deevad/flat.myb
-share/mypaint/brushes/deevad/flat_prev.png
+share/mypaint/brushes/deevad/gpen.myb
+share/mypaint/brushes/deevad/gpen_prev.png
+share/mypaint/brushes/deevad/hard.myb
+share/mypaint/brushes/deevad/hard_prev.png
+share/mypaint/brushes/deevad/kneaded.myb
+share/mypaint/brushes/deevad/kneaded2.myb
+share/mypaint/brushes/deevad/kneaded2_prev.png
+share/mypaint/brushes/deevad/kneaded_prev.png
+share/mypaint/brushes/deevad/knife.myb
+share/mypaint/brushes/deevad/knife_prev.png
 share/mypaint/brushes/deevad/marker.myb
 share/mypaint/brushes/deevad/marker_prev.png
+share/mypaint/brushes/deevad/mixbrush.myb
+share/mypaint/brushes/deevad/mixbrush_prev.png
+share/mypaint/brushes/deevad/mixknife.myb
+share/mypaint/brushes/deevad/mixknife_prev.png
 share/mypaint/brushes/deevad/mop.myb
 share/mypaint/brushes/deevad/mop_prev.png
-share/mypaint/brushes/deevad/pastel.myb
-share/mypaint/brushes/deevad/pastel_prev.png
 share/mypaint/brushes/deevad/pen.myb
 share/mypaint/brushes/deevad/pen_prev.png
-share/mypaint/brushes/deevad/pencil.myb
-share/mypaint/brushes/deevad/pencil_prev.png
+share/mypaint/brushes/deevad/readme.txt
 share/mypaint/brushes/deevad/rigger.myb
+share/mypaint/brushes/deevad/rigger2.myb
+share/mypaint/brushes/deevad/rigger2_prev.png
 share/mypaint/brushes/deevad/rigger_prev.png
+share/mypaint/brushes/deevad/sketch.myb
+share/mypaint/brushes/deevad/sketch_prev.png
 share/mypaint/brushes/deevad/sponge.myb
 share/mypaint/brushes/deevad/sponge_prev.png
 share/mypaint/brushes/deevad/spray.myb
-share/mypaint/brushes/deevad/spray1.myb
-share/mypaint/brushes/deevad/spray1_prev.png
+share/mypaint/brushes/deevad/spray2.myb
+share/mypaint/brushes/deevad/spray2_prev.png
 share/mypaint/brushes/deevad/spray_prev.png
-share/mypaint/brushes/deevad/watercolor.myb
-share/mypaint/brushes/deevad/watercolor1.myb
-share/mypaint/brushes/deevad/watercolor1_prev.png
-share/mypaint/brushes/deevad/watercolor_prev.png
+share/mypaint/brushes/deevad/stick.myb
+share/mypaint/brushes/deevad/stick_prev.png
+share/mypaint/brushes/deevad/water1.myb
+share/mypaint/brushes/deevad/water1_prev.png
+share/mypaint/brushes/deevad/water2.myb
+share/mypaint/brushes/deevad/water2_prev.png
+share/mypaint/brushes/deevad/water3.myb
+share/mypaint/brushes/deevad/water3_prev.png
 share/mypaint/brushes/experimental/1pixel.myb
 share/mypaint/brushes/experimental/1pixel_prev.png
 share/mypaint/brushes/experimental/DNA_brush.myb
@@ -396,6 +537,7 @@ share/mypaint/gui/application.py
 share/mypaint/gui/backgroundwindow.py
 share/mypaint/gui/brushcreationwidget.py
 share/mypaint/gui/brushmanager.py
+share/mypaint/gui/brushmodifier.py
 share/mypaint/gui/brushselectionwindow.py
 share/mypaint/gui/brushsettingswindow.py
 share/mypaint/gui/colorhistory.py
@@ -403,22 +545,40 @@ share/mypaint/gui/colorpicker.py
 share/mypaint/gui/colorsamplerwindow.py
 share/mypaint/gui/colorselectionwindow.py
 share/mypaint/gui/cursor.py
+share/mypaint/gui/curve.py
 share/mypaint/gui/dialogs.py
 share/mypaint/gui/document.py
 share/mypaint/gui/drawwindow.py
+share/mypaint/gui/dropdownpanel.py
+share/mypaint/gui/elastic.py
 share/mypaint/gui/filehandling.py
+share/mypaint/gui/framewindow.py
 share/mypaint/gui/functionwindow.py
 share/mypaint/gui/gtkexcepthook.py
 share/mypaint/gui/historypopup.py
+share/mypaint/gui/hsvcompat.py
 share/mypaint/gui/inputtestwindow.py
 share/mypaint/gui/keyboard.py
 share/mypaint/gui/layerswindow.py
+share/mypaint/gui/layout.py
 share/mypaint/gui/main.py
 share/mypaint/gui/menu.xml
 share/mypaint/gui/pixbuflist.py
 share/mypaint/gui/preferenceswindow.py
+share/mypaint/gui/scratchwindow.py
+share/mypaint/gui/spinbox.py
 share/mypaint/gui/stategroup.py
+share/mypaint/gui/stock.py
 share/mypaint/gui/tileddrawwidget.py
+share/mypaint/gui/toolbar-blendmodes.xml
+share/mypaint/gui/toolbar-edit.xml
+share/mypaint/gui/toolbar-file.xml
+share/mypaint/gui/toolbar-scrap.xml
+share/mypaint/gui/toolbar-subwindows.xml
+share/mypaint/gui/toolbar-view.xml
+share/mypaint/gui/toolbar.py
+share/mypaint/gui/toolbar.xml
+share/mypaint/gui/widgets.py
 share/mypaint/gui/windowing.py
 share/mypaint/lib/__init__.py
 share/mypaint/lib/backgroundsurface.py
@@ -430,9 +590,21 @@ share/mypaint/lib/idletask.py
 share/mypaint/lib/layer.py
 share/mypaint/lib/mypaintlib.py
 share/mypaint/lib/pixbufsurface.py
+share/mypaint/lib/scratchpad_palette.py
 share/mypaint/lib/stroke.py
 share/mypaint/lib/strokemap.py
 share/mypaint/lib/tiledsurface.py
 share/mypaint/pixmaps/cursor_color_picker.png
+share/mypaint/pixmaps/eye_closed.png
+share/mypaint/pixmaps/eye_open.png
+share/mypaint/pixmaps/layer_duplicate.png
+share/mypaint/pixmaps/lock_closed.png
+share/mypaint/pixmaps/lock_open.png
 share/mypaint/pixmaps/mypaint_logo.png
 share/mypaint/pixmaps/plus.png
+share/mypaint/pixmaps/tool_brushSelectionWindow.png
+share/mypaint/pixmaps/tool_colorSamplerWindow.png
+share/mypaint/pixmaps/tool_colorSelectionWindow.png
+share/mypaint/pixmaps/tool_layersWindow.png
+share/mypaint/pixmaps/tool_scratchWindow.png
+share/mypaint/pixmaps/tool_scratchpadWindow.png
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 82b07c410f3..1085300fb98 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/05/04 11:16:23 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2011/11/23 11:00:55 ryoon Exp $
 
-SHA1 (mypaint-0.9.1.tar.bz2) = b2fe2e311619a4c4815cd698abd41e99b6692b43
-RMD160 (mypaint-0.9.1.tar.bz2) = 16bd0492b567822b5ea4d6e3153e73436828a728
-Size (mypaint-0.9.1.tar.bz2) = 5542866 bytes
+SHA1 (mypaint-1.0.0.tar.bz2) = 5f9221304bb8becd642b00d94af947edf1e18844
+RMD160 (mypaint-1.0.0.tar.bz2) = 6d3ff0f5c16e18b006f6449e9591067bd29ed3c5
+Size (mypaint-1.0.0.tar.bz2) = 36748957 bytes
 SHA1 (patch-SConstruct) = d524789a7053976d06d3d4389869b82c456522bf