diff --git a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml index 4241d541c..516fbebbf 100644 --- a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml +++ b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml @@ -59,7 +59,6 @@ QtQuickControlStyle.CheckBoxStyle { } anchors { fill: parent - margins: parent.margins.left/2 } Behavior on opacity { NumberAnimation { diff --git a/src/desktoptheme/breeze/dialogs/background.svgz b/src/desktoptheme/breeze/dialogs/background.svgz index 951778e96..a99f79a9a 100644 Binary files a/src/desktoptheme/breeze/dialogs/background.svgz and b/src/desktoptheme/breeze/dialogs/background.svgz differ diff --git a/src/desktoptheme/breeze/icons/akonadi.svgz b/src/desktoptheme/breeze/icons/akonadi.svgz index ccbc2a0d2..56165dbfe 100644 Binary files a/src/desktoptheme/breeze/icons/akonadi.svgz and b/src/desktoptheme/breeze/icons/akonadi.svgz differ diff --git a/src/desktoptheme/breeze/icons/akregator.svgz b/src/desktoptheme/breeze/icons/akregator.svgz index 22e9e0f90..81b2a3df0 100644 Binary files a/src/desktoptheme/breeze/icons/akregator.svgz and b/src/desktoptheme/breeze/icons/akregator.svgz differ diff --git a/src/desktoptheme/breeze/icons/amarok.svgz b/src/desktoptheme/breeze/icons/amarok.svgz index 35ae66b2d..54aacd302 100644 Binary files a/src/desktoptheme/breeze/icons/amarok.svgz and b/src/desktoptheme/breeze/icons/amarok.svgz differ diff --git a/src/desktoptheme/breeze/icons/applications.svgz b/src/desktoptheme/breeze/icons/applications.svgz index 0319cbc47..190f1955a 100644 Binary files a/src/desktoptheme/breeze/icons/applications.svgz and b/src/desktoptheme/breeze/icons/applications.svgz differ diff --git a/src/desktoptheme/breeze/icons/apport.svgz b/src/desktoptheme/breeze/icons/apport.svgz index 5e2f955ca..cdce6ebda 100644 Binary files a/src/desktoptheme/breeze/icons/apport.svgz and b/src/desktoptheme/breeze/icons/apport.svgz differ diff --git a/src/desktoptheme/breeze/icons/audio.svgz b/src/desktoptheme/breeze/icons/audio.svgz index 75d1ff8d5..0db44dc16 100644 Binary files a/src/desktoptheme/breeze/icons/audio.svgz and b/src/desktoptheme/breeze/icons/audio.svgz differ diff --git a/src/desktoptheme/breeze/icons/battery.svgz b/src/desktoptheme/breeze/icons/battery.svgz index 5b2eacfa8..2a5cd49b9 100644 Binary files a/src/desktoptheme/breeze/icons/battery.svgz and b/src/desktoptheme/breeze/icons/battery.svgz differ diff --git a/src/desktoptheme/breeze/icons/bookmarks.svgz b/src/desktoptheme/breeze/icons/bookmarks.svgz index a5ab18bc1..6b52e8ac8 100644 Binary files a/src/desktoptheme/breeze/icons/bookmarks.svgz and b/src/desktoptheme/breeze/icons/bookmarks.svgz differ diff --git a/src/desktoptheme/breeze/icons/computer.svgz b/src/desktoptheme/breeze/icons/computer.svgz index 3f4bda84c..fcbe605dc 100644 Binary files a/src/desktoptheme/breeze/icons/computer.svgz and b/src/desktoptheme/breeze/icons/computer.svgz differ diff --git a/src/desktoptheme/breeze/icons/configure.svgz b/src/desktoptheme/breeze/icons/configure.svgz index b31723e45..10a87233e 100644 Binary files a/src/desktoptheme/breeze/icons/configure.svgz and b/src/desktoptheme/breeze/icons/configure.svgz differ diff --git a/src/desktoptheme/breeze/icons/device.svgz b/src/desktoptheme/breeze/icons/device.svgz index 7f72ef1b3..baf5b5387 100644 Binary files a/src/desktoptheme/breeze/icons/device.svgz and b/src/desktoptheme/breeze/icons/device.svgz differ diff --git a/src/desktoptheme/breeze/icons/distribute.svgz b/src/desktoptheme/breeze/icons/distribute.svgz index 6e9afbbd5..cdfa93b95 100644 Binary files a/src/desktoptheme/breeze/icons/distribute.svgz and b/src/desktoptheme/breeze/icons/distribute.svgz differ diff --git a/src/desktoptheme/breeze/icons/document.svgz b/src/desktoptheme/breeze/icons/document.svgz index 6c511c569..3e2140326 100644 Binary files a/src/desktoptheme/breeze/icons/document.svgz and b/src/desktoptheme/breeze/icons/document.svgz differ diff --git a/src/desktoptheme/breeze/icons/drive.svgz b/src/desktoptheme/breeze/icons/drive.svgz index 2750043e0..80bdffa87 100644 Binary files a/src/desktoptheme/breeze/icons/drive.svgz and b/src/desktoptheme/breeze/icons/drive.svgz differ diff --git a/src/desktoptheme/breeze/icons/edit.svgz b/src/desktoptheme/breeze/icons/edit.svgz index b375e9625..c15c5af6b 100644 Binary files a/src/desktoptheme/breeze/icons/edit.svgz and b/src/desktoptheme/breeze/icons/edit.svgz differ diff --git a/src/desktoptheme/breeze/icons/go.svgz b/src/desktoptheme/breeze/icons/go.svgz index 85d31dc46..30f4cff61 100644 Binary files a/src/desktoptheme/breeze/icons/go.svgz and b/src/desktoptheme/breeze/icons/go.svgz differ diff --git a/src/desktoptheme/breeze/icons/input.svgz b/src/desktoptheme/breeze/icons/input.svgz index 175dbf3eb..4d316f62c 100644 Binary files a/src/desktoptheme/breeze/icons/input.svgz and b/src/desktoptheme/breeze/icons/input.svgz differ diff --git a/src/desktoptheme/breeze/icons/kdeconnect.svgz b/src/desktoptheme/breeze/icons/kdeconnect.svgz index 0fc068248..e3339f10c 100644 Binary files a/src/desktoptheme/breeze/icons/kdeconnect.svgz and b/src/desktoptheme/breeze/icons/kdeconnect.svgz differ diff --git a/src/desktoptheme/breeze/icons/keyboard.svgz b/src/desktoptheme/breeze/icons/keyboard.svgz index 45e5d6a65..7b6d5926b 100644 Binary files a/src/desktoptheme/breeze/icons/keyboard.svgz and b/src/desktoptheme/breeze/icons/keyboard.svgz differ diff --git a/src/desktoptheme/breeze/icons/kget.svgz b/src/desktoptheme/breeze/icons/kget.svgz index b7d58639f..bb330ad41 100644 Binary files a/src/desktoptheme/breeze/icons/kget.svgz and b/src/desktoptheme/breeze/icons/kget.svgz differ diff --git a/src/desktoptheme/breeze/icons/kgpg.svgz b/src/desktoptheme/breeze/icons/kgpg.svgz index 25da3e596..ed68aa65b 100644 Binary files a/src/desktoptheme/breeze/icons/kgpg.svgz and b/src/desktoptheme/breeze/icons/kgpg.svgz differ diff --git a/src/desktoptheme/breeze/icons/klipper.svgz b/src/desktoptheme/breeze/icons/klipper.svgz index c55e4515a..046279b38 100644 Binary files a/src/desktoptheme/breeze/icons/klipper.svgz and b/src/desktoptheme/breeze/icons/klipper.svgz differ diff --git a/src/desktoptheme/breeze/icons/kmail.svgz b/src/desktoptheme/breeze/icons/kmail.svgz index 494ee2c7c..1da7c2b71 100644 Binary files a/src/desktoptheme/breeze/icons/kmail.svgz and b/src/desktoptheme/breeze/icons/kmail.svgz differ diff --git a/src/desktoptheme/breeze/icons/konv_message.svgz b/src/desktoptheme/breeze/icons/konv_message.svgz index 903b93946..9b790ac21 100644 Binary files a/src/desktoptheme/breeze/icons/konv_message.svgz and b/src/desktoptheme/breeze/icons/konv_message.svgz differ diff --git a/src/desktoptheme/breeze/icons/konversation.svgz b/src/desktoptheme/breeze/icons/konversation.svgz index db08b5edc..71839df6f 100644 Binary files a/src/desktoptheme/breeze/icons/konversation.svgz and b/src/desktoptheme/breeze/icons/konversation.svgz differ diff --git a/src/desktoptheme/breeze/icons/kopete.svgz b/src/desktoptheme/breeze/icons/kopete.svgz index b4f92da80..7e556bc12 100644 Binary files a/src/desktoptheme/breeze/icons/kopete.svgz and b/src/desktoptheme/breeze/icons/kopete.svgz differ diff --git a/src/desktoptheme/breeze/icons/korgac.svgz b/src/desktoptheme/breeze/icons/korgac.svgz index 5257707dc..666763d1b 100644 Binary files a/src/desktoptheme/breeze/icons/korgac.svgz and b/src/desktoptheme/breeze/icons/korgac.svgz differ diff --git a/src/desktoptheme/breeze/icons/kpackagekit.svgz b/src/desktoptheme/breeze/icons/kpackagekit.svgz index ad8ad0fb4..5a5b10e8a 100644 Binary files a/src/desktoptheme/breeze/icons/kpackagekit.svgz and b/src/desktoptheme/breeze/icons/kpackagekit.svgz differ diff --git a/src/desktoptheme/breeze/icons/kteatime.svgz b/src/desktoptheme/breeze/icons/kteatime.svgz index e66a7bb8c..e22d98e21 100644 Binary files a/src/desktoptheme/breeze/icons/kteatime.svgz and b/src/desktoptheme/breeze/icons/kteatime.svgz differ diff --git a/src/desktoptheme/breeze/icons/ktorrent.svgz b/src/desktoptheme/breeze/icons/ktorrent.svgz index f983867c6..2f1bcf718 100644 Binary files a/src/desktoptheme/breeze/icons/ktorrent.svgz and b/src/desktoptheme/breeze/icons/ktorrent.svgz differ diff --git a/src/desktoptheme/breeze/icons/list.svgz b/src/desktoptheme/breeze/icons/list.svgz index 9b666a345..614732772 100644 Binary files a/src/desktoptheme/breeze/icons/list.svgz and b/src/desktoptheme/breeze/icons/list.svgz differ diff --git a/src/desktoptheme/breeze/icons/mail.svgz b/src/desktoptheme/breeze/icons/mail.svgz index 986a27d1d..97e831630 100644 Binary files a/src/desktoptheme/breeze/icons/mail.svgz and b/src/desktoptheme/breeze/icons/mail.svgz differ diff --git a/src/desktoptheme/breeze/icons/nepomuk.svgz b/src/desktoptheme/breeze/icons/nepomuk.svgz index b88b61f13..1ee8e076a 100644 Binary files a/src/desktoptheme/breeze/icons/nepomuk.svgz and b/src/desktoptheme/breeze/icons/nepomuk.svgz differ diff --git a/src/desktoptheme/breeze/icons/network.svgz b/src/desktoptheme/breeze/icons/network.svgz index bcf71ce01..076762d53 100644 Binary files a/src/desktoptheme/breeze/icons/network.svgz and b/src/desktoptheme/breeze/icons/network.svgz differ diff --git a/src/desktoptheme/breeze/icons/phone.svgz b/src/desktoptheme/breeze/icons/phone.svgz index 525a8e4b3..e3c35c8e8 100644 Binary files a/src/desktoptheme/breeze/icons/phone.svgz and b/src/desktoptheme/breeze/icons/phone.svgz differ diff --git a/src/desktoptheme/breeze/icons/preferences.svgz b/src/desktoptheme/breeze/icons/preferences.svgz index d023f18ea..76025a1f0 100644 Binary files a/src/desktoptheme/breeze/icons/preferences.svgz and b/src/desktoptheme/breeze/icons/preferences.svgz differ diff --git a/src/desktoptheme/breeze/icons/printer.svgz b/src/desktoptheme/breeze/icons/printer.svgz index e73ff9b00..ce120dc2f 100644 Binary files a/src/desktoptheme/breeze/icons/printer.svgz and b/src/desktoptheme/breeze/icons/printer.svgz differ diff --git a/src/desktoptheme/breeze/icons/software.svgz b/src/desktoptheme/breeze/icons/software.svgz index fcc11a0fe..cdd5a2b38 100644 Binary files a/src/desktoptheme/breeze/icons/software.svgz and b/src/desktoptheme/breeze/icons/software.svgz differ diff --git a/src/desktoptheme/breeze/icons/system.svgz b/src/desktoptheme/breeze/icons/system.svgz index 7e07b050f..8528bfe78 100644 Binary files a/src/desktoptheme/breeze/icons/system.svgz and b/src/desktoptheme/breeze/icons/system.svgz differ diff --git a/src/desktoptheme/breeze/icons/touchpad.svgz b/src/desktoptheme/breeze/icons/touchpad.svgz index a4bcdf1f4..a86cbe695 100644 Binary files a/src/desktoptheme/breeze/icons/touchpad.svgz and b/src/desktoptheme/breeze/icons/touchpad.svgz differ diff --git a/src/desktoptheme/breeze/icons/user.svgz b/src/desktoptheme/breeze/icons/user.svgz index 716f7a4c0..bc0d9d1cd 100644 Binary files a/src/desktoptheme/breeze/icons/user.svgz and b/src/desktoptheme/breeze/icons/user.svgz differ diff --git a/src/desktoptheme/breeze/icons/view.svgz b/src/desktoptheme/breeze/icons/view.svgz index 7f866c9a8..c2e30be71 100644 Binary files a/src/desktoptheme/breeze/icons/view.svgz and b/src/desktoptheme/breeze/icons/view.svgz differ diff --git a/src/desktoptheme/breeze/icons/wallet.svgz b/src/desktoptheme/breeze/icons/wallet.svgz index 248cf4287..84eb7994e 100644 Binary files a/src/desktoptheme/breeze/icons/wallet.svgz and b/src/desktoptheme/breeze/icons/wallet.svgz differ diff --git a/src/desktoptheme/breeze/icons/window.svgz b/src/desktoptheme/breeze/icons/window.svgz index 5c8ca12a1..f4540af5b 100644 Binary files a/src/desktoptheme/breeze/icons/window.svgz and b/src/desktoptheme/breeze/icons/window.svgz differ diff --git a/src/desktoptheme/breeze/icons/zoom.svgz b/src/desktoptheme/breeze/icons/zoom.svgz index a3ffaea48..ccb6b86eb 100644 Binary files a/src/desktoptheme/breeze/icons/zoom.svgz and b/src/desktoptheme/breeze/icons/zoom.svgz differ diff --git a/src/desktoptheme/breeze/opaque/dialogs/background.svgz b/src/desktoptheme/breeze/opaque/dialogs/background.svgz index 3564c6162..30080a711 100644 Binary files a/src/desktoptheme/breeze/opaque/dialogs/background.svgz and b/src/desktoptheme/breeze/opaque/dialogs/background.svgz differ diff --git a/src/desktoptheme/breeze/opaque/widgets/panel-background.svgz b/src/desktoptheme/breeze/opaque/widgets/panel-background.svgz index 8b1099ede..8f057f019 100644 Binary files a/src/desktoptheme/breeze/opaque/widgets/panel-background.svgz and b/src/desktoptheme/breeze/opaque/widgets/panel-background.svgz differ diff --git a/src/desktoptheme/breeze/opaque/widgets/tooltip.svgz b/src/desktoptheme/breeze/opaque/widgets/tooltip.svgz index 1fd9b592c..27376df79 100644 Binary files a/src/desktoptheme/breeze/opaque/widgets/tooltip.svgz and b/src/desktoptheme/breeze/opaque/widgets/tooltip.svgz differ diff --git a/src/desktoptheme/breeze/translucent/dialogs/background.svgz b/src/desktoptheme/breeze/translucent/dialogs/background.svgz index 8abc6edd8..21776986f 100644 Binary files a/src/desktoptheme/breeze/translucent/dialogs/background.svgz and b/src/desktoptheme/breeze/translucent/dialogs/background.svgz differ diff --git a/src/desktoptheme/breeze/translucent/widgets/panel-background.svgz b/src/desktoptheme/breeze/translucent/widgets/panel-background.svgz index cd783cead..bfec5e4e0 100644 Binary files a/src/desktoptheme/breeze/translucent/widgets/panel-background.svgz and b/src/desktoptheme/breeze/translucent/widgets/panel-background.svgz differ diff --git a/src/desktoptheme/breeze/translucent/widgets/tooltip.svgz b/src/desktoptheme/breeze/translucent/widgets/tooltip.svgz index 408a01980..eb27d2e4f 100644 Binary files a/src/desktoptheme/breeze/translucent/widgets/tooltip.svgz and b/src/desktoptheme/breeze/translucent/widgets/tooltip.svgz differ diff --git a/src/desktoptheme/breeze/widgets/action-overlays.svgz b/src/desktoptheme/breeze/widgets/action-overlays.svgz index 2742bffe1..3204c0a78 100644 Binary files a/src/desktoptheme/breeze/widgets/action-overlays.svgz and b/src/desktoptheme/breeze/widgets/action-overlays.svgz differ diff --git a/src/desktoptheme/breeze/widgets/arrows.svgz b/src/desktoptheme/breeze/widgets/arrows.svgz index a5c37f484..7b6e6369c 100644 Binary files a/src/desktoptheme/breeze/widgets/arrows.svgz and b/src/desktoptheme/breeze/widgets/arrows.svgz differ diff --git a/src/desktoptheme/breeze/widgets/background.svgz b/src/desktoptheme/breeze/widgets/background.svgz index e4490c4d6..dcbad4cdc 100644 Binary files a/src/desktoptheme/breeze/widgets/background.svgz and b/src/desktoptheme/breeze/widgets/background.svgz differ diff --git a/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz b/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz index 25a7c9c40..787d5908f 100644 Binary files a/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz and b/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz differ diff --git a/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz b/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz index dd7f140aa..da2cd223c 100644 Binary files a/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz and b/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz differ diff --git a/src/desktoptheme/breeze/widgets/busywidget.svgz b/src/desktoptheme/breeze/widgets/busywidget.svgz index 9a2ff5083..854ee7a89 100644 Binary files a/src/desktoptheme/breeze/widgets/busywidget.svgz and b/src/desktoptheme/breeze/widgets/busywidget.svgz differ diff --git a/src/desktoptheme/breeze/widgets/button.svgz b/src/desktoptheme/breeze/widgets/button.svgz index b427a204d..e04b52130 100644 Binary files a/src/desktoptheme/breeze/widgets/button.svgz and b/src/desktoptheme/breeze/widgets/button.svgz differ diff --git a/src/desktoptheme/breeze/widgets/checkmarks.svgz b/src/desktoptheme/breeze/widgets/checkmarks.svgz index 7e2bc1398..96c8979a9 100644 Binary files a/src/desktoptheme/breeze/widgets/checkmarks.svgz and b/src/desktoptheme/breeze/widgets/checkmarks.svgz differ diff --git a/src/desktoptheme/breeze/widgets/configuration-icons.svgz b/src/desktoptheme/breeze/widgets/configuration-icons.svgz index edf76c391..0d1dea514 100644 Binary files a/src/desktoptheme/breeze/widgets/configuration-icons.svgz and b/src/desktoptheme/breeze/widgets/configuration-icons.svgz differ diff --git a/src/desktoptheme/breeze/widgets/frame.svgz b/src/desktoptheme/breeze/widgets/frame.svgz index 5f53cc5bc..592abed0b 100644 Binary files a/src/desktoptheme/breeze/widgets/frame.svgz and b/src/desktoptheme/breeze/widgets/frame.svgz differ diff --git a/src/desktoptheme/breeze/widgets/glowbar.svgz b/src/desktoptheme/breeze/widgets/glowbar.svgz index 32cce803b..0d348ab65 100644 Binary files a/src/desktoptheme/breeze/widgets/glowbar.svgz and b/src/desktoptheme/breeze/widgets/glowbar.svgz differ diff --git a/src/desktoptheme/breeze/widgets/line.svgz b/src/desktoptheme/breeze/widgets/line.svgz index bd8dd1288..d47aa0fd8 100644 Binary files a/src/desktoptheme/breeze/widgets/line.svgz and b/src/desktoptheme/breeze/widgets/line.svgz differ diff --git a/src/desktoptheme/breeze/widgets/notes.svgz b/src/desktoptheme/breeze/widgets/notes.svgz new file mode 100644 index 000000000..0bcbbe486 Binary files /dev/null and b/src/desktoptheme/breeze/widgets/notes.svgz differ diff --git a/src/desktoptheme/breeze/widgets/panel-background.svgz b/src/desktoptheme/breeze/widgets/panel-background.svgz index 624a11eaa..f402dbb35 100644 Binary files a/src/desktoptheme/breeze/widgets/panel-background.svgz and b/src/desktoptheme/breeze/widgets/panel-background.svgz differ diff --git a/src/desktoptheme/breeze/widgets/scrollbar.svgz b/src/desktoptheme/breeze/widgets/scrollbar.svgz index 502a7cead..965ba9b65 100644 Binary files a/src/desktoptheme/breeze/widgets/scrollbar.svgz and b/src/desktoptheme/breeze/widgets/scrollbar.svgz differ diff --git a/src/desktoptheme/breeze/widgets/scrollwidget.svgz b/src/desktoptheme/breeze/widgets/scrollwidget.svgz index 0f9f6b6c9..4a666ea78 100644 Binary files a/src/desktoptheme/breeze/widgets/scrollwidget.svgz and b/src/desktoptheme/breeze/widgets/scrollwidget.svgz differ diff --git a/src/desktoptheme/breeze/widgets/slider.svgz b/src/desktoptheme/breeze/widgets/slider.svgz index 0c60ee891..767d5be44 100644 Binary files a/src/desktoptheme/breeze/widgets/slider.svgz and b/src/desktoptheme/breeze/widgets/slider.svgz differ diff --git a/src/desktoptheme/breeze/widgets/tabbar.svgz b/src/desktoptheme/breeze/widgets/tabbar.svgz index 1999ecb4d..e059cd03d 100644 Binary files a/src/desktoptheme/breeze/widgets/tabbar.svgz and b/src/desktoptheme/breeze/widgets/tabbar.svgz differ diff --git a/src/desktoptheme/breeze/widgets/tasks.svgz b/src/desktoptheme/breeze/widgets/tasks.svgz index bd65295fc..77f3b88ee 100644 Binary files a/src/desktoptheme/breeze/widgets/tasks.svgz and b/src/desktoptheme/breeze/widgets/tasks.svgz differ diff --git a/src/desktoptheme/breeze/widgets/timer.svgz b/src/desktoptheme/breeze/widgets/timer.svgz new file mode 100644 index 000000000..746bf9b63 Binary files /dev/null and b/src/desktoptheme/breeze/widgets/timer.svgz differ diff --git a/src/desktoptheme/breeze/widgets/toolbar.svgz b/src/desktoptheme/breeze/widgets/toolbar.svgz index 7005e5a9e..e49e8dd91 100644 Binary files a/src/desktoptheme/breeze/widgets/toolbar.svgz and b/src/desktoptheme/breeze/widgets/toolbar.svgz differ diff --git a/src/desktoptheme/breeze/widgets/tooltip.svgz b/src/desktoptheme/breeze/widgets/tooltip.svgz index 57166b2a5..70d3892a5 100644 Binary files a/src/desktoptheme/breeze/widgets/tooltip.svgz and b/src/desktoptheme/breeze/widgets/tooltip.svgz differ diff --git a/src/desktoptheme/breeze/widgets/translucentbackground.svgz b/src/desktoptheme/breeze/widgets/translucentbackground.svgz index 0cf0ea3d3..80b012157 100644 Binary files a/src/desktoptheme/breeze/widgets/translucentbackground.svgz and b/src/desktoptheme/breeze/widgets/translucentbackground.svgz differ diff --git a/src/tools/apply-stylesheet.sh b/src/tools/apply-stylesheet.sh index 797c5fd73..eb8daf306 100755 --- a/src/tools/apply-stylesheet.sh +++ b/src/tools/apply-stylesheet.sh @@ -1,73 +1,287 @@ #!/bin/bash -if [ $# -ne 1 ]; - then echo Usage: $0 file.svgz +PARSED_OPTIONS=$(getopt -n "$0" -o hf: --long "file:,TextFrom:,TextTo:,BackgroundFrom:,BackgroundTo:,HighlightFrom:,HighlightTo:,ViewTextFrom:,ViewTextTo:,ViewBackgroundFrom:,ViewBackgroundTo:,ViewHoverFrom:,ViewHoverTo:,ViewFocusFrom:,ViewFocusTo:,ButtonTextFrom:,ButtonTextTo:,ButtonBackgroundFrom:,ButtonBackgroundTo:,ButtonHoverFrom:,ButtonHoverTo:,ButtonFocusFrom:,ButtonFocusTo:" -- "$@") + +if [ $? -ne 0 ]; +then + exit 1 +fi + +eval set -- "$PARSED_OPTIONS" + +textFrom=\#31363b +backgroundFrom=\#eff0f1 +highlightFrom=\#3daee9 +viewTextFrom=\#31363b +viewBackgroundFrom=\#fcfcfc +viewHoverFrom=\#93cee9 +viewFocusFrom=\#3daee9 +buttonTextFrom=\#31363b +buttonBackgroundFrom=\#eff0f1 +buttonHoverFrom=\#93cee9 +buttonFocusFrom=\#3daee9 + +textTo=\#31363b +backgroundTo=\#eff0f1 +highlightTo=\#3daee9 +viewTextTo=\#31363b +viewBackgroundTo=\#fcfcfc +viewHoverTo=\#93cee9 +viewFocusTo=\#3daee9 +buttonTextTo=\#31363b +buttonBackgroundTo=\#eff0f1 +buttonHoverTo=\#93cee9 +buttonFocusTo=\#3daee9 + +file='' + +while true; +do + case "$1" in + + -h|--help) + echo "usage $0 [-h|options] -f file.svgz" + echo "Where options can be:" + echo " --TextFrom=color html encoded color to replace with the ColorScheme-Text from the stylesheet" + echo " --TextTo=color html encoded that the ColorScheme-Text class will have" + echo + echo " --BackgroundFrom=color html encoded color to replace with the ColorScheme-Background from the stylesheet" + echo " --BackgroundTo=color html encoded that the ColorScheme-Background class will have" + echo + echo " --HighlightFrom=color html encoded color to replace with the ColorScheme-Highlight from the stylesheet" + echo " --HighlightTo=color html encoded that the ColorScheme-Highlight class will have" + echo + echo " --ViewTextFrom=color html encoded color to replace with the ColorScheme-ViewText from the stylesheet" + echo " --ViewTextTo=color html encoded that the ColorScheme-ViewText class will have" + echo + echo " --ViewBackgroundFrom=color html encoded color to replace with the ColorScheme-ViewBackground from the stylesheet" + echo " --ViewBackgroundTo=color html encoded that the ColorScheme-ViewBackground class will have" + echo + echo " --ViewHoverFrom=color html encoded color to replace with the ColorScheme-ViewHover from the stylesheet" + echo " --ViewHoverTo=color html encoded that the ColorScheme-ViewHover class will have" + echo + echo " --ViewFocusFrom=color html encoded color to replace with the ColorScheme-ViewFocus from the stylesheet" + echo " --ViewFocusTo=color html encoded that the ColorScheme-ViewFocus class will have" + echo + echo " --ButtonTextFrom=color html encoded color to replace with the ColorScheme-ButtonText from the stylesheet" + echo " --ButtonTextTo=color html encoded that the ColorScheme-ButtonText class will have" + echo + echo " --ButtonBackgroundFrom=color html encoded color to replace with the ColorScheme-ButtonBackground from the stylesheet" + echo " --ButtonBackgroundTo=color html encoded that the ColorScheme-ButtonBackground class will have" + echo + echo " --ButtonHoverFrom=color html encoded color to replace with the ColorScheme-ButtonHover from the stylesheet" + echo " --ButtonHoverTo=color html encoded that the ColorScheme-ButtonHover class will have" + echo + echo " --ButtonFocusFrom=color html encoded color to replace with the ColorScheme-ButtonFocus from the stylesheet" + echo " --ButtonFocusTo=color html encoded that the ColorScheme-ButtonFocus class will have" + echo + echo "All the colors have default values conformant to the Breeze color palette" + echo + exit + shift;; + + --TextFrom) + textFrom=$2 + shift 2;; + --TextTo) + textTo=$2 + shift 2;; + + --BackgroundFrom) + backgroundFrom=$2 + shift 2;; + --BackgroundTo) + backgroundTo=$2 + shift 2;; + + --HighlightFrom) + highlightFrom=$2 + shift 2;; + --HighlightTo) + highlightTo=$2 + shift 2;; + + --ViewTextFrom) + viewTextFrom=$2 + shift 2;; + --ViewTextTo) + viewTextTo=$2 + shift 2;; + + --ViewBackgroundFrom) + viewBackgroundFrom=$2 + shift 2;; + --ViewBackgroundTo) + viewBackgroundTo=$2 + shift 2;; + + --ViewHoverFrom) + viewHoverFrom=$2 + shift 2;; + --ViewHoverTo) + viewHoverTo=$2 + shift 2;; + + --ViewFocusFrom) + viewFocusFrom=$2 + shift 2;; + --ViewFocusTo) + viewFocusTo=$2 + shift 2;; + + --ButtonTextFrom) + buttonTextFrom=$2 + shift 2;; + --ButtonTextTo) + buttonTextTo=$2 + shift 2;; + + --ButtonBackgroundFrom) + buttonBackgroundFrom=$2 + shift 2;; + --ButtonBackgroundTo) + buttonBackgroundTo=$2 + shift 2;; + + --ButtonHoverFrom) + buttonBackgroundFrom=$2 + shift 2;; + --ButtonHoverTo) + buttonHoverTo=$2 + shift 2;; + + --ButtonFocusFrom) + buttonFocusFrom=$2 + shift 2;; + --ButtonFocusTo) + buttonFocusTo=$2 + shift 2;; + + -f|--file) + file=`echo $2 | cut -d'.' --complement -f2-` + shift 2;; + + --) + shift + break;; + esac +done + + +if [ -z "$file" ]; + then echo missing svg file exit 1 fi -if [ ! -f $1 ]; then +isSvgz=0 + +if [ ! -f $file.svgz ] && [ ! -f $file.svg ]; then echo "you must specify a valid svg" exit 1 fi +if [ -f $file.svgz ]; then + isSvgz=1 +fi -file=`echo $1 | cut -d'.' --complement -f2-` -mv $1 $file.svg.gz -gunzip $file.svg.gz + +if [ $isSvgz = 1 ]; then + mv $file.svgz $file.svg.gz + gunzip $file.svg.gz +fi echo Processing $file -stylesheet=' +stylesheet=" .ColorScheme-Text { - color:#31363b; + color:$textTo; } .ColorScheme-Background { - color:#eff0f1; + color:$backgroundTo; } .ColorScheme-Highlight { - color:#3daee9; + color:$highlightTo; } .ColorScheme-ViewText { - color:#31363b; + color:$viewTextTo; } .ColorScheme-ViewBackground { - color:#fcfcfc; + color:$viewBackgroundTo; } .ColorScheme-ViewHover { - color:#93cee9; + color:$viewHoverTo; } .ColorScheme-ViewFocus{ - color:#3daee9; + color:$viewFocusTo; } .ColorScheme-ButtonText { - color:#31363b; + color:$buttonTextTo; } .ColorScheme-ButtonBackground { - color:#eff0f1; + color:$buttonBackgroundTo; } .ColorScheme-ButtonHover { - color:#93cee9; + color:$buttonHoverTo; } .ColorScheme-ButtonFocus{ - color:#3daee9; + color:$buttonFocusTo; } - ' -colors=(\#31363b \#eff0f1 \#3daee9 \#fcfcfc \#93cee9) -colorNames=(ColorScheme-Text ColorScheme-Background ColorScheme-Highlight ColorScheme-ViewBackground ColorScheme-ViewHover) + " +colors=($textFrom $backgroundFrom $highlightFrom $viewTextFrom $viewBackgroundFrom $viewHoverFrom $viewFocusFrom $buttonTextFrom $buttonBackgroundFrom $buttonHoverFrom $buttonFocusFrom) +colorNames=(ColorScheme-Text ColorScheme-Background ColorScheme-Highlight ColorScheme-ViewText ColorScheme-ViewBackground ColorScheme-ViewHover ColorScheme-ViewFocus ColorScheme-ButtonText ColorScheme-ButtonBackground ColorScheme-ButtonHover ColorScheme-ButtonFocus) +reorderXslt=' + + + + + + + + + + + + + + + + + + + + +' +echo $reorderXslt > transform.xsl + +if grep -q '"current-color-scheme"' $file.svg; then + echo replacing the stylesheet + xml ed --update "/svg:svg/svg:defs/_:style" -v "$stylesheet" $file.svg > temp.svg +else + echo adding the stylesheet xml ed --subnode "/svg:svg/svg:defs" -t elem -n "style" -v "$stylesheet"\ --subnode "/svg:svg/svg:defs/style" -t attr -n "type" -v "text/css"\ --subnode "/svg:svg/svg:defs/style" -t attr -n "id" -v "current-color-scheme" $file.svg > temp.svg +fi + +xml tr transform.xsl temp.svg > temp2.svg +mv temp2.svg temp.svg for i in {0..4} do - xml ed --subnode "//*/*[contains(@style, '${colors[i]}')]" -t attr -n "class" -v "${colorNames[i]}" temp.svg > temp2.svg + xml ed --subnode "//*/*[contains(@style, '${colors[i]}') and not (@class)]" -t attr -n "class" -v "${colorNames[i]}" temp.svg > temp2.svg mv temp2.svg temp.svg sed -i 's/\(style=".*\)fill:'${colors[i]}'/\1fill:currentColor/g' temp.svg + sed -i 's/\(style=".*\)stop-color:'${colors[i]}'/\1stop-color:currentColor/g' temp.svg done +rm transform.xsl + mv temp.svg $file.svg -gzip $file.svg -mv $file.svg.gz $file.svgz +if [ $isSvgz = 1 ]; then + gzip $file.svg + mv $file.svg.gz $file.svgz +fi