Skip to content

Syntax highlighting and Themes #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MathisFederico merged 5 commits into from
Nov 16, 2021
Merged

Syntax highlighting and Themes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c240db
:tada: Add a ThemeManager to change the appearance of the python editors
vanyle Nov 15, 2021
9043530
:tada: Add ability to set the theme from window.py
vanyle Nov 16, 2021
f30e049
:sparkles: Run autopep8 on theme_manager.py
vanyle Nov 16, 2021
2a9797b
:tada: :wrench: The menu in window dynamically changes syntax highlig…
vanyle Nov 16, 2021
df8308e
:memo: Add docstring for the new modules
vanyle Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,9 @@

sys.path.insert(0, os.path.join( os.path.dirname(__file__), "..", ".." ))

SOURCE_TEST = \
'''def build_dataset(a, b):
""" Build you dataset. """
return [0, a, 0, b, 1, a]
'''

SOURCE_TEST_2 = \
'''def mon_ia(a, b):
""" Compute the absolute value of inputs difference. """
if a > b:
return a - b
else:
return b - a
'''

if __name__ == '__main__':
app = QApplication(sys.argv)
app.setStyle('Fusion')

wnd = OCBWindow()
# if hasattr(wnd, 'ocb_widget'):
# scene = wnd.ocb_widget.scene

# test_block = OCBBlock(title="Other kind of block")
# scene.addItem(test_block)
# test_block.setPos(-250, 150)

# test_block_2 = OCBCodeBlock(title="Dataset", source=SOURCE_TEST)
# for _ in range(2):
# test_block_2.add_socket(OCBSocket(test_block_2, socket_type='input'))
# for _ in range(1):
# test_block_2.add_socket(OCBSocket(test_block_2, socket_type='output'))
# test_block_2.setPos(-350, -100)
# scene.addItem(test_block_2)

# test_block_3 = OCBCodeBlock(title="Mon IA (par blocks ?)", source=SOURCE_TEST_2)
# for _ in range(2):
# test_block_3.add_socket(OCBSocket(test_block_3, socket_type='input'))
# for _ in range(1):
# test_block_3.add_socket(OCBSocket(test_block_3, socket_type='output'))
# test_block_3.setPos(0, -100)
# scene.addItem(test_block_3)

# # for i in range(3):
# # edge = OCBEdge(
# # source_socket=test_block_3.sockets_out[0],
# # destination_socket=test_block_2.sockets_in[i]
# # )
# # scene.addItem(edge)

wnd.show()
sys.exit(app.exec_())
75 changes: 29 additions & 46 deletions opencodeblocks/graphics/pyeditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QFocusEvent, QFont, QFontMetrics, QColor
from PyQt5.Qsci import QsciScintilla, QsciLexerPython
from opencodeblocks.graphics.theme_manager import theme_manager

from opencodeblocks.graphics.blocks.block import OCBBlock


if TYPE_CHECKING:
from opencodeblocks.graphics.view import OCBView

class PythonEditor(QsciScintilla):

""" In-block python editor for OpenCodeBlocks. """

def __init__(self, block:OCBBlock):
def __init__(self, block: OCBBlock):
""" In-block python editor for OpenCodeBlocks.

Args:
Expand All @@ -28,50 +30,8 @@ def __init__(self, block:OCBBlock):
self.block = block
self.setText(self.block.source)

# Set the default font
font = QFont()
font.setFamily('Courier')
font.setFixedPitch(True)
font.setPointSize(1)
self.setFont(font)

# Margin 0 is used for line numbers
fontmetrics = QFontMetrics(font)
foreground_color = QColor("#dddddd")
background_color = QColor("#212121")
self.setMarginsFont(font)
self.setMarginWidth(2, fontmetrics.width("00") + 6)
self.setMarginLineNumbers(2, True)
self.setMarginsForegroundColor(foreground_color)
self.setMarginsBackgroundColor(background_color)

# Set Python lexer
lexer = QsciLexerPython()
lexer.setDefaultFont(font)
lexer.setDefaultPaper(QColor("#1E1E1E"))
lexer.setDefaultColor(QColor("#D4D4D4"))

string_types = [
QsciLexerPython.SingleQuotedString,
QsciLexerPython.DoubleQuotedString,
QsciLexerPython.UnclosedString,
QsciLexerPython.SingleQuotedFString,
QsciLexerPython.TripleSingleQuotedString,
QsciLexerPython.TripleDoubleQuotedString,
QsciLexerPython.TripleSingleQuotedFString,
QsciLexerPython.TripleDoubleQuotedFString,
]

for string_type in string_types:
lexer.setColor(QColor('#CE9178'), string_type)

lexer.setColor(QColor('#DCDCAA'), QsciLexerPython.FunctionMethodName)
lexer.setColor(QColor('#569CD6'), QsciLexerPython.Keyword)
lexer.setColor(QColor('#4EC9B0'), QsciLexerPython.ClassName)
lexer.setColor(QColor('#7FB347'), QsciLexerPython.Number)
lexer.setColor(QColor('#D8D8D8'), QsciLexerPython.Operator)

self.setLexer(lexer)
self.update_theme()
theme_manager().themeChanged.connect(self.update_theme)

# Set caret
self.setCaretForegroundColor(QColor("#D4D4D4"))
Expand All @@ -97,6 +57,29 @@ def __init__(self, block:OCBBlock):
self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
self.setWindowFlags(Qt.WindowType.FramelessWindowHint)

def update_theme(self):
""" Change the font and colors of the editor to match the current theme """
font = QFont()
font.setFamily(theme_manager().recommended_font_family)
font.setFixedPitch(True)
font.setPointSize(11)
self.setFont(font)

# Margin 0 is used for line numbers
fontmetrics = QFontMetrics(font)
foreground_color = QColor("#dddddd")
background_color = QColor("#212121")
self.setMarginsFont(font)
self.setMarginWidth(2, fontmetrics.width("00") + 6)
self.setMarginLineNumbers(2, True)
self.setMarginsForegroundColor(foreground_color)
self.setMarginsBackgroundColor(background_color)

lexer = QsciLexerPython()
theme_manager().current_theme().apply_to_lexer(lexer)
lexer.setFont(font)
self.setLexer(lexer)

def views(self) -> List['OCBView']:
""" Get the views in which the python_editor is present. """
return self.graphicsProxyWidget().scene().views()
Expand Down
181 changes: 180 additions & 1 deletion opencodeblocks/graphics/qss/ocb_dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,180 @@
QFrame,QDialog,QMainWindow{background:#474747}QSplitter,QMainWindow::separator{background:#474747}QStatusBar{background:#474747;color:#ccc}QTabWidget{border:0}QTabBar{background:#474747;color:#ccc}QMdiArea QTabBar,QMdiArea QTabWidget,QMdiArea QTabWidget::pane,QMdiArea QTabWidget::tab-bar,QMdiArea QTabBar::tab{height:17px}QMdiArea QTabBar::tab:top:!selected,QMdiArea QTabBar::tab:top:selected,QMdiArea QTabBar::tab:top:!selected:hover{border-top-left-radius:4px;border-top-right-radius:4px;padding:2px 8px;padding-top:0;padding-bottom:3px;min-width:8ex;border:1px solid #333;border-bottom:0}QMdiArea QTabBar::tab:top:!selected,QMdiArea QTabBar::tab:top:!selected:hover{background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #6d6d6d,stop : .1 #474747,stop : .89 #3f3f3f,stop : 1 #3f3f3f)}QMdiArea QTabBar::tab:top:selected{background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #878787,stop : .1 #545454,stop : .89 #474747,stop : 1 #474747)}QMdiArea QTabBar::tab:top:!selected:hover{background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #727272,stop : .1 #4c4c4c,stop : .89 #444,stop : 1 #444)}QMdiArea QTabBar QToolButton{background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #878787,stop : .1 #616161,stop : .89 #4f4f4f,stop : 1 #4f4f4f);border:1px solid #333;border-radius:0}QMdiArea QTabBar QToolButton::left-arrow{image:url(":icons/small_arrow_left-light.png")}QMdiArea QTabBar QToolButton::right-arrow{image:url(":icons/small_arrow_right-light.png")}QMdiArea QTabBar::close-button:selected{image:url(":icons/tab_close_btn.png");subcontrol-origin:border;subcontrol-position:right bottom}QMdiArea QTabBar::close-button:!selected{image:url(":icons/tab_close_nonselected_btn.png")}QMdiSubWindow{border-style:solid;background:#616161}QTabBar::tab:selected,QTabBar::tab:hover{color:#eee}QDockWidget{color:#ddd;font-weight:bold;titlebar-close-icon:url(":icons/docktitle-close-btn-light.png");titlebar-normal-icon:url(":icons/docktitle-normal-btn-light.png")}QDockWidget::title{background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #3b3b3b,stop : 1 #2e2e2e);padding-top:4px;padding-right:22px;font-weight:bold}QDockWidget::close-button,QDockWidget::float-button{subcontrol-position:top right;subcontrol-origin:margin;text-align:center;icon-size:16px;width:14px;position:absolute;top:0;bottom:0;left:0;right:4px}QDockWidget::close-button{right:4px}QDockWidget::float-button{right:18px}QMenuBar{background:#474747}QMenuBar::item{spacing:3px;padding:3px 5px;color:#eee;background:transparent}QMenuBar::item:selected,QMenuBar::item:pressed{background:#4f9eee}QMenu{background:#474747;border:1px solid #2e2e2e}QMenu::item{background:#474747;color:#eee}QMenu::item:selected{background:#616161}QMenu::active{background:#616161;color:#eee}QMenu::separator{height:1px;background:#2e2e2e}QMenu::disabled,QMenu::item:disabled{color:#6e6e6e}QListView{background-color:#555;alternate-background-color:#434343}QListView::item{height:22px;color:#e6e6e6}QListView::item:hover{background:#6e6e6e}QListView::item::active:hover{color:#fff}QListView::item:selected,QListView::item::active:selected{color:#fff;background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #4f9eee,stop : 1 #2084ea);border:0}QPushButton{color:#e6e6e6;background:#555;border-color:#141414}QLabel{color:#e6e6e6}QLineEdit,QTextEdit{color:#e6e6e6;background:#5a5a5a}QLineEdit{border:1px solid #3a3a3a;border-radius:2px;padding:1px 2px}QDMNodeContentWidget{background:transparent;}QDMNodeContentWidget QFrame{background:transparent}QDMNodeContentWidget QTextEdit{background:#666}QDMNodeContentWidget QLabel{color:#e0e0e0}QGraphicsView{selection-background-color:#fff}
QFrame,QDialog,QMainWindow{
background:#474747
}
QSplitter,QMainWindow::separator{
background:#474747
}
QStatusBar{
background:#474747;
color:#ccc
}
QTabWidget{
border:0
}
QTabBar{
background:#474747;
color:#ccc
}
QMdiArea QTabBar,QMdiArea QTabWidget,QMdiArea QTabWidget::pane,QMdiArea QTabWidget::tab-bar,QMdiArea QTabBar::tab{
height:17px
}
QMdiArea QTabBar::tab:top:!selected,QMdiArea QTabBar::tab:top:selected,QMdiArea QTabBar::tab:top:!selected:hover{
border-top-left-radius:4px;
border-top-right-radius:4px;
padding:2px 8px;
padding-top:0;
padding-bottom:3px;
min-width:8ex;
border:1px solid #333;
border-bottom:0
}
QMdiArea QTabBar::tab:top:!selected,QMdiArea QTabBar::tab:top:!selected:hover{
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #6d6d6d,stop : .1 #474747,stop : .89 #3f3f3f,stop : 1 #3f3f3f)
}
QMdiArea QTabBar::tab:top:selected{
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #878787,stop : .1 #545454,stop : .89 #474747,stop : 1 #474747)
}
QMdiArea QTabBar::tab:top:!selected:hover{
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #727272,stop : .1 #4c4c4c,stop : .89 #444,stop : 1 #444)
}
QMdiArea QTabBar QToolButton{
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #878787,stop : .1 #616161,stop : .89 #4f4f4f,stop : 1 #4f4f4f);
border:1px solid #333;
border-radius:0
}
QMdiArea QTabBar QToolButton::left-arrow{
image:url(":icons/small_arrow_left-light.png")
}
QMdiArea QTabBar QToolButton::right-arrow{
image:url(":icons/small_arrow_right-light.png")
}
QMdiArea QTabBar::close-button:selected{
image:url(":icons/tab_close_btn.png");
subcontrol-origin:border;
subcontrol-position:right bottom
}
QMdiArea QTabBar::close-button:!selected{
image:url(":icons/tab_close_nonselected_btn.png")
}
QMdiSubWindow{
border-style:solid;
background:#616161
}
QTabBar::tab:selected,QTabBar::tab:hover{
color:#eee
}
QDockWidget{
color:#ddd;
font-weight:bold;
titlebar-close-icon:url(":icons/docktitle-close-btn-light.png");
titlebar-normal-icon:url(":icons/docktitle-normal-btn-light.png")
}
QDockWidget::title{
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #3b3b3b,stop : 1 #2e2e2e);
padding-top:4px;
padding-right:22px;
font-weight:bold
}
QDockWidget::close-button,QDockWidget::float-button{
subcontrol-position:top right;
subcontrol-origin:margin;
text-align:center;
icon-size:16px;
width:14px;
position:absolute;
top:0;
bottom:0;
left:0;
right:4px
}
QDockWidget::close-button{
right:4px
}
QDockWidget::float-button{
right:18px
}
QMenuBar{
background:#474747
}
QMenuBar::item{
spacing:3px;
padding:3px 5px;
color:#eee;
background:transparent
}
QMenuBar::item:selected,QMenuBar::item:pressed{
background:#4f9eee
}
QMenu{
background:#474747;
border:1px solid #2e2e2e
}
QMenu::item{
background:#474747;
color:#eee
}
QMenu::item:selected{
background:#616161
}
QMenu::active{
background:#616161;
color:#eee
}
QMenu::separator{
height:1px;
background:#2e2e2e
}
QMenu::disabled,QMenu::item:disabled{
color:#6e6e6e
}
QListView{
background-color:#555;
alternate-background-color:#434343
}
QListView::item{
height:22px;
color:#e6e6e6
}
QListView::item:hover{
background:#6e6e6e
}
QListView::item::active:hover{
color:#fff
}
QListView::item:selected,QListView::item::active:selected{
color:#fff;
background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,stop : 0 #4f9eee,stop : 1 #2084ea);
border:0
}
QPushButton{
color:#e6e6e6;
background:#555;
border-color:#141414
}
QLabel{
color:#e6e6e6
}
QLineEdit,QTextEdit{
color:#e6e6e6;
background:#5a5a5a
}
QLineEdit{
border:1px solid #3a3a3a;
border-radius:2px;
padding:1px 2px
}
QDMNodeContentWidget{
background:transparent;
}
QDMNodeContentWidget QFrame{
background:transparent
}
QDMNodeContentWidget QTextEdit{
background:#666
}
QDMNodeContentWidget QLabel{
color:#e0e0e0
}
QGraphicsView{
selection-background-color:#fff
}
Loading