From 4d2620ca58c3263546a0c86e9e66804366837580 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sat, 25 Feb 2012 15:44:16 +0100 Subject: [PATCH 1/5] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 + data/servicetypes/plasma-service.desktop | 1 + data/servicetypes/plasma-toolbox.desktop | 1 + .../plasma-containmentactions-test.desktop | 2 ++ 4 files changed, 5 insertions(+) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index f8bd81219..fc4ccc209 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -27,6 +27,7 @@ Description[he]=פרוטוקול עבור הרכיבים של Plasma Description[hr]=Protokol za servise u Plasmi Description[hu]=Protokoll a Plazma-szolgáltatáshoz Description[ia]=un protocollo per servicios de Plasma +Description[id]=Protokol untuk layanan Plasma Description[is]=Samskiptamáti fyrir Plasma-þjónustur Description[it]=Un protocollo per servizi plasma Description[ja]=Plasma サービスのためのプロトコル diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop index 454722c77..fb5ea6148 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -24,6 +24,7 @@ Comment[he]=שירות של Plasma Comment[hr]=Servis u Plasmi Comment[hu]=Plazma-szolgáltatás Comment[ia]=Servicio de Plasma +Comment[id]=Layanan Plasma Comment[is]=Plasma-þjónusta Comment[it]=Servizio plasma Comment[ja]=Plasma サービス diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop index 612f32a88..812815fdf 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -24,6 +24,7 @@ Comment[he]=ארגז כלים של Plasma Comment[hr]=Plasma alatni okvir Comment[hu]=Plazma-eszközkészlet Comment[ia]=Instrumentario de Plasma +Comment[id]=Kotak alat Plasma Comment[is]=Plasma verkfærasafn Comment[it]=Barra degli strumenti plasma Comment[ja]=Plasma ツールボックス diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index 5488c7326..36a85ec8f 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -22,6 +22,7 @@ Name[he]=בדיקה Name[hr]=Test Name[hu]=Teszt Name[ia]=Essayo +Name[id]=Tes Name[is]=Prófun Name[it]=Prova Name[ja]=テスト @@ -83,6 +84,7 @@ Comment[he]=תוסף דמה לבדיקה Comment[hr]=Lažan priključak za testiranje Comment[hu]=Üres bővítmény teszteléshez Comment[ia]=Un plugin vacue pro essayar +Comment[id]=Plugin palsu untuk pengujian Comment[is]=Tilraunaíforrit fyrir prófanir Comment[it]=Una estensione fittizia di prova Comment[ja]=テスト用のダミープラグイン From 9a1eda0cbf934b1cb20a8cc7824e83d35996fc48 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Sun, 26 Feb 2012 00:16:35 +0100 Subject: [PATCH 2/5] fix crash on windows --- paintutils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/paintutils.cpp b/paintutils.cpp index b1d2ec5aa..d2ef4d691 100644 --- a/paintutils.cpp +++ b/paintutils.cpp @@ -147,6 +147,7 @@ QPixmap texturedText(const QString &text, const QFont &font, Plasma::Svg *textur buffPainter.setCompositionMode(QPainter::CompositionMode_SourceOver); buffPainter.drawImage(QPoint(0,0), image); buffPainter.drawPixmap(QPoint(1,1), pixmap); + buffPainter.end(); return ret; } From 94a074203a76501e27ce4731321c652ef7ad319c Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 1 Mar 2012 22:51:13 +0100 Subject: [PATCH 3/5] if the icon changes do a popupConstraintsEvent the decision always collapsed or not could have changed (if the icon becomes valid or isn't valid anymore) --- popupapplet.cpp | 1 + servicejob.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/popupapplet.cpp b/popupapplet.cpp index 9064f812b..2abdcf803 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -83,6 +83,7 @@ void PopupApplet::setPopupIcon(const QIcon &icon) setAspectRatioMode(d->savedAspectRatio); } + d->popupConstraintsEvent(FormFactorConstraint); return; } diff --git a/servicejob.h b/servicejob.h index b55b70e2f..6a975c0c7 100644 --- a/servicejob.h +++ b/servicejob.h @@ -132,8 +132,8 @@ private: }; } // namespace Plasma - -Q_DECLARE_METATYPE(Plasma::ServiceJob *) +using namespace Plasma; +Q_DECLARE_METATYPE(ServiceJob *) #endif // multiple inclusion guard From d24fbdc4c7ab1c9ce07e0ed9940b4964a547c094 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 2 Mar 2012 10:10:36 +0100 Subject: [PATCH 4/5] don't rerun popupConstraintsEvent if the icon situation is correct --- popupapplet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popupapplet.cpp b/popupapplet.cpp index 2abdcf803..59a20319c 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -81,9 +81,9 @@ void PopupApplet::setPopupIcon(const QIcon &icon) d->icon = 0; setLayout(0); setAspectRatioMode(d->savedAspectRatio); + d->popupConstraintsEvent(FormFactorConstraint); } - d->popupConstraintsEvent(FormFactorConstraint); return; } From 3c62cc78812e58596c470d3245081a85d6b89723 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 2 Mar 2012 10:40:18 +0100 Subject: [PATCH 5/5] partial revert of 1db495ef44dfc101ca6baa0349bcd5e97019d3d0 revert all the files that shouldn't have been modified --- servicejob.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servicejob.h b/servicejob.h index 6a975c0c7..b55b70e2f 100644 --- a/servicejob.h +++ b/servicejob.h @@ -132,8 +132,8 @@ private: }; } // namespace Plasma -using namespace Plasma; -Q_DECLARE_METATYPE(ServiceJob *) + +Q_DECLARE_METATYPE(Plasma::ServiceJob *) #endif // multiple inclusion guard