From 7228c20dd86663d9a87e1e43fbba1abbe4c1673f Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 6 Mar 2018 12:16:31 +0000 Subject: [PATCH 1/4] Update version number for 5.12.3 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea16302ffb..5956b9ca5c 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.12.2") +set(PROJECT_VERSION "5.12.3") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0") From 6ff10e44053a8d2b36557e4e2135f10ae34d6941 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Mar 2018 07:13:28 +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" --- kwin.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kwin.notifyrc b/kwin.notifyrc index a8cf9776ab..8899d17294 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -24,7 +24,7 @@ Comment[hi]=केविन विंडो प्रबंधक Comment[hr]=Upravitelj prozora KWin Comment[hu]=KWin ablakkezelő Comment[ia]=Gerente de fenestra KWin -Comment[id]=Manajer Jendela KWin +Comment[id]=Pengelola Jendela KWin Comment[is]=KWin gluggastjóri Comment[it]=Gestore delle finestre KWin Comment[ja]=KWin ウィンドウマネージャ From 6c00ed2df8386653b19c55a64517720b862d6aa6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Mar 2018 07:01:20 +0200 Subject: [PATCH 3/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" --- effects/windowaperture/package/metadata.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 28b00d3e8c..2b42708dd4 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -54,6 +54,7 @@ Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. Comment[hu]=A sarkokba mozgatja az ablakokat az asztal megjelenítése közben Comment[ia]=Move fenestra a le angulos quando monstra scriptorio +Comment[id]=Pindah jendela ke pojok ketika menampilkan desktop Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동 diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 7496d3995c..0db6d4dada 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -98,7 +98,7 @@ Comment[fr]=Bords et coins actifs de l'écran Comment[gl]=Bordos e esquinas activos da pantalla Comment[he]=פינות וקצוות של המסך Comment[hu]=Aktív képernyősarkok és szélek -Comment[id]=Sudut dan Tepi Layar Aktif +Comment[id]=Pojok dan Tepi Layar Aktif Comment[it]=Angoli e bordi attivi dello schermo Comment[ko]=활성 화면 경계와 꼭지점 Comment[lt]=Aktyvaus ekrano kampai ir kraštinės From c99d329125ac745d4c764c5262a8010e9b565fde Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Mon, 26 Mar 2018 10:39:28 +0200 Subject: [PATCH 4/4] [AppMenu] Ignore show request when application menu isn't configured Before Plasma 5.12 one could only have either global menu or decoration button configured but since the setting was non-intuitive it was switched to auto-enable when applet or button is present. This results in both menus reacting to e.g. Alt+F for File menu. BUG: 392012 FIXED-IN: 5.12.4 Differential Revision: https://phabricator.kde.org/D11580 --- appmenu.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appmenu.cpp b/appmenu.cpp index eda2d1fab9..4ad824a8a0 100644 --- a/appmenu.cpp +++ b/appmenu.cpp @@ -27,6 +27,9 @@ along with this program. If not, see . #include #include +#include "decorations/decorationbridge.h" +#include + using namespace KWin; KWIN_SINGLETON_FACTORY(ApplicationMenu) @@ -81,6 +84,13 @@ void ApplicationMenu::setViewEnabled(bool enabled) void ApplicationMenu::slotShowRequest(const QString &serviceName, const QDBusObjectPath &menuObjectPath, int actionId) { + // Ignore show request when user has not configured the application menu title bar button + auto decorationSettings = Decoration::DecorationBridge::self()->settings(); + if (!decorationSettings->decorationButtonsLeft().contains(KDecoration2::DecorationButtonType::ApplicationMenu) + && !decorationSettings->decorationButtonsRight().contains(KDecoration2::DecorationButtonType::ApplicationMenu)) { + return; + } + if (AbstractClient *c = findAbstractClientWithApplicationMenu(serviceName, menuObjectPath)) { c->showApplicationMenu(actionId); }