git-svn-id: svn://db.shs.com.ru/libs@454 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -77,12 +77,13 @@ void Ribbon::init() {
|
|||||||
connect(tab, SIGNAL(tabHovered(int)), this, SLOT(tabHovered(int)));
|
connect(tab, SIGNAL(tabHovered(int)), this, SLOT(tabHovered(int)));
|
||||||
connect(tab, SIGNAL(currentChanged(int)), this, SIGNAL(currentTabChanged(int)));
|
connect(tab, SIGNAL(currentChanged(int)), this, SIGNAL(currentTabChanged(int)));
|
||||||
tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||||
QGroupBox * g;
|
QFrame * g;
|
||||||
QBoxLayout * l, * tl;
|
QBoxLayout * l, * tl;
|
||||||
QToolButton * b;
|
QToolButton * b;
|
||||||
//tab->setIconSize(QSize(32, 32));
|
//tab->setIconSize(QSize(32, 32));
|
||||||
foreach (QAction * i, lm) {
|
foreach (QAction * i, lm) {
|
||||||
if (i->menu() == 0) continue;
|
if (!i->menu()) continue;
|
||||||
|
//if (!i->menu()->isVisible()) continue;
|
||||||
la = i->menu()->actions();
|
la = i->menu()->actions();
|
||||||
QIcon tic = i->icon();
|
QIcon tic = i->icon();
|
||||||
if (!tic.isNull())
|
if (!tic.isNull())
|
||||||
@@ -112,7 +113,7 @@ void Ribbon::init() {
|
|||||||
#else
|
#else
|
||||||
tl->setContentsMargins(2, 0, 2, 2);
|
tl->setContentsMargins(2, 0, 2, 2);
|
||||||
#endif
|
#endif
|
||||||
g = new QGroupBox();
|
g = new QFrame(); g->setFrameShape(QFrame::StyledPanel);
|
||||||
l = new QBoxLayout(QBoxLayout::LeftToRight);
|
l = new QBoxLayout(QBoxLayout::LeftToRight);
|
||||||
g->setLayout(l);
|
g->setLayout(l);
|
||||||
l->setSpacing(2);
|
l->setSpacing(2);
|
||||||
@@ -121,7 +122,7 @@ void Ribbon::init() {
|
|||||||
if (j->isSeparator()) {
|
if (j->isSeparator()) {
|
||||||
if (l->isEmpty()) continue;
|
if (l->isEmpty()) continue;
|
||||||
tl->addWidget(g);
|
tl->addWidget(g);
|
||||||
g = new QGroupBox();
|
g = new QFrame(); g->setFrameShape(QFrame::StyledPanel);
|
||||||
l = new QBoxLayout(QBoxLayout::LeftToRight);
|
l = new QBoxLayout(QBoxLayout::LeftToRight);
|
||||||
l->setSpacing(2);
|
l->setSpacing(2);
|
||||||
l->setContentsMargins(2, 2, 2, 2);
|
l->setContentsMargins(2, 2, 2, 2);
|
||||||
|
|||||||
Reference in New Issue
Block a user