summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-05-12 21:37:51 +0100
committerCarl Hetherington <cth@carlh.net>2018-05-27 23:05:46 +0100
commitaae000e8a37a494bf20ba0e5dd219ad9f78c6286 (patch)
tree6a70119d34484f3cc6534e0e17c4a4bb1307c3cb
parent8449388da769c45ef8a441bccdeb062bc96d27ae (diff)
Move email server preferences into a separate tab.
-rw-r--r--graphics/linux/128/dcpomatic2.pngbin24154 -> 24162 bytes
-rw-r--r--graphics/linux/128/dcpomatic2_batch.pngbin22632 -> 22631 bytes
-rw-r--r--graphics/linux/128/dcpomatic2_kdm.pngbin22264 -> 22271 bytes
-rw-r--r--graphics/linux/128/dcpomatic2_player.pngbin21707 -> 21707 bytes
-rw-r--r--graphics/linux/128/dcpomatic2_server.pngbin21329 -> 21329 bytes
-rw-r--r--graphics/linux/16/dcpomatic2.pngbin1946 -> 1947 bytes
-rw-r--r--graphics/linux/16/dcpomatic2_batch.pngbin892 -> 891 bytes
-rw-r--r--graphics/linux/16/dcpomatic2_kdm.pngbin875 -> 875 bytes
-rw-r--r--graphics/linux/16/dcpomatic2_player.pngbin888 -> 888 bytes
-rw-r--r--graphics/linux/16/dcpomatic2_server.pngbin890 -> 890 bytes
-rw-r--r--graphics/linux/22/dcpomatic2.pngbin2366 -> 2374 bytes
-rw-r--r--graphics/linux/22/dcpomatic2_batch.pngbin1419 -> 1419 bytes
-rw-r--r--graphics/linux/22/dcpomatic2_kdm.pngbin1408 -> 1408 bytes
-rw-r--r--graphics/linux/22/dcpomatic2_player.pngbin1441 -> 1441 bytes
-rw-r--r--graphics/linux/22/dcpomatic2_server.pngbin1434 -> 1434 bytes
-rw-r--r--graphics/linux/256/dcpomatic2.pngbin70188 -> 70196 bytes
-rw-r--r--graphics/linux/256/dcpomatic2_batch.pngbin68119 -> 68119 bytes
-rw-r--r--graphics/linux/256/dcpomatic2_kdm.pngbin68203 -> 68203 bytes
-rw-r--r--graphics/linux/256/dcpomatic2_player.pngbin65652 -> 65652 bytes
-rw-r--r--graphics/linux/256/dcpomatic2_server.pngbin64042 -> 64042 bytes
-rw-r--r--graphics/linux/32/dcpomatic2.pngbin3704 -> 3712 bytes
-rw-r--r--graphics/linux/32/dcpomatic2_batch.pngbin2586 -> 2585 bytes
-rw-r--r--graphics/linux/32/dcpomatic2_kdm.pngbin2524 -> 2524 bytes
-rw-r--r--graphics/linux/32/dcpomatic2_player.pngbin2603 -> 2603 bytes
-rw-r--r--graphics/linux/32/dcpomatic2_server.pngbin2583 -> 2583 bytes
-rw-r--r--graphics/linux/48/dcpomatic2.pngbin6369 -> 6377 bytes
-rw-r--r--graphics/linux/48/dcpomatic2_batch.pngbin5114 -> 5114 bytes
-rw-r--r--graphics/linux/48/dcpomatic2_kdm.pngbin4935 -> 4935 bytes
-rw-r--r--graphics/linux/48/dcpomatic2_player.pngbin4973 -> 4973 bytes
-rw-r--r--graphics/linux/48/dcpomatic2_server.pngbin4892 -> 4892 bytes
-rw-r--r--graphics/linux/512/dcpomatic2.pngbin232409 -> 232417 bytes
-rw-r--r--graphics/linux/512/dcpomatic2_batch.pngbin229156 -> 229165 bytes
-rw-r--r--graphics/linux/512/dcpomatic2_kdm.pngbin228553 -> 228558 bytes
-rw-r--r--graphics/linux/512/dcpomatic2_player.pngbin222270 -> 222270 bytes
-rw-r--r--graphics/linux/512/dcpomatic2_server.pngbin214924 -> 214924 bytes
-rw-r--r--graphics/linux/64/dcpomatic2.pngbin9349 -> 9357 bytes
-rw-r--r--graphics/linux/64/dcpomatic2_batch.pngbin8057 -> 8057 bytes
-rw-r--r--graphics/linux/64/dcpomatic2_kdm.pngbin7838 -> 7837 bytes
-rw-r--r--graphics/linux/64/dcpomatic2_player.pngbin7760 -> 7760 bytes
-rw-r--r--graphics/linux/64/dcpomatic2_server.pngbin7623 -> 7623 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_128x128.pngbin24154 -> 24162 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_128x128@2x.pngbin24154 -> 24162 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_16x16.pngbin1946 -> 1947 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_16x16@2x.pngbin1946 -> 1947 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_256x256.pngbin70188 -> 70196 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_256x256@2x.pngbin70188 -> 70196 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_32x32.pngbin3704 -> 3712 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_32x32@2x.pngbin3704 -> 3712 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_512x512.pngbin232409 -> 232417 bytes
-rw-r--r--graphics/osx/dcpomatic2.iconset/icon_512x512@2x.pngbin232409 -> 232417 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_128x128.pngbin22632 -> 22631 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.pngbin22632 -> 22631 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_16x16.pngbin892 -> 891 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.pngbin892 -> 891 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_256x256.pngbin68119 -> 68119 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.pngbin68119 -> 68119 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_32x32.pngbin2586 -> 2585 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.pngbin2586 -> 2585 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_512x512.pngbin229156 -> 229165 bytes
-rw-r--r--graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.pngbin229156 -> 229165 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.pngbin22264 -> 22271 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.pngbin22264 -> 22271 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.pngbin875 -> 875 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.pngbin875 -> 875 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.pngbin68203 -> 68203 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.pngbin68203 -> 68203 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.pngbin2524 -> 2524 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.pngbin2524 -> 2524 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.pngbin228553 -> 228558 bytes
-rw-r--r--graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.pngbin228553 -> 228558 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_128x128.pngbin21707 -> 21707 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.pngbin21707 -> 21707 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_16x16.pngbin888 -> 888 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.pngbin888 -> 888 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_256x256.pngbin65652 -> 65652 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.pngbin65652 -> 65652 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_32x32.pngbin2603 -> 2603 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.pngbin2603 -> 2603 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_512x512.pngbin222270 -> 222270 bytes
-rw-r--r--graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.pngbin222270 -> 222270 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_128x128.pngbin21329 -> 21329 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.pngbin21329 -> 21329 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_16x16.pngbin890 -> 890 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.pngbin890 -> 890 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_256x256.pngbin64042 -> 64042 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.pngbin64042 -> 64042 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_32x32.pngbin2583 -> 2583 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.pngbin2583 -> 2583 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_512x512.pngbin214924 -> 214924 bytes
-rw-r--r--graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.pngbin214924 -> 214924 bytes
-rw-r--r--graphics/osx/preferences/colour_conversions.pngbin278 -> 278 bytes
-rw-r--r--graphics/osx/preferences/cover_sheet.pngbin1184 -> 1184 bytes
-rw-r--r--graphics/osx/preferences/defaults.pngbin535 -> 535 bytes
-rw-r--r--graphics/osx/preferences/email.pngbin0 -> 2158 bytes
-rw-r--r--graphics/osx/preferences/kdm_email.pngbin2158 -> 2502 bytes
-rw-r--r--graphics/osx/preferences/keys.pngbin1797 -> 1797 bytes
-rw-r--r--graphics/osx/preferences/tms.pngbin1616 -> 1616 bytes
-rw-r--r--graphics/splash.pngbin39075 -> 39249 bytes
-rw-r--r--graphics/src/email.svg474
-rw-r--r--graphics/src/kdm_email.svg733
-rwxr-xr-xgraphics/update2
-rw-r--r--graphics/web/favicon-128x128.pngbin25046 -> 25054 bytes
-rw-r--r--graphics/web/favicon-16x16.pngbin1976 -> 1977 bytes
-rw-r--r--graphics/web/favicon-256x256.pngbin70281 -> 70289 bytes
-rw-r--r--graphics/web/favicon-32x32.pngbin3747 -> 3755 bytes
-rw-r--r--graphics/web/favicon-64x64.pngbin9587 -> 9595 bytes
-rw-r--r--graphics/web/logo.pngbin22492 -> 22500 bytes
-rw-r--r--src/wx/full_config_dialog.cc208
108 files changed, 921 insertions, 496 deletions
diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png
index 273e67de5..002c8a43a 100644
--- a/graphics/linux/128/dcpomatic2.png
+++ b/graphics/linux/128/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/128/dcpomatic2_batch.png b/graphics/linux/128/dcpomatic2_batch.png
index 6d4994493..8b084a07e 100644
--- a/graphics/linux/128/dcpomatic2_batch.png
+++ b/graphics/linux/128/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/128/dcpomatic2_kdm.png b/graphics/linux/128/dcpomatic2_kdm.png
index 31c1333d6..b2b8518e8 100644
--- a/graphics/linux/128/dcpomatic2_kdm.png
+++ b/graphics/linux/128/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/128/dcpomatic2_player.png b/graphics/linux/128/dcpomatic2_player.png
index 06f2b86ab..427699852 100644
--- a/graphics/linux/128/dcpomatic2_player.png
+++ b/graphics/linux/128/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/128/dcpomatic2_server.png b/graphics/linux/128/dcpomatic2_server.png
index c6b118c11..fae26a5ad 100644
--- a/graphics/linux/128/dcpomatic2_server.png
+++ b/graphics/linux/128/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png
index d56bcb15a..eb295c31d 100644
--- a/graphics/linux/16/dcpomatic2.png
+++ b/graphics/linux/16/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/16/dcpomatic2_batch.png b/graphics/linux/16/dcpomatic2_batch.png
index a4cfd0d92..f6744e45b 100644
--- a/graphics/linux/16/dcpomatic2_batch.png
+++ b/graphics/linux/16/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/16/dcpomatic2_kdm.png b/graphics/linux/16/dcpomatic2_kdm.png
index bbff2ed74..f0cecb6bd 100644
--- a/graphics/linux/16/dcpomatic2_kdm.png
+++ b/graphics/linux/16/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/16/dcpomatic2_player.png b/graphics/linux/16/dcpomatic2_player.png
index b86c6cd01..2f0d12e95 100644
--- a/graphics/linux/16/dcpomatic2_player.png
+++ b/graphics/linux/16/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/16/dcpomatic2_server.png b/graphics/linux/16/dcpomatic2_server.png
index 31ffcf7d5..cf9fdb583 100644
--- a/graphics/linux/16/dcpomatic2_server.png
+++ b/graphics/linux/16/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png
index a10383d67..7564c87a2 100644
--- a/graphics/linux/22/dcpomatic2.png
+++ b/graphics/linux/22/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/22/dcpomatic2_batch.png b/graphics/linux/22/dcpomatic2_batch.png
index 12c7dd860..c235ad8b5 100644
--- a/graphics/linux/22/dcpomatic2_batch.png
+++ b/graphics/linux/22/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/22/dcpomatic2_kdm.png b/graphics/linux/22/dcpomatic2_kdm.png
index d5aa1d0a2..6646ec909 100644
--- a/graphics/linux/22/dcpomatic2_kdm.png
+++ b/graphics/linux/22/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/22/dcpomatic2_player.png b/graphics/linux/22/dcpomatic2_player.png
index 75e66fd63..0251c36d1 100644
--- a/graphics/linux/22/dcpomatic2_player.png
+++ b/graphics/linux/22/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/22/dcpomatic2_server.png b/graphics/linux/22/dcpomatic2_server.png
index 5b0f3456b..09df5e4c1 100644
--- a/graphics/linux/22/dcpomatic2_server.png
+++ b/graphics/linux/22/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png
index 8cd8a9891..0cb634e1e 100644
--- a/graphics/linux/256/dcpomatic2.png
+++ b/graphics/linux/256/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/256/dcpomatic2_batch.png b/graphics/linux/256/dcpomatic2_batch.png
index 08a1c524e..94c5ca596 100644
--- a/graphics/linux/256/dcpomatic2_batch.png
+++ b/graphics/linux/256/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/256/dcpomatic2_kdm.png b/graphics/linux/256/dcpomatic2_kdm.png
index 73c04ce04..43751e2d8 100644
--- a/graphics/linux/256/dcpomatic2_kdm.png
+++ b/graphics/linux/256/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/256/dcpomatic2_player.png b/graphics/linux/256/dcpomatic2_player.png
index d678c6b7d..be9b918da 100644
--- a/graphics/linux/256/dcpomatic2_player.png
+++ b/graphics/linux/256/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/256/dcpomatic2_server.png b/graphics/linux/256/dcpomatic2_server.png
index 4f4deb800..e85920837 100644
--- a/graphics/linux/256/dcpomatic2_server.png
+++ b/graphics/linux/256/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png
index b877d6b1d..edfbbb743 100644
--- a/graphics/linux/32/dcpomatic2.png
+++ b/graphics/linux/32/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/32/dcpomatic2_batch.png b/graphics/linux/32/dcpomatic2_batch.png
index b44c5fb15..d2d8045b6 100644
--- a/graphics/linux/32/dcpomatic2_batch.png
+++ b/graphics/linux/32/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/32/dcpomatic2_kdm.png b/graphics/linux/32/dcpomatic2_kdm.png
index 8b381dff4..9bda6f5fd 100644
--- a/graphics/linux/32/dcpomatic2_kdm.png
+++ b/graphics/linux/32/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/32/dcpomatic2_player.png b/graphics/linux/32/dcpomatic2_player.png
index 06800a0d6..f8acf5a72 100644
--- a/graphics/linux/32/dcpomatic2_player.png
+++ b/graphics/linux/32/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/32/dcpomatic2_server.png b/graphics/linux/32/dcpomatic2_server.png
index 5059479e6..8e071b747 100644
--- a/graphics/linux/32/dcpomatic2_server.png
+++ b/graphics/linux/32/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png
index 2ad1b7483..98e8e5b6e 100644
--- a/graphics/linux/48/dcpomatic2.png
+++ b/graphics/linux/48/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/48/dcpomatic2_batch.png b/graphics/linux/48/dcpomatic2_batch.png
index b9537e247..5f1db9014 100644
--- a/graphics/linux/48/dcpomatic2_batch.png
+++ b/graphics/linux/48/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/48/dcpomatic2_kdm.png b/graphics/linux/48/dcpomatic2_kdm.png
index 44c2129db..9837bc87d 100644
--- a/graphics/linux/48/dcpomatic2_kdm.png
+++ b/graphics/linux/48/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/48/dcpomatic2_player.png b/graphics/linux/48/dcpomatic2_player.png
index 1b88f011f..6096ebce1 100644
--- a/graphics/linux/48/dcpomatic2_player.png
+++ b/graphics/linux/48/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/48/dcpomatic2_server.png b/graphics/linux/48/dcpomatic2_server.png
index c9d007e99..270422612 100644
--- a/graphics/linux/48/dcpomatic2_server.png
+++ b/graphics/linux/48/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png
index 121572d13..66b67d2e0 100644
--- a/graphics/linux/512/dcpomatic2.png
+++ b/graphics/linux/512/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/512/dcpomatic2_batch.png b/graphics/linux/512/dcpomatic2_batch.png
index 354c49615..cc5121b12 100644
--- a/graphics/linux/512/dcpomatic2_batch.png
+++ b/graphics/linux/512/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/512/dcpomatic2_kdm.png b/graphics/linux/512/dcpomatic2_kdm.png
index ea07929cc..e5a4f0bed 100644
--- a/graphics/linux/512/dcpomatic2_kdm.png
+++ b/graphics/linux/512/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/512/dcpomatic2_player.png b/graphics/linux/512/dcpomatic2_player.png
index 2c26510a1..468056e31 100644
--- a/graphics/linux/512/dcpomatic2_player.png
+++ b/graphics/linux/512/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/512/dcpomatic2_server.png b/graphics/linux/512/dcpomatic2_server.png
index c5b9fd8ce..4c0c39065 100644
--- a/graphics/linux/512/dcpomatic2_server.png
+++ b/graphics/linux/512/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png
index e17ae2658..0b10add1e 100644
--- a/graphics/linux/64/dcpomatic2.png
+++ b/graphics/linux/64/dcpomatic2.png
Binary files differ
diff --git a/graphics/linux/64/dcpomatic2_batch.png b/graphics/linux/64/dcpomatic2_batch.png
index 8a38719e7..7afcbaecb 100644
--- a/graphics/linux/64/dcpomatic2_batch.png
+++ b/graphics/linux/64/dcpomatic2_batch.png
Binary files differ
diff --git a/graphics/linux/64/dcpomatic2_kdm.png b/graphics/linux/64/dcpomatic2_kdm.png
index 9bfd5cf15..950010c45 100644
--- a/graphics/linux/64/dcpomatic2_kdm.png
+++ b/graphics/linux/64/dcpomatic2_kdm.png
Binary files differ
diff --git a/graphics/linux/64/dcpomatic2_player.png b/graphics/linux/64/dcpomatic2_player.png
index 24c722ff5..503a9e8dd 100644
--- a/graphics/linux/64/dcpomatic2_player.png
+++ b/graphics/linux/64/dcpomatic2_player.png
Binary files differ
diff --git a/graphics/linux/64/dcpomatic2_server.png b/graphics/linux/64/dcpomatic2_server.png
index 689b82cd0..d1e084639 100644
--- a/graphics/linux/64/dcpomatic2_server.png
+++ b/graphics/linux/64/dcpomatic2_server.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
index cae2c1935..002c8a43a 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
index cae2c1935..002c8a43a 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
index 4967414dc..eb295c31d 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
index 4967414dc..eb295c31d 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
index 52db12fb4..0cb634e1e 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
index 52db12fb4..0cb634e1e 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
index 1358b6a5f..edfbbb743 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
index 1358b6a5f..edfbbb743 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
index 888407ea6..66b67d2e0 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
index 888407ea6..66b67d2e0 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png
index 6d4994493..8b084a07e 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png
index 6d4994493..8b084a07e 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png
index a4cfd0d92..f6744e45b 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png
index a4cfd0d92..f6744e45b 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png
index 08a1c524e..94c5ca596 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png
index 08a1c524e..94c5ca596 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png
index b44c5fb15..d2d8045b6 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png
index b44c5fb15..d2d8045b6 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png
index 354c49615..cc5121b12 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png
index 354c49615..cc5121b12 100644
--- a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png
index 31c1333d6..b2b8518e8 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png
index 31c1333d6..b2b8518e8 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png
index bbff2ed74..f0cecb6bd 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png
index bbff2ed74..f0cecb6bd 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png
index 73c04ce04..43751e2d8 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png
index 73c04ce04..43751e2d8 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png
index 8b381dff4..9bda6f5fd 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png
index 8b381dff4..9bda6f5fd 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png
index ea07929cc..e5a4f0bed 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png
index ea07929cc..e5a4f0bed 100644
--- a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png
index 06f2b86ab..427699852 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png
index 06f2b86ab..427699852 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png
index b86c6cd01..2f0d12e95 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png
index b86c6cd01..2f0d12e95 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png
index d678c6b7d..be9b918da 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png
index d678c6b7d..be9b918da 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png
index 06800a0d6..f8acf5a72 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png
index 06800a0d6..f8acf5a72 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png
index 2c26510a1..468056e31 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png
index 2c26510a1..468056e31 100644
--- a/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png
index c6b118c11..fae26a5ad 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png
index c6b118c11..fae26a5ad 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png
index 31ffcf7d5..cf9fdb583 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png
index 31ffcf7d5..cf9fdb583 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png
index 4f4deb800..e85920837 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png
index 4f4deb800..e85920837 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png
index 5059479e6..8e071b747 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png
index 5059479e6..8e071b747 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png
index c5b9fd8ce..4c0c39065 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png
Binary files differ
diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png
index c5b9fd8ce..4c0c39065 100644
--- a/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png
Binary files differ
diff --git a/graphics/osx/preferences/colour_conversions.png b/graphics/osx/preferences/colour_conversions.png
index 161e8d6f1..7d18fe1b5 100644
--- a/graphics/osx/preferences/colour_conversions.png
+++ b/graphics/osx/preferences/colour_conversions.png
Binary files differ
diff --git a/graphics/osx/preferences/cover_sheet.png b/graphics/osx/preferences/cover_sheet.png
index 9bdf1371e..63c407409 100644
--- a/graphics/osx/preferences/cover_sheet.png
+++ b/graphics/osx/preferences/cover_sheet.png
Binary files differ
diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults.png
index 6ccce17b1..fc92d4387 100644
--- a/graphics/osx/preferences/defaults.png
+++ b/graphics/osx/preferences/defaults.png
Binary files differ
diff --git a/graphics/osx/preferences/email.png b/graphics/osx/preferences/email.png
new file mode 100644
index 000000000..89dfbe3f1
--- /dev/null
+++ b/graphics/osx/preferences/email.png
Binary files differ
diff --git a/graphics/osx/preferences/kdm_email.png b/graphics/osx/preferences/kdm_email.png
index b66a12a1b..c940210f1 100644
--- a/graphics/osx/preferences/kdm_email.png
+++ b/graphics/osx/preferences/kdm_email.png
Binary files differ
diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys.png
index b7b870314..41a3a36f8 100644
--- a/graphics/osx/preferences/keys.png
+++ b/graphics/osx/preferences/keys.png
Binary files differ
diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms.png
index 4041ccd8e..47877e224 100644
--- a/graphics/osx/preferences/tms.png
+++ b/graphics/osx/preferences/tms.png
Binary files differ
diff --git a/graphics/splash.png b/graphics/splash.png
index a74153092..f14760948 100644
--- a/graphics/splash.png
+++ b/graphics/splash.png
Binary files differ
diff --git a/graphics/src/email.svg b/graphics/src/email.svg
new file mode 100644
index 000000000..c09d94e81
--- /dev/null
+++ b/graphics/src/email.svg
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:ns1="http://sozi.baierouge.fr"
+ id="svg5816"
+ viewBox="0 0 48 48"
+ sodipodi:version="0.32"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:version="0.46"
+ sodipodi:docname="internet-mail.svg"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
+ >
+ <defs
+ id="defs3"
+ >
+ <radialGradient
+ id="radialGradient6719"
+ xlink:href="#linearGradient5060"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(-2.7744 0 0 1.9697 112.76 -872.89)"
+ r="117.14"
+ inkscape:collect="always"
+ />
+ <linearGradient
+ id="linearGradient5060"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop5062"
+ style="stop-color:black"
+ offset="0"
+ />
+ <stop
+ id="stop5064"
+ style="stop-color:black;stop-opacity:0"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <radialGradient
+ id="radialGradient6717"
+ xlink:href="#linearGradient5060"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(2.7744 0 0 1.9697 -1891.6 -872.89)"
+ r="117.14"
+ inkscape:collect="always"
+ />
+ <linearGradient
+ id="linearGradient6715"
+ y2="609.51"
+ gradientUnits="userSpaceOnUse"
+ x2="302.86"
+ gradientTransform="matrix(2.7744 0 0 1.9697 -1892.2 -872.89)"
+ y1="366.65"
+ x1="302.86"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop5050"
+ style="stop-color:black;stop-opacity:0"
+ offset="0"
+ />
+ <stop
+ id="stop5056"
+ style="stop-color:black"
+ offset=".5"
+ />
+ <stop
+ id="stop5052"
+ style="stop-color:black;stop-opacity:0"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient2152"
+ >
+ <stop
+ id="stop2154"
+ style="stop-color:#9aa29a"
+ offset="0"
+ />
+ <stop
+ id="stop2156"
+ style="stop-color:#b5beb5"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27463"
+ y2="32.203"
+ gradientUnits="userSpaceOnUse"
+ y1="37.785"
+ gradientTransform="matrix(2.3949 0 0 .78106 2.8795 0.343)"
+ x2="9.7619"
+ x1="8.7804"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop2276"
+ style="stop-color:#000000;stop-opacity:.12871"
+ offset="0"
+ />
+ <stop
+ id="stop2278"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27468"
+ y2="24.133"
+ gradientUnits="userSpaceOnUse"
+ y1="13.686"
+ gradientTransform="matrix(1.3709 0 0 1.4438 2.4311 -.14079)"
+ x2="21.112"
+ x1="11.233"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop9751"
+ style="stop-color:#ffffff"
+ offset="0"
+ />
+ <stop
+ id="stop9753"
+ style="stop-color:#ededed"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27471"
+ y2="52.091"
+ xlink:href="#linearGradient2152"
+ gradientUnits="userSpaceOnUse"
+ y1="37.197"
+ gradientTransform="matrix(2.4548 0 0 0.762 2.8795 0.343)"
+ x2="9.8855"
+ x1="8.9156"
+ inkscape:collect="always"
+ />
+ <linearGradient
+ id="linearGradient27477"
+ y2="29.569"
+ gradientUnits="userSpaceOnUse"
+ y1="15.148"
+ gradientTransform="matrix(1.8193 0 0 1.0282 2.8795 0.343)"
+ x2="15.311"
+ x1="10.184"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop2168"
+ style="stop-color:#ffffff"
+ offset="0"
+ />
+ <stop
+ id="stop2170"
+ style="stop-color:#dcdcdc"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27483"
+ y2="17.877"
+ gradientUnits="userSpaceOnUse"
+ y1="7.2311"
+ gradientTransform="matrix(1.5706 0 0 1.191 2.8795 0.343)"
+ x2="13.467"
+ x1="5.8266"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop18915"
+ style="stop-color:#ededed"
+ offset="0"
+ />
+ <stop
+ id="stop18917"
+ style="stop-color:#c8c8c8"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27486"
+ y2="26.023"
+ gradientUnits="userSpaceOnUse"
+ y1="4.7462"
+ gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
+ x2="18.475"
+ x1="11.573"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop15109"
+ style="stop-color:#ffffff"
+ offset="0"
+ />
+ <stop
+ id="stop15111"
+ style="stop-color:#e2e2e2"
+ offset="1"
+ />
+ </linearGradient
+ >
+ <linearGradient
+ id="linearGradient27488"
+ y2="15.257"
+ gradientUnits="userSpaceOnUse"
+ y1="15.257"
+ gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
+ x2="30.6"
+ x1="2.0619"
+ inkscape:collect="always"
+ >
+ <stop
+ id="stop2138"
+ style="stop-color:#989690"
+ offset="0"
+ />
+ <stop
+ id="stop2140"
+ style="stop-color:#656460"
+ offset="1"
+ />
+ </linearGradient
+ >
+ </defs
+ >
+ <sodipodi:namedview
+ id="base"
+ bordercolor="#666666"
+ inkscape:window-x="331"
+ inkscape:window-y="105"
+ pagecolor="#ffffff"
+ inkscape:grid-bbox="true"
+ inkscape:zoom="1"
+ inkscape:pageshadow="2"
+ showgrid="false"
+ borderopacity="1.0"
+ inkscape:current-layer="layer1"
+ inkscape:cx="28.384904"
+ inkscape:cy="18.816166"
+ inkscape:window-width="872"
+ inkscape:pageopacity="0.0"
+ inkscape:window-height="743"
+ inkscape:document-units="px"
+ />
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ >
+ <g
+ id="g6707"
+ transform="matrix(0.0227 0 0 .022979 44.989 37.784)"
+ >
+ <rect
+ id="rect6709"
+ style="opacity:.40206;color:black;fill:url(#linearGradient6715)"
+ height="478.36"
+ width="1339.6"
+ y="-150.7"
+ x="-1559.3"
+ />
+ <path
+ id="path6711"
+ sodipodi:nodetypes="cccc"
+ style="opacity:.40206;color:black;fill:url(#radialGradient6717)"
+ d="m-219.62-150.68v478.33c142.88 0.9 345.4-107.17 345.4-239.2 0-132.02-159.44-239.13-345.4-239.13z"
+ />
+ <path
+ id="path6713"
+ sodipodi:nodetypes="cccc"
+ style="opacity:.40206;color:black;fill:url(#radialGradient6719)"
+ d="m-1559.3-150.68v478.33c-142.8 0.9-345.4-107.17-345.4-239.2 0-132.02 159.5-239.13 345.4-239.13z"
+ />
+ </g
+ >
+ <path
+ id="path12723"
+ sodipodi:nodetypes="ccczzzz"
+ style="stroke-linejoin:round;fill-rule:evenodd;stroke:url(#linearGradient27488);stroke-width:.85660;fill:url(#linearGradient27486)"
+ d="m6.3334 16.972v24.51h36.973l-0.062-24.392c-0.003-1.378-11.848-14.678-14.033-14.678l-8.552 0.0001c-2.297 0-14.326 13.262-14.326 14.56z"
+ />
+ <path
+ id="path18153"
+ sodipodi:nodetypes="czzzccz"
+ style="fill-rule:evenodd;fill:url(#linearGradient27483)"
+ d="m6.9231 16.787c-0.3981-0.43 11.887-13.694 13.744-13.694l8.376 0.0005c1.747 0 14.037 13.128 13.427 13.886l-10.861 13.495-12.314-0.318-12.372-13.37z"
+ />
+ <path
+ id="path2164"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m19.078 30.018l-7.333-8.746 24.818-6.936 3.029 6.216-7.416 9.44"
+ />
+ <path
+ id="path2162"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m18.292 29.836l-7.483-8.81 24.648-6.893 3.174 6.271-7.241 9.407"
+ />
+ <path
+ id="path2160"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m18.775 29.957l-7.675-8.66 24.968-7.065 3.286 6.593-7.48 9.107"
+ />
+ <path
+ id="path15105"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:url(#linearGradient27477)"
+ d="m18.594 30.441l-7.333-8.746 24.712-6.894 3.11 6.388-7.12 8.986"
+ />
+ <path
+ id="path14245"
+ sodipodi:nodetypes="ccccccc"
+ style="fill:url(#linearGradient27471);fill-rule:evenodd"
+ d="m20.488 29.064l-13.396 10.972 13.909-9.604h9.018l12.42 9.482-11.864-10.85h-10.087z"
+ />
+ <path
+ id="path14339"
+ sodipodi:nodetypes="cccc"
+ style="fill-rule:evenodd;color:#000000;fill:url(#linearGradient27471)"
+ d="m6.9635 16.885l11.516 14.316 1.068-0.854-12.584-13.462z"
+ />
+ <path
+ id="path15103"
+ sodipodi:nodetypes="ccczzzz"
+ style="stroke:url(#linearGradient27468);stroke-width:.85660;fill:none"
+ d="m7.3077 17.131l0.0312 23.211h34.945l-0.063-23.084c-0.002-0.75-11.216-13.799-13.384-13.799l-7.895 0.0002c-2.253 0-13.635 12.892-13.634 13.672z"
+ />
+ <path
+ id="path17393"
+ sodipodi:nodetypes="cccccc"
+ style="fill-rule:evenodd;fill:#ffffff"
+ d="m20.957 30.453l-11.941 8.271 2.219 0.006 9.998-6.869 8.822-1.423-9.098 0.015z"
+ />
+ <path
+ id="path2174"
+ sodipodi:nodetypes="ccccccc"
+ style="fill-rule:evenodd;fill:#ffffff"
+ d="m11.428 21.67l1.324 1.411 22.791-6.884 2.915 5.682 0.614-0.712-3.069-6.378-24.575 6.881z"
+ />
+ <path
+ id="path2272"
+ sodipodi:nodetypes="ccccccc"
+ style="fill-rule:evenodd;fill:url(#linearGradient27463)"
+ d="m13.308 23.636l6.026 6.454 1.197-1.026 10.087 0.043 0.812 0.727 3.975-4.744c-1.154-1.411-22.097-1.454-22.097-1.454z"
+ />
+ <path
+ id="path27492"
+ sodipodi:nodetypes="cccc"
+ style="fill-rule:evenodd;color:#000000;fill:#b1b1b1"
+ d="m41.813 17.848l-9.952 12.631-1.068-0.855 11.02-11.776z"
+ />
+ </g
+ >
+ <metadata
+ >
+ <rdf:RDF
+ >
+ <cc:Work
+ >
+ <dc:format
+ >image/svg+xml</dc:format
+ >
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+ />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+ />
+ <dc:publisher
+ >
+ <cc:Agent
+ rdf:about="http://openclipart.org/"
+ >
+ <dc:title
+ >Openclipart</dc:title
+ >
+ </cc:Agent
+ >
+ </dc:publisher
+ >
+ <dc:title
+ >tango internet mail</dc:title
+ >
+ <dc:date
+ >2010-03-29T08:04:16</dc:date
+ >
+ <dc:description
+ >"E-mail" icon from &lt;a href="http://tango.freedesktop.org/Tango_Desktop_Project"&gt; Tango Project &lt;/a&gt; &#13;\n&lt;br&gt;&lt;br&gt;&#13;\nSince version 0.8.90 Tango Project icons are Public Domain: &lt;a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"&gt; Tango Project FAQ &lt;/a&gt;</dc:description
+ >
+ <dc:source
+ >https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka</dc:source
+ >
+ <dc:creator
+ >
+ <cc:Agent
+ >
+ <dc:title
+ >warszawianka</dc:title
+ >
+ </cc:Agent
+ >
+ </dc:creator
+ >
+ <dc:subject
+ >
+ <rdf:Bag
+ >
+ <rdf:li
+ >email</rdf:li
+ >
+ <rdf:li
+ >envelope</rdf:li
+ >
+ <rdf:li
+ >externalsource</rdf:li
+ >
+ <rdf:li
+ >icon</rdf:li
+ >
+ <rdf:li
+ >letter</rdf:li
+ >
+ <rdf:li
+ >tango</rdf:li
+ >
+ </rdf:Bag
+ >
+ </dc:subject
+ >
+ </cc:Work
+ >
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/"
+ >
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"
+ />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"
+ />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+ />
+ </cc:License
+ >
+ </rdf:RDF
+ >
+ </metadata
+ >
+</svg
+>
diff --git a/graphics/src/kdm_email.svg b/graphics/src/kdm_email.svg
index c09d94e81..a0dbc9015 100644
--- a/graphics/src/kdm_email.svg
+++ b/graphics/src/kdm_email.svg
@@ -1,474 +1,383 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:ns1="http://sozi.baierouge.fr"
- id="svg5816"
- viewBox="0 0 48 48"
- sodipodi:version="0.32"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:version="0.46"
- sodipodi:docname="internet-mail.svg"
- sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
- >
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ 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"
+ id="svg5816"
+ viewBox="0 0 48 48"
+ sodipodi:version="0.32"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="kdm_email.svg"
+ version="1.1">
<defs
- id="defs3"
- >
+ id="defs3">
<radialGradient
- id="radialGradient6719"
- xlink:href="#linearGradient5060"
- gradientUnits="userSpaceOnUse"
- cy="486.65"
- cx="605.71"
- gradientTransform="matrix(-2.7744 0 0 1.9697 112.76 -872.89)"
- r="117.14"
- inkscape:collect="always"
- />
+ id="radialGradient6719"
+ xlink:href="#linearGradient5060"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(-2.7744 0 0 1.9697 112.76 -872.89)"
+ r="117.14"
+ inkscape:collect="always" />
<linearGradient
- id="linearGradient5060"
- inkscape:collect="always"
- >
+ id="linearGradient5060"
+ inkscape:collect="always">
<stop
- id="stop5062"
- style="stop-color:black"
- offset="0"
- />
+ id="stop5062"
+ style="stop-color:black"
+ offset="0" />
<stop
- id="stop5064"
- style="stop-color:black;stop-opacity:0"
- offset="1"
- />
- </linearGradient
- >
+ id="stop5064"
+ style="stop-color:black;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
<radialGradient
- id="radialGradient6717"
- xlink:href="#linearGradient5060"
- gradientUnits="userSpaceOnUse"
- cy="486.65"
- cx="605.71"
- gradientTransform="matrix(2.7744 0 0 1.9697 -1891.6 -872.89)"
- r="117.14"
- inkscape:collect="always"
- />
+ id="radialGradient6717"
+ xlink:href="#linearGradient5060"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(2.7744 0 0 1.9697 -1891.6 -872.89)"
+ r="117.14"
+ inkscape:collect="always" />
<linearGradient
- id="linearGradient6715"
- y2="609.51"
- gradientUnits="userSpaceOnUse"
- x2="302.86"
- gradientTransform="matrix(2.7744 0 0 1.9697 -1892.2 -872.89)"
- y1="366.65"
- x1="302.86"
- inkscape:collect="always"
- >
+ id="linearGradient6715"
+ y2="609.51"
+ gradientUnits="userSpaceOnUse"
+ x2="302.86"
+ gradientTransform="matrix(2.7744 0 0 1.9697 -1892.2 -872.89)"
+ y1="366.65"
+ x1="302.86"
+ inkscape:collect="always">
<stop
- id="stop5050"
- style="stop-color:black;stop-opacity:0"
- offset="0"
- />
+ id="stop5050"
+ style="stop-color:black;stop-opacity:0"
+ offset="0" />
<stop
- id="stop5056"
- style="stop-color:black"
- offset=".5"
- />
+ id="stop5056"
+ style="stop-color:black"
+ offset=".5" />
<stop
- id="stop5052"
- style="stop-color:black;stop-opacity:0"
- offset="1"
- />
- </linearGradient
- >
+ id="stop5052"
+ style="stop-color:black;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient2152"
- >
+ id="linearGradient2152">
<stop
- id="stop2154"
- style="stop-color:#9aa29a"
- offset="0"
- />
+ id="stop2154"
+ style="stop-color:#9aa29a"
+ offset="0" />
<stop
- id="stop2156"
- style="stop-color:#b5beb5"
- offset="1"
- />
- </linearGradient
- >
+ id="stop2156"
+ style="stop-color:#b5beb5"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27463"
- y2="32.203"
- gradientUnits="userSpaceOnUse"
- y1="37.785"
- gradientTransform="matrix(2.3949 0 0 .78106 2.8795 0.343)"
- x2="9.7619"
- x1="8.7804"
- inkscape:collect="always"
- >
+ id="linearGradient27463"
+ y2="32.203"
+ gradientUnits="userSpaceOnUse"
+ y1="37.785"
+ gradientTransform="matrix(2.3949 0 0 .78106 2.8795 0.343)"
+ x2="9.7619"
+ x1="8.7804"
+ inkscape:collect="always">
<stop
- id="stop2276"
- style="stop-color:#000000;stop-opacity:.12871"
- offset="0"
- />
+ id="stop2276"
+ style="stop-color:#000000;stop-opacity:.12871"
+ offset="0" />
<stop
- id="stop2278"
- style="stop-color:#000000;stop-opacity:0"
- offset="1"
- />
- </linearGradient
- >
+ id="stop2278"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27468"
- y2="24.133"
- gradientUnits="userSpaceOnUse"
- y1="13.686"
- gradientTransform="matrix(1.3709 0 0 1.4438 2.4311 -.14079)"
- x2="21.112"
- x1="11.233"
- inkscape:collect="always"
- >
+ id="linearGradient27468"
+ y2="24.133"
+ gradientUnits="userSpaceOnUse"
+ y1="13.686"
+ gradientTransform="matrix(1.3709 0 0 1.4438 2.4311 -.14079)"
+ x2="21.112"
+ x1="11.233"
+ inkscape:collect="always">
<stop
- id="stop9751"
- style="stop-color:#ffffff"
- offset="0"
- />
+ id="stop9751"
+ style="stop-color:#ffffff"
+ offset="0" />
<stop
- id="stop9753"
- style="stop-color:#ededed"
- offset="1"
- />
- </linearGradient
- >
+ id="stop9753"
+ style="stop-color:#ededed"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27471"
- y2="52.091"
- xlink:href="#linearGradient2152"
- gradientUnits="userSpaceOnUse"
- y1="37.197"
- gradientTransform="matrix(2.4548 0 0 0.762 2.8795 0.343)"
- x2="9.8855"
- x1="8.9156"
- inkscape:collect="always"
- />
+ id="linearGradient27471"
+ y2="52.091"
+ xlink:href="#linearGradient2152"
+ gradientUnits="userSpaceOnUse"
+ y1="37.197"
+ gradientTransform="matrix(2.4548 0 0 0.762 2.8795 0.343)"
+ x2="9.8855"
+ x1="8.9156"
+ inkscape:collect="always" />
<linearGradient
- id="linearGradient27477"
- y2="29.569"
- gradientUnits="userSpaceOnUse"
- y1="15.148"
- gradientTransform="matrix(1.8193 0 0 1.0282 2.8795 0.343)"
- x2="15.311"
- x1="10.184"
- inkscape:collect="always"
- >
+ id="linearGradient27477"
+ y2="29.569"
+ gradientUnits="userSpaceOnUse"
+ y1="15.148"
+ gradientTransform="matrix(1.8193 0 0 1.0282 2.8795 0.343)"
+ x2="15.311"
+ x1="10.184"
+ inkscape:collect="always">
<stop
- id="stop2168"
- style="stop-color:#ffffff"
- offset="0"
- />
+ id="stop2168"
+ style="stop-color:#ffffff"
+ offset="0" />
<stop
- id="stop2170"
- style="stop-color:#dcdcdc"
- offset="1"
- />
- </linearGradient
- >
+ id="stop2170"
+ style="stop-color:#dcdcdc"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27483"
- y2="17.877"
- gradientUnits="userSpaceOnUse"
- y1="7.2311"
- gradientTransform="matrix(1.5706 0 0 1.191 2.8795 0.343)"
- x2="13.467"
- x1="5.8266"
- inkscape:collect="always"
- >
+ id="linearGradient27483"
+ y2="17.877"
+ gradientUnits="userSpaceOnUse"
+ y1="7.2311"
+ gradientTransform="matrix(1.5706 0 0 1.191 2.8795 0.343)"
+ x2="13.467"
+ x1="5.8266"
+ inkscape:collect="always">
<stop
- id="stop18915"
- style="stop-color:#ededed"
- offset="0"
- />
+ id="stop18915"
+ style="stop-color:#ededed"
+ offset="0" />
<stop
- id="stop18917"
- style="stop-color:#c8c8c8"
- offset="1"
- />
- </linearGradient
- >
+ id="stop18917"
+ style="stop-color:#c8c8c8"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27486"
- y2="26.023"
- gradientUnits="userSpaceOnUse"
- y1="4.7462"
- gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
- x2="18.475"
- x1="11.573"
- inkscape:collect="always"
- >
+ id="linearGradient27486"
+ y2="26.023"
+ gradientUnits="userSpaceOnUse"
+ y1="4.7462"
+ gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
+ x2="18.475"
+ x1="11.573"
+ inkscape:collect="always">
<stop
- id="stop15109"
- style="stop-color:#ffffff"
- offset="0"
- />
+ id="stop15109"
+ style="stop-color:#ffffff"
+ offset="0" />
<stop
- id="stop15111"
- style="stop-color:#e2e2e2"
- offset="1"
- />
- </linearGradient
- >
+ id="stop15111"
+ style="stop-color:#e2e2e2"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient27488"
- y2="15.257"
- gradientUnits="userSpaceOnUse"
- y1="15.257"
- gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
- x2="30.6"
- x1="2.0619"
- inkscape:collect="always"
- >
+ id="linearGradient27488"
+ y2="15.257"
+ gradientUnits="userSpaceOnUse"
+ y1="15.257"
+ gradientTransform="matrix(1.3435 0 0 1.4179 2.8795 .31460)"
+ x2="30.6"
+ x1="2.0619"
+ inkscape:collect="always">
<stop
- id="stop2138"
- style="stop-color:#989690"
- offset="0"
- />
+ id="stop2138"
+ style="stop-color:#989690"
+ offset="0" />
<stop
- id="stop2140"
- style="stop-color:#656460"
- offset="1"
- />
- </linearGradient
- >
- </defs
- >
+ id="stop2140"
+ style="stop-color:#656460"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3601"
+ y2="613.94"
+ gradientUnits="userSpaceOnUse"
+ x2="385.04001"
+ gradientTransform="matrix(0.04860254,-0.04951283,0.04860254,0.04951283,-9.7664634,27.282)"
+ y1="63.870998"
+ x1="386.39001">
+ <stop
+ id="stop3797"
+ stop-color="#ffe800"
+ offset="0" />
+ <stop
+ id="stop3799"
+ stop-color="#dfb300"
+ offset="1" />
+ </linearGradient>
+ </defs>
<sodipodi:namedview
- id="base"
- bordercolor="#666666"
- inkscape:window-x="331"
- inkscape:window-y="105"
- pagecolor="#ffffff"
- inkscape:grid-bbox="true"
- inkscape:zoom="1"
- inkscape:pageshadow="2"
- showgrid="false"
- borderopacity="1.0"
- inkscape:current-layer="layer1"
- inkscape:cx="28.384904"
- inkscape:cy="18.816166"
- inkscape:window-width="872"
- inkscape:pageopacity="0.0"
- inkscape:window-height="743"
- inkscape:document-units="px"
- />
+ id="base"
+ bordercolor="#666666"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ pagecolor="#ffffff"
+ inkscape:grid-bbox="true"
+ inkscape:zoom="5.6568542"
+ inkscape:pageshadow="2"
+ showgrid="false"
+ borderopacity="1.0"
+ inkscape:current-layer="layer1"
+ inkscape:cx="14.465598"
+ inkscape:cy="3.1824916"
+ inkscape:window-width="1366"
+ inkscape:pageopacity="0.0"
+ inkscape:window-height="704"
+ inkscape:document-units="px"
+ inkscape:snap-global="false"
+ inkscape:window-maximized="1" />
<g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- >
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
<g
- id="g6707"
- transform="matrix(0.0227 0 0 .022979 44.989 37.784)"
- >
+ id="g6707"
+ transform="matrix(0.0227 0 0 .022979 44.989 37.784)">
<rect
- id="rect6709"
- style="opacity:.40206;color:black;fill:url(#linearGradient6715)"
- height="478.36"
- width="1339.6"
- y="-150.7"
- x="-1559.3"
- />
+ id="rect6709"
+ style="opacity:.40206;color:black;fill:url(#linearGradient6715)"
+ height="478.36"
+ width="1339.6"
+ y="-150.7"
+ x="-1559.3" />
<path
- id="path6711"
- sodipodi:nodetypes="cccc"
- style="opacity:.40206;color:black;fill:url(#radialGradient6717)"
- d="m-219.62-150.68v478.33c142.88 0.9 345.4-107.17 345.4-239.2 0-132.02-159.44-239.13-345.4-239.13z"
- />
+ id="path6711"
+ sodipodi:nodetypes="cccc"
+ style="opacity:.40206;color:black;fill:url(#radialGradient6717)"
+ d="m-219.62-150.68v478.33c142.88 0.9 345.4-107.17 345.4-239.2 0-132.02-159.44-239.13-345.4-239.13z" />
<path
- id="path6713"
- sodipodi:nodetypes="cccc"
- style="opacity:.40206;color:black;fill:url(#radialGradient6719)"
- d="m-1559.3-150.68v478.33c-142.8 0.9-345.4-107.17-345.4-239.2 0-132.02 159.5-239.13 345.4-239.13z"
- />
- </g
- >
+ id="path6713"
+ sodipodi:nodetypes="cccc"
+ style="opacity:.40206;color:black;fill:url(#radialGradient6719)"
+ d="m-1559.3-150.68v478.33c-142.8 0.9-345.4-107.17-345.4-239.2 0-132.02 159.5-239.13 345.4-239.13z" />
+ </g>
<path
- id="path12723"
- sodipodi:nodetypes="ccczzzz"
- style="stroke-linejoin:round;fill-rule:evenodd;stroke:url(#linearGradient27488);stroke-width:.85660;fill:url(#linearGradient27486)"
- d="m6.3334 16.972v24.51h36.973l-0.062-24.392c-0.003-1.378-11.848-14.678-14.033-14.678l-8.552 0.0001c-2.297 0-14.326 13.262-14.326 14.56z"
- />
+ id="path12723"
+ sodipodi:nodetypes="ccczzzz"
+ style="stroke-linejoin:round;fill-rule:evenodd;stroke:url(#linearGradient27488);stroke-width:.85660;fill:url(#linearGradient27486)"
+ d="m6.3334 16.972v24.51h36.973l-0.062-24.392c-0.003-1.378-11.848-14.678-14.033-14.678l-8.552 0.0001c-2.297 0-14.326 13.262-14.326 14.56z" />
<path
- id="path18153"
- sodipodi:nodetypes="czzzccz"
- style="fill-rule:evenodd;fill:url(#linearGradient27483)"
- d="m6.9231 16.787c-0.3981-0.43 11.887-13.694 13.744-13.694l8.376 0.0005c1.747 0 14.037 13.128 13.427 13.886l-10.861 13.495-12.314-0.318-12.372-13.37z"
- />
+ id="path18153"
+ sodipodi:nodetypes="czzzccz"
+ style="fill-rule:evenodd;fill:url(#linearGradient27483)"
+ d="m6.9231 16.787c-0.3981-0.43 11.887-13.694 13.744-13.694l8.376 0.0005c1.747 0 14.037 13.128 13.427 13.886l-10.861 13.495-12.314-0.318-12.372-13.37z" />
<path
- id="path2164"
- sodipodi:nodetypes="ccccc"
- style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
- d="m19.078 30.018l-7.333-8.746 24.818-6.936 3.029 6.216-7.416 9.44"
- />
+ id="path2164"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m19.078 30.018l-7.333-8.746 24.818-6.936 3.029 6.216-7.416 9.44" />
<path
- id="path2162"
- sodipodi:nodetypes="ccccc"
- style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
- d="m18.292 29.836l-7.483-8.81 24.648-6.893 3.174 6.271-7.241 9.407"
- />
+ id="path2162"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m18.292 29.836l-7.483-8.81 24.648-6.893 3.174 6.271-7.241 9.407" />
<path
- id="path2160"
- sodipodi:nodetypes="ccccc"
- style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
- d="m18.775 29.957l-7.675-8.66 24.968-7.065 3.286 6.593-7.48 9.107"
- />
+ id="path2160"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:#000000;fill-opacity:.14620"
+ d="m18.775 29.957l-7.675-8.66 24.968-7.065 3.286 6.593-7.48 9.107" />
<path
- id="path15105"
- sodipodi:nodetypes="ccccc"
- style="fill-rule:evenodd;fill:url(#linearGradient27477)"
- d="m18.594 30.441l-7.333-8.746 24.712-6.894 3.11 6.388-7.12 8.986"
- />
+ id="path15105"
+ sodipodi:nodetypes="ccccc"
+ style="fill-rule:evenodd;fill:url(#linearGradient27477)"
+ d="m18.594 30.441l-7.333-8.746 24.712-6.894 3.11 6.388-7.12 8.986" />
<path
- id="path14245"
- sodipodi:nodetypes="ccccccc"
- style="fill:url(#linearGradient27471);fill-rule:evenodd"
- d="m20.488 29.064l-13.396 10.972 13.909-9.604h9.018l12.42 9.482-11.864-10.85h-10.087z"
- />
+ id="path14245"
+ sodipodi:nodetypes="ccccccc"
+ style="fill:url(#linearGradient27471);fill-rule:evenodd"
+ d="m20.488 29.064l-13.396 10.972 13.909-9.604h9.018l12.42 9.482-11.864-10.85h-10.087z" />
<path
- id="path14339"
- sodipodi:nodetypes="cccc"
- style="fill-rule:evenodd;color:#000000;fill:url(#linearGradient27471)"
- d="m6.9635 16.885l11.516 14.316 1.068-0.854-12.584-13.462z"
- />
+ id="path14339"
+ sodipodi:nodetypes="cccc"
+ style="fill-rule:evenodd;color:#000000;fill:url(#linearGradient27471)"
+ d="m6.9635 16.885l11.516 14.316 1.068-0.854-12.584-13.462z" />
<path
- id="path15103"
- sodipodi:nodetypes="ccczzzz"
- style="stroke:url(#linearGradient27468);stroke-width:.85660;fill:none"
- d="m7.3077 17.131l0.0312 23.211h34.945l-0.063-23.084c-0.002-0.75-11.216-13.799-13.384-13.799l-7.895 0.0002c-2.253 0-13.635 12.892-13.634 13.672z"
- />
+ id="path15103"
+ sodipodi:nodetypes="ccczzzz"
+ style="stroke:url(#linearGradient27468);stroke-width:.85660;fill:none"
+ d="m7.3077 17.131l0.0312 23.211h34.945l-0.063-23.084c-0.002-0.75-11.216-13.799-13.384-13.799l-7.895 0.0002c-2.253 0-13.635 12.892-13.634 13.672z" />
<path
- id="path17393"
- sodipodi:nodetypes="cccccc"
- style="fill-rule:evenodd;fill:#ffffff"
- d="m20.957 30.453l-11.941 8.271 2.219 0.006 9.998-6.869 8.822-1.423-9.098 0.015z"
- />
+ id="path17393"
+ sodipodi:nodetypes="cccccc"
+ style="fill-rule:evenodd;fill:#ffffff"
+ d="m20.957 30.453l-11.941 8.271 2.219 0.006 9.998-6.869 8.822-1.423-9.098 0.015z" />
<path
- id="path2174"
- sodipodi:nodetypes="ccccccc"
- style="fill-rule:evenodd;fill:#ffffff"
- d="m11.428 21.67l1.324 1.411 22.791-6.884 2.915 5.682 0.614-0.712-3.069-6.378-24.575 6.881z"
- />
+ id="path2174"
+ sodipodi:nodetypes="ccccccc"
+ style="fill-rule:evenodd;fill:#ffffff"
+ d="m11.428 21.67l1.324 1.411 22.791-6.884 2.915 5.682 0.614-0.712-3.069-6.378-24.575 6.881z" />
<path
- id="path2272"
- sodipodi:nodetypes="ccccccc"
- style="fill-rule:evenodd;fill:url(#linearGradient27463)"
- d="m13.308 23.636l6.026 6.454 1.197-1.026 10.087 0.043 0.812 0.727 3.975-4.744c-1.154-1.411-22.097-1.454-22.097-1.454z"
- />
+ id="path2272"
+ sodipodi:nodetypes="ccccccc"
+ style="fill-rule:evenodd;fill:url(#linearGradient27463)"
+ d="m13.308 23.636l6.026 6.454 1.197-1.026 10.087 0.043 0.812 0.727 3.975-4.744c-1.154-1.411-22.097-1.454-22.097-1.454z" />
<path
- id="path27492"
- sodipodi:nodetypes="cccc"
- style="fill-rule:evenodd;color:#000000;fill:#b1b1b1"
- d="m41.813 17.848l-9.952 12.631-1.068-0.855 11.02-11.776z"
- />
- </g
- >
+ id="path27492"
+ sodipodi:nodetypes="cccc"
+ style="fill-rule:evenodd;color:#000000;fill:#b1b1b1"
+ d="m41.813 17.848l-9.952 12.631-1.068-0.855 11.02-11.776z" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:url(#linearGradient3601);stroke:#000000;stroke-width:0.83249676;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 14.522775,13.664241 c -3.206444,3.266498 -3.207821,8.570615 -0.002,11.836413 2.125254,2.165065 5.127557,2.893988 7.843929,2.18957 l 1.53277,1.560779 2.726675,0.340308 0.337512,2.781948 2.727367,0.34031 0.336116,2.779852 2.730116,0.34377 0.334053,2.77845 4.847815,-0.413811 0.389029,-0.03215 0.07354,-0.854958 0.3863,-4.465269 -1.516957,-1.545368 -1.514213,-1.542574 -1.515585,-1.543971 -1.514214,-1.541875 -1.515585,-1.543971 -1.515584,-1.54397 -1.515586,-1.543972 c 0.862614,-2.866675 0.182834,-6.109366 -2.04209,-8.375961 -3.205756,-3.265799 -8.407551,-3.269298 -11.613309,-0.0035 z m 1.664055,1.702918 c 1.471596,-1.499159 3.57898,-1.788344 4.704157,-0.642099 1.125178,1.146257 0.842679,3.294512 -0.628231,4.793666 -1.471598,1.499158 -3.57898,1.784851 -4.704158,0.638593 -1.125177,-1.146245 -0.843366,-3.2917 0.628232,-4.79016 z"
+ id="path6625" />
+ </g>
<metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
+ id="metadata53">
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
- <cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >tango internet mail</dc:title
- >
- <dc:date
- >2010-03-29T08:04:16</dc:date
- >
- <dc:description
- >"E-mail" icon from &lt;a href="http://tango.freedesktop.org/Tango_Desktop_Project"&gt; Tango Project &lt;/a&gt; &#13;\n&lt;br&gt;&lt;br&gt;&#13;\nSince version 0.8.90 Tango Project icons are Public Domain: &lt;a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"&gt; Tango Project FAQ &lt;/a&gt;</dc:description
- >
- <dc:source
- >https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka</dc:source
- >
- <dc:creator
- >
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:publisher>
<cc:Agent
- >
- <dc:title
- >warszawianka</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >email</rdf:li
- >
- <rdf:li
- >envelope</rdf:li
- >
- <rdf:li
- >externalsource</rdf:li
- >
- <rdf:li
- >icon</rdf:li
- >
- <rdf:li
- >letter</rdf:li
- >
- <rdf:li
- >tango</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>tango internet mail</dc:title>
+ <dc:date>2010-03-29T08:04:16</dc:date>
+ <dc:description>&quot;E-mail&quot; icon from &lt;a href=&quot;http://tango.freedesktop.org/Tango_Desktop_Project&quot;&gt; Tango Project &lt;/a&gt; \n&lt;br&gt;&lt;br&gt; \nSince version 0.8.90 Tango Project icons are Public Domain: &lt;a href=&quot;http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F&quot;&gt; Tango Project FAQ &lt;/a&gt;</dc:description>
+ <dc:source>https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>warszawianka</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>email</rdf:li>
+ <rdf:li>envelope</rdf:li>
+ <rdf:li>externalsource</rdf:li>
+ <rdf:li>icon</rdf:li>
+ <rdf:li>letter</rdf:li>
+ <rdf:li>tango</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
-</svg
->
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/graphics/update b/graphics/update
index 4f5cdc8f8..cd0995e05 100755
--- a/graphics/update
+++ b/graphics/update
@@ -55,7 +55,7 @@ else
# OS X preferences icons
# servers.png does not have an SVG version
mkdir -p osx/preferences
- for i in colour_conversions defaults kdm_email cover_sheet keys tms; do
+ for i in colour_conversions defaults email kdm_email cover_sheet keys tms; do
$INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32
done
diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png
index 387e38782..d114e46e4 100644
--- a/graphics/web/favicon-128x128.png
+++ b/graphics/web/favicon-128x128.png
Binary files differ
diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png
index 98e4be827..196cac469 100644
--- a/graphics/web/favicon-16x16.png
+++ b/graphics/web/favicon-16x16.png
Binary files differ
diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png
index 849b5f8c0..7a26e4a98 100644
--- a/graphics/web/favicon-256x256.png
+++ b/graphics/web/favicon-256x256.png
Binary files differ
diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png
index 01099c350..c123f9d6d 100644
--- a/graphics/web/favicon-32x32.png
+++ b/graphics/web/favicon-32x32.png
Binary files differ
diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png
index 77755ecaf..ee4ce4ea6 100644
--- a/graphics/web/favicon-64x64.png
+++ b/graphics/web/favicon-64x64.png
Binary files differ
diff --git a/graphics/web/logo.png b/graphics/web/logo.png
index 7cc15450f..97b8fdcd8 100644
--- a/graphics/web/logo.png
+++ b/graphics/web/logo.png
Binary files differ
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 46a9f1b4f..15e2c4c04 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -685,11 +685,10 @@ column (string s)
return s;
}
-class KDMEmailPage : public StandardPage
+class EmailPage : public StandardPage
{
public:
-
- KDMEmailPage (wxSize panel_size, int border)
+ EmailPage (wxSize panel_size, int border)
#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
: StandardPage (wxSize (480, 128), border)
@@ -700,13 +699,13 @@ public:
wxString GetName () const
{
- return _("KDM Email");
+ return _("Email");
}
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+ return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE);
}
#endif
@@ -720,142 +719,184 @@ private:
add_label_to_sizer (table, _panel, _("Outgoing mail server"), true);
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _mail_server = new wxTextCtrl (_panel, wxID_ANY);
- s->Add (_mail_server, 1, wxEXPAND | wxALL);
+ _server = new wxTextCtrl (_panel, wxID_ANY);
+ s->Add (_server, 1, wxEXPAND | wxALL);
add_label_to_sizer (s, _panel, _("port"), false);
- _mail_port = new wxSpinCtrl (_panel, wxID_ANY);
- _mail_port->SetRange (0, 65535);
- s->Add (_mail_port);
+ _port = new wxSpinCtrl (_panel, wxID_ANY);
+ _port->SetRange (0, 65535);
+ s->Add (_port);
table->Add (s, 1, wxEXPAND | wxALL);
}
add_label_to_sizer (table, _panel, _("Mail user name"), true);
- _mail_user = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_mail_user, 1, wxEXPAND | wxALL);
+ _user = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_user, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("Mail password"), true);
- _mail_password = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_mail_password, 1, wxEXPAND | wxALL);
+ _password = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_password, 1, wxEXPAND | wxALL);
+
+ _server->Bind (wxEVT_TEXT, boost::bind (&EmailPage::server_changed, this));
+ _port->Bind (wxEVT_SPINCTRL, boost::bind (&EmailPage::port_changed, this));
+ _user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this));
+ _password->Bind (wxEVT_TEXT, boost::bind (&EmailPage::password_changed, this));
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+
+ checked_set (_server, config->mail_server ());
+ checked_set (_port, config->mail_port ());
+ checked_set (_user, config->mail_user ());
+ checked_set (_password, config->mail_password ());
+ }
+
+ void server_changed ()
+ {
+ Config::instance()->set_mail_server (wx_to_std (_server->GetValue ()));
+ }
+
+ void port_changed ()
+ {
+ Config::instance()->set_mail_port (_port->GetValue ());
+ }
+
+ void user_changed ()
+ {
+ Config::instance()->set_mail_user (wx_to_std (_user->GetValue ()));
+ }
+
+ void password_changed ()
+ {
+ Config::instance()->set_mail_password (wx_to_std (_password->GetValue ()));
+ }
+
+ wxTextCtrl* _server;
+ wxSpinCtrl* _port;
+ wxTextCtrl* _user;
+ wxTextCtrl* _password;
+};
+
+class KDMEmailPage : public StandardPage
+{
+public:
+
+ KDMEmailPage (wxSize panel_size, int border)
+#ifdef DCPOMATIC_OSX
+ /* We have to force both width and height of this one */
+ : StandardPage (wxSize (480, 128), border)
+#else
+ : StandardPage (panel_size, border)
+#endif
+ {}
+
+ wxString GetName () const
+ {
+ return _("KDM Email");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
+private:
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
add_label_to_sizer (table, _panel, _("Subject"), true);
- _kdm_subject = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_subject, 1, wxEXPAND | wxALL);
+ _subject = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_subject, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("From address"), true);
- _kdm_from = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+ _from = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_from, 1, wxEXPAND | wxALL);
vector<string> columns;
columns.push_back (wx_to_std (_("Address")));
add_label_to_sizer (table, _panel, _("CC addresses"), true);
- _kdm_cc = new EditableList<string, EmailDialog> (
+ _cc = new EditableList<string, EmailDialog> (
_panel,
columns,
bind (&Config::kdm_cc, Config::instance()),
bind (&Config::set_kdm_cc, Config::instance(), _1),
bind (&column, _1)
);
- table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+ table->Add (_cc, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("BCC address"), true);
- _kdm_bcc = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
+ _bcc = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_bcc, 1, wxEXPAND | wxALL);
- _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
- _panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border);
+ _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+ _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
- _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
- _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
+ _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
+ _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
- _kdm_cc->layout ();
+ _cc->layout ();
- _mail_server->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_server_changed, this));
- _mail_port->Bind (wxEVT_SPINCTRL, boost::bind (&KDMEmailPage::mail_port_changed, this));
- _mail_user->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_user_changed, this));
- _mail_password->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_password_changed, this));
- _kdm_subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
- _kdm_from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
- _kdm_bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
- _kdm_email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
- _reset_kdm_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_kdm_email, this));
+ _subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
+ _from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+ _bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
+ _email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
+ _reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
}
void config_changed ()
{
Config* config = Config::instance ();
- checked_set (_mail_server, config->mail_server ());
- checked_set (_mail_port, config->mail_port ());
- checked_set (_mail_user, config->mail_user ());
- checked_set (_mail_password, config->mail_password ());
- checked_set (_kdm_subject, config->kdm_subject ());
- checked_set (_kdm_from, config->kdm_from ());
- checked_set (_kdm_bcc, config->kdm_bcc ());
- checked_set (_kdm_email, Config::instance()->kdm_email ());
- }
-
- void mail_server_changed ()
- {
- Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
- }
-
- void mail_port_changed ()
- {
- Config::instance()->set_mail_port (_mail_port->GetValue ());
- }
-
- void mail_user_changed ()
- {
- Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
- }
-
- void mail_password_changed ()
- {
- Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+ checked_set (_subject, config->kdm_subject ());
+ checked_set (_from, config->kdm_from ());
+ checked_set (_bcc, config->kdm_bcc ());
+ checked_set (_email, Config::instance()->kdm_email ());
}
void kdm_subject_changed ()
{
- Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ()));
+ Config::instance()->set_kdm_subject (wx_to_std (_subject->GetValue ()));
}
void kdm_from_changed ()
{
- Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
+ Config::instance()->set_kdm_from (wx_to_std (_from->GetValue ()));
}
void kdm_bcc_changed ()
{
- Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
+ Config::instance()->set_kdm_bcc (wx_to_std (_bcc->GetValue ()));
}
void kdm_email_changed ()
{
- if (_kdm_email->GetValue().IsEmpty ()) {
+ if (_email->GetValue().IsEmpty ()) {
/* Sometimes we get sent an erroneous notification that the email
is empty; I don't know why.
*/
return;
}
- Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+ Config::instance()->set_kdm_email (wx_to_std (_email->GetValue ()));
}
- void reset_kdm_email ()
+ void reset_email ()
{
Config::instance()->reset_kdm_email ();
- checked_set (_kdm_email, Config::instance()->kdm_email ());
- }
-
- wxTextCtrl* _mail_server;
- wxSpinCtrl* _mail_port;
- wxTextCtrl* _mail_user;
- wxTextCtrl* _mail_password;
- wxTextCtrl* _kdm_subject;
- wxTextCtrl* _kdm_from;
- EditableList<string, EmailDialog>* _kdm_cc;
- wxTextCtrl* _kdm_bcc;
- wxTextCtrl* _kdm_email;
- wxButton* _reset_kdm_email;
+ checked_set (_email, Config::instance()->kdm_email ());
+ }
+
+ wxTextCtrl* _subject;
+ wxTextCtrl* _from;
+ EditableList<string, EmailDialog>* _cc;
+ wxTextCtrl* _bcc;
+ wxTextCtrl* _email;
+ wxButton* _reset_email;
};
class CoverSheetPage : public StandardPage
@@ -1186,6 +1227,7 @@ create_full_config_dialog ()
e->AddPage (new EncodingServersPage (ps, border));
e->AddPage (new KeysPage (ps, border));
e->AddPage (new TMSPage (ps, border));
+ e->AddPage (new EmailPage (ps, border));
e->AddPage (new KDMEmailPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
e->AddPage (new AdvancedPage (ps, border));