mirror of
https://github.com/lalbornoz/roar.git
synced 2024-11-16 12:36:38 +00:00
f504fa2b76
1) Add background colour toolbar beneath (foreground) colour toolbar.
2) Add colour flipping command w/ {accelerator,{menu,toolbar} item}.
3) Add {de,in}crease {brush,canvas} size accelerator.
4) Add {hide,show} assets window toolbar item.
5) Circle tool: draw outline with foreground colour.
6) Circle tool: honour transparency.
7) Fill tool: change comprehensive fill modifier key from <Shift> to <Ctrl>.
8) Fill tool: fill with {back,fore}ground colour given <[RL]MB>
9) Fix arrow keys cursor motion when scrolled down.
10 Instantly reflect {brush size,colour,tool} changes in canvas.
11) Object tool: honour transparency w/ non-external objects.
12) Object tool: update selection rectangle during <LMB> whilst dragging, set w/ release of <LMB>.
13) Rectangle tool: draw outline with foreground colour.
14) Rectangle tool: honour transparency.
15) Replace wx.ToolBar() w/ wx.lib.agw.aui.AuiToolBar() & custom wx.lib.agw.aui.AuiDefaultToolBarArt().
16) Restore scrolling position after resizing canvas.
.TODO: deleted.
assets/audio/roar{arab8,spoke11}.wav: added.
assets/text/hotkeys.txt: added to document hotkeys.
assets/text/requirements.txt, requirements.txt: moved.
assets/text/TODO: updated.
{assets/tools,lib{canvas,gui,roar,rtl,tools}}/*.py: remove Vim fold markers.
libroar/RoarCanvasCommandsFile.py:_importFile(): update wx.FileDialog() message.
libroar/RoarCanvasCommandsOperators.py:canvasOperator(): update invert colours {caption,label}.
61 lines
2.9 KiB
Python
61 lines
2.9 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# RoarClient.py
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
#
|
|
|
|
from Canvas import Canvas
|
|
from GuiCanvasWxBackend import GuiCanvasWxBackend
|
|
from GuiFrame import GuiFrame, NID_TOOLBAR_HSEP
|
|
from RoarAssetsWindow import RoarAssetsWindow
|
|
from RoarCanvasCommands import RoarCanvasCommands
|
|
from RoarCanvasWindow import RoarCanvasWindow
|
|
|
|
from glob import glob
|
|
import os, random, sys, wx
|
|
|
|
class RoarClient(GuiFrame):
|
|
def _getIconPathName(self):
|
|
iconPathNames = glob(os.path.join("assets", "images", "logo*.bmp"))
|
|
return iconPathNames[random.randint(0, len(iconPathNames) - 1)]
|
|
|
|
def _initToolBitmaps(self, toolBars):
|
|
basePathName = os.path.join(os.path.dirname(sys.argv[0]), "assets", "images")
|
|
for toolBar in toolBars:
|
|
for toolBarItem in [i for i in toolBar if i != NID_TOOLBAR_HSEP]:
|
|
toolBarItem.attrDict["icon"] = self.loadBitmap(basePathName, toolBarItem.attrDict["icon"])
|
|
|
|
|
|
def onChar(self, event):
|
|
self.canvasPanel.onKeyboardInput(event)
|
|
|
|
def onMouseWheel(self, event):
|
|
self.canvasPanel.GetEventHandler().ProcessEvent(event)
|
|
|
|
|
|
#
|
|
# __init__(self, parent, defaultCanvasPos=(0, 75), defaultCanvasSize=(100, 30), defaultCellSize=(7, 14), size=(840, 630), title=""): initialisation method
|
|
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, RoarCanvasCommands, self.panelSkin, self, defaultCanvasPos, defaultCellSize, defaultCanvasSize)
|
|
self.loadAccels(self.canvasPanel.commands.accels, self.canvasPanel.commands.menus, self.canvasPanel.commands.toolBars)
|
|
self.loadMenus(self.canvasPanel.commands.menus)
|
|
self._initToolBitmaps(self.canvasPanel.commands.toolBars)
|
|
self.loadToolBars(self.canvasPanel.commands.toolBars)
|
|
|
|
self.canvasPanel.commands.canvasNew(None)
|
|
self.canvasPanel.commands.canvasTool(self.canvasPanel.commands.canvasTool, 1)(None)
|
|
self.canvasPanel.commands.update(brushSize=self.canvasPanel.brushSize, colours=self.canvasPanel.brushColours)
|
|
self.addWindow(self.canvasPanel, expand=True)
|
|
self.assetsWindow = RoarAssetsWindow(GuiCanvasWxBackend, defaultCellSize, self)
|
|
self.canvasPanel.commands.canvasAssetsWindowShow(None)
|
|
|
|
# XXX
|
|
self.canvasPanel.operatorsMenu = wx.Menu()
|
|
for menuItem in self.canvasPanel.commands.menus[3][1:]:
|
|
menuItemWindow = self.canvasPanel.operatorsMenu.Append(menuItem.attrDict["id"], menuItem.attrDict["label"], menuItem.attrDict["caption"])
|
|
self.Bind(wx.EVT_MENU, self.onMenu, menuItemWindow)
|
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|