From 863c586b19e972389e199e744be0aaffbc5f9291 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Mar 2016 14:32:45 +0000 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- effects/morphingpopups/package/metadata.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 190070c9fc..475614a324 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -5,8 +5,10 @@ Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o l Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter geometry Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría +Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambiano la loro geometria Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen +Comment[nn]=Krysstoningsanimasjon når hjelpebobler eller varslingar endrar form Comment[pl]=Animacja zanikania przy zmianie geometrii wskazówek lub powiadomień Comment[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho Comment[pt_BR]=Animar a transição suave quando as dicas ou notificações mudarem de tamanho @@ -28,8 +30,10 @@ Name[ca@valencia]=Missatges emergents en metamorfosi Name[da]=Sammensmeltende pop-op'er Name[en_GB]=Morphing popups Name[es]=Transformación de ventanas emergentes +Name[fi]=Ponnahdusikkunoiden muodonmuutos Name[it]=Finestre a comparsa che si trasformano Name[nl]=Morphing popups +Name[nn]=Formendring for sprettoppvindauge Name[pl]=Morfing elementów wysuwnych Name[pt]=Mensagens com mudança de forma Name[pt_BR]=Mensagens com mudança de forma From fe745177e0f524abb72e1025fedb3d1031aa9c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 16 Mar 2016 11:06:53 +0100 Subject: [PATCH 2/2] [plugins/qpa] Add a roundtrip platform function Summary: Mostly intended for plugins loaded into KWin and wanting to use KWayland::Client::ConnectionThread::roundtrip(). By providing this function we can ensure that KWin does not block and nevertheless perform the required roundtrip. Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1153 --- plugins/qpa/nativeinterface.cpp | 21 +++++++++++++++++++++ plugins/qpa/nativeinterface.h | 1 + 2 files changed, 22 insertions(+) diff --git a/plugins/qpa/nativeinterface.cpp b/plugins/qpa/nativeinterface.cpp index c3cb175994..fc7ab3b29f 100644 --- a/plugins/qpa/nativeinterface.cpp +++ b/plugins/qpa/nativeinterface.cpp @@ -79,5 +79,26 @@ void *NativeInterface::nativeResourceForWindow(const QByteArray &resource, QWind return nullptr; } +static void roundtrip() +{ + if (!waylandServer()) { + return; + } + auto c = waylandServer()->internalClientConection(); + if (!c) { + return; + } + c->flush(); + waylandServer()->dispatch(); +} + +QFunctionPointer NativeInterface::platformFunction(const QByteArray &function) const +{ + if (qstrcmp(function.toLower(), "roundtrip") == 0) { + return &roundtrip; + } + return nullptr; +} + } } diff --git a/plugins/qpa/nativeinterface.h b/plugins/qpa/nativeinterface.h index b36ee1bb35..4a9f8e3988 100644 --- a/plugins/qpa/nativeinterface.h +++ b/plugins/qpa/nativeinterface.h @@ -35,6 +35,7 @@ public: explicit NativeInterface(Integration *integration); void *nativeResourceForIntegration(const QByteArray &resource) override; void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) override; + QFunctionPointer platformFunction(const QByteArray &function) const override; private: Integration *m_integration;