libgui/GuiFrame.py: updated.

libroar/RoarCanvasCommands{,Edit,File,Help,Tools}.py: split from libroar/RoarCanvasInterface.py.
libroar/RoarCanvasWindow.py: updated.
libroar/RoarClient.py: updated.
libroar/RoarWindowAbout.py: renamed from libroar/RoarClientAboutWindow.py.
roar.py: updated.

libgui/GuiFrame.py

@@ -148,7 +148,7 @@ class GuiFrame(wx.Frame):
     # }}}
     # {{{ onMenu(self, event)
     def onMenu(self, event):
-        event.Skip()
+        eventId = event.GetId(); self.itemsById[eventId](event);
     # }}}
     # {{{ onMouseWheel(self, event)
     def onMouseWheel(self, event):

libroar/RoarCanvasCommands.py

@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+#
+# RoarCanvasCommands.py
+# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+#
+
+from GuiCanvasColours import Colours
+from GuiFrame import NID_TOOLBAR_HSEP
+from RoarCanvasCommandsEdit import RoarCanvasCommandsEdit
+from RoarCanvasCommandsFile import RoarCanvasCommandsFile
+from RoarCanvasCommandsHelp import RoarCanvasCommandsHelp
+from RoarCanvasCommandsTools import RoarCanvasCommandsTools
+import os, wx
+
+class RoarCanvasCommands(RoarCanvasCommandsFile, RoarCanvasCommandsEdit, RoarCanvasCommandsHelp, RoarCanvasCommandsTools):
+    # {{{ _initColourBitmaps(self)
+    def _initColourBitmaps(self):
+        for numColour in range(len(RoarCanvasCommandsEdit.canvasColour.attrList)):
+            if numColour < len(Colours):
+                toolBitmapColour = Colours[numColour][0:4]
+                toolBitmap = wx.Bitmap((16, 16))
+                toolBitmapDc = wx.MemoryDC(); toolBitmapDc.SelectObject(toolBitmap);
+                toolBitmapBrush = wx.Brush(wx.Colour(toolBitmapColour), wx.BRUSHSTYLE_SOLID)
+                toolBitmapDc.SetBrush(toolBitmapBrush)
+                toolBitmapDc.SetBackground(toolBitmapBrush)
+                toolBitmapDc.SetPen(wx.Pen(wx.Colour(toolBitmapColour), 1))
+                toolBitmapDc.DrawRectangle(0, 0, 16, 16)
+            RoarCanvasCommandsEdit.canvasColour.attrList[numColour]["icon"] = ["", None, toolBitmap]
+        toolBitmapColours = ((0, 0, 0, 255), (255, 255, 255, 255))
+        toolBitmap = wx.Bitmap((16, 16))
+        toolBitmapDc = wx.MemoryDC(); toolBitmapDc.SelectObject(toolBitmap);
+        toolBitmapBrush = [wx.Brush(wx.Colour(c), wx.BRUSHSTYLE_SOLID) for c in toolBitmapColours]
+        toolBitmapDc.SetBrush(toolBitmapBrush[1])
+        toolBitmapDc.SetBackground(toolBitmapBrush[1])
+        toolBitmapDc.SetPen(wx.Pen(wx.Colour(toolBitmapColours[1]), 1))
+        toolBitmapDc.DrawRectangle(0, 0, 8, 8)
+        toolBitmapDc.DrawRectangle(8, 8, 16, 16)
+        RoarCanvasCommandsEdit.canvasColourAlpha.attrList[0]["icon"] = ["", None, toolBitmap]
+    # }}}
+
+    # {{{ update(self, **kwargs)
+    def update(self, **kwargs):
+        self.lastPanelState.update(kwargs); textItems = [];
+        if "cellPos" in self.lastPanelState:
+            textItems.append("X: {:03d} Y: {:03d}".format(*self.lastPanelState["cellPos"]))
+        if "size" in self.lastPanelState:
+            textItems.append("W: {:03d} H: {:03d}".format(*self.lastPanelState["size"]))
+        if "brushSize" in self.lastPanelState:
+            textItems.append("Brush: {:02d}x{:02d}".format(*self.lastPanelState["brushSize"]))
+        if "colours" in self.lastPanelState:
+            textItems.append("FG: {:02d}, BG: {:02d}".format(*self.lastPanelState["colours"]))
+            textItems.append("{} on {}".format(
+                Colours[self.lastPanelState["colours"][0]][4] if self.lastPanelState["colours"][0] != -1 else "Transparent",
+                Colours[self.lastPanelState["colours"][1]][4] if self.lastPanelState["colours"][1] != -1 else "Transparent"))
+        if "pathName" in self.lastPanelState:
+            if self.lastPanelState["pathName"] != None:
+                basePathName = os.path.basename(self.lastPanelState["pathName"])
+                textItems.append("Current file: {}".format(basePathName))
+                self.parentFrame.SetTitle("{} - roar".format(basePathName))
+            else:
+                self.parentFrame.SetTitle("roar")
+        if "toolName" in self.lastPanelState:
+            textItems.append("Current tool: {}".format(self.lastPanelState["toolName"]))
+        if  "dirty" in self.lastPanelState  \
+        and self.lastPanelState["dirty"]:
+            textItems.append("*")
+        self.parentFrame.statusBar.SetStatusText(" | ".join(textItems))
+        if "undoLevel" in self.lastPanelState:
+            if self.lastPanelState["undoLevel"] >= 0:
+                self.parentFrame.menuItemsById[self.canvasUndo.attrDict["id"]].Enable(True)
+                toolBar = self.parentFrame.toolBarItemsById[self.canvasUndo.attrDict["id"]].GetToolBar()
+                toolBar.EnableTool(self.canvasUndo.attrDict["id"], True)
+            else:
+                self.parentFrame.menuItemsById[self.canvasUndo.attrDict["id"]].Enable(False)
+                toolBar = self.parentFrame.toolBarItemsById[self.canvasUndo.attrDict["id"]].GetToolBar()
+                toolBar.EnableTool(self.canvasUndo.attrDict["id"], False)
+            if self.lastPanelState["undoLevel"] > 0:
+                self.parentFrame.menuItemsById[self.canvasRedo.attrDict["id"]].Enable(True)
+                toolBar = self.parentFrame.toolBarItemsById[self.canvasRedo.attrDict["id"]].GetToolBar()
+                toolBar.EnableTool(self.canvasRedo.attrDict["id"], True)
+            else:
+                self.parentFrame.menuItemsById[self.canvasRedo.attrDict["id"]].Enable(False)
+                toolBar = self.parentFrame.toolBarItemsById[self.canvasRedo.attrDict["id"]].GetToolBar()
+                toolBar.EnableTool(self.canvasRedo.attrDict["id"], False)
+    # }}}
+
+    #
+    # __init__(self, parentCanvas, parentFrame):
+    def __init__(self, parentCanvas, parentFrame):
+        accels, menus, toolBars = [], [], []
+        self.canvasPathName, self.lastPanelState, self.parentCanvas, self.parentFrame = None, {}, parentCanvas, parentFrame
+        for classObject in self.__class__.__bases__:
+            classObject.__init__(self)
+            if len(self.accels):
+                accels += self.accels
+            if len(self.menus):
+                menus += self.menus
+            if len(self.toolBars):
+                toolBars += self.toolBars
+        self._initColourBitmaps()
+
+        # XXX
+        toolBars.append(
+            [self.canvasNew, self.canvasOpen, self.canvasSave, self.canvasSaveAs, NID_TOOLBAR_HSEP,
+             self.canvasUndo, self.canvasRedo, NID_TOOLBAR_HSEP,
+             self.canvasCut, self.canvasCopy, self.canvasPaste, self.canvasDelete, NID_TOOLBAR_HSEP,
+             self.canvasCanvasSize(self.canvasCanvasSize, 1, True), self.canvasCanvasSize(self.canvasCanvasSize, 1, False), self.canvasCanvasSize(self.canvasCanvasSize, 0, True), self.canvasCanvasSize(self.canvasCanvasSize, 0, False), NID_TOOLBAR_HSEP,
+             self.canvasCanvasSize(self.canvasCanvasSize, 2, True), self.canvasCanvasSize(self.canvasCanvasSize, 2, False), NID_TOOLBAR_HSEP,
+             self.canvasTool(self.canvasTool, 5), self.canvasTool(self.canvasTool, 0), self.canvasTool(self.canvasTool, 2), self.canvasTool(self.canvasTool, 3), self.canvasTool(self.canvasTool, 6), self.canvasTool(self.canvasTool, 1), self.canvasTool(self.canvasTool, 4),
+            ])
+        # XXX
+        toolBars.append(
+            [self.canvasColour(self.canvasColour, 0), self.canvasColour(self.canvasColour, 1), self.canvasColour(self.canvasColour, 2), self.canvasColour(self.canvasColour, 3),
+             self.canvasColour(self.canvasColour, 4), self.canvasColour(self.canvasColour, 5), self.canvasColour(self.canvasColour, 6), self.canvasColour(self.canvasColour, 7),
+             self.canvasColour(self.canvasColour, 8), self.canvasColour(self.canvasColour, 9), self.canvasColour(self.canvasColour, 10), self.canvasColour(self.canvasColour, 11),
+             self.canvasColour(self.canvasColour, 12), self.canvasColour(self.canvasColour, 13), self.canvasColour(self.canvasColour, 14), self.canvasColour(self.canvasColour, 15),
+             self.canvasColourAlpha(self.canvasColourAlpha, 0), NID_TOOLBAR_HSEP,
+             self.canvasBrushSize(self.canvasBrushSize, 1, True), self.canvasBrushSize(self.canvasBrushSize, 0, False), self.canvasBrushSize(self.canvasBrushSize, 1, True), self.canvasBrushSize(self.canvasBrushSize, 1, False), NID_TOOLBAR_HSEP,
+             self.canvasBrushSize(self.canvasBrushSize, 2, True), self.canvasBrushSize(self.canvasBrushSize, 2, False),
+            ])
+        self.accels, self.menus, self.toolBars = accels, menus, toolBars
+
+# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasCommandsEdit.py

