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

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

Browse Source 
Conflicts:
	kdecore/services/kmimeglobsfileparser.cpp [whole file is gone]
	kdecore/sycoca/kprotocolinfo.cpp [rewritten in kio; hand-merged]
	kdeui/widgets/kmainwindow.cpp [geometry handling, code is gone]
	kfile/kfileplacesitem.cpp
	kio/kio/kfileitem.cpp [tons of kurl/qmimetype differences for the big if(!d) patch]
	kio/tests/kfileitemtest.cpp [kurl]
	plasma/private/applethandle.cpp [namespace]
	plasma/runnermanager.cpp
	staging/kservice/src/services/kservicetypetrader.h [i18n]
This commit is contained in:
David Faure 2012-10-30 19:25:57 +01:00
commit 3e623699ce
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/applethandle.cpp
View File

@ -236,7 +236,7 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
QLinearGradient g(QPoint(0, 0), QPoint(m_decorationRect.width(), 0)); QLinearGradient g(QPoint(0, 0), QPoint(m_decorationRect.width(), 0));
//fading out panel //fading out panel
if (m_applet->backgroundHints() != Plasma::NoBackground && if (m_applet && m_applet->backgroundHints() != Plasma::NoBackground &&
m_rect.height() > qreal(minimumHeight()) * 1.25) { m_rect.height() > qreal(minimumHeight()) * 1.25) {
if (m_buttonsOnRight) { if (m_buttonsOnRight) {
qreal opaquePoint = qreal opaquePoint =

3
runnermanager.cpp
View File

@ -301,6 +301,9 @@ public:
#endif #endif
QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool))); QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool)));
runner->init(); runner->init();
if (prepped) {
emit runner->prepare();
}
} }
return runner; return runner;