diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-16 22:21:34 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-18 20:37:00 +0200 |
| commit | fecfda4c913da3f60ab4329d1f4f412bc27d19a7 (patch) | |
| tree | dbf98f66d23dd6677e487e4efdbdad8d7650923e | |
| parent | e983d424808894dc9b036c46cd61d8fa39487dfd (diff) | |
Use slightly better icons for macOS prefs in dark mode.
| -rw-r--r-- | graphics/osx/preferences/advanced@2x_black.png (renamed from graphics/osx/preferences/advanced@2x.png) | bin | 3305 -> 3305 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/advanced@2x_white.png | bin | 0 -> 3267 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/advanced_black.png (renamed from graphics/osx/preferences/advanced.png) | bin | 1631 -> 1631 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/advanced_white.png | bin | 0 -> 1619 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/cover_sheet@2x_black.png (renamed from graphics/osx/preferences/cover_sheet@2x.png) | bin | 353 -> 353 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/cover_sheet@2x_white.png | bin | 0 -> 356 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/cover_sheet_black.png (renamed from graphics/osx/preferences/cover_sheet.png) | bin | 229 -> 229 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/cover_sheet_white.png | bin | 0 -> 232 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/defaults@2x_black.png (renamed from graphics/osx/preferences/defaults@2x.png) | bin | 1307 -> 1307 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/defaults@2x_white.png | bin | 0 -> 1221 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/defaults_black.png (renamed from graphics/osx/preferences/defaults.png) | bin | 644 -> 644 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/defaults_white.png | bin | 0 -> 626 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/email@2x_black.png (renamed from graphics/osx/preferences/email@2x.png) | bin | 2029 -> 2029 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/email@2x_white.png | bin | 0 -> 1945 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/email_black.png (renamed from graphics/osx/preferences/email.png) | bin | 946 -> 946 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/email_white.png | bin | 0 -> 879 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/general@2x_black.png (renamed from graphics/osx/preferences/general@2x.png) | bin | 499 -> 499 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/general@2x_white.png | bin | 0 -> 497 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/general_black.png (renamed from graphics/osx/preferences/general.png) | bin | 346 -> 346 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/general_white.png | bin | 0 -> 340 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/identifiers@2x_black.png (renamed from graphics/osx/preferences/identifiers@2x.png) | bin | 1502 -> 1502 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/identifiers@2x_white.png | bin | 0 -> 1660 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/identifiers_black.png (renamed from graphics/osx/preferences/identifiers.png) | bin | 831 -> 831 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/identifiers_white.png | bin | 0 -> 847 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/kdm_email@2x_black.png (renamed from graphics/osx/preferences/kdm_email@2x.png) | bin | 2500 -> 2500 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/kdm_email@2x_white.png | bin | 0 -> 2514 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/kdm_email_black.png (renamed from graphics/osx/preferences/kdm_email.png) | bin | 1122 -> 1122 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/kdm_email_white.png | bin | 0 -> 1156 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/keys@2x_black.png (renamed from graphics/osx/preferences/keys@2x.png) | bin | 715 -> 715 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/keys@2x_white.png | bin | 0 -> 758 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/keys_black.png (renamed from graphics/osx/preferences/keys.png) | bin | 397 -> 397 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/keys_white.png | bin | 0 -> 424 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/locations@2x_black.png (renamed from graphics/osx/preferences/locations@2x.png) | bin | 2614 -> 2614 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/locations@2x_white.png | bin | 0 -> 2593 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/locations_black.png (renamed from graphics/osx/preferences/locations.png) | bin | 1284 -> 1284 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/locations_white.png | bin | 0 -> 1302 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/notifications@2x_black.png (renamed from graphics/osx/preferences/notifications@2x.png) | bin | 2269 -> 2269 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/notifications@2x_white.png | bin | 0 -> 2252 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/notifications_black.png (renamed from graphics/osx/preferences/notifications.png) | bin | 1298 -> 1298 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/notifications_white.png | bin | 0 -> 1271 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/servers@2x_black.png (renamed from graphics/osx/preferences/servers@2x.png) | bin | 390 -> 390 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/servers@2x_white.png | bin | 0 -> 390 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/servers_black.png (renamed from graphics/osx/preferences/servers.png) | bin | 279 -> 279 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/servers_white.png | bin | 0 -> 283 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/sound@2x_black.png (renamed from graphics/osx/preferences/sound@2x.png) | bin | 1385 -> 1385 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/sound@2x_white.png | bin | 0 -> 1465 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/sound_black.png (renamed from graphics/osx/preferences/sound.png) | bin | 696 -> 696 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/sound_white.png | bin | 0 -> 769 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/tms@2x_black.png (renamed from graphics/osx/preferences/tms@2x.png) | bin | 966 -> 966 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/tms@2x_white.png | bin | 0 -> 1027 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/tms_black.png (renamed from graphics/osx/preferences/tms.png) | bin | 529 -> 529 bytes | |||
| -rw-r--r-- | graphics/osx/preferences/tms_white.png | bin | 0 -> 536 bytes | |||
| -rw-r--r-- | graphics/src/preferences_black.svg (renamed from graphics/src/preferences.svg) | 0 | ||||
| -rw-r--r-- | graphics/src/preferences_white.svg | 1066 | ||||
| -rwxr-xr-x | graphics/update | 8 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 39 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/config_dialog.h | 6 | ||||
| -rw-r--r-- | src/wx/full_config_dialog.cc | 28 |
59 files changed, 1107 insertions, 42 deletions
diff --git a/graphics/osx/preferences/advanced@2x.png b/graphics/osx/preferences/advanced@2x_black.png Binary files differindex e2cb8e361..e2cb8e361 100644 --- a/graphics/osx/preferences/advanced@2x.png +++ b/graphics/osx/preferences/advanced@2x_black.png diff --git a/graphics/osx/preferences/advanced@2x_white.png b/graphics/osx/preferences/advanced@2x_white.png Binary files differnew file mode 100644 index 000000000..71f97b3ca --- /dev/null +++ b/graphics/osx/preferences/advanced@2x_white.png diff --git a/graphics/osx/preferences/advanced.png b/graphics/osx/preferences/advanced_black.png Binary files differindex 50c086ed6..50c086ed6 100644 --- a/graphics/osx/preferences/advanced.png +++ b/graphics/osx/preferences/advanced_black.png diff --git a/graphics/osx/preferences/advanced_white.png b/graphics/osx/preferences/advanced_white.png Binary files differnew file mode 100644 index 000000000..b5bbfa16b --- /dev/null +++ b/graphics/osx/preferences/advanced_white.png diff --git a/graphics/osx/preferences/cover_sheet@2x.png b/graphics/osx/preferences/cover_sheet@2x_black.png Binary files differindex d5ee6ebdb..d5ee6ebdb 100644 --- a/graphics/osx/preferences/cover_sheet@2x.png +++ b/graphics/osx/preferences/cover_sheet@2x_black.png diff --git a/graphics/osx/preferences/cover_sheet@2x_white.png b/graphics/osx/preferences/cover_sheet@2x_white.png Binary files differnew file mode 100644 index 000000000..3e1bade6f --- /dev/null +++ b/graphics/osx/preferences/cover_sheet@2x_white.png diff --git a/graphics/osx/preferences/cover_sheet.png b/graphics/osx/preferences/cover_sheet_black.png Binary files differindex 18eaf0a40..18eaf0a40 100644 --- a/graphics/osx/preferences/cover_sheet.png +++ b/graphics/osx/preferences/cover_sheet_black.png diff --git a/graphics/osx/preferences/cover_sheet_white.png b/graphics/osx/preferences/cover_sheet_white.png Binary files differnew file mode 100644 index 000000000..3a41359a1 --- /dev/null +++ b/graphics/osx/preferences/cover_sheet_white.png diff --git a/graphics/osx/preferences/defaults@2x.png b/graphics/osx/preferences/defaults@2x_black.png Binary files differindex 53ab3968a..53ab3968a 100644 --- a/graphics/osx/preferences/defaults@2x.png +++ b/graphics/osx/preferences/defaults@2x_black.png diff --git a/graphics/osx/preferences/defaults@2x_white.png b/graphics/osx/preferences/defaults@2x_white.png Binary files differnew file mode 100644 index 000000000..e86c02350 --- /dev/null +++ b/graphics/osx/preferences/defaults@2x_white.png diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults_black.png Binary files differindex a2c2217d7..a2c2217d7 100644 --- a/graphics/osx/preferences/defaults.png +++ b/graphics/osx/preferences/defaults_black.png diff --git a/graphics/osx/preferences/defaults_white.png b/graphics/osx/preferences/defaults_white.png Binary files differnew file mode 100644 index 000000000..3dbbac384 --- /dev/null +++ b/graphics/osx/preferences/defaults_white.png diff --git a/graphics/osx/preferences/email@2x.png b/graphics/osx/preferences/email@2x_black.png Binary files differindex 0a814951d..0a814951d 100644 --- a/graphics/osx/preferences/email@2x.png +++ b/graphics/osx/preferences/email@2x_black.png diff --git a/graphics/osx/preferences/email@2x_white.png b/graphics/osx/preferences/email@2x_white.png Binary files differnew file mode 100644 index 000000000..68408a6e4 --- /dev/null +++ b/graphics/osx/preferences/email@2x_white.png diff --git a/graphics/osx/preferences/email.png b/graphics/osx/preferences/email_black.png Binary files differindex 8d5136d82..8d5136d82 100644 --- a/graphics/osx/preferences/email.png +++ b/graphics/osx/preferences/email_black.png diff --git a/graphics/osx/preferences/email_white.png b/graphics/osx/preferences/email_white.png Binary files differnew file mode 100644 index 000000000..ed821598e --- /dev/null +++ b/graphics/osx/preferences/email_white.png diff --git a/graphics/osx/preferences/general@2x.png b/graphics/osx/preferences/general@2x_black.png Binary files differindex af79038a1..af79038a1 100644 --- a/graphics/osx/preferences/general@2x.png +++ b/graphics/osx/preferences/general@2x_black.png diff --git a/graphics/osx/preferences/general@2x_white.png b/graphics/osx/preferences/general@2x_white.png Binary files differnew file mode 100644 index 000000000..72820d0fd --- /dev/null +++ b/graphics/osx/preferences/general@2x_white.png diff --git a/graphics/osx/preferences/general.png b/graphics/osx/preferences/general_black.png Binary files differindex c75898c24..c75898c24 100644 --- a/graphics/osx/preferences/general.png +++ b/graphics/osx/preferences/general_black.png diff --git a/graphics/osx/preferences/general_white.png b/graphics/osx/preferences/general_white.png Binary files differnew file mode 100644 index 000000000..20d41c7d4 --- /dev/null +++ b/graphics/osx/preferences/general_white.png diff --git a/graphics/osx/preferences/identifiers@2x.png b/graphics/osx/preferences/identifiers@2x_black.png Binary files differindex 33b5499a7..33b5499a7 100644 --- a/graphics/osx/preferences/identifiers@2x.png +++ b/graphics/osx/preferences/identifiers@2x_black.png diff --git a/graphics/osx/preferences/identifiers@2x_white.png b/graphics/osx/preferences/identifiers@2x_white.png Binary files differnew file mode 100644 index 000000000..3416793c1 --- /dev/null +++ b/graphics/osx/preferences/identifiers@2x_white.png diff --git a/graphics/osx/preferences/identifiers.png b/graphics/osx/preferences/identifiers_black.png Binary files differindex c1c93924d..c1c93924d 100644 --- a/graphics/osx/preferences/identifiers.png +++ b/graphics/osx/preferences/identifiers_black.png diff --git a/graphics/osx/preferences/identifiers_white.png b/graphics/osx/preferences/identifiers_white.png Binary files differnew file mode 100644 index 000000000..4b9cd116b --- /dev/null +++ b/graphics/osx/preferences/identifiers_white.png diff --git a/graphics/osx/preferences/kdm_email@2x.png b/graphics/osx/preferences/kdm_email@2x_black.png Binary files differindex 32dbaa7e3..32dbaa7e3 100644 --- a/graphics/osx/preferences/kdm_email@2x.png +++ b/graphics/osx/preferences/kdm_email@2x_black.png diff --git a/graphics/osx/preferences/kdm_email@2x_white.png b/graphics/osx/preferences/kdm_email@2x_white.png Binary files differnew file mode 100644 index 000000000..c6b547f9c --- /dev/null +++ b/graphics/osx/preferences/kdm_email@2x_white.png diff --git a/graphics/osx/preferences/kdm_email.png b/graphics/osx/preferences/kdm_email_black.png Binary files differindex adbf81439..adbf81439 100644 --- a/graphics/osx/preferences/kdm_email.png +++ b/graphics/osx/preferences/kdm_email_black.png diff --git a/graphics/osx/preferences/kdm_email_white.png b/graphics/osx/preferences/kdm_email_white.png Binary files differnew file mode 100644 index 000000000..705c63313 --- /dev/null +++ b/graphics/osx/preferences/kdm_email_white.png diff --git a/graphics/osx/preferences/keys@2x.png b/graphics/osx/preferences/keys@2x_black.png Binary files differindex cdca69915..cdca69915 100644 --- a/graphics/osx/preferences/keys@2x.png +++ b/graphics/osx/preferences/keys@2x_black.png diff --git a/graphics/osx/preferences/keys@2x_white.png b/graphics/osx/preferences/keys@2x_white.png Binary files differnew file mode 100644 index 000000000..d2a70d4ee --- /dev/null +++ b/graphics/osx/preferences/keys@2x_white.png diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys_black.png Binary files differindex a512081a1..a512081a1 100644 --- a/graphics/osx/preferences/keys.png +++ b/graphics/osx/preferences/keys_black.png diff --git a/graphics/osx/preferences/keys_white.png b/graphics/osx/preferences/keys_white.png Binary files differnew file mode 100644 index 000000000..000b46eb6 --- /dev/null +++ b/graphics/osx/preferences/keys_white.png diff --git a/graphics/osx/preferences/locations@2x.png b/graphics/osx/preferences/locations@2x_black.png Binary files differindex b06decb37..b06decb37 100644 --- a/graphics/osx/preferences/locations@2x.png +++ b/graphics/osx/preferences/locations@2x_black.png diff --git a/graphics/osx/preferences/locations@2x_white.png b/graphics/osx/preferences/locations@2x_white.png Binary files differnew file mode 100644 index 000000000..939056a18 --- /dev/null +++ b/graphics/osx/preferences/locations@2x_white.png diff --git a/graphics/osx/preferences/locations.png b/graphics/osx/preferences/locations_black.png Binary files differindex 215ed3f61..215ed3f61 100644 --- a/graphics/osx/preferences/locations.png +++ b/graphics/osx/preferences/locations_black.png diff --git a/graphics/osx/preferences/locations_white.png b/graphics/osx/preferences/locations_white.png Binary files differnew file mode 100644 index 000000000..ba7594c6b --- /dev/null +++ b/graphics/osx/preferences/locations_white.png diff --git a/graphics/osx/preferences/notifications@2x.png b/graphics/osx/preferences/notifications@2x_black.png Binary files differindex 4349de64a..4349de64a 100644 --- a/graphics/osx/preferences/notifications@2x.png +++ b/graphics/osx/preferences/notifications@2x_black.png diff --git a/graphics/osx/preferences/notifications@2x_white.png b/graphics/osx/preferences/notifications@2x_white.png Binary files differnew file mode 100644 index 000000000..32ae1ff76 --- /dev/null +++ b/graphics/osx/preferences/notifications@2x_white.png diff --git a/graphics/osx/preferences/notifications.png b/graphics/osx/preferences/notifications_black.png Binary files differindex c6e8a6276..c6e8a6276 100644 --- a/graphics/osx/preferences/notifications.png +++ b/graphics/osx/preferences/notifications_black.png diff --git a/graphics/osx/preferences/notifications_white.png b/graphics/osx/preferences/notifications_white.png Binary files differnew file mode 100644 index 000000000..a11f216e5 --- /dev/null +++ b/graphics/osx/preferences/notifications_white.png diff --git a/graphics/osx/preferences/servers@2x.png b/graphics/osx/preferences/servers@2x_black.png Binary files differindex 7e188018b..7e188018b 100644 --- a/graphics/osx/preferences/servers@2x.png +++ b/graphics/osx/preferences/servers@2x_black.png diff --git a/graphics/osx/preferences/servers@2x_white.png b/graphics/osx/preferences/servers@2x_white.png Binary files differnew file mode 100644 index 000000000..d796f3f9b --- /dev/null +++ b/graphics/osx/preferences/servers@2x_white.png diff --git a/graphics/osx/preferences/servers.png b/graphics/osx/preferences/servers_black.png Binary files differindex 86be5bf0e..86be5bf0e 100644 --- a/graphics/osx/preferences/servers.png +++ b/graphics/osx/preferences/servers_black.png diff --git a/graphics/osx/preferences/servers_white.png b/graphics/osx/preferences/servers_white.png Binary files differnew file mode 100644 index 000000000..3a798a652 --- /dev/null +++ b/graphics/osx/preferences/servers_white.png diff --git a/graphics/osx/preferences/sound@2x.png b/graphics/osx/preferences/sound@2x_black.png Binary files differindex 8207d34dd..8207d34dd 100644 --- a/graphics/osx/preferences/sound@2x.png +++ b/graphics/osx/preferences/sound@2x_black.png diff --git a/graphics/osx/preferences/sound@2x_white.png b/graphics/osx/preferences/sound@2x_white.png Binary files differnew file mode 100644 index 000000000..a0579fde5 --- /dev/null +++ b/graphics/osx/preferences/sound@2x_white.png diff --git a/graphics/osx/preferences/sound.png b/graphics/osx/preferences/sound_black.png Binary files differindex 0998f5fde..0998f5fde 100644 --- a/graphics/osx/preferences/sound.png +++ b/graphics/osx/preferences/sound_black.png diff --git a/graphics/osx/preferences/sound_white.png b/graphics/osx/preferences/sound_white.png Binary files differnew file mode 100644 index 000000000..4ef33ab07 --- /dev/null +++ b/graphics/osx/preferences/sound_white.png diff --git a/graphics/osx/preferences/tms@2x.png b/graphics/osx/preferences/tms@2x_black.png Binary files differindex ddbf71955..ddbf71955 100644 --- a/graphics/osx/preferences/tms@2x.png +++ b/graphics/osx/preferences/tms@2x_black.png diff --git a/graphics/osx/preferences/tms@2x_white.png b/graphics/osx/preferences/tms@2x_white.png Binary files differnew file mode 100644 index 000000000..724451df4 --- /dev/null +++ b/graphics/osx/preferences/tms@2x_white.png diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms_black.png Binary files differindex cb34101ef..cb34101ef 100644 --- a/graphics/osx/preferences/tms.png +++ b/graphics/osx/preferences/tms_black.png diff --git a/graphics/osx/preferences/tms_white.png b/graphics/osx/preferences/tms_white.png Binary files differnew file mode 100644 index 000000000..09248cb28 --- /dev/null +++ b/graphics/osx/preferences/tms_white.png diff --git a/graphics/src/preferences.svg b/graphics/src/preferences_black.svg index 22e61c78b..22e61c78b 100644 --- a/graphics/src/preferences.svg +++ b/graphics/src/preferences_black.svg diff --git a/graphics/src/preferences_white.svg b/graphics/src/preferences_white.svg new file mode 100644 index 000000000..d1f84e7d5 --- /dev/null +++ b/graphics/src/preferences_white.svg @@ -0,0 +1,1066 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + sodipodi:docname="preferences_white.svg" + inkscape:version="1.1 (c4e8f9e, 2021-05-24)" + id="svg8" + version="1.1" + viewBox="0 0 8.4666796 8.4666595" + height="8.4666595mm" + width="8.4666796mm" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs2"> + <linearGradient + inkscape:collect="always" + id="linearGradient1314"> + <stop + style="stop-color:#808080;stop-opacity:1;" + offset="0" + id="stop1310" /> + <stop + style="stop-color:#808080;stop-opacity:0" + offset="1" + id="stop1312" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1314" + id="linearGradient1316" + x1="98.921783" + y1="144.93053" + x2="98.954666" + y2="146.41513" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.96689231,0,0,1.0056282,3.2689299,-0.77321996)" /> + </defs> + <sodipodi:namedview + inkscape:pagecheckerboard="false" + inkscape:snap-midpoints="false" + inkscape:snap-global="true" + inkscape:guide-bbox="true" + showguides="true" + inkscape:window-maximized="1" + inkscape:window-y="0" + inkscape:window-x="0" + inkscape:window-height="1043" + inkscape:window-width="1920" + showborder="true" + showgrid="false" + inkscape:document-rotation="0" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="110.99999" + inkscape:cx="-213.99998" + inkscape:zoom="2.0000002" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#212121" + id="base" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:showpageshadow="false" + inkscape:snap-bbox="true"> + <sodipodi:guide + id="guide3870" + orientation="0,-1" + position="-39.261579,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3874" + orientation="1,0" + position="-76.199937,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3876" + orientation="0,-1" + position="-67.733277,15.720472" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3878" + orientation="1,0" + position="-67.733287,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3880" + orientation="1,0" + position="-63.499987,-6.8724623" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3882" + orientation="1,0" + position="-50.799968,15.720482" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3884" + orientation="1,0" + position="-42.333308,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3886" + orientation="1,0" + position="-38.099999,20.778702" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3888" + orientation="1,0" + position="-25.39999,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3890" + orientation="1,0" + position="-16.933329,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3892" + orientation="1,0" + position="-12.699995,-6.8724623" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3894" + orientation="1,0" + position="-4.2333346,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3896" + orientation="1,0" + position="8.4666522,24.187142" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3898" + orientation="0,-1" + position="-76.199947,8.4666874" + inkscape:locked="false" /> + <sodipodi:guide + id="guide3900" + orientation="0,-1" + position="-76.199947,2.7135395e-05" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4307" + orientation="0,-1" + position="6.7044022,6.8856575" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4325" + orientation="0,-1" + position="18.906614,1.7542827" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4418" + orientation="0,-1" + position="-70.801877,7.6536375" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4420" + orientation="0,-1" + position="-70.801877,0.98050709" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4449" + orientation="0.00233919,-0.99999726" + position="-73.567837,5.6661875" + inkscape:locked="false" /> + <sodipodi:guide + id="guide4451" + orientation="0,-1" + position="6.0516822,2.9862076" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5336" + orientation="1,0" + position="-7.8309776e-06,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5410" + orientation="1,0" + position="-29.633339,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5442" + orientation="1,0" + position="-55.033338,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5504" + orientation="1,0" + position="-80.433327,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5536" + orientation="1,0" + position="-88.899987,-6.8724623" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5538" + orientation="1,0" + position="-105.83333,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5540" + orientation="1,0" + position="-93.133327,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5596" + orientation="1,0" + position="-118.53333,-15.339127" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5598" + orientation="1,0" + position="-114.3,-6.8724623" + inkscape:locked="false" /> + <sodipodi:guide + id="guide5600" + orientation="1,0" + position="-101.59999,-6.8724623" + inkscape:locked="false" /> + <sodipodi:guide + position="-126.99999,-46.96181" + orientation="1,0" + id="guide1238" /> + <sodipodi:guide + position="-131.23332,-55.42847" + orientation="1,0" + id="guide1240" /> + <sodipodi:guide + position="12.699999,-46.96181" + orientation="1,0" + id="guide1257" /> + <sodipodi:guide + position="21.166658,-46.96181" + orientation="1,0" + id="guide1289" /> + <sodipodi:guide + id="guide1102" + orientation="1,0" + position="33.866655,-55.42847" /> + <sodipodi:guide + id="guide1119" + orientation="1,0" + position="25.399995,-46.96181" /> + <inkscape:grid + type="xygrid" + id="grid1934" + spacingx="0.13229166" + spacingy="0.13229166" + empspacing="2" + empcolor="#3f3fff" + empopacity="0.49803922" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:groupmode="layer" + inkscape:label="Old" + style="display:inline" + transform="translate(-221.81526,-142.13316)"> + <image + xlink:href="no_tick.svg" + id="image2055" + height="68.000031" + width="68.000031" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="249.30568" + y="98.565674" /> + <image + xlink:href="defaults.svg" + id="image1269" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="120.21528" + y="126.41271" /> + <image + xlink:href="email.svg" + id="image1397" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="171.01529" + y="126.41271" /> + <image + xlink:href="kdm_email.svg" + id="image1684" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="183.71527" + y="126.41271" /> + <image + xlink:href="keys.svg" + id="image1948" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="145.61531" + y="126.41271" /> + <image + xlink:href="sound.svg" + id="image2205" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="107.51526" + y="126.41271" /> + <image + xlink:href="cover_sheet.svg" + id="image2404" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="209.11526" + y="126.41271" /> + <image + xlink:href="identifiers.svg" + id="image2657" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="221.81526" + y="126.41271" /> + <image + xlink:href="tms.svg" + id="image2918" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="158.31528" + y="126.41271" /> + <image + xlink:href="notifications.svg" + id="image3199" + height="8.4666662" + width="8.4666662" + inkscape:svg-dpi="96" + preserveAspectRatio="none" + x="196.41527" + y="126.41271" /> + <image + id="image3559" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAcuSURBVHjaYvz//z8DPuDu7s7w+/dvBkZG RgaQWhBmYmIGyvwHiXEzMjIXamlp5nz8+Onh8+fPz75//+HSw4cPzysqqjz4+fPH6wsXTv8DmYPL HoAAYmEgA/z7948BaLiutLTslLi4GDsHBweGb9++iT9//sLsxYsXDDdu3Pp6//79x8+evXz46tXz Cc+ePdmByyyAACLJAaBQ+PnzJz87O0epu7tnUXx8PKe4uBhIjIGDg5NBRUWFQU1NjcHJyYH7y5fv GgcOnNa4fv06E9AB14HaH2IzEyCAiHbA379/gVHxy0ZeXqEnIiLK3NbWDiz2/v0nkNOgDvzPwMLC zPDhw1eG27efM7x9+xUUXoJAQgyXAwACiCgHANMAHxsbW6OLi29OeHgki5CQEAPQh+CogKUNJiZG MH7w4BXD3bvPgeJMwFBhBTnrHzjB4AAAAcRChM+tJCWlJkRGxpmam1uCE+SHD5+RVPxnYGZmAkbD X4ZHj14yvHr1ERgKTAzs7OxAB/6Chw4uABBABB0gISHRVVPTYCosLAEM0ncMf/78AfsO5FuQ70GW f/r0leHp01fAhPgb6Gs2cDSwsrICMeEABggggiq4uLi5ZGQkGHh4eIBsFoaPH7+Cg//nz99g3795 85Xh5cv3YLWcnOxABzEDHccEdQAr2JH4AEAAEXQAMH7//fnzF8zm5uYAY1Cc//jxm+H06etAn78B +pqdgY2NBWw5BDOBfQ+iCQGAACKoAmQQKM43bTrCcPXqPbDvQb7i5GQDxy8ouGGWs7CwgPnMzIzg UABhQmkAIICIyAWMYMNB4Pr1h0Afv2ZQUJBiUFKSAvuQhYUVbjHMUlD6AMmB2ISiACCAmIgpfP78 +Qf2OTs7K4OAAC8wZ/wDlwEgC0ApHhbvsKwIw5AowO8AgABiIrboBcU9OzsbMO5/AbPiX6ADwHUB NMiZ4L6HsUE0KCoIBAADQAAxEbacAexzUIr++vUH2FIQH1IIMUAtZoCyIVkTFgKg7EoIAAQQwTQA Cn6Q7z08zIGJ8QvDu3efgJb/B0cBrByAWQqiIWxEKBByBEAAEZUIf//+B852oOAWExME+x7kCEQN C7OcAep7CM3KykzQdIAAYiEmEYLyPSjh/f79B2wxpC0Ak0dEAcwRsEIJGIFAPjgL4UwJAAFERF3w D1z6MTOzwRskoBCA1QMQCxmhoQAR5eDgAOaabwxbt24F1g3AfAs0Bpf5AAFEhAP+Mzx79g5o4C9w kIJ8BkqEoOwHiwIIDWkp8fBwMzx8+Jhh2bIlP7dsWXPk/ftXq4CST3CZDxBABB0Aind+fi5w7QZq eEBCgxGcK0ChAylo/oMLJGZmFoZDh44yLFo059np00d2//79Yz1Q8iAQf8BlPkAAsRAuitnYpKTE QDQ4WP/8AVZC/5jAloOiAhQlIMf9+PGTYfv2Df9Xr1589e7dq2uBWrcA8VUg/o7PfIAAIuiAV69e 3d2zZ6+uiYkRg7i4KAMnhzDDzTeXgK0UYIODnQMYAr+BQf6QYcOGtV+3bVt77MOHNyBfbwfiB8QU cgABxEioVSwoKKzEyMgSp66u6WVkZKrh4ujEy676l0FOXo7h7z0+hl179wJrxcN/du7csO3Tp49z gVqOAPE7LLUqVvMBAoigA6CVCShPKQKxjriYtJ2aio6FpaW1Gp8gP/+vX7+BifTun1Wrlkz69Olz G1DNW1AhxM3NDUywnMByQ4zhypUrOB0AEEDENkp/AvENIL758tXTnUAs+uL1g6SqqtpqMTFZhqNH v4AqpL+w7Kamps6gp6cDrqRu376D12CAACLoAC8vL4bv37/Ditj/586d+/z54/vPMorK5/UtHBiY GLkZ/p4+9//XX7Dl/zQ1NRl0dHTBOYaNjRVacOEGAAFE0AF8fHzAcu4/I6RxwcBgZmn9n5/51z8n /tfy0ldnMvwF5gjLzydY9vH+ErzDLs6mqqoKrLS+MAMbUuDsCaTxtooBAoigAxQVlXbLyckL/wXl O1AYM7H+Z//4iiGMcbaKgMpboAgvg7+cAKMCh3LkLoE0a05Olt+MkG4bqDXFtXr16o1ARXXQaMQA AAFE0AGamtrmoaFR3D9+/IAIALPev7s3GNgOAnObojfQRcIMDJ+OMagrfOKTC0zWYQQWXAz//4Hr CFAhtn//QQ+gLlBpeBab+QABRNABT5++YNq79zCkAAJFMhs7A8vDJwyWrz8wcL0FmvuTm4Hh132G V4/fMZzef5qBhe0vuGyGhgCw8PrMBQ4mHAAggAg64PDhfVv27t1hAMxGILX//wATIu/nn8yKom+k RDRPsTH8AQp/+8Rw/siPHxMPtr5iZfn3hxFejLOw3b9/7xGoc4XLfIAAIlgOAA0RBMa/LqiSgyYm EGbSYWTQFOZk0P3LyMDFBGyb3P3B8PopA8NpoNwLlMYEMHxAWRhozwts5gMEGAAM8r1vbXWZTwAA AABJRU5ErkJggg== " + preserveAspectRatio="none" + height="8.4666662" + width="8.4666662" + x="132.91527" + y="126.41271" /> + <g + transform="matrix(1.1551658,0,0,1.1392711,-38.903365,-20.430414)" + id="g1161" + style="stroke-width:0.23063583;stroke-miterlimit:4;stroke-dasharray:none;stroke:#ffffff;fill:#333333"> + <path + id="path1140" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.23063583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + inkscape:transform-center-y="0.82979223" + d="m 251.35104,149.66655 c -1.02681,-2.04753 -2.2451,-3.29197 -2.25653,-4.23965 -0.0447,-3.29377 4.44748,-3.29377 4.51308,0 0.006,1.11239 -1.27158,2.19212 -2.25655,4.23965 z" + sodipodi:nodetypes="cccc" + inkscape:transform-center-x="-2.8553886e-06" /> + <circle + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.23063583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="path1157" + cx="251.29668" + cy="145.24889" + r="0.97841752" /> + </g> + </g> + <g + inkscape:label="New" + id="layer2" + inkscape:groupmode="layer" + style="display:inline" + transform="translate(-221.81526,-142.13316)"> + <rect + y="144.91129" + x="108.70589" + height="2.9104164" + width="1.5875053" + id="rect4197" + style="vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.270809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:open="true" + sodipodi:arc-type="arc" + sodipodi:end="0.62542306" + sodipodi:start="5.6119701" + sodipodi:ry="4.2965121" + sodipodi:rx="4.0784903" + sodipodi:cy="146.3636" + sodipodi:cx="110.9753" + sodipodi:type="arc" + id="path4260" + style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 114.16903,143.69144 a 4.0784903,4.2965121 0 0 1 0.11277,5.18751" /> + <path + sodipodi:nodetypes="ccccc" + id="path4276" + d="m 110.29339,145.04358 2.64583,-2.24896 v 7.14375 l -2.64583,-2.24896 z" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <path + sodipodi:nodetypes="cc" + id="path4285" + d="m 123.65485,143.85295 h 3.43959" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + sodipodi:nodetypes="ccc" + id="path4309" + d="m 123.0911,142.96076 -1.36064,1.74783 -0.66542,-0.57233" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 123.65485,149.14462 h 3.43959" + id="path4285-2" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path4285-2-8" + d="m 123.65485,146.49878 h 3.43959" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <g + style="display:inline;fill:#333333;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke:#ffffff" + transform="translate(-25.44543,-0.13228854)" + id="g5160"> + <path + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 173.97111,146.36649 h 4.7625" + id="path4562" + sodipodi:nodetypes="cc" /> + <circle + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + id="path4580" + cx="172.9473" + cy="146.3665" + r="1.0585326" /> + <rect + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + id="rect4582" + width="1.0583345" + height="0.79375434" + x="177.54298" + y="146.36649" + ry="4.4042968e-06" /> + </g> + <rect + y="143.58836" + x="171.41214" + height="5.2916665" + width="7.672914" + id="rect4591" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.258206;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <path + id="path4718" + d="m 171.41214,143.58837 3.83653,3.57677 3.70409,-3.44448" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + sodipodi:nodetypes="ccc" /> + <path + id="path4720" + d="m 171.41214,148.88003 2.76231,-2.86677" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + d="m 176.30693,146.10191 2.77812,2.77812" + id="path4720-0" + sodipodi:nodetypes="cc" /> + <circle + r="3.4979" + cy="146.3665" + cx="200.67569" + id="path4787" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + sodipodi:nodetypes="ccccc" + id="path4877" + d="m 200.31495,147.28816 -0.20355,-3.25948 1.10682,-8.8e-4 -0.21968,3.25753 z" + style="display:inline;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-dashoffset:0;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" /> + <rect + y="148.26013" + x="200.42728" + height="0.47716767" + width="0.47716767" + id="rect4879" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;opacity:1;-inkscape-stroke:none;stop-opacity:1" /> + <rect + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + id="rect4416-5" + width="6.6145797" + height="8.2020779" + x="210.04131" + y="142.26546" /> + <path + id="path4911" + d="m 211.23193,143.58837 h 4.49791" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 211.23193,144.91128 h 1.85208" + id="path4911-6" /> + <path + id="path4911-6-9" + d="m 211.23193,146.2342 h 2.91041" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + id="path4911-6-2" + d="m 211.23193,147.55712 h 3.70416" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + id="path4911-6-24" + d="m 211.23193,148.88003 h 1.5875" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <rect + y="142.79462" + x="134.37047" + height="7.1437511" + width="5.8208375" + id="rect4416" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.274035;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + ry="0" /> + <path + id="path4422" + d="m 135.56109,145.17587 h 3.43959" + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 135.56109,146.2342 h 3.43959" + id="path4422-5" + sodipodi:nodetypes="cc" /> + <path + id="path4422-5-3" + d="m 135.56109,144.11753 h 3.43959" + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + id="path4981" + d="m 135.56109,148.88003 h 0.52917" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ef2929;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + sodipodi:nodetypes="cc" /> + <rect + ry="1.0526322" + rx="1.0333338" + y="143.58836" + x="221.94756" + height="5.2916737" + width="8.2020826" + id="rect5003" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.275945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + transform="scale(1,-1)" + sodipodi:arc-type="slice" + sodipodi:end="3.1415927" + sodipodi:start="0" + sodipodi:ry="1.145589" + sodipodi:rx="1.1472777" + sodipodi:cy="-147.45592" + sodipodi:cx="224.34216" + sodipodi:type="arc" + id="path5005" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 225.48944,-147.45592 a 1.1472777,1.145589 0 0 1 -0.57364,0.99211 1.1472777,1.145589 0 0 1 -1.14728,0 1.1472777,1.145589 0 0 1 -0.57363,-0.99211 h 1.14727 z" /> + <ellipse + cy="145.33148" + cx="224.37093" + id="path5007" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + rx="0.69045985" + ry="0.68944359" /> + <rect + y="142.79462" + x="225.91631" + height="1.0583328" + width="0.5291636" + id="rect5009" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + id="path5026" + d="m 226.57776,144.91128 h 2.38125" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 226.57776,147.55712 h 2.38125" + id="path5026-8" + sodipodi:nodetypes="cc" /> + <path + id="path5026-8-9" + d="m 226.57776,146.2342 h 2.38125" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <rect + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="rect4591-6" + width="7.1437454" + height="5.2916617" + x="184.37672" + y="145.17587" /> + <path + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + d="m 184.50901,145.30816 3.4363,3.49952 3.44287,-3.49952" + id="path4718-8" + sodipodi:nodetypes="ccc" /> + <path + sodipodi:nodetypes="cc" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + d="m 184.50901,150.33524 2.38125,-2.64583" + id="path4720-02" /> + <path + sodipodi:nodetypes="cc" + id="path4720-0-1" + d="m 189.00693,147.68941 2.51354,2.77812" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <g + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + transform="translate(12.632137,-3.0427151)" + id="g5160-5"> + <path + sodipodi:nodetypes="cc" + id="path4562-1" + d="m 173.86125,146.3665 4.7625,0" + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <circle + r="1.0585326" + cy="146.3665" + cx="172.9473" + id="path4580-1" + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="146.3665" + x="177.56541" + height="0.79374915" + width="1.0583351" + id="rect4582-0" + style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + ry="0" /> + </g> + <rect + y="156.3499" + x="158.61089" + height="5.7464957" + width="8.1710596" + id="rect5186" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + sodipodi:nodetypes="cccccc" + id="path5204" + d="m 158.61088,156.3499 2.29741,1e-5 c -0.11186,2.67756 -1.1942,2.82164 -2.24858,3.11185 0.80006,0.6658 0.98167,1.10334 0.9926,2.63465 l -1.04143,-2e-5 z" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.529169;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.529169;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 166.78193,156.34991 -2.2974,2e-5 c 0.11185,2.67755 1.19419,2.82163 2.24857,3.11184 -0.80005,0.66581 -0.98167,1.10334 -0.99259,2.63465 l 1.04142,-2e-5 z" + id="path5204-0" + sodipodi:nodetypes="cccccc" /> + <path + id="path5226" + d="m 159.25908,159.61251 h -0.94291" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <path + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + d="m 167.08217,159.61266 h -0.94291" + id="path5226-6" /> + <path + sodipodi:nodetypes="cc" + id="path5243" + d="m 159.92289,156.55554 c 0.22393,1.07871 -0.88582,2.33292 -1.18652,3.0127" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 159.63818,143.58837 h 5.82084 c 0.36236,0.51491 0.88791,0.92004 1.19063,1.19062 v 2.91042 c -0.41669,0.23146 -0.94165,0.69981 -1.19063,1.19062 h -5.82084 c -0.18245,-0.47189 -0.81101,-0.96279 -1.19062,-1.19062 v -2.91042 c 0.43314,-0.26661 1.05089,-0.81378 1.19062,-1.19062 z" + id="path5271" + sodipodi:nodetypes="ccccccccc" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 164.00381,143.72066 v 5.02708" + id="path5602" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + d="m 159.63818,145.44045 h 2.91042" + id="path5620" + sodipodi:nodetypes="cc" /> + <path + id="path5620-3" + d="m 159.63818,147.02795 h 2.91042" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + d="m 165.51981,156.59026 c -0.22393,1.07871 0.88582,2.33292 1.18652,3.0127" + id="path5243-0" + sodipodi:nodetypes="cc" /> + <path + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none" + d="m 123.0911,145.49381 -1.36064,1.74783 -0.66542,-0.57233" + id="path4309-3" + sodipodi:nodetypes="ccc" /> + <path + sodipodi:nodetypes="ccc" + id="path4309-3-6" + d="m 123.0911,148.08756 -1.36064,1.74783 -0.66542,-0.57233" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none" /> + <path + d="m 241.31866,145.98907 0.32801,-0.0482 0.19241,0.0187 0.54261,0.24564 v 0.32246 l -0.54261,0.24564 -0.19241,0.0187 -0.32801,-0.0482 -0.15562,0.58079 0.30815,0.1223 0.15727,0.11239 0.34711,0.48404 -0.16124,0.27926 -0.59274,-0.0586 -0.17597,-0.08 -0.25999,-0.20573 -0.42517,0.42517 0.20573,0.25999 0.08,0.17597 0.0586,0.59274 -0.27926,0.16124 -0.48404,-0.34711 -0.11239,-0.15727 -0.1223,-0.30815 -0.58079,0.15562 0.0482,0.32801 -0.0187,0.19241 -0.24564,0.54261 h -0.32246 l -0.24564,-0.54261 -0.0187,-0.19241 0.0482,-0.32801 -0.58079,-0.15562 -0.1223,0.30815 -0.11239,0.15727 -0.48404,0.34711 -0.27926,-0.16124 0.0586,-0.59274 0.08,-0.17597 0.20573,-0.25999 -0.42517,-0.42517 -0.25999,0.20573 -0.17597,0.08 -0.59274,0.0586 -0.16124,-0.27926 0.34711,-0.48404 0.15727,-0.11239 0.30815,-0.1223 -0.15562,-0.58079 -0.32801,0.0482 -0.19241,-0.0187 -0.54261,-0.24564 v -0.32246 l 0.54261,-0.24564 0.19241,-0.0187 0.32801,0.0482 0.15562,-0.58079 -0.30815,-0.1223 -0.15727,-0.11239 -0.34711,-0.48404 0.16124,-0.27926 0.59274,0.0586 0.17597,0.08 0.25999,0.20573 0.42517,-0.42517 -0.20573,-0.25999 -0.08,-0.17597 -0.0586,-0.59274 0.27926,-0.16124 0.48404,0.34711 0.11239,0.15727 0.1223,0.30815 0.58079,-0.15562 -0.0482,-0.32801 0.0187,-0.19241 0.24564,-0.54261 h 0.32246 l 0.24564,0.54261 0.0187,0.19241 -0.0482,0.32801 0.58079,0.15562 0.1223,-0.30815 0.11239,-0.15727 0.48404,-0.34711 0.27926,0.16124 -0.0586,0.59274 -0.08,0.17597 -0.20573,0.25999 0.42517,0.42517 0.25999,-0.20573 0.17597,-0.08 0.59274,-0.0586 0.16124,0.27926 -0.34711,0.48404 -0.15727,0.11239 -0.30815,0.1223 z" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="path4521" + inkscape:connector-curvature="0" /> + <circle + style="display:inline;fill:#333333;stroke:#ffffff;stroke-width:0.249;stroke-miterlimit:4;stroke-dasharray:none" + id="path4523" + cx="238.7486" + cy="146.36647" + r="1.4924972" /> + <rect + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="rect1291" + width="6.6145811" + height="6.879168" + x="95.74131" + y="142.79462" + ry="0" /> + <rect + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="rect1293" + width="2.1166694" + height="3.7041724" + x="97.990265" + y="144.38211" /> + <rect + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1316);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="rect1304" + width="2.1166694" + height="1.852089" + x="97.990265" + y="144.38211" /> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Bounding" + style="display:none;opacity:0.999" + transform="translate(-221.81526,-142.13316)" + sodipodi:insensitive="true"> + <rect + y="142.13316" + x="145.61531" + height="8.4666595" + width="8.4666796" + id="bounds-keys" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13316" + x="158.31526" + height="8.4666595" + width="8.4666796" + id="bounds-tms" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13316" + x="171.0153" + height="8.4666595" + width="8.4666796" + id="bounds-email" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13316" + x="183.71526" + height="8.4666595" + width="8.4666796" + id="bounds-kdm_email" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13316" + x="196.41528" + height="8.4666595" + width="8.4666796" + id="bounds-notifications" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13316" + x="209.11525" + height="8.4666595" + width="8.4666796" + id="bounds-cover_sheet" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="bounds-identifiers" + width="8.4666796" + height="8.4666595" + x="221.81526" + y="142.13316" /> + <rect + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="bounds-sound" + width="8.4666796" + height="8.4666595" + x="107.51525" + y="142.13316" /> + <rect + inkscape:export-ydpi="96" + inkscape:export-xdpi="96" + inkscape:export-filename="/home/carl/src/dcpomatic/graphics/osx/preferences/sound.png" + y="142.13316" + x="120.21528" + height="8.4666595" + width="8.4666796" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="bounds-defaults" /> + <rect + y="142.13316" + x="132.91527" + height="8.4666595" + width="8.4666796" + id="bounds-servers" + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13313" + x="94.815247" + height="8.4666595" + width="8.4666796" + id="bounds-general" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + y="142.13313" + x="234.51524" + height="8.4666595" + width="8.4666796" + id="bounds-advanced" + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" /> + <rect + style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" + id="bounds-locations" + width="8.4666796" + height="8.4666595" + x="247.21526" + y="142.13313" /> + </g> + <g + sodipodi:insensitive="true" + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Alignment" + style="display:none" + transform="translate(-221.81526,-142.13316)"> + <rect + y="142.13313" + x="75.307411" + height="8.4666662" + width="8.4666662" + id="rect3872" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8" + width="8.4666662" + height="8.4666662" + x="221.81526" + y="197.56163" /> + <rect + y="206.02829" + x="217.58192" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5" + width="12.7" + height="8.4666662" + x="204.88193" + y="206.02829" /> + <rect + y="197.56163" + x="209.11526" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-8" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="206.02829" + x="192.18193" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2-5-6" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-8-2" + width="8.4666662" + height="8.4666662" + x="196.41527" + y="197.56163" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5-6-8" + width="12.7" + height="8.4666662" + x="179.48193" + y="206.02829" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5-6-4" + width="12.7" + height="8.4666662" + x="166.78194" + y="206.02829" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5-6-7" + width="12.7" + height="8.4666662" + x="154.08194" + y="206.02829" /> + <rect + y="197.56163" + x="183.71527" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-8-2-4" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-8-2-4-0" + width="8.4666662" + height="8.4666662" + x="171.01527" + y="197.56163" /> + <rect + y="197.56163" + x="158.31528" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-8-2-4-0-6" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="206.02829" + x="141.38194" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2-5-6-7-2" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-8-2-4-0-6-9" + width="8.4666662" + height="8.4666662" + x="145.61528" + y="197.56163" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5-6-7-2-9" + width="12.7" + height="8.4666662" + x="128.68195" + y="206.02829" /> + <rect + y="206.02829" + x="115.98194" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2-5-6-7-2-9-0" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="197.56163" + x="132.91528" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-8-2-4-0-6-9-8" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-8-2-4-0-6-9-8-1" + width="8.4666662" + height="8.4666662" + x="120.21528" + y="197.56163" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-5-6-7-2-9-0-3" + width="12.7" + height="8.4666662" + x="103.28194" + y="206.02829" /> + <rect + y="197.56163" + x="107.51527" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-8-2-4-0-6-9-8-1-1" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="206.02829" + x="90.58194" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2-5-6-7-2-9-0-3-1" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-8-2-4-0-6-9-8-1-1-2" + width="8.4666662" + height="8.4666662" + x="94.815269" + y="197.56163" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-2-7" + width="12.7" + height="8.4666662" + x="230.28192" + y="206.02829" /> + <rect + y="197.56163" + x="234.51526" + height="8.4666662" + width="8.4666662" + id="rect3872-7-6-9-9-8-9" + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="206.02829" + x="242.98192" + height="8.4666662" + width="12.7" + id="rect3872-7-6-9-9-8-2-7-3" + style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="display:inline;opacity:1;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3872-7-6-9-9-8-9-6" + width="8.4666662" + height="8.4666662" + x="247.21526" + y="197.56163" /> + </g> +</svg> diff --git a/graphics/update b/graphics/update index f518b5b5b..0195c3695 100755 --- a/graphics/update +++ b/graphics/update @@ -80,9 +80,11 @@ else # OS X preferences icons mkdir -p osx/preferences - for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do - inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg - inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg + for c in black white; do + for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do + inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}_${c}.png --width 32 --height 32 src/preferences_$c.svg + inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}@2x_${c}.png --width 64 --height 64 src/preferences_$c.svg + done done # OS X menu bar icon for the server (in dark and light mode) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 3ae60143f..3285f7d1d 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -224,32 +224,19 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest" cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_editor.icns "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest" - cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/email*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/servers*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/tms*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/keys*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/sound*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest" cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 7148fd173..07ab2d8aa 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1054,7 +1054,7 @@ LocationsPage::GetName () const wxBitmap LocationsPage::GetLargeIcon () const { - return wxBitmap(bitmap_path("locations.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("locations"), wxBITMAP_TYPE_PNG); } #endif diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index c767929f7..a258e1fe2 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -88,7 +88,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("general.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("general"), wxBITMAP_TYPE_PNG); } #endif @@ -166,7 +166,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("keys.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("keys"), wxBITMAP_TYPE_PNG); } #endif @@ -197,7 +197,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("sound.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("sound"), wxBITMAP_TYPE_PNG); } #endif diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 40cb0c285..6b0be4603 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -84,6 +84,16 @@ using namespace boost::placeholders; using dcp::locale_convert; +#ifdef DCPOMATIC_OSX +static +wxString +icon_path(string name) +{ + return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name)); +} +#endif + + class FullGeneralPage : public GeneralPage { public: @@ -257,7 +267,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("defaults"), wxBITMAP_TYPE_PNG); } #endif @@ -615,7 +625,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("servers"), wxBITMAP_TYPE_PNG); } #endif @@ -678,7 +688,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG); } #endif @@ -789,7 +799,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("email"), wxBITMAP_TYPE_PNG); } #endif @@ -961,7 +971,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("kdm_email"), wxBITMAP_TYPE_PNG); } #endif @@ -1086,7 +1096,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("notifications"), wxBITMAP_TYPE_PNG); } #endif @@ -1262,7 +1272,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("cover_sheet"), wxBITMAP_TYPE_PNG); } #endif @@ -1321,7 +1331,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("identifiers"), wxBITMAP_TYPE_PNG); } #endif @@ -1439,7 +1449,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG); } #endif |