@@ -0,0 +1,159 @@
+#!/usr/bin/env python3
+#
+# RoarCanvasCommandsEdit.py
+# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+#
+
+from GuiFrame import GuiCommandDecorator, GuiCommandListDecorator, GuiSelectDecorator, NID_MENU_SEP
+import wx
+
+class RoarCanvasCommandsEdit():
+    # {{{ canvasBrush(self, f, idx)
+    @GuiSelectDecorator(0, "Solid brush", "Solid brush", None, None, True)
+    def canvasBrush(self, f, idx):
+        def canvasBrush_(self, event):
+            pass
+        setattr(canvasBrush_, "attrDict", f.attrList[idx])
+        setattr(canvasBrush_, "isSelect", True)
+        return canvasBrush_
+    # }}}
+    # {{{ canvasBrushSize(self, f, dimension, incrFlag)
+    @GuiCommandListDecorator(0, "Decrease brush width", "Decrease brush width", ["toolDecrBrushW.png"], None, None)
+    @GuiCommandListDecorator(1, "Decrease brush height", "Decrease brush height", ["toolDecrBrushH.png"], None, None)
+    @GuiCommandListDecorator(2, "Decrease brush size", "Decrease brush size", ["toolDecrBrushHW.png"], None, None)
+    @GuiCommandListDecorator(3, "Increase brush width", "Increase brush width", ["toolIncrBrushW.png"], None, None)
+    @GuiCommandListDecorator(4, "Increase brush height", "Increase brush height", ["toolIncrBrushH.png"], None, None)
+    @GuiCommandListDecorator(5, "Increase brush size", "Increase brush size", ["toolIncrBrushHW.png"], None, None)
+    def canvasBrushSize(self, f, dimension, incrFlag):
+        def canvasBrushSize_(event):
+            if (dimension < 2) and not incrFlag:
+                if self.parentCanvas.brushSize[dimension] > 1:
+                    self.parentCanvas.brushSize[dimension] -= 1
+                    self.update(brushSize=self.parentCanvas.brushSize)
+            elif (dimension < 2) and incrFlag:
+                self.parentCanvas.brushSize[dimension] += 1
+                self.update(brushSize=self.parentCanvas.brushSize)
+            elif dimension == 2:
+                [self.canvasBrushSize(f, dimension_, incrFlag)(None) for dimension_ in [0, 1]]
+        setattr(canvasBrushSize_, "attrDict", f.attrList[dimension + (0 if not incrFlag else 3)])
+        return canvasBrushSize_
+    # }}}
+    # {{{ canvasCanvasSize(self, f, dimension, incrFlag)
+    @GuiCommandListDecorator(0, "Decrease canvas height", "Decrease canvas height", ["toolDecrCanvasH.png"], None, None)
+    @GuiCommandListDecorator(1, "Decrease canvas width", "Decrease canvas width", ["toolDecrCanvasW.png"], None, None)
+    @GuiCommandListDecorator(2, "Decrease canvas size", "Decrease canvas size", ["toolDecrCanvasHW.png"], None, None)
+    @GuiCommandListDecorator(3, "Increase canvas height", "Increase canvas height", ["toolIncrCanvasH.png"], None, None)
+    @GuiCommandListDecorator(4, "Increase canvas width", "Increase canvas width", ["toolIncrCanvasW.png"], None, None)
+    @GuiCommandListDecorator(5, "Increase canvas size", "Increase canvas size", ["toolIncrCanvasHW.png"], None, None)
+    def canvasCanvasSize(self, f, dimension, incrFlag):
+        def canvasCanvasSize_(event):
+            if (dimension < 2) and not incrFlag:
+                if dimension == 0:
+                    if self.parentCanvas.canvas.size[1] > 1:
+                        self.parentCanvas.resize([self.parentCanvas.canvas.size[0], self.parentCanvas.canvas.size[1] - 1])
+                elif dimension == 1:
+                    if self.parentCanvas.canvas.size[0] > 1:
+                        self.parentCanvas.resize([self.parentCanvas.canvas.size[0] - 1, self.parentCanvas.canvas.size[1]])
+            elif (dimension < 2) and incrFlag:
+                if dimension == 0:
+                    self.parentCanvas.resize([self.parentCanvas.canvas.size[0], self.parentCanvas.canvas.size[1] + 1])
+                elif dimension == 1:
+                    self.parentCanvas.resize([self.parentCanvas.canvas.size[0] + 1, self.parentCanvas.canvas.size[1]])
+            elif dimension == 2:
+                [self.canvasCanvasSize(f, dimension_, incrFlag)(None) for dimension_ in [0, 1]]
+        setattr(canvasCanvasSize_, "attrDict", f.attrList[dimension + (0 if not incrFlag else 3)])
+        return canvasCanvasSize_
+    # }}}
+    # {{{ canvasColour(self, f, idx)
+    @GuiSelectDecorator(0, "Colour #00", "Colour #00 (Bright White)", None, None, False)
+    @GuiSelectDecorator(1, "Colour #01", "Colour #01 (Black)", None, None, False)
+    @GuiSelectDecorator(2, "Colour #02", "Colour #02 (Blue)", None, None, False)
+    @GuiSelectDecorator(3, "Colour #03", "Colour #03 (Green)", None, None, False)
+    @GuiSelectDecorator(4, "Colour #04", "Colour #04 (Red)", None, None, False)
+    @GuiSelectDecorator(5, "Colour #05", "Colour #05 (Light Red)", None, None, False)
+    @GuiSelectDecorator(6, "Colour #06", "Colour #06 (Pink)", None, None, False)
+    @GuiSelectDecorator(7, "Colour #07", "Colour #07 (Yellow)", None, None, False)
+    @GuiSelectDecorator(8, "Colour #08", "Colour #08 (Light Yellow)", None, None, False)
+    @GuiSelectDecorator(9, "Colour #09", "Colour #09 (Light Green)", None, None, False)
+    @GuiSelectDecorator(10, "Colour #10", "Colour #10 (Cyan)", None, None, False)
+    @GuiSelectDecorator(11, "Colour #11", "Colour #11 (Light Cyan)", None, None, False)
+    @GuiSelectDecorator(12, "Colour #12", "Colour #12 (Light Blue)", None, None, False)
+    @GuiSelectDecorator(13, "Colour #13", "Colour #13 (Light Pink)", None, None, False)
+    @GuiSelectDecorator(14, "Colour #14", "Colour #14 (Grey)", None, None, False)
+    @GuiSelectDecorator(15, "Colour #15", "Colour #15 (Light Grey)", None, None, False)
+    def canvasColour(self, f, idx):
+        def canvasColour_(event):
+            if event.GetEventType() == wx.wxEVT_TOOL:
+                self.parentCanvas.brushColours[0] = idx
+            elif event.GetEventType() == wx.wxEVT_TOOL_RCLICKED:
+                self.parentCanvas.brushColours[1] = idx
+            self.update(colours=self.parentCanvas.brushColours)
+        setattr(canvasColour_, "attrDict", f.attrList[idx])
+        setattr(canvasColour_, "isSelect", True)
+        return canvasColour_
+    # }}}
+    # {{{ canvasColourAlpha(self, f, idx)
+    @GuiSelectDecorator(0, "Transparent colour", "Transparent colour", None, None, False)
+    def canvasColourAlpha(self, f, idx):
+        def canvasColourAlpha_(self, event):
+            if event.GetEventType() == wx.wxEVT_TOOL:
+                self.parentCanvas.brushColours[0] = -1
+            elif event.GetEventType() == wx.wxEVT_TOOL_RCLICKED:
+                self.parentCanvas.brushColours[1] = -1
+            self.update(colours=self.parentCanvas.brushColours)
+        setattr(canvasColourAlpha_, "attrDict", f.attrList[idx])
+        setattr(canvasColourAlpha_, "isSelect", True)
+        return canvasColourAlpha_
+    # }}}
+    # {{{ canvasCopy(self, event)
+    @GuiCommandDecorator("Copy", "&Copy", ["", wx.ART_COPY], None, False)
+    def canvasCopy(self, event):
+        pass
+    # }}}
+    # {{{ canvasCut(self, event)
+    @GuiCommandDecorator("Cut", "Cu&t", ["", wx.ART_CUT], None, False)
+    def canvasCut(self, event):
+        pass
+    # }}}
+    # {{{ canvasDelete(self, event)
+    @GuiCommandDecorator("Delete", "De&lete", ["", wx.ART_DELETE], None, False)
+    def canvasDelete(self, event):
+        pass
+    # }}}
+    # {{{ canvasPaste(self, event)
+    @GuiCommandDecorator("Paste", "&Paste", ["", wx.ART_PASTE], None, False)
+    def canvasPaste(self, event):
+        pass
+    # }}}
+    # {{{ canvasRedo(self, event)
+    @GuiCommandDecorator("Redo", "&Redo", ["", wx.ART_REDO], [wx.ACCEL_CTRL, ord("Y")], False)
+    def canvasRedo(self, event):
+        self.parentCanvas.dispatchDeltaPatches(self.parentCanvas.canvas.journal.popRedo())
+        self.update(size=self.parentCanvas.canvas.size, undoLevel=self.parentCanvas.canvas.journal.patchesUndoLevel)
+    # }}}
+    # {{{ canvasUndo(self, event)
+    @GuiCommandDecorator("Undo", "&Undo", ["", wx.ART_UNDO], [wx.ACCEL_CTRL, ord("Z")], False)
+    def canvasUndo(self, event):
+        self.parentCanvas.dispatchDeltaPatches(self.parentCanvas.canvas.journal.popUndo())
+        self.update(size=self.parentCanvas.canvas.size, undoLevel=self.parentCanvas.canvas.journal.patchesUndoLevel)
+    # }}}
+
+    #
+    # __init__(self)
+    def __init__(self):
+        self.accels = (self.canvasUndo, self.canvasRedo)
+        self.menus = (
+            ("&Edit",
+                self.canvasUndo, self.canvasRedo, NID_MENU_SEP,
+                self.canvasCut, self.canvasCopy, self.canvasPaste,
+                self.canvasDelete, NID_MENU_SEP,
+                self.canvasCanvasSize(self.canvasCanvasSize, 1, True), self.canvasCanvasSize(self.canvasCanvasSize, 1, False), self.canvasCanvasSize(self.canvasCanvasSize, 0, True), self.canvasCanvasSize(self.canvasCanvasSize, 0, False), NID_MENU_SEP,
+                self.canvasCanvasSize(self.canvasCanvasSize, 2, True), self.canvasCanvasSize(self.canvasCanvasSize, 2, False), NID_MENU_SEP,
+                self.canvasBrushSize(self.canvasBrushSize, 0, True), self.canvasBrushSize(self.canvasBrushSize, 0, False), self.canvasBrushSize(self.canvasBrushSize, 1, True), self.canvasBrushSize(self.canvasBrushSize, 1, False), NID_MENU_SEP,
+                self.canvasBrushSize(self.canvasBrushSize, 2, True), self.canvasBrushSize(self.canvasBrushSize, 2, False), NID_MENU_SEP,
+                self.canvasBrush(self.canvasBrush, 0),
+            ),
+        )
+        self.toolBars = ()
+
+# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasCommandsFile.py

@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+#
+# RoarCanvasCommandsFile.py
+# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+#
+
+try:
+    from ImgurApiKey import ImgurApiKey
+    haveImgurApiKey = True
+except ImportError:
+    haveImgurApiKey = False
+
+try:
+    import base64, json, requests, urllib.request
+    haveUrllib = True
+except ImportError:
+    haveUrllib = False
+
+from GuiFrame import GuiCommandDecorator, NID_MENU_SEP
+import io, os, wx
+
+class RoarCanvasCommandsFile():
+    # {{{ _import(self, f, newDirty, pathName)
+    def _import(self, f, newDirty, pathName):
+        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+        rc, error, newMap, newPathName, newSize = f(pathName)
+        if rc:
+            self.parentCanvas.dirty = newDirty
+            self.parentCanvas.update(newSize, False, newMap)
+            self.canvasPathName = newPathName
+            self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
+            self.parentCanvas.canvas.journal.resetCursor()
+            self.parentCanvas.canvas.journal.resetUndo()
+        else:
+            with wx.MessageDialog(self.parentCanvas, "Error: {}".format(error), "", wx.OK | wx.OK_DEFAULT) as dialog:
+                dialogChoice = dialog.ShowModal()
+        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+        return rc
+    # }}}
+    # {{{ _importFile(self, f, newDirty, wildcard)
+    def _importFile(self, f, newDirty, wildcard):
+        with wx.FileDialog(self.parentCanvas, "Open", os.getcwd(), "", wildcard, wx.FD_OPEN) as dialog:
+            if dialog.ShowModal() == wx.ID_CANCEL:
+                return False
+            elif self._promptSaveChanges():
+                return self._import(f, newDirty, dialog.GetPath())
+    # }}}
+    # {{{ _promptSaveChanges(self)
+    def _promptSaveChanges(self):
+        if self.parentCanvas.dirty:
+            message = "Do you want to save changes to {}?".format(self.canvasPathName if self.canvasPathName != None else "(Untitled)")
+            with wx.MessageDialog(self.parentCanvas, message, "", wx.CANCEL | wx.CANCEL_DEFAULT | wx.ICON_QUESTION | wx.YES_NO) as dialog:
+                dialogChoice = dialog.ShowModal()
+                if dialogChoice == wx.ID_CANCEL:
+                    return False
+                elif dialogChoice == wx.ID_NO:
+                    return True
+                elif dialogChoice == wx.ID_YES:
+                    return self.canvasSaveAs(None) if self.canvasPathName == None else self.canvasSave(None)
+                else:
+                    return False
+        else:
+            return True
+    # }}}
+
+    # {{{ canvasExit(self, event)
+    @GuiCommandDecorator("Exit", "E&xit", None, [wx.ACCEL_CTRL, ord("X")], None)
+    def canvasExit(self, event):
+        if self._promptSaveChanges():
+            self.parentFrame.Close(True)
+    # }}}
+    # {{{ canvasExportAsAnsi(self, event)
+    @GuiCommandDecorator("Export as ANSI...", "Export as ANSI...", None, None, None)
+    def canvasExportAsAnsi(self, event):
+        with wx.FileDialog(self.parentFrame, "Save As...", os.getcwd(), "", "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
+            if dialog.ShowModal() == wx.ID_CANCEL:
+                return False
+            else:
+                outPathName = dialog.GetPath()
+                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+                with open(outPathName, "w", encoding="utf-8") as outFile:
+                    self.parentCanvas.canvas.exportStore.exportAnsiFile(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size, outFile)
+                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+                return True
+    # }}}
+    # {{{ canvasExportAsPng(self, event)
+    @GuiCommandDecorator("Export as PNG...", "Export as PN&G...", None, None, None)
+    def canvasExportAsPng(self, event):
+        with wx.FileDialog(self.parentFrame, "Save As...", os.getcwd(), "", "PNG (*.png)|*.png|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
+            if dialog.ShowModal() == wx.ID_CANCEL:
+                return False
+            else:
+                outPathName = dialog.GetPath()
+                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+                self.parentCanvas.canvas.exportStore.exportBitmapToPngFile(self.parentCanvas.backend.canvasBitmap, outPathName, wx.BITMAP_TYPE_PNG)
+                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+                return True
+    # }}}
+    # {{{ canvasExportImgur(self, event)
+    @GuiCommandDecorator("Export to Imgur...", "Export to I&mgur...", None, None, haveImgurApiKey and haveUrllib)
+    def canvasExportImgur(self, event):
+        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+        rc, status, result = self.parentCanvas.canvas.exportStore.exportBitmapToImgur(self.imgurApiKey, self.parentCanvas.backend.canvasBitmap, "", "", wx.BITMAP_TYPE_PNG)
+        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+        if rc:
+            if not wx.TheClipboard.IsOpened():
+                wx.TheClipboard.Open(); wx.TheClipboard.SetData(wx.TextDataObject(result)); wx.TheClipboard.Close();
+            wx.MessageBox("Exported to Imgur: {}".format(result), "Export to Imgur", wx.ICON_INFORMATION | wx.OK)
+        else:
+            wx.MessageBox("Failed to export to Imgur: {}".format(result), "Export to Imgur", wx.ICON_EXCLAMATION | wx.OK)
+    # }}}
+    # {{{ canvasExportPastebin(self, event)
+    @GuiCommandDecorator("Export to Pastebin...", "Export to Pasteb&in...", None, None, haveUrllib)
+    def canvasExportPastebin(self, event):
+        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+        pasteStatus, pasteResult = self.parentCanvas.canvas.exportStore.exportPastebin("", self.parentCanvas.canvas.map, self.parentCanvas.canvas.size)
+        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+        if pasteStatus:
+            if not wx.TheClipboard.IsOpened():
+                wx.TheClipboard.Open()
+                wx.TheClipboard.SetData(wx.TextDataObject(pasteResult))
+                wx.TheClipboard.Close()
+            wx.MessageBox("Exported to Pastebin: " + pasteResult, "Export to Pastebin", wx.OK|wx.ICON_INFORMATION)
+        else:
+            wx.MessageBox("Failed to export to Pastebin: " + pasteResult, "Export to Pastebin", wx.OK|wx.ICON_EXCLAMATION)
+    # }}}
+    # {{{ canvasExportToClipboard(self, event)
+    @GuiCommandDecorator("Export to clipboard", "&Export to clipboard", None, None, None)
+    def canvasExportToClipboard(self, event):
+        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+        rc, outBuffer = self.parentCanvas.canvas.exportStore.exportTextBuffer(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size)
+        if rc and wx.TheClipboard.Open():
+            wx.TheClipboard.SetData(wx.TextDataObject(outBuffer))
+            wx.TheClipboard.Close()
+        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+        return True
+    # }}}
+    # {{{ canvasImportAnsi(self, event)
+    @GuiCommandDecorator("Import ANSI...", "Import ANSI...", None, None, None)
+    def canvasImportAnsi(self, event):
+        def canvasImportAnsi_(pathName):
+            rc, error = self.parentCanvas.canvas.importStore.importAnsiFile(pathName)
+            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
+        self._importFile(canvasImportAnsi_, True, "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
+    # }}}
+    # {{{ canvasImportFromClipboard(self, event)
+    @GuiCommandDecorator("Import from clipboard", "&Import from clipboard", None, None, None)
+    def canvasImportFromClipboard(self, event):
+        def canvasImportFromClipboard_(pathName):
+            if  wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT))  \
+            and wx.TheClipboard.Open():
+                inBuffer = wx.TextDataObject()
+                if wx.TheClipboard.GetData(inBuffer):
+                    if self._promptSaveChanges():
+                        rc, error = self.parentCanvas.canvas.importStore.importTextBuffer(io.StringIO(inBuffer.GetText()))
+                wx.TheClipboard.Close()
+            else:
+                rc, error = False, "Clipboard does not contain text data and/or cannot be opened"
+            return (rc, error, self.parentCanvas.canvas.importStore.outMap, None, self.parentCanvas.canvas.importStore.inSize)
+        if self._promptSaveChanges():
+            self._import(canvasImportFromClipboard_, True, None)
+    # }}}
+    # {{{ canvasImportSauce(self, event)
+    @GuiCommandDecorator("Import SAUCE...", "Import SAUCE...", None, None, None)
+    def canvasImportSauce(self, event):
+        def canvasImportSauce_(pathName):
+            rc, error = self.parentCanvas.canvas.importStore.importSauceFile(pathName)
+            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
+        self._importFile(canvasImportSauce_, True, "SAUCE files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
+    # }}}
+    # {{{ canvasNew(self, event, newCanvasSize=None)
+    @GuiCommandDecorator("New", "&New", ["", wx.ART_NEW], [wx.ACCEL_CTRL, ord("N")], None)
+    def canvasNew(self, event, newCanvasSize=None):
+        def canvasImportEmpty(pathName):
+            nonlocal newCanvasSize
+            if newCanvasSize == None:
+                newCanvasSize = list(self.parentCanvas.canvas.size)
+            newMap = [[[1, 1, 0, " "] for x in range(newCanvasSize[0])] for y in range(newCanvasSize[1])]
+            return (True, "", newMap, None, newCanvasSize)
+        if self._promptSaveChanges():
+            self._import(canvasImportEmpty, False, None)
+    # }}}
+    # {{{ canvasOpen(self, event)
+    @GuiCommandDecorator("Open", "&Open", ["", wx.ART_FILE_OPEN], [wx.ACCEL_CTRL, ord("O")], None)
+    def canvasOpen(self, event):
+        def canvasImportmIRC(pathName):
+            rc, error = self.parentCanvas.canvas.importStore.importTextFile(pathName)
+            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
+        self._importFile(canvasImportmIRC, False, "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*")
+    # }}}
+    # {{{ canvasSave(self, event)
+    @GuiCommandDecorator("Save", "&Save", ["", wx.ART_FILE_SAVE], [wx.ACCEL_CTRL, ord("S")], None)
+    def canvasSave(self, event):
+        if self.canvasPathName == None:
+            if self.canvasSaveAs(event) == False:
+                return False
+        try:
+            with open(self.canvasPathName, "w", encoding="utf-8") as outFile:
+                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+                self.parentCanvas.canvas.exportStore.exportTextFile(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size, outFile)
+                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
+                self.parentCanvas.dirty = False
+                self.update(dirty=self.parentCanvas.dirty)
+            return True
+        except IOError as error:
+            return False
+    # }}}
+    # {{{ canvasSaveAs(self, event)
+    @GuiCommandDecorator("Save As...", "Save &As...", ["", wx.ART_FILE_SAVE_AS], None, None)
+    def canvasSaveAs(self, event):
+        with wx.FileDialog(self.parentCanvas, "Save As", os.getcwd(), "", "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
+            if dialog.ShowModal() == wx.ID_CANCEL:
+                return False
+            else:
+                self.canvasPathName = dialog.GetPath()
+                return self.canvasSave(event)
+    # }}}
+
+    #
+    # __init__(self)
+    def __init__(self):
+        self.imgurApiKey = ImgurApiKey.imgurApiKey if haveImgurApiKey else None
+        self.accels = (self.canvasExit, self.canvasNew, self.canvasOpen, self.canvasSave)
+        self.menus = (
+            ("&File",
+                self.canvasNew, self.canvasOpen, self.canvasSave, self.canvasSaveAs, NID_MENU_SEP,
+                self.canvasExportAsAnsi, self.canvasExportToClipboard, self.canvasExportImgur, self.canvasExportPastebin, self.canvasExportAsPng, NID_MENU_SEP,
+                self.canvasImportAnsi, self.canvasImportFromClipboard, self.canvasImportSauce, NID_MENU_SEP,
+                self.canvasExit,
+            ),
+        )
+        self.toolBars = ()
+
+# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasCommandsHelp.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+#
+# RoarCanvasCommandsHelp.py
+# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+#
+
+from GuiFrame import GuiCommandDecorator
+from RoarWindowAbout import RoarWindowAbout
+
+class RoarCanvasCommandsHelp():
+    # {{{ canvasAbout(self, event)
+    @GuiCommandDecorator("About", "&About", None, None, True)
+    def canvasAbout(self, event):
+        RoarWindowAbout(self.parentFrame)
+    # }}}
+
+    #
+    # __init__(self)
+    def __init__(self):
+        self.accels, self.menus, self.toolBars = (), (("&Help", self.canvasAbout,),), ()
+
+# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasCommandsTools.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# RoarCanvasCommandsTools.py
+# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+#
+
+from GuiFrame import GuiSelectDecorator
+from ToolCircle import ToolCircle
+from ToolFill import ToolFill
+from ToolLine import ToolLine
+from ToolRect import ToolRect
+from ToolSelectClone import ToolSelectClone
+from ToolSelectMove import ToolSelectMove
+from ToolText import ToolText
+import wx
+
+class RoarCanvasCommandsTools():
+    # {{{ canvasTool(self, f, idx)
+    @GuiSelectDecorator(0, "Circle", "&Circle", ["toolCircle.png"], [wx.ACCEL_CTRL, ord("C")], False)
+    @GuiSelectDecorator(1, "Clone", "Cl&one", ["toolClone.png"], [wx.ACCEL_CTRL, ord("E")], False)
+    @GuiSelectDecorator(2, "Fill", "&Fill", ["toolFill.png"], [wx.ACCEL_CTRL, ord("F")], False)
+    @GuiSelectDecorator(3, "Line", "&Line", ["toolLine.png"], [wx.ACCEL_CTRL, ord("L")], False)
+    @GuiSelectDecorator(4, "Move", "&Move", ["toolMove.png"], [wx.ACCEL_CTRL, ord("M")], False)
+    @GuiSelectDecorator(5, "Rectangle", "&Rectangle", ["toolRect.png"], [wx.ACCEL_CTRL, ord("R")], True)
+    @GuiSelectDecorator(6, "Text", "&Text", ["toolText.png"], [wx.ACCEL_CTRL, ord("T")], False)
+    def canvasTool(self, f, idx):
+        def canvasTool_(event):
+            self.currentTool = [ToolCircle, ToolSelectClone, ToolFill, ToolLine, ToolSelectMove, ToolRect, ToolText][idx](self.parentCanvas)
+            self.parentFrame.menuItemsById[self.canvasTool.attrList[idx]["id"]].Check(True)
+            toolBar = self.parentFrame.toolBarItemsById[self.canvasTool.attrList[idx]["id"]].GetToolBar()
+            toolBar.ToggleTool(self.canvasTool.attrList[idx]["id"], True)
+            self.update(toolName=self.currentTool.name)
+            viewRect = self.parentCanvas.GetViewStart()
+            eventDc = self.parentCanvas.backend.getDeviceContext(self.parentCanvas, viewRect)
+            self.parentCanvas.applyTool(eventDc, True, None, None, self.parentCanvas.brushPos, False, False, False, self.currentTool, viewRect)
+        setattr(canvasTool_, "attrDict", f.attrList[idx])
+        setattr(canvasTool_, "isSelect", True)
+        return canvasTool_
+    # }}}
+
+    #
+    # __init__(self)
+    def __init__(self):
+        self.accels = (self.canvasTool(self.canvasTool, 5), self.canvasTool(self.canvasTool, 0), self.canvasTool(self.canvasTool, 2), self.canvasTool(self.canvasTool, 3), self.canvasTool(self.canvasTool, 6), self.canvasTool(self.canvasTool, 1), self.canvasTool(self.canvasTool, 4),)
+        self.menus = (
+            ("&Tools",
+                self.canvasTool(self.canvasTool, 5), self.canvasTool(self.canvasTool, 0), self.canvasTool(self.canvasTool, 2), self.canvasTool(self.canvasTool, 3), self.canvasTool(self.canvasTool, 6), self.canvasTool(self.canvasTool, 1), self.canvasTool(self.canvasTool, 4),
+            ),
+        )
+        self.toolBars = ()
+
+# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasInterface.py

@@ -1,515 +0,0 @@
-#!/usr/bin/env python3
-#
-# RoarCanvasInterface.py
-# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
-#
-
-try:
-    from ImgurApiKey import ImgurApiKey
-    haveImgurApiKey = True
-except ImportError:
-    haveImgurApiKey = False
-
-try:
-    import base64, json, requests, urllib.request
-    haveUrllib = True
-except ImportError:
-    haveUrllib = False
-
-from ToolCircle import ToolCircle
-from ToolFill import ToolFill
-from ToolLine import ToolLine
-from ToolRect import ToolRect
-from ToolSelectClone import ToolSelectClone
-from ToolSelectMove import ToolSelectMove
-from ToolText import ToolText
-
-from GuiCanvasColours import Colours
-from GuiFrame import GuiCommandDecorator, GuiCommandListDecorator, GuiSelectDecorator, NID_MENU_SEP, NID_TOOLBAR_HSEP
-from RoarClientAboutWindow import RoarClientAboutWindow
-import io, os, sys, wx
-
-class RoarCanvasInterface():
-    # {{{ _import(self, f, newDirty, pathName)
-    def _import(self, f, newDirty, pathName):
-        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-        rc, error, newMap, newPathName, newSize = f(pathName)
-        if rc:
-            self.parentCanvas.dirty = newDirty
-            self.parentCanvas.update(newSize, False, newMap)
-            self.canvasPathName = newPathName
-            self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
-            self.parentCanvas.canvas.journal.resetCursor()
-            self.parentCanvas.canvas.journal.resetUndo()
-        else:
-            with wx.MessageDialog(self.parentCanvas, "Error: {}".format(error), "", wx.OK | wx.OK_DEFAULT) as dialog:
-                dialogChoice = dialog.ShowModal()
-        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-        return rc
-    # }}}
-    # {{{ _importFile(self, f, newDirty, wildcard)
-    def _importFile(self, f, newDirty, wildcard):
-        with wx.FileDialog(self.parentCanvas, "Open", os.getcwd(), "", wildcard, wx.FD_OPEN) as dialog:
-            if dialog.ShowModal() == wx.ID_CANCEL:
-                return False
-            elif self._promptSaveChanges():
-                return self._import(f, newDirty, dialog.GetPath())
-    # }}}
-    # {{{ _initColourBitmaps(self)
-    def _initColourBitmaps(self):
-        for numColour in range(len(self.canvasColour.attrList)):
-            if numColour < len(Colours):
-                toolBitmapColour = Colours[numColour][0:4]
-                toolBitmap = wx.Bitmap((16, 16))
-                toolBitmapDc = wx.MemoryDC(); toolBitmapDc.SelectObject(toolBitmap);
-                toolBitmapBrush = wx.Brush(wx.Colour(toolBitmapColour), wx.BRUSHSTYLE_SOLID)
-                toolBitmapDc.SetBrush(toolBitmapBrush)
-                toolBitmapDc.SetBackground(toolBitmapBrush)
-                toolBitmapDc.SetPen(wx.Pen(wx.Colour(toolBitmapColour), 1))
-                toolBitmapDc.DrawRectangle(0, 0, 16, 16)
-            self.canvasColour.attrList[numColour]["icon"] = ["", None, toolBitmap]
-        toolBitmapColours = ((0, 0, 0, 255), (255, 255, 255, 255))
-        toolBitmap = wx.Bitmap((16, 16))
-        toolBitmapDc = wx.MemoryDC(); toolBitmapDc.SelectObject(toolBitmap);
-        toolBitmapBrush = [wx.Brush(wx.Colour(c), wx.BRUSHSTYLE_SOLID) for c in toolBitmapColours]
-        toolBitmapDc.SetBrush(toolBitmapBrush[1])
-        toolBitmapDc.SetBackground(toolBitmapBrush[1])
-        toolBitmapDc.SetPen(wx.Pen(wx.Colour(toolBitmapColours[1]), 1))
-        toolBitmapDc.DrawRectangle(0, 0, 8, 8)
-        toolBitmapDc.DrawRectangle(8, 8, 16, 16)
-        self.canvasColourAlpha.attrList[0]["icon"] = ["", None, toolBitmap]
-    # }}}
-    # {{{ _promptSaveChanges(self)
-    def _promptSaveChanges(self):
-        if self.parentCanvas.dirty:
-           with wx.MessageDialog(self.parentCanvas,                                                                                    \
-                        "Do you want to save changes to {}?".format(self.canvasPathName if self.canvasPathName != None else "(Untitled)"),  \
-                        "", wx.CANCEL|wx.CANCEL_DEFAULT|wx.ICON_QUESTION|wx.YES_NO) as dialog:
-                dialogChoice = dialog.ShowModal()
-                if dialogChoice == wx.ID_CANCEL:
-                    return False
-                elif dialogChoice == wx.ID_NO:
-                    return True
-                elif dialogChoice == wx.ID_YES:
-                    return self.canvasSaveAs(None) if self.canvasPathName == None else self.canvasSave(None)
-                else:
-                    return False
-        else:
-            return True
-    # }}}
-
-    # {{{ canvasAbout(self, event)
-    @GuiCommandDecorator("About", "&About", None, None, True)
-    def canvasAbout(self, event):
-        RoarClientAboutWindow(self.parentFrame)
-    # }}}
-    # {{{ canvasBrush(self, f, idx)
-    @GuiSelectDecorator(0, "Solid brush", "Solid brush", None, None, True)
-    def canvasBrush(self, f, idx):
-        def canvasBrush_(self, event):
-            pass
-        setattr(canvasBrush_, "attrDict", f.attrList[idx])
-        setattr(canvasBrush_, "isSelect", True)
-        return canvasBrush_
-    # }}}
-    # {{{ canvasColour(self, f, idx)
-    @GuiSelectDecorator(0, "Colour #00", "Colour #00 (Bright White)", None, None, False)
-    @GuiSelectDecorator(1, "Colour #01", "Colour #01 (Black)", None, None, False)
-    @GuiSelectDecorator(2, "Colour #02", "Colour #02 (Blue)", None, None, False)
-    @GuiSelectDecorator(3, "Colour #03", "Colour #03 (Green)", None, None, False)
-    @GuiSelectDecorator(4, "Colour #04", "Colour #04 (Red)", None, None, False)
-    @GuiSelectDecorator(5, "Colour #05", "Colour #05 (Light Red)", None, None, False)
-    @GuiSelectDecorator(6, "Colour #06", "Colour #06 (Pink)", None, None, False)
-    @GuiSelectDecorator(7, "Colour #07", "Colour #07 (Yellow)", None, None, False)
-    @GuiSelectDecorator(8, "Colour #08", "Colour #08 (Light Yellow)", None, None, False)
-    @GuiSelectDecorator(9, "Colour #09", "Colour #09 (Light Green)", None, None, False)
-    @GuiSelectDecorator(10, "Colour #10", "Colour #10 (Cyan)", None, None, False)
-    @GuiSelectDecorator(11, "Colour #11", "Colour #11 (Light Cyan)", None, None, False)
-    @GuiSelectDecorator(12, "Colour #12", "Colour #12 (Light Blue)", None, None, False)
-    @GuiSelectDecorator(13, "Colour #13", "Colour #13 (Light Pink)", None, None, False)
-    @GuiSelectDecorator(14, "Colour #14", "Colour #14 (Grey)", None, None, False)
-    @GuiSelectDecorator(15, "Colour #15", "Colour #15 (Light Grey)", None, None, False)
-    def canvasColour(self, f, idx):
-        def canvasColour_(self, event):
-            if event.GetEventType() == wx.wxEVT_TOOL:
-                self.parentCanvas.brushColours[0] = idx
-            elif event.GetEventType() == wx.wxEVT_TOOL_RCLICKED:
-                self.parentCanvas.brushColours[1] = idx
-            self.update(colours=self.parentCanvas.brushColours)
-        setattr(canvasColour_, "attrDict", f.attrList[idx])
-        setattr(canvasColour_, "isSelect", True)
-        return canvasColour_
-    # }}}
-    # {{{ canvasColourAlpha(self, f, idx)
-    @GuiSelectDecorator(0, "Transparent colour", "Transparent colour", None, None, False)
-    def canvasColourAlpha(self, f, idx):
-        def canvasColourAlpha_(self, event):
-            if event.GetEventType() == wx.wxEVT_TOOL:
-                self.parentCanvas.brushColours[0] = -1
-            elif event.GetEventType() == wx.wxEVT_TOOL_RCLICKED:
-                self.parentCanvas.brushColours[1] = -1
-            self.update(colours=self.parentCanvas.brushColours)
-        setattr(canvasColourAlpha_, "attrDict", f.attrList[idx])
-        setattr(canvasColourAlpha_, "isSelect", True)
-        return canvasColourAlpha_
-    # }}}
-    # {{{ canvasCopy(self, event)
-    @GuiCommandDecorator("Copy", "&Copy", ["", wx.ART_COPY], None, False)
-    def canvasCopy(self, event):
-        pass
-    # }}}
-    # {{{ canvasCut(self, event)
-    @GuiCommandDecorator("Cut", "Cu&t", ["", wx.ART_CUT], None, False)
-    def canvasCut(self, event):
-        pass
-    # }}}
-    # {{{ canvasDelete(self, event)
-    @GuiCommandDecorator("Delete", "De&lete", ["", wx.ART_DELETE], None, False)
-    def canvasDelete(self, event):
-        pass
-    # }}}
-    # {{{ canvasExit(self, event)
-    @GuiCommandDecorator("Exit", "E&xit", None, [wx.ACCEL_CTRL, ord("X")], None)
-    def canvasExit(self, event):
-        if self._promptSaveChanges():
-            self.parentFrame.Close(True)
-    # }}}
-    # {{{ canvasNew(self, event, newCanvasSize=None)
-    @GuiCommandDecorator("New", "&New", ["", wx.ART_NEW], [wx.ACCEL_CTRL, ord("N")], None)
-    def canvasNew(self, event, newCanvasSize=None):
-        def canvasImportEmpty(pathName):
-            nonlocal newCanvasSize
-            if newCanvasSize == None:
-                newCanvasSize = list(self.parentCanvas.canvas.size)
-            newMap = [[[1, 1, 0, " "] for x in range(newCanvasSize[0])] for y in range(newCanvasSize[1])]
-            return (True, "", newMap, None, newCanvasSize)
-        if self._promptSaveChanges():
-            self._import(canvasImportEmpty, False, None)
-    # }}}
-    # {{{ canvasOpen(self, event)
-    @GuiCommandDecorator("Open", "&Open", ["", wx.ART_FILE_OPEN], [wx.ACCEL_CTRL, ord("O")], None)
-    def canvasOpen(self, event):
-        def canvasImportmIRC(pathName):
-            rc, error = self.parentCanvas.canvas.importStore.importTextFile(pathName)
-            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
-        self._importFile(canvasImportmIRC, False, "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*")
-    # }}}
-    # {{{ canvasPaste(self, event)
-    @GuiCommandDecorator("Paste", "&Paste", ["", wx.ART_PASTE], None, False)
-    def canvasPaste(self, event):
-        pass
-    # }}}
-    # {{{ canvasRedo(self, event)
-    @GuiCommandDecorator("Redo", "&Redo", ["", wx.ART_REDO], [wx.ACCEL_CTRL, ord("Y")], False)
-    def canvasRedo(self, event):
-        self.parentCanvas.dispatchDeltaPatches(self.parentCanvas.canvas.journal.popRedo())
-        self.update(size=self.parentCanvas.canvas.size, undoLevel=self.parentCanvas.canvas.journal.patchesUndoLevel)
-    # }}}
-    # {{{ canvasSave(self, event)
-    @GuiCommandDecorator("Save", "&Save", ["", wx.ART_FILE_SAVE], [wx.ACCEL_CTRL, ord("S")], None)
-    def canvasSave(self, event):
-        if self.canvasPathName == None:
-            if self.canvasSaveAs(event) == False:
-                return False
-        try:
-            with open(self.canvasPathName, "w", encoding="utf-8") as outFile:
-                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-                self.parentCanvas.canvas.exportStore.exportTextFile(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size, outFile)
-                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-                self.parentCanvas.dirty = False
-                self.update(dirty=self.parentCanvas.dirty)
-            return True
-        except IOError as error:
-            return False
-    # }}}
-    # {{{ canvasSaveAs(self, event)
-    @GuiCommandDecorator("Save As...", "Save &As...", ["", wx.ART_FILE_SAVE_AS], None, None)
-    def canvasSaveAs(self, event):
-        with wx.FileDialog(self.parentCanvas, "Save As", os.getcwd(), "", "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
-            if dialog.ShowModal() == wx.ID_CANCEL:
-                return False
-            else:
-                self.canvasPathName = dialog.GetPath()
-                return self.canvasSave(event)
-    # }}}
-    # {{{ canvasUndo(self, event)
-    @GuiCommandDecorator("Undo", "&Undo", ["", wx.ART_UNDO], [wx.ACCEL_CTRL, ord("Z")], False)
-    def canvasUndo(self, event):
-        self.parentCanvas.dispatchDeltaPatches(self.parentCanvas.canvas.journal.popUndo())
-        self.update(size=self.parentCanvas.canvas.size, undoLevel=self.parentCanvas.canvas.journal.patchesUndoLevel)
-    # }}}
-
-    # {{{ canvasBrushSize(self, f, dimension, incrFlag)
-    @GuiCommandListDecorator(0, "Decrease brush width", "Decrease brush width", ["toolDecrBrushW.png"], None, None)
-    @GuiCommandListDecorator(1, "Decrease brush height", "Decrease brush height", ["toolDecrBrushH.png"], None, None)
-    @GuiCommandListDecorator(2, "Decrease brush size", "Decrease brush size", ["toolDecrBrushHW.png"], None, None)
-    @GuiCommandListDecorator(3, "Increase brush width", "Increase brush width", ["toolIncrBrushW.png"], None, None)
-    @GuiCommandListDecorator(4, "Increase brush height", "Increase brush height", ["toolIncrBrushH.png"], None, None)
-    @GuiCommandListDecorator(5, "Increase brush size", "Increase brush size", ["toolIncrBrushHW.png"], None, None)
-    def canvasBrushSize(self, f, dimension, incrFlag):
-        def canvasBrushSize_(self, event):
-            if (dimension < 2) and not incrFlag:
-                if self.parentCanvas.brushSize[dimension] > 1:
-                    self.parentCanvas.brushSize[dimension] -= 1
-                    self.update(brushSize=self.parentCanvas.brushSize)
-            elif (dimension < 2) and incrFlag:
-                self.parentCanvas.brushSize[dimension] += 1
-                self.update(brushSize=self.parentCanvas.brushSize)
-            elif dimension == 2:
-                [self.canvasBrushSize(f, dimension_, incrFlag)(self, None) for dimension_ in [0, 1]]
-        setattr(canvasBrushSize_, "attrDict", f.attrList[dimension + (0 if not incrFlag else 3)])
-        return canvasBrushSize_
-    # }}}
-    # {{{ canvasCanvasSize(self, f, dimension, incrFlag)
-    @GuiCommandListDecorator(0, "Decrease canvas height", "Decrease canvas height", ["toolDecrCanvasH.png"], None, None)
-    @GuiCommandListDecorator(1, "Decrease canvas width", "Decrease canvas width", ["toolDecrCanvasW.png"], None, None)
-    @GuiCommandListDecorator(2, "Decrease canvas size", "Decrease canvas size", ["toolDecrCanvasHW.png"], None, None)
-    @GuiCommandListDecorator(3, "Increase canvas height", "Increase canvas height", ["toolIncrCanvasH.png"], None, None)
-    @GuiCommandListDecorator(4, "Increase canvas width", "Increase canvas width", ["toolIncrCanvasW.png"], None, None)
-    @GuiCommandListDecorator(5, "Increase canvas size", "Increase canvas size", ["toolIncrCanvasHW.png"], None, None)
-    def canvasCanvasSize(self, f, dimension, incrFlag):
-        def canvasCanvasSize_(self, event):
-            if (dimension < 2) and not incrFlag:
-                if dimension == 0:
-                    if self.parentCanvas.canvas.size[1] > 1:
-                        self.parentCanvas.resize([self.parentCanvas.canvas.size[0], self.parentCanvas.canvas.size[1] - 1])
-                elif dimension == 1:
-                    if self.parentCanvas.canvas.size[0] > 1:
-                        self.parentCanvas.resize([self.parentCanvas.canvas.size[0] - 1, self.parentCanvas.canvas.size[1]])
-            elif (dimension < 2) and incrFlag:
-                if dimension == 0:
-                    self.parentCanvas.resize([self.parentCanvas.canvas.size[0], self.parentCanvas.canvas.size[1] + 1])
-                elif dimension == 1:
-                    self.parentCanvas.resize([self.parentCanvas.canvas.size[0] + 1, self.parentCanvas.canvas.size[1]])
-            elif dimension == 2:
-                [self.canvasCanvasSize(f, dimension_, incrFlag)(self, None) for dimension_ in [0, 1]]
-        setattr(canvasCanvasSize_, "attrDict", f.attrList[dimension + (0 if not incrFlag else 3)])
-        return canvasCanvasSize_
-    # }}}
-    # {{{ canvasTool(self, f, idx)
-    @GuiSelectDecorator(0, "Circle", "&Circle", ["toolCircle.png"], [wx.ACCEL_CTRL, ord("C")], False)
-    @GuiSelectDecorator(1, "Clone", "Cl&one", ["toolClone.png"], [wx.ACCEL_CTRL, ord("E")], False)
-    @GuiSelectDecorator(2, "Fill", "&Fill", ["toolFill.png"], [wx.ACCEL_CTRL, ord("F")], False)
-    @GuiSelectDecorator(3, "Line", "&Line", ["toolLine.png"], [wx.ACCEL_CTRL, ord("L")], False)
-    @GuiSelectDecorator(4, "Move", "&Move", ["toolMove.png"], [wx.ACCEL_CTRL, ord("M")], False)
-    @GuiSelectDecorator(5, "Rectangle", "&Rectangle", ["toolRect.png"], [wx.ACCEL_CTRL, ord("R")], True)
-    @GuiSelectDecorator(6, "Text", "&Text", ["toolText.png"], [wx.ACCEL_CTRL, ord("T")], False)
-    def canvasTool(self, f, idx):
-        def canvasTool_(self, event):
-            self.currentTool = [ToolCircle, ToolSelectClone, ToolFill, ToolLine, ToolSelectMove, ToolRect, ToolText][idx](self.parentCanvas)
-            self.parentFrame.menuItemsById[self.canvasTool.attrList[idx]["id"]].Check(True)
-            toolBar = self.parentFrame.toolBarItemsById[self.canvasTool.attrList[idx]["id"]].GetToolBar()
-            toolBar.ToggleTool(self.canvasTool.attrList[idx]["id"], True)
-            self.update(toolName=self.currentTool.name)
-            viewRect = self.parentCanvas.GetViewStart()
-            eventDc = self.parentCanvas.backend.getDeviceContext(self.parentCanvas, viewRect)
-            self.parentCanvas.applyTool(eventDc, True, None, None, self.parentCanvas.brushPos, False, False, False, self.currentTool, viewRect)
-        setattr(canvasTool_, "attrDict", f.attrList[idx])
-        setattr(canvasTool_, "isSelect", True)
-        return canvasTool_
-    # }}}
-
-    # {{{ canvasExportAsAnsi(self, event)
-    @GuiCommandDecorator("Export as ANSI...", "Export as ANSI...", None, None, None)
-    def canvasExportAsAnsi(self, event):
-        with wx.FileDialog(self.parentFrame, "Save As...", os.getcwd(), "", "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
-            if dialog.ShowModal() == wx.ID_CANCEL:
-                return False
-            else:
-                outPathName = dialog.GetPath()
-                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-                with open(outPathName, "w", encoding="utf-8") as outFile:
-                    self.parentCanvas.canvas.exportStore.exportAnsiFile(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size, outFile)
-                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-                return True
-    # }}}
-    # {{{ canvasExportAsPng(self, event)
-    @GuiCommandDecorator("Export as PNG...", "Export as PN&G...", None, None, None)
-    def canvasExportAsPng(self, event):
-        with wx.FileDialog(self.parentFrame, "Save As...", os.getcwd(), "", "PNG (*.png)|*.png|All Files (*.*)|*.*", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dialog:
-            if dialog.ShowModal() == wx.ID_CANCEL:
-                return False
-            else:
-                outPathName = dialog.GetPath()
-                self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-                self.parentCanvas.canvas.exportStore.exportBitmapToPngFile(self.parentCanvas.backend.canvasBitmap, outPathName, wx.BITMAP_TYPE_PNG)
-                self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-                return True
-    # }}}
-    # {{{ canvasExportImgur(self, event)
-    @GuiCommandDecorator("Export to Imgur...", "Export to I&mgur...", None, None, haveImgurApiKey and haveUrllib)
-    def canvasExportImgur(self, event):
-        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-        rc, status, result = self.parentCanvas.canvas.exportStore.exportBitmapToImgur(self.imgurApiKey, self.parentCanvas.backend.canvasBitmap, "", "", wx.BITMAP_TYPE_PNG)
-        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-        if rc:
-            if not wx.TheClipboard.IsOpened():
-                wx.TheClipboard.Open(); wx.TheClipboard.SetData(wx.TextDataObject(result)); wx.TheClipboard.Close();
-            wx.MessageBox("Exported to Imgur: {}".format(result), "Export to Imgur", wx.ICON_INFORMATION | wx.OK)
-        else:
-            wx.MessageBox("Failed to export to Imgur: {}".format(result), "Export to Imgur", wx.ICON_EXCLAMATION | wx.OK)
-    # }}}
-    # {{{ canvasExportPastebin(self, event)
-    @GuiCommandDecorator("Export to Pastebin...", "Export to Pasteb&in...", None, None, haveUrllib)
-    def canvasExportPastebin(self, event):
-        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-        pasteStatus, pasteResult = self.parentCanvas.canvas.exportStore.exportPastebin("", self.parentCanvas.canvas.map, self.parentCanvas.canvas.size)
-        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-        if pasteStatus:
-            if not wx.TheClipboard.IsOpened():
-                wx.TheClipboard.Open()
-                wx.TheClipboard.SetData(wx.TextDataObject(pasteResult))
-                wx.TheClipboard.Close()
-            wx.MessageBox("Exported to Pastebin: " + pasteResult, "Export to Pastebin", wx.OK|wx.ICON_INFORMATION)
-        else:
-            wx.MessageBox("Failed to export to Pastebin: " + pasteResult, "Export to Pastebin", wx.OK|wx.ICON_EXCLAMATION)
-    # }}}
-    # {{{ canvasExportToClipboard(self, event)
-    @GuiCommandDecorator("Export to clipboard", "&Export to clipboard", None, None, None)
-    def canvasExportToClipboard(self, event):
-        self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
-        rc, outBuffer = self.parentCanvas.canvas.exportStore.exportTextBuffer(self.parentCanvas.canvas.map, self.parentCanvas.canvas.size)
-        if rc and wx.TheClipboard.Open():
-            wx.TheClipboard.SetData(wx.TextDataObject(outBuffer))
-            wx.TheClipboard.Close()
-        self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
-        return True
-    # }}}
-    # {{{ canvasImportAnsi(self, event)
-    @GuiCommandDecorator("Import ANSI...", "Import ANSI...", None, None, None)
-    def canvasImportAnsi(self, event):
-        def canvasImportAnsi_(pathName):
-            rc, error = self.parentCanvas.canvas.importStore.importAnsiFile(pathName)
-            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
-        self._importFile(canvasImportAnsi_, True, "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
-    # }}}
-    # {{{ canvasImportFromClipboard(self, event)
-    @GuiCommandDecorator("Import from clipboard", "&Import from clipboard", None, None, None)
-    def canvasImportFromClipboard(self, event):
-        def canvasImportFromClipboard_(pathName):
-            if  wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT))  \
-            and wx.TheClipboard.Open():
-                inBuffer = wx.TextDataObject()
-                if wx.TheClipboard.GetData(inBuffer):
-                    if self._promptSaveChanges():
-                        rc, error = self.parentCanvas.canvas.importStore.importTextBuffer(io.StringIO(inBuffer.GetText()))
-                wx.TheClipboard.Close()
-            else:
-                rc, error = False, "Clipboard does not contain text data and/or cannot be opened"
-            return (rc, error, self.parentCanvas.canvas.importStore.outMap, None, self.parentCanvas.canvas.importStore.inSize)
-        if self._promptSaveChanges():
-            self._import(canvasImportFromClipboard_, True, None)
-    # }}}
-    # {{{ canvasImportSauce(self, event)
-    @GuiCommandDecorator("Import SAUCE...", "Import SAUCE...", None, None, None)
-    def canvasImportSauce(self, event):
-        def canvasImportSauce_(pathName):
-            rc, error = self.parentCanvas.canvas.importStore.importSauceFile(pathName)
-            return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
-        self._importFile(canvasImportSauce_, True, "SAUCE files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
-    # }}}
-
-    # {{{ update(self, **kwargs)
-    def update(self, **kwargs):
-        self.lastPanelState.update(kwargs); textItems = [];
-        if "cellPos" in self.lastPanelState:
-            textItems.append("X: {:03d} Y: {:03d}".format(*self.lastPanelState["cellPos"]))
-        if "size" in self.lastPanelState:
-            textItems.append("W: {:03d} H: {:03d}".format(*self.lastPanelState["size"]))
-        if "brushSize" in self.lastPanelState:
-            textItems.append("Brush: {:02d}x{:02d}".format(*self.lastPanelState["brushSize"]))
-        if "colours" in self.lastPanelState:
-            textItems.append("FG: {:02d}, BG: {:02d}".format(*self.lastPanelState["colours"]))
-            textItems.append("{} on {}".format(
-                Colours[self.lastPanelState["colours"][0]][4] if self.lastPanelState["colours"][0] != -1 else "Transparent",
-                Colours[self.lastPanelState["colours"][1]][4] if self.lastPanelState["colours"][1] != -1 else "Transparent"))
-        if "pathName" in self.lastPanelState:
-            if self.lastPanelState["pathName"] != None:
-                basePathName = os.path.basename(self.lastPanelState["pathName"])
-                textItems.append("Current file: {}".format(basePathName))
-                self.parentFrame.SetTitle("{} - roar".format(basePathName))
-            else:
-                self.parentFrame.SetTitle("roar")
-        if "toolName" in self.lastPanelState:
-            textItems.append("Current tool: {}".format(self.lastPanelState["toolName"]))
-        if  "dirty" in self.lastPanelState  \
-        and self.lastPanelState["dirty"]:
-            textItems.append("*")
-        self.parentFrame.statusBar.SetStatusText(" | ".join(textItems))
-        if "undoLevel" in self.lastPanelState:
-            if self.lastPanelState["undoLevel"] >= 0:
-                self.parentFrame.menuItemsById[self.canvasUndo.attrDict["id"]].Enable(True)
-                toolBar = self.parentFrame.toolBarItemsById[self.canvasUndo.attrDict["id"]].GetToolBar()
-                toolBar.EnableTool(self.canvasUndo.attrDict["id"], True)
-            else:
-                self.parentFrame.menuItemsById[self.canvasUndo.attrDict["id"]].Enable(False)
-                toolBar = self.parentFrame.toolBarItemsById[self.canvasUndo.attrDict["id"]].GetToolBar()
-                toolBar.EnableTool(self.canvasUndo.attrDict["id"], False)
-            if self.lastPanelState["undoLevel"] > 0:
-                self.parentFrame.menuItemsById[self.canvasRedo.attrDict["id"]].Enable(True)
-                toolBar = self.parentFrame.toolBarItemsById[self.canvasRedo.attrDict["id"]].GetToolBar()
-                toolBar.EnableTool(self.canvasRedo.attrDict["id"], True)
-            else:
-                self.parentFrame.menuItemsById[self.canvasRedo.attrDict["id"]].Enable(False)
-                toolBar = self.parentFrame.toolBarItemsById[self.canvasRedo.attrDict["id"]].GetToolBar()
-                toolBar.EnableTool(self.canvasRedo.attrDict["id"], False)
-    # }}}
-
-    # {{{ accels
-    accels = (
-        canvasNew, canvasOpen, canvasSave, canvasExit, canvasUndo, canvasRedo,
-        canvasTool(None, canvasTool, 5), canvasTool(None, canvasTool, 0), canvasTool(None, canvasTool, 2), canvasTool(None, canvasTool, 3), canvasTool(None, canvasTool, 6), canvasTool(None, canvasTool, 1), canvasTool(None, canvasTool, 4),
-    )
-    # }}}
-    # {{{ menus
-    menus = (
-        ("&File",
-            canvasNew, canvasOpen, canvasSave, canvasSaveAs, NID_MENU_SEP,
-            canvasExportAsAnsi, canvasExportToClipboard, canvasExportImgur, canvasExportPastebin, canvasExportAsPng, NID_MENU_SEP,
-            canvasImportAnsi, canvasImportFromClipboard, canvasImportSauce, NID_MENU_SEP,
-            canvasExit,
-        ),
-        ("&Edit",
-            canvasUndo, canvasRedo, NID_MENU_SEP,
-            canvasCut, canvasCopy, canvasPaste,
-            canvasDelete, NID_MENU_SEP,
-            canvasCanvasSize(None, canvasCanvasSize, 1, True), canvasCanvasSize(None, canvasCanvasSize, 1, False), canvasCanvasSize(None, canvasCanvasSize, 0, True), canvasCanvasSize(None, canvasCanvasSize, 0, False), NID_MENU_SEP,
-            canvasCanvasSize(None, canvasCanvasSize, 2, True), canvasCanvasSize(None, canvasCanvasSize, 2, False), NID_MENU_SEP,
-            canvasBrushSize(None, canvasBrushSize, 0, True), canvasBrushSize(None, canvasBrushSize, 0, False), canvasBrushSize(None, canvasBrushSize, 1, True), canvasBrushSize(None, canvasBrushSize, 1, False), NID_MENU_SEP,
-            canvasBrushSize(None, canvasBrushSize, 2, True), canvasBrushSize(None, canvasBrushSize, 2, False), NID_MENU_SEP,
-            canvasBrush(None, canvasBrush, 0),
-        ),
-        ("&Tools",
-            canvasTool(None, canvasTool, 5), canvasTool(None, canvasTool, 0), canvasTool(None, canvasTool, 2), canvasTool(None, canvasTool, 3), canvasTool(None, canvasTool, 6), canvasTool(None, canvasTool, 1), canvasTool(None, canvasTool, 4),),
-        ("&Help",
-            canvasAbout,),
-    )
-    # }}}
-    # {{{ toolBars
-    toolBars = (
-        (canvasNew, canvasOpen, canvasSave, canvasSaveAs, NID_TOOLBAR_HSEP,
-         canvasUndo, canvasRedo, NID_TOOLBAR_HSEP,
-         canvasCut, canvasCopy, canvasPaste, canvasDelete, NID_TOOLBAR_HSEP,
-         canvasCanvasSize(None, canvasCanvasSize, 1, True), canvasCanvasSize(None, canvasCanvasSize, 1, False), canvasCanvasSize(None, canvasCanvasSize, 0, True), canvasCanvasSize(None, canvasCanvasSize, 0, False), NID_TOOLBAR_HSEP,
-         canvasCanvasSize(None, canvasCanvasSize, 2, True), canvasCanvasSize(None, canvasCanvasSize, 2, False), NID_TOOLBAR_HSEP,
-         canvasTool(None, canvasTool, 5), canvasTool(None, canvasTool, 0), canvasTool(None, canvasTool, 2), canvasTool(None, canvasTool, 3), canvasTool(None, canvasTool, 6), canvasTool(None, canvasTool, 1), canvasTool(None, canvasTool, 4),
-        ),
-        (canvasColour(None, canvasColour, 0), canvasColour(None, canvasColour, 1), canvasColour(None, canvasColour, 2), canvasColour(None, canvasColour, 3),
-         canvasColour(None, canvasColour, 4), canvasColour(None, canvasColour, 5), canvasColour(None, canvasColour, 6), canvasColour(None, canvasColour, 7),
-         canvasColour(None, canvasColour, 8), canvasColour(None, canvasColour, 9), canvasColour(None, canvasColour, 10), canvasColour(None, canvasColour, 11),
-         canvasColour(None, canvasColour, 12), canvasColour(None, canvasColour, 13), canvasColour(None, canvasColour, 14), canvasColour(None, canvasColour, 15),
-         canvasColourAlpha(None, canvasColourAlpha, 0), NID_TOOLBAR_HSEP,
-         canvasBrushSize(None, canvasBrushSize, 1, True), canvasBrushSize(None, canvasBrushSize, 0, False), canvasBrushSize(None, canvasBrushSize, 1, True), canvasBrushSize(None, canvasBrushSize, 1, False), NID_TOOLBAR_HSEP,
-         canvasBrushSize(None, canvasBrushSize, 2, True), canvasBrushSize(None, canvasBrushSize, 2, False),
-        ),
-    )
-    # }}}
-
-    #
-    # __init__(self, parentCanvas, parentFrame):
-    def __init__(self, parentCanvas, parentFrame):
-        self.canvasPathName, self.lastPanelState, self.parentCanvas, self.parentFrame = None, {}, parentCanvas, parentFrame
-        self.imgurApiKey = ImgurApiKey.imgurApiKey if haveImgurApiKey else None
-        self._initColourBitmaps()
-
-# vim:expandtab foldmethod=marker sw=4 ts=4 tw=0

libroar/RoarCanvasWindow.py

@@ -30,9 +30,9 @@ class RoarCanvasWindow(GuiWindow):
             rc, dirty = tool.onKeyboardEvent(self.brushColours, self.brushSize, self.dispatchPatchSingle, eventDc, keyChar, keyModifiers, self.brushPos, viewRect)
         if dirty:
             self.dirty = True
-            self.interface.update(dirty=self.dirty, cellPos=self.brushPos, undoLevel=self.canvas.journal.patchesUndoLevel)
+            self.commands.update(dirty=self.dirty, cellPos=self.brushPos, undoLevel=self.canvas.journal.patchesUndoLevel)
         else:
-            self.interface.update(cellPos=mapPoint if mapPoint else self.brushPos)
+            self.commands.update(cellPos=mapPoint if mapPoint else self.brushPos)
         self.canvas.journal.end()
         return rc
     # }}}
@@ -73,7 +73,7 @@ class RoarCanvasWindow(GuiWindow):
                 for numNewRow in range(oldSize[1], newSize[1]):
                     for numNewCol in range(newSize[0]):
                         self._drawPatch(eventDc, False, [numNewCol, numNewRow, 1, 1, 0, " "], viewRect)
-            self.interface.update(size=newSize, undoLevel=self.canvas.journal.patchesUndoLevel)
+            self.commands.update(size=newSize, undoLevel=self.canvas.journal.patchesUndoLevel)
     # }}}
     # {{{ update(self, newSize, commitUndo=True, newCanvas=None)
     def update(self, newSize, commitUndo=True, newCanvas=None):
@@ -89,7 +89,7 @@ class RoarCanvasWindow(GuiWindow):
     def onKeyboardInput(self, event):
         viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self, viewRect);
         keyChar, keyModifiers = chr(event.GetUnicodeKey()), event.GetModifiers()
-        if not self.applyTool(eventDc, False, keyChar, keyModifiers, None, None, None, None, self.interface.currentTool, viewRect):
+        if not self.applyTool(eventDc, False, keyChar, keyModifiers, None, None, None, None, self.commands.currentTool, viewRect):
             event.Skip()
     # }}}
     # {{{ onLeaveWindow(self, event)
@@ -102,7 +102,7 @@ class RoarCanvasWindow(GuiWindow):
         viewRect = self.GetViewStart(); eventDc = self.backend.getDeviceContext(self, viewRect);
         mouseDragging, mouseLeftDown, mouseRightDown = event.Dragging(), event.LeftIsDown(), event.RightIsDown()
         mapPoint = self.backend.xlateEventPoint(event, eventDc, viewRect)
-        if not self.applyTool(eventDc, True, None, None, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, self.interface.currentTool, viewRect):
+        if not self.applyTool(eventDc, True, None, None, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, self.commands.currentTool, viewRect):
             event.Skip()
     # }}}
     # {{{ onPaint(self, event)
@@ -120,10 +120,10 @@ class RoarCanvasWindow(GuiWindow):
     # }}}
 
     #
-    # __init__(self, backend, canvas, cellSize, interface, parent, parentFrame, pos, scrollStep, size): initialisation method
+    # __init__(self, backend, canvas, cellSize, commands, parent, parentFrame, pos, scrollStep, size): initialisation method
-    def __init__(self, backend, canvas, cellSize, interface, parent, parentFrame, pos, scrollStep, size):
+    def __init__(self, backend, canvas, cellSize, commands, parent, parentFrame, pos, scrollStep, size):
         super().__init__(parent, pos, scrollStep, [w * h for w, h in zip(cellSize, size)])
-        self.backend, self.canvas, self.cellSize, self.interface, self.parentFrame = backend(self.size, cellSize), canvas, cellSize, interface(self, parentFrame), parentFrame
+        self.backend, self.canvas, self.cellSize, self.commands, self.parentFrame = backend(self.size, cellSize), canvas, cellSize, commands(self, parentFrame), parentFrame
         self.brushColours, self.brushPos, self.brushSize, self.dirty = [4, 1], [0, 0], [1, 1], False
 
 # vim:expandtab foldmethod=marker sw=4 ts=4 tw=120

libroar/RoarClient.py

@@ -7,7 +7,7 @@
 from Canvas import Canvas
 from GuiCanvasWxBackend import GuiCanvasWxBackend
 from GuiFrame import GuiFrame, NID_TOOLBAR_HSEP
-from RoarCanvasInterface import RoarCanvasInterface
+from RoarCanvasCommands import RoarCanvasCommands
 from RoarCanvasWindow import RoarCanvasWindow
 
 from glob import glob
@@ -31,10 +31,6 @@ class RoarClient(GuiFrame):
     def onChar(self, event):
         self.canvasPanel.onKeyboardInput(event)
     # }}}
-    # {{{ onMenu(self, event)
-    def onMenu(self, event):
-        eventId = event.GetId(); self.itemsById[eventId](self.canvasPanel.interface, event);
-    # }}}
     # {{{ onMouseWheel(self, event)
     def onMouseWheel(self, event):
         self.canvasPanel.GetEventHandler().ProcessEvent(event)
@@ -45,15 +41,15 @@ class RoarClient(GuiFrame):
     def __init__(self, parent, defaultCanvasPos=(0, 75), defaultCanvasSize=(100, 30), defaultCellSize=(7, 14), size=(840, 630), title=""):
         super().__init__(self._getIconPathName(), size, parent, title)
         self.canvas = Canvas(defaultCanvasSize)
-        self.canvasPanel = RoarCanvasWindow(GuiCanvasWxBackend, self.canvas, defaultCellSize, RoarCanvasInterface, self.panelSkin, self, defaultCanvasPos, defaultCellSize, defaultCanvasSize)
+        self.canvasPanel = RoarCanvasWindow(GuiCanvasWxBackend, self.canvas, defaultCellSize, RoarCanvasCommands, self.panelSkin, self, defaultCanvasPos, defaultCellSize, defaultCanvasSize)
-        self.loadAccels(self.canvasPanel.interface.accels)
+        self.loadAccels(self.canvasPanel.commands.accels)
-        self.loadMenus(self.canvasPanel.interface.menus)
+        self.loadMenus(self.canvasPanel.commands.menus)
-        self._initToolBitmaps(self.canvasPanel.interface.toolBars)
+        self._initToolBitmaps(self.canvasPanel.commands.toolBars)
-        self.loadToolBars(self.canvasPanel.interface.toolBars)
+        self.loadToolBars(self.canvasPanel.commands.toolBars)
 
-        self.canvasPanel.interface.canvasNew(None)
+        self.canvasPanel.commands.canvasNew(None)
-        self.canvasPanel.interface.canvasTool(self.canvasPanel.interface.canvasTool, 5)(self.canvasPanel.interface, None)
+        self.canvasPanel.commands.canvasTool(self.canvasPanel.commands.canvasTool, 5)(None)
-        self.canvasPanel.interface.update(brushSize=self.canvasPanel.brushSize, colours=self.canvasPanel.brushColours)
+        self.canvasPanel.commands.update(brushSize=self.canvasPanel.brushSize, colours=self.canvasPanel.brushColours)
         self.addWindow(self.canvasPanel, expand=True)
 
 # vim:expandtab foldmethod=marker sw=4 ts=4 tw=120

libroar/RoarWindowAbout.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 #
-# RoarClientAboutWindow.py
+# RoarWindowAbout.py
 # Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
 #
 
 from glob import glob
 import os, random, wx, wx.adv
 
-class RoarClientAboutWindow(wx.Dialog):
+class RoarWindowAbout(wx.Dialog):
     # {{{ onButtonRoar(self, event)
     def onButtonRoar(self, event):
         self.Destroy()

roar.py

@@ -16,11 +16,11 @@ import wx
 def main(*argv):
     wxApp, roarClient = wx.App(False), RoarClient(None)
     if (len(argv) > 1) and (len(argv[1]) > 0):
-        roarClient.canvasPanel.interface.canvasPathName = argv[1]
+        roarClient.canvasPanel.commands.canvasPathName = argv[1]
         rc, error = roarClient.canvasPanel.canvas.importStore.importTextFile(argv[1])
         if rc:
             roarClient.canvasPanel.update(roarClient.canvasPanel.canvas.importStore.inSize, False, roarClient.canvasPanel.canvas.importStore.outMap)
-            roarClient.canvasPanel.interface.update(pathName=argv[1], undoLevel=-1)
+            roarClient.canvasPanel.commands.update(pathName=argv[1], undoLevel=-1)
         else:
             print("error: {}".format(error), file=sys.stderr)
     wxApp.MainLoop()