diff --git a/src/gui_qt/_py/usermodeleditor.py b/src/gui_qt/_py/usermodeleditor.py index 5858c0b..0a098df 100644 --- a/src/gui_qt/_py/usermodeleditor.py +++ b/src/gui_qt/_py/usermodeleditor.py @@ -2,9 +2,10 @@ # Form implementation generated from reading ui file 'resources/_ui/usermodeleditor.ui' # -# Created by: PyQt5 UI code generator 5.12.3 +# Created by: PyQt5 UI code generator 5.15.10 # -# WARNING! All changes made in this file will be lost! +# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# run again. Do not edit this file unless you know what you are doing. from PyQt5 import QtCore, QtGui, QtWidgets @@ -20,15 +21,12 @@ class Ui_MainWindow(object): self.verticalLayout.setContentsMargins(3, 3, 3, 3) self.verticalLayout.setSpacing(3) self.verticalLayout.setObjectName("verticalLayout") - self.edit_field = CodeEditor(self.centralwidget) - font = QtGui.QFont() - font.setPointSize(10) - self.edit_field.setFont(font) - self.edit_field.setObjectName("edit_field") - self.verticalLayout.addWidget(self.edit_field) + self.widget = EditorWidget(self.centralwidget) + self.widget.setObjectName("widget") + self.verticalLayout.addWidget(self.widget) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 30)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -61,4 +59,4 @@ class Ui_MainWindow(object): self.actionSave.setText(_translate("MainWindow", "Save")) self.actionSave_as.setText(_translate("MainWindow", "Save as...")) self.actionClose.setText(_translate("MainWindow", "Close")) -from ..lib.codeeditor import CodeEditor +from ..lib.codeeditor import EditorWidget diff --git a/src/gui_qt/lib/usermodeleditor.py b/src/gui_qt/lib/usermodeleditor.py index 7fe0742..d9e5761 100644 --- a/src/gui_qt/lib/usermodeleditor.py +++ b/src/gui_qt/lib/usermodeleditor.py @@ -3,7 +3,7 @@ from __future__ import annotations from pathlib import Path from ..Qt import QtWidgets, QtCore, QtGui -from ..lib.codeeditor import CodeEditor +from ..lib.codeeditor import EditorWidget class QUsermodelEditor(QtWidgets.QMainWindow): @@ -26,7 +26,7 @@ class QUsermodelEditor(QtWidgets.QMainWindow): layout.setContentsMargins(3, 3, 3, 3) layout.setSpacing(3) - self.edit_field = CodeEditor(self.centralwidget) + self.edit_field = EditorWidget(self.centralwidget) font = QtGui.QFont('default') font.setStyleHint(font.Monospace) font.setPointSize(10) diff --git a/src/resources/_ui/usermodeleditor.ui b/src/resources/_ui/usermodeleditor.ui index 8f705a7..384593c 100644 --- a/src/resources/_ui/usermodeleditor.ui +++ b/src/resources/_ui/usermodeleditor.ui @@ -31,13 +31,7 @@ 3 - - - - 10 - - - + @@ -47,7 +41,7 @@ 0 0 800 - 30 + 20 @@ -85,9 +79,10 @@ - CodeEditor - QPlainTextEdit + EditorWidget + QWidget
..lib.codeeditor
+ 1