From 6efd9f1c9954e003197755fabd5446bfcda86687 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Tue, 26 Jun 2012 19:13:32 +0200 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 - data/servicetypes/plasma-service.desktop | 2 +- data/servicetypes/plasma-toolbox.desktop | 2 +- data/servicetypes/plasma-wallpaper.desktop | 1 + .../plasma-containmentactions-test.desktop | 3 +-- tests/testengine/plasma-dataengine-testengine.desktop | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index fc4ccc209..f8bd81219 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -27,7 +27,6 @@ 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 fb5ea6148..d8a0e54c9 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -21,10 +21,10 @@ Comment[fr]=Service Plasma Comment[ga]=Seirbhís Plasma Comment[gl]=Servizo do Plasma Comment[he]=שירות של Plasma +Comment[hi]=प्लासमा सेवा 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 812815fdf..c5916ee62 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -21,10 +21,10 @@ Comment[fr]=Boîte à outils Plasma Comment[ga]=Bosca uirlisí Plasma Comment[gl]=Barra de ferramentas do Plasma Comment[he]=ארגז כלים של Plasma +Comment[hi]=प्लासमा औज़ारबक्सा 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/data/servicetypes/plasma-wallpaper.desktop b/data/servicetypes/plasma-wallpaper.desktop index 92413e93b..777d6e762 100644 --- a/data/servicetypes/plasma-wallpaper.desktop +++ b/data/servicetypes/plasma-wallpaper.desktop @@ -28,6 +28,7 @@ Comment[ga]=Cúlbhrat Plasma Comment[gl]=Fondo de escritorio do Plasma Comment[gu]=પ્લાઝમા વોલપેપર Comment[he]=תמונת רקע של Plasma +Comment[hi]=प्लाजमा वालपेपर Comment[hne]=प्लाज्मा वालपेपर Comment[hr]=Plasmina pozadinska slika Comment[hsb]=Tapeta za Plasma diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index f935444b8..696d067be 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -19,10 +19,10 @@ Name[fr]=Test Name[ga]=Tástáil Name[gl]=Proba Name[he]=בדיקה +Name[hi]=जांच Name[hr]=Test Name[hu]=Teszt Name[ia]=Essayo -Name[id]=Tes Name[is]=Prófun Name[it]=Prova Name[ja]=テスト @@ -84,7 +84,6 @@ 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]=テスト用のダミープラグイン diff --git a/tests/testengine/plasma-dataengine-testengine.desktop b/tests/testengine/plasma-dataengine-testengine.desktop index 52a7fa2e2..9a037a4f7 100644 --- a/tests/testengine/plasma-dataengine-testengine.desktop +++ b/tests/testengine/plasma-dataengine-testengine.desktop @@ -25,6 +25,7 @@ Name[ga]=Inneall Sonraí Tástála Name[gl]=Motor de datos de probas Name[gu]=ચકાસણી માહિતી એન્જિન Name[he]=בדיקה למנוע מידע +Name[hi]=जाँच डाटा इंजिन Name[hne]=जांच डाटा इंजिन Name[hr]=Provjeri podatkovni mehanizam Name[hsb]=Test Data Engine From daef7975e19c85a4783fcc421df956038fb27358 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 27 Jun 2012 12:33:07 +0200 Subject: [PATCH 2/2] close a toolbox on mouse ress anywhere BUG:260964 FIXED-IN:4.9 --- containment.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/containment.cpp b/containment.cpp index e1895c07d..5f13c2b50 100644 --- a/containment.cpp +++ b/containment.cpp @@ -548,6 +548,10 @@ void Containment::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event) { + //close a toolbox if exists, to emulate qmenu behavior + if (d->toolBox) { + d->toolBox.data()->setShowing(false); + } event->ignore(); if (d->appletAt(event->scenePos())) { return; //no unexpected click-throughs @@ -577,6 +581,7 @@ void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event) void Containment::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { event->ignore(); + if (d->appletAt(event->scenePos())) { return; //no unexpected click-throughs }