From 4683569bd505e5581f3ba554319aa800d82dbb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 29 Nov 2017 13:00:11 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@332
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/application/ribbon.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/qad/application/ribbon.cpp b/qad/application/ribbon.cpp
index ed29d56..8e1bd3d 100644
--- a/qad/application/ribbon.cpp
+++ b/qad/application/ribbon.cpp
@@ -69,7 +69,7 @@ void Ribbon::init() {
 	if (parent == 0) return;
 	if (parent->menuBar() == 0) return;
 	QList<QAction * > lm = parent->menuBar()->actions(), la;
-	if (tab) delete tab;
+	clear();
 	if (scroll_area) delete scroll_area;
 	buttons.clear();
 	tab = new ETabWidget();
@@ -84,7 +84,14 @@ void Ribbon::init() {
 	foreach (QAction * i, lm) {
 		if (i->menu() == 0) continue;
 		la = i->menu()->actions();
-		tab->addTab(new QWidget(), i->icon(), i->text());
+		QIcon tic = i->icon();
+		if (!tic.isNull())
+			i->setProperty("__icon", QVariant::fromValue<QIcon>(tic));
+		else
+			tic = i->property("__icon").value<QIcon>();
+		tab->addTab(new QWidget(), tic, i->text());
+		//qDebug() << this << i->icon() << i->text();
+		//continue;
 		/*QScrollArea * sa = new QScrollArea();
 		sa->setWidget(new QWidget());
 		sa->setWidgetResizable(true);