diff --git a/AppKit/Themes/Aristo2/Artwork/Aristo-HUD 11-06-07.psd b/AppKit/Themes/Aristo2/Artwork/Aristo-HUD 11-06-07.psd index ea0389385..0d49c03f1 100755 Binary files a/AppKit/Themes/Aristo2/Artwork/Aristo-HUD 11-06-07.psd and b/AppKit/Themes/Aristo2/Artwork/Aristo-HUD 11-06-07.psd differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-center.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-center.png index a5893796f..98b5a1b67 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-center.png index 6cb36e1e8..99c38f38d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-left.png index 10046e4f9..5b68b3070 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-right.png index d0409cb29..834d46db8 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-center.png index ddad3ff08..ae459d8bb 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-left.png index ae55bd0f4..b61163c2f 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-right.png index a8e0caf23..bd0198fe2 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-left.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-left.png index ae354374a..bad3c91fb 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-right.png b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-right.png index 4e8e65dfb..2cfb2974f 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/button-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-disabled.png new file mode 100644 index 000000000..cf2fde061 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-highlighted.png new file mode 100644 index 000000000..08c07114a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-disabled.png new file mode 100644 index 000000000..cb1efa0b7 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-highlighted.png new file mode 100644 index 000000000..9be52df71 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed.png new file mode 100644 index 000000000..ee87f09bf Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-mixed.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-disabled.png new file mode 100644 index 000000000..8355d00ba Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-highlighted.png new file mode 100644 index 000000000..8a5e94d30 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected.png new file mode 100644 index 000000000..83048e92c Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image-selected.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/check-box-image.png b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image.png new file mode 100644 index 000000000..471abc8f7 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/check-box-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-center.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-center.png index 60a7c8a79..86c8ebf42 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-center.png index 7fb3d7877..d27d92876 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-left.png index 80872f0da..a9bbd2b41 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-right.png index 41d2d660f..0153034e5 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-center.png index 11b0122ec..804981c65 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-left.png index 7ce38bf75..9cab8ac2d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-right.png index f714a71a8..4438b725b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-left.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-left.png index 6e4ea98b1..81a6d7470 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-right.png b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-right.png index 5a47f1810..ae1c61814 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/default-button-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-center.png index 5d104f9d8..409798291 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-center.png old mode 100755 new mode 100644 index 540f11cdc..7fb2826be Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-left.png old mode 100755 new mode 100644 index 6df0c0f8e..4bca3a202 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-right.png old mode 100755 new mode 100644 index 7927436ad..e6c91a1c7 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-left.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-left.png index 105570dbb..33a560d10 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-right.png b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-right.png index a335bca30..e64940f9a 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/horizontal-track-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/knob-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/knob-disabled.png old mode 100755 new mode 100644 index 034806f7f..f5b233788 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/knob-disabled.png and b/AppKit/Themes/Aristo2/Resources/HUD/knob-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/knob-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/knob-highlighted.png index f4451bec1..07c357696 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/knob-highlighted.png and b/AppKit/Themes/Aristo2/Resources/HUD/knob-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/knob.png b/AppKit/Themes/Aristo2/Resources/HUD/knob.png index 37c98b2e5..c9cab57a2 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/knob.png and b/AppKit/Themes/Aristo2/Resources/HUD/knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-disabled.png new file mode 100644 index 000000000..f73ce1759 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-highlighted.png new file mode 100644 index 000000000..d0c15438e Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-disabled.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-disabled.png new file mode 100644 index 000000000..f381542e4 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-highlighted.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-highlighted.png new file mode 100644 index 000000000..f4826fc03 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected.png new file mode 100644 index 000000000..7f0d24135 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image-selected.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/radio-image.png b/AppKit/Themes/Aristo2/Resources/HUD/radio-image.png new file mode 100644 index 000000000..bc64b28e3 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/HUD/radio-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-center.png index d12b3fbf4..8e01a8019 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png index f5d4f3a57..485e34abe 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png index 5b4ab1308..424e6e47f 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png index 13928b5ff..9ba206f92 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png index cea577355..ce98724b9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-divider.png index a7c09616b..403d0e8e2 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-divider.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-center.png index 3c124528f..a6eecdbbe 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png index c1cbbe046..f57e67fba 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png index 831ebc604..cffda59f6 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png index 8a27099e5..d79747572 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png index 0af2530a9..bd8cf37f5 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-divider.png index 90ec7cd36..18a5faee9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-divider.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-left.png index c3a53532a..1539eaaa8 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-right.png index 57153afe4..086d99435 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-left.png index 02de7bb19..28e78cc2e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-center.png index 9f70d2b43..9f5c8ce67 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-left.png index 7637b3ca9..0da985fe6 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-right.png index 38df3d368..e60400999 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-pushed-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-right.png index 19c3c36e4..222141704 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-bezel.png b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-bezel.png index 3824f44af..5a05b632d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-bezel.png and b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-bezel.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-bezel.png b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-bezel.png index 565b15811..c92bcbac1 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-bezel.png and b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-bezel.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-knob.png b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-knob.png index 617b35400..602ae17ac 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-knob.png and b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-disabled-knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-knob.png b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-knob.png index 0c68c7b5d..74e88ee50 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-knob.png and b/AppKit/Themes/Aristo2/Resources/HUD/slider-circular-knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-bottom.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-bottom.png index d6e069983..35d729d7c 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-bottom.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-bottom.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-center.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-center.png index 59d567d67..39b3f08b2 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-bottom.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-bottom.png old mode 100755 new mode 100644 index 7bf9206ac..a33e2882d Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-bottom.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-bottom.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-center.png old mode 100755 new mode 100644 index de9fc8dfa..762bc5fe3 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-top.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-top.png old mode 100755 new mode 100644 index dc6abbbbe..09f331595 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-top.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-disabled-top.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-top.png b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-top.png index 30d6687fd..e9e44c80e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-top.png and b/AppKit/Themes/Aristo2/Resources/HUD/vertical-track-top.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index ecefd447d..8fc9f5cec 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -20,7 +20,9 @@ var themedButtonValues = nil, themedAlertValues = nil, themedWindowViewValues = nil, themedProgressIndicator = nil, - themedIndeterminateProgressIndicator = nil; + themedIndeterminateProgressIndicator = nil, + themedCheckBoxValues = nil, + themedRadioButtonValues = nil; @implementation Aristo2ThemeDescriptor : BKThemeDescriptor @@ -309,7 +311,7 @@ var themedButtonValues = nil, + (CPScrollView)themedScrollView { - var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 200.0)]; + var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 100.0)]; var borderColor = [CPColor colorWithWhite:0.0 alpha:0.2], bottomCornerColor = PatternColor(@"scrollview-bottom-corner-color.png", 15.0, 15.0); @@ -332,7 +334,7 @@ var themedButtonValues = nil, + (CPScroller)makeHorizontalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 273.0, 15.0)]; + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 15.0)]; [scroller setFloatValue:0.1]; [scroller setKnobProportion:0.5]; @@ -344,7 +346,7 @@ var themedButtonValues = nil, + (CPScroller)makeVerticalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 273.0)]; + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 100.0)]; [scroller setFloatValue:1]; [scroller setKnobProportion:0.1]; @@ -952,29 +954,29 @@ var themedButtonValues = nil, imageSelectedHighlighted = PatternImage("radio-image-selected-highlighted.png", 21.0, 21.0), imageSelectedDisabled = PatternImage("radio-image-selected-disabled.png", 21.0, 21.0), imageDisabled = PatternImage("radio-image-disabled.png", 21.0, 21.0), - imageHighlighted = PatternImage("radio-image-highlighted.png", 21.0, 21.0), + imageHighlighted = PatternImage("radio-image-highlighted.png", 21.0, 21.0); - themeValues = - [ - [@"alignment", CPLeftTextAlignment, CPThemeStateNormal], - [@"font", [CPFont systemFontOfSize:12.0], CPThemeStateNormal], - [@"content-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateNormal], + themedRadioButtonValues = + [ + [@"alignment", CPLeftTextAlignment, CPThemeStateNormal], + [@"font", [CPFont systemFontOfSize:12.0], CPThemeStateNormal], + [@"content-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateNormal], - [@"image", imageNormal, CPThemeStateNormal], - [@"image", imageSelected, CPThemeStateSelected], - [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], - [@"image", imageHighlighted, CPThemeStateHighlighted], - [@"image", imageDisabled, CPThemeStateDisabled], - [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], - [@"image-offset", CPRadioImageOffset], + [@"image", imageNormal, CPThemeStateNormal], + [@"image", imageSelected, CPThemeStateSelected], + [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], + [@"image", imageHighlighted, CPThemeStateHighlighted], + [@"image", imageDisabled, CPThemeStateDisabled], + [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], + [@"image-offset", CPRadioImageOffset], - [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], + [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], - [@"min-size", CGSizeMake(21.0, 21.0)], - [@"max-size", CGSizeMake(-1.0, -1.0)] - ]; + [@"min-size", CGSizeMake(21.0, 21.0)], + [@"max-size", CGSizeMake(-1.0, -1.0)] + ]; - [self registerThemeValues:themeValues forView:button]; + [self registerThemeValues:themedRadioButtonValues forView:button]; return button; } @@ -988,31 +990,31 @@ var themedButtonValues = nil, imageSelectedHighlighted = PatternImage("check-box-image-selected-highlighted.png", 21.0, 21.0), imageSelectedDisabled = PatternImage("check-box-image-selected-disabled.png", 21.0, 21.0), imageDisabled = PatternImage("check-box-image-disabled.png", 21.0, 21.0), - imageHighlighted = PatternImage("check-box-image-highlighted.png", 21.0, 21.0), + imageHighlighted = PatternImage("check-box-image-highlighted.png", 21.0, 21.0); - themeValues = - [ - [@"alignment", CPLeftTextAlignment, CPThemeStateNormal], - [@"content-inset", CGInsetMakeZero(), CPThemeStateNormal], + themedCheckBoxValues = + [ + [@"alignment", CPLeftTextAlignment, CPThemeStateNormal], + [@"content-inset", CGInsetMakeZero(), CPThemeStateNormal], - [@"image", imageNormal, CPThemeStateNormal], - [@"image", imageSelected, CPThemeStateSelected], - [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], - [@"image", imageHighlighted, CPThemeStateHighlighted], - [@"image", imageDisabled, CPThemeStateDisabled], - [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], - [@"image-offset", CPCheckBoxImageOffset], + [@"image", imageNormal, CPThemeStateNormal], + [@"image", imageSelected, CPThemeStateSelected], + [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], + [@"image", imageHighlighted, CPThemeStateHighlighted], + [@"image", imageDisabled, CPThemeStateDisabled], + [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], + [@"image-offset", CPCheckBoxImageOffset], - [@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize], CPThemeStateNormal], - [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], + [@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize], CPThemeStateNormal], + [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], - [@"min-size", CGSizeMake(21.0, 21.0)], - [@"max-size", CGSizeMake(-1.0, -1.0)] - ]; + [@"min-size", CGSizeMake(21.0, 21.0)], + [@"max-size", CGSizeMake(-1.0, -1.0)] + ]; [button setThemeState:CPThemeStateSelected]; - [self registerThemeValues:themeValues forView:button]; + [self registerThemeValues:themedCheckBoxValues forView:button]; return button; } @@ -1868,7 +1870,7 @@ var themedButtonValues = nil, + (CPShadowView)themedShadowView { - var shadowView = [[CPShadowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 100.0)], + var shadowView = [[CPShadowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100, 100)], lightColor = PatternColor( [ @@ -1912,7 +1914,7 @@ var themedButtonValues = nil, + (CPBrowser)themedBrowser { - var browser = [[CPBrowser alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 100.0)], + var browser = [[CPBrowser alloc] initWithFrame:CGRectMake(0.0, 0.0, 100, 100.0)], imageResize = PatternImage(@"browser-image-resize-control.png", 15.0, 14.0), imageLeaf = PatternImage(@"browser-image-leaf.png", 9.0, 9.0), @@ -1931,7 +1933,7 @@ var themedButtonValues = nil, + (_CPModalWindowView)themedModalWindowView { - var modalWindowView = [[_CPModalWindowView alloc] initWithFrame:CGRectMake(0,0,400,300) styleMask:_CPModalWindowView]; + var modalWindowView = [[_CPModalWindowView alloc] initWithFrame:CGRectMake(0, 0, 200, 200) styleMask:_CPModalWindowView]; var bezelColor = PatternColor( [ @@ -1958,7 +1960,7 @@ var themedButtonValues = nil, + (_CPWindowView)themedWindowView { - var windowView = [[_CPWindowView alloc] initWithFrame:CGRectMakeZero()], + var windowView = [[_CPWindowView alloc] initWithFrame:CGRectMakeZero(0.0, 0.0, 200, 200)], sheetShadow = PatternColor(@"window-attached-sheet-shadow.png", 9, 8), resizeIndicator = PatternImage(@"window-resize-indicator.png", 12, 12), @@ -1993,7 +1995,7 @@ var themedButtonValues = nil, + (_CPHUDWindowView)themedHUDWindowView { - var HUDWindowView = [[_CPHUDWindowView alloc] initWithFrame:CGRectMake(0,0,250,150) styleMask:CPHUDBackgroundWindowMask | CPClosableWindowMask]; + var HUDWindowView = [[_CPHUDWindowView alloc] initWithFrame:CGRectMake(0, 0, 200, 200) styleMask:CPHUDBackgroundWindowMask | CPClosableWindowMask]; [HUDWindowView setTitle:@"HUDWindow"]; var HUDBezelColor = PatternColor( @@ -2075,7 +2077,7 @@ var themedButtonValues = nil, + (_CPStandardWindowView)themedStandardWindowView { - var standardWindowView = [[_CPStandardWindowView alloc] initWithFrame:CGRectMake(0,0,200,300) styleMask:CPClosableWindowMask], + var standardWindowView = [[_CPStandardWindowView alloc] initWithFrame:CGRectMake(0, 0, 200, 200) styleMask:CPClosableWindowMask], bezelColor = PatternColor( [ @@ -2139,7 +2141,7 @@ var themedButtonValues = nil, + (_CPDocModalWindowView)themedDocModalWindowView { - var docModalWindowView = [[_CPDocModalWindowView alloc] initWithFrame:CGRectMake(0,0,200,300) styleMask:nil], + var docModalWindowView = [[_CPDocModalWindowView alloc] initWithFrame:CGRectMake(0, 0, 200, 200) styleMask:nil], bezelColor = PatternColor( [ @@ -2191,7 +2193,7 @@ var themedButtonValues = nil, + (_CPToolbarView)themedToolbarView { - var toolbarView = [[_CPToolbarView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 59.0)], + var toolbarView = [[_CPToolbarView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 59.0)], toolbarExtraItemsImage = PatternImage(@"toolbar-view-extra-items-image.png", 10.0, 15.0), toolbarExtraItemsAlternateImage = PatternImage(@"toolbar-view-extra-items-alternate-image.png", 10.0, 15.0), @@ -2385,7 +2387,7 @@ var themedButtonValues = nil, + (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues { var overrides = [CPArray arrayWithObjects: - [@"text-color", [CPColor whiteColor]], + [@"text-color", [CPColor colorWithHexString:@"cdcdcd"]], [@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:0.6], CPThemeStateDisabled], [@"text-shadow-color", [CPColor blackColor]], [@"text-shadow-color", [CPColor blackColor], CPThemeStateDisabled], @@ -2521,8 +2523,77 @@ var themedButtonValues = nil, [progressBar setIndeterminate:YES]; [self registerThemeValues:nil forView:progressBar inherit:themedIndeterminateProgressIndicator]; - + console.log([progressBar valueForThemeAttribute:@"bezel-color"]) return progressBar; } ++ (CPCheckBox)themedCheckBoxButton +{ + var button = [CPCheckBox checkBoxWithTitle:@"Checkbox"]; + + [button setThemeState:CPThemeStateSelected]; + + var imageNormal = PatternImage("HUD/check-box-image.png", 21.0, 21.0), + imageSelected = PatternImage("HUD/check-box-image-selected.png", 21.0, 21.0), + imageSelectedHighlighted = PatternImage("HUD/check-box-image-selected-highlighted.png", 21.0, 21.0), + imageSelectedDisabled = PatternImage("HUD/check-box-image-selected-disabled.png", 21.0, 21.0), + imageDisabled = PatternImage("HUD/check-box-image-disabled.png", 21.0, 21.0), + imageHighlighted = PatternImage("HUD/check-box-image-highlighted.png", 21.0, 21.0), + mixedHighlightedImage = PatternImage("HUD/check-box-image-mixed-highlighted.png", 21.0, 21.0), + mixedDisabledImage = PatternImage("HUD/check-box-image-mixed-disabled.png", 21.0, 21.0), + mixedImage = PatternImage("HUD/check-box-image-mixed.png", 21.0, 21.0), + + hudSpecific = + [ + [@"image", imageNormal, CPThemeStateNormal], + [@"image", imageSelected, CPThemeStateSelected], + [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], + [@"image", imageHighlighted, CPThemeStateHighlighted], + [@"image", imageDisabled, CPThemeStateDisabled], + [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], + [@"image", mixedImage, CPButtonStateMixed], + [@"image", mixedHighlightedImage, CPButtonStateMixed | CPThemeStateHighlighted], + [@"image", mixedDisabledImage, CPButtonStateMixed | CPThemeStateDisabled] + ]; + + [self registerThemeValues:[self defaultThemeOverridesAddedTo:hudSpecific] forView:button inherit:themedCheckBoxValues]; + + return button; +} + ++ (CPCheckBox)themedMixedCheckBoxButton +{ + var button = [self themedCheckBoxButton]; + + [button setAllowsMixedState:YES]; + [button setState:CPMixedState]; + + [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:button]; + + return button; +} + ++ (CPRadioButton)themedRadioButton +{ + var button = [CPRadio radioWithTitle:@"Radio button"], + imageNormal = PatternImage("HUD/radio-image.png", 21.0, 21.0), + imageSelected = PatternImage("HUD/radio-image-selected.png", 21.0, 21.0), + imageSelectedHighlighted = PatternImage("HUD/radio-image-selected-highlighted.png", 21.0, 21.0), + imageSelectedDisabled = PatternImage("HUD/radio-image-selected-disabled.png", 21.0, 21.0), + imageDisabled = PatternImage("HUD/radio-image-disabled.png", 21.0, 21.0), + imageHighlighted = PatternImage("HUD/radio-image-highlighted.png", 21.0, 21.0); + + hudSpecific = + [ + [@"image", imageNormal, CPThemeStateNormal], + [@"image", imageSelected, CPThemeStateSelected], + [@"image", imageSelectedHighlighted, CPThemeStateSelected | CPThemeStateHighlighted], + [@"image", imageHighlighted, CPThemeStateHighlighted], + [@"image", imageDisabled, CPThemeStateDisabled], + [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled] + ] + + [self registerThemeValues:[self defaultThemeOverridesAddedTo:hudSpecific] forView:button inherit:themedRadioButtonValues]; + return button; +} @end