CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

console: Change colors for errors/warnings

Browse Source
This commit is contained in:
Jordan 2021-06-12 14:03:41 -04:00 committed by jordanruthe
parent 207c026cb5
commit a8038c39c0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panels/console.py
View File

@ -14,18 +14,18 @@ def create_panel(*args):
COLORS = { COLORS = {
"command": "#bad8ff", "command": "#bad8ff",
"response": "#cccccc", "error": "#ff6975",
"time": "grey" "response": "#b8b8b8",
"time": "grey",
"warning": "#c9c9c9"
} }
class ConsolePanel(ScreenPanel): class ConsolePanel(ScreenPanel):
def initialize(self, panel_name): def initialize(self, panel_name):
_ = self.lang.gettext _ = self.lang.gettext
gcodes = self._screen._ws.send_method("server.gcode_store",{"count": 100}, self.gcode_response) gcodes = self._screen._ws.send_method("server.gcode_store",{"count": 100}, self.gcode_response)
vbox = Gtk.VBox() vbox = Gtk.VBox()
vbox.set_hexpand(True) vbox.set_hexpand(True)
vbox.set_vexpand(True) vbox.set_vexpand(True)
@ -72,9 +72,16 @@ class ConsolePanel(ScreenPanel):
def add_gcode(self, type, time, message): def add_gcode(self, type, time, message):
if type == "command": if type == "command":
message = '<span color="%s">$ %s</span>' % (COLORS['command'], message) color = COLORS['command']
message = '$ %s' % message
elif message.startswith("!!"):
color = COLORS['error']
elif message.startswith("//"):
color = COLORS['warning']
else: else:
message = '<span color="%s">%s</span>' % (COLORS['response'], message) color = COLORS['response']
message = '<span color="%s">%s</span>' % (color, message)
message = message.replace('\n','\n ') message = message.replace('\n','\n ')
@ -86,7 +93,6 @@ class ConsolePanel(ScreenPanel):
if method != "server.gcode_store": if method != "server.gcode_store":
return return
logging.info("Gcodes: %s " % result)
for resp in result['result']['gcode_store']: for resp in result['result']['gcode_store']:
self.add_gcode(resp['type'], resp['time'], resp['message']) self.add_gcode(resp['type'], resp['time'], resp['message'])