Update leash icon and button graphics

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
[kaduk@mit.edu: While here, remove now-unused doghead icons.]

(cherry picked from commit 1f3db78954f891037120d45f9985470d6113421f)

ticket: 7245
status: resolved

diff --git a/src/windows/leash/Leash.rc b/src/windows/leash/Leash.rc
index f682f25ae5340de52f13410dc2d6f5efdeb99e54..1cfd3105e4fb9a296198e3056699ac9fad1bd67f 100644 (file)
--- a/src/windows/leash/Leash.rc
+++ b/src/windows/leash/Leash.rc
@@ -79,10 +79,10 @@ IDI_TICKETTYPE_NOTINSTALLED ICON                    "res\\Leash_tickets_out.ico"
 IDI_TICKET_GOOD         ICON                    "res\\Leash_tkt_green.ico"
 IDI_TICKET_LOW          ICON                    "res\\Leash_tkt_orange.ico"
 IDI_TICKET_EXPIRED      ICON                    "res\\Leash_tkt_red.ico"
-IDI_LEASH_TRAY_GOOD     ICON                    "res\\doghead_green.ico"
-IDI_LEASH_TRAY_LOW      ICON                    "res\\doghead_orange.ico"
-IDI_LEASH_TRAY_EXPIRED  ICON                    "res\\doghead_red.ico"
-IDI_LEASH_TRAY_NONE     ICON                    "res\\doghead_grey.ico"
+IDI_LEASH_TRAY_GOOD     ICON                    "res\\status_greenK.ico"
+IDI_LEASH_TRAY_LOW      ICON                    "res\\status_yelloK.ico"
+IDI_LEASH_TRAY_EXPIRED  ICON                    "res\\status_redK.ico"
+IDI_LEASH_TRAY_NONE     ICON                    "res\\status_grayK.ico"
 IDI_LEASH_TICKET_ADDRESS ICON                    "res\\address.ico"
 IDI_LEASH_TICKET_SESSION ICON                    "res\\key.ico"
 IDI_LEASH_TICKET_ENCRYPTION ICON                    "res\\encryption.ico"

diff --git a/src/windows/leash/res/Leash.ico b/src/windows/leash/res/Leash.ico
index 9ef4f96ffcb8230f5111a031e4a4bbf17481f5b9..235c6f445dae8f108e277e1310faf50ebc76245e 100644 (file)
Binary files a/src/windows/leash/res/Leash.ico and b/src/windows/leash/res/Leash.ico differ

diff --git a/src/windows/leash/res/doghead_green.ico b/src/windows/leash/res/doghead_green.ico
deleted file mode 100644 (file)
index eadc2a3..0000000
Binary files a/src/windows/leash/res/doghead_green.ico and /dev/null differ

diff --git a/src/windows/leash/res/doghead_grey.ico b/src/windows/leash/res/doghead_grey.ico
deleted file mode 100644 (file)
index ffffce3..0000000
Binary files a/src/windows/leash/res/doghead_grey.ico and /dev/null differ

diff --git a/src/windows/leash/res/doghead_orange.ico b/src/windows/leash/res/doghead_orange.ico
deleted file mode 100644 (file)
index ded7e14..0000000
Binary files a/src/windows/leash/res/doghead_orange.ico and /dev/null differ

diff --git a/src/windows/leash/res/doghead_red.ico b/src/windows/leash/res/doghead_red.ico
deleted file mode 100644 (file)
index 589b86a..0000000
Binary files a/src/windows/leash/res/doghead_red.ico and /dev/null differ

diff --git a/src/windows/leash/res/homelarge.bmp b/src/windows/leash/res/homelarge.bmp
new file mode 100644 (file)
index 0000000..d34f398
Binary files /dev/null and b/src/windows/leash/res/homelarge.bmp differ

diff --git a/src/windows/leash/res/main.bmp b/src/windows/leash/res/main.bmp
new file mode 100644 (file)
index 0000000..301d63c
Binary files /dev/null and b/src/windows/leash/res/main.bmp differ

diff --git a/src/windows/leash/res/status_grayK.ico b/src/windows/leash/res/status_grayK.ico
new file mode 100644 (file)
index 0000000..f963f0d
Binary files /dev/null and b/src/windows/leash/res/status_grayK.ico differ

diff --git a/src/windows/leash/res/status_greenK.ico b/src/windows/leash/res/status_greenK.ico
new file mode 100644 (file)
index 0000000..d1557aa
Binary files /dev/null and b/src/windows/leash/res/status_greenK.ico differ

diff --git a/src/windows/leash/res/status_redK.ico b/src/windows/leash/res/status_redK.ico
new file mode 100644 (file)
index 0000000..3a624be
Binary files /dev/null and b/src/windows/leash/res/status_redK.ico differ

diff --git a/src/windows/leash/res/status_yelloK.ico b/src/windows/leash/res/status_yelloK.ico
new file mode 100644 (file)
index 0000000..08ba599
Binary files /dev/null and b/src/windows/leash/res/status_yelloK.ico differ

diff --git a/src/windows/leashdll/res/leash.ico b/src/windows/leashdll/res/leash.ico
index 9ef4f96ffcb8230f5111a031e4a4bbf17481f5b9..235c6f445dae8f108e277e1310faf50ebc76245e 100644 (file)
Binary files a/src/windows/leashdll/res/leash.ico and b/src/windows/leashdll/res/leash.ico differ