From 4a75f4a69b35c2a69303eac87195640493186621 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Wed, 28 Dec 2011 15:40:44 +0100 Subject: [PATCH 1/3] 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 c3ae0d68b..0de900fb9 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -19,6 +19,7 @@ Description[et]=Plasma teenuste protokoll Description[eu]=Plasma zerbitzuentzako protokolo bat Description[fi]=Plasma-palvelujen yhteyskäytäntö Description[fr]=Un protocole pour les services Plasma +Description[ga]=Prótacal le haghaidh seirbhísí Plasma Description[hr]=Protokol za servise u Plasmi Description[hu]=Protokoll a Plazma-szolgáltatáshoz Description[ia]=un protocollo per servicios de Plasma diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop index db21604e7..b2580f935 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -17,6 +17,7 @@ Comment[et]=Plasma teenus Comment[eu]=Plasma zerbitzua Comment[fi]=Plasma-palvelu Comment[fr]=Service Plasma +Comment[ga]=Seirbhís Plasma Comment[gl]=Servizo do Plasma Comment[hr]=Servis u Plasmi Comment[hu]=Plazma-szolgáltatás diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop index 92a5bffaa..3d3c20b57 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -17,6 +17,7 @@ Comment[et]=Plasma tööriistakast Comment[eu]=Plasma tresna-kutxa Comment[fi]=Plasma-työkalurivi Comment[fr]=Boîte à outils Plasma +Comment[ga]=Bosca uirlisí Plasma Comment[gl]=Barra de ferramentas do Plasma Comment[hr]=Plasma alatni okvir Comment[hu]=Plazma-eszközkészlet diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index 87582b8d9..1ab082b35 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -15,6 +15,7 @@ Name[eu]=Proba Name[fa]=آزمون Name[fi]=Testi Name[fr]=Test +Name[ga]=Tástáil Name[gl]=Proba Name[hr]=Test Name[hu]=Teszt @@ -68,6 +69,7 @@ Comment[et]=Libaplugin testimiseks Comment[eu]=Probatarako gezurretazko plugin bat Comment[fi]=Tyhjä testausliitännäinen Comment[fr]=Un module factice de test +Comment[ga]=Bréagbhreiseán le haghaidh tástála Comment[gl]=Un engadido para probas Comment[hr]=Lažan priključak za testiranje Comment[hu]=Üres bővítmény teszteléshez From 7126ebd18a60e8e110cac2415d56be52627139f3 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Thu, 29 Dec 2011 10:46:14 +0100 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 + data/servicetypes/plasma-dataengine.desktop | 2 +- data/servicetypes/plasma-service.desktop | 1 + data/servicetypes/plasma-toolbox.desktop | 1 + tests/packagemetadatatest.desktop | 2 +- .../plasma-containmentactions-test.desktop | 4 +++- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index f95baf84d..a16b50b81 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -20,6 +20,7 @@ Description[et]=Plasma teenuste protokoll Description[eu]=Plasma zerbitzuentzako protokolo bat Description[fi]=Plasma-palvelujen yhteyskäytäntö Description[fr]=Un protocole pour les services Plasma +Description[ga]=Prótacal le haghaidh seirbhísí Plasma Description[gl]=Un protocolo para servizos do Plasma Description[hr]=Protokol za servise u Plasmi Description[hu]=Protokoll a Plazma-szolgáltatáshoz diff --git a/data/servicetypes/plasma-dataengine.desktop b/data/servicetypes/plasma-dataengine.desktop index 13e85544e..29b9aa2d3 100644 --- a/data/servicetypes/plasma-dataengine.desktop +++ b/data/servicetypes/plasma-dataengine.desktop @@ -71,7 +71,7 @@ Comment[ta]=பிளாஸ்மா தரவு இயந்திரம் Comment[tg]=Системаи маълумотии Plasma Comment[th]=กลไกข้อมูลของพลาสมา Comment[tr]=Plasma Veri Motoru -Comment[ug]=Plasma سانلىق مەلۇمات ماتورى +Comment[ug]=Plasma سانلىق-مەلۇمات ماتورى Comment[uk]=Рушій даних Плазми Comment[vi]=Cơ chế dữ liệu Plasma Comment[wa]=Moteur di dnêyes di Plasma diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop index e04e3b437..ac7e09038 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -17,6 +17,7 @@ Comment[et]=Plasma teenus Comment[eu]=Plasma zerbitzua Comment[fi]=Plasma-palvelu Comment[fr]=Service Plasma +Comment[ga]=Seirbhís Plasma Comment[gl]=Servizo do Plasma Comment[hr]=Servis u Plasmi Comment[hu]=Plazma-szolgáltatás diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop index 308ff77e8..9b433a50a 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -17,6 +17,7 @@ Comment[et]=Plasma tööriistakast Comment[eu]=Plasma tresna-kutxa Comment[fi]=Plasma-työkalurivi Comment[fr]=Boîte à outils Plasma +Comment[ga]=Bosca uirlisí Plasma Comment[gl]=Barra de ferramentas do Plasma Comment[hr]=Plasma alatni okvir Comment[hu]=Plazma-eszközkészlet diff --git a/tests/packagemetadatatest.desktop b/tests/packagemetadatatest.desktop index 793f65ca0..f790eb0e0 100644 --- a/tests/packagemetadatatest.desktop +++ b/tests/packagemetadatatest.desktop @@ -64,7 +64,7 @@ Name[ta]=பொதியின் மூலத்தரவு சோதனைக Name[tg]=Файли санҷишии стсетмаи metadata Name[th]=แฟ้มทดสอบข้อมูลกำกับแพกเกจ Name[tr]=Paket metadata test dosyası -Name[ug]=بوغچا مېتا سانلىق مەلۇمات سىناق ھۆججەت +Name[ug]=بوغچا مېتا سانلىق-مەلۇمات سىناق ھۆججەت Name[uk]=Файл перевірки метаданих пакунка Name[vi]=Tập tin kiểm tra dữ liệu lý lịch Plasma Name[wa]=Fitchî d' asprouvaedje des meta-dnêyes do pacaedje diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index 6d12204b8..74831a9c4 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -15,6 +15,7 @@ Name[eu]=Proba Name[fa]=آزمون Name[fi]=Testi Name[fr]=Test +Name[ga]=Tástáil Name[gl]=Proba Name[hr]=Test Name[hu]=Teszt @@ -47,7 +48,7 @@ Name[sr@latin]=Proba Name[sv]=Test Name[th]=ทดสอบ Name[tr]=Deneme -Name[ug]=سىنا +Name[ug]=سىناق Name[uk]=Тест Name[vi]=Kiểm tra Name[wa]=Sayî @@ -69,6 +70,7 @@ Comment[et]=Libaplugin testimiseks Comment[eu]=Probatarako gezurretazko plugin bat Comment[fi]=Tyhjä testausliitännäinen Comment[fr]=Un module factice de test +Comment[ga]=Bréagbhreiseán le haghaidh tástála Comment[gl]=Un engadido para probas Comment[hr]=Lažan priključak za testiranje Comment[hu]=Üres bővítmény teszteléshez From 6dcaf4fe7fd1674942a24cfcdf041347c9f723ed Mon Sep 17 00:00:00 2001 From: Nikita Churaev Date: Sat, 31 Dec 2011 11:45:02 +0400 Subject: [PATCH 3/3] Fix one-pixel distance from some edges. REVIEW: 103595 --- corona.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/corona.cpp b/corona.cpp index 366a9df01..5c90aa434 100644 --- a/corona.cpp +++ b/corona.cpp @@ -540,8 +540,8 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig pos.setX(pos.x() + actualItem->boundingRect().width() - s.width()); } - if (pos.x() + s.width() > v->geometry().right()) { - pos.setX(v->geometry().right() - s.width()); + if (pos.x() + s.width() > v->geometry().x() + v->geometry().width()) { + pos.setX((v->geometry().x() + v->geometry().width()) - s.width()); } else { pos.setX(qMax(pos.x(), v->geometry().left())); } @@ -555,8 +555,8 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig pos.setY(pos.y() + actualItem->boundingRect().height() - s.height()); } - if (pos.y() + s.height() > v->geometry().bottom()) { - pos.setY(v->geometry().bottom() - s.height()); + if (pos.y() + s.height() > v->geometry().y() + v->geometry().height()) { + pos.setY((v->geometry().y() + v->geometry().height()) - s.height()); } else { pos.setY(qMax(pos.y(), v->geometry().top())); } @@ -591,10 +591,10 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig pos.setY(v->geometry().y() - s.height()); break; case TopEdge: - pos.setY(v->geometry().bottom()); + pos.setY(v->geometry().y() + v->geometry().height()); break; case LeftEdge: - pos.setX(v->geometry().right()); + pos.setX(v->geometry().x() + v->geometry().width()); break; case RightEdge: pos.setX(v->geometry().x() - s.width()); @@ -609,12 +609,12 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig //kDebug() << "==> rect for" << screen << "is" << screenRect; - if (loc != LeftEdge && pos.x() + s.width() > screenRect.right()) { - pos.rx() -= ((pos.x() + s.width()) - screenRect.right()); + if (loc != LeftEdge && pos.x() + s.width() > screenRect.x() + screenRect.width()) { + pos.rx() -= ((pos.x() + s.width()) - (screenRect.x() + screenRect.width())); } - if (loc != TopEdge && pos.y() + s.height() > screenRect.bottom()) { - pos.ry() -= ((pos.y() + s.height()) - screenRect.bottom()); + if (loc != TopEdge && pos.y() + s.height() > screenRect.y() + screenRect.height()) { + pos.ry() -= ((pos.y() + s.height()) - (screenRect.y() + screenRect.height())); } pos.rx() = qMax(0, pos.x());