From 36e36321014ad3ba21099dc97206a162ba22beda Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jan 2018 06:53:21 +0100 Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/scenes/opengl/opengl.json | 1 + plugins/scenes/qpainter/qpainter.json | 1 + plugins/scenes/xrender/xrender.json | 1 + 3 files changed, 3 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index d0bb2131e5..b56fc07268 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -12,6 +12,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL", "Description[ko]": "OpenGL로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via OpenGL", + "Description[nn]": "KWin-samansetjartillegg som brukar OpenGL", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL", "Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo OpenGL", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index db0b961045..6b46dbbcc7 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -14,6 +14,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter", "Description[ko]": "QPainter로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter", + "Description[nn]": "KWin-samansetjartillegg som brukar QPainter", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter", "Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index a1ca903579..8d25fe410f 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -14,6 +14,7 @@ "Description[it]": "Estensione del compositore di KWin per la resa tramite XRender", "Description[ko]": "XRender로 렌더링하는 KWin 컴포지터 플러그인", "Description[nl]": "KWin-compositor-plug-in rendering via XRender", + "Description[nn]": "KWin-samansetjartillegg som brukar XRender", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender", "Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender", "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo XRender", From e48eba00cc7303c56657efc3008cda1e140ead5e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Jan 2018 06:51:07 +0100 Subject: [PATCH 2/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- scripts/minimizeall/metadata.desktop | 1 + scripts/videowall/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 1fa1d346cf..448ccda6f6 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -42,6 +42,7 @@ Name[zh_TW]=全部最小化 Comment=Adds a shortcut to minimize and restore all windows Comment[ca]=Afegeix una drecera per a minimitzar i restaurar totes les finestres Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les finestres +Comment[da]=Tilføjer en genvej til at minimere og gendanne alle vinduer Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen Comment[en_GB]=Adds a shortcut to minimise and restore all windows Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index a8a991568e..2399883907 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -64,7 +64,7 @@ Comment[gl]=Estende un reprodutor de vídeo a pantalla completa por todas as pan Comment[he]=מפעיל נגן וידאו במסך מלא על כל המסכים המחוברים ליצירה של קיר וידאו Comment[hu]=Kiterjeszti a teljes képernyős videólejátszót az összes csatolt kijelzőre, hogy videófalat hozzon létre Comment[ia]=Extende jocator de video de schermo plen super omne schermos attachate pro crea un Muro de Video -Comment[id]=Rentangkan pemutar video layar penuh ke semua layar yang terhubung untuk menciptakan Dinding Video +Comment[id]=Rentangkan pemain video layar penuh ke semua layar yang terhubung untuk menciptakan Dinding Video Comment[it]=Distribuisci il lettore video a schermo pieno su tutti gli schermi per creare una parete video Comment[kk]=Видеоплейердің суретін бейне қабырғаны құратын экрандарға жайып көрсету Comment[km]=រំលង​កម្មវិធី​ចាក់​វីដេអូ​លើ​អេក្រង់​ដែល​បានភ្ជាប់ ដើម្បី​បង្កើត​ផ្ទាំង​វីដេអូ From 137f164261f9a452dd6bfcc93905f6f634a2acf6 Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Thu, 1 Feb 2018 17:35:40 +0530 Subject: [PATCH 3/4] Update version number for 5.12.0 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e98780d06..48cbcdbfef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.11.95") +set(PROJECT_VERSION "5.12.0") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0") From 6c00cfb5c75dd318421bc92b3a7da5454d169028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Thu, 1 Feb 2018 18:04:18 +0100 Subject: [PATCH 4/4] [libinput] Ensure Event::device returns a proper Device Summary: This fixes a problem when a Device added and another event on the Device are queued together. In that case the second event would not get the Device set as it's not yet created. This change ensures that when accessing device the pointer will be updated. BUG: 389674 FIXED-IN: 5.12.0 Reviewers: #kwin, #plasma, fvogt Subscribers: plasma-devel, kwin Tags: #plasma Differential Revision: https://phabricator.kde.org/D10236 --- libinput/events.cpp | 10 +++++++++- libinput/events.h | 6 ++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libinput/events.cpp b/libinput/events.cpp index cf52fc2b06..f1293de999 100644 --- a/libinput/events.cpp +++ b/libinput/events.cpp @@ -69,7 +69,7 @@ Event *Event::create(libinput_event *event) Event::Event(libinput_event *event, libinput_event_type type) : m_event(event) , m_type(type) - , m_device(Device::getDevice(libinput_event_get_device(m_event))) + , m_device(nullptr) { } @@ -78,6 +78,14 @@ Event::~Event() libinput_event_destroy(m_event); } +Device *Event::device() const +{ + if (!m_device) { + m_device = Device::getDevice(libinput_event_get_device(m_event)); + } + return m_device; +} + libinput_device *Event::nativeDevice() const { if (m_device) { diff --git a/libinput/events.h b/libinput/events.h index f9f6bb429c..a6c8eafc88 100644 --- a/libinput/events.h +++ b/libinput/events.h @@ -42,9 +42,7 @@ public: virtual ~Event(); libinput_event_type type() const; - Device *device() const { - return m_device; - } + Device *device() const; libinput_device *nativeDevice() const; operator libinput_event*() { @@ -62,7 +60,7 @@ protected: private: libinput_event *m_event; libinput_event_type m_type; - Device *m_device; + mutable Device *m_device; }; class KeyEvent : public Event