Move email server preferences into a separate tab.
authorCarl Hetherington <cth@carlh.net>
Sat, 12 May 2018 20:37:51 +0000 (21:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 27 May 2018 22:05:46 +0000 (23:05 +0100)
108 files changed:
graphics/linux/128/dcpomatic2.png
graphics/linux/128/dcpomatic2_batch.png
graphics/linux/128/dcpomatic2_kdm.png
graphics/linux/128/dcpomatic2_player.png
graphics/linux/128/dcpomatic2_server.png
graphics/linux/16/dcpomatic2.png
graphics/linux/16/dcpomatic2_batch.png
graphics/linux/16/dcpomatic2_kdm.png
graphics/linux/16/dcpomatic2_player.png
graphics/linux/16/dcpomatic2_server.png
graphics/linux/22/dcpomatic2.png
graphics/linux/22/dcpomatic2_batch.png
graphics/linux/22/dcpomatic2_kdm.png
graphics/linux/22/dcpomatic2_player.png
graphics/linux/22/dcpomatic2_server.png
graphics/linux/256/dcpomatic2.png
graphics/linux/256/dcpomatic2_batch.png
graphics/linux/256/dcpomatic2_kdm.png
graphics/linux/256/dcpomatic2_player.png
graphics/linux/256/dcpomatic2_server.png
graphics/linux/32/dcpomatic2.png
graphics/linux/32/dcpomatic2_batch.png
graphics/linux/32/dcpomatic2_kdm.png
graphics/linux/32/dcpomatic2_player.png
graphics/linux/32/dcpomatic2_server.png
graphics/linux/48/dcpomatic2.png
graphics/linux/48/dcpomatic2_batch.png
graphics/linux/48/dcpomatic2_kdm.png
graphics/linux/48/dcpomatic2_player.png
graphics/linux/48/dcpomatic2_server.png
graphics/linux/512/dcpomatic2.png
graphics/linux/512/dcpomatic2_batch.png
graphics/linux/512/dcpomatic2_kdm.png
graphics/linux/512/dcpomatic2_player.png
graphics/linux/512/dcpomatic2_server.png
graphics/linux/64/dcpomatic2.png
graphics/linux/64/dcpomatic2_batch.png
graphics/linux/64/dcpomatic2_kdm.png
graphics/linux/64/dcpomatic2_player.png
graphics/linux/64/dcpomatic2_server.png
graphics/osx/dcpomatic2.iconset/icon_128x128.png
graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
graphics/osx/dcpomatic2.iconset/icon_16x16.png
graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
graphics/osx/dcpomatic2.iconset/icon_256x256.png
graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
graphics/osx/dcpomatic2.iconset/icon_32x32.png
graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
graphics/osx/dcpomatic2.iconset/icon_512x512.png
graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png
graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png
graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png
graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png
graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png
graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png
graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png
graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png
graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png
graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png
graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png
graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png
graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png
graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png
graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png
graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png
graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png
graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png
graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png
graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png
graphics/osx/dcpomatic2_player.iconset/icon_128x128.png
graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png
graphics/osx/dcpomatic2_player.iconset/icon_16x16.png
graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png
graphics/osx/dcpomatic2_player.iconset/icon_256x256.png
graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png
graphics/osx/dcpomatic2_player.iconset/icon_32x32.png
graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png
graphics/osx/dcpomatic2_player.iconset/icon_512x512.png
graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png
graphics/osx/dcpomatic2_server.iconset/icon_128x128.png
graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png
graphics/osx/dcpomatic2_server.iconset/icon_16x16.png
graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png
graphics/osx/dcpomatic2_server.iconset/icon_256x256.png
graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png
graphics/osx/dcpomatic2_server.iconset/icon_32x32.png
graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png
graphics/osx/dcpomatic2_server.iconset/icon_512x512.png
graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png
graphics/osx/preferences/colour_conversions.png
graphics/osx/preferences/cover_sheet.png
graphics/osx/preferences/defaults.png
graphics/osx/preferences/email.png [new file with mode: 0644]
graphics/osx/preferences/kdm_email.png
graphics/osx/preferences/keys.png
graphics/osx/preferences/tms.png
graphics/splash.png
graphics/src/email.svg [new file with mode: 0644]
graphics/src/kdm_email.svg
graphics/update
graphics/web/favicon-128x128.png
graphics/web/favicon-16x16.png
graphics/web/favicon-256x256.png
graphics/web/favicon-32x32.png
graphics/web/favicon-64x64.png
graphics/web/logo.png
src/wx/full_config_dialog.cc

index 273e67de5789f51cc4387459d2ec8ba572692165..002c8a43aa5aa763c00ed3f783ff6a0d67c01712 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2.png and b/graphics/linux/128/dcpomatic2.png differ
index 6d499449379bb8602bdca2c773a9f6591a71b98a..8b084a07e7fb2bdccdbf218792523c97881f893a 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2_batch.png and b/graphics/linux/128/dcpomatic2_batch.png differ
index 31c1333d659b1f1dbe3a77931c0b75d8febb43d0..b2b8518e825bd4fce222707652ef553f5df5a685 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2_kdm.png and b/graphics/linux/128/dcpomatic2_kdm.png differ
index 06f2b86ab583bd023d9f0b154058ee038ce148d1..427699852786a83336aff8c5b1dd55506d837e36 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2_player.png and b/graphics/linux/128/dcpomatic2_player.png differ
index c6b118c11fe3dccedfeab358c06efee532b80afe..fae26a5ad56e4483b81bc206090b6277402dc163 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2_server.png and b/graphics/linux/128/dcpomatic2_server.png differ
index d56bcb15a90a6ee304d40a17a9241b249e55211e..eb295c31db171b9b0ecf310daff50f1f35fe0384 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2.png and b/graphics/linux/16/dcpomatic2.png differ
index a4cfd0d929b127f69c27f5965724f39d7f6b9050..f6744e45b26ddf4fb47bfe743f79bf2f6f2605fe 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2_batch.png and b/graphics/linux/16/dcpomatic2_batch.png differ
index bbff2ed747aa84604d62d6a1971c0ba4231abee8..f0cecb6bd9e8e0b262faf605a3ecf1c187ddb9a5 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2_kdm.png and b/graphics/linux/16/dcpomatic2_kdm.png differ
index b86c6cd016c8d055729a7b97b08de4d383c03a25..2f0d12e95df232d06d08a17a49671a4bf3d44470 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2_player.png and b/graphics/linux/16/dcpomatic2_player.png differ
index 31ffcf7d5e5151189be6452d99b8fef5cdf492a2..cf9fdb583315fda540069adda5b162de7763bb7f 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2_server.png and b/graphics/linux/16/dcpomatic2_server.png differ
index a10383d67d77fe34da9635411ec5bacee7cf62a8..7564c87a2dc524ecd913e97b65cff81c3f459120 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2.png and b/graphics/linux/22/dcpomatic2.png differ
index 12c7dd86025ac492fd2b3841e12b8b4a68844320..c235ad8b57ea2b2981dd2dab3144b36fb5e31a39 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2_batch.png and b/graphics/linux/22/dcpomatic2_batch.png differ
index d5aa1d0a2fdeabc4e8dd9aeee36fc97c561c5ff9..6646ec909a2bd90b194d875a4bdb413fbebd0641 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2_kdm.png and b/graphics/linux/22/dcpomatic2_kdm.png differ
index 75e66fd63907974126649d00424e7afe1fe7ce3e..0251c36d1ef67b841f8540f1499953622f6d4768 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2_player.png and b/graphics/linux/22/dcpomatic2_player.png differ
index 5b0f3456bcdc9608252011c69ebaf6e3548fd956..09df5e4c1c829f3b22d5588e50ca9a1c541c8d72 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2_server.png and b/graphics/linux/22/dcpomatic2_server.png differ
index 8cd8a989146af4d45588044a08c8ec5726ebb08d..0cb634e1eba53381768e00df7ab24d61f6331e43 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2.png and b/graphics/linux/256/dcpomatic2.png differ
index 08a1c524eed71b76d355e05a22b045d541540baf..94c5ca59649af57c8a63a8f0a25a0d81ae3ee691 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2_batch.png and b/graphics/linux/256/dcpomatic2_batch.png differ
index 73c04ce04f44b307f332b0a0dbf5c833fc8ebea3..43751e2d81a97b180c5f9b0236858103ebfc1b3a 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2_kdm.png and b/graphics/linux/256/dcpomatic2_kdm.png differ
index d678c6b7ddb3e51c3981c03552bdb4236a7bf9bf..be9b918da5a15e5e6cc52e47b0da1a243b0edfed 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2_player.png and b/graphics/linux/256/dcpomatic2_player.png differ
index 4f4deb8006fc1831768a075b907a7aa06061d45a..e85920837bf34ec7bbc1c8f91bfe6edcb8e60df9 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2_server.png and b/graphics/linux/256/dcpomatic2_server.png differ
index b877d6b1d715bc92bf5f946950bf33abd85ff94e..edfbbb7439e889e32c3af28463133af4f9b28c11 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2.png and b/graphics/linux/32/dcpomatic2.png differ
index b44c5fb157708913dc4ccb8760f218e5525a10f1..d2d8045b651bce2beaac4d403d89fb708919e9ec 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2_batch.png and b/graphics/linux/32/dcpomatic2_batch.png differ
index 8b381dff4367319e4078234948c2ff0e9a6e4be8..9bda6f5fd7df64ed77b807e9022ac5fd614b4f65 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2_kdm.png and b/graphics/linux/32/dcpomatic2_kdm.png differ
index 06800a0d66ea36a2791e8d466dd47adb6d28e7ca..f8acf5a726bcdc58820f7a33512ce45787d6c552 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2_player.png and b/graphics/linux/32/dcpomatic2_player.png differ
index 5059479e6748b7f5bfa1fed6f761e7fe82bb877c..8e071b747e974acdaa5561b850e5e3c5889eb147 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2_server.png and b/graphics/linux/32/dcpomatic2_server.png differ
index 2ad1b74838df89aa71c4a87aa98283d4060d154d..98e8e5b6e644b229220d0a22cf8047d06c36f5ec 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2.png and b/graphics/linux/48/dcpomatic2.png differ
index b9537e24735664e322b44163e8f02b7d45af0392..5f1db90142009f43030c7eebbbecac6be0ccccee 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2_batch.png and b/graphics/linux/48/dcpomatic2_batch.png differ
index 44c2129dbfecb979d89278058e86d2e4a868584c..9837bc87d2738ffed3f8982239f00680156e34c1 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2_kdm.png and b/graphics/linux/48/dcpomatic2_kdm.png differ
index 1b88f011f8eb58c5b420d7241512a324664a858b..6096ebce102f894f90baaf0fe7a84dd51394b59c 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2_player.png and b/graphics/linux/48/dcpomatic2_player.png differ
index c9d007e99c28b7d1089b14b9a0a945edc612ac71..2704226121cb95a1180363a34cf4a634e933fa43 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2_server.png and b/graphics/linux/48/dcpomatic2_server.png differ
index 121572d132d08e787a602eff95e23857590d519c..66b67d2e0216c2369453749a1e8be4676271b1fd 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2.png and b/graphics/linux/512/dcpomatic2.png differ
index 354c49615f6fdb8ad6d9aa6469f380171ea03613..cc5121b122ddfcecdd49debfb011c8e1e86cbae5 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2_batch.png and b/graphics/linux/512/dcpomatic2_batch.png differ
index ea07929cc6e4b788e12167b751ef2cc5aef331c3..e5a4f0beda88010cdac03299714d7b60b14783d7 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2_kdm.png and b/graphics/linux/512/dcpomatic2_kdm.png differ
index 2c26510a1efde164424086af667ac4784305964d..468056e316099c384ea828c24d36ca9f9e73bfda 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2_player.png and b/graphics/linux/512/dcpomatic2_player.png differ
index c5b9fd8ce3afd1d727d29ec275c0a2bff25a782f..4c0c3906555e8c01f84c10cd637c3692e01c6866 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2_server.png and b/graphics/linux/512/dcpomatic2_server.png differ
index e17ae26582a0fa2b85cc5314257769ad3f18a3f1..0b10add1ee2003f630b4eaffabbfa771d4631dc6 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2.png and b/graphics/linux/64/dcpomatic2.png differ
index 8a38719e75500caa6245499c4a6672ed15b564d9..7afcbaecb7bdb56e7a0f46154e23e7b313c8d388 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2_batch.png and b/graphics/linux/64/dcpomatic2_batch.png differ
index 9bfd5cf150ad4062ec8cc348f9a8d4442dcc12f1..950010c45987ebd308af6c7c7d570481ea2877e5 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2_kdm.png and b/graphics/linux/64/dcpomatic2_kdm.png differ
index 24c722ff5ff90cc44b2d997c3a1579cf2e14740c..503a9e8dd85a746a961ec99d5539d858430bee8d 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2_player.png and b/graphics/linux/64/dcpomatic2_player.png differ
index 689b82cd0942b22c8106436cacb30cb21a37d81d..d1e084639b253314272b1283adfcfb35f786db93 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2_server.png and b/graphics/linux/64/dcpomatic2_server.png differ
index cae2c193535fd26763065ab7094127f35b0ec390..002c8a43aa5aa763c00ed3f783ff6a0d67c01712 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128.png differ
index cae2c193535fd26763065ab7094127f35b0ec390..002c8a43aa5aa763c00ed3f783ff6a0d67c01712 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png differ
index 4967414dc7b049aa1004eeee6dcb06cd89f5e5be..eb295c31db171b9b0ecf310daff50f1f35fe0384 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16.png differ
index 4967414dc7b049aa1004eeee6dcb06cd89f5e5be..eb295c31db171b9b0ecf310daff50f1f35fe0384 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png differ
index 52db12fb43bf99981737231570b7bd02cb0bd241..0cb634e1eba53381768e00df7ab24d61f6331e43 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256.png differ
index 52db12fb43bf99981737231570b7bd02cb0bd241..0cb634e1eba53381768e00df7ab24d61f6331e43 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png differ
index 1358b6a5f0d4782b5a8e28d0d33b52be885d758a..edfbbb7439e889e32c3af28463133af4f9b28c11 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32.png differ
index 1358b6a5f0d4782b5a8e28d0d33b52be885d758a..edfbbb7439e889e32c3af28463133af4f9b28c11 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png differ
index 888407ea6f67dd744feb72ac4548bed2ce667cde..66b67d2e0216c2369453749a1e8be4676271b1fd 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512.png differ
index 888407ea6f67dd744feb72ac4548bed2ce667cde..66b67d2e0216c2369453749a1e8be4676271b1fd 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png differ
index 6d499449379bb8602bdca2c773a9f6591a71b98a..8b084a07e7fb2bdccdbf218792523c97881f893a 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png differ
index 6d499449379bb8602bdca2c773a9f6591a71b98a..8b084a07e7fb2bdccdbf218792523c97881f893a 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png differ
index a4cfd0d929b127f69c27f5965724f39d7f6b9050..f6744e45b26ddf4fb47bfe743f79bf2f6f2605fe 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png differ
index a4cfd0d929b127f69c27f5965724f39d7f6b9050..f6744e45b26ddf4fb47bfe743f79bf2f6f2605fe 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png differ
index 08a1c524eed71b76d355e05a22b045d541540baf..94c5ca59649af57c8a63a8f0a25a0d81ae3ee691 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png differ
index 08a1c524eed71b76d355e05a22b045d541540baf..94c5ca59649af57c8a63a8f0a25a0d81ae3ee691 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png differ
index b44c5fb157708913dc4ccb8760f218e5525a10f1..d2d8045b651bce2beaac4d403d89fb708919e9ec 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png differ
index b44c5fb157708913dc4ccb8760f218e5525a10f1..d2d8045b651bce2beaac4d403d89fb708919e9ec 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png differ
index 354c49615f6fdb8ad6d9aa6469f380171ea03613..cc5121b122ddfcecdd49debfb011c8e1e86cbae5 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png differ
index 354c49615f6fdb8ad6d9aa6469f380171ea03613..cc5121b122ddfcecdd49debfb011c8e1e86cbae5 100644 (file)
Binary files a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png differ
index 31c1333d659b1f1dbe3a77931c0b75d8febb43d0..b2b8518e825bd4fce222707652ef553f5df5a685 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png differ
index 31c1333d659b1f1dbe3a77931c0b75d8febb43d0..b2b8518e825bd4fce222707652ef553f5df5a685 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png differ
index bbff2ed747aa84604d62d6a1971c0ba4231abee8..f0cecb6bd9e8e0b262faf605a3ecf1c187ddb9a5 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png differ
index bbff2ed747aa84604d62d6a1971c0ba4231abee8..f0cecb6bd9e8e0b262faf605a3ecf1c187ddb9a5 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png differ
index 73c04ce04f44b307f332b0a0dbf5c833fc8ebea3..43751e2d81a97b180c5f9b0236858103ebfc1b3a 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png differ
index 73c04ce04f44b307f332b0a0dbf5c833fc8ebea3..43751e2d81a97b180c5f9b0236858103ebfc1b3a 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png differ
index 8b381dff4367319e4078234948c2ff0e9a6e4be8..9bda6f5fd7df64ed77b807e9022ac5fd614b4f65 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png differ
index 8b381dff4367319e4078234948c2ff0e9a6e4be8..9bda6f5fd7df64ed77b807e9022ac5fd614b4f65 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png differ
index ea07929cc6e4b788e12167b751ef2cc5aef331c3..e5a4f0beda88010cdac03299714d7b60b14783d7 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png differ
index ea07929cc6e4b788e12167b751ef2cc5aef331c3..e5a4f0beda88010cdac03299714d7b60b14783d7 100644 (file)
Binary files a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png differ
index 06f2b86ab583bd023d9f0b154058ee038ce148d1..427699852786a83336aff8c5b1dd55506d837e36 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_player.iconset/icon_128x128.png differ
index 06f2b86ab583bd023d9f0b154058ee038ce148d1..427699852786a83336aff8c5b1dd55506d837e36 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_128x128@2x.png differ
index b86c6cd016c8d055729a7b97b08de4d383c03a25..2f0d12e95df232d06d08a17a49671a4bf3d44470 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_player.iconset/icon_16x16.png differ
index b86c6cd016c8d055729a7b97b08de4d383c03a25..2f0d12e95df232d06d08a17a49671a4bf3d44470 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_16x16@2x.png differ
index d678c6b7ddb3e51c3981c03552bdb4236a7bf9bf..be9b918da5a15e5e6cc52e47b0da1a243b0edfed 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_player.iconset/icon_256x256.png differ
index d678c6b7ddb3e51c3981c03552bdb4236a7bf9bf..be9b918da5a15e5e6cc52e47b0da1a243b0edfed 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_256x256@2x.png differ
index 06800a0d66ea36a2791e8d466dd47adb6d28e7ca..f8acf5a726bcdc58820f7a33512ce45787d6c552 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_player.iconset/icon_32x32.png differ
index 06800a0d66ea36a2791e8d466dd47adb6d28e7ca..f8acf5a726bcdc58820f7a33512ce45787d6c552 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_32x32@2x.png differ
index 2c26510a1efde164424086af667ac4784305964d..468056e316099c384ea828c24d36ca9f9e73bfda 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_player.iconset/icon_512x512.png differ
index 2c26510a1efde164424086af667ac4784305964d..468056e316099c384ea828c24d36ca9f9e73bfda 100644 (file)
Binary files a/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_player.iconset/icon_512x512@2x.png differ
index c6b118c11fe3dccedfeab358c06efee532b80afe..fae26a5ad56e4483b81bc206090b6277402dc163 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png differ
index c6b118c11fe3dccedfeab358c06efee532b80afe..fae26a5ad56e4483b81bc206090b6277402dc163 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png differ
index 31ffcf7d5e5151189be6452d99b8fef5cdf492a2..cf9fdb583315fda540069adda5b162de7763bb7f 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png differ
index 31ffcf7d5e5151189be6452d99b8fef5cdf492a2..cf9fdb583315fda540069adda5b162de7763bb7f 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png differ
index 4f4deb8006fc1831768a075b907a7aa06061d45a..e85920837bf34ec7bbc1c8f91bfe6edcb8e60df9 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png differ
index 4f4deb8006fc1831768a075b907a7aa06061d45a..e85920837bf34ec7bbc1c8f91bfe6edcb8e60df9 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png differ
index 5059479e6748b7f5bfa1fed6f761e7fe82bb877c..8e071b747e974acdaa5561b850e5e3c5889eb147 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png differ
index 5059479e6748b7f5bfa1fed6f761e7fe82bb877c..8e071b747e974acdaa5561b850e5e3c5889eb147 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png differ
index c5b9fd8ce3afd1d727d29ec275c0a2bff25a782f..4c0c3906555e8c01f84c10cd637c3692e01c6866 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png differ
index c5b9fd8ce3afd1d727d29ec275c0a2bff25a782f..4c0c3906555e8c01f84c10cd637c3692e01c6866 100644 (file)
Binary files a/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png differ
index 161e8d6f1631ae4ece3acb5aeeb9a86081ae1faa..7d18fe1b5d9dbb5d2ac7d1c3a4e461025f1a5f92 100644 (file)
Binary files a/graphics/osx/preferences/colour_conversions.png and b/graphics/osx/preferences/colour_conversions.png differ
index 9bdf1371e36fa9c9b0952dc33182ebedba6802e6..63c407409b078c80cb7203fe182fa396c16ad25b 100644 (file)
Binary files a/graphics/osx/preferences/cover_sheet.png and b/graphics/osx/preferences/cover_sheet.png differ
index 6ccce17b14d5878de30b26f150dd1fb24a658bc7..fc92d4387911473044c07d280c55ca206b70cecc 100644 (file)
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 (file)
index 0000000..89dfbe3
Binary files /dev/null and b/graphics/osx/preferences/email.png differ
index b66a12a1b3454f8c000e41c9bfa6bafdeb7015a7..c940210f133dddbc3d9b0541ee14d56680f2989c 100644 (file)
Binary files a/graphics/osx/preferences/kdm_email.png and b/graphics/osx/preferences/kdm_email.png differ
index b7b870314838f7f391e92975f73138b81751b1c3..41a3a36f8fff124b33be3d641a2b6b683957a26b 100644 (file)
Binary files a/graphics/osx/preferences/keys.png and b/graphics/osx/preferences/keys.png differ
index 4041ccd8e002854e3abafd5ef3d2d8fb6ce58b85..47877e22445b1de4dbfe8316f85ccd2cf2dad79f 100644 (file)
Binary files a/graphics/osx/preferences/tms.png and b/graphics/osx/preferences/tms.png differ
index a74153092328ffc2d50d1d0faf45686bc33779e4..f14760948737e30a5615bfe44d7dbc1af0943afe 100644 (file)
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 (file)
index 0000000..c09d94e
--- /dev/null
@@ -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
+>
index c09d94e81622d24f350225d7393baa66e3a5717e..a0dbc901550a0b38759ca949bd2ada5512779c68 100644 (file)
 <?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; \r\n&lt;br&gt;&lt;br&gt;\r\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>
index 4f5cdc8f8ceebffcc4439d6b7fdbe64b4d49c22c..cd0995e055b692c6bab4bca7e9fc3d6365aa15cf 100755 (executable)
@@ -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
 
index 387e387822d3d69c19bd330c1ee0e615168dd0eb..d114e46e46a31896db72bf1cc951aa2e5996ffea 100644 (file)
Binary files a/graphics/web/favicon-128x128.png and b/graphics/web/favicon-128x128.png differ
index 98e4be827cc85684cb82eb24a30208a8f5bd7fe5..196cac469619d4a94d8942b74f6a91214536de5f 100644 (file)
Binary files a/graphics/web/favicon-16x16.png and b/graphics/web/favicon-16x16.png differ
index 849b5f8c0b554488c9a380e5b0b22d3fb78063a3..7a26e4a988398f05a7e70521521138fecf66fb1b 100644 (file)
Binary files a/graphics/web/favicon-256x256.png and b/graphics/web/favicon-256x256.png differ
index 01099c350e167369c547b3a9c08797bcb358fe63..c123f9d6d2a0db1dc27bcdecbf855b772555472f 100644 (file)
Binary files a/graphics/web/favicon-32x32.png and b/graphics/web/favicon-32x32.png differ
index 77755ecaf47677ab83b7eaa2642de19071c63f12..ee4ce4ea6ecb849d461b028ac1425dd724060db5 100644 (file)
Binary files a/graphics/web/favicon-64x64.png and b/graphics/web/favicon-64x64.png differ
index 7cc15450f0287b6d6bfecb8cae746e191a6ed32c..97b8fdcd88bbdfa8f2ef9428e486f3170a2fcb79 100644 (file)
Binary files a/graphics/web/logo.png and b/graphics/web/logo.png differ
index 46a9f1b4f710050a4ea6828e68b34f31cc115b6b..15e2c4c04b273bc5e1609c5bcf633d2c8d6ac356 100644 (file)
@@ -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));