[Xfce4-commits] [xfce/xfwm4] 03/03: themes: Add new default theme
noreply at xfce.org
noreply at xfce.org
Thu May 2 16:42:23 CEST 2019
This is an automated email from the git hooks/post-receive script.
o l i v i e r p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfwm4.
commit deed0d10dbe284304d44271f4240431c4dd2ec47
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Thu May 2 09:38:21 2019 +0200
themes: Add new default theme
Add new default theme for xfce 4.14 which integrates nicely with gtk
client side decorations.
Comes in standard, hdpi and xhdpi variants.
Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
themes/default-hdpi/bottom-left-active.png | Bin 150 -> 155 bytes
themes/default-hdpi/bottom-left-inactive.png | Bin 150 -> 155 bytes
themes/default-hdpi/bottom-right-active.png | Bin 149 -> 149 bytes
themes/default-hdpi/bottom-right-inactive.png | Bin 149 -> 149 bytes
themes/default-hdpi/close-active.png | Bin 1295 -> 165 bytes
themes/default-hdpi/close-active.svg | 67 +----------
themes/default-hdpi/close-active.xpm | 25 ++--
.../{menu-active.svg => close-inactive} | 12 +-
themes/default-hdpi/close-inactive.png | Bin 833 -> 165 bytes
themes/default-hdpi/close-inactive.svg | 31 ++---
themes/default-hdpi/close-inactive.xpm | 23 ++--
themes/default-hdpi/close-prelight.png | Bin 1860 -> 165 bytes
themes/default-hdpi/close-prelight.svg | 93 ++-------------
themes/default-hdpi/close-prelight.xpm | 86 +++++++-------
themes/default-hdpi/close-pressed.png | Bin 2010 -> 165 bytes
themes/default-hdpi/close-pressed.svg | 93 ++-------------
themes/default-hdpi/close-pressed.xpm | 86 +++++++-------
themes/default-hdpi/hide-active.png | Bin 388 -> 165 bytes
themes/default-hdpi/hide-active.svg | 67 ++---------
themes/default-hdpi/hide-active.xpm | 11 +-
themes/default-hdpi/hide-inactive.png | Bin 214 -> 165 bytes
themes/default-hdpi/hide-inactive.svg | 31 ++---
themes/default-hdpi/hide-inactive.xpm | 9 +-
themes/default-hdpi/hide-prelight.png | Bin 895 -> 165 bytes
themes/default-hdpi/hide-prelight.svg | 81 +------------
themes/default-hdpi/hide-prelight.xpm | 86 +++++++-------
themes/default-hdpi/hide-pressed.png | Bin 869 -> 165 bytes
themes/default-hdpi/hide-pressed.svg | 81 +------------
themes/default-hdpi/hide-pressed.xpm | 86 +++++++-------
themes/default-hdpi/maximize-active.png | Bin 596 -> 165 bytes
themes/default-hdpi/maximize-active.svg | 61 ++--------
themes/default-hdpi/maximize-active.xpm | 25 ++--
themes/default-hdpi/maximize-inactive.png | Bin 350 -> 165 bytes
themes/default-hdpi/maximize-inactive.svg | 30 ++---
themes/default-hdpi/maximize-inactive.xpm | 23 ++--
themes/default-hdpi/maximize-prelight.png | Bin 1052 -> 165 bytes
themes/default-hdpi/maximize-prelight.svg | 75 +-----------
themes/default-hdpi/maximize-prelight.xpm | 86 +++++++-------
themes/default-hdpi/maximize-pressed.png | Bin 1082 -> 165 bytes
themes/default-hdpi/maximize-pressed.svg | 75 +-----------
themes/default-hdpi/maximize-pressed.xpm | 86 +++++++-------
themes/default-hdpi/maximize-toggled-active.png | Bin 751 -> 165 bytes
themes/default-hdpi/maximize-toggled-active.svg | 65 ++---------
themes/default-hdpi/maximize-toggled-active.xpm | 23 ++--
themes/default-hdpi/maximize-toggled-inactive.png | Bin 446 -> 165 bytes
themes/default-hdpi/maximize-toggled-inactive.svg | 32 ++----
themes/default-hdpi/maximize-toggled-inactive.xpm | 21 ++--
themes/default-hdpi/maximize-toggled-prelight.png | Bin 1154 -> 165 bytes
themes/default-hdpi/maximize-toggled-prelight.svg | 85 ++------------
themes/default-hdpi/maximize-toggled-prelight.xpm | 88 +++++++-------
themes/default-hdpi/maximize-toggled-pressed.png | Bin 1230 -> 165 bytes
themes/default-hdpi/maximize-toggled-pressed.svg | 85 ++------------
themes/default-hdpi/maximize-toggled-pressed.xpm | 88 +++++++-------
themes/default-hdpi/menu-active.png | Bin 167 -> 165 bytes
themes/default-hdpi/menu-active.svg | 4 +-
themes/default-hdpi/menu-active.xpm | 2 +-
themes/default-hdpi/menu-inactive.png | Bin 167 -> 165 bytes
themes/default-hdpi/menu-inactive.svg | 4 +-
themes/default-hdpi/menu-prelight.png | Bin 167 -> 165 bytes
themes/default-hdpi/menu-prelight.svg | 14 +--
themes/default-hdpi/menu-prelight.xpm | 2 +-
themes/default-hdpi/menu-pressed.png | Bin 167 -> 165 bytes
themes/default-hdpi/menu-pressed.svg | 14 +--
themes/default-hdpi/menu-pressed.xpm | 2 +-
themes/default-hdpi/shade-active.png | Bin 904 -> 165 bytes
themes/default-hdpi/shade-active.svg | 61 ++--------
themes/default-hdpi/shade-active.xpm | 21 ++--
themes/default-hdpi/shade-inactive.png | Bin 521 -> 165 bytes
themes/default-hdpi/shade-inactive.svg | 28 ++---
themes/default-hdpi/shade-inactive.xpm | 19 ++--
themes/default-hdpi/shade-prelight.png | Bin 1332 -> 165 bytes
themes/default-hdpi/shade-prelight.svg | 75 +-----------
themes/default-hdpi/shade-prelight.xpm | 86 +++++++-------
themes/default-hdpi/shade-pressed.png | Bin 1381 -> 165 bytes
themes/default-hdpi/shade-pressed.svg | 75 +-----------
themes/default-hdpi/shade-pressed.xpm | 86 +++++++-------
themes/default-hdpi/shade-toggled-active.png | Bin 906 -> 165 bytes
themes/default-hdpi/shade-toggled-active.svg | 61 ++--------
themes/default-hdpi/shade-toggled-active.xpm | 23 ++--
themes/default-hdpi/shade-toggled-inactive.png | Bin 529 -> 165 bytes
themes/default-hdpi/shade-toggled-inactive.svg | 28 ++---
themes/default-hdpi/shade-toggled-inactive.xpm | 21 ++--
themes/default-hdpi/shade-toggled-prelight.png | Bin 1328 -> 165 bytes
themes/default-hdpi/shade-toggled-prelight.svg | 75 +-----------
themes/default-hdpi/shade-toggled-prelight.xpm | 88 +++++++-------
themes/default-hdpi/shade-toggled-pressed.png | Bin 1336 -> 165 bytes
themes/default-hdpi/shade-toggled-pressed.svg | 75 +-----------
themes/default-hdpi/shade-toggled-pressed.xpm | 88 +++++++-------
themes/default-hdpi/stick-active.png | Bin 1022 -> 165 bytes
themes/default-hdpi/stick-active.svg | 61 ++--------
themes/default-hdpi/stick-active.xpm | 25 ++--
themes/default-hdpi/stick-inactive.png | Bin 642 -> 165 bytes
themes/default-hdpi/stick-inactive.svg | 28 ++---
themes/default-hdpi/stick-inactive.xpm | 23 ++--
themes/default-hdpi/stick-prelight.png | Bin 1481 -> 165 bytes
themes/default-hdpi/stick-prelight.svg | 75 +-----------
themes/default-hdpi/stick-prelight.xpm | 86 +++++++-------
themes/default-hdpi/stick-pressed.png | Bin 1481 -> 165 bytes
themes/default-hdpi/stick-pressed.svg | 75 +-----------
themes/default-hdpi/stick-pressed.xpm | 86 +++++++-------
themes/default-hdpi/stick-toggled-active.png | Bin 1029 -> 165 bytes
themes/default-hdpi/stick-toggled-active.svg | 70 ++----------
themes/default-hdpi/stick-toggled-active.xpm | 27 +++--
themes/default-hdpi/stick-toggled-inactive.png | Bin 701 -> 165 bytes
themes/default-hdpi/stick-toggled-inactive.svg | 37 ++----
themes/default-hdpi/stick-toggled-inactive.xpm | 25 ++--
themes/default-hdpi/stick-toggled-prelight.png | Bin 1503 -> 165 bytes
themes/default-hdpi/stick-toggled-prelight.svg | 90 ++-------------
themes/default-hdpi/stick-toggled-prelight.xpm | 88 +++++++-------
themes/default-hdpi/stick-toggled-pressed.png | Bin 1482 -> 165 bytes
themes/default-hdpi/stick-toggled-pressed.svg | 90 ++-------------
themes/default-hdpi/stick-toggled-pressed.xpm | 88 +++++++-------
themes/default-hdpi/title-1-active.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-1-active.svg | 4 +-
themes/default-hdpi/title-1-active.xpm | 2 +-
themes/default-hdpi/title-1-inactive.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-1-inactive.svg | 4 +-
themes/default-hdpi/title-2-active.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-2-active.svg | 4 +-
themes/default-hdpi/title-2-active.xpm | 2 +-
themes/default-hdpi/title-2-inactive.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-2-inactive.svg | 4 +-
themes/default-hdpi/title-3-active.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-3-active.svg | 4 +-
themes/default-hdpi/title-3-active.xpm | 2 +-
themes/default-hdpi/title-3-inactive.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-3-inactive.svg | 4 +-
themes/default-hdpi/title-4-active.png | Bin 428 -> 142 bytes
themes/default-hdpi/title-4-active.svg | 47 ++------
themes/default-hdpi/title-4-active.xpm | 2 +-
themes/default-hdpi/title-4-inactive.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-4-inactive.svg | 4 +-
themes/default-hdpi/title-5-active.png | Bin 228 -> 142 bytes
themes/default-hdpi/title-5-active.svg | 47 ++------
themes/default-hdpi/title-5-active.xpm | 2 +-
themes/default-hdpi/title-5-inactive.png | Bin 145 -> 142 bytes
themes/default-hdpi/title-5-inactive.svg | 4 +-
themes/default-hdpi/top-left-active.png | Bin 357 -> 297 bytes
themes/default-hdpi/top-left-active.svg | 15 ++-
themes/default-hdpi/top-left-active.xpm | 2 +-
themes/default-hdpi/top-left-inactive.png | Bin 357 -> 297 bytes
themes/default-hdpi/top-left-inactive.svg | 15 ++-
themes/default-hdpi/top-right-active.png | Bin 439 -> 302 bytes
themes/default-hdpi/top-right-active.svg | 37 +-----
themes/default-hdpi/top-right-active.xpm | 2 +-
themes/default-hdpi/top-right-inactive.png | Bin 411 -> 302 bytes
themes/default-hdpi/top-right-inactive.svg | 25 ++--
themes/default-xhdpi/bottom-left-active.png | Bin 174 -> 173 bytes
themes/default-xhdpi/bottom-left-inactive.png | Bin 174 -> 173 bytes
themes/default-xhdpi/bottom-right-active.png | Bin 159 -> 157 bytes
themes/default-xhdpi/bottom-right-inactive.png | Bin 159 -> 157 bytes
themes/default-xhdpi/close-active.png | Bin 1681 -> 180 bytes
themes/default-xhdpi/close-active.svg | 67 +----------
themes/default-xhdpi/close-active.xpm | 123 ++++++++++----------
.../{menu-active.svg => close-inactive} | 16 +--
themes/default-xhdpi/close-inactive.png | Bin 974 -> 180 bytes
themes/default-xhdpi/close-inactive.svg | 31 ++---
themes/default-xhdpi/close-inactive.xpm | 121 ++++++++++----------
themes/default-xhdpi/close-prelight.png | Bin 2286 -> 180 bytes
themes/default-xhdpi/close-prelight.svg | 93 ++-------------
themes/default-xhdpi/close-prelight.xpm | 124 ++++++++++----------
themes/default-xhdpi/close-pressed.png | Bin 2420 -> 180 bytes
themes/default-xhdpi/close-pressed.svg | 93 ++-------------
themes/default-xhdpi/close-pressed.xpm | 124 ++++++++++----------
themes/default-xhdpi/hide-active.png | Bin 365 -> 180 bytes
themes/default-xhdpi/hide-active.svg | 67 ++---------
themes/default-xhdpi/hide-active.xpm | 123 ++++++++++----------
themes/default-xhdpi/hide-inactive.png | Bin 219 -> 180 bytes
themes/default-xhdpi/hide-inactive.svg | 31 ++---
themes/default-xhdpi/hide-inactive.xpm | 121 ++++++++++----------
themes/default-xhdpi/hide-prelight.png | Bin 1007 -> 180 bytes
themes/default-xhdpi/hide-prelight.svg | 81 +------------
themes/default-xhdpi/hide-prelight.xpm | 124 ++++++++++----------
themes/default-xhdpi/hide-pressed.png | Bin 945 -> 180 bytes
themes/default-xhdpi/hide-pressed.svg | 81 +------------
themes/default-xhdpi/hide-pressed.xpm | 124 ++++++++++----------
themes/default-xhdpi/maximize-active.png | Bin 501 -> 180 bytes
themes/default-xhdpi/maximize-active.svg | 61 ++--------
themes/default-xhdpi/maximize-active.xpm | 123 ++++++++++----------
themes/default-xhdpi/maximize-inactive.png | Bin 303 -> 180 bytes
themes/default-xhdpi/maximize-inactive.svg | 30 ++---
themes/default-xhdpi/maximize-inactive.xpm | 121 ++++++++++----------
themes/default-xhdpi/maximize-prelight.png | Bin 1142 -> 180 bytes
themes/default-xhdpi/maximize-prelight.svg | 75 +-----------
themes/default-xhdpi/maximize-prelight.xpm | 124 ++++++++++----------
themes/default-xhdpi/maximize-pressed.png | Bin 1087 -> 180 bytes
themes/default-xhdpi/maximize-pressed.svg | 75 +-----------
themes/default-xhdpi/maximize-pressed.xpm | 124 ++++++++++----------
themes/default-xhdpi/maximize-toggled-active.png | Bin 622 -> 180 bytes
themes/default-xhdpi/maximize-toggled-active.svg | 65 ++---------
themes/default-xhdpi/maximize-toggled-active.xpm | 125 ++++++++++----------
themes/default-xhdpi/maximize-toggled-inactive.png | Bin 400 -> 180 bytes
themes/default-xhdpi/maximize-toggled-inactive.svg | 32 ++----
themes/default-xhdpi/maximize-toggled-inactive.xpm | 123 ++++++++++----------
themes/default-xhdpi/maximize-toggled-prelight.png | Bin 1232 -> 180 bytes
themes/default-xhdpi/maximize-toggled-prelight.svg | 85 ++------------
themes/default-xhdpi/maximize-toggled-prelight.xpm | 126 +++++++++++----------
themes/default-xhdpi/maximize-toggled-pressed.png | Bin 1165 -> 180 bytes
themes/default-xhdpi/maximize-toggled-pressed.svg | 85 ++------------
themes/default-xhdpi/maximize-toggled-pressed.xpm | 126 +++++++++++----------
themes/default-xhdpi/menu-active.png | Bin 187 -> 180 bytes
themes/default-xhdpi/menu-active.svg | 4 +-
themes/default-xhdpi/menu-active.xpm | 2 +-
themes/default-xhdpi/menu-inactive.png | Bin 187 -> 180 bytes
themes/default-xhdpi/menu-inactive.svg | 4 +-
themes/default-xhdpi/menu-prelight.png | Bin 187 -> 180 bytes
themes/default-xhdpi/menu-prelight.svg | 14 +--
themes/default-xhdpi/menu-prelight.xpm | 2 +-
themes/default-xhdpi/menu-pressed.png | Bin 187 -> 180 bytes
themes/default-xhdpi/menu-pressed.svg | 14 +--
themes/default-xhdpi/menu-pressed.xpm | 2 +-
themes/default-xhdpi/shade-active.png | Bin 1141 -> 180 bytes
themes/default-xhdpi/shade-active.svg | 61 ++--------
themes/default-xhdpi/shade-active.xpm | 123 ++++++++++----------
themes/default-xhdpi/shade-inactive.png | Bin 592 -> 180 bytes
themes/default-xhdpi/shade-inactive.svg | 28 ++---
themes/default-xhdpi/shade-inactive.xpm | 121 ++++++++++----------
themes/default-xhdpi/shade-prelight.png | Bin 1650 -> 180 bytes
themes/default-xhdpi/shade-prelight.svg | 75 +-----------
themes/default-xhdpi/shade-prelight.xpm | 124 ++++++++++----------
themes/default-xhdpi/shade-pressed.png | Bin 1698 -> 180 bytes
themes/default-xhdpi/shade-pressed.svg | 75 +-----------
themes/default-xhdpi/shade-pressed.xpm | 124 ++++++++++----------
themes/default-xhdpi/shade-toggled-active.png | Bin 1170 -> 180 bytes
themes/default-xhdpi/shade-toggled-active.svg | 61 ++--------
themes/default-xhdpi/shade-toggled-active.xpm | 125 ++++++++++----------
themes/default-xhdpi/shade-toggled-inactive.png | Bin 638 -> 180 bytes
themes/default-xhdpi/shade-toggled-inactive.svg | 28 ++---
themes/default-xhdpi/shade-toggled-inactive.xpm | 123 ++++++++++----------
themes/default-xhdpi/shade-toggled-prelight.png | Bin 1672 -> 180 bytes
themes/default-xhdpi/shade-toggled-prelight.svg | 75 +-----------
themes/default-xhdpi/shade-toggled-prelight.xpm | 126 +++++++++++----------
themes/default-xhdpi/shade-toggled-pressed.png | Bin 1700 -> 180 bytes
themes/default-xhdpi/shade-toggled-pressed.svg | 75 +-----------
themes/default-xhdpi/shade-toggled-pressed.xpm | 126 +++++++++++----------
themes/default-xhdpi/stick-active.png | Bin 1430 -> 180 bytes
themes/default-xhdpi/stick-active.svg | 61 ++--------
themes/default-xhdpi/stick-active.xpm | 123 ++++++++++----------
themes/default-xhdpi/stick-inactive.png | Bin 807 -> 180 bytes
themes/default-xhdpi/stick-inactive.svg | 28 ++---
themes/default-xhdpi/stick-inactive.xpm | 121 ++++++++++----------
themes/default-xhdpi/stick-prelight.png | Bin 1907 -> 180 bytes
themes/default-xhdpi/stick-prelight.svg | 75 +-----------
themes/default-xhdpi/stick-prelight.xpm | 124 ++++++++++----------
themes/default-xhdpi/stick-pressed.png | Bin 1910 -> 180 bytes
themes/default-xhdpi/stick-pressed.svg | 75 +-----------
themes/default-xhdpi/stick-pressed.xpm | 124 ++++++++++----------
themes/default-xhdpi/stick-toggled-active.png | Bin 1423 -> 180 bytes
themes/default-xhdpi/stick-toggled-active.svg | 70 ++----------
themes/default-xhdpi/stick-toggled-active.xpm | 125 ++++++++++----------
themes/default-xhdpi/stick-toggled-inactive.png | Bin 884 -> 180 bytes
themes/default-xhdpi/stick-toggled-inactive.svg | 37 ++----
themes/default-xhdpi/stick-toggled-inactive.xpm | 123 ++++++++++----------
themes/default-xhdpi/stick-toggled-prelight.png | Bin 1915 -> 180 bytes
themes/default-xhdpi/stick-toggled-prelight.svg | 90 ++-------------
themes/default-xhdpi/stick-toggled-prelight.xpm | 126 +++++++++++----------
themes/default-xhdpi/stick-toggled-pressed.png | Bin 1919 -> 180 bytes
themes/default-xhdpi/stick-toggled-pressed.svg | 90 ++-------------
themes/default-xhdpi/stick-toggled-pressed.xpm | 126 +++++++++++----------
themes/default-xhdpi/title-1-active.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-1-active.svg | 4 +-
themes/default-xhdpi/title-1-active.xpm | 2 +-
themes/default-xhdpi/title-1-inactive.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-1-inactive.svg | 4 +-
themes/default-xhdpi/title-2-active.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-2-active.svg | 4 +-
themes/default-xhdpi/title-2-active.xpm | 2 +-
themes/default-xhdpi/title-2-inactive.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-2-inactive.svg | 4 +-
themes/default-xhdpi/title-3-active.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-3-active.svg | 4 +-
themes/default-xhdpi/title-3-active.xpm | 2 +-
themes/default-xhdpi/title-3-inactive.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-3-inactive.svg | 4 +-
themes/default-xhdpi/title-4-active.png | Bin 540 -> 144 bytes
themes/default-xhdpi/title-4-active.svg | 47 ++------
themes/default-xhdpi/title-4-active.xpm | 2 +-
themes/default-xhdpi/title-4-inactive.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-4-inactive.svg | 4 +-
themes/default-xhdpi/title-5-active.png | Bin 234 -> 144 bytes
themes/default-xhdpi/title-5-active.svg | 47 ++------
themes/default-xhdpi/title-5-active.xpm | 2 +-
themes/default-xhdpi/title-5-inactive.png | Bin 145 -> 144 bytes
themes/default-xhdpi/title-5-inactive.svg | 4 +-
themes/default-xhdpi/top-left-active.png | Bin 402 -> 332 bytes
themes/default-xhdpi/top-left-active.svg | 13 ++-
themes/default-xhdpi/top-left-active.xpm | 2 +-
themes/default-xhdpi/top-left-inactive.png | Bin 402 -> 332 bytes
themes/default-xhdpi/top-left-inactive.svg | 13 ++-
themes/default-xhdpi/top-right-active.png | Bin 473 -> 336 bytes
themes/default-xhdpi/top-right-active.svg | 37 +-----
themes/default-xhdpi/top-right-active.xpm | 2 +-
themes/default-xhdpi/top-right-inactive.png | Bin 463 -> 336 bytes
themes/default-xhdpi/top-right-inactive.svg | 13 ++-
themes/default/bottom-active.png | Bin 96 -> 96 bytes
themes/default/bottom-active.svg | 4 +-
themes/default/bottom-active.xpm | 3 +-
themes/default/bottom-inactive.png | Bin 96 -> 96 bytes
themes/default/bottom-inactive.svg | 4 +-
themes/default/bottom-inactive.xpm | 3 +-
themes/default/bottom-left-active.xpm | 24 ++--
themes/default/bottom-left-inactive.xpm | 24 ++--
themes/default/bottom-right-active.xpm | 24 ++--
themes/default/bottom-right-inactive.xpm | 24 ++--
themes/default/close-active.png | Bin 710 -> 133 bytes
themes/default/close-active.svg | 75 ++----------
themes/default/close-active.xpm | 65 ++++++-----
themes/default/close-inactive.png | Bin 530 -> 133 bytes
themes/default/close-inactive.svg | 33 ++----
themes/default/close-inactive.xpm | 63 ++++++-----
themes/default/close-prelight.png | Bin 1038 -> 133 bytes
themes/default/close-prelight.svg | 101 ++---------------
themes/default/close-prelight.xpm | 66 ++++++-----
themes/default/close-pressed.png | Bin 1072 -> 133 bytes
themes/default/close-pressed.svg | 101 ++---------------
themes/default/close-pressed.xpm | 66 ++++++-----
themes/default/hide-active.png | Bin 253 -> 133 bytes
themes/default/hide-active.svg | 75 ++----------
themes/default/hide-active.xpm | 65 ++++++-----
themes/default/hide-inactive.png | Bin 159 -> 150 bytes
themes/default/hide-inactive.svg | 4 +-
themes/default/hide-inactive.xpm | 63 ++++++-----
themes/default/hide-prelight.png | Bin 533 -> 133 bytes
themes/default/hide-prelight.svg | 89 ++-------------
themes/default/hide-prelight.xpm | 66 ++++++-----
themes/default/hide-pressed.png | Bin 510 -> 133 bytes
themes/default/hide-pressed.svg | 89 ++-------------
themes/default/hide-pressed.xpm | 66 ++++++-----
themes/default/left-active.png | Bin 98 -> 98 bytes
themes/default/left-active.svg | 2 +-
themes/default/left-active.xpm | 50 ++++----
themes/default/left-inactive.png | Bin 98 -> 98 bytes
themes/default/left-inactive.svg | 2 +-
themes/default/left-inactive.xpm | 50 ++++----
themes/default/maximize-active.png | Bin 350 -> 133 bytes
themes/default/maximize-active.svg | 69 ++---------
themes/default/maximize-active.xpm | 65 ++++++-----
themes/default/maximize-inactive.png | Bin 213 -> 190 bytes
themes/default/maximize-inactive.svg | 4 +-
themes/default/maximize-inactive.xpm | 63 ++++++-----
themes/default/maximize-prelight.png | Bin 621 -> 133 bytes
themes/default/maximize-prelight.svg | 83 ++------------
themes/default/maximize-prelight.xpm | 66 ++++++-----
themes/default/maximize-pressed.png | Bin 596 -> 133 bytes
themes/default/maximize-pressed.svg | 83 ++------------
themes/default/maximize-pressed.xpm | 66 ++++++-----
themes/default/maximize-toggled-active.png | Bin 439 -> 133 bytes
themes/default/maximize-toggled-active.svg | 73 ++----------
themes/default/maximize-toggled-active.xpm | 67 +++++------
themes/default/maximize-toggled-inactive.png | Bin 272 -> 220 bytes
themes/default/maximize-toggled-inactive.svg | 4 +-
themes/default/maximize-toggled-inactive.xpm | 65 ++++++-----
themes/default/maximize-toggled-prelight.png | Bin 671 -> 133 bytes
themes/default/maximize-toggled-prelight.svg | 93 ++-------------
themes/default/maximize-toggled-prelight.xpm | 68 +++++------
themes/default/maximize-toggled-pressed.png | Bin 660 -> 133 bytes
themes/default/maximize-toggled-pressed.svg | 93 ++-------------
themes/default/maximize-toggled-pressed.xpm | 68 +++++------
themes/default/menu-active.png | Bin 137 -> 136 bytes
themes/default/menu-active.svg | 4 +-
themes/default/menu-active.xpm | 2 +-
themes/default/menu-inactive.png | Bin 137 -> 136 bytes
themes/default/menu-inactive.svg | 4 +-
themes/default/menu-prelight.png | Bin 137 -> 136 bytes
themes/default/menu-prelight.svg | 4 +-
themes/default/menu-prelight.xpm | 2 +-
themes/default/menu-pressed.png | Bin 137 -> 136 bytes
themes/default/menu-pressed.svg | 4 +-
themes/default/menu-pressed.xpm | 2 +-
themes/default/right-active.png | Bin 96 -> 96 bytes
themes/default/right-active.svg | 4 +-
themes/default/right-active.xpm | 50 ++++----
themes/default/right-inactive.png | Bin 96 -> 96 bytes
themes/default/right-inactive.svg | 4 +-
themes/default/right-inactive.xpm | 50 ++++----
themes/default/shade-active.png | Bin 513 -> 133 bytes
themes/default/shade-active.svg | 69 ++---------
themes/default/shade-active.xpm | 65 ++++++-----
themes/default/shade-inactive.png | Bin 339 -> 133 bytes
themes/default/shade-inactive.svg | 32 ++----
themes/default/shade-inactive.xpm | 63 ++++++-----
themes/default/shade-prelight.png | Bin 771 -> 133 bytes
themes/default/shade-prelight.svg | 83 ++------------
themes/default/shade-prelight.xpm | 66 ++++++-----
themes/default/shade-pressed.png | Bin 769 -> 133 bytes
themes/default/shade-pressed.svg | 83 ++------------
themes/default/shade-pressed.xpm | 66 ++++++-----
themes/default/shade-toggled-active.png | Bin 505 -> 133 bytes
themes/default/shade-toggled-active.svg | 69 ++---------
themes/default/shade-toggled-active.xpm | 67 +++++------
themes/default/shade-toggled-inactive.png | Bin 342 -> 133 bytes
themes/default/shade-toggled-inactive.svg | 32 ++----
themes/default/shade-toggled-inactive.xpm | 65 ++++++-----
themes/default/shade-toggled-prelight.png | Bin 773 -> 133 bytes
themes/default/shade-toggled-prelight.svg | 83 ++------------
themes/default/shade-toggled-prelight.xpm | 68 +++++------
themes/default/shade-toggled-pressed.png | Bin 760 -> 133 bytes
themes/default/shade-toggled-pressed.svg | 83 ++------------
themes/default/shade-toggled-pressed.xpm | 68 +++++------
themes/default/stick-active.png | Bin 588 -> 133 bytes
themes/default/stick-active.svg | 69 ++---------
themes/default/stick-active.xpm | 65 ++++++-----
themes/default/stick-inactive.png | Bin 405 -> 133 bytes
themes/default/stick-inactive.svg | 36 ++----
themes/default/stick-inactive.xpm | 63 ++++++-----
themes/default/stick-prelight.png | Bin 854 -> 133 bytes
themes/default/stick-prelight.svg | 83 ++------------
themes/default/stick-prelight.xpm | 66 ++++++-----
themes/default/stick-pressed.png | Bin 824 -> 133 bytes
themes/default/stick-pressed.svg | 83 ++------------
themes/default/stick-pressed.xpm | 66 ++++++-----
themes/default/stick-toggled-active.png | Bin 598 -> 133 bytes
themes/default/stick-toggled-active.svg | 78 ++-----------
themes/default/stick-toggled-active.xpm | 67 +++++------
themes/default/stick-toggled-inactive.png | Bin 405 -> 133 bytes
themes/default/stick-toggled-inactive.svg | 39 ++-----
themes/default/stick-toggled-inactive.xpm | 65 ++++++-----
themes/default/stick-toggled-prelight.png | Bin 860 -> 133 bytes
themes/default/stick-toggled-prelight.svg | 98 ++--------------
themes/default/stick-toggled-prelight.xpm | 68 +++++------
themes/default/stick-toggled-pressed.png | Bin 838 -> 133 bytes
themes/default/stick-toggled-pressed.svg | 98 ++--------------
themes/default/stick-toggled-pressed.xpm | 68 +++++------
themes/default/themerc | 4 +-
themes/default/title-1-active.png | Bin 123 -> 121 bytes
themes/default/title-1-active.svg | 4 +-
themes/default/title-1-active.xpm | 2 +-
themes/default/title-1-inactive.png | Bin 123 -> 121 bytes
themes/default/title-1-inactive.svg | 4 +-
themes/default/title-2-active.png | Bin 123 -> 121 bytes
themes/default/title-2-active.svg | 4 +-
themes/default/title-2-active.xpm | 2 +-
themes/default/title-2-inactive.png | Bin 123 -> 121 bytes
themes/default/title-2-inactive.svg | 4 +-
themes/default/title-3-active.png | Bin 123 -> 121 bytes
themes/default/title-3-active.svg | 4 +-
themes/default/title-3-active.xpm | 2 +-
themes/default/title-3-inactive.png | Bin 123 -> 121 bytes
themes/default/title-3-inactive.svg | 4 +-
themes/default/title-4-active.png | Bin 308 -> 121 bytes
themes/default/title-4-active.svg | 47 ++------
themes/default/title-4-active.xpm | 2 +-
themes/default/title-4-inactive.png | Bin 123 -> 121 bytes
themes/default/title-4-inactive.svg | 4 +-
themes/default/title-5-active.png | Bin 184 -> 121 bytes
themes/default/title-5-active.svg | 47 ++------
themes/default/title-5-active.xpm | 2 +-
themes/default/title-5-inactive.png | Bin 123 -> 121 bytes
themes/default/title-5-inactive.svg | 4 +-
themes/default/top-left-active.png | Bin 245 -> 224 bytes
themes/default/top-left-active.svg | 13 ++-
themes/default/top-left-active.xpm | 2 +-
themes/default/top-left-inactive.png | Bin 245 -> 224 bytes
themes/default/top-left-inactive.svg | 13 ++-
themes/default/top-right-active.png | Bin 310 -> 238 bytes
themes/default/top-right-active.svg | 37 +-----
themes/default/top-right-active.xpm | 2 +-
themes/default/top-right-inactive.png | Bin 283 -> 238 bytes
themes/default/top-right-inactive.svg | 13 ++-
459 files changed, 5258 insertions(+), 9961 deletions(-)
diff --git a/themes/default-hdpi/bottom-left-active.png b/themes/default-hdpi/bottom-left-active.png
index 660406b..31d0a1f 100644
Binary files a/themes/default-hdpi/bottom-left-active.png and b/themes/default-hdpi/bottom-left-active.png differ
diff --git a/themes/default-hdpi/bottom-left-inactive.png b/themes/default-hdpi/bottom-left-inactive.png
index 660406b..31d0a1f 100644
Binary files a/themes/default-hdpi/bottom-left-inactive.png and b/themes/default-hdpi/bottom-left-inactive.png differ
diff --git a/themes/default-hdpi/bottom-right-active.png b/themes/default-hdpi/bottom-right-active.png
index 63e1f73..3ccba92 100644
Binary files a/themes/default-hdpi/bottom-right-active.png and b/themes/default-hdpi/bottom-right-active.png differ
diff --git a/themes/default-hdpi/bottom-right-inactive.png b/themes/default-hdpi/bottom-right-inactive.png
index 63e1f73..3ccba92 100644
Binary files a/themes/default-hdpi/bottom-right-inactive.png and b/themes/default-hdpi/bottom-right-inactive.png differ
diff --git a/themes/default-hdpi/close-active.png b/themes/default-hdpi/close-active.png
index 3abc2e4..d423f23 100644
Binary files a/themes/default-hdpi/close-active.png and b/themes/default-hdpi/close-active.png differ
diff --git a/themes/default-hdpi/close-active.svg b/themes/default-hdpi/close-active.svg
index d184331..e813ff4 100644
--- a/themes/default-hdpi/close-active.svg
+++ b/themes/default-hdpi/close-active.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,40 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/close-active.xpm b/themes/default-hdpi/close-active.xpm
index 92d262b..a7021f3 100644
--- a/themes/default-hdpi/close-active.xpm
+++ b/themes/default-hdpi/close-active.xpm
@@ -1,17 +1,11 @@
/* XPM */
static char * close_active_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +24,15 @@ static char * close_active_xpm[] = {
".................................",
".................................",
".................................",
+"............##@...@##............",
+"............###@.@###............",
+"............@###@###@............",
+".............@#####@.............",
+"..............@###@..............",
+".............@#####@.............",
+"............@###@###@............",
+"............###@.@###............",
+"............##@...@##............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/menu-active.svg b/themes/default-hdpi/close-inactive
similarity index 95%
copy from themes/default-hdpi/menu-active.svg
copy to themes/default-hdpi/close-inactive
index 2a3ec7b..857ae9e 100644
--- a/themes/default-hdpi/menu-active.svg
+++ b/themes/default-hdpi/close-inactive
@@ -16,12 +16,12 @@
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
version="1.0"
- sodipodi:docname="menu-active.svg"
+ sodipodi:docname="button.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata25" />
+ id="metadata38" />
<defs
- id="defs23" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview21" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/close-inactive.png b/themes/default-hdpi/close-inactive.png
index 58dfc86..d423f23 100644
Binary files a/themes/default-hdpi/close-inactive.png and b/themes/default-hdpi/close-inactive.png differ
diff --git a/themes/default-hdpi/close-inactive.svg b/themes/default-hdpi/close-inactive.svg
index 4298135..ee8c0be 100644
--- a/themes/default-hdpi/close-inactive.svg
+++ b/themes/default-hdpi/close-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata38" />
<defs
- id="defs27" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,28 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(3,9)">
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/close-inactive.xpm b/themes/default-hdpi/close-inactive.xpm
index 912db27..0197ae2 100644
--- a/themes/default-hdpi/close-inactive.xpm
+++ b/themes/default-hdpi/close-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -21,15 +24,15 @@ static char * close_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"............##$...$##............",
+"............###$.$###............",
+"............$###$###$............",
+".............$#####$.............",
+"..............$###$..............",
+".............$#####$.............",
+"............$###$###$............",
+"............###$.$###............",
+"............##$...$##............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/close-prelight.png b/themes/default-hdpi/close-prelight.png
index c7fd79c..d423f23 100644
Binary files a/themes/default-hdpi/close-prelight.png and b/themes/default-hdpi/close-prelight.png differ
diff --git a/themes/default-hdpi/close-prelight.svg b/themes/default-hdpi/close-prelight.svg
index b6150f5..1cff208 100644
--- a/themes/default-hdpi/close-prelight.svg
+++ b/themes/default-hdpi/close-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata41" />
+ id="metadata38" />
<defs
- id="defs39" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview37" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,40 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/close-prelight.xpm b/themes/default-hdpi/close-prelight.xpm
index 92d262b..ca30bab 100644
--- a/themes/default-hdpi/close-prelight.xpm
+++ b/themes/default-hdpi/close-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * close_active_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++##@+++@##+++++++++++@",
+"@+++++++++++###@+@###+++++++++++@",
+"@+++++++++++@###@###@+++++++++++@",
+"@++++++++++++@#####@++++++++++++@",
+"@+++++++++++++@###@+++++++++++++@",
+"@++++++++++++@#####@++++++++++++@",
+"@+++++++++++@###@###@+++++++++++@",
+"@+++++++++++###@+@###+++++++++++@",
+"@+++++++++++##@+++@##+++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/close-pressed.png b/themes/default-hdpi/close-pressed.png
index da872d4..d423f23 100644
Binary files a/themes/default-hdpi/close-pressed.png and b/themes/default-hdpi/close-pressed.png differ
diff --git a/themes/default-hdpi/close-pressed.svg b/themes/default-hdpi/close-pressed.svg
index ca8dbf8..cd6fd2b 100644
--- a/themes/default-hdpi/close-pressed.svg
+++ b/themes/default-hdpi/close-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata41" />
+ id="metadata38" />
<defs
- id="defs39" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview37" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,58 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,10)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/close-pressed.xpm b/themes/default-hdpi/close-pressed.xpm
index f5cd2bb..9b0b0bf 100644
--- a/themes/default-hdpi/close-pressed.xpm
+++ b/themes/default-hdpi/close-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...........##@...@##...........@",
+"@...........###@.@###...........@",
+"@...........@###@###@...........@",
+"@............@#####@............@",
+"@.............@###@.............@",
+"@............@#####@............@",
+"@...........@###@###@...........@",
+"@...........###@.@###...........@",
+"@...........##@...@##...........@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/hide-active.png b/themes/default-hdpi/hide-active.png
index 9a1c7c3..d423f23 100644
Binary files a/themes/default-hdpi/hide-active.png and b/themes/default-hdpi/hide-active.png differ
diff --git a/themes/default-hdpi/hide-active.svg b/themes/default-hdpi/hide-active.svg
index c1f1fec..749f149 100644
--- a/themes/default-hdpi/hide-active.svg
+++ b/themes/default-hdpi/hide-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="hide-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata35" />
+ id="metadata38" />
<defs
- id="defs33" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview31" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,34 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/hide-active.xpm b/themes/default-hdpi/hide-active.xpm
index 650bb4d..5311a1e 100644
--- a/themes/default-hdpi/hide-active.xpm
+++ b/themes/default-hdpi/hide-active.xpm
@@ -1,10 +1,11 @@
/* XPM */
static char * hide_active_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +31,8 @@ static char * hide_active_xpm[] = {
".................................",
".................................",
".................................",
+"............#########............",
+"............#########............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/hide-inactive.png b/themes/default-hdpi/hide-inactive.png
index a30205e..d423f23 100644
Binary files a/themes/default-hdpi/hide-inactive.png and b/themes/default-hdpi/hide-inactive.png differ
diff --git a/themes/default-hdpi/hide-inactive.svg b/themes/default-hdpi/hide-inactive.svg
index 11d5098..b9467b5 100644
--- a/themes/default-hdpi/hide-inactive.svg
+++ b/themes/default-hdpi/hide-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="hide-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata28" />
+ id="metadata38" />
<defs
- id="defs26" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview24" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,28 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(3,9)">
- <rect
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/hide-inactive.xpm b/themes/default-hdpi/hide-inactive.xpm
index f5145ec..b8d7af4 100644
--- a/themes/default-hdpi/hide-inactive.xpm
+++ b/themes/default-hdpi/hide-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -28,8 +31,8 @@ static char * hide_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
+"............#########............",
+"............#########............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/hide-prelight.png b/themes/default-hdpi/hide-prelight.png
index f6118b8..d423f23 100644
Binary files a/themes/default-hdpi/hide-prelight.png and b/themes/default-hdpi/hide-prelight.png differ
diff --git a/themes/default-hdpi/hide-prelight.svg b/themes/default-hdpi/hide-prelight.svg
index 07b3cae..026b5c4 100644
--- a/themes/default-hdpi/hide-prelight.svg
+++ b/themes/default-hdpi/hide-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,34 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/hide-prelight.xpm b/themes/default-hdpi/hide-prelight.xpm
index 650bb4d..93acdf4 100644
--- a/themes/default-hdpi/hide-prelight.xpm
+++ b/themes/default-hdpi/hide-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * hide_active_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/hide-pressed.png b/themes/default-hdpi/hide-pressed.png
index 41cc10a..d423f23 100644
Binary files a/themes/default-hdpi/hide-pressed.png and b/themes/default-hdpi/hide-pressed.png differ
diff --git a/themes/default-hdpi/hide-pressed.svg b/themes/default-hdpi/hide-pressed.svg
index aec8417..d61f1d9 100644
--- a/themes/default-hdpi/hide-pressed.svg
+++ b/themes/default-hdpi/hide-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,52 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/hide-pressed.xpm b/themes/default-hdpi/hide-pressed.xpm
index 7784eee..fa14f1d 100644
--- a/themes/default-hdpi/hide-pressed.xpm
+++ b/themes/default-hdpi/hide-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...........#########...........@",
+"@...........#########...........@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-active.png b/themes/default-hdpi/maximize-active.png
index c98294a..d423f23 100644
Binary files a/themes/default-hdpi/maximize-active.png and b/themes/default-hdpi/maximize-active.png differ
diff --git a/themes/default-hdpi/maximize-active.svg b/themes/default-hdpi/maximize-active.svg
index 1b0ef10..5d67bb4 100644
--- a/themes/default-hdpi/maximize-active.svg
+++ b/themes/default-hdpi/maximize-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata35" />
+ id="metadata38" />
<defs
- id="defs33" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview31" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-active.xpm b/themes/default-hdpi/maximize-active.xpm
index a6ee3a3..99a134e 100644
--- a/themes/default-hdpi/maximize-active.xpm
+++ b/themes/default-hdpi/maximize-active.xpm
@@ -1,17 +1,11 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +24,15 @@ static char * maximize_active_xpm[] = {
".................................",
".................................",
".................................",
+"............#########............",
+"............#########............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............#########............",
+"............#########............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-inactive.png b/themes/default-hdpi/maximize-inactive.png
index 8b8012c..d423f23 100644
Binary files a/themes/default-hdpi/maximize-inactive.png and b/themes/default-hdpi/maximize-inactive.png differ
diff --git a/themes/default-hdpi/maximize-inactive.svg b/themes/default-hdpi/maximize-inactive.svg
index 4e6bab4..1b3a03a 100644
--- a/themes/default-hdpi/maximize-inactive.svg
+++ b/themes/default-hdpi/maximize-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata28" />
+ id="metadata38" />
<defs
- id="defs26" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview24" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -121,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(3,9)">
- <path
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- id="rect2275" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/maximize-inactive.xpm b/themes/default-hdpi/maximize-inactive.xpm
index 020d069..adc2c7f 100644
--- a/themes/default-hdpi/maximize-inactive.xpm
+++ b/themes/default-hdpi/maximize-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -21,15 +24,15 @@ static char * maximize_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"............#########............",
+"............#########............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............##.....##............",
+"............#########............",
+"............#########............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-prelight.png b/themes/default-hdpi/maximize-prelight.png
index e899ebd..d423f23 100644
Binary files a/themes/default-hdpi/maximize-prelight.png and b/themes/default-hdpi/maximize-prelight.png differ
diff --git a/themes/default-hdpi/maximize-prelight.svg b/themes/default-hdpi/maximize-prelight.svg
index 4e93c37..7148fac 100644
--- a/themes/default-hdpi/maximize-prelight.svg
+++ b/themes/default-hdpi/maximize-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-prelight.xpm b/themes/default-hdpi/maximize-prelight.xpm
index a6ee3a3..736855b 100644
--- a/themes/default-hdpi/maximize-prelight.xpm
+++ b/themes/default-hdpi/maximize-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++##+++++##+++++++++++@",
+"@+++++++++++##+++++##+++++++++++@",
+"@+++++++++++##+++++##+++++++++++@",
+"@+++++++++++##+++++##+++++++++++@",
+"@+++++++++++##+++++##+++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-pressed.png b/themes/default-hdpi/maximize-pressed.png
index 433247e..d423f23 100644
Binary files a/themes/default-hdpi/maximize-pressed.png and b/themes/default-hdpi/maximize-pressed.png differ
diff --git a/themes/default-hdpi/maximize-pressed.svg b/themes/default-hdpi/maximize-pressed.svg
index ec18da4..4817053 100644
--- a/themes/default-hdpi/maximize-pressed.svg
+++ b/themes/default-hdpi/maximize-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,10)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-pressed.xpm b/themes/default-hdpi/maximize-pressed.xpm
index 7a60f67..dac211d 100644
--- a/themes/default-hdpi/maximize-pressed.xpm
+++ b/themes/default-hdpi/maximize-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...........#########...........@",
+"@...........#########...........@",
+"@...........##.....##...........@",
+"@...........##.....##...........@",
+"@...........##.....##...........@",
+"@...........##.....##...........@",
+"@...........##.....##...........@",
+"@...........#########...........@",
+"@...........#########...........@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-toggled-active.png b/themes/default-hdpi/maximize-toggled-active.png
index d6fd1f3..d423f23 100644
Binary files a/themes/default-hdpi/maximize-toggled-active.png and b/themes/default-hdpi/maximize-toggled-active.png differ
diff --git a/themes/default-hdpi/maximize-toggled-active.svg b/themes/default-hdpi/maximize-toggled-active.svg
index 5f9e0f2..6b82eaf 100644
--- a/themes/default-hdpi/maximize-toggled-active.svg
+++ b/themes/default-hdpi/maximize-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata38" />
<defs
- id="defs34" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,32 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-toggled-active.xpm b/themes/default-hdpi/maximize-toggled-active.xpm
index b63731a..e81bdab 100644
--- a/themes/default-hdpi/maximize-toggled-active.xpm
+++ b/themes/default-hdpi/maximize-toggled-active.xpm
@@ -1,15 +1,11 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * maximize_active_xpm[] = {
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -29,6 +25,13 @@ static char * maximize_toggled_active_xpm[] = {
".................................",
".................................",
".................................",
+".............#######.............",
+".............#######.............",
+".............##...##.............",
+".............##...##.............",
+".............##...##.............",
+".............#######.............",
+".............#######.............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-toggled-inactive.png b/themes/default-hdpi/maximize-toggled-inactive.png
index 9ac44e2..d423f23 100644
Binary files a/themes/default-hdpi/maximize-toggled-inactive.png and b/themes/default-hdpi/maximize-toggled-inactive.png differ
diff --git a/themes/default-hdpi/maximize-toggled-inactive.svg b/themes/default-hdpi/maximize-toggled-inactive.svg
index de7db88..4c78aab 100644
--- a/themes/default-hdpi/maximize-toggled-inactive.svg
+++ b/themes/default-hdpi/maximize-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata38" />
<defs
- id="defs27" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1639"
- transform="translate(3,9)">
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/maximize-toggled-inactive.xpm b/themes/default-hdpi/maximize-toggled-inactive.xpm
index 676cfd6..35b8219 100644
--- a/themes/default-hdpi/maximize-toggled-inactive.xpm
+++ b/themes/default-hdpi/maximize-toggled-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"33 43 2 1",
+static char * maximize_inactive_xpm[] = {
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -22,13 +25,13 @@ static char * maximize_toggled_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+".............#######.............",
+".............#######.............",
+".............##...##.............",
+".............##...##.............",
+".............##...##.............",
+".............#######.............",
+".............#######.............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-toggled-prelight.png b/themes/default-hdpi/maximize-toggled-prelight.png
index 1777537..d423f23 100644
Binary files a/themes/default-hdpi/maximize-toggled-prelight.png and b/themes/default-hdpi/maximize-toggled-prelight.png differ
diff --git a/themes/default-hdpi/maximize-toggled-prelight.svg b/themes/default-hdpi/maximize-toggled-prelight.svg
index b25fc05..00b8217 100644
--- a/themes/default-hdpi/maximize-toggled-prelight.svg
+++ b/themes/default-hdpi/maximize-toggled-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata39" />
+ id="metadata38" />
<defs
- id="defs37" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview35" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,32 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-toggled-prelight.xpm b/themes/default-hdpi/maximize-toggled-prelight.xpm
index b63731a..e4ad782 100644
--- a/themes/default-hdpi/maximize-toggled-prelight.xpm
+++ b/themes/default-hdpi/maximize-toggled-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * maximize_active_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@++++++++++++#######++++++++++++@",
+"@++++++++++++#######++++++++++++@",
+"@++++++++++++##+++##++++++++++++@",
+"@++++++++++++##+++##++++++++++++@",
+"@++++++++++++##+++##++++++++++++@",
+"@++++++++++++#######++++++++++++@",
+"@++++++++++++#######++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/maximize-toggled-pressed.png b/themes/default-hdpi/maximize-toggled-pressed.png
index 34729c5..d423f23 100644
Binary files a/themes/default-hdpi/maximize-toggled-pressed.png and b/themes/default-hdpi/maximize-toggled-pressed.png differ
diff --git a/themes/default-hdpi/maximize-toggled-pressed.svg b/themes/default-hdpi/maximize-toggled-pressed.svg
index 6ea8bd4..118847d 100644
--- a/themes/default-hdpi/maximize-toggled-pressed.svg
+++ b/themes/default-hdpi/maximize-toggled-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata39" />
+ id="metadata38" />
<defs
- id="defs37" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview35" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,50 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,10)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/maximize-toggled-pressed.xpm b/themes/default-hdpi/maximize-toggled-pressed.xpm
index 75b0990..f68a44d 100644
--- a/themes/default-hdpi/maximize-toggled-pressed.xpm
+++ b/themes/default-hdpi/maximize-toggled-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"33 43 2 1",
+static char * maximize_pressed_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@............#######............@",
+"@............#######............@",
+"@............##...##............@",
+"@............##...##............@",
+"@............##...##............@",
+"@............#######............@",
+"@............#######............@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/menu-active.png b/themes/default-hdpi/menu-active.png
index c697cae..d423f23 100644
Binary files a/themes/default-hdpi/menu-active.png and b/themes/default-hdpi/menu-active.png differ
diff --git a/themes/default-hdpi/menu-active.svg b/themes/default-hdpi/menu-active.svg
index 2a3ec7b..addc466 100644
--- a/themes/default-hdpi/menu-active.svg
+++ b/themes/default-hdpi/menu-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default-hdpi/menu-active.xpm b/themes/default-hdpi/menu-active.xpm
index 281a00a..97bd286 100644
--- a/themes/default-hdpi/menu-active.xpm
+++ b/themes/default-hdpi/menu-active.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"33 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/menu-inactive.png b/themes/default-hdpi/menu-inactive.png
index c697cae..d423f23 100644
Binary files a/themes/default-hdpi/menu-inactive.png and b/themes/default-hdpi/menu-inactive.png differ
diff --git a/themes/default-hdpi/menu-inactive.svg b/themes/default-hdpi/menu-inactive.svg
index 12138c4..c941ff9 100644
--- a/themes/default-hdpi/menu-inactive.svg
+++ b/themes/default-hdpi/menu-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default-hdpi/menu-prelight.png b/themes/default-hdpi/menu-prelight.png
index c697cae..d423f23 100644
Binary files a/themes/default-hdpi/menu-prelight.png and b/themes/default-hdpi/menu-prelight.png differ
diff --git a/themes/default-hdpi/menu-prelight.svg b/themes/default-hdpi/menu-prelight.svg
index 5c35767..59cf9cf 100644
--- a/themes/default-hdpi/menu-prelight.svg
+++ b/themes/default-hdpi/menu-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="menu-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata25" />
+ id="metadata38" />
<defs
- id="defs23" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview21" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/menu-prelight.xpm b/themes/default-hdpi/menu-prelight.xpm
index 281a00a..97bd286 100644
--- a/themes/default-hdpi/menu-prelight.xpm
+++ b/themes/default-hdpi/menu-prelight.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"33 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/menu-pressed.png b/themes/default-hdpi/menu-pressed.png
index c697cae..d423f23 100644
Binary files a/themes/default-hdpi/menu-pressed.png and b/themes/default-hdpi/menu-pressed.png differ
diff --git a/themes/default-hdpi/menu-pressed.svg b/themes/default-hdpi/menu-pressed.svg
index fc71e49..d2546cd 100644
--- a/themes/default-hdpi/menu-pressed.svg
+++ b/themes/default-hdpi/menu-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="menu-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata25" />
+ id="metadata38" />
<defs
- id="defs23" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview21" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/menu-pressed.xpm b/themes/default-hdpi/menu-pressed.xpm
index 888a3c1..12cffea 100644
--- a/themes/default-hdpi/menu-pressed.xpm
+++ b/themes/default-hdpi/menu-pressed.xpm
@@ -2,7 +2,7 @@
static char * menu_pressed_xpm[] = {
"33 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-active.png b/themes/default-hdpi/shade-active.png
index fd3681b..d423f23 100644
Binary files a/themes/default-hdpi/shade-active.png and b/themes/default-hdpi/shade-active.png differ
diff --git a/themes/default-hdpi/shade-active.svg b/themes/default-hdpi/shade-active.svg
index 998937a..f0a89dc 100644
--- a/themes/default-hdpi/shade-active.svg
+++ b/themes/default-hdpi/shade-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata35" />
+ id="metadata38" />
<defs
- id="defs33" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview31" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-active.xpm b/themes/default-hdpi/shade-active.xpm
index 355490a..32c33bd 100644
--- a/themes/default-hdpi/shade-active.xpm
+++ b/themes/default-hdpi/shade-active.xpm
@@ -1,15 +1,11 @@
/* XPM */
static char * shade_active_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -29,6 +25,13 @@ static char * shade_active_xpm[] = {
".................................",
".................................",
".................................",
+"................ at ................",
+"...............@#@...............",
+"..............@###@..............",
+".............@#####@.............",
+"............@###@###@............",
+"............###@.@###............",
+"............##@...@##............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-inactive.png b/themes/default-hdpi/shade-inactive.png
index c2f8ffb..d423f23 100644
Binary files a/themes/default-hdpi/shade-inactive.png and b/themes/default-hdpi/shade-inactive.png differ
diff --git a/themes/default-hdpi/shade-inactive.svg b/themes/default-hdpi/shade-inactive.svg
index 02e604b..78e7559 100644
--- a/themes/default-hdpi/shade-inactive.svg
+++ b/themes/default-hdpi/shade-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata28" />
+ id="metadata38" />
<defs
- id="defs26" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview24" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/shade-inactive.xpm b/themes/default-hdpi/shade-inactive.xpm
index 37ff26a..6f2db66 100644
--- a/themes/default-hdpi/shade-inactive.xpm
+++ b/themes/default-hdpi/shade-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -22,13 +25,13 @@ static char * shade_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"................$................",
+"...............$#$...............",
+"..............$###$..............",
+".............$#####$.............",
+"............$###$###$............",
+"............###$.$###............",
+"............##$...$##............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-prelight.png b/themes/default-hdpi/shade-prelight.png
index 9d54d26..d423f23 100644
Binary files a/themes/default-hdpi/shade-prelight.png and b/themes/default-hdpi/shade-prelight.png differ
diff --git a/themes/default-hdpi/shade-prelight.svg b/themes/default-hdpi/shade-prelight.svg
index f1aba70..df709d3 100644
--- a/themes/default-hdpi/shade-prelight.svg
+++ b/themes/default-hdpi/shade-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-prelight.xpm b/themes/default-hdpi/shade-prelight.xpm
index 355490a..3671c0c 100644
--- a/themes/default-hdpi/shade-prelight.xpm
+++ b/themes/default-hdpi/shade-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * shade_active_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++ at +++++++++++++++@",
+"@++++++++++++++@#@++++++++++++++@",
+"@+++++++++++++@###@+++++++++++++@",
+"@++++++++++++@#####@++++++++++++@",
+"@+++++++++++@###@###@+++++++++++@",
+"@+++++++++++###@+@###+++++++++++@",
+"@+++++++++++##@+++@##+++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-pressed.png b/themes/default-hdpi/shade-pressed.png
index 81aca08..d423f23 100644
Binary files a/themes/default-hdpi/shade-pressed.png and b/themes/default-hdpi/shade-pressed.png differ
diff --git a/themes/default-hdpi/shade-pressed.svg b/themes/default-hdpi/shade-pressed.svg
index 9bec32a..d6b67ed 100644
--- a/themes/default-hdpi/shade-pressed.svg
+++ b/themes/default-hdpi/shade-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-pressed.xpm b/themes/default-hdpi/shade-pressed.xpm
index 0f66763..253230c 100644
--- a/themes/default-hdpi/shade-pressed.xpm
+++ b/themes/default-hdpi/shade-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@............... at ...............@",
+"@..............@#@..............@",
+"@.............@###@.............@",
+"@............@#####@............@",
+"@...........@###@###@...........@",
+"@...........###@.@###...........@",
+"@...........##@...@##...........@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-toggled-active.png b/themes/default-hdpi/shade-toggled-active.png
index d5afc7e..d423f23 100644
Binary files a/themes/default-hdpi/shade-toggled-active.png and b/themes/default-hdpi/shade-toggled-active.png differ
diff --git a/themes/default-hdpi/shade-toggled-active.svg b/themes/default-hdpi/shade-toggled-active.svg
index b507d6b..ef2b410 100644
--- a/themes/default-hdpi/shade-toggled-active.svg
+++ b/themes/default-hdpi/shade-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata35" />
+ id="metadata38" />
<defs
- id="defs33" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview31" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-toggled-active.xpm b/themes/default-hdpi/shade-toggled-active.xpm
index 751b983..08f9237 100644
--- a/themes/default-hdpi/shade-toggled-active.xpm
+++ b/themes/default-hdpi/shade-toggled-active.xpm
@@ -1,15 +1,11 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * shade_active_xpm[] = {
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +26,13 @@ static char * shade_toggled_active_xpm[] = {
".................................",
".................................",
".................................",
+"............##@...@##............",
+"............###@.@###............",
+"............@###@###@............",
+".............@#####@.............",
+"..............@###@..............",
+"...............@#@...............",
+"................ at ................",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-toggled-inactive.png b/themes/default-hdpi/shade-toggled-inactive.png
index a621a06..d423f23 100644
Binary files a/themes/default-hdpi/shade-toggled-inactive.png and b/themes/default-hdpi/shade-toggled-inactive.png differ
diff --git a/themes/default-hdpi/shade-toggled-inactive.svg b/themes/default-hdpi/shade-toggled-inactive.svg
index 1b8e631..ec01cf3 100644
--- a/themes/default-hdpi/shade-toggled-inactive.svg
+++ b/themes/default-hdpi/shade-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata28" />
+ id="metadata38" />
<defs
- id="defs26" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview24" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/shade-toggled-inactive.xpm b/themes/default-hdpi/shade-toggled-inactive.xpm
index eec52d9..cd40d2d 100644
--- a/themes/default-hdpi/shade-toggled-inactive.xpm
+++ b/themes/default-hdpi/shade-toggled-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"33 43 2 1",
+static char * shade_inactive_xpm[] = {
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -23,13 +26,13 @@ static char * shade_toggled_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"............##$...$##............",
+"............###$.$###............",
+"............$###$###$............",
+".............$#####$.............",
+"..............$###$..............",
+"...............$#$...............",
+"................$................",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-toggled-prelight.png b/themes/default-hdpi/shade-toggled-prelight.png
index c6f6bec..d423f23 100644
Binary files a/themes/default-hdpi/shade-toggled-prelight.png and b/themes/default-hdpi/shade-toggled-prelight.png differ
diff --git a/themes/default-hdpi/shade-toggled-prelight.svg b/themes/default-hdpi/shade-toggled-prelight.svg
index a1ab016..1394d25 100644
--- a/themes/default-hdpi/shade-toggled-prelight.svg
+++ b/themes/default-hdpi/shade-toggled-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-toggled-prelight.xpm b/themes/default-hdpi/shade-toggled-prelight.xpm
index 751b983..950b12b 100644
--- a/themes/default-hdpi/shade-toggled-prelight.xpm
+++ b/themes/default-hdpi/shade-toggled-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * shade_active_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++##@+++@##+++++++++++@",
+"@+++++++++++###@+@###+++++++++++@",
+"@+++++++++++@###@###@+++++++++++@",
+"@++++++++++++@#####@++++++++++++@",
+"@+++++++++++++@###@+++++++++++++@",
+"@++++++++++++++@#@++++++++++++++@",
+"@+++++++++++++++ at +++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/shade-toggled-pressed.png b/themes/default-hdpi/shade-toggled-pressed.png
index f242156..d423f23 100644
Binary files a/themes/default-hdpi/shade-toggled-pressed.png and b/themes/default-hdpi/shade-toggled-pressed.png differ
diff --git a/themes/default-hdpi/shade-toggled-pressed.svg b/themes/default-hdpi/shade-toggled-pressed.svg
index 43666be..cf1524e 100644
--- a/themes/default-hdpi/shade-toggled-pressed.svg
+++ b/themes/default-hdpi/shade-toggled-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,10)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/shade-toggled-pressed.xpm b/themes/default-hdpi/shade-toggled-pressed.xpm
index 4543247..f3f1630 100644
--- a/themes/default-hdpi/shade-toggled-pressed.xpm
+++ b/themes/default-hdpi/shade-toggled-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"33 43 2 1",
+static char * shade_pressed_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...........##@...@##...........@",
+"@...........###@.@###...........@",
+"@...........@###@###@...........@",
+"@............@#####@............@",
+"@.............@###@.............@",
+"@..............@#@..............@",
+"@............... at ...............@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-active.png b/themes/default-hdpi/stick-active.png
index 3b3dc66..d423f23 100644
Binary files a/themes/default-hdpi/stick-active.png and b/themes/default-hdpi/stick-active.png differ
diff --git a/themes/default-hdpi/stick-active.svg b/themes/default-hdpi/stick-active.svg
index bc1c6e9..cc17bc5 100644
--- a/themes/default-hdpi/stick-active.svg
+++ b/themes/default-hdpi/stick-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata35" />
+ id="metadata38" />
<defs
- id="defs33" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview31" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-active.xpm b/themes/default-hdpi/stick-active.xpm
index 7608eb9..821c224 100644
--- a/themes/default-hdpi/stick-active.xpm
+++ b/themes/default-hdpi/stick-active.xpm
@@ -1,17 +1,11 @@
/* XPM */
static char * stick_active_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +24,15 @@ static char * stick_active_xpm[] = {
".................................",
".................................",
".................................",
+"...............@#@...............",
+"...............###...............",
+"...............###...............",
+"............@#######@............",
+"............#########............",
+"............@#######@............",
+"...............###...............",
+"...............###...............",
+"...............@#@...............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-inactive.png b/themes/default-hdpi/stick-inactive.png
index 9b62596..d423f23 100644
Binary files a/themes/default-hdpi/stick-inactive.png and b/themes/default-hdpi/stick-inactive.png differ
diff --git a/themes/default-hdpi/stick-inactive.svg b/themes/default-hdpi/stick-inactive.svg
index 7780f51..acdb926 100644
--- a/themes/default-hdpi/stick-inactive.svg
+++ b/themes/default-hdpi/stick-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata28" />
+ id="metadata38" />
<defs
- id="defs26" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview24" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/stick-inactive.xpm b/themes/default-hdpi/stick-inactive.xpm
index 55506e6..805c5e6 100644
--- a/themes/default-hdpi/stick-inactive.xpm
+++ b/themes/default-hdpi/stick-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"33 43 2 1",
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -21,15 +24,15 @@ static char * stick_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"...............$#$...............",
+"...............###...............",
+"...............###...............",
+"............$#######$............",
+"............#########............",
+"............$#######$............",
+"...............###...............",
+"...............###...............",
+"...............$#$...............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-prelight.png b/themes/default-hdpi/stick-prelight.png
index d7670a2..d423f23 100644
Binary files a/themes/default-hdpi/stick-prelight.png and b/themes/default-hdpi/stick-prelight.png differ
diff --git a/themes/default-hdpi/stick-prelight.svg b/themes/default-hdpi/stick-prelight.svg
index 8227b05..dcaec47 100644
--- a/themes/default-hdpi/stick-prelight.svg
+++ b/themes/default-hdpi/stick-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-prelight.xpm b/themes/default-hdpi/stick-prelight.xpm
index 7608eb9..2ea82c7 100644
--- a/themes/default-hdpi/stick-prelight.xpm
+++ b/themes/default-hdpi/stick-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * stick_active_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@++++++++++++++@#@++++++++++++++@",
+"@++++++++++++++###++++++++++++++@",
+"@++++++++++++++###++++++++++++++@",
+"@+++++++++++@#######@+++++++++++@",
+"@+++++++++++#########+++++++++++@",
+"@+++++++++++@#######@+++++++++++@",
+"@++++++++++++++###++++++++++++++@",
+"@++++++++++++++###++++++++++++++@",
+"@++++++++++++++@#@++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-pressed.png b/themes/default-hdpi/stick-pressed.png
index 144adcf..d423f23 100644
Binary files a/themes/default-hdpi/stick-pressed.png and b/themes/default-hdpi/stick-pressed.png differ
diff --git a/themes/default-hdpi/stick-pressed.svg b/themes/default-hdpi/stick-pressed.svg
index 51a8ce2..c0e3896 100644
--- a/themes/default-hdpi/stick-pressed.svg
+++ b/themes/default-hdpi/stick-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-pressed.xpm b/themes/default-hdpi/stick-pressed.xpm
index 78f5cc7..31b81f4 100644
--- a/themes/default-hdpi/stick-pressed.xpm
+++ b/themes/default-hdpi/stick-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"33 43 2 1",
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@..............@#@..............@",
+"@..............###..............@",
+"@..............###..............@",
+"@...........@#######@...........@",
+"@...........#########...........@",
+"@...........@#######@...........@",
+"@..............###..............@",
+"@..............###..............@",
+"@..............@#@..............@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-toggled-active.png b/themes/default-hdpi/stick-toggled-active.png
index de8757a..d423f23 100644
Binary files a/themes/default-hdpi/stick-toggled-active.png and b/themes/default-hdpi/stick-toggled-active.png differ
diff --git a/themes/default-hdpi/stick-toggled-active.svg b/themes/default-hdpi/stick-toggled-active.svg
index 0a6e7fa..d8e9d68 100644
--- a/themes/default-hdpi/stick-toggled-active.svg
+++ b/themes/default-hdpi/stick-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata38" />
<defs
- id="defs34" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,37 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-toggled-active.xpm b/themes/default-hdpi/stick-toggled-active.xpm
index a8582a0..247ebd0 100644
--- a/themes/default-hdpi/stick-toggled-active.xpm
+++ b/themes/default-hdpi/stick-toggled-active.xpm
@@ -1,17 +1,11 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * stick_active_xpm[] = {
+"33 43 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
".................................",
".................................",
".................................",
@@ -30,6 +24,15 @@ static char * stick_toggled_active_xpm[] = {
".................................",
".................................",
".................................",
+"...............###...............",
+"...............###...............",
+"...............@#@...............",
+"............##$.$.@##............",
+"............###@.@###............",
+"............##@. at .@##............",
+"...............@#@...............",
+"...............###...............",
+"...............###...............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-toggled-inactive.png b/themes/default-hdpi/stick-toggled-inactive.png
index 96e32d7..d423f23 100644
Binary files a/themes/default-hdpi/stick-toggled-inactive.png and b/themes/default-hdpi/stick-toggled-inactive.png differ
diff --git a/themes/default-hdpi/stick-toggled-inactive.svg b/themes/default-hdpi/stick-toggled-inactive.svg
index d0d9aee..b1c9551 100644
--- a/themes/default-hdpi/stick-toggled-inactive.svg
+++ b/themes/default-hdpi/stick-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata38" />
<defs
- id="defs27" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,34 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2202"
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/stick-toggled-inactive.xpm b/themes/default-hdpi/stick-toggled-inactive.xpm
index 4f83d73..f132c0c 100644
--- a/themes/default-hdpi/stick-toggled-inactive.xpm
+++ b/themes/default-hdpi/stick-toggled-inactive.xpm
@@ -1,8 +1,11 @@
/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"33 43 2 1",
+static char * stick_inactive_xpm[] = {
+"33 43 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
".................................",
".................................",
".................................",
@@ -21,15 +24,15 @@ static char * stick_toggled_inactive_xpm[] = {
".................................",
".................................",
".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"...............###...............",
+"...............###...............",
+"...............$#$...............",
+"............##$.$.$##............",
+"............###$.$###............",
+"............##$.$.$##............",
+"...............$#$...............",
+"...............###...............",
+"...............###...............",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-toggled-prelight.png b/themes/default-hdpi/stick-toggled-prelight.png
index ba36054..d423f23 100644
Binary files a/themes/default-hdpi/stick-toggled-prelight.png and b/themes/default-hdpi/stick-toggled-prelight.png differ
diff --git a/themes/default-hdpi/stick-toggled-prelight.svg b/themes/default-hdpi/stick-toggled-prelight.svg
index f812dee..857e0b1 100644
--- a/themes/default-hdpi/stick-toggled-prelight.svg
+++ b/themes/default-hdpi/stick-toggled-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata39" />
+ id="metadata38" />
<defs
- id="defs37" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview35" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,37 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-toggled-prelight.xpm b/themes/default-hdpi/stick-toggled-prelight.xpm
index a8582a0..bcf40c8 100644
--- a/themes/default-hdpi/stick-toggled-prelight.xpm
+++ b/themes/default-hdpi/stick-toggled-prelight.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"33 43 2 1",
+static char * stick_active_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..$$$$$$$$$$$$$$$$$$$$$$$$$$$$$..",
+".$+++++++++++++++++++++++++++++$.",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$++++++++++++++###++++++++++++++$",
+"$++++++++++++++###++++++++++++++$",
+"$++++++++++++++@#@++++++++++++++$",
+"$+++++++++++##@+ at +@##+++++++++++$",
+"$+++++++++++###@+@###+++++++++++$",
+"$+++++++++++##@+ at +@##+++++++++++$",
+"$++++++++++++++@#@++++++++++++++$",
+"$++++++++++++++###++++++++++++++$",
+"$++++++++++++++###++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+"$+++++++++++++++++++++++++++++++$",
+".$+++++++++++++++++++++++++++++$.",
+"..$$$$$$$$$$$$$$$$$$$$$$$$$$$$$..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/stick-toggled-pressed.png b/themes/default-hdpi/stick-toggled-pressed.png
index ad4801a..d423f23 100644
Binary files a/themes/default-hdpi/stick-toggled-pressed.png and b/themes/default-hdpi/stick-toggled-pressed.png differ
diff --git a/themes/default-hdpi/stick-toggled-pressed.svg b/themes/default-hdpi/stick-toggled-pressed.svg
index d6c5d7f..f67b1ac 100644
--- a/themes/default-hdpi/stick-toggled-pressed.svg
+++ b/themes/default-hdpi/stick-toggled-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata39" />
+ id="metadata38" />
<defs
- id="defs37" />
+ id="defs36" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview35" />
+ id="namedview34" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,55 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/stick-toggled-pressed.xpm b/themes/default-hdpi/stick-toggled-pressed.xpm
index 3c8e57e..e13de8c 100644
--- a/themes/default-hdpi/stick-toggled-pressed.xpm
+++ b/themes/default-hdpi/stick-toggled-pressed.xpm
@@ -1,47 +1,51 @@
/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"33 43 2 1",
+static char * stick_pressed_xpm[] = {
+"33 43 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
-".................................",
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .............................@.",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@..............###..............@",
+"@..............###..............@",
+"@..............@#@..............@",
+"@...........##@. at .@##...........@",
+"@...........###@.@###...........@",
+"@...........##@. at .@##...........@",
+"@..............@#@..............@",
+"@..............###..............@",
+"@..............###..............@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+"@...............................@",
+". at .............................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
".................................",
".................................",
".................................",
diff --git a/themes/default-hdpi/title-1-active.png b/themes/default-hdpi/title-1-active.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-1-active.png and b/themes/default-hdpi/title-1-active.png differ
diff --git a/themes/default-hdpi/title-1-active.svg b/themes/default-hdpi/title-1-active.svg
index f8a50d2..43e6626 100644
--- a/themes/default-hdpi/title-1-active.svg
+++ b/themes/default-hdpi/title-1-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-1-active.xpm b/themes/default-hdpi/title-1-active.xpm
index bb54dcb..9f0e8a0 100644
--- a/themes/default-hdpi/title-1-active.xpm
+++ b/themes/default-hdpi/title-1-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"6 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-hdpi/title-1-inactive.png b/themes/default-hdpi/title-1-inactive.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-1-inactive.png and b/themes/default-hdpi/title-1-inactive.png differ
diff --git a/themes/default-hdpi/title-1-inactive.svg b/themes/default-hdpi/title-1-inactive.svg
index ac7f4dc..57695a5 100644
--- a/themes/default-hdpi/title-1-inactive.svg
+++ b/themes/default-hdpi/title-1-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-2-active.png b/themes/default-hdpi/title-2-active.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-2-active.png and b/themes/default-hdpi/title-2-active.png differ
diff --git a/themes/default-hdpi/title-2-active.svg b/themes/default-hdpi/title-2-active.svg
index ca0f40a..1d29b6f 100644
--- a/themes/default-hdpi/title-2-active.svg
+++ b/themes/default-hdpi/title-2-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-2-active.xpm b/themes/default-hdpi/title-2-active.xpm
index bb54dcb..9f0e8a0 100644
--- a/themes/default-hdpi/title-2-active.xpm
+++ b/themes/default-hdpi/title-2-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"6 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-hdpi/title-2-inactive.png b/themes/default-hdpi/title-2-inactive.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-2-inactive.png and b/themes/default-hdpi/title-2-inactive.png differ
diff --git a/themes/default-hdpi/title-2-inactive.svg b/themes/default-hdpi/title-2-inactive.svg
index 854b13b..7a6ed38 100644
--- a/themes/default-hdpi/title-2-inactive.svg
+++ b/themes/default-hdpi/title-2-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-3-active.png b/themes/default-hdpi/title-3-active.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-3-active.png and b/themes/default-hdpi/title-3-active.png differ
diff --git a/themes/default-hdpi/title-3-active.svg b/themes/default-hdpi/title-3-active.svg
index be5c687..aa0ffcd 100644
--- a/themes/default-hdpi/title-3-active.svg
+++ b/themes/default-hdpi/title-3-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-3-active.xpm b/themes/default-hdpi/title-3-active.xpm
index bb54dcb..9f0e8a0 100644
--- a/themes/default-hdpi/title-3-active.xpm
+++ b/themes/default-hdpi/title-3-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"6 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-hdpi/title-3-inactive.png b/themes/default-hdpi/title-3-inactive.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-3-inactive.png and b/themes/default-hdpi/title-3-inactive.png differ
diff --git a/themes/default-hdpi/title-3-inactive.svg b/themes/default-hdpi/title-3-inactive.svg
index 02d9cfb..c013aa0 100644
--- a/themes/default-hdpi/title-3-inactive.svg
+++ b/themes/default-hdpi/title-3-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-4-active.png b/themes/default-hdpi/title-4-active.png
index b966ef8..8209447 100644
Binary files a/themes/default-hdpi/title-4-active.png and b/themes/default-hdpi/title-4-active.png differ
diff --git a/themes/default-hdpi/title-4-active.svg b/themes/default-hdpi/title-4-active.svg
index f8a7a9c..30a6c6d 100644
--- a/themes/default-hdpi/title-4-active.svg
+++ b/themes/default-hdpi/title-4-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-4-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata31" />
+ id="metadata25" />
<defs
- id="defs29" />
+ id="defs23" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview27" />
+ id="namedview21" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/title-4-active.xpm b/themes/default-hdpi/title-4-active.xpm
index bb54dcb..9f0e8a0 100644
--- a/themes/default-hdpi/title-4-active.xpm
+++ b/themes/default-hdpi/title-4-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"6 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-hdpi/title-4-inactive.png b/themes/default-hdpi/title-4-inactive.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-4-inactive.png and b/themes/default-hdpi/title-4-inactive.png differ
diff --git a/themes/default-hdpi/title-4-inactive.svg b/themes/default-hdpi/title-4-inactive.svg
index c39ce20..14594ab 100644
--- a/themes/default-hdpi/title-4-inactive.svg
+++ b/themes/default-hdpi/title-4-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/title-5-active.png b/themes/default-hdpi/title-5-active.png
index 7cf3ccf..8209447 100644
Binary files a/themes/default-hdpi/title-5-active.png and b/themes/default-hdpi/title-5-active.png differ
diff --git a/themes/default-hdpi/title-5-active.svg b/themes/default-hdpi/title-5-active.svg
index 4107909..468ca25 100644
--- a/themes/default-hdpi/title-5-active.svg
+++ b/themes/default-hdpi/title-5-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-5-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata31" />
+ id="metadata25" />
<defs
- id="defs29" />
+ id="defs23" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview27" />
+ id="namedview21" />
<g
transform="scale(1.5)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-hdpi/title-5-active.xpm b/themes/default-hdpi/title-5-active.xpm
index bb54dcb..9f0e8a0 100644
--- a/themes/default-hdpi/title-5-active.xpm
+++ b/themes/default-hdpi/title-5-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"6 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-hdpi/title-5-inactive.png b/themes/default-hdpi/title-5-inactive.png
index bbf6359..8209447 100644
Binary files a/themes/default-hdpi/title-5-inactive.png and b/themes/default-hdpi/title-5-inactive.png differ
diff --git a/themes/default-hdpi/title-5-inactive.svg b/themes/default-hdpi/title-5-inactive.svg
index 4bd9d10..c477259 100644
--- a/themes/default-hdpi/title-5-inactive.svg
+++ b/themes/default-hdpi/title-5-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-hdpi/top-left-active.png b/themes/default-hdpi/top-left-active.png
index 91b0404..e7f829c 100644
Binary files a/themes/default-hdpi/top-left-active.png and b/themes/default-hdpi/top-left-active.png differ
diff --git a/themes/default-hdpi/top-left-active.svg b/themes/default-hdpi/top-left-active.svg
index f094b7d..8388786 100644
--- a/themes/default-hdpi/top-left-active.svg
+++ b/themes/default-hdpi/top-left-active.svg
@@ -123,7 +123,7 @@
<path
id="path6057"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+ d="M 8,1 L 6,1 C 6,1 1.5,1.5 1,6 L 1,26 L 8,26 L 8,26 L 8,1 z " />
</g>
<g
inkscape:label="hilight"
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default-hdpi/top-left-active.xpm b/themes/default-hdpi/top-left-active.xpm
index b5d91c9..c6b382f 100644
--- a/themes/default-hdpi/top-left-active.xpm
+++ b/themes/default-hdpi/top-left-active.xpm
@@ -2,7 +2,7 @@
static char * top_left_active_xpm[] = {
"12 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
" .....",
" .......",
" .........",
diff --git a/themes/default-hdpi/top-left-inactive.png b/themes/default-hdpi/top-left-inactive.png
index 91b0404..e7f829c 100644
Binary files a/themes/default-hdpi/top-left-inactive.png and b/themes/default-hdpi/top-left-inactive.png differ
diff --git a/themes/default-hdpi/top-left-inactive.svg b/themes/default-hdpi/top-left-inactive.svg
index c0b026f..02cdc1c 100644
--- a/themes/default-hdpi/top-left-inactive.svg
+++ b/themes/default-hdpi/top-left-inactive.svg
@@ -123,7 +123,7 @@
<path
id="path6057"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+ d="M 8,1 L 6,1 C 6,1 1.5,1.5 1,6 L 1,26 L 8,26 L 8,26 L 8,1 z " />
</g>
<g
inkscape:label="hilight"
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default-hdpi/top-right-active.png b/themes/default-hdpi/top-right-active.png
index d875983..245762a 100644
Binary files a/themes/default-hdpi/top-right-active.png and b/themes/default-hdpi/top-right-active.png differ
diff --git a/themes/default-hdpi/top-right-active.svg b/themes/default-hdpi/top-right-active.svg
index 48c9d9b..c24e6c9 100644
--- a/themes/default-hdpi/top-right-active.svg
+++ b/themes/default-hdpi/top-right-active.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,7 +156,7 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 6.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-hdpi/top-right-active.xpm b/themes/default-hdpi/top-right-active.xpm
index 2386055..c101165 100644
--- a/themes/default-hdpi/top-right-active.xpm
+++ b/themes/default-hdpi/top-right-active.xpm
@@ -2,7 +2,7 @@
static char * top_right_active_xpm[] = {
"12 43 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"..... ",
"....... ",
"......... ",
diff --git a/themes/default-hdpi/top-right-inactive.png b/themes/default-hdpi/top-right-inactive.png
index c9cd585..245762a 100644
Binary files a/themes/default-hdpi/top-right-inactive.png and b/themes/default-hdpi/top-right-inactive.png differ
diff --git a/themes/default-hdpi/top-right-inactive.svg b/themes/default-hdpi/top-right-inactive.svg
index 7b10500..4dfae55 100644
--- a/themes/default-hdpi/top-right-inactive.svg
+++ b/themes/default-hdpi/top-right-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="top-right-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata25" />
+ id="metadata31" />
<defs
- id="defs23" />
+ id="defs29" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview21" />
+ id="namedview27" />
<g
transform="scale(1.5)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+ d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,13 +130,16 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
id="path6061" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
- id="path1884" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
inkscape:label="Border"
@@ -154,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 5.5,28.5"
+ d="M 0.5,26.5 L 6.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/bottom-left-active.png b/themes/default-xhdpi/bottom-left-active.png
index a566118..6d79941 100644
Binary files a/themes/default-xhdpi/bottom-left-active.png and b/themes/default-xhdpi/bottom-left-active.png differ
diff --git a/themes/default-xhdpi/bottom-left-inactive.png b/themes/default-xhdpi/bottom-left-inactive.png
index a566118..6d79941 100644
Binary files a/themes/default-xhdpi/bottom-left-inactive.png and b/themes/default-xhdpi/bottom-left-inactive.png differ
diff --git a/themes/default-xhdpi/bottom-right-active.png b/themes/default-xhdpi/bottom-right-active.png
index 1aeef2b..80ec7f8 100644
Binary files a/themes/default-xhdpi/bottom-right-active.png and b/themes/default-xhdpi/bottom-right-active.png differ
diff --git a/themes/default-xhdpi/bottom-right-inactive.png b/themes/default-xhdpi/bottom-right-inactive.png
index 1aeef2b..80ec7f8 100644
Binary files a/themes/default-xhdpi/bottom-right-inactive.png and b/themes/default-xhdpi/bottom-right-inactive.png differ
diff --git a/themes/default-xhdpi/close-active.png b/themes/default-xhdpi/close-active.png
index a6953a2..4a02448 100644
Binary files a/themes/default-xhdpi/close-active.png and b/themes/default-xhdpi/close-active.png differ
diff --git a/themes/default-xhdpi/close-active.svg b/themes/default-xhdpi/close-active.svg
index 308b4df..8548700 100644
--- a/themes/default-xhdpi/close-active.svg
+++ b/themes/default-xhdpi/close-active.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,40 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/close-active.xpm b/themes/default-xhdpi/close-active.xpm
index 6428094..14898cd 100644
--- a/themes/default-xhdpi/close-active.xpm
+++ b/themes/default-xhdpi/close-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * close_active_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............##@.......@##...............",
+"...............###@.....@###...............",
+"...............@###@...@###@...............",
+"................@###@.@###@................",
+".................@###@###@.................",
+"..................@#####@..................",
+"...................@###@...................",
+"..................@#####@..................",
+".................@###@###@.................",
+"................@###@.@###@................",
+"...............@###@...@###@...............",
+"...............###@.....@###...............",
+"...............##@.......@##...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/menu-active.svg b/themes/default-xhdpi/close-inactive
similarity index 90%
copy from themes/default-xhdpi/menu-active.svg
copy to themes/default-xhdpi/close-inactive
index 01d8fd7..8548700 100644
--- a/themes/default-xhdpi/menu-active.svg
+++ b/themes/default-xhdpi/close-inactive
@@ -16,12 +16,12 @@
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
version="1.0"
- sodipodi:docname="menu-active.svg"
+ sodipodi:docname="close-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata26" />
+ id="metadata39" />
<defs
- id="defs24" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview22" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/close-inactive.png b/themes/default-xhdpi/close-inactive.png
index 2af1e1c..4a02448 100644
Binary files a/themes/default-xhdpi/close-inactive.png and b/themes/default-xhdpi/close-inactive.png differ
diff --git a/themes/default-xhdpi/close-inactive.svg b/themes/default-xhdpi/close-inactive.svg
index 2b6beff..3b37bfa 100644
--- a/themes/default-xhdpi/close-inactive.svg
+++ b/themes/default-xhdpi/close-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata30" />
+ id="metadata39" />
<defs
- id="defs28" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview26" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,28 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(3,9)">
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/close-inactive.xpm b/themes/default-xhdpi/close-inactive.xpm
index 56192f8..ae9b24d 100644
--- a/themes/default-xhdpi/close-inactive.xpm
+++ b/themes/default-xhdpi/close-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............##$.......$##...............",
+"...............###$.....$###...............",
+"...............$###$...$###$...............",
+"................$###$.$###$................",
+".................$###$###$.................",
+"..................$#####$..................",
+"...................$###$...................",
+"..................$#####$..................",
+".................$###$###$.................",
+"................$###$.$###$................",
+"...............$###$...$###$...............",
+"...............###$.....$###...............",
+"...............##$.......$##...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/close-prelight.png b/themes/default-xhdpi/close-prelight.png
index 3845776..4a02448 100644
Binary files a/themes/default-xhdpi/close-prelight.png and b/themes/default-xhdpi/close-prelight.png differ
diff --git a/themes/default-xhdpi/close-prelight.svg b/themes/default-xhdpi/close-prelight.svg
index 8406749..64a788d 100644
--- a/themes/default-xhdpi/close-prelight.svg
+++ b/themes/default-xhdpi/close-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata42" />
+ id="metadata39" />
<defs
- id="defs40" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview38" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,40 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/close-prelight.xpm b/themes/default-xhdpi/close-prelight.xpm
index 6428094..8523865 100644
--- a/themes/default-xhdpi/close-prelight.xpm
+++ b/themes/default-xhdpi/close-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * close_active_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@++++++++++++++##@+++++++@##++++++++++++++@",
+"@++++++++++++++###@+++++@###++++++++++++++@",
+"@++++++++++++++@###@+++@###@++++++++++++++@",
+"@+++++++++++++++@###@+@###@+++++++++++++++@",
+"@++++++++++++++++@###@###@++++++++++++++++@",
+"@+++++++++++++++++@#####@+++++++++++++++++@",
+"@++++++++++++++++++@###@++++++++++++++++++@",
+"@+++++++++++++++++@#####@+++++++++++++++++@",
+"@++++++++++++++++@###@###@++++++++++++++++@",
+"@+++++++++++++++@###@+@###@+++++++++++++++@",
+"@++++++++++++++@###@+++@###@++++++++++++++@",
+"@++++++++++++++###@+++++@###++++++++++++++@",
+"@++++++++++++++##@+++++++@##++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/close-pressed.png b/themes/default-xhdpi/close-pressed.png
index ec60054..4a02448 100644
Binary files a/themes/default-xhdpi/close-pressed.png and b/themes/default-xhdpi/close-pressed.png differ
diff --git a/themes/default-xhdpi/close-pressed.svg b/themes/default-xhdpi/close-pressed.svg
index 3f41b53..245e84c 100644
--- a/themes/default-xhdpi/close-pressed.svg
+++ b/themes/default-xhdpi/close-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="close-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata42" />
+ id="metadata39" />
<defs
- id="defs40" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview38" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,58 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,10)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/close-pressed.xpm b/themes/default-xhdpi/close-pressed.xpm
index 442257b..e8801ac 100644
--- a/themes/default-xhdpi/close-pressed.xpm
+++ b/themes/default-xhdpi/close-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@..............##@.......@##..............@",
+"@..............###@.....@###..............@",
+"@..............@###@...@###@..............@",
+"@...............@###@.@###@...............@",
+"@................@###@###@................@",
+"@.................@#####@.................@",
+"@..................@###@..................@",
+"@.................@#####@.................@",
+"@................@###@###@................@",
+"@...............@###@.@###@...............@",
+"@..............@###@...@###@..............@",
+"@..............###@.....@###..............@",
+"@..............##@.......@##..............@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/hide-active.png b/themes/default-xhdpi/hide-active.png
index 76ec20f..4a02448 100644
Binary files a/themes/default-xhdpi/hide-active.png and b/themes/default-xhdpi/hide-active.png differ
diff --git a/themes/default-xhdpi/hide-active.svg b/themes/default-xhdpi/hide-active.svg
index feaefda..2b7984c 100644
--- a/themes/default-xhdpi/hide-active.svg
+++ b/themes/default-xhdpi/hide-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="hide-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,34 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/hide-active.xpm b/themes/default-xhdpi/hide-active.xpm
index 90ce5a4..2a3b1cf 100644
--- a/themes/default-xhdpi/hide-active.xpm
+++ b/themes/default-xhdpi/hide-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * hide_active_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............#############...............",
+"...............#############...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/hide-inactive.png b/themes/default-xhdpi/hide-inactive.png
index e2d2d3f..4a02448 100644
Binary files a/themes/default-xhdpi/hide-inactive.png and b/themes/default-xhdpi/hide-inactive.png differ
diff --git a/themes/default-xhdpi/hide-inactive.svg b/themes/default-xhdpi/hide-inactive.svg
index f184cab..5d1af74 100644
--- a/themes/default-xhdpi/hide-inactive.svg
+++ b/themes/default-xhdpi/hide-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="hide-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,28 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(3,9)">
- <rect
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/hide-inactive.xpm b/themes/default-xhdpi/hide-inactive.xpm
index 426b66d..b8bf9e2 100644
--- a/themes/default-xhdpi/hide-inactive.xpm
+++ b/themes/default-xhdpi/hide-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............#############...............",
+"...............#############...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/hide-prelight.png b/themes/default-xhdpi/hide-prelight.png
index 792f83f..4a02448 100644
Binary files a/themes/default-xhdpi/hide-prelight.png and b/themes/default-xhdpi/hide-prelight.png differ
diff --git a/themes/default-xhdpi/hide-prelight.svg b/themes/default-xhdpi/hide-prelight.svg
index 5790ab2..aa39e20 100644
--- a/themes/default-xhdpi/hide-prelight.svg
+++ b/themes/default-xhdpi/hide-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,34 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/hide-prelight.xpm b/themes/default-xhdpi/hide-prelight.xpm
index 90ce5a4..01b0fc4 100644
--- a/themes/default-xhdpi/hide-prelight.xpm
+++ b/themes/default-xhdpi/hide-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * hide_active_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/hide-pressed.png b/themes/default-xhdpi/hide-pressed.png
index e743647..4a02448 100644
Binary files a/themes/default-xhdpi/hide-pressed.png and b/themes/default-xhdpi/hide-pressed.png differ
diff --git a/themes/default-xhdpi/hide-pressed.svg b/themes/default-xhdpi/hide-pressed.svg
index 58e9391..4360183 100644
--- a/themes/default-xhdpi/hide-pressed.svg
+++ b/themes/default-xhdpi/hide-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,52 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/hide-pressed.xpm b/themes/default-xhdpi/hide-pressed.xpm
index 0f9bd78..62fe057 100644
--- a/themes/default-xhdpi/hide-pressed.xpm
+++ b/themes/default-xhdpi/hide-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@..............############...............@",
+"@..............############...............@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-active.png b/themes/default-xhdpi/maximize-active.png
index 34a6bc7..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-active.png and b/themes/default-xhdpi/maximize-active.png differ
diff --git a/themes/default-xhdpi/maximize-active.svg b/themes/default-xhdpi/maximize-active.svg
index c9fbc3d..2b6e1c0 100644
--- a/themes/default-xhdpi/maximize-active.svg
+++ b/themes/default-xhdpi/maximize-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-active.xpm b/themes/default-xhdpi/maximize-active.xpm
index 79de423..7f54789 100644
--- a/themes/default-xhdpi/maximize-active.xpm
+++ b/themes/default-xhdpi/maximize-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............#############...............",
+"...............#############...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............#############...............",
+"...............#############...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-inactive.png b/themes/default-xhdpi/maximize-inactive.png
index a86c8af..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-inactive.png and b/themes/default-xhdpi/maximize-inactive.png differ
diff --git a/themes/default-xhdpi/maximize-inactive.svg b/themes/default-xhdpi/maximize-inactive.svg
index 8e69f48..2276270 100644
--- a/themes/default-xhdpi/maximize-inactive.svg
+++ b/themes/default-xhdpi/maximize-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -121,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(3,9)">
- <path
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- id="rect2275" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/maximize-inactive.xpm b/themes/default-xhdpi/maximize-inactive.xpm
index 2981e12..e667055 100644
--- a/themes/default-xhdpi/maximize-inactive.xpm
+++ b/themes/default-xhdpi/maximize-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...............#############...............",
+"...............#############...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............##.........##...............",
+"...............#############...............",
+"...............#############...............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-prelight.png b/themes/default-xhdpi/maximize-prelight.png
index b9b6a6d..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-prelight.png and b/themes/default-xhdpi/maximize-prelight.png differ
diff --git a/themes/default-xhdpi/maximize-prelight.svg b/themes/default-xhdpi/maximize-prelight.svg
index d973db0..10cc99f 100644
--- a/themes/default-xhdpi/maximize-prelight.svg
+++ b/themes/default-xhdpi/maximize-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-prelight.xpm b/themes/default-xhdpi/maximize-prelight.xpm
index 79de423..5cbe2de 100644
--- a/themes/default-xhdpi/maximize-prelight.xpm
+++ b/themes/default-xhdpi/maximize-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++##+++++++++##++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-pressed.png b/themes/default-xhdpi/maximize-pressed.png
index 206c9a6..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-pressed.png and b/themes/default-xhdpi/maximize-pressed.png differ
diff --git a/themes/default-xhdpi/maximize-pressed.svg b/themes/default-xhdpi/maximize-pressed.svg
index 0cfc4dc..64d2872 100644
--- a/themes/default-xhdpi/maximize-pressed.svg
+++ b/themes/default-xhdpi/maximize-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,10)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-pressed.xpm b/themes/default-xhdpi/maximize-pressed.xpm
index 464c1e3..3facb30 100644
--- a/themes/default-xhdpi/maximize-pressed.xpm
+++ b/themes/default-xhdpi/maximize-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@..............#############..............@",
+"@..............#############..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............##.........##..............@",
+"@..............#############..............@",
+"@..............#############..............@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-toggled-active.png b/themes/default-xhdpi/maximize-toggled-active.png
index 30fddf7..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-toggled-active.png and b/themes/default-xhdpi/maximize-toggled-active.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-active.svg b/themes/default-xhdpi/maximize-toggled-active.svg
index 2c4a4d6..88820b6 100644
--- a/themes/default-xhdpi/maximize-toggled-active.svg
+++ b/themes/default-xhdpi/maximize-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata37" />
+ id="metadata39" />
<defs
- id="defs35" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview33" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,32 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-toggled-active.xpm b/themes/default-xhdpi/maximize-toggled-active.xpm
index 59541ae..69dcf38 100644
--- a/themes/default-xhdpi/maximize-toggled-active.xpm
+++ b/themes/default-xhdpi/maximize-toggled-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * maximize_active_xpm[] = {
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..................#######..................",
+"..................#######..................",
+"..................##...##..................",
+"..................##...##..................",
+"..................##...##..................",
+"..................#######..................",
+"..................#######..................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.png b/themes/default-xhdpi/maximize-toggled-inactive.png
index 7910ff1..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-toggled-inactive.png and b/themes/default-xhdpi/maximize-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.svg b/themes/default-xhdpi/maximize-toggled-inactive.svg
index d54e6ad..0647504 100644
--- a/themes/default-xhdpi/maximize-toggled-inactive.svg
+++ b/themes/default-xhdpi/maximize-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata30" />
+ id="metadata39" />
<defs
- id="defs28" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview26" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1639"
- transform="translate(3,9)">
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.xpm b/themes/default-xhdpi/maximize-toggled-inactive.xpm
index 4cfc203..238c6e7 100644
--- a/themes/default-xhdpi/maximize-toggled-inactive.xpm
+++ b/themes/default-xhdpi/maximize-toggled-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"44 58 2 1",
+static char * maximize_inactive_xpm[] = {
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..................#######..................",
+"..................#######..................",
+"..................##...##..................",
+"..................##...##..................",
+"..................##...##..................",
+"..................#######..................",
+"..................#######..................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.png b/themes/default-xhdpi/maximize-toggled-prelight.png
index edaab25..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-toggled-prelight.png and b/themes/default-xhdpi/maximize-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.svg b/themes/default-xhdpi/maximize-toggled-prelight.svg
index d38f8b8..00e845b 100644
--- a/themes/default-xhdpi/maximize-toggled-prelight.svg
+++ b/themes/default-xhdpi/maximize-toggled-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,32 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.xpm b/themes/default-xhdpi/maximize-toggled-prelight.xpm
index 59541ae..6ffb5e8 100644
--- a/themes/default-xhdpi/maximize-toggled-prelight.xpm
+++ b/themes/default-xhdpi/maximize-toggled-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * maximize_active_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++#######+++++++++++++++++@",
+"@+++++++++++++++++#######+++++++++++++++++@",
+"@+++++++++++++++++##+++##+++++++++++++++++@",
+"@+++++++++++++++++##+++##+++++++++++++++++@",
+"@+++++++++++++++++##+++##+++++++++++++++++@",
+"@+++++++++++++++++#######+++++++++++++++++@",
+"@+++++++++++++++++#######+++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.png b/themes/default-xhdpi/maximize-toggled-pressed.png
index d6b96a2..4a02448 100644
Binary files a/themes/default-xhdpi/maximize-toggled-pressed.png and b/themes/default-xhdpi/maximize-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.svg b/themes/default-xhdpi/maximize-toggled-pressed.svg
index f32f6d5..d96e802 100644
--- a/themes/default-xhdpi/maximize-toggled-pressed.svg
+++ b/themes/default-xhdpi/maximize-toggled-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,50 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,10)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.xpm b/themes/default-xhdpi/maximize-toggled-pressed.xpm
index ee2e343..c342b6b 100644
--- a/themes/default-xhdpi/maximize-toggled-pressed.xpm
+++ b/themes/default-xhdpi/maximize-toggled-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"44 58 2 1",
+static char * maximize_pressed_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.................#######.................@",
+"@.................#######.................@",
+"@.................##...##.................@",
+"@.................##...##.................@",
+"@.................##...##.................@",
+"@.................#######.................@",
+"@.................#######.................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/menu-active.png b/themes/default-xhdpi/menu-active.png
index 90ccbba..4a02448 100644
Binary files a/themes/default-xhdpi/menu-active.png and b/themes/default-xhdpi/menu-active.png differ
diff --git a/themes/default-xhdpi/menu-active.svg b/themes/default-xhdpi/menu-active.svg
index 01d8fd7..bb1e5a3 100644
--- a/themes/default-xhdpi/menu-active.svg
+++ b/themes/default-xhdpi/menu-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default-xhdpi/menu-active.xpm b/themes/default-xhdpi/menu-active.xpm
index 5d923c8..c43f2c8 100644
--- a/themes/default-xhdpi/menu-active.xpm
+++ b/themes/default-xhdpi/menu-active.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"44 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"............................................",
"............................................",
"............................................",
diff --git a/themes/default-xhdpi/menu-inactive.png b/themes/default-xhdpi/menu-inactive.png
index 90ccbba..4a02448 100644
Binary files a/themes/default-xhdpi/menu-inactive.png and b/themes/default-xhdpi/menu-inactive.png differ
diff --git a/themes/default-xhdpi/menu-inactive.svg b/themes/default-xhdpi/menu-inactive.svg
index abeb3a6..63c110d 100644
--- a/themes/default-xhdpi/menu-inactive.svg
+++ b/themes/default-xhdpi/menu-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default-xhdpi/menu-prelight.png b/themes/default-xhdpi/menu-prelight.png
index 90ccbba..4a02448 100644
Binary files a/themes/default-xhdpi/menu-prelight.png and b/themes/default-xhdpi/menu-prelight.png differ
diff --git a/themes/default-xhdpi/menu-prelight.svg b/themes/default-xhdpi/menu-prelight.svg
index 849cf13..d50b070 100644
--- a/themes/default-xhdpi/menu-prelight.svg
+++ b/themes/default-xhdpi/menu-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="menu-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata26" />
+ id="metadata39" />
<defs
- id="defs24" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview22" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/menu-prelight.xpm b/themes/default-xhdpi/menu-prelight.xpm
index 5d923c8..c43f2c8 100644
--- a/themes/default-xhdpi/menu-prelight.xpm
+++ b/themes/default-xhdpi/menu-prelight.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"44 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"............................................",
"............................................",
"............................................",
diff --git a/themes/default-xhdpi/menu-pressed.png b/themes/default-xhdpi/menu-pressed.png
index 90ccbba..4a02448 100644
Binary files a/themes/default-xhdpi/menu-pressed.png and b/themes/default-xhdpi/menu-pressed.png differ
diff --git a/themes/default-xhdpi/menu-pressed.svg b/themes/default-xhdpi/menu-pressed.svg
index a6dc8e4..e655354 100644
--- a/themes/default-xhdpi/menu-pressed.svg
+++ b/themes/default-xhdpi/menu-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="menu-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata26" />
+ id="metadata39" />
<defs
- id="defs24" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview22" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -157,7 +157,7 @@
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/menu-pressed.xpm b/themes/default-xhdpi/menu-pressed.xpm
index 2642edf..0efdfe2 100644
--- a/themes/default-xhdpi/menu-pressed.xpm
+++ b/themes/default-xhdpi/menu-pressed.xpm
@@ -2,7 +2,7 @@
static char * menu_pressed_xpm[] = {
"44 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"............................................",
"............................................",
"............................................",
diff --git a/themes/default-xhdpi/shade-active.png b/themes/default-xhdpi/shade-active.png
index 6425b92..4a02448 100644
Binary files a/themes/default-xhdpi/shade-active.png and b/themes/default-xhdpi/shade-active.png differ
diff --git a/themes/default-xhdpi/shade-active.svg b/themes/default-xhdpi/shade-active.svg
index 287336d..0337a88 100644
--- a/themes/default-xhdpi/shade-active.svg
+++ b/themes/default-xhdpi/shade-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-active.xpm b/themes/default-xhdpi/shade-active.xpm
index edc8ff1..1c1d66c 100644
--- a/themes/default-xhdpi/shade-active.xpm
+++ b/themes/default-xhdpi/shade-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * shade_active_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..................... at .....................",
+"....................@#@....................",
+"...................@###@...................",
+"..................@#####@..................",
+".................@###@###@.................",
+"................@###@.@###@................",
+"...............@###@...@###@...............",
+"..............@###@.....@###@..............",
+".............@###@.......@###@.............",
+".............###@.........@###.............",
+".............##@...........@##.............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-inactive.png b/themes/default-xhdpi/shade-inactive.png
index 0b15c75..4a02448 100644
Binary files a/themes/default-xhdpi/shade-inactive.png and b/themes/default-xhdpi/shade-inactive.png differ
diff --git a/themes/default-xhdpi/shade-inactive.svg b/themes/default-xhdpi/shade-inactive.svg
index 868593c..b1d74d7 100644
--- a/themes/default-xhdpi/shade-inactive.svg
+++ b/themes/default-xhdpi/shade-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/shade-inactive.xpm b/themes/default-xhdpi/shade-inactive.xpm
index 2fa9500..7375d00 100644
--- a/themes/default-xhdpi/shade-inactive.xpm
+++ b/themes/default-xhdpi/shade-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+".....................$.....................",
+"....................$#$....................",
+"...................$###$...................",
+"..................$#####$..................",
+".................$###$###$.................",
+"................$###$.$###$................",
+"...............$###$...$###$...............",
+"..............$###$.....$###$..............",
+".............$###$.......$###$.............",
+".............###$.........$###.............",
+".............##$...........$##.............",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-prelight.png b/themes/default-xhdpi/shade-prelight.png
index 2b41e5c..4a02448 100644
Binary files a/themes/default-xhdpi/shade-prelight.png and b/themes/default-xhdpi/shade-prelight.png differ
diff --git a/themes/default-xhdpi/shade-prelight.svg b/themes/default-xhdpi/shade-prelight.svg
index ebd0107..f83ade5 100644
--- a/themes/default-xhdpi/shade-prelight.svg
+++ b/themes/default-xhdpi/shade-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-prelight.xpm b/themes/default-xhdpi/shade-prelight.xpm
index edc8ff1..822b6be 100644
--- a/themes/default-xhdpi/shade-prelight.xpm
+++ b/themes/default-xhdpi/shade-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * shade_active_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@++++++++++++++++++++ at ++++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@++++++++++++++++++@###@++++++++++++++++++@",
+"@+++++++++++++++++@#####@+++++++++++++++++@",
+"@++++++++++++++++@###@###@++++++++++++++++@",
+"@+++++++++++++++@###@+@###@+++++++++++++++@",
+"@++++++++++++++@###@+++@###@++++++++++++++@",
+"@+++++++++++++@###@+++++@###@+++++++++++++@",
+"@++++++++++++@###@+++++++@###@++++++++++++@",
+"@++++++++++++###@+++++++++@###++++++++++++@",
+"@++++++++++++##@+++++++++++@##++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-pressed.png b/themes/default-xhdpi/shade-pressed.png
index 27b20db..4a02448 100644
Binary files a/themes/default-xhdpi/shade-pressed.png and b/themes/default-xhdpi/shade-pressed.png differ
diff --git a/themes/default-xhdpi/shade-pressed.svg b/themes/default-xhdpi/shade-pressed.svg
index e158ec6..d374054 100644
--- a/themes/default-xhdpi/shade-pressed.svg
+++ b/themes/default-xhdpi/shade-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-pressed.xpm b/themes/default-xhdpi/shade-pressed.xpm
index ef6866a..a7ccb1a 100644
--- a/themes/default-xhdpi/shade-pressed.xpm
+++ b/themes/default-xhdpi/shade-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.................... at ....................@",
+"@...................@#@...................@",
+"@..................@###@..................@",
+"@.................@#####@.................@",
+"@................@###@###@................@",
+"@...............@###@.@###@...............@",
+"@..............@###@...@###@..............@",
+"@.............@###@.....@###@.............@",
+"@............@###@.......@###@............@",
+"@............###@.........@###............@",
+"@............##@...........@##............@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-toggled-active.png b/themes/default-xhdpi/shade-toggled-active.png
index e4f4988..4a02448 100644
Binary files a/themes/default-xhdpi/shade-toggled-active.png and b/themes/default-xhdpi/shade-toggled-active.png differ
diff --git a/themes/default-xhdpi/shade-toggled-active.svg b/themes/default-xhdpi/shade-toggled-active.svg
index 88c9b88..b5c0783 100644
--- a/themes/default-xhdpi/shade-toggled-active.svg
+++ b/themes/default-xhdpi/shade-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-toggled-active.xpm b/themes/default-xhdpi/shade-toggled-active.xpm
index c35e22d..daf8dcb 100644
--- a/themes/default-xhdpi/shade-toggled-active.xpm
+++ b/themes/default-xhdpi/shade-toggled-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * shade_active_xpm[] = {
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+".............##@...........@##.............",
+".............###@.........@###.............",
+".............@###@.......@###@.............",
+"..............@###@.....@###@..............",
+"...............@###@...@###@...............",
+"................@###@.@###@................",
+".................@###@###@.................",
+"..................@#####@..................",
+"...................@###@...................",
+"....................@#@....................",
+"..................... at .....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-toggled-inactive.png b/themes/default-xhdpi/shade-toggled-inactive.png
index 81a1750..4a02448 100644
Binary files a/themes/default-xhdpi/shade-toggled-inactive.png and b/themes/default-xhdpi/shade-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/shade-toggled-inactive.svg b/themes/default-xhdpi/shade-toggled-inactive.svg
index 1bb2afe..d2b7bef 100644
--- a/themes/default-xhdpi/shade-toggled-inactive.svg
+++ b/themes/default-xhdpi/shade-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/shade-toggled-inactive.xpm b/themes/default-xhdpi/shade-toggled-inactive.xpm
index cd4f2c8..05c4526 100644
--- a/themes/default-xhdpi/shade-toggled-inactive.xpm
+++ b/themes/default-xhdpi/shade-toggled-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"44 58 2 1",
+static char * shade_inactive_xpm[] = {
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+".............##$...........$##.............",
+".............###$.........$###.............",
+".............$###$.......$###$.............",
+"..............$###$.....$###$..............",
+"...............$###$...$###$...............",
+"................$###$.$###$................",
+".................$###$###$.................",
+"..................$#####$..................",
+"...................$###$...................",
+"....................$#$....................",
+".....................$.....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-toggled-prelight.png b/themes/default-xhdpi/shade-toggled-prelight.png
index ad2de9a..4a02448 100644
Binary files a/themes/default-xhdpi/shade-toggled-prelight.png and b/themes/default-xhdpi/shade-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/shade-toggled-prelight.svg b/themes/default-xhdpi/shade-toggled-prelight.svg
index c5c46c0..1baa71e 100644
--- a/themes/default-xhdpi/shade-toggled-prelight.svg
+++ b/themes/default-xhdpi/shade-toggled-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-toggled-prelight.xpm b/themes/default-xhdpi/shade-toggled-prelight.xpm
index c35e22d..ad10847 100644
--- a/themes/default-xhdpi/shade-toggled-prelight.xpm
+++ b/themes/default-xhdpi/shade-toggled-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * shade_active_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@++++++++++++##@+++++++++++@##++++++++++++@",
+"@++++++++++++###@+++++++++@###++++++++++++@",
+"@++++++++++++@###@+++++++@###@++++++++++++@",
+"@+++++++++++++@###@+++++@###@+++++++++++++@",
+"@++++++++++++++@###@+++@###@++++++++++++++@",
+"@+++++++++++++++@###@+@###@+++++++++++++++@",
+"@++++++++++++++++@###@###@++++++++++++++++@",
+"@+++++++++++++++++@#####@+++++++++++++++++@",
+"@++++++++++++++++++@###@++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@++++++++++++++++++++ at ++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/shade-toggled-pressed.png b/themes/default-xhdpi/shade-toggled-pressed.png
index 2eeeaac..4a02448 100644
Binary files a/themes/default-xhdpi/shade-toggled-pressed.png and b/themes/default-xhdpi/shade-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/shade-toggled-pressed.svg b/themes/default-xhdpi/shade-toggled-pressed.svg
index 3786d7a..9e2bcef 100644
--- a/themes/default-xhdpi/shade-toggled-pressed.svg
+++ b/themes/default-xhdpi/shade-toggled-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,10)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/shade-toggled-pressed.xpm b/themes/default-xhdpi/shade-toggled-pressed.xpm
index b60fc23..2f9b98a 100644
--- a/themes/default-xhdpi/shade-toggled-pressed.xpm
+++ b/themes/default-xhdpi/shade-toggled-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"44 58 2 1",
+static char * shade_pressed_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@............##@...........@##............@",
+"@............###@.........@###............@",
+"@............@###@.......@###@............@",
+"@.............@###@.....@###@.............@",
+"@..............@###@...@###@..............@",
+"@...............@###@.@###@...............@",
+"@................@###@###@................@",
+"@.................@#####@.................@",
+"@..................@###@..................@",
+"@...................@#@...................@",
+"@.................... at ....................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-active.png b/themes/default-xhdpi/stick-active.png
index 0a15dee..4a02448 100644
Binary files a/themes/default-xhdpi/stick-active.png and b/themes/default-xhdpi/stick-active.png differ
diff --git a/themes/default-xhdpi/stick-active.svg b/themes/default-xhdpi/stick-active.svg
index f718282..2d65784 100644
--- a/themes/default-xhdpi/stick-active.svg
+++ b/themes/default-xhdpi/stick-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-active.xpm b/themes/default-xhdpi/stick-active.xpm
index 681092c..bcf729f 100644
--- a/themes/default-xhdpi/stick-active.xpm
+++ b/themes/default-xhdpi/stick-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * stick_active_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"....................@#@....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"...............@###########@...............",
+"...............#############...............",
+"...............@###########@...............",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................@#@....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-inactive.png b/themes/default-xhdpi/stick-inactive.png
index 0d1963f..4a02448 100644
Binary files a/themes/default-xhdpi/stick-inactive.png and b/themes/default-xhdpi/stick-inactive.png differ
diff --git a/themes/default-xhdpi/stick-inactive.svg b/themes/default-xhdpi/stick-inactive.svg
index 38e443d..b647347 100644
--- a/themes/default-xhdpi/stick-inactive.svg
+++ b/themes/default-xhdpi/stick-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/stick-inactive.xpm b/themes/default-xhdpi/stick-inactive.xpm
index f824212..03809d4 100644
--- a/themes/default-xhdpi/stick-inactive.xpm
+++ b/themes/default-xhdpi/stick-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"44 58 2 1",
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"....................$#$....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"...............$###########$...............",
+"...............#############...............",
+"...............$###########$...............",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................$#$....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-prelight.png b/themes/default-xhdpi/stick-prelight.png
index 727f0d2..4a02448 100644
Binary files a/themes/default-xhdpi/stick-prelight.png and b/themes/default-xhdpi/stick-prelight.png differ
diff --git a/themes/default-xhdpi/stick-prelight.svg b/themes/default-xhdpi/stick-prelight.svg
index 24cbf34..e6351ec 100644
--- a/themes/default-xhdpi/stick-prelight.svg
+++ b/themes/default-xhdpi/stick-prelight.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,28 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-prelight.xpm b/themes/default-xhdpi/stick-prelight.xpm
index 681092c..869f016 100644
--- a/themes/default-xhdpi/stick-prelight.xpm
+++ b/themes/default-xhdpi/stick-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * stick_active_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@++++++++++++++@###########@++++++++++++++@",
+"@++++++++++++++#############++++++++++++++@",
+"@++++++++++++++@###########@++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-pressed.png b/themes/default-xhdpi/stick-pressed.png
index acf730c..4a02448 100644
Binary files a/themes/default-xhdpi/stick-pressed.png and b/themes/default-xhdpi/stick-pressed.png differ
diff --git a/themes/default-xhdpi/stick-pressed.svg b/themes/default-xhdpi/stick-pressed.svg
index d31f9d6..d3b201b 100644
--- a/themes/default-xhdpi/stick-pressed.svg
+++ b/themes/default-xhdpi/stick-pressed.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,46 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-pressed.xpm b/themes/default-xhdpi/stick-pressed.xpm
index 225392f..6ddc213 100644
--- a/themes/default-xhdpi/stick-pressed.xpm
+++ b/themes/default-xhdpi/stick-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"44 58 2 1",
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@...................@#@...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@..............@###########@..............@",
+"@..............#############..............@",
+"@..............@###########@..............@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................@#@...................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-toggled-active.png b/themes/default-xhdpi/stick-toggled-active.png
index 7ef6549..4a02448 100644
Binary files a/themes/default-xhdpi/stick-toggled-active.png and b/themes/default-xhdpi/stick-toggled-active.png differ
diff --git a/themes/default-xhdpi/stick-toggled-active.svg b/themes/default-xhdpi/stick-toggled-active.svg
index d94adcf..122054b 100644
--- a/themes/default-xhdpi/stick-toggled-active.svg
+++ b/themes/default-xhdpi/stick-toggled-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata37" />
+ id="metadata39" />
<defs
- id="defs35" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview33" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,37 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-toggled-active.xpm b/themes/default-xhdpi/stick-toggled-active.xpm
index a394d48..ff62b32 100644
--- a/themes/default-xhdpi/stick-toggled-active.xpm
+++ b/themes/default-xhdpi/stick-toggled-active.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * stick_active_xpm[] = {
+"43 58 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................@#@....................",
+"..................... at .....................",
+"...............###@.....@###...............",
+"...............####@...@####...............",
+"...............###@.....@###...............",
+"..................... at .....................",
+"....................@#@....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-toggled-inactive.png b/themes/default-xhdpi/stick-toggled-inactive.png
index 2e33478..4a02448 100644
Binary files a/themes/default-xhdpi/stick-toggled-inactive.png and b/themes/default-xhdpi/stick-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/stick-toggled-inactive.svg b/themes/default-xhdpi/stick-toggled-inactive.svg
index ac6c3e5..8b66d6e 100644
--- a/themes/default-xhdpi/stick-toggled-inactive.svg
+++ b/themes/default-xhdpi/stick-toggled-inactive.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata30" />
+ id="metadata39" />
<defs
- id="defs28" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview26" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,34 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2202"
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/stick-toggled-inactive.xpm b/themes/default-xhdpi/stick-toggled-inactive.xpm
index 810d9bf..a941a5f 100644
--- a/themes/default-xhdpi/stick-toggled-inactive.xpm
+++ b/themes/default-xhdpi/stick-toggled-inactive.xpm
@@ -1,62 +1,67 @@
/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"44 58 2 1",
+static char * stick_inactive_xpm[] = {
+"43 58 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"....................$#$....................",
+".....................$.....................",
+"...............###$.....$###...............",
+"...............####$...$####...............",
+"...............###$.....$###...............",
+".....................$.....................",
+"....................$#$....................",
+"....................###....................",
+"....................###....................",
+"....................###....................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-toggled-prelight.png b/themes/default-xhdpi/stick-toggled-prelight.png
index 171ff67..4a02448 100644
Binary files a/themes/default-xhdpi/stick-toggled-prelight.png and b/themes/default-xhdpi/stick-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/stick-toggled-prelight.svg b/themes/default-xhdpi/stick-toggled-prelight.svg
index 12b5a0b..e50ebf5 100644
--- a/themes/default-xhdpi/stick-toggled-prelight.svg
+++ b/themes/default-xhdpi/stick-toggled-prelight.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,29 +117,11 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,37 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-toggled-prelight.xpm b/themes/default-xhdpi/stick-toggled-prelight.xpm
index a394d48..6f82dac 100644
--- a/themes/default-xhdpi/stick-toggled-prelight.xpm
+++ b/themes/default-xhdpi/stick-toggled-prelight.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"44 58 2 1",
+static char * stick_active_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@++++++++++++++++++++ at ++++++++++++++++++++@",
+"@++++++++++++++###@+++++@###++++++++++++++@",
+"@++++++++++++++####@+++@####++++++++++++++@",
+"@++++++++++++++###@+++++@###++++++++++++++@",
+"@++++++++++++++++++++ at ++++++++++++++++++++@",
+"@+++++++++++++++++++@#@+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++###+++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+"@+++++++++++++++++++++++++++++++++++++++++@",
+". at +++++++++++++++++++++++++++++++++++++++@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/stick-toggled-pressed.png b/themes/default-xhdpi/stick-toggled-pressed.png
index a814b30..4a02448 100644
Binary files a/themes/default-xhdpi/stick-toggled-pressed.png and b/themes/default-xhdpi/stick-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/stick-toggled-pressed.svg b/themes/default-xhdpi/stick-toggled-pressed.svg
index 6bd3529..b39be7b 100644
--- a/themes/default-xhdpi/stick-toggled-pressed.svg
+++ b/themes/default-xhdpi/stick-toggled-pressed.svg
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,55 +153,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 21.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/stick-toggled-pressed.xpm b/themes/default-xhdpi/stick-toggled-pressed.xpm
index a972c5d..dd1ae63 100644
--- a/themes/default-xhdpi/stick-toggled-pressed.xpm
+++ b/themes/default-xhdpi/stick-toggled-pressed.xpm
@@ -1,62 +1,68 @@
/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"44 58 2 1",
+static char * stick_pressed_xpm[] = {
+"43 58 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................",
-"............................................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+". at .......................................@.",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................@#@...................@",
+"@.................... at ....................@",
+"@..............###@.....@###..............@",
+"@..............####@...@####..............@",
+"@..............###@.....@###..............@",
+"@.................... at ....................@",
+"@...................@#@...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@...................###...................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+"@.........................................@",
+". at .......................................@.",
+"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"...........................................",
+"..........................................."};
diff --git a/themes/default-xhdpi/title-1-active.png b/themes/default-xhdpi/title-1-active.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-1-active.png and b/themes/default-xhdpi/title-1-active.png differ
diff --git a/themes/default-xhdpi/title-1-active.svg b/themes/default-xhdpi/title-1-active.svg
index 9f626ef..168c632 100644
--- a/themes/default-xhdpi/title-1-active.svg
+++ b/themes/default-xhdpi/title-1-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-1-active.xpm b/themes/default-xhdpi/title-1-active.xpm
index 9468f21..3b163b5 100644
--- a/themes/default-xhdpi/title-1-active.xpm
+++ b/themes/default-xhdpi/title-1-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"8 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-xhdpi/title-1-inactive.png b/themes/default-xhdpi/title-1-inactive.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-1-inactive.png and b/themes/default-xhdpi/title-1-inactive.png differ
diff --git a/themes/default-xhdpi/title-1-inactive.svg b/themes/default-xhdpi/title-1-inactive.svg
index 01d62bd..4134880 100644
--- a/themes/default-xhdpi/title-1-inactive.svg
+++ b/themes/default-xhdpi/title-1-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-2-active.png b/themes/default-xhdpi/title-2-active.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-2-active.png and b/themes/default-xhdpi/title-2-active.png differ
diff --git a/themes/default-xhdpi/title-2-active.svg b/themes/default-xhdpi/title-2-active.svg
index f3bbf08..f16985e 100644
--- a/themes/default-xhdpi/title-2-active.svg
+++ b/themes/default-xhdpi/title-2-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-2-active.xpm b/themes/default-xhdpi/title-2-active.xpm
index 9468f21..3b163b5 100644
--- a/themes/default-xhdpi/title-2-active.xpm
+++ b/themes/default-xhdpi/title-2-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"8 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-xhdpi/title-2-inactive.png b/themes/default-xhdpi/title-2-inactive.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-2-inactive.png and b/themes/default-xhdpi/title-2-inactive.png differ
diff --git a/themes/default-xhdpi/title-2-inactive.svg b/themes/default-xhdpi/title-2-inactive.svg
index 726a985..12298d5 100644
--- a/themes/default-xhdpi/title-2-inactive.svg
+++ b/themes/default-xhdpi/title-2-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-3-active.png b/themes/default-xhdpi/title-3-active.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-3-active.png and b/themes/default-xhdpi/title-3-active.png differ
diff --git a/themes/default-xhdpi/title-3-active.svg b/themes/default-xhdpi/title-3-active.svg
index 7584f83..8d25f79 100644
--- a/themes/default-xhdpi/title-3-active.svg
+++ b/themes/default-xhdpi/title-3-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-3-active.xpm b/themes/default-xhdpi/title-3-active.xpm
index 9468f21..3b163b5 100644
--- a/themes/default-xhdpi/title-3-active.xpm
+++ b/themes/default-xhdpi/title-3-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"8 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-xhdpi/title-3-inactive.png b/themes/default-xhdpi/title-3-inactive.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-3-inactive.png and b/themes/default-xhdpi/title-3-inactive.png differ
diff --git a/themes/default-xhdpi/title-3-inactive.svg b/themes/default-xhdpi/title-3-inactive.svg
index 0eea5e1..c630933 100644
--- a/themes/default-xhdpi/title-3-inactive.svg
+++ b/themes/default-xhdpi/title-3-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-4-active.png b/themes/default-xhdpi/title-4-active.png
index 88109a7..a30423e 100644
Binary files a/themes/default-xhdpi/title-4-active.png and b/themes/default-xhdpi/title-4-active.png differ
diff --git a/themes/default-xhdpi/title-4-active.svg b/themes/default-xhdpi/title-4-active.svg
index 6d7c217..80023c9 100644
--- a/themes/default-xhdpi/title-4-active.svg
+++ b/themes/default-xhdpi/title-4-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-4-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata32" />
+ id="metadata26" />
<defs
- id="defs30" />
+ id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview28" />
+ id="namedview22" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/title-4-active.xpm b/themes/default-xhdpi/title-4-active.xpm
index 9468f21..3b163b5 100644
--- a/themes/default-xhdpi/title-4-active.xpm
+++ b/themes/default-xhdpi/title-4-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"8 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-xhdpi/title-4-inactive.png b/themes/default-xhdpi/title-4-inactive.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-4-inactive.png and b/themes/default-xhdpi/title-4-inactive.png differ
diff --git a/themes/default-xhdpi/title-4-inactive.svg b/themes/default-xhdpi/title-4-inactive.svg
index 0007333..8a675ff 100644
--- a/themes/default-xhdpi/title-4-inactive.svg
+++ b/themes/default-xhdpi/title-4-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/title-5-active.png b/themes/default-xhdpi/title-5-active.png
index 2bad2f8..a30423e 100644
Binary files a/themes/default-xhdpi/title-5-active.png and b/themes/default-xhdpi/title-5-active.png differ
diff --git a/themes/default-xhdpi/title-5-active.svg b/themes/default-xhdpi/title-5-active.svg
index 1038a35..0f9a3b2 100644
--- a/themes/default-xhdpi/title-5-active.svg
+++ b/themes/default-xhdpi/title-5-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-5-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata32" />
+ id="metadata26" />
<defs
- id="defs30" />
+ id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview28" />
+ id="namedview22" />
<g
transform="scale(2)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default-xhdpi/title-5-active.xpm b/themes/default-xhdpi/title-5-active.xpm
index 9468f21..3b163b5 100644
--- a/themes/default-xhdpi/title-5-active.xpm
+++ b/themes/default-xhdpi/title-5-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"8 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........",
"........",
"........",
diff --git a/themes/default-xhdpi/title-5-inactive.png b/themes/default-xhdpi/title-5-inactive.png
index 7fa2e8b..a30423e 100644
Binary files a/themes/default-xhdpi/title-5-inactive.png and b/themes/default-xhdpi/title-5-inactive.png differ
diff --git a/themes/default-xhdpi/title-5-inactive.svg b/themes/default-xhdpi/title-5-inactive.svg
index f2ec3d9..865952e 100644
--- a/themes/default-xhdpi/title-5-inactive.svg
+++ b/themes/default-xhdpi/title-5-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default-xhdpi/top-left-active.png b/themes/default-xhdpi/top-left-active.png
index 72e85f8..033f360 100644
Binary files a/themes/default-xhdpi/top-left-active.png and b/themes/default-xhdpi/top-left-active.png differ
diff --git a/themes/default-xhdpi/top-left-active.svg b/themes/default-xhdpi/top-left-active.svg
index c62c5a6..08ac26f 100644
--- a/themes/default-xhdpi/top-left-active.svg
+++ b/themes/default-xhdpi/top-left-active.svg
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default-xhdpi/top-left-active.xpm b/themes/default-xhdpi/top-left-active.xpm
index 21007d5..1775913 100644
--- a/themes/default-xhdpi/top-left-active.xpm
+++ b/themes/default-xhdpi/top-left-active.xpm
@@ -2,7 +2,7 @@
static char * top_left_active_xpm[] = {
"16 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
" ........",
" ..........",
" ............",
diff --git a/themes/default-xhdpi/top-left-inactive.png b/themes/default-xhdpi/top-left-inactive.png
index 72e85f8..033f360 100644
Binary files a/themes/default-xhdpi/top-left-inactive.png and b/themes/default-xhdpi/top-left-inactive.png differ
diff --git a/themes/default-xhdpi/top-left-inactive.svg b/themes/default-xhdpi/top-left-inactive.svg
index 5e38b37..e44dca7 100644
--- a/themes/default-xhdpi/top-left-inactive.svg
+++ b/themes/default-xhdpi/top-left-inactive.svg
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default-xhdpi/top-right-active.png b/themes/default-xhdpi/top-right-active.png
index 833a6c7..c665840 100644
Binary files a/themes/default-xhdpi/top-right-active.png and b/themes/default-xhdpi/top-right-active.png differ
diff --git a/themes/default-xhdpi/top-right-active.svg b/themes/default-xhdpi/top-right-active.svg
index 23b70d1..87416d4 100644
--- a/themes/default-xhdpi/top-right-active.svg
+++ b/themes/default-xhdpi/top-right-active.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,7 +156,7 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 6.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default-xhdpi/top-right-active.xpm b/themes/default-xhdpi/top-right-active.xpm
index ba9800f..fbb39fb 100644
--- a/themes/default-xhdpi/top-right-active.xpm
+++ b/themes/default-xhdpi/top-right-active.xpm
@@ -2,7 +2,7 @@
static char * top_right_active_xpm[] = {
"16 58 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"........ ",
".......... ",
"............ ",
diff --git a/themes/default-xhdpi/top-right-inactive.png b/themes/default-xhdpi/top-right-inactive.png
index 843f1c6..c665840 100644
Binary files a/themes/default-xhdpi/top-right-inactive.png and b/themes/default-xhdpi/top-right-inactive.png differ
diff --git a/themes/default-xhdpi/top-right-inactive.svg b/themes/default-xhdpi/top-right-inactive.svg
index 3860fd5..c539360 100644
--- a/themes/default-xhdpi/top-right-inactive.svg
+++ b/themes/default-xhdpi/top-right-inactive.svg
@@ -130,13 +130,16 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
id="path6061" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
- id="path1884" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
inkscape:label="Border"
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index f4f253b..91c5a4b 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
index 752f28a..70de0e2 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -10,7 +10,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
- height="4"
+ height="5"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
@@ -98,7 +98,7 @@
id="layer1">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 0,3.5 L 24,3.5"
+ d="M 0,4.5 L 24,4.5"
id="path1340" />
</g>
</g>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 9222f87..b5efc83 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,10 +1,11 @@
/* XPM */
static char * bottom_active_xpm[] = {
-"24 4 3 1",
+"24 5 3 1",
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_2",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index f4f253b..91c5a4b 100644
Binary files a/themes/default/bottom-inactive.png and b/themes/default/bottom-inactive.png differ
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
index 1d8b0b3..637df2c 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -10,7 +10,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
- height="4"
+ height="5"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
@@ -98,7 +98,7 @@
id="layer1">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 0,3.5 L 24,3.5"
+ d="M 0,4.5 L 24,4.5"
id="path1340" />
</g>
</g>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 67549b9..3481504 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,10 +1,11 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
-"24 4 3 1",
+"24 5 3 1",
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 8a14103..1c31a6a 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -4,18 +4,18 @@ static char * bottom_left_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_2",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index c4449e5..6eb387c 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -4,18 +4,18 @@ static char * bottom_left_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
-"@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@ ",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 9977d9a..7c85126 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -4,18 +4,18 @@ static char * bottom_right_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_2",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 69fafd9..f3e1e47 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -4,18 +4,18 @@ static char * bottom_right_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
-" @@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+" @@@@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 2262e62..1e5779a 100644
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
index 9ecc7a3..b798a0d 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,41 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 939cfc2..b2faf93 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * close_active_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......##@...@##......",
+"......###@.@###......",
+"......@###@###@......",
+".......@#####@.......",
+"........@###@........",
+".......@#####@.......",
+"......@###@###@......",
+"......###@.@###......",
+"......##@...@##......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index 740023b..1e5779a 100644
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
index f008a8f..9f24baf 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -130,13 +130,13 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
- width="22"
+ width="21"
height="18"
x="0"
y="1" />
@@ -148,33 +148,16 @@
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 0.5,0.5 L 21.5,0.5"
+ d="M 0.5,0.5 L 20.5,0.5"
id="path6059" />
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(3,9)">
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,28.5 L 20.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index c45a794..bbe6d21 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......##$...$##......",
+"......###$.$###......",
+"......$###$###$......",
+".......$#####$.......",
+"........$###$........",
+".......$#####$.......",
+"......$###$###$......",
+"......###$.$###......",
+"......##$...$##......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index 86801bd..1e5779a 100644
Binary files a/themes/default/close-prelight.png and b/themes/default/close-prelight.png differ
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
index a9812f4..08086ff 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="close-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata42" />
+ id="metadata39" />
<defs
- id="defs40" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview38" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,41 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,9)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index 939cfc2..6654bfb 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * close_active_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++##@+++@##+++++@",
+"@+++++###@+@###+++++@",
+"@+++++@###@###@+++++@",
+"@++++++@#####@++++++@",
+"@+++++++@###@+++++++@",
+"@++++++@#####@++++++@",
+"@+++++@###@###@+++++@",
+"@+++++###@+@###+++++@",
+"@+++++##@+++@##+++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 5d76d63..1e5779a 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg
index d9f2993..251ed17 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="close-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata42" />
+ id="metadata39" />
<defs
- id="defs40" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview38" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,59 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- id="g2327"
- transform="translate(5,10)">
- <g
- transform="matrix(0.875,0,0,0.875,0.75,0.75)"
- style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="g2217">
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,2 L 10,10"
- id="path1340" />
- <path
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 2,10 L 10,2"
- id="path2215" />
- </g>
- <path
- id="path2221"
- d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2225"
- d="M 2.5,9.5 L 9.5,2.5"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index fb28512..d6bf616 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@.....##@...@##.....@",
+"@.....###@.@###.....@",
+"@.....@###@###@.....@",
+"@......@#####@......@",
+"@.......@###@.......@",
+"@......@#####@......@",
+"@.....@###@###@.....@",
+"@.....###@.@###.....@",
+"@.....##@...@##.....@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index 880ae10..1e5779a 100644
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
index 35de20a..9de7c29 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="hide-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,35 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index b5a87f2..7402bd5 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * hide_active_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......#########......",
+"......#########......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index 15e21cf..da38b08 100644
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
index b4f44a1..8a279ef 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 381d958..1183065 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......#########......",
+"......#########......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index 97d8ce8..1e5779a 100644
Binary files a/themes/default/hide-prelight.png and b/themes/default/hide-prelight.png differ
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
index 311ba13..4bdd925 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,35 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index b5a87f2..557f88f 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * hide_active_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++#########+++++@",
+"@+++++#########+++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index 1cb379e..1e5779a 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
index e29342a..d78b318 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,53 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <rect
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2376"
- width="8"
- height="4"
- x="2"
- y="7" />
- <rect
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="rect2378"
- width="6"
- height="2"
- x="3"
- y="8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index b28a096..ca7f08a 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@.....#########.....@",
+"@.....#########.....@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index e004e24..4c77af2 100644
Binary files a/themes/default/left-active.png and b/themes/default/left-active.png differ
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
index 93f459a..ac058c3 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="4"
+ width="5"
height="24"
id="svg2"
sodipodi:version="0.32"
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index df054f1..00d1a22 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,30 +1,30 @@
/* XPM */
static char * left_active_xpm[] = {
-"4 24 3 1",
+"5 24 3 1",
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index e004e24..4c77af2 100644
Binary files a/themes/default/left-inactive.png and b/themes/default/left-inactive.png differ
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
index 097debc..c578aae 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="4"
+ width="5"
height="24"
id="svg2"
sodipodi:version="0.32"
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index 5c1b02a..82222f2 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,30 +1,30 @@
/* XPM */
static char * left_inactive_xpm[] = {
-"4 24 3 1",
+"5 24 3 1",
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index 1f24ca8..1e5779a 100644
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
index 8cd5ea8..451d39a 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 1820996..1850b8b 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......#########......",
+"......#########......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......#########......",
+"......#########......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index e0a37a3..0c3a6e8 100644
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
index 8ce2b97..2546404 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index c131926..c719553 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......#########......",
+"......#########......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......##.....##......",
+"......#########......",
+"......#########......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index 45ebc75..1e5779a 100644
Binary files a/themes/default/maximize-prelight.png and b/themes/default/maximize-prelight.png differ
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
index 0c875fd..acadae8 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,9)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index 1820996..92440f1 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++#########+++++@",
+"@+++++#########+++++@",
+"@+++++##+++++##+++++@",
+"@+++++##+++++##+++++@",
+"@+++++##+++++##+++++@",
+"@+++++##+++++##+++++@",
+"@+++++##+++++##+++++@",
+"@+++++#########+++++@",
+"@+++++#########+++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index 9319553..1e5779a 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg
index bd5073c..317ca78 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,47 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1614"
- transform="translate(5,10)">
- <path
- id="rect2266"
- d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2275"
- d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index ebcd713..8482aff 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@.....#########.....@",
+"@.....#########.....@",
+"@.....##.....##.....@",
+"@.....##.....##.....@",
+"@.....##.....##.....@",
+"@.....##.....##.....@",
+"@.....##.....##.....@",
+"@.....#########.....@",
+"@.....#########.....@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 252ae63..1e5779a 100644
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
index 3e890fd..9ff3710 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata37" />
+ id="metadata39" />
<defs
- id="defs35" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview33" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,33 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index b5c219c..1e66588 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * maximize_active_xpm[] = {
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".......#######.......",
+".......#######.......",
+".......##...##.......",
+".......##...##.......",
+".......##...##.......",
+".......#######.......",
+".......#######.......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 832af2c..3e7caec 100644
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
index 9c5185c..b19cf4f 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 58b29bd..1dce403 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"22 29 2 1",
+static char * maximize_inactive_xpm[] = {
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".......#######.......",
+".......#######.......",
+".......##...##.......",
+".......##...##.......",
+".......##...##.......",
+".......#######.......",
+".......#######.......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index 0852238..1e5779a 100644
Binary files a/themes/default/maximize-toggled-prelight.png and b/themes/default/maximize-toggled-prelight.png differ
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
index 7584df0..3661579 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,33 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,9)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index b5c219c..98e9527 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * maximize_active_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@++++++#######++++++@",
+"@++++++#######++++++@",
+"@++++++##+++##++++++@",
+"@++++++##+++##++++++@",
+"@++++++##+++##++++++@",
+"@++++++#######++++++@",
+"@++++++#######++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index f4afedc..1e5779a 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg
index c48cbd4..727aac7 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="maximize-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,51 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1626"
- transform="translate(5,10)">
- <path
- id="rect2318"
- d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
- <path
- id="rect2331"
- d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="rect2371"
- d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 5c5e581..6cd60cc 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"22 29 2 1",
+static char * maximize_pressed_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@......#######......@",
+"@......#######......@",
+"@......##...##......@",
+"@......##...##......@",
+"@......##...##......@",
+"@......#######......@",
+"@......#######......@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 87acd7a..4d19340 100644
Binary files a/themes/default/menu-active.png and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
index 7a26606..75db087 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index e548be4..6e6c067 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"22 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"......................",
"......................",
"......................",
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index 87acd7a..4d19340 100644
Binary files a/themes/default/menu-inactive.png and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
index c5356aa..3564f13 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index 87acd7a..4d19340 100644
Binary files a/themes/default/menu-prelight.png and b/themes/default/menu-prelight.png differ
diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg
index c4ed469..bbc1587 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
index e548be4..6e6c067 100644
--- a/themes/default/menu-prelight.xpm
+++ b/themes/default/menu-prelight.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"22 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"......................",
"......................",
"......................",
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index 87acd7a..4d19340 100644
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
index 9a7d0ff..28e636f 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 09910bf..e4a807b 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -2,7 +2,7 @@
static char * menu_pressed_xpm[] = {
"22 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"......................",
"......................",
"......................",
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 1ddbddb..096aadf 100644
Binary files a/themes/default/right-active.png and b/themes/default/right-active.png differ
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
index 30123d2..191f4f4 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="4"
+ width="5"
height="24"
id="svg2"
sodipodi:version="0.32"
@@ -96,7 +96,7 @@
id="layer1">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 3.5,0 L 3.5,24"
+ d="M 4.5,0 L 4.5,24"
id="path1340" />
</g>
</g>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 1910d87..6899265 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,30 +1,30 @@
/* XPM */
static char * right_active_xpm[] = {
-"4 24 3 1",
+"5 24 3 1",
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 1ddbddb..096aadf 100644
Binary files a/themes/default/right-inactive.png and b/themes/default/right-inactive.png differ
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
index e33e867..919fc21 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="4"
+ width="5"
height="24"
id="svg2"
sodipodi:version="0.32"
@@ -96,7 +96,7 @@
id="layer1">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 3.5,0 L 3.5,24"
+ d="M 4.5,0 L 4.5,24"
id="path1340" />
</g>
</g>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index cb2e5c0..d149d63 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,30 +1,30 @@
/* XPM */
static char * right_inactive_xpm[] = {
-"4 24 3 1",
+"5 24 3 1",
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_2",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index c559c1a..1e5779a 100644
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
index 9ee1c44..cd36bde 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="shade-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 0831e74..9c299ae 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * shade_active_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".......... at ..........",
+".........@#@.........",
+"........@###@........",
+".......@#####@.......",
+"......@###@###@......",
+"......###@.@###......",
+"......##@...@##......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 6fde3f0..1e5779a 100644
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
index 977c31b..6bbe27d 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="shade-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 6a1ca81..aebe46d 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"..........$..........",
+".........$#$.........",
+"........$###$........",
+".......$#####$.......",
+"......$###$###$......",
+"......###$.$###......",
+"......##$...$##......",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index 9c08f47..1e5779a 100644
Binary files a/themes/default/shade-prelight.png and b/themes/default/shade-prelight.png differ
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
index fbf13a1..15f2141 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,9)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index 0831e74..6010763 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * shade_active_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++ at +++++++++@",
+"@++++++++@#@++++++++@",
+"@+++++++@###@+++++++@",
+"@++++++@#####@++++++@",
+"@+++++@###@###@+++++@",
+"@+++++###@+@###+++++@",
+"@+++++##@+++@##+++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index 83bab48..1e5779a 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg
index fb52bce..0244ae7 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,47 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1616"
- transform="translate(5,10)">
- <path
- d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 7f129b0..0586abc 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@......... at .........@",
+"@........@#@........@",
+"@.......@###@.......@",
+"@......@#####@......@",
+"@.....@###@###@.....@",
+"@.....###@.@###.....@",
+"@.....##@...@##.....@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 2dee872..1e5779a 100644
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
index 66ca84f..c001dc0 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index e630557..7db6fb9 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * shade_active_xpm[] = {
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......##@...@##......",
+"......###@.@###......",
+"......@###@###@......",
+".......@#####@.......",
+"........@###@........",
+".........@#@.........",
+".......... at ..........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index 3fb8848..1e5779a 100644
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
index 2894cd5..ecbffe2 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="shade-toggled-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata39" />
<defs
- id="defs27" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -153,25 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(3,9)">
- <path
- id="path2620"
- style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 69c0403..31b0a0e 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"22 29 2 1",
+static char * shade_inactive_xpm[] = {
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"......##$...$##......",
+"......###$.$###......",
+"......$###$###$......",
+".......$#####$.......",
+"........$###$........",
+".........$#$.........",
+"..........$..........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index ce98706..1e5779a 100644
Binary files a/themes/default/shade-toggled-prelight.png and b/themes/default/shade-toggled-prelight.png differ
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
index 25264c8..160f870 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,9)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index e630557..3ebac98 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * shade_active_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++##@+++@##+++++@",
+"@+++++###@+@###+++++@",
+"@+++++@###@###@+++++@",
+"@++++++@#####@++++++@",
+"@+++++++@###@+++++++@",
+"@++++++++@#@++++++++@",
+"@+++++++++ at +++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index f460846..1e5779a 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
index 8b42b1b..377e26b 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,47 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1628"
- transform="translate(5,10)">
- <path
- d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
- style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2605" />
- <path
- d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2620" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index e5df2c8..7dc88f9 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"22 29 2 1",
+static char * shade_pressed_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@.....##@...@##.....@",
+"@.....###@.@###.....@",
+"@.....@###@###@.....@",
+"@......@#####@......@",
+"@.......@###@.......@",
+"@........@#@........@",
+"@......... at .........@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index b345c3a..1e5779a 100644
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
index 572f073..291bf9e 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="stick-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata36" />
+ id="metadata39" />
<defs
- id="defs34" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview32" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index da71c6e..c850bfa 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * stick_active_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".........@#@.........",
+".........###.........",
+".........###.........",
+"......@#######@......",
+"......#########......",
+"......@#######@......",
+".........###.........",
+".........###.........",
+".........@#@.........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 8cd69af..1e5779a 100644
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
index 94f1090..46425c2 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="stick-inactive.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata29" />
+ id="metadata30" />
<defs
- id="defs27" />
+ id="defs28" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview25" />
+ id="namedview26" />
<g
transform="scale(1)"
id="g3">
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -130,13 +130,13 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
- width="22"
+ width="21"
height="18"
x="0"
y="1" />
@@ -148,30 +148,16 @@
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 0.5,0.5 L 21.5,0.5"
+ d="M 0.5,0.5 L 20.5,0.5"
id="path6059" />
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,28.5 L 20.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 1d7fa52..1ada880 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"22 29 2 1",
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".........$#$.........",
+".........###.........",
+".........###.........",
+"......$#######$......",
+"......#########......",
+"......$#######$......",
+".........###.........",
+".........###.........",
+".........$#$.........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index f7adf71..1e5779a 100644
Binary files a/themes/default/stick-prelight.png and b/themes/default/stick-prelight.png differ
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
index 1eb8e94..e024aec 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,29 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index da71c6e..05fb399 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * stick_active_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@++++++++@#@++++++++@",
+"@++++++++###++++++++@",
+"@++++++++###++++++++@",
+"@+++++@#######@+++++@",
+"@+++++#########+++++@",
+"@+++++@#######@+++++@",
+"@++++++++###++++++++@",
+"@++++++++###++++++++@",
+"@++++++++@#@++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index e2e1f81..1e5779a 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
index 2d3ff1d..27370ef 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,47 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1613"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index bac54bf..07dc009 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"22 29 2 1",
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@........@#@........@",
+"@........###........@",
+"@........###........@",
+"@.....@#######@.....@",
+"@.....#########.....@",
+"@.....@#######@.....@",
+"@........###........@",
+"@........###........@",
+"@........@#@........@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 5e4ac8c..1e5779a 100644
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
index 29b5892..8f02aac 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata37" />
+ id="metadata39" />
<defs
- id="defs35" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview33" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -182,38 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index e228f42..346483f 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * stick_active_xpm[] = {
+"21 29 5 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".........###.........",
+".........###.........",
+".........@#@.........",
+"......##$.$.@##......",
+"......###@.@###......",
+"......##@. at .@##......",
+".........@#@.........",
+".........###.........",
+".........###.........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index 7ea6c60..1e5779a 100644
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
index c20db87..5306f51 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -122,7 +122,7 @@
style="display:inline">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+ d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -130,13 +130,13 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
- width="22"
+ width="21"
height="18"
x="0"
y="1" />
@@ -148,39 +148,16 @@
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
- d="M 0.5,0.5 L 21.5,0.5"
+ d="M 0.5,0.5 L 20.5,0.5"
id="path6059" />
</g>
<g
inkscape:groupmode="layer"
- id="g20"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(3,9)">
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="6"
- sodipodi:cx="6"
- id="path2202"
- style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
- d="M 0.5,28.5 L 21.5,28.5"
+ d="M 0.5,28.5 L 20.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 06e3c3a..08461cb 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,34 +1,37 @@
/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"22 29 2 1",
+static char * stick_inactive_xpm[] = {
+"21 29 5 1",
" c None",
". c #C0C0FF s inactive_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"@ c #949594 s inactive_shadow_2",
+"# c #000000 s inactive_text_color",
+"$ c #B4BAB4 s inactive_mid_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".........###.........",
+".........###.........",
+".........$#$.........",
+"......##$.$.$##......",
+"......###$.$###......",
+"......##$.$.$##......",
+".........$#$.........",
+".........###.........",
+".........###.........",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index eea0afb..1e5779a 100644
Binary files a/themes/default/stick-toggled-prelight.png and b/themes/default/stick-toggled-prelight.png differ
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
index 6c45d0e..723d557 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-prelight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -146,30 +117,12 @@
</metadata>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="prelight">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -177,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -191,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -200,38 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,9)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index e228f42..8549a4b 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"22 29 2 1",
+static char * stick_active_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@++++++++###++++++++@",
+"@++++++++###++++++++@",
+"@++++++++@#@++++++++@",
+"@+++++##@+ at +@##+++++@",
+"@+++++###@+@###+++++@",
+"@+++++##@+ at +@##+++++@",
+"@++++++++@#@++++++++@",
+"@++++++++###++++++++@",
+"@++++++++###++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+"@+++++++++++++++++++@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index b688b05..1e5779a 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
index a83a6a7..e5a4a3c 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -10,7 +10,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="22"
+ width="21"
height="29"
id="svg2"
sodipodi:version="0.32"
@@ -19,9 +19,9 @@
sodipodi:docname="stick-toggled-pressed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata40" />
+ id="metadata39" />
<defs
- id="defs38" />
+ id="defs37" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview36" />
+ id="namedview35" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="22"
height="18"
@@ -173,7 +144,7 @@
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
+ id="layer1"
style="display:inline">
<path
style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
@@ -182,56 +153,11 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
- <g
- id="g1789"
- transform="translate(0,0)">
- <rect
- style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
- x="1"
- y="4"
- rx="2"
- ry="2"
- width="20"
- height="21"
- id="path4123" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
- inkscape:label="Button">
- <g
- style="display:inline"
- id="g1625"
- transform="translate(5,10)">
- <path
- id="path1412"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path2287"
- d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
- sodipodi:ry="1"
- sodipodi:rx="1"
- sodipodi:cy="0"
- sodipodi:cx="6"
- id="path2292"
- style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 21.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,26.5 L 20.5,26.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index a470d7e..afe22d1 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,34 +1,38 @@
/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"22 29 2 1",
+static char * stick_pressed_xpm[] = {
+"21 29 6 1",
" c None",
-". c #C0C0FF s active_color_2",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
+"$ c #C0C0FF s active_color_2",
+"@ c #949594 s active_shadow_2",
+"# c #000000 s active_text_color",
+". c #B4BAB4 s active_mid_2",
+"+ c #B4BAB4 s active_hilight_2",
+".....................",
+".....................",
+".....................",
+".....................",
+".....................",
+".@@@@@@@@@@@@@@@@@@@.",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@........###........@",
+"@........###........@",
+"@........@#@........@",
+"@.....##@. at .@##.....@",
+"@.....###@.@###.....@",
+"@.....##@. at .@##.....@",
+"@........@#@........@",
+"@........###........@",
+"@........###........@",
+"@...................@",
+"@...................@",
+"@...................@",
+"@...................@",
+".@@@@@@@@@@@@@@@@@@@.",
+".....................",
+".....................",
+"....................."};
diff --git a/themes/default/themerc b/themes/default/themerc
index f713582..f6b57d3 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -2,8 +2,8 @@ active_text_color=active_text_color_2
active_text_shadow_color=active_hilight_2
inactive_text_color=inactive_text_color_2
inactive_text_shadow_color=inactive_hilight_2
-button_offset=2
-button_spacing=0
+button_offset=0
+button_spacing=2
full_width_title=true
maximized_offset=0
show_app_icon=true
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg
index 40fa259..490249b 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index de1ca89..c424c37 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"4 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"....",
"....",
"....",
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg
index 6fb724b..b8230c7 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg
index 48c3d65..be1c1b9 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index de1ca89..c424c37 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"4 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"....",
"....",
"....",
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg
index 8db3967..37421b2 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg
index caad8ec..b657cdb 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index de1ca89..c424c37 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"4 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"....",
"....",
"....",
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg
index fad4dcb..8b96165 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index eb584f9..bbbe28d 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg
index c6a6333..d3d1b1e 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-4-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata32" />
+ id="metadata26" />
<defs
- id="defs30" />
+ id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview28" />
+ id="namedview22" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index de1ca89..c424c37 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"4 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"....",
"....",
"....",
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg
index 1b92807..e88201e 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 9412aa3..bbbe28d 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg
index 35259f2..9cb911e 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -19,9 +19,9 @@
sodipodi:docname="title-5-active.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
- id="metadata32" />
+ id="metadata26" />
<defs
- id="defs30" />
+ id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -33,7 +33,7 @@
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
- id="namedview28" />
+ id="namedview22" />
<g
transform="scale(1)"
id="g3">
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,8 +121,8 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
id="path6057" />
</g>
<g
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,8 +156,8 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
- d="M 0.5,26.5 L 7.5,26.5"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+ d="M 0.5,28.5 L 7.5,28.5"
id="path6989" />
</g>
</g>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index de1ca89..c424c37 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -2,7 +2,7 @@
static char * title_active_xpm[] = {
"4 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
"....",
"....",
"....",
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index e1a4d6e..bbbe28d 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg
index dd103de..4cd5161 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -130,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 833473a..c49e09e 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg
index d387eea..c540fea 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index a0d9e09..9e6d80d 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -2,7 +2,7 @@
static char * top_left_active_xpm[] = {
"8 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
" ....",
" ......",
" .......",
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 833473a..c49e09e 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg
index 4e8dd85..301d265 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -132,11 +132,14 @@
<path
id="path6061"
d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
- id="path1884" />
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
style="display:inline"
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index c50d012..aa8ea59 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg
index 4b7f851..3255cc1 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -51,35 +51,6 @@
id="stop1890" />
</linearGradient>
<linearGradient
- id="linearGradient5847">
- <stop
- id="stop5849"
- offset="0"
- style="stop-color:black;stop-opacity:0.30;" />
- <stop
- id="stop2776"
- offset="0.4"
- style="stop-color:black;stop-opacity:0.20;" />
- <stop
- id="stop2779"
- offset="0.6"
- style="stop-color:black;stop-opacity:0.25;" />
- <stop
- id="stop5851"
- offset="1"
- style="stop-color:black;stop-opacity:0.10;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
- x1="0"
- y1="0.5"
- x2="0"
- y2="28.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1886"
id="linearGradient1892"
@@ -150,7 +121,7 @@
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
id="path6057" />
</g>
@@ -159,11 +130,11 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
id="path6061" />
<rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1884"
width="8"
height="18"
@@ -185,7 +156,7 @@
id="layer5"
inkscape:label="Shadow">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
d="M 0.5,26.5 L 6.5,26.5"
id="path6989" />
</g>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 1cb0608..bf84914 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -2,7 +2,7 @@
static char * top_right_active_xpm[] = {
"8 29 2 1",
" c None",
-". c #C0C0FF s active_color_2",
+". c #C0C0FF s active_mid_2",
".... ",
"...... ",
"....... ",
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index b61250d..aa8ea59 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg
index fd39f28..2d2477b 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -130,13 +130,16 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
id="path6061" />
- <path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
- id="path1884" />
+ <rect
+ style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="18"
+ x="0"
+ y="1" />
</g>
<g
inkscape:label="Border"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list