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

- fixed some issues with using the exec_() which now should be exec()

Browse Source 
- added a context menu action in the canvas context menu for moving selected objects to origin
This commit is contained in:
Marius Stanciu
2021-08-15 02:19:24 +03:00
committed by Marius
parent 835ef0620e
commit 7a7214752c
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appGUI/GUIElements.py
View File

@@ -348,7 +348,7 @@ class FCLineEdit(QtWidgets.QLineEdit):
self.menu.addAction(sel_all_action)
sel_all_action.triggered.connect(self.selectAll)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def cut_text(self):
clipboard = QtWidgets.QApplication.clipboard()
@@ -1063,7 +1063,7 @@ class FCSpinner(QtWidgets.QSpinBox):
if line_edit.isReadOnly():
step_down_action.setDisabled(True)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def cut_text(self):
clipboard = QtWidgets.QApplication.clipboard()
@@ -1462,7 +1462,7 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
if line_edit.isReadOnly():
step_down_action.setDisabled(True)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def cut_text(self):
clipboard = QtWidgets.QApplication.clipboard()
@@ -1655,7 +1655,7 @@ class FCTextEdit(QtWidgets.QTextEdit):
self.menu.addAction(sel_all_action)
sel_all_action.triggered.connect(self.selectAll)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def cut_text(self):
tcursor = self.textCursor()
@@ -2012,7 +2012,7 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
else:
self.copy_action.setDisabled(False)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def add_action_to_context_menu(self, text, shortcut='', icon=None, callback=lambda: None, separator=None):
"""
@@ -3241,9 +3241,9 @@ class FCDetachableTab(QtWidgets.QTabWidget):
drag.setPixmap(targetPixmap)
# Initiate the drag
dropAction = drag.exec_(QtCore.Qt.DropAction.MoveAction | QtCore.Qt.DropAction.CopyAction)
dropAction = drag.exec(QtCore.Qt.DropAction.MoveAction | QtCore.Qt.DropAction.CopyAction)
# For Linux: Here, drag.exec_() will not return MoveAction on Linux. So it
# For Linux: Here, drag.exec() will not return MoveAction on Linux. So it
# must be set manually
if self.dragDropedPos.x() != 0 and self.dragDropedPos.y() != 0:
dropAction = QtCore.Qt.DropAction.MoveAction
@@ -4061,7 +4061,7 @@ class _BrowserTextEdit(QTextEdit):
self.cut_action.setDisabled(False)
self.copy_action.setDisabled(False)
self.menu.exec_(event.globalPos())
self.menu.exec(event.globalPos())
def keyPressEvent(self, event) -> None:
modifiers = QtWidgets.QApplication.keyboardModifiers()

2
appGUI/MainGUI.py
View File

@@ -1786,6 +1786,8 @@ class MainGUI(QtWidgets.QMainWindow):
self.popmenu_save.setVisible(False)
self.popMenu.addSeparator()
self.popmenu_move2origin = self.popMenu.addAction(
QtGui.QIcon(self.app.resource_location + '/origin2_32.png'), _("Move2Origin"))
self.popmenu_move = self.popMenu.addAction(
QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move"))
self.popmenu_properties = self.popMenu.addAction(