From 2528ca466015fbbe1591cac87f5dabcc8d257bb6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Jan 2016 14:42:43 +0000 Subject: [PATCH 1/9] SVN_SILENT made messages (.desktop file) --- backends/virtual/virtual.json | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/virtual/virtual.json b/backends/virtual/virtual.json index a3d63e20b9..add4bf3c8f 100644 --- a/backends/virtual/virtual.json +++ b/backends/virtual/virtual.json @@ -3,6 +3,7 @@ "Description": "Render to a virtual framebuffer.", "Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.", "Description[ca]": "Renderitza a un «framebuffer» virtual.", + "Description[de]": "In virtuellen Framebuffer rendern.", "Description[en_GB]": "Render to a virtual framebuffer.", "Description[es]": "Renderizar en un «framebuffer» virtual.", "Description[et]": "Renderdamine virtuaalses kaadripuhvris.", From 808e003481e0998a2f0043ec24a9c96064fbd41c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Jan 2016 13:26:59 +0000 Subject: [PATCH 2/9] SVN_SILENT made messages (.desktop file) --- backends/x11/x11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/x11/x11.json b/backends/x11/x11.json index d76309ae5e..93a649c407 100644 --- a/backends/x11/x11.json +++ b/backends/x11/x11.json @@ -34,7 +34,7 @@ "Name[ca]": "X11", "Name[cs]": "x11", "Name[da]": "x11", - "Name[de]": "x11", + "Name[de]": "X11", "Name[en_GB]": "x11", "Name[es]": "x11", "Name[et]": "x11", From e641022bf9482a11209577b5654cd43231be0755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 17 Jan 2016 22:01:00 +0100 Subject: [PATCH 3/9] skip SWAP_BEHAVIOR_PRESERVED for supportsBufferAge pointless and unsupported on latter MESA/DRI3 http://lists.freedesktop.org/archives/mesa-dev/2015-November/100869.html Thanks to Uriy Zhuravlev for reporting and investigation BUG: 356992 FIXED-IN: 5.5.4 --- eglonxbackend.cpp | 4 +++- libkwineffects/kwinglutils.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/eglonxbackend.cpp b/eglonxbackend.cpp index f7c9475cc1..f2c81dd5d1 100644 --- a/eglonxbackend.cpp +++ b/eglonxbackend.cpp @@ -91,6 +91,8 @@ EglOnXBackend::~EglOnXBackend() void EglOnXBackend::init() { + initEGL(); // required to toggle + initBufferAge(); // EGL_SWAP_BEHAVIOR_PRESERVED_BIT if (!initRenderingContext()) { setFailed(QStringLiteral("Could not initialize rendering context")); return; @@ -251,7 +253,7 @@ bool EglOnXBackend::initRenderingContext() bool EglOnXBackend::initBufferConfigs() { const EGLint config_attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_SWAP_BEHAVIOR_PRESERVED_BIT, + EGL_SURFACE_TYPE, EGL_WINDOW_BIT | (supportsBufferAge() ? 0 : EGL_SWAP_BEHAVIOR_PRESERVED_BIT), EGL_RED_SIZE, 1, EGL_GREEN_SIZE, 1, EGL_BLUE_SIZE, 1, diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp index 438b785610..8bf62cd89e 100644 --- a/libkwineffects/kwinglutils.cpp +++ b/libkwineffects/kwinglutils.cpp @@ -96,6 +96,8 @@ void initGLX() void initEGL() { EGLDisplay dpy = eglGetCurrentDisplay(); + if (dpy == EGL_NO_DISPLAY) + dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); int major, minor; eglInitialize(dpy, &major, &minor); eglVersion = MAKE_GL_VERSION(major, minor, 0); From e202ad46a12f0b14fb79e85476525f3053d8b091 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Jan 2016 15:37:46 +0000 Subject: [PATCH 4/9] SVN_SILENT made messages (.desktop file) --- backends/hwcomposer/hwcomposer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json index c5114ea6bd..e91c330ff3 100644 --- a/backends/hwcomposer/hwcomposer.json +++ b/backends/hwcomposer/hwcomposer.json @@ -32,6 +32,7 @@ "Name[ca@valencia]": "hwcomposer", "Name[ca]": "hwcomposer", "Name[cs]": "hwcomposer", + "Name[de]": "hwcomposer", "Name[en_GB]": "hwcomposer", "Name[es]": "hwcomposer", "Name[et]": "hwcomposer", From 9d57ecf23d65a3e7cca559d72d0eb415fb26915e Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 26 Jan 2016 10:30:28 +0000 Subject: [PATCH 5/9] Update version number for 5.5.4 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36f72f0c6d..6394246600 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.5.3") +set(PROJECT_VERSION "5.5.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 90112ef0cd6ed33f28b657f59d1cd3196077e955 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 26 Jan 2016 17:01:40 +0000 Subject: [PATCH 6/9] Use new Qt flag to disable high DPI scaling on X This flag was set for main_wayland but not X. BUG: 357896 REVIEW: 126810 --- main_x11.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main_x11.cpp b/main_x11.cpp index 2c137431b5..b2139e52e3 100644 --- a/main_x11.cpp +++ b/main_x11.cpp @@ -269,6 +269,9 @@ KWIN_EXPORT int kdemain(int argc, char * argv[]) setenv("QT_QPA_PLATFORM", "xcb", true); qunsetenv("QT_DEVICE_PIXEL_RATIO"); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); +#endif KWin::ApplicationX11 a(argc, argv); a.setupTranslator(); From 5e1a8c6b63a3f06f08295ee6d795552448c7a7a3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Feb 2016 16:14:11 +0000 Subject: [PATCH 7/9] SVN_SILENT made messages (.desktop file) --- effects/windowaperture/package/metadata.desktop | 2 ++ scripts/minimizeall/metadata.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 42eeda8aeb..d632e294c7 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Obertura de la finestra Name[cs]=Mřížka oken Name[da]=Vinduesblænding Name[de]=Fensteröffnung +Name[el]=Διάφραγμα παραθύρου Name[en_GB]=Window Aperture Name[es]=Apertura de ventanas Name[et]=Aknaava @@ -40,6 +41,7 @@ Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori Comment[ca@valencia]=Mou la finestra cap a les cantonades en mostrar l'escriptori Comment[da]=Flyt vinduer til hjørnerne når skrivebordet vises Comment[de]=Verschiebt Fenster bei der Anzeige der Arbeitsfläche in die Ecken. +Comment[el]=Μετακίνηση παραθύρου στις γωνίες κατά την εμφάνιση της επιφάνειας εργασίας Comment[en_GB]=Move window into the corners while showing desktop Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[et]=Akende viimine nurkadesse töölauda näidates diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 34b8d04e0c..4884f20bc1 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=MinimitzaTot Name[cs]=MinimalizovatVše Name[da]=Minimér alle Name[de]=Alle minimieren +Name[el]=ΕλαχιστοποίησηΌλων Name[en_GB]=MinimiseAll Name[es]=Maximizar todo Name[et]=Kõigi minimeerimine @@ -39,6 +40,7 @@ Comment[ca]=Afegeix una drecera per a minimitzar totes les finestres o desminimi Comment[ca@valencia]=Afig una drecera per a minimitzar totes les finestres o desminimitzar-les si estan minimitzades Comment[da]=Tilføjer en genvej til at minimere alle vinduer eller afminimere alle vinduer der er minimeret på den måde Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder alle auf diese Art minimierten Fenster wieder anzuzeigen +Comment[el]=Προσθήκη συντόμευσης για την ελαχιστοποίηση όλων των παραθύρων ή την αναίρεση της ελαχιστοποίησης που έγινε με αυτόν τον τρόπο Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo Comment[et]=Kiirtoimingu lisamine kõigi akende minimeerimiseks või sel moel minimeeritud akende suuruse taastamiseks From 11514079eadc2ecf71aafbda0df6eae52cc28d35 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Feb 2016 12:46:35 +0000 Subject: [PATCH 8/9] SVN_SILENT made messages (.desktop file) --- effects/maximize/package/metadata.desktop | 2 +- effects/mouseclick/mouseclick_config.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 045efc3af9..8d8c220a22 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -79,7 +79,7 @@ Name[nds]=Maximeren Name[nl]=Maximaliseren Name[nn]=Maksimer Name[pa]=ਵੱਧੋ-ਵੱਧ -Name[pl]=Maksymalizuj +Name[pl]=Maksymalizowanie Name[pt]=Maximização Name[pt_BR]=Maximizar Name[ro]=Maximizează diff --git a/effects/mouseclick/mouseclick_config.desktop b/effects/mouseclick/mouseclick_config.desktop index 3b8b074afa..4cfd062678 100644 --- a/effects/mouseclick/mouseclick_config.desktop +++ b/effects/mouseclick/mouseclick_config.desktop @@ -36,7 +36,7 @@ Name[nds]=Muusklick-Animeren Name[nl]=Animatie van muisklik Name[nn]=Museklikkanimasjon Name[pa]=ਮਾਊਸ ਕਲਿੱਕ ਐਨੀਮੇਸ਼ਨ -Name[pl]=Animacja kliknięcia myszy +Name[pl]=Animacja kliknięcia myszą Name[pt]=Animação do Botão do Rato Name[pt_BR]=Animação de clique do mouse Name[ro]=Animație la clic de maus From 3434358acdd52ae1fbf21ce1f61bcfe56df26a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 26 Jan 2016 11:38:11 +0100 Subject: [PATCH 9/9] [aurorae] Handle client palette changes When the client's palette changes we need to update the internal colors and emit a colorChanged, so that the decoration can repaint. BUG: 357311 FIXED-IN: 5.5.5 REVIEW: 126891 --- clients/aurorae/src/decorationoptions.cpp | 7 +++++++ clients/aurorae/src/decorationoptions.h | 1 + 2 files changed, 8 insertions(+) diff --git a/clients/aurorae/src/decorationoptions.cpp b/clients/aurorae/src/decorationoptions.cpp index f7b8de5b33..277ebd3ead 100644 --- a/clients/aurorae/src/decorationoptions.cpp +++ b/clients/aurorae/src/decorationoptions.cpp @@ -172,9 +172,16 @@ void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration) disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); + disconnect(m_paletteConnection); } m_decoration = decoration; connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); + m_paletteConnection = connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::paletteChanged, this, + [this] (const QPalette &pal) { + m_colors.update(pal); + emit colorsChanged(); + } + ); auto s = m_decoration->settings(); connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); diff --git a/clients/aurorae/src/decorationoptions.h b/clients/aurorae/src/decorationoptions.h index 6606b39eb7..f9013579ee 100644 --- a/clients/aurorae/src/decorationoptions.h +++ b/clients/aurorae/src/decorationoptions.h @@ -244,6 +244,7 @@ private: bool m_active; KDecoration2::Decoration *m_decoration; ColorSettings m_colors; + QMetaObject::Connection m_paletteConnection; }; class Borders : public QObject