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

Merge remote-tracking branch 'origin/KDE/4.9' into frameworks

Browse Source 
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
This commit is contained in:
David Faure 2012-07-20 15:10:26 +02:00
commit d930917d95
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/servicetypes/plasma-applet-popupapplet.desktop
View File

@ -18,7 +18,7 @@ Comment[en_GB]=Plasma scripting popup applet
Comment[es]=Miniaplicación emergente de script para Plasma
Comment[et]=Plasma skriptimise hüpikaplett
Comment[eu]=Plasma scripting popup appleta
Comment[fi]=Plasma ponnahdusikkunoiden skriptisovelma
Comment[fi]=Skriptikielellä tehty Plasma-ponnahdussovelma
Comment[fr]=Applet de script Plasma
Comment[fy]=Plasma scripting popup applet
Comment[ga]=Feidhmchláirín aníos scriptithe Plasma

5
dialog.cpp
View File

@ -174,7 +174,8 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
qreal bottomHeight(0);
//decide about disabling the border attached to the panel
if (applet) {
//don't cut borders on tooltips
if (applet && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) {
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
switch (applet->location()) {
@ -226,7 +227,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
}
//decide if to disable the other borders
if (q->isVisible()) {
if (q->isVisible() && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) {
if (dialogGeom.left() <= avail.left()) {
borders &= ~FrameSvg::LeftBorder;
}

2
widgets/toolbutton.h
View File

@ -186,7 +186,7 @@ protected:
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
private slots:
private Q_SLOTS:
void setAnimationUpdate(qreal progress);
qreal animationUpdate() const;