alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* hide the icon when a null one is set

Browse Source 
* center the title text

svn path=/trunk/KDE/kdelibs/; revision=1185117
This commit is contained in:
Marco Martin 2010-10-12 10:02:19 +00:00
parent 2f468e0167
commit b2afff32f3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extenders/extendergroup.cpp
View File

@ -138,9 +138,6 @@ bool ExtenderGroup::isAutoCollapse() const
void ExtenderGroup::setAutoCollapse(bool collapse) void ExtenderGroup::setAutoCollapse(bool collapse)
{ {
d->autoCollapse = collapse; d->autoCollapse = collapse;
if (collapse) {
setCollapsed(d->collapsed);
}
} }
bool ExtenderGroup::isGroupCollapsed() const bool ExtenderGroup::isGroupCollapsed() const

11
extenders/extenderitem.cpp
View File

@ -159,6 +159,8 @@ ExtenderItem::ExtenderItem(Extender *hostExtender, uint extenderItemId)
d->collapseIcon = new IconWidget(d->toolbox); d->collapseIcon = new IconWidget(d->toolbox);
d->collapseIcon->setCursor(Qt::ArrowCursor); d->collapseIcon->setCursor(Qt::ArrowCursor);
d->titleLabel = new Label(d->toolbox); d->titleLabel = new Label(d->toolbox);
d->titleLabel->setWordWrap(false);
d->titleLabel->setAlignment(Qt::AlignCenter);
d->toolboxLayout->addItem(d->collapseIcon); d->toolboxLayout->addItem(d->collapseIcon);
d->toolboxLayout->addItem(d->titleLabel); d->toolboxLayout->addItem(d->titleLabel);
@ -322,6 +324,7 @@ void ExtenderItem::setIcon(const QIcon &icon)
if (d->collapseIcon->icon().isNull() || icon.cacheKey() != d->collapseIcon->icon().cacheKey()) { if (d->collapseIcon->icon().isNull() || icon.cacheKey() != d->collapseIcon->icon().cacheKey()) {
d->iconName.clear(); d->iconName.clear();
d->collapseIcon->setIcon(icon); d->collapseIcon->setIcon(icon);
d->collapseIcon->setVisible(!icon.isNull());
} }
} }
@ -841,6 +844,7 @@ void ExtenderItemPrivate::updateToolBox()
int closeIndex = -1; int closeIndex = -1;
int returnToSourceIndex = -1; int returnToSourceIndex = -1;
const int startingIndex = 2; // collapse item is index 0, title label is 1 const int startingIndex = 2; // collapse item is index 0, title label is 1
int lastIndex = 2;
const QSizeF widgetSize = collapseIcon->sizeFromIconSize(toolbox->iconSize()); const QSizeF widgetSize = collapseIcon->sizeFromIconSize(toolbox->iconSize());
QSet<QAction*> shownActions = actionsInOrder.toSet(); QSet<QAction*> shownActions = actionsInOrder.toSet();
@ -903,6 +907,7 @@ void ExtenderItemPrivate::updateToolBox()
button->setMaximumHeight(widgetSize.height()); button->setMaximumHeight(widgetSize.height());
button->setCursor(Qt::ArrowCursor); button->setCursor(Qt::ArrowCursor);
toolboxLayout->insertItem(startingIndex, button); toolboxLayout->insertItem(startingIndex, button);
++lastIndex;
} else { } else {
if (!icon) { if (!icon) {
icon = new IconWidget(q); icon = new IconWidget(q);
@ -916,6 +921,7 @@ void ExtenderItemPrivate::updateToolBox()
icon->setMaximumSize(widgetSize); icon->setMaximumSize(widgetSize);
icon->setCursor(Qt::ArrowCursor); icon->setCursor(Qt::ArrowCursor);
toolboxLayout->insertItem(startingIndex, icon); toolboxLayout->insertItem(startingIndex, icon);
++lastIndex;
} }
} }
} }
@ -941,6 +947,7 @@ void ExtenderItemPrivate::updateToolBox()
} else { } else {
toolboxLayout->insertItem(closeIndex - 1, returnToSourceIcon); toolboxLayout->insertItem(closeIndex - 1, returnToSourceIcon);
} }
++lastIndex;
} }
//add the close icon if desired. //add the close icon if desired.
@ -961,7 +968,11 @@ void ExtenderItemPrivate::updateToolBox()
destroyButton->setMaximumSize(widgetSize); destroyButton->setMaximumSize(widgetSize);
destroyButton->setCursor(Qt::ArrowCursor); destroyButton->setCursor(Qt::ArrowCursor);
toolboxLayout->addItem(destroyButton); toolboxLayout->addItem(destroyButton);
++lastIndex;
} }
//to keep the text really centered
toolboxLayout->setItemSpacing(0, KIconLoader::SizeSmall * (lastIndex - 2));
} }
Applet *ExtenderItemPrivate::hostApplet() const Applet *ExtenderItemPrivate::hostApplet() const