Merge branch 'closable_docks' into develop

CHANGELOG

@@ -49,6 +49,7 @@ pyqtgraph-0.9.9  [unreleased]
     - Added configurable formatting for TableWidget
     - Added 'stepMode' argument to PlotDataItem()
     - Added ViewBox.invertX()
+    - Docks now have optional close button
 
   Bugfixes:
     - PlotCurveItem now has correct clicking behavior--clicks within a few px

examples/dockarea.py

@@ -35,7 +35,7 @@ win.setWindowTitle('pyqtgraph example: dockarea')
 ## Note that size arguments are only a suggestion; docks will still have to
 ## fill the entire dock area and obey the limits of their internal widgets.
 d1 = Dock("Dock1", size=(1, 1))     ## give this dock the minimum possible size
-d2 = Dock("Dock2 - Console", size=(500,300))
+d2 = Dock("Dock2 - Console", size=(500,300), closable=True)
 d3 = Dock("Dock3", size=(500,400))
 d4 = Dock("Dock4 (tabbed) - Plot", size=(500,200))
 d5 = Dock("Dock5 - Image", size=(500,200))

pyqtgraph/dockarea/Container.py

@@ -22,6 +22,9 @@ class Container(object):
         return None
 
     def insert(self, new, pos=None, neighbor=None):
+        # remove from existing parent first
+        new.setParent(None)
+        
         if not isinstance(new, list):
             new = [new]
         if neighbor is None:

pyqtgraph/dockarea/Dock.py

@@ -8,11 +8,13 @@ class Dock(QtGui.QWidget, DockDrop):
     
     sigStretchChanged = QtCore.Signal()
     
-    def __init__(self, name, area=None, size=(10, 10), widget=None, hideTitle=False, autoOrientation=True):
+    def __init__(self, name, area=None, size=(10, 10), widget=None, hideTitle=False, autoOrientation=True, closable=False):
         QtGui.QWidget.__init__(self)
         DockDrop.__init__(self)
         self.area = area
-        self.label = DockLabel(name, self)
+        self.label = DockLabel(name, self, closable)
+        if closable:
+            self.label.sigCloseClicked.connect(self.close)
         self.labelHidden = False
         self.moveLabel = True  ## If false, the dock is no longer allowed to move the label.
         self.autoOrient = autoOrientation
@@ -239,12 +241,13 @@ class Dock(QtGui.QWidget, DockDrop):
     def dropEvent(self, *args):
         DockDrop.dropEvent(self, *args)
 
+
 class DockLabel(VerticalLabel):
     
     sigClicked = QtCore.Signal(object, object)
+    sigCloseClicked = QtCore.Signal()
     
-    def __init__(self, text, dock):
+    def __init__(self, text, dock, showCloseButton):
-        self.startedDrag = False
         self.dim = False
         self.fixedWidth = False
         VerticalLabel.__init__(self, text, orientation='horizontal', forceWidth=False)
@@ -252,10 +255,13 @@ class DockLabel(VerticalLabel):
         self.dock = dock
         self.updateStyle()
         self.setAutoFillBackground(False)
+        self.startedDrag = False
 
-    #def minimumSizeHint(self):
+        self.closeButton = None
-        ##sh = QtGui.QWidget.minimumSizeHint(self)
+        if showCloseButton:
-        #return QtCore.QSize(20, 20)
+            self.closeButton = QtGui.QToolButton(self)
+            self.closeButton.clicked.connect(self.sigCloseClicked)
+            self.closeButton.setIcon(QtGui.QApplication.style().standardIcon(QtGui.QStyle.SP_TitleBarCloseButton))
 
     def updateStyle(self):
         r = '3px'
@@ -316,11 +322,9 @@ class DockLabel(VerticalLabel):
         if not self.startedDrag and (ev.pos() - self.pressPos).manhattanLength() > QtGui.QApplication.startDragDistance():
             self.dock.startDrag()
         ev.accept()
-        #print ev.pos()
             
     def mouseReleaseEvent(self, ev):
         if not self.startedDrag:
-            #self.emit(QtCore.SIGNAL('clicked'), self, ev)
             self.sigClicked.emit(self, ev)
         ev.accept()
         
@@ -328,13 +332,14 @@ class DockLabel(VerticalLabel):
         if ev.button() == QtCore.Qt.LeftButton:
             self.dock.float()
             
-    #def paintEvent(self, ev):
+    def resizeEvent (self, ev):
-        #p = QtGui.QPainter(self)
+        if self.closeButton:
-        ##p.setBrush(QtGui.QBrush(QtGui.QColor(100, 100, 200)))
+            if self.orientation == 'vertical':
-        #p.setPen(QtGui.QPen(QtGui.QColor(50, 50, 100)))
+                size = ev.size().width()
-        #p.drawRect(self.rect().adjusted(0, 0, -1, -1))
+                pos = QtCore.QPoint(0, 0)
-        
+            else:
-        #VerticalLabel.paintEvent(self, ev)
+                size = ev.size().height()
-            
+                pos = QtCore.QPoint(ev.size().width() - size, 0)
-            
+            self.closeButton.setFixedSize(QtCore.QSize(size, size))
-            
+            self.closeButton.move(pos)
+        super(DockLabel,self).resizeEvent(ev)