bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- more fixes for porting to PyQt6

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-05 02:23:29 +03:00
committed by Marius
parent e0a7afb2cd
commit 4eb20fd5fe
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta
- continuing to fix the PyQt6 port - continuing to fix the PyQt6 port
- added an Exception when App.on_canvas_setup() fails - added an Exception when App.on_canvas_setup() fails
- fixed fullscreen functionality for PyQt6 and a few other fixes regarding the port to PyQt6 - fixed fullscreen functionality for PyQt6 and a few other fixes regarding the port to PyQt6
- more fixes for porting to PyQt6
4.08.2021 4.08.2021

2
appEditors/AppGeoEditor.py
View File

@@ -365,7 +365,7 @@ class TextInputTool(AppTool):
self.grid_text.addWidget(FCLabel('%s:' % _("Text")), 4, 0, 1, 2) self.grid_text.addWidget(FCLabel('%s:' % _("Text")), 4, 0, 1, 2)
self.text_input_entry = FCTextAreaRich() self.text_input_entry = FCTextAreaRich()
self.text_input_entry.setTabStopWidth(12) self.text_input_entry.setTabStopDistance(12)
self.text_input_entry.setMinimumHeight(200) self.text_input_entry.setMinimumHeight(200)
# self.text_input_entry.setMaximumHeight(150) # self.text_input_entry.setMaximumHeight(150)
self.text_input_entry.setCurrentFont(f_current) self.text_input_entry.setCurrentFont(f_current)

18
appGUI/GUIElements.py
View File

@@ -3149,7 +3149,7 @@ class FCDetachableTab(QtWidgets.QTabWidget):
""" """
event.accept() event.accept()
self.onDetachTabSignal.emit(self.tabAt(event.pos()), self.mouseCursor.pos()) self.onDetachTabSignal.emit(self.tabAt(event.position().toPoint()), self.mouseCursor.pos())
def mousePressEvent(self, event): def mousePressEvent(self, event):
""" """
@@ -3160,9 +3160,9 @@ class FCDetachableTab(QtWidgets.QTabWidget):
:return: :return:
""" """
if event.button() == QtCore.Qt.MouseButton.LeftButton: if event.button() == QtCore.Qt.MouseButton.LeftButton:
self.dragStartPos = event.pos() self.dragStartPos = event.position().toPoint()
elif event.button() == QtCore.Qt.MouseButton.RightButton: elif event.button() == QtCore.Qt.MouseButton.RightButton:
self.prev_index = self.tabAt(event.pos()) self.prev_index = self.tabAt(event.position().toPoint())
self.dragDropedPos.setX(0) self.dragDropedPos.setX(0)
self.dragDropedPos.setY(0) self.dragDropedPos.setY(0)
@@ -3200,7 +3200,7 @@ class FCDetachableTab(QtWidgets.QTabWidget):
""" """
# Determine if the current movement is detected as a drag # Determine if the current movement is detected as a drag
if not self.dragStartPos.isNull() and \ if not self.dragStartPos.isNull() and \
((event.pos() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()): ((event.position().toPoint() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()):
self.dragInitiated = True self.dragInitiated = True
# If the current movement is a drag initiated by the left button # If the current movement is a drag initiated by the left button
@@ -3208,7 +3208,7 @@ class FCDetachableTab(QtWidgets.QTabWidget):
# Stop the move event # Stop the move event
finishMoveEvent = QtGui.QMouseEvent( finishMoveEvent = QtGui.QMouseEvent(
QtCore.QEvent.Type.MouseMove, event.pos(), QtCore.Qt.MouseButton.NoButton, QtCore.QEvent.Type.MouseMove, event.position().toPoint(), QtCore.Qt.MouseButton.NoButton,
QtCore.Qt.MouseButton.NoButton, QtCore.Qt.KeyboardModifier.NoModifier QtCore.Qt.MouseButton.NoButton, QtCore.Qt.KeyboardModifier.NoModifier
) )
QtWidgets.QTabBar.mouseMoveEvent(self, finishMoveEvent) QtWidgets.QTabBar.mouseMoveEvent(self, finishMoveEvent)
@@ -3278,7 +3278,7 @@ class FCDetachableTab(QtWidgets.QTabWidget):
:param event: a drop event :param event: a drop event
:return: :return:
""" """
self.dragDropedPos = event.pos() self.dragDropedPos = event.position().toPoint()
QtWidgets.QTabBar.dropEvent(self, event) QtWidgets.QTabBar.dropEvent(self, event)
def detachedTabDrop(self, name, dropPos): def detachedTabDrop(self, name, dropPos):
@@ -3542,7 +3542,7 @@ class FCTable(QtWidgets.QTableWidget):
# if user is clicking an blank area inside the QTableWidget it will deselect currently selected rows # if user is clicking an blank area inside the QTableWidget it will deselect currently selected rows
def mousePressEvent(self, event): def mousePressEvent(self, event):
clicked_item = self.itemAt(event.pos()) clicked_item = self.itemAt(event.position().toPoint())
if not clicked_item: if not clicked_item:
self.clearSelection() self.clearSelection()
self.clearFocus() self.clearFocus()
@@ -3775,11 +3775,11 @@ class FCTable(QtWidgets.QTableWidget):
super().dropEvent(event) super().dropEvent(event)
def drop_on(self, event): def drop_on(self, event):
index = self.indexAt(event.pos()) index = self.indexAt(event.position().toPoint())
if not index.isValid(): if not index.isValid():
return self.rowCount() return self.rowCount()
return index.row() + 1 if self.is_below(event.pos(), index) else index.row() return index.row() + 1 if self.is_below(event.position().toPoint(), index) else index.row()
def is_below(self, pos, index): def is_below(self, pos, index):
rect = self.visualRect(index) rect = self.visualRect(index)

2
appObjects/FlatCAMDocument.py
View File

@@ -224,7 +224,7 @@ class DocumentObject(FlatCAMObj):
self.ui.tab_size_spinner.set_value(val) self.ui.tab_size_spinner.set_value(val)
tab_balue = int(self.ui.tab_size_spinner.get_value()) tab_balue = int(self.ui.tab_size_spinner.get_value())
self.document_editor_tab.code_editor.setTabStopWidth(tab_balue) self.document_editor_tab.code_editor.setTabStopDistance(tab_balue)
self.app.defaults['document_tab_size'] = tab_balue self.app.defaults['document_tab_size'] = tab_balue
self.ui.tab_size_spinner.returnPressed.connect(self.on_tab_size_change) self.ui.tab_size_spinner.returnPressed.connect(self.on_tab_size_change)