2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 03:08:27 +08:00

gui: add pyqtgraph patch to prevent closing of detached nonclosable docks (move them to main window instead)

This commit is contained in:
Sebastien Bourdeauducq 2015-07-19 18:08:24 +02:00
parent bb05ed268e
commit 97ebdee2c6

View File

@ -0,0 +1,28 @@
diff --git a/pyqtgraph/dockarea/Dock.py b/pyqtgraph/dockarea/Dock.py
index 4493d07..a05e685 100644
--- a/pyqtgraph/dockarea/Dock.py
+++ b/pyqtgraph/dockarea/Dock.py
@@ -18,6 +18,7 @@ class Dock(QtGui.QWidget, DockDrop):
self.label = DockLabel(name, self, closable)
if closable:
self.label.sigCloseClicked.connect(self.close)
+ self.closable = closable
self.labelHidden = False
self.moveLabel = True ## If false, the dock is no longer allowed to move the label.
self.autoOrient = autoOrientation
diff --git a/pyqtgraph/dockarea/DockArea.py b/pyqtgraph/dockarea/DockArea.py
index ffe75b6..b054b24 100644
--- a/pyqtgraph/dockarea/DockArea.py
+++ b/pyqtgraph/dockarea/DockArea.py
@@ -306,7 +306,10 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
def clear(self):
docks = self.findAll()[1]
for dock in docks.values():
- dock.close()
+ if dock.closable:
+ dock.close()
+ else:
+ self.home.moveDock(dock, "top", None)
## PySide bug: We need to explicitly redefine these methods
## or else drag/drop events will not be delivered.