From a3ec982d01c82260a32b4885dca9ed4955c0b5d2 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sat, 1 Oct 2011 15:12:18 +0200 Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 + 1 file changed, 1 insertion(+) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index c52eb8ffb..00384ed59 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -49,6 +49,7 @@ Description[tr]=Plasma servisleri için bir protokol Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى Description[uk]=Протокол для служб Плазми Description[x-test]=xxA protocol for Plasma servicesxx +Description[zh_CN]=Plasma 服务协议 Description[zh_TW]=Plasma 服務協定 helper=true From 9abdf64813658ec2524e6a719c5b35b5a4cd27f1 Mon Sep 17 00:00:00 2001 From: Alexey Chernov <4ernov@gmail.com> Date: Sun, 25 Sep 2011 19:05:26 +0400 Subject: [PATCH 2/4] Remove waste setTextBackgroundColor() for internal KTextEdit Removed setTextBackgroundColor() for internal KTextEdit as it seems to be useless and leads to QTBUG-21522 (http://bugreports.qt.nokia.com/browse/QTBUG-21522). REVIEW: 102698 --- widgets/textedit.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/widgets/textedit.cpp b/widgets/textedit.cpp index 13cc6aad9..633aec694 100644 --- a/widgets/textedit.cpp +++ b/widgets/textedit.cpp @@ -112,7 +112,6 @@ void TextEdit::setNativeWidget(KTextEdit *nativeWidget) nativeWidget->setAttribute(Qt::WA_NoSystemBackground); nativeWidget->setFrameShape(QFrame::NoFrame); - nativeWidget->setTextBackgroundColor(Qt::transparent); nativeWidget->viewport()->setAutoFillBackground(false); nativeWidget->verticalScrollBar()->setStyle(d->style.data()); nativeWidget->horizontalScrollBar()->setStyle(d->style.data()); From 28ab3be499a33b47caed13abf67cbda09e76ba54 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 3 Oct 2011 14:06:34 +0200 Subject: [PATCH 3/4] small performance improvement for the removeAllSources case --- dataengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengine.cpp b/dataengine.cpp index 5993942c1..84e0f347b 100644 --- a/dataengine.cpp +++ b/dataengine.cpp @@ -330,10 +330,10 @@ void DataEngine::removeAllSources() QMutableHashIterator it(d->sources); while (it.hasNext()) { it.next(); - const QString source = it.key(); Plasma::DataContainer *s = it.value(); it.remove(); - emit sourceRemoved(source); + emit sourceRemoved(it.key()); + s->disconnect(this); delete s; } } From ef069ab402bb4d8654a0401f3fdc51c81a0d5be4 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Mon, 3 Oct 2011 17:26:12 +0200 Subject: [PATCH 4/4] RSIP_OnMouseClick as Oxygen style does --- private/style.cpp | 10 ++++++++++ private/style_p.h | 1 + 2 files changed, 11 insertions(+) diff --git a/private/style.cpp b/private/style.cpp index 1e01302d1..9fff60d8a 100644 --- a/private/style.cpp +++ b/private/style.cpp @@ -314,6 +314,16 @@ QRect Style::subControlRect(ComplexControl control, const QStyleOptionComplex *o } } +int Style::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const +{ + switch (hint) { + case SH_RequestSoftwareInputPanel: + return RSIP_OnMouseClick; + default: + return QCommonStyle::styleHint(hint, option, widget, returnData); + } +} + int Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const { if (Theme::defaultTheme()->useNativeWidgetStyle()) { diff --git a/private/style_p.h b/private/style_p.h index 7f88ec884..787cf8d76 100644 --- a/private/style_p.h +++ b/private/style_p.h @@ -45,6 +45,7 @@ public: ~Style(); void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const; + int styleHint(StyleHint hint, const QStyleOption *option=0, const QWidget *widget=0, QStyleHintReturn *returnData=0) const; protected: void drawComplexControl(ComplexControl control,