brushpack import: add to context menu

To make import accessible at the same place where you can
export a group into a brushpack.

diff --git a/gui/brushselectionwindow.py b/gui/brushselectionwindow.py
index cc2b7ee..d45b47c 100644 (file)
--- a/gui/brushselectionwindow.py
+++ b/gui/brushselectionwindow.py
@@ -352,8 +352,10 @@ class GroupSelector(gtk.DrawingArea):
         menu += [ (_("New group..."), self.create_group_cb) ]
         if group:
             menu += [ (_("Rename group..."), self.rename_group_cb),
-                      (_("Export group..."), self.export_group_cb),
-                      (_("Delete group..."), self.delete_group_cb)]
+                      (_("Delete group..."), self.delete_group_cb),
+                      (_("Export group as brush package..."), self.export_group_cb),
+                      ]
+        menu += [ (_("Import brush package..."), self.app.drawWindow.import_brush_pack_cb) ]
         for label, callback in menu:
             mi = gtk.MenuItem(label)
             mi.connect('activate', callback, group)

diff --git a/gui/drawwindow.py b/gui/drawwindow.py
index 63c96f1..b22d732 100644 (file)
--- a/gui/drawwindow.py
+++ b/gui/drawwindow.py
@@ -408,12 +408,12 @@ class Window(windowing.MainWindow):
         gtk.main_quit()
         return False
 
-    def import_brush_pack_cb(self, action):
+    def import_brush_pack_cb(self, *trash):
         format_id, filename = dialogs.open_dialog(_("Import brush package..."), self,
                                  [(_("MyPaint brush package (*.zip)"), "*.zip")])
         if filename is not None:
             #try:
-            self.app.brushmanager.import_brushpack(filename, self)
+            self.app.brushmanager.import_brushpack(filename,  self)
             #except Exception, e:
             #    d = gtk.MessageDialog(self, buttons=gtk.BUTTONS_OK_CANCEL, type=gtk.MESSAGE_ERROR)
             #    text = _("An error occured while importing brush package. Error was: %s") % e