diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/build*/
CMakeLists.txt.user*
*.unc-backup*
+.cmake/
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.67.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.66.0") # handled by release scripts
+set(KF5_VERSION "5.68.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.67.0") # handled by release scripts
project(Plasma VERSION ${KF5_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.66.0 NO_MODULE)
+find_package(ECM 5.67.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -142,7 +142,7 @@
PACKAGE_SETUP_AUTOMOC_VARIABLES
)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300)
#add_definitions(-Wno-deprecated)
@@ -225,6 +225,4 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
-install(FILES plasma-framework.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plasma-framework.categories b/plasma-framework.categories
deleted file mode 100644
--- a/plasma-framework.categories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.kde.plasma Plasma Core lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMA]
-org.kde.plasma Plasma Quick lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMAQUICK]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,3 +4,9 @@
add_subdirectory(plasmapkg)
add_subdirectory(scriptengines)
add_subdirectory(plasmaquick)
+
+ecm_qt_install_logging_categories(
+ EXPORT PLASMA
+ FILE plasma-framework.categories
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
diff --git a/src/declarativeimports/core/private/DefaultToolTip.qml b/src/declarativeimports/core/private/DefaultToolTip.qml
--- a/src/declarativeimports/core/private/DefaultToolTip.qml
+++ b/src/declarativeimports/core/private/DefaultToolTip.qml
@@ -24,7 +24,7 @@
import org.kde.plasma.extras 2.0 as PlasmaExtras
-Item {
+PlasmaCore.ColorScope {
id: tooltipContentItem
property Item toolTip
@@ -37,6 +37,8 @@
LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
LayoutMirroring.childrenInherit: true
+ colorGroup: PlasmaCore.Theme.NormalColorGroup
+ inherit: false
RowLayout {
@@ -52,14 +54,14 @@
id: tooltipImage
source: toolTip ? toolTip.image : ""
visible: toolTip != null && toolTip.image != ""
- Layout.alignment: Qt.AlignTop
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
}
PlasmaCore.IconItem {
id: tooltipIcon
animated: false
source: toolTip ? toolTip.icon : ""
- Layout.alignment: Qt.AlignTop
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
visible: toolTip != null && toolTip.icon != "" && toolTip.image == "" && valid
Layout.preferredWidth: units.iconSizes.medium
Layout.preferredHeight: units.iconSizes.medium
diff --git a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
--- a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
@@ -26,8 +26,8 @@
property Item control
imagePath: "widgets/button"
prefix: "normal"
- implicitWidth: units.gridUnit
- implicitHeight: units.gridUnit
+ implicitWidth: units.iconSizes.small
+ implicitHeight: implicitWidth
opacity: control.enabled ? 1 : 0.6
PlasmaCore.SvgItem {
diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
--- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
@@ -27,7 +27,9 @@
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding + rightPadding)
- implicitHeight: units.gridUnit * 1.6
+ implicitHeight: Math.max(background ? background.implicitHeight : 0,
+ Math.max(contentItem.implicitHeight,
+ indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 1
diff --git a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
--- a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
@@ -31,7 +31,7 @@
opacity: control.enabled ? 1 : 0.6
implicitWidth: implicitHeight
- implicitHeight: units.gridUnit
+ implicitHeight: units.iconSizes.small
PlasmaCore.SvgItem {
id: checkmark
diff --git a/src/declarativeimports/plasmacomponents3/TabButton.qml b/src/declarativeimports/plasmacomponents3/TabButton.qml
--- a/src/declarativeimports/plasmacomponents3/TabButton.qml
+++ b/src/declarativeimports/plasmacomponents3/TabButton.qml
@@ -18,10 +18,12 @@
*/
import QtQuick 2.6
+import QtQuick.Layouts 1.2
import QtQuick.Controls @QQC2_VERSION@
import QtQml.Models 2.1
import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami 2.5 as Kirigami
T.TabButton {
id: control
@@ -34,14 +36,33 @@
hoverEnabled: true
- contentItem: Label {
- text: control.text
- font: control.font
- elide: Text.ElideRight
- opacity: enabled ? 1 : 0.3
- color: PlasmaCore.ColorScope.textColor
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
+ Kirigami.MnemonicData.enabled: control.enabled && control.visible
+ Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.SecondaryControl
+ Kirigami.MnemonicData.label: control.text
+
+ contentItem: GridLayout {
+ columns: control.display == T.AbstractButton.TextBesideIcon ? 2 : 1
+ PlasmaCore.IconItem {
+ id: icon
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ colorGroup: PlasmaCore.Theme.ButtonColorGroup
+ visible: source.length > 0
+ source: control.icon ? (control.icon.name || control.icon.source) : ""
+ status: control.activeFocus && !control.pressed && !control.checked ? PlasmaCore.Svg.Selected : PlasmaCore.Svg.Normal
+ }
+ Label {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ visible: text.length > 0
+ text: control.Kirigami.MnemonicData.richTextLabel
+ font: control.font
+ opacity: enabled || control.highlighted || control.checked ? 1 : 0.4
+ color: control.activeFocus && !control.down ? theme.highlightedTextColor : theme.buttonTextColor
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
+ }
}
background: Item {}
diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml
--- a/src/declarativeimports/plasmacomponents3/ToolButton.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml
@@ -45,18 +45,17 @@
flat: true
- contentItem: RowLayout {
+ contentItem: GridLayout {
+ columns: control.display == T.AbstractButton.TextBesideIcon ? 2 : 1
PlasmaCore.IconItem {
id: icon
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ colorGroup: PlasmaCore.Theme.ButtonColorGroup
visible: source.length > 0
- Layout.fillWidth: control.icon.width <= 0
- Layout.fillHeight: control.icon.height <= 0
- Layout.preferredWidth: control.icon.width > 0 ? control.icon.width : -1
- Layout.preferredHeight: control.icon.height > 0 ? control.icon.height : -1
- colorGroup: PlasmaCore.ColorScope.colorGroup
source: control.icon ? (control.icon.name || control.icon.source) : ""
+ status: control.activeFocus && !control.pressed && !control.checked ? PlasmaCore.Svg.Selected : PlasmaCore.Svg.Normal
}
- //NOTE: this is used only to check element's existence
PlasmaCore.FrameSvgItem {
id: buttonsurfaceChecker
visible: false
diff --git a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
--- a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
@@ -69,7 +69,7 @@
var s;
switch (l) {
case 1:
- return Math.round(n * 1.80) + step;
+ return Math.round(n * 1.50) + step;
case 2:
return Math.round(n * 1.30) + step;
case 3:
diff --git a/src/declarativeimports/plasmaextracomponents/qml/Title.qml b/src/declarativeimports/plasmaextracomponents/qml/Title.qml
--- a/src/declarativeimports/plasmaextracomponents/qml/Title.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/Title.qml
@@ -43,5 +43,6 @@
*/
Label {
id: root
- font.pointSize: theme.defaultFont.pointSize*2
+ // Match size of level 1 Heading
+ font.pointSize: Math.round(theme.defaultFont.pointSize * 1.50)
}
diff --git a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
--- a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
+++ b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
@@ -45,8 +45,8 @@
indicator: PlasmaCore.FrameSvgItem {
imagePath: "widgets/button"
prefix: "normal"
- width: theme.mSize(theme.defaultFont).height + margins.left
- height: theme.mSize(theme.defaultFont).height + margins.top
+ width: units.iconSizes.small
+ height: width
opacity: control.enabled ? 1 : 0.6
PlasmaCore.SvgItem {
diff --git a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
--- a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
+++ b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
@@ -51,8 +51,8 @@
elementId: "normal"
opacity: control.enabled ? 1 : 0.6
- width: height
- height: theme.mSize(theme.defaultFont).height * 1.6
+ width: units.iconSizes.small
+ height: width
PlasmaCore.SvgItem {
id: checkmark
diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
--- a/src/desktoptheme/breeze-dark/CMakeLists.txt
+++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
@@ -9,3 +9,4 @@
DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
)
+plasma_install_desktoptheme_svgs(breeze-dark SUBPATH translucent/widgets FILES translucent/widgets/panel-background.svg)
diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake
--- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake
+++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake
@@ -94,6 +94,6 @@
[ContrastEffect]
enabled=true
-contrast=0.2
-intensity=0.4
-saturation=1.7
+contrast=0.23
+intensity=1.3
+saturation=3.8
diff --git a/src/desktoptheme/breeze-dark/translucent/widgets/panel-background.svg b/src/desktoptheme/breeze-dark/translucent/widgets/panel-background.svg
new file mode 100755
--- /dev/null
+++ b/src/desktoptheme/breeze-dark/translucent/widgets/panel-background.svg
@@ -0,0 +1,1099 @@
+
+
+
+
diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake
--- a/src/desktoptheme/breeze-light/metadata.desktop.cmake
+++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake
@@ -93,6 +93,6 @@
[ContrastEffect]
enabled=true
-contrast=0.2
-intensity=2.0
-saturation=1.7
+contrast=0.23
+intensity=1.4
+saturation=3.8
diff --git a/src/desktoptheme/breeze/dialogs/background.svg b/src/desktoptheme/breeze/dialogs/background.svg
--- a/src/desktoptheme/breeze/dialogs/background.svg
+++ b/src/desktoptheme/breeze/dialogs/background.svg
@@ -16,8 +16,10 @@
id="svg2"
version="1.1"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
- sodipodi:docname="background.svgz">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:collect="always"
+ id="linearGradient1064">
+ id="stop1060" />
+
+ id="stop1062" />
+
+
+
+
+
+ y2="55.999981"
+ gradientTransform="translate(58)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ y2="55.999981"
+ gradientTransform="translate(58)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ y2="-2.0185304e-05" />
+
+
+
+
+
+
+
+
+
+
+
+ y2="-2.0185304e-05"
+ gradientTransform="translate(58)" />
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ class="ColorScheme-ViewBackground" />
-
-
-
-
-
-
+ class="ColorScheme-ViewBackground" />
+ class="ColorScheme-ViewBackground" />
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ class="ColorScheme-ViewBackground" />
+ class="ColorScheme-ViewBackground" />
+ transform="rotate(90)" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ y="-13.999994"
+ transform="rotate(90)" />
+ transform="translate(55.999978,-2.8024903e-6)"
+ style="display:inline">
+ transform="translate(55.999978,-2.8024903e-6)">
-
+
+ id="path4830"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(55.999978,-2.8024903e-6)">
-
+
+ transform="translate(-58,904.36218)"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(55.999978,-2.8024903e-6)">
+ transform="rotate(90)" />
+ transform="rotate(90)" />
+ transform="translate(55.999978,-2.8024903e-6)">
-
+
+ id="path4866"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="scale(-1)" />
+ transform="translate(55.999978,-2.8024903e-6)">
-
+
+ id="path4880"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(55.999978,-2.8024903e-6)">
+ transform="translate(55.999978,-2.8024903e-6)">
+ transform="translate(55.999978,-2.8024903e-6)">
+ style="fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+ x="89"
+ y="954.36224" />
+ x="930.36224"
+ y="-119.00002" />
+ style="fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/desktoptheme/breeze/translucent/widgets/tooltip.svg b/src/desktoptheme/breeze/translucent/widgets/tooltip.svg
old mode 100644
new mode 100755
--- a/src/desktoptheme/breeze/translucent/widgets/tooltip.svg
+++ b/src/desktoptheme/breeze/translucent/widgets/tooltip.svg
@@ -15,9 +15,11 @@
viewBox="0 0 173 56.000004"
id="svg2"
version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="tooltip.svgz">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="stop1117"
+ offset="0.62452108"
+ style="stop-color:#000000;stop-opacity:0.06" />
+ id="stop1074" />
+ x1="19"
+ y1="7.9999795"
+ x2="19"
+ y2="-2.0185304e-05"
+ gradientTransform="translate(58)" />
+ inkscape:collect="always"
+ id="linearGradient1070">
-
-
+ id="stop1066" />
+ id="stop1113"
+ offset="0.61807454"
+ style="stop-color:#000000;stop-opacity:0.06" />
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop1068" />
+
+
+
+ style="stop-color:#000000;stop-opacity:0.3"
+ offset="0"
+ id="stop1036" />
+ id="stop1083"
+ offset="0.61945844"
+ style="stop-color:#000000;stop-opacity:0.06" />
+ id="stop1038" />
-
-
-
-
-
-
-
-
+ Â
+
-
-
-
-
-
-
+ class="ColorScheme-ViewBackground" />
-
-
-
-
-
-
+ class="ColorScheme-ViewBackground" />
+ class="ColorScheme-ViewBackground" />
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ class="ColorScheme-ViewBackground" />
+ class="ColorScheme-ViewBackground" />
+ x="33.000034"
+ y="916.36212" />
+ transform="rotate(90)" />
+ x="930.36212"
+ y="-25.000038"
+ transform="rotate(90)" />
+ transform="translate(57.000015,-2.280249e-5)"
+ style="display:inline">
+ transform="translate(57.000015,-2.280249e-5)">
+ d="m 7,9 v 1 2 h 6 V 8 9 Z"
+ style="opacity:0.9;fill:url(#linearGradient4922);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ id="path4830"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(57.000015,-2.280249e-5)">
+ d="m 57,9 v -1 4 h 6 V 8 9 Z"
+ style="opacity:0.9;fill:url(#linearGradient4928);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(-58,904.36218)"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(57.000015,-2.280249e-5)">
+ transform="rotate(90)" />
+ transform="rotate(90)" />
+ transform="translate(57.000015,-2.280249e-5)">
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ id="path4866"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ d="m 7,44 v 4 -1 h 6 v 1 -4 z"
+ style="opacity:0.9;fill:url(#linearGradient4940);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="scale(-1)" />
+ transform="translate(57.000015,-2.280249e-5)">
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ id="path4880"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ d="m 57,44 v 4 -1 h 6 v 1 -4 z"
+ style="opacity:0.9;fill:url(#linearGradient4946);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ transform="translate(57.000015,-2.280249e-5)">
+ transform="translate(57.000015,-2.280249e-5)">
+ transform="translate(57.000015,-2.280249e-5)">
+ style="fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+ y="-120.00005" />
-
-
-
+ style="fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+
+
+
+
+
+
+
+
+
+ transform="translate(3.5e-5,-6.280249e-5)"
+ id="topleft">
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 16,6 c -2,0 -3,1 -3,3 v 2 1 h 4 1 1 V 11 7 6 h -1 1 z"
+ transform="translate(0,904.36218)"
+ id="rect4159"
+ inkscape:connector-curvature="0"
+ class="ColorScheme-ViewBackground"
+ sodipodi:nodetypes="ssccccccccccs" />
+ transform="translate(3.5e-5,-6.280249e-5)"
+ id="topright">
-
-
-
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 51,6 v 1 4 1 h 1 1 3 1 V 11 9 C 57,7 56,6 54,6 h -1 -1 z"
+ transform="translate(0,904.36218)"
+ id="rect4177"
+ inkscape:connector-curvature="0"
+ class="ColorScheme-ViewBackground"
+ sodipodi:nodetypes="cccccccccssccc" />
+ transform="translate(3.5e-5,-6.280249e-5)"
+ id="bottomleft">
+ inkscape:connector-curvature="0"
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 19,954.36218 v -1 -4 -1 h -1 -1 -3 -1 v 1 2 c 0,2 1,3 3,3 h 1 1 z"
+ id="path5048"
+ class="ColorScheme-ViewBackground"
+ sodipodi:nodetypes="cccccccccssccc" />
+ transform="translate(3.5e-5,-6.280249e-5)"
+ id="bottomright">
-
-
-
-
-
-
-
-
-
-
+ id="rect4177-6"
+ d="m 51,954.36218 v -1 -4 -1 h 1 1 3 1 v 1 2 c 0,2 -1,3 -3,3 h -1 -1 z"
+ style="opacity:0.8;fill:currentColor;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0"
+ class="ColorScheme-ViewBackground"
+ sodipodi:nodetypes="cccccccccssccc" />
-
-
diff --git a/src/desktoptheme/breeze/widgets/actionbutton.svg b/src/desktoptheme/breeze/widgets/actionbutton.svg
--- a/src/desktoptheme/breeze/widgets/actionbutton.svg
+++ b/src/desktoptheme/breeze/widgets/actionbutton.svg
@@ -1,556 +1,94 @@
-
-
-
-