SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@332 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-11-29 13:00:11 +00:00
parent 8333812844
commit 4683569bd5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qad/application/ribbon.cpp
View File

@@ -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);