Further shorten {file,operator,tool} status bar items.

assets/images/roar.png: updated.
This commit is contained in:
Lucio Andrés Illanes Albornoz 2019-09-23 22:25:32 +02:00
parent 40c893139a
commit d5c5902d10
2 changed files with 5 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -47,12 +47,9 @@ class RoarCanvasCommands(RoarCanvasCommandsFile, RoarCanvasCommandsEdit, RoarCan
if "size" in self.lastPanelState: if "size" in self.lastPanelState:
textItems.append("W: {:03d} H: {:03d}".format(*self.lastPanelState["size"])) textItems.append("W: {:03d} H: {:03d}".format(*self.lastPanelState["size"]))
if "brushSize" in self.lastPanelState: if "brushSize" in self.lastPanelState:
textItems.append("Brush: {:02d}x{:02d}".format(*self.lastPanelState["brushSize"])) textItems.append("B: {:02d}x{:02d}".format(*self.lastPanelState["brushSize"]))
if "colours" in self.lastPanelState: if "colours" in self.lastPanelState:
textItems.append("FG: {:02d}, BG: {:02d}".format(*self.lastPanelState["colours"])) textItems.append("FG: {:02d} ({}), BG: {:02d} ({})".format(self.lastPanelState["colours"][0], Colours[self.lastPanelState["colours"][0]][4] if self.lastPanelState["colours"][0] != -1 else "Transparent", self.lastPanelState["colours"][1], Colours[self.lastPanelState["colours"][1]][4] if self.lastPanelState["colours"][1] != -1 else "Transparent"))
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"))
toolBar = self.parentFrame.toolBarItemsById[self.canvasColour(self.canvasColour, self.lastPanelState["colours"][0]).attrDict["id"]][0] toolBar = self.parentFrame.toolBarItemsById[self.canvasColour(self.canvasColour, self.lastPanelState["colours"][0]).attrDict["id"]][0]
toolBarBg = self.parentFrame.toolBarItemsById[self.canvasColourBackground(self.canvasColourBackground, self.lastPanelState["colours"][1]).attrDict["id"]][0] toolBarBg = self.parentFrame.toolBarItemsById[self.canvasColourBackground(self.canvasColourBackground, self.lastPanelState["colours"][1]).attrDict["id"]][0]
if self.lastPanelState["colours"][0] != -1: if self.lastPanelState["colours"][0] != -1:
@ -70,15 +67,15 @@ class RoarCanvasCommands(RoarCanvasCommandsFile, RoarCanvasCommandsEdit, RoarCan
if "pathName" in self.lastPanelState: if "pathName" in self.lastPanelState:
if self.lastPanelState["pathName"] != None: if self.lastPanelState["pathName"] != None:
basePathName = os.path.basename(self.lastPanelState["pathName"]) basePathName = os.path.basename(self.lastPanelState["pathName"])
textItems.append("File: {}".format(basePathName)) textItems.append("F: {}".format(basePathName))
self.parentFrame.SetTitle("{} - roar".format(basePathName)) self.parentFrame.SetTitle("{} - roar".format(basePathName))
else: else:
self.parentFrame.SetTitle("roar") self.parentFrame.SetTitle("roar")
if "toolName" in self.lastPanelState: if "toolName" in self.lastPanelState:
textItems.append("Tool: {}".format(self.lastPanelState["toolName"])) textItems.append("T: {}".format(self.lastPanelState["toolName"]))
if ("operator" in self.lastPanelState) \ if ("operator" in self.lastPanelState) \
and (self.lastPanelState["operator"] != None): and (self.lastPanelState["operator"] != None):
textItems.append("Operator: {}".format(self.lastPanelState["operator"])) textItems.append("O: {}".format(self.lastPanelState["operator"]))
if "dirty" in self.lastPanelState \ if "dirty" in self.lastPanelState \
and self.lastPanelState["dirty"]: and self.lastPanelState["dirty"]:
textItems.append("*") textItems.append("*")