From aae000e8a37a494bf20ba0e5dd219ad9f78c6286 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 May 2018 21:37:51 +0100 Subject: Move email server preferences into a separate tab. --- graphics/linux/128/dcpomatic2.png | Bin 24154 -> 24162 bytes graphics/linux/128/dcpomatic2_batch.png | Bin 22632 -> 22631 bytes graphics/linux/128/dcpomatic2_kdm.png | Bin 22264 -> 22271 bytes graphics/linux/128/dcpomatic2_player.png | Bin 21707 -> 21707 bytes graphics/linux/128/dcpomatic2_server.png | Bin 21329 -> 21329 bytes graphics/linux/16/dcpomatic2.png | Bin 1946 -> 1947 bytes graphics/linux/16/dcpomatic2_batch.png | Bin 892 -> 891 bytes graphics/linux/16/dcpomatic2_kdm.png | Bin 875 -> 875 bytes graphics/linux/16/dcpomatic2_player.png | Bin 888 -> 888 bytes graphics/linux/16/dcpomatic2_server.png | Bin 890 -> 890 bytes graphics/linux/22/dcpomatic2.png | Bin 2366 -> 2374 bytes graphics/linux/22/dcpomatic2_batch.png | Bin 1419 -> 1419 bytes graphics/linux/22/dcpomatic2_kdm.png | Bin 1408 -> 1408 bytes graphics/linux/22/dcpomatic2_player.png | Bin 1441 -> 1441 bytes graphics/linux/22/dcpomatic2_server.png | Bin 1434 -> 1434 bytes graphics/linux/256/dcpomatic2.png | Bin 70188 -> 70196 bytes graphics/linux/256/dcpomatic2_batch.png | Bin 68119 -> 68119 bytes graphics/linux/256/dcpomatic2_kdm.png | Bin 68203 -> 68203 bytes graphics/linux/256/dcpomatic2_player.png | Bin 65652 -> 65652 bytes graphics/linux/256/dcpomatic2_server.png | Bin 64042 -> 64042 bytes graphics/linux/32/dcpomatic2.png | Bin 3704 -> 3712 bytes graphics/linux/32/dcpomatic2_batch.png | Bin 2586 -> 2585 bytes graphics/linux/32/dcpomatic2_kdm.png | Bin 2524 -> 2524 bytes graphics/linux/32/dcpomatic2_player.png | Bin 2603 -> 2603 bytes graphics/linux/32/dcpomatic2_server.png | Bin 2583 -> 2583 bytes graphics/linux/48/dcpomatic2.png | Bin 6369 -> 6377 bytes graphics/linux/48/dcpomatic2_batch.png | Bin 5114 -> 5114 bytes graphics/linux/48/dcpomatic2_kdm.png | Bin 4935 -> 4935 bytes graphics/linux/48/dcpomatic2_player.png | Bin 4973 -> 4973 bytes graphics/linux/48/dcpomatic2_server.png | Bin 4892 -> 4892 bytes graphics/linux/512/dcpomatic2.png | Bin 232409 -> 232417 bytes graphics/linux/512/dcpomatic2_batch.png | Bin 229156 -> 229165 bytes graphics/linux/512/dcpomatic2_kdm.png | Bin 228553 -> 228558 bytes graphics/linux/512/dcpomatic2_player.png | Bin 222270 -> 222270 bytes graphics/linux/512/dcpomatic2_server.png | Bin 214924 -> 214924 bytes graphics/linux/64/dcpomatic2.png | Bin 9349 -> 9357 bytes graphics/linux/64/dcpomatic2_batch.png | Bin 8057 -> 8057 bytes graphics/linux/64/dcpomatic2_kdm.png | Bin 7838 -> 7837 bytes graphics/linux/64/dcpomatic2_player.png | Bin 7760 -> 7760 bytes graphics/linux/64/dcpomatic2_server.png | Bin 7623 -> 7623 bytes graphics/osx/dcpomatic2.iconset/icon_128x128.png | Bin 24154 -> 24162 bytes .../osx/dcpomatic2.iconset/icon_128x128@2x.png | Bin 24154 -> 24162 bytes graphics/osx/dcpomatic2.iconset/icon_16x16.png | Bin 1946 -> 1947 bytes graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png | Bin 1946 -> 1947 bytes graphics/osx/dcpomatic2.iconset/icon_256x256.png | Bin 70188 -> 70196 bytes .../osx/dcpomatic2.iconset/icon_256x256@2x.png | Bin 70188 -> 70196 bytes graphics/osx/dcpomatic2.iconset/icon_32x32.png | Bin 3704 -> 3712 bytes graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png | Bin 3704 -> 3712 bytes graphics/osx/dcpomatic2.iconset/icon_512x512.png | Bin 232409 -> 232417 bytes .../osx/dcpomatic2.iconset/icon_512x512@2x.png | Bin 232409 -> 232417 bytes .../osx/dcpomatic2_batch.iconset/icon_128x128.png | Bin 22632 -> 22631 bytes .../dcpomatic2_batch.iconset/icon_128x128@2x.png | Bin 22632 -> 22631 bytes .../osx/dcpomatic2_batch.iconset/icon_16x16.png | Bin 892 -> 891 bytes .../osx/dcpomatic2_batch.iconset/icon_16x16@2x.png | Bin 892 -> 891 bytes .../osx/dcpomatic2_batch.iconset/icon_256x256.png | Bin 68119 -> 68119 bytes .../dcpomatic2_batch.iconset/icon_256x256@2x.png | Bin 68119 -> 68119 bytes .../osx/dcpomatic2_batch.iconset/icon_32x32.png | Bin 2586 -> 2585 bytes .../osx/dcpomatic2_batch.iconset/icon_32x32@2x.png | Bin 2586 -> 2585 bytes .../osx/dcpomatic2_batch.iconset/icon_512x512.png | Bin 229156 -> 229165 bytes .../dcpomatic2_batch.iconset/icon_512x512@2x.png | Bin 229156 -> 229165 bytes .../osx/dcpomatic2_kdm.iconset/icon_128x128.png | Bin 22264 -> 22271 bytes .../osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png | Bin 22264 -> 22271 bytes graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png | Bin 875 -> 875 bytes .../osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png | Bin 875 -> 875 bytes .../osx/dcpomatic2_kdm.iconset/icon_256x256.png | Bin 68203 -> 68203 bytes .../osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png | Bin 68203 -> 68203 bytes graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png | Bin 2524 -> 2524 bytes .../osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png | Bin 2524 -> 2524 bytes .../osx/dcpomatic2_kdm.iconset/icon_512x512.png | Bin 228553 -> 228558 bytes .../osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png | Bin 228553 -> 228558 bytes .../osx/dcpomatic2_player.iconset/icon_128x128.png | Bin 21707 -> 21707 bytes .../dcpomatic2_player.iconset/icon_128x128@2x.png | Bin 21707 -> 21707 bytes .../osx/dcpomatic2_player.iconset/icon_16x16.png | Bin 888 -> 888 bytes .../dcpomatic2_player.iconset/icon_16x16@2x.png | Bin 888 -> 888 bytes .../osx/dcpomatic2_player.iconset/icon_256x256.png | Bin 65652 -> 65652 bytes .../dcpomatic2_player.iconset/icon_256x256@2x.png | Bin 65652 -> 65652 bytes .../osx/dcpomatic2_player.iconset/icon_32x32.png | Bin 2603 -> 2603 bytes .../dcpomatic2_player.iconset/icon_32x32@2x.png | Bin 2603 -> 2603 bytes .../osx/dcpomatic2_player.iconset/icon_512x512.png | Bin 222270 -> 222270 bytes .../dcpomatic2_player.iconset/icon_512x512@2x.png | Bin 222270 -> 222270 bytes .../osx/dcpomatic2_server.iconset/icon_128x128.png | Bin 21329 -> 21329 bytes .../dcpomatic2_server.iconset/icon_128x128@2x.png | Bin 21329 -> 21329 bytes .../osx/dcpomatic2_server.iconset/icon_16x16.png | Bin 890 -> 890 bytes .../dcpomatic2_server.iconset/icon_16x16@2x.png | Bin 890 -> 890 bytes .../osx/dcpomatic2_server.iconset/icon_256x256.png | Bin 64042 -> 64042 bytes .../dcpomatic2_server.iconset/icon_256x256@2x.png | Bin 64042 -> 64042 bytes .../osx/dcpomatic2_server.iconset/icon_32x32.png | Bin 2583 -> 2583 bytes .../dcpomatic2_server.iconset/icon_32x32@2x.png | Bin 2583 -> 2583 bytes .../osx/dcpomatic2_server.iconset/icon_512x512.png | Bin 214924 -> 214924 bytes .../dcpomatic2_server.iconset/icon_512x512@2x.png | Bin 214924 -> 214924 bytes graphics/osx/preferences/colour_conversions.png | Bin 278 -> 278 bytes graphics/osx/preferences/cover_sheet.png | Bin 1184 -> 1184 bytes graphics/osx/preferences/defaults.png | Bin 535 -> 535 bytes graphics/osx/preferences/email.png | Bin 0 -> 2158 bytes graphics/osx/preferences/kdm_email.png | Bin 2158 -> 2502 bytes graphics/osx/preferences/keys.png | Bin 1797 -> 1797 bytes graphics/osx/preferences/tms.png | Bin 1616 -> 1616 bytes graphics/splash.png | Bin 39075 -> 39249 bytes graphics/src/email.svg | 474 +++++++++++++ graphics/src/kdm_email.svg | 733 +++++++++------------ graphics/update | 2 +- graphics/web/favicon-128x128.png | Bin 25046 -> 25054 bytes graphics/web/favicon-16x16.png | Bin 1976 -> 1977 bytes graphics/web/favicon-256x256.png | Bin 70281 -> 70289 bytes graphics/web/favicon-32x32.png | Bin 3747 -> 3755 bytes graphics/web/favicon-64x64.png | Bin 9587 -> 9595 bytes graphics/web/logo.png | Bin 22492 -> 22500 bytes src/wx/full_config_dialog.cc | 208 +++--- 108 files changed, 921 insertions(+), 496 deletions(-) create mode 100644 graphics/osx/preferences/email.png create mode 100644 graphics/src/email.svg diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png index 273e67de5..002c8a43a 100644 Binary files a/graphics/linux/128/dcpomatic2.png and b/graphics/linux/128/dcpomatic2.png differ diff --git a/graphics/linux/128/dcpomatic2_batch.png b/graphics/linux/128/dcpomatic2_batch.png index 6d4994493..8b084a07e 100644 Binary files a/graphics/linux/128/dcpomatic2_batch.png and b/graphics/linux/128/dcpomatic2_batch.png differ diff --git a/graphics/linux/128/dcpomatic2_kdm.png b/graphics/linux/128/dcpomatic2_kdm.png index 31c1333d6..b2b8518e8 100644 Binary files a/graphics/linux/128/dcpomatic2_kdm.png and b/graphics/linux/128/dcpomatic2_kdm.png differ diff --git a/graphics/linux/128/dcpomatic2_player.png b/graphics/linux/128/dcpomatic2_player.png index 06f2b86ab..427699852 100644 Binary files a/graphics/linux/128/dcpomatic2_player.png and b/graphics/linux/128/dcpomatic2_player.png differ diff --git a/graphics/linux/128/dcpomatic2_server.png b/graphics/linux/128/dcpomatic2_server.png index c6b118c11..fae26a5ad 100644 Binary files a/graphics/linux/128/dcpomatic2_server.png and b/graphics/linux/128/dcpomatic2_server.png differ diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png index d56bcb15a..eb295c31d 100644 Binary files a/graphics/linux/16/dcpomatic2.png and b/graphics/linux/16/dcpomatic2.png differ diff --git a/graphics/linux/16/dcpomatic2_batch.png b/graphics/linux/16/dcpomatic2_batch.png index a4cfd0d92..f6744e45b 100644 Binary files a/graphics/linux/16/dcpomatic2_batch.png and b/graphics/linux/16/dcpomatic2_batch.png differ diff --git a/graphics/linux/16/dcpomatic2_kdm.png b/graphics/linux/16/dcpomatic2_kdm.png index bbff2ed74..f0cecb6bd 100644 Binary files a/graphics/linux/16/dcpomatic2_kdm.png and b/graphics/linux/16/dcpomatic2_kdm.png differ diff --git a/graphics/linux/16/dcpomatic2_player.png b/graphics/linux/16/dcpomatic2_player.png index b86c6cd01..2f0d12e95 100644 Binary files a/graphics/linux/16/dcpomatic2_player.png and b/graphics/linux/16/dcpomatic2_player.png differ diff --git a/graphics/linux/16/dcpomatic2_server.png b/graphics/linux/16/dcpomatic2_server.png index 31ffcf7d5..cf9fdb583 100644 Binary files a/graphics/linux/16/dcpomatic2_server.png and b/graphics/linux/16/dcpomatic2_server.png differ diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png index a10383d67..7564c87a2 100644 Binary files a/graphics/linux/22/dcpomatic2.png and b/graphics/linux/22/dcpomatic2.png differ diff --git a/graphics/linux/22/dcpomatic2_batch.png b/graphics/linux/22/dcpomatic2_batch.png index 12c7dd860..c235ad8b5 100644 Binary files a/graphics/linux/22/dcpomatic2_batch.png and b/graphics/linux/22/dcpomatic2_batch.png differ diff --git a/graphics/linux/22/dcpomatic2_kdm.png b/graphics/linux/22/dcpomatic2_kdm.png index d5aa1d0a2..6646ec909 100644 Binary files a/graphics/linux/22/dcpomatic2_kdm.png and b/graphics/linux/22/dcpomatic2_kdm.png differ diff --git a/graphics/linux/22/dcpomatic2_player.png b/graphics/linux/22/dcpomatic2_player.png index 75e66fd63..0251c36d1 100644 Binary files a/graphics/linux/22/dcpomatic2_player.png and b/graphics/linux/22/dcpomatic2_player.png differ diff --git a/graphics/linux/22/dcpomatic2_server.png b/graphics/linux/22/dcpomatic2_server.png index 5b0f3456b..09df5e4c1 100644 Binary files a/graphics/linux/22/dcpomatic2_server.png and b/graphics/linux/22/dcpomatic2_server.png differ diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png index 8cd8a9891..0cb634e1e 100644 Binary files a/graphics/linux/256/dcpomatic2.png and b/graphics/linux/256/dcpomatic2.png differ diff --git a/graphics/linux/256/dcpomatic2_batch.png b/graphics/linux/256/dcpomatic2_batch.png index 08a1c524e..94c5ca596 100644 Binary files a/graphics/linux/256/dcpomatic2_batch.png and b/graphics/linux/256/dcpomatic2_batch.png differ diff --git a/graphics/linux/256/dcpomatic2_kdm.png b/graphics/linux/256/dcpomatic2_kdm.png index 73c04ce04..43751e2d8 100644 Binary files a/graphics/linux/256/dcpomatic2_kdm.png and b/graphics/linux/256/dcpomatic2_kdm.png differ diff --git a/graphics/linux/256/dcpomatic2_player.png b/graphics/linux/256/dcpomatic2_player.png index d678c6b7d..be9b918da 100644 Binary files a/graphics/linux/256/dcpomatic2_player.png and b/graphics/linux/256/dcpomatic2_player.png differ diff --git a/graphics/linux/256/dcpomatic2_server.png b/graphics/linux/256/dcpomatic2_server.png index 4f4deb800..e85920837 100644 Binary files a/graphics/linux/256/dcpomatic2_server.png and b/graphics/linux/256/dcpomatic2_server.png differ diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png index b877d6b1d..edfbbb743 100644 Binary files a/graphics/linux/32/dcpomatic2.png and b/graphics/linux/32/dcpomatic2.png differ diff --git a/graphics/linux/32/dcpomatic2_batch.png b/graphics/linux/32/dcpomatic2_batch.png index b44c5fb15..d2d8045b6 100644 Binary files a/graphics/linux/32/dcpomatic2_batch.png and b/graphics/linux/32/dcpomatic2_batch.png differ diff --git a/graphics/linux/32/dcpomatic2_kdm.png b/graphics/linux/32/dcpomatic2_kdm.png index 8b381dff4..9bda6f5fd 100644 Binary files a/graphics/linux/32/dcpomatic2_kdm.png and b/graphics/linux/32/dcpomatic2_kdm.png differ diff --git a/graphics/linux/32/dcpomatic2_player.png b/graphics/linux/32/dcpomatic2_player.png index 06800a0d6..f8acf5a72 100644 Binary files a/graphics/linux/32/dcpomatic2_player.png and b/graphics/linux/32/dcpomatic2_player.png differ diff --git a/graphics/linux/32/dcpomatic2_server.png b/graphics/linux/32/dcpomatic2_server.png index 5059479e6..8e071b747 100644 Binary files a/graphics/linux/32/dcpomatic2_server.png and b/graphics/linux/32/dcpomatic2_server.png differ diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png index 2ad1b7483..98e8e5b6e 100644 Binary files a/graphics/linux/48/dcpomatic2.png and b/graphics/linux/48/dcpomatic2.png differ diff --git a/graphics/linux/48/dcpomatic2_batch.png b/graphics/linux/48/dcpomatic2_batch.png index b9537e247..5f1db9014 100644 Binary files a/graphics/linux/48/dcpomatic2_batch.png and b/graphics/linux/48/dcpomatic2_batch.png differ diff --git a/graphics/linux/48/dcpomatic2_kdm.png b/graphics/linux/48/dcpomatic2_kdm.png index 44c2129db..9837bc87d 100644 Binary files a/graphics/linux/48/dcpomatic2_kdm.png and b/graphics/linux/48/dcpomatic2_kdm.png differ diff --git a/graphics/linux/48/dcpomatic2_player.png b/graphics/linux/48/dcpomatic2_player.png index 1b88f011f..6096ebce1 100644 Binary files a/graphics/linux/48/dcpomatic2_player.png and b/graphics/linux/48/dcpomatic2_player.png differ diff --git a/graphics/linux/48/dcpomatic2_server.png b/graphics/linux/48/dcpomatic2_server.png index c9d007e99..270422612 100644 Binary files a/graphics/linux/48/dcpomatic2_server.png and b/graphics/linux/48/dcpomatic2_server.png differ diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png index 121572d13..66b67d2e0 100644 Binary files a/graphics/linux/512/dcpomatic2.png and b/graphics/linux/512/dcpomatic2.png differ diff --git a/graphics/linux/512/dcpomatic2_batch.png b/graphics/linux/512/dcpomatic2_batch.png index 354c49615..cc5121b12 100644 Binary files a/graphics/linux/512/dcpomatic2_batch.png and b/graphics/linux/512/dcpomatic2_batch.png differ diff --git a/graphics/linux/512/dcpomatic2_kdm.png b/graphics/linux/512/dcpomatic2_kdm.png index ea07929cc..e5a4f0bed 100644 Binary files a/graphics/linux/512/dcpomatic2_kdm.png and b/graphics/linux/512/dcpomatic2_kdm.png differ diff --git a/graphics/linux/512/dcpomatic2_player.png b/graphics/linux/512/dcpomatic2_player.png index 2c26510a1..468056e31 100644 Binary files a/graphics/linux/512/dcpomatic2_player.png and b/graphics/linux/512/dcpomatic2_player.png differ diff --git a/graphics/linux/512/dcpomatic2_server.png b/graphics/linux/512/dcpomatic2_server.png index c5b9fd8ce..4c0c39065 100644 Binary files a/graphics/linux/512/dcpomatic2_server.png and b/graphics/linux/512/dcpomatic2_server.png differ diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png index e17ae2658..0b10add1e 100644 Binary files a/graphics/linux/64/dcpomatic2.png and b/graphics/linux/64/dcpomatic2.png differ diff --git a/graphics/linux/64/dcpomatic2_batch.png b/graphics/linux/64/dcpomatic2_batch.png index 8a38719e7..7afcbaecb 100644 Binary files a/graphics/linux/64/dcpomatic2_batch.png and b/graphics/linux/64/dcpomatic2_batch.png differ diff --git a/graphics/linux/64/dcpomatic2_kdm.png b/graphics/linux/64/dcpomatic2_kdm.png index 9bfd5cf15..950010c45 100644 Binary files a/graphics/linux/64/dcpomatic2_kdm.png and b/graphics/linux/64/dcpomatic2_kdm.png differ diff --git a/graphics/linux/64/dcpomatic2_player.png b/graphics/linux/64/dcpomatic2_player.png index 24c722ff5..503a9e8dd 100644 Binary files a/graphics/linux/64/dcpomatic2_player.png and b/graphics/linux/64/dcpomatic2_player.png differ diff --git a/graphics/linux/64/dcpomatic2_server.png b/graphics/linux/64/dcpomatic2_server.png index 689b82cd0..d1e084639 100644 Binary files a/graphics/linux/64/dcpomatic2_server.png and b/graphics/linux/64/dcpomatic2_server.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png index cae2c1935..002c8a43a 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128.png 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 Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png index 4967414dc..eb295c31d 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16.png 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 Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png index 52db12fb4..0cb634e1e 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256.png 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 Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png index 1358b6a5f..edfbbb743 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32.png 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 Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png index 888407ea6..66b67d2e0 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512.png 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 Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png 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 Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png 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 Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png 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 Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png 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 Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/preferences/colour_conversions.png b/graphics/osx/preferences/colour_conversions.png index 161e8d6f1..7d18fe1b5 100644 Binary files a/graphics/osx/preferences/colour_conversions.png and b/graphics/osx/preferences/colour_conversions.png differ diff --git a/graphics/osx/preferences/cover_sheet.png b/graphics/osx/preferences/cover_sheet.png index 9bdf1371e..63c407409 100644 Binary files a/graphics/osx/preferences/cover_sheet.png and b/graphics/osx/preferences/cover_sheet.png differ diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults.png index 6ccce17b1..fc92d4387 100644 Binary files a/graphics/osx/preferences/defaults.png and b/graphics/osx/preferences/defaults.png differ diff --git a/graphics/osx/preferences/email.png b/graphics/osx/preferences/email.png new file mode 100644 index 000000000..89dfbe3f1 Binary files /dev/null and b/graphics/osx/preferences/email.png differ diff --git a/graphics/osx/preferences/kdm_email.png b/graphics/osx/preferences/kdm_email.png index b66a12a1b..c940210f1 100644 Binary files a/graphics/osx/preferences/kdm_email.png and b/graphics/osx/preferences/kdm_email.png differ diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys.png index b7b870314..41a3a36f8 100644 Binary files a/graphics/osx/preferences/keys.png and b/graphics/osx/preferences/keys.png differ diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms.png index 4041ccd8e..47877e224 100644 Binary files a/graphics/osx/preferences/tms.png and b/graphics/osx/preferences/tms.png differ diff --git a/graphics/splash.png b/graphics/splash.png index a74153092..f14760948 100644 Binary files a/graphics/splash.png and b/graphics/splash.png 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + tango internet mail + 2010-03-29T08:04:16 + "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka + + + warszawianka + + + + + email + envelope + externalsource + icon + letter + tango + + + + + + + + + + + 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 @@ + + 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"> + id="defs3"> + 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="linearGradient5060" + inkscape:collect="always"> + id="stop5062" + style="stop-color:black" + offset="0" /> - + id="stop5064" + style="stop-color:black;stop-opacity:0" + offset="1" /> + + 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="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="stop5050" + style="stop-color:black;stop-opacity:0" + offset="0" /> + id="stop5056" + style="stop-color:black" + offset=".5" /> - + id="stop5052" + style="stop-color:black;stop-opacity:0" + offset="1" /> + + id="linearGradient2152"> + id="stop2154" + style="stop-color:#9aa29a" + offset="0" /> - + id="stop2156" + style="stop-color:#b5beb5" + offset="1" /> + + 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="stop2276" + style="stop-color:#000000;stop-opacity:.12871" + offset="0" /> - + id="stop2278" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + + 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="stop9751" + style="stop-color:#ffffff" + offset="0" /> - + id="stop9753" + style="stop-color:#ededed" + offset="1" /> + + 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="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="stop2168" + style="stop-color:#ffffff" + offset="0" /> - + id="stop2170" + style="stop-color:#dcdcdc" + offset="1" /> + + 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="stop18915" + style="stop-color:#ededed" + offset="0" /> - + id="stop18917" + style="stop-color:#c8c8c8" + offset="1" /> + + 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="stop15109" + style="stop-color:#ffffff" + offset="0" /> - + id="stop15111" + style="stop-color:#e2e2e2" + offset="1" /> + + 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="stop2138" + style="stop-color:#989690" + offset="0" /> - - + id="stop2140" + style="stop-color:#656460" + offset="1" /> + + + + + + + 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" /> + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + id="g6707" + transform="matrix(0.0227 0 0 .022979 44.989 37.784)"> + id="rect6709" + style="opacity:.40206;color:black;fill:url(#linearGradient6715)" + height="478.36" + width="1339.6" + y="-150.7" + x="-1559.3" /> + 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="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" /> + + 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="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="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="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="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="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="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="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="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="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="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="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="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" /> + + - - - image/svg+xml + id="metadata53"> + + + image/svg+xml + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - - - Openclipart - - - tango internet mail - 2010-03-29T08:04:16 - "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> - https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka - + rdf:resource="http://creativecommons.org/licenses/publicdomain/" /> + - warszawianka - - - - - email - envelope - externalsource - icon - letter - tango - - - + rdf:about="http://openclipart.org/"> + Openclipart + + + tango internet mail + 2010-03-29T08:04:16 + "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka + + + warszawianka + + + + + email + envelope + externalsource + icon + letter + tango + + + + rdf:about="http://creativecommons.org/licenses/publicdomain/"> + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + rdf:resource="http://creativecommons.org/ns#Distribution" /> - - - - + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + + + + 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 Binary files a/graphics/web/favicon-128x128.png and b/graphics/web/favicon-128x128.png differ diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png index 98e4be827..196cac469 100644 Binary files a/graphics/web/favicon-16x16.png and b/graphics/web/favicon-16x16.png differ diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png index 849b5f8c0..7a26e4a98 100644 Binary files a/graphics/web/favicon-256x256.png and b/graphics/web/favicon-256x256.png differ diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png index 01099c350..c123f9d6d 100644 Binary files a/graphics/web/favicon-32x32.png and b/graphics/web/favicon-32x32.png differ diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png index 77755ecaf..ee4ce4ea6 100644 Binary files a/graphics/web/favicon-64x64.png and b/graphics/web/favicon-64x64.png differ diff --git a/graphics/web/logo.png b/graphics/web/logo.png index 7cc15450f..97b8fdcd8 100644 Binary files a/graphics/web/logo.png and b/graphics/web/logo.png 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 columns; columns.push_back (wx_to_std (_("Address"))); add_label_to_sizer (table, _panel, _("CC addresses"), true); - _kdm_cc = new EditableList ( + _cc = new EditableList ( _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* _kdm_cc; - wxTextCtrl* _kdm_bcc; - wxTextCtrl* _kdm_email; - wxButton* _reset_kdm_email; + checked_set (_email, Config::instance()->kdm_email ()); + } + + wxTextCtrl* _subject; + wxTextCtrl* _from; + EditableList* _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)); -- cgit v1.2.3