From 3dcbe0f3ee992e8aa48ab58f01713835d70df7d0 Mon Sep 17 00:00:00 2001 From: Fabien Roger <efab.roger@gmail.com> Date: Thu, 10 Feb 2022 18:27:08 +0100 Subject: [PATCH 1/3] :art: Make blocks output more visible --- pyflow/blocks/codeblock.py | 10 +++++++++- pyflow/blocks/markdownblock.py | 11 ++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pyflow/blocks/codeblock.py b/pyflow/blocks/codeblock.py index 9678bd1d..4013a9e1 100644 --- a/pyflow/blocks/codeblock.py +++ b/pyflow/blocks/codeblock.py @@ -8,7 +8,7 @@ from ansi2html import Ansi2HTMLConverter from PyQt5.QtWidgets import QPushButton, QTextEdit -from PyQt5.QtGui import QPen, QColor +from PyQt5.QtGui import QPen, QColor, QPalette from pyflow.blocks.block import Block from pyflow.blocks.executableblock import ExecutableBlock @@ -67,6 +67,8 @@ def __init__(self, source: str = "", **kwargs): QPen(QColor("#00ff00")), # Transmitting ] + self.output_panel_background_color = "#1E1E1E" + # Add output pannel self.output_panel = self.init_output_panel() self.run_button = self.init_run_button() @@ -88,6 +90,12 @@ def init_output_panel(self): output_panel = QTextEdit() output_panel.setReadOnly(True) output_panel.setFont(self.source_editor.font()) + style_sheet = ( + "QTextEdit { background-color: " + + self.output_panel_background_color + + "; }" + ) + output_panel.setStyleSheet(style_sheet) return output_panel def init_run_button(self): diff --git a/pyflow/blocks/markdownblock.py b/pyflow/blocks/markdownblock.py index bb173f47..e1e6e807 100644 --- a/pyflow/blocks/markdownblock.py +++ b/pyflow/blocks/markdownblock.py @@ -47,8 +47,9 @@ def __init__(self, **kwargs): self.splitter.addWidget(self.editor) self.rendered_markdown = QWebEngineView() + self.output_panel_background_color = "#1E1E1E" self.rendered_markdown.page().setBackgroundColor( - QColor.fromRgba64(0, 0, 0, alpha=0) + QColor(self.output_panel_background_color) ) self.splitter.addWidget(self.rendered_markdown) @@ -58,14 +59,18 @@ def valueChanged(self): """Update markdown rendering when the content of the markdown editor changes.""" t = self.editor.text() - dark_theme = """ + dark_theme = ( + """ <style> *{ - background-color:transparent; + background-color:""" + + self.output_panel_background_color + + """; color:white; } </style> """ + ) self.rendered_markdown.setHtml(f"{dark_theme}{markdown(t)}") From 482d7e0ae805b1edcfa605fbb483921e0ad9b3c1 Mon Sep 17 00:00:00 2001 From: Fabien Roger <efab.roger@gmail.com> Date: Thu, 10 Feb 2022 18:56:27 +0100 Subject: [PATCH 2/3] :sparkles: Remove unused import --- pyflow/blocks/codeblock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyflow/blocks/codeblock.py b/pyflow/blocks/codeblock.py index 4013a9e1..1c496106 100644 --- a/pyflow/blocks/codeblock.py +++ b/pyflow/blocks/codeblock.py @@ -8,7 +8,7 @@ from ansi2html import Ansi2HTMLConverter from PyQt5.QtWidgets import QPushButton, QTextEdit -from PyQt5.QtGui import QPen, QColor, QPalette +from PyQt5.QtGui import QPen, QColor from pyflow.blocks.block import Block from pyflow.blocks.executableblock import ExecutableBlock From 99d9ae117c711fb3706a911bab8e000d26323e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=AFs=20F=C3=A9d=C3=A9rico?= <mathfederico@gmail.com> Date: Fri, 11 Feb 2022 16:38:12 +0100 Subject: [PATCH 3/3] :wrench: Refactor using f-strings --- pyflow/blocks/codeblock.py | 4 +--- pyflow/blocks/markdownblock.py | 14 +++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pyflow/blocks/codeblock.py b/pyflow/blocks/codeblock.py index 1c496106..140521b4 100644 --- a/pyflow/blocks/codeblock.py +++ b/pyflow/blocks/codeblock.py @@ -91,9 +91,7 @@ def init_output_panel(self): output_panel.setReadOnly(True) output_panel.setFont(self.source_editor.font()) style_sheet = ( - "QTextEdit { background-color: " - + self.output_panel_background_color - + "; }" + f'QTextEdit {{ background-color: "{self.output_panel_background_color}"; }}' ) output_panel.setStyleSheet(style_sheet) return output_panel diff --git a/pyflow/blocks/markdownblock.py b/pyflow/blocks/markdownblock.py index e1e6e807..182e5a8f 100644 --- a/pyflow/blocks/markdownblock.py +++ b/pyflow/blocks/markdownblock.py @@ -59,18 +59,14 @@ def valueChanged(self): """Update markdown rendering when the content of the markdown editor changes.""" t = self.editor.text() - dark_theme = ( - """ + dark_theme =f''' <style> - *{ - background-color:""" - + self.output_panel_background_color - + """; + *{{ + background-color:"""{self.output_panel_background_color}"""; color:white; - } + }} </style> - """ - ) + ''' self.rendered_markdown.setHtml(f"{dark_theme}{markdown(t)}")