- overwritten the Beta_8.995 branch with the Gerber_Editor_Upgrade branch

This commit is contained in:
Marius Stanciu
2023-05-24 18:07:05 +03:00
parent c23d0c4ed6
commit 63071a9bae
214 changed files with 22249 additions and 6251 deletions

View File

@@ -9,8 +9,10 @@
from PyQt6 import QtCore, QtGui, QtWidgets
from PyQt6.QtCore import QSettings
from PyQt6.QtGui import QTextCursor, QPixmap
from PyQt6.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout, QLabel
from PyQt6.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout
from appGUI.GUIElements import _BrowserTextEdit, _ExpandableTextEdit, FCLabel
import html
import sys
import traceback
@@ -42,7 +44,7 @@ class TermWidget(QWidget):
self._browser = _BrowserTextEdit(version=version, app=app)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:
@@ -73,7 +75,7 @@ class TermWidget(QWidget):
hlay = QHBoxLayout()
hlay.addWidget(self._delete_line)
hlay.addWidget(QLabel(" "))
hlay.addWidget(FCLabel(" "))
hlay.addWidget(self._edit)
layout.addLayout(hlay)
@@ -312,8 +314,6 @@ class FCShell(TermWidget):
self.init_tcl()
self._edit.set_model_data(self.app.myKeywords)
app_icon = QtGui.QIcon()
app_icon.addFile(self.app.resource_location + '/app16.png', QtCore.QSize(16, 16))
app_icon.addFile(self.app.resource_location + '/app24.png', QtCore.QSize(24, 24))