Fix QToolTip
svn path=/trunk/KDE/kdebase/workspace/; revision=508032icc-effect-5.14.5
parent
026d7fb501
commit
fde9470fdc
|
@ -820,7 +820,6 @@ void B2Client::desktopChange()
|
||||||
bool on = isOnAllDesktops();
|
bool on = isOnAllDesktops();
|
||||||
if (B2Button *b = button[BtnSticky]) {
|
if (B2Button *b = button[BtnSticky]) {
|
||||||
b->setDown(on);
|
b->setDown(on);
|
||||||
QToolTip::remove(b);
|
|
||||||
b->setToolTip(
|
b->setToolTip(
|
||||||
on ? i18n("Not on all desktops") : i18n("On all desktops"));
|
on ? i18n("Not on all desktops") : i18n("On all desktops"));
|
||||||
}
|
}
|
||||||
|
@ -832,7 +831,6 @@ void B2Client::maximizeChange()
|
||||||
if (button[BtnMax]) {
|
if (button[BtnMax]) {
|
||||||
button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
|
button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
|
||||||
button[BtnMax]->repaint();
|
button[BtnMax]->repaint();
|
||||||
QToolTip::remove(button[BtnMax]);
|
|
||||||
button[BtnMax]->setToolTip(
|
button[BtnMax]->setToolTip(
|
||||||
m ? i18n("Restore") : i18n("Maximize"));
|
m ? i18n("Restore") : i18n("Maximize"));
|
||||||
}
|
}
|
||||||
|
@ -866,7 +864,6 @@ void B2Client::shadeChange()
|
||||||
g->activate();
|
g->activate();
|
||||||
doShape();
|
doShape();
|
||||||
if (B2Button *b = button[BtnShade]) {
|
if (B2Button *b = button[BtnShade]) {
|
||||||
QToolTip::remove(b);
|
|
||||||
b->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade"));
|
b->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1411,7 +1411,6 @@ void KeramikClient::maximizeChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( button[ MaxButton ] ) {
|
if ( button[ MaxButton ] ) {
|
||||||
QToolTip::remove( button[ MaxButton ] );
|
|
||||||
button[ MaxButton ]->setToolTip( maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
|
button[ MaxButton ]->setToolTip( maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
|
||||||
button[ MaxButton ]->repaint();
|
button[ MaxButton ]->repaint();
|
||||||
}
|
}
|
||||||
|
@ -1423,7 +1422,6 @@ void KeramikClient::desktopChange()
|
||||||
if ( button[ OnAllDesktopsButton ] )
|
if ( button[ OnAllDesktopsButton ] )
|
||||||
{
|
{
|
||||||
button[ OnAllDesktopsButton ]->repaint( true );
|
button[ OnAllDesktopsButton ]->repaint( true );
|
||||||
QToolTip::remove( button[ OnAllDesktopsButton ] );
|
|
||||||
button[ OnAllDesktopsButton ]->setToolTip( isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
|
button[ OnAllDesktopsButton ]->setToolTip( isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1434,7 +1432,6 @@ void KeramikClient::shadeChange()
|
||||||
if ( button[ ShadeButton ] )
|
if ( button[ ShadeButton ] )
|
||||||
{
|
{
|
||||||
button[ ShadeButton ]->repaint( true );
|
button[ ShadeButton ]->repaint( true );
|
||||||
QToolTip::remove( button[ ShadeButton ] );
|
|
||||||
button[ ShadeButton ]->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade") );
|
button[ ShadeButton ]->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade") );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -761,7 +761,6 @@ void KWMThemeClient::desktopChange()
|
||||||
if (stickyBtn) {
|
if (stickyBtn) {
|
||||||
bool on = isOnAllDesktops();
|
bool on = isOnAllDesktops();
|
||||||
stickyBtn->setPixmap(on ? *pindownPix : *pinupPix);
|
stickyBtn->setPixmap(on ? *pindownPix : *pinupPix);
|
||||||
QToolTip::remove( stickyBtn );
|
|
||||||
stickyBtn->setToolTip( on ? i18n("Unsticky") : i18n("Sticky") );
|
stickyBtn->setToolTip( on ? i18n("Unsticky") : i18n("Sticky") );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -771,7 +770,6 @@ void KWMThemeClient::maximizeChange()
|
||||||
if (maxBtn) {
|
if (maxBtn) {
|
||||||
bool m = maximizeMode() == MaximizeFull;
|
bool m = maximizeMode() == MaximizeFull;
|
||||||
maxBtn->setPixmap(m ? *minmaxPix : *maxPix);
|
maxBtn->setPixmap(m ? *minmaxPix : *maxPix);
|
||||||
QToolTip::remove( maxBtn );
|
|
||||||
maxBtn->setToolTip( m ? i18n("Restore") : i18n("Maximize"));
|
maxBtn->setToolTip( m ? i18n("Restore") : i18n("Maximize"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -928,7 +928,6 @@ QSize KCommonDecorationButton::sizeHint() const
|
||||||
}
|
}
|
||||||
|
|
||||||
void KCommonDecorationButton::setTipText(const QString &tip) {
|
void KCommonDecorationButton::setTipText(const QString &tip) {
|
||||||
QToolTip::remove(this );
|
|
||||||
this->setToolTip( tip );
|
this->setToolTip( tip );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue