mirror of
https://github.com/lalbornoz/roar.git
synced 2024-11-22 07:16:38 +00:00
libgui/GuiCanvasInterface.py: minor cleanup.
This commit is contained in:
Lucio Andrés Illanes Albornoz
parent
c77813380a
commit
f6e2dbd64b
@ -48,6 +48,29 @@ def GuiCanvasSelectDecorator(idx, caption, label, icon, accel, initialState):
|
|||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
class GuiCanvasInterface():
|
class GuiCanvasInterface():
|
||||||
|
# {{{ _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)
|
||||||
|
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)
|
# {{{ _initColourBitmaps(self)
|
||||||
def _initColourBitmaps(self):
|
def _initColourBitmaps(self):
|
||||||
for numColour in range(len(self.canvasColour.attrList)):
|
for numColour in range(len(self.canvasColour.attrList)):
|
||||||
@ -170,37 +193,22 @@ class GuiCanvasInterface():
|
|||||||
# {{{ canvasNew(self, event, newCanvasSize=None)
|
# {{{ canvasNew(self, event, newCanvasSize=None)
|
||||||
@GuiCanvasCommandDecorator("New", "&New", ["", wx.ART_NEW], [wx.ACCEL_CTRL, ord("N")], None)
|
@GuiCanvasCommandDecorator("New", "&New", ["", wx.ART_NEW], [wx.ACCEL_CTRL, ord("N")], None)
|
||||||
def canvasNew(self, event, newCanvasSize=None):
|
def canvasNew(self, event, newCanvasSize=None):
|
||||||
if self._promptSaveChanges():
|
def canvasImportEmpty(pathName):
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
nonlocal newCanvasSize
|
||||||
if newCanvasSize == None:
|
if newCanvasSize == None:
|
||||||
newCanvasSize = list(self.parentCanvas.defaultCanvasSize)
|
newCanvasSize = list(self.parentCanvas.defaultCanvasSize)
|
||||||
newMap = [[[1, 1, 0, " "] for x in range(newCanvasSize[0])] for y in range(newCanvasSize[1])]
|
newMap = [[[1, 1, 0, " "] for x in range(newCanvasSize[0])] for y in range(newCanvasSize[1])]
|
||||||
self.parentCanvas.dirty = False
|
return (True, "", newMap, None, newCanvasSize)
|
||||||
self.parentCanvas.update(newCanvasSize, False, newMap)
|
if self._promptSaveChanges():
|
||||||
self.canvasPathName = None
|
self._import(canvasImportEmpty, False, None)
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
|
|
||||||
self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
|
|
||||||
# }}}
|
# }}}
|
||||||
# {{{ canvasOpen(self, event)
|
# {{{ canvasOpen(self, event)
|
||||||
@GuiCanvasCommandDecorator("Open", "&Open", ["", wx.ART_FILE_OPEN], [wx.ACCEL_CTRL, ord("O")], None)
|
@GuiCanvasCommandDecorator("Open", "&Open", ["", wx.ART_FILE_OPEN], [wx.ACCEL_CTRL, ord("O")], None)
|
||||||
def canvasOpen(self, event):
|
def canvasOpen(self, event):
|
||||||
if self._promptSaveChanges():
|
def canvasImportmIRC(pathName):
|
||||||
with wx.FileDialog(self.parentCanvas, "Open", os.getcwd(), "", "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*", wx.FD_OPEN) as dialog:
|
rc, error = self.parentCanvas.canvas.importStore.importTextFile(pathName)
|
||||||
if dialog.ShowModal() == wx.ID_CANCEL:
|
return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
|
||||||
return False
|
self._importFile(canvasImportmIRC, False, "mIRC art files (*.txt)|*.txt|All Files (*.*)|*.*")
|
||||||
else:
|
|
||||||
self.canvasPathName = dialog.GetPath()
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
|
||||||
rc, error = self.parentCanvas.canvas.importStore.importTextFile(self.canvasPathName)
|
|
||||||
if rc:
|
|
||||||
self.parentCanvas.dirty = False
|
|
||||||
self.parentCanvas.update(self.parentCanvas.canvas.importStore.inSize, False, self.parentCanvas.canvas.importStore.outMap)
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
|
|
||||||
self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print("error: {}".format(error), file=sys.stderr)
|
|
||||||
return False
|
|
||||||
# }}}
|
# }}}
|
||||||
# {{{ canvasPaste(self, event)
|
# {{{ canvasPaste(self, event)
|
||||||
@GuiCanvasCommandDecorator("Paste", "&Paste", ["", wx.ART_PASTE], None, False)
|
@GuiCanvasCommandDecorator("Paste", "&Paste", ["", wx.ART_PASTE], None, False)
|
||||||
@ -408,68 +416,35 @@ class GuiCanvasInterface():
|
|||||||
# {{{ canvasImportAnsi(self, event)
|
# {{{ canvasImportAnsi(self, event)
|
||||||
@GuiCanvasCommandDecorator("Import ANSI...", "Import ANSI...", None, None, None)
|
@GuiCanvasCommandDecorator("Import ANSI...", "Import ANSI...", None, None, None)
|
||||||
def canvasImportAnsi(self, event):
|
def canvasImportAnsi(self, event):
|
||||||
with wx.FileDialog(self.parentCanvas, "Open", os.getcwd(), "", "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*", wx.FD_OPEN) as dialog:
|
def canvasImportAnsi_(pathName):
|
||||||
if dialog.ShowModal() == wx.ID_CANCEL:
|
rc, error = self.parentCanvas.canvas.importStore.importAnsiFile(pathName)
|
||||||
return False
|
return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
|
||||||
elif self._promptSaveChanges():
|
self._importFile(canvasImportAnsi_, True, "ANSI files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
|
||||||
self.canvasPathName = dialog.GetPath()
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
|
||||||
rc, error = self.parentCanvas.canvas.importStore.importAnsiFile(self.canvasPathName)
|
|
||||||
if rc:
|
|
||||||
self.parentCanvas.dirty = True
|
|
||||||
self.parentCanvas.update(self.parentCanvas.canvas.importStore.inSize, False, self.parentCanvas.canvas.importStore.outMap)
|
|
||||||
self.canvasPathName = None
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
|
|
||||||
self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print("error: {}".format(error), file=sys.stderr)
|
|
||||||
return False
|
|
||||||
# }}}
|
# }}}
|
||||||
# {{{ canvasImportFromClipboard(self, event)
|
# {{{ canvasImportFromClipboard(self, event)
|
||||||
@GuiCanvasCommandDecorator("Import from clipboard", "&Import from clipboard", None, None, None)
|
@GuiCanvasCommandDecorator("Import from clipboard", "&Import from clipboard", None, None, None)
|
||||||
def canvasImportFromClipboard(self, event):
|
def canvasImportFromClipboard(self, event):
|
||||||
rc = False
|
def canvasImportFromClipboard_(pathName):
|
||||||
if wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)) \
|
if wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)) \
|
||||||
and wx.TheClipboard.Open():
|
and wx.TheClipboard.Open():
|
||||||
inBuffer = wx.TextDataObject()
|
inBuffer = wx.TextDataObject()
|
||||||
if wx.TheClipboard.GetData(inBuffer):
|
if wx.TheClipboard.GetData(inBuffer):
|
||||||
if self._promptSaveChanges():
|
if self._promptSaveChanges():
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
rc, error = self.parentCanvas.canvas.importStore.importTextBuffer(io.StringIO(inBuffer.GetText()))
|
||||||
rc, error = self.parentCanvas.canvas.importStore.importTextBuffer(io.StringIO(inBuffer.GetText()))
|
wx.TheClipboard.Close()
|
||||||
if rc:
|
else:
|
||||||
self.parentCanvas.dirty = True
|
rc, error = False, "Clipboard does not contain text data and/or cannot be opened"
|
||||||
self.parentCanvas.update(self.parentCanvas.canvas.importStore.inSize, False, self.parentCanvas.canvas.importStore.outMap)
|
return (rc, error, self.parentCanvas.canvas.importStore.outMap, None, self.parentCanvas.canvas.importStore.inSize)
|
||||||
self.canvasPathName = None
|
if self._promptSaveChanges():
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
|
self._import(canvasImportFromClipboard_, True, None)
|
||||||
self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
|
|
||||||
else:
|
|
||||||
print("error: {}".format(error), file=sys.stderr)
|
|
||||||
wx.TheClipboard.Close()
|
|
||||||
if not rc:
|
|
||||||
with wx.MessageDialog(self.parentCanvas, "Clipboard does not contain text data and/or cannot be opened", "", wx.ICON_QUESTION | wx.OK | wx.OK_DEFAULT) as dialog:
|
|
||||||
dialog.ShowModal()
|
|
||||||
# }}}
|
# }}}
|
||||||
# {{{ canvasImportSauce(self, event)
|
# {{{ canvasImportSauce(self, event)
|
||||||
@GuiCanvasCommandDecorator("Import SAUCE...", "Import SAUCE...", None, None, None)
|
@GuiCanvasCommandDecorator("Import SAUCE...", "Import SAUCE...", None, None, None)
|
||||||
def canvasImportSauce(self, event):
|
def canvasImportSauce(self, event):
|
||||||
with wx.FileDialog(self.parentCanvas, "Open", os.getcwd(), "", "SAUCE files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*", wx.FD_OPEN) as dialog:
|
def canvasImportSauce_(pathName):
|
||||||
if dialog.ShowModal() == wx.ID_CANCEL:
|
rc, error = self.parentCanvas.canvas.importStore.importSauceFile(pathName)
|
||||||
return False
|
return (rc, error, self.parentCanvas.canvas.importStore.outMap, pathName, self.parentCanvas.canvas.importStore.inSize)
|
||||||
elif self._promptSaveChanges():
|
self._importFile(canvasImportSauce_, True, "SAUCE files (*.ans;*.txt)|*.ans;*.txt|All Files (*.*)|*.*")
|
||||||
self.canvasPathName = dialog.GetPath()
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
|
||||||
rc, error = self.parentCanvas.canvas.importStore.importSauceFile(self.canvasPathName)
|
|
||||||
if rc:
|
|
||||||
self.parentCanvas.dirty = True
|
|
||||||
self.parentCanvas.update(self.parentCanvas.canvas.importStore.inSize, False, self.parentCanvas.canvas.importStore.outMap)
|
|
||||||
self.canvasPathName = None
|
|
||||||
self.parentCanvas.SetCursor(wx.Cursor(wx.NullCursor))
|
|
||||||
self.update(dirty=self.parentCanvas.dirty, pathName=self.canvasPathName, undoLevel=-1)
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print("error: {}".format(error), file=sys.stderr)
|
|
||||||
return False
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
# {{{ update(self, **kwargs)
|
# {{{ update(self, **kwargs)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user