Set QgsCollapsibleGroupBox's collapse-on-uncheck to happen only when clicked by user

dakcarto · dakcarto · commit 0fd52ecf390c · 2013-04-13T19:12:18.000-06:00
- This keeps checkable group boxes from being programmatically collapsed when initializing a dialog
diff --git a/python/gui/qgscollapsiblegroupbox.sip b/python/gui/qgscollapsiblegroupbox.sip
@@ -35,6 +35,7 @@ class QgsCollapsibleGroupBoxBasic : QGroupBox
 
   public slots:
     void checkToggled( bool ckd );
+    void checkClicked( bool ckd );
     void toggleCollapsed();
 
   protected:
diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp
@@ -82,6 +82,7 @@ void QgsCollapsibleGroupBoxBasic::init()
 
   connect( mCollapseButton, SIGNAL( clicked() ), this, SLOT( toggleCollapsed() ) );
   connect( this, SIGNAL( toggled( bool ) ), this, SLOT( checkToggled( bool ) ) );
+  connect( this, SIGNAL( clicked( bool ) ), this, SLOT( checkClicked( bool ) ) );
 }
 
 void QgsCollapsibleGroupBoxBasic::showEvent( QShowEvent * event )
@@ -213,8 +214,16 @@ void QgsCollapsibleGroupBoxBasic::clearModifiers()
 
 void QgsCollapsibleGroupBoxBasic::checkToggled( bool chkd )
 {
+  Q_UNUSED( chkd );
   mCollapseButton->setEnabled( true ); // always keep enabled
-  // expand/collapse when toggled
+}
+
+void QgsCollapsibleGroupBoxBasic::checkClicked( bool chkd )
+{
+  // expand/collapse when checkbox toggled by user click.
+  // don't do this on toggle signal, otherwise group boxes will default to collapsed
+  // in option dialog constructors, reducing discovery of options by new users and
+  // overriding user's auto-saved collapsed/expanded state for the group box
   if ( chkd && isCollapsed() )
     setCollapsed( false );
   else if ( ! chkd && ! isCollapsed() )
diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h
@@ -96,6 +96,7 @@ class GUI_EXPORT QgsCollapsibleGroupBoxBasic : public QGroupBox
 
   public slots:
     void checkToggled( bool ckd );
+    void checkClicked( bool ckd );
     void toggleCollapsed();
 
   protected:
