Added support for display of dock widget icons in DockArea tab menus

Author: Uwe Kindler

src/DockAreaWidget.cpp

@@ -224,12 +224,12 @@ void DockAreaWidgetPrivate::addTabsMenuEntry(CDockWidget* DockWidget,
 	QAction* Action;
 	if (Index >= 0 && Index < menu->actions().count())
 	{
-		Action = new QAction(DockWidget->windowTitle());
+		Action = new QAction(DockWidget->icon(), DockWidget->windowTitle());
 		menu->insertAction(menu->actions().at(Index), Action);
 	}
 	else
 	{
-		Action = menu->addAction(DockWidget->windowTitle());
+		Action = menu->addAction(DockWidget->icon(), DockWidget->windowTitle());
 	}
 	QVariant vAction = QVariant::fromValue(Action);
 	DockWidget->setProperty(ACTION_PROPERTY, vAction);

src/DockWidget.cpp

@@ -431,6 +431,13 @@ void CDockWidget::setIcon(const QIcon& Icon)
 }
 
 
+//============================================================================
+QIcon CDockWidget::icon() const
+{
+	return d->TitleWidget->icon();
+}
+
+
 
 } // namespace ads
 

src/DockWidget.h

@@ -227,6 +227,11 @@ class ADS_EXPORT CDockWidget : public QFrame
 	 */
 	void setIcon(const QIcon& Icon);
 
+	/**
+	 * Returns tzhe icon that has been assigned to the dock widget
+	 */
+	QIcon icon() const;
+
 public slots:
 	/**
 	 * This property controls whether the dock widget is open or closed.