replace codeeditor with editorwidget

This commit is contained in:
Dominik Demuth 2023-12-28 15:27:55 +01:00
parent 1964cc26f8
commit dde2ee3c28
3 changed files with 15 additions and 22 deletions

@ -2,9 +2,10 @@
# Form implementation generated from reading ui file 'resources/_ui/usermodeleditor.ui' # 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 from PyQt5 import QtCore, QtGui, QtWidgets
@ -20,15 +21,12 @@ class Ui_MainWindow(object):
self.verticalLayout.setContentsMargins(3, 3, 3, 3) self.verticalLayout.setContentsMargins(3, 3, 3, 3)
self.verticalLayout.setSpacing(3) self.verticalLayout.setSpacing(3)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.edit_field = CodeEditor(self.centralwidget) self.widget = EditorWidget(self.centralwidget)
font = QtGui.QFont() self.widget.setObjectName("widget")
font.setPointSize(10) self.verticalLayout.addWidget(self.widget)
self.edit_field.setFont(font)
self.edit_field.setObjectName("edit_field")
self.verticalLayout.addWidget(self.edit_field)
MainWindow.setCentralWidget(self.centralwidget) MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow) 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.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile = QtWidgets.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile") self.menuFile.setObjectName("menuFile")
@ -61,4 +59,4 @@ class Ui_MainWindow(object):
self.actionSave.setText(_translate("MainWindow", "Save")) self.actionSave.setText(_translate("MainWindow", "Save"))
self.actionSave_as.setText(_translate("MainWindow", "Save as...")) self.actionSave_as.setText(_translate("MainWindow", "Save as..."))
self.actionClose.setText(_translate("MainWindow", "Close")) self.actionClose.setText(_translate("MainWindow", "Close"))
from ..lib.codeeditor import CodeEditor from ..lib.codeeditor import EditorWidget

@ -3,7 +3,7 @@ from __future__ import annotations
from pathlib import Path from pathlib import Path
from ..Qt import QtWidgets, QtCore, QtGui from ..Qt import QtWidgets, QtCore, QtGui
from ..lib.codeeditor import CodeEditor from ..lib.codeeditor import EditorWidget
class QUsermodelEditor(QtWidgets.QMainWindow): class QUsermodelEditor(QtWidgets.QMainWindow):
@ -26,7 +26,7 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
layout.setContentsMargins(3, 3, 3, 3) layout.setContentsMargins(3, 3, 3, 3)
layout.setSpacing(3) layout.setSpacing(3)
self.edit_field = CodeEditor(self.centralwidget) self.edit_field = EditorWidget(self.centralwidget)
font = QtGui.QFont('default') font = QtGui.QFont('default')
font.setStyleHint(font.Monospace) font.setStyleHint(font.Monospace)
font.setPointSize(10) font.setPointSize(10)

@ -31,13 +31,7 @@
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="CodeEditor" name="edit_field"> <widget class="EditorWidget" name="widget" native="true"/>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -47,7 +41,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>30</height> <height>20</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -85,9 +79,10 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>CodeEditor</class> <class>EditorWidget</class>
<extends>QPlainTextEdit</extends> <extends>QWidget</extends>
<header>..lib.codeeditor</header> <header>..lib.codeeditor</header>
<container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>