From f0b3be584489d821e27b126a68aa19c5b99749fd Mon Sep 17 00:00:00 2001 From: Anthony Fieroni Date: Tue, 21 Mar 2017 20:56:25 +0200 Subject: [PATCH 1/5] [kcm_kwindecoration] Respect theme colors in buttons https://phabricator.kde.org/D5116 Signed-off-by: Anthony Fieroni --- kcmkwin/kwindecoration/qml/Buttons.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwindecoration/qml/Buttons.qml b/kcmkwin/kwindecoration/qml/Buttons.qml index 64ab0f9be3..d8ca4258de 100644 --- a/kcmkwin/kwindecoration/qml/Buttons.qml +++ b/kcmkwin/kwindecoration/qml/Buttons.qml @@ -39,7 +39,7 @@ Item { anchors.fill: parent anchors.topMargin: units.gridUnit / 2 border.width: Math.ceil(units.gridUnit / 16.0) - color: SystemPalette.base; + color: backgroundColor; border.color: highlightColor; ColumnLayout { id: layout @@ -51,7 +51,7 @@ Item { Layout.fillWidth: true border.width: Math.ceil(units.gridUnit / 16.0) border.color: highlightColor - color: SystemPalette.base; + color: backgroundColor; RowLayout { id: buttonPreviewRow anchors.top: parent.top; @@ -194,7 +194,7 @@ Item { id: dragHint visible: !(leftButtonsView.dragging || rightButtonsView.dragging || availableGrid.dragging) Layout.fillWidth: true - color: SystemPalette.text; + color: backgroundColor; opacity: 0.66 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignTop From 3836e048810e64c787f56b5512262129da6df8c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Mar 2017 05:00:58 +0100 Subject: [PATCH 2/5] 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/eyeonscreen/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 15938fd4f4..12acb8fceb 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -2,6 +2,7 @@ Name=eye On Screen Name[ca]=Ull a la pantalla Name[ca@valencia]=Ull a la pantalla +Name[cs]=oko na obrazovce Name[da]=øjet på skærmen Name[de]=Ansicht der Arbeitsfläche Name[el]=μάτι Στην Οθόνη From ffbb25497c3f71c05652617f51e34a1c0a2bbb03 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 22 Mar 2017 16:49:53 +0100 Subject: [PATCH 3/5] [Aurorae DecorationButton] Hook up app menu button This makes clicking the application menu button trigger the menu. CHANGELOG: Aurorae window decorations now support global menu button BUG: 375862 FIXED-IN: 5.9.5 Differential Revision: https://phabricator.kde.org/D5130 --- plugins/kdecorations/aurorae/src/qml/DecorationButton.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml b/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml index 6c295d09a1..32d6990958 100644 --- a/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml +++ b/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml @@ -62,7 +62,8 @@ Item { break; case DecorationOptions.DecorationButtonApplicationMenu: // app menu -// decoration.appMenuClicked(); + var pos = button.mapToItem(null, 0, 0); // null = "map to scene" + decoration.requestShowApplicationMenu(Qt.rect(pos.x, pos.y, button.width, button.height), 0) break; case DecorationOptions.DecorationButtonOnAllDesktops: // all desktops From 3e0ddba683ca68cb50b403cb3893fa2fc9d2d737 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 22 Mar 2017 16:50:34 +0100 Subject: [PATCH 4/5] [Plastik Decoration] Show application menu button if client has one CCBUG: 375862 CHANGELOG: Plastik window decoration now supports global menu Differential Revision: https://phabricator.kde.org/D5131 --- .../themes/plastik/package/contents/ui/PlastikButton.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml index 97571a26ce..39132f725f 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml +++ b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml @@ -144,8 +144,7 @@ DecorationButton { visible = Qt.binding(function() { return decoration.client.providesContextHelp}); } if (buttonType == DecorationOptions.DecorationButtonApplicationMenu) { -// visible = decoration.appMenu; - visible = false; + visible = Qt.binding(function() { return decoration.client.hasApplicationMenu; }); } } onHoveredChanged: colorize() From c2369507bc6f3fe8ca4f0f70ba684147f6eab022 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 22 Mar 2017 16:51:20 +0100 Subject: [PATCH 5/5] [Aurorae AppMenuButton] Show if client has app menu Differential Revision: https://phabricator.kde.org/D5132 --- plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml b/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml index e60579a804..58841a7f4c 100644 --- a/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml +++ b/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml @@ -21,7 +21,7 @@ import org.kde.kwin.decoration 0.1 DecorationButton { id: appMenuButton buttonType: DecorationOptions.DecorationButtonApplicationMenu - visible: false //decoration.appMenu + visible: decoration.client.hasApplicationMenu KQuickControlsAddons.QIconItem { icon: decoration.client.icon anchors.fill: parent