[CHANGE] dock widget help button only appears if help is available

src/qt4gui/guiElements/WQtDockTitleWidget.cpp

@@ -25,10 +25,11 @@
 #include "../WQt4Gui.h"
 #include "../WMainWindow.h"
 
+#include "WQtDockWidget.h"
 #include "WQtDockTitleWidget.h"
 #include "WQtDockTitleWidget.moc"
 
-WQtDockTitleWidget::WQtDockTitleWidget( QDockWidget* parent ):
+WQtDockTitleWidget::WQtDockTitleWidget( WQtDockWidget* parent ):
     QWidget( parent ),
     dockParent( parent )
 {
@@ -111,6 +112,7 @@ void WQtDockTitleWidget::construct()
     setupSizeConstraints( m_helpBtn );
     m_helpBtn->setMinimumSize( 24, 24 );
     m_helpBtn->setMaximumSize( 24, 24 );
+    m_helpBtn->setVisible( false );
 
     // fill layout
     titleWidgetLayout->addWidget( m_title );
@@ -204,7 +206,7 @@ void WQtDockTitleWidget::addTitleSeperator()
 
 void WQtDockTitleWidget::updateLayouts( int width )
 {
-    // calc the size of widgets and the title and the mandatory close button
+    // calculate the size of widgets and the title and the mandatory close button
     int minRequired = m_title->calculateSize( m_title->text().length() ) +
                       m_moreBtn->sizeHint().width() +
                       m_helpBtn->isVisible() * m_helpBtn->sizeHint().width() +
@@ -240,6 +242,17 @@ void WQtDockTitleWidget::updateLayouts( int width )
         m_toolsMenuLayout->addWidget( *i );
     }
 
-    // hide more button if nothing needs to be hiden
+    // hide more button if nothing needs to be hidden
     m_moreBtn->setHidden( !( hidden.size() ) );
 }
+
+void WQtDockTitleWidget::updateHelp()
+{
+    // hide button if no help is available.
+    if( dockParent->getHelpContext() == "" )
+    {
+        m_helpBtn->setVisible( false );
+        return;
+    }
+    m_helpBtn->setVisible( true );
+}

src/qt4gui/guiElements/WQtDockTitleWidget.h

@@ -35,6 +35,11 @@
 
 #include "WScaleLabel.h"
 
+/**
+ * We need the dock widget class.
+ */
+class WQtDockWidget;
+
 /**
  * Class for managing dock widget title bars.
  */
@@ -47,7 +52,7 @@ public:
      *
      * \param parent the parent
      */
-    explicit WQtDockTitleWidget( QDockWidget* parent );
+    explicit WQtDockTitleWidget( WQtDockWidget* parent );
 
     /**
      * Add the given action to the titlebar. It gets added after the previously added ones.
@@ -90,6 +95,10 @@ public:
      */
     virtual void removeTitleWidget( QWidget* widget );
 
+    /**
+     * Update help button.
+     */
+    virtual void updateHelp();
 protected:
     /**
      * Called upon resize. Used to switch between the more menu and the tools widget
@@ -167,7 +176,7 @@ private:
     /**
      * The parent as dock pointer
      */
-    QDockWidget* dockParent;
+    WQtDockWidget* dockParent;
 
     /**
      * We keep track of the widgets that we add

src/qt4gui/guiElements/WQtDockWidget.cpp

@@ -36,6 +36,7 @@ WQtDockWidget::WQtDockWidget( const QString& title, QWidget* parent, Qt::WindowF
     // thats it. we now have the title bar
     m_titleBar = new WQtDockTitleWidget( this );
     setTitleBarWidget( m_titleBar );
+    m_titleBar->updateHelp();
 
     // some standard dock features
     setAllowedAreas( Qt::AllDockWidgetAreas );
@@ -48,6 +49,7 @@ WQtDockWidget::WQtDockWidget( QWidget* parent, Qt::WindowFlags flags ):
     // thats it. we now have the title bar
     m_titleBar = new WQtDockTitleWidget( this );
     setTitleBarWidget( m_titleBar );
+    m_titleBar->updateHelp();
 
     // some standard dock features
     setAllowedAreas( Qt::AllDockWidgetAreas );
@@ -92,6 +94,7 @@ void WQtDockWidget::removeTitleWidget( QWidget* widget )
 void WQtDockWidget::setHelpContext( const QString& id )
 {
     m_helpContextId = id;
+    m_titleBar->updateHelp();
 }
 
 const QString& WQtDockWidget::getHelpContext()