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

Merged in 8.995_qt6_1 (pull request #18)

Browse Source 
8.995 qt6 1
This commit is contained in:
Marius Stanciu
2021-08-11 19:58:15 +00:00
parent 061e109e45 63506b57a3
commit 19441a1995
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appGUI/MainGUI.py
View File

@@ -3977,7 +3977,7 @@ class MainGUI(QtWidgets.QMainWindow):
def dropEvent(self, event): def dropEvent(self, event):
if event.mimeData().hasUrls: if event.mimeData().hasUrls:
event.setDropAction(QtCore.Qt.CopyAction) event.setDropAction(QtCore.Qt.DropAction.CopyAction)
event.accept() event.accept()
for url in event.mimeData().urls(): for url in event.mimeData().urls():
self.filename = str(url.toLocalFile()) self.filename = str(url.toLocalFile())

2
appObjects/ObjectCollection.py
View File

@@ -537,7 +537,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
return False return False
def supportedDropActions(self): def supportedDropActions(self):
return Qt.MoveAction return Qt.DropAction.MoveAction
def flags(self, index): def flags(self, index):
default_flags = QtCore.QAbstractItemModel.flags(self, index) default_flags = QtCore.QAbstractItemModel.flags(self, index)

8
appPlugins/ToolShell.py
View File

@@ -97,8 +97,8 @@ class TermWidget(QWidget):
:return: None :return: None
""" """
self._edit.setTextColor(QtCore.Qt.white) self._edit.setTextColor(QtCore.Qt.GlobalColor.white)
self._edit.setTextBackgroundColor(QtCore.Qt.darkGreen) self._edit.setTextBackgroundColor(QtCore.Qt.GlobalColor.darkGreen)
if detail is None: if detail is None:
self._edit.setPlainText(_("...processing...")) self._edit.setPlainText(_("...processing..."))
else: else:
@@ -113,8 +113,8 @@ class TermWidget(QWidget):
:return: :return:
""" """
self._edit.setTextColor(QtCore.Qt.black) self._edit.setTextColor(QtCore.Qt.GlobalColor.black)
self._edit.setTextBackgroundColor(QtCore.Qt.white) self._edit.setTextBackgroundColor(QtCore.Qt.GlobalColor.white)
self._edit.setPlainText('') self._edit.setPlainText('')
self._edit.setDisabled(False) self._edit.setDisabled(False)
self._edit.setFocus() self._edit.setFocus()

3
app_Main.py
View File

@@ -891,7 +891,8 @@ class App(QtCore.QObject):
# move splashscreen to the current monitor # move splashscreen to the current monitor
# desktop = QtWidgets.QApplication.desktop() # desktop = QtWidgets.QApplication.desktop()
# screen = desktop.screenNumber(QtGui.QCursor.pos()) # screen = desktop.screenNumber(QtGui.QCursor.pos())
screen = QtWidgets.QWidget.screen(self.splash) # screen = QtWidgets.QWidget.screen(self.splash)
screen = QtWidgets.QApplication.screenAt(QtGui.QCursor.pos())
current_screen_center = screen.availableGeometry().center() current_screen_center = screen.availableGeometry().center()
self.splash.move(current_screen_center - self.splash.rect().center()) self.splash.move(current_screen_center - self.splash.rect().center())