diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-18 20:37:14 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-18 20:37:14 +0200 |
| commit | a2b97a1e3e4211a5c6b86ab780bcb9f5f4a9eeeb (patch) | |
| tree | 354d75141352ab018a7a7020a28c68691ec1a23e | |
| parent | e983d424808894dc9b036c46cd61d8fa39487dfd (diff) | |
| parent | 179685ef5cfb81d362282ee2fae526533e6404a3 (diff) | |
Improve the appearance of things in macOS dark mode in various ways.
| -rw-r--r-- | cscript | 15 | ||||
| -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/select.png | bin | 1295 -> 1318 bytes | |||
| -rw-r--r-- | graphics/select_black.png | bin | 0 -> 1318 bytes | |||
| -rw-r--r-- | graphics/select_white.png | bin | 0 -> 1266 bytes | |||
| -rw-r--r-- | graphics/sequence.png | bin | 715 -> 486 bytes | |||
| -rw-r--r-- | graphics/sequence_black.png | bin | 0 -> 486 bytes | |||
| -rw-r--r-- | graphics/sequence_white.png | bin | 0 -> 539 bytes | |||
| -rw-r--r-- | graphics/snap.png | bin | 1232 -> 1235 bytes | |||
| -rw-r--r-- | graphics/snap_black.png | bin | 0 -> 1235 bytes | |||
| -rw-r--r-- | graphics/snap_white.png | bin | 0 -> 1246 bytes | |||
| -rw-r--r-- | graphics/splash.png | bin | 39059 -> 39115 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 | ||||
| -rw-r--r-- | graphics/src/select.svg | 74 | ||||
| -rw-r--r-- | graphics/src/sequence.svg | 132 | ||||
| -rw-r--r-- | graphics/src/snap.svg | 98 | ||||
| -rw-r--r-- | graphics/src/timeline_black.svg | 199 | ||||
| -rw-r--r-- | graphics/src/timeline_white.svg | 189 | ||||
| -rw-r--r-- | graphics/src/zoom.svg | 74 | ||||
| -rw-r--r-- | graphics/src/zoom_all.svg | 81 | ||||
| -rwxr-xr-x | graphics/update | 14 | ||||
| -rw-r--r-- | graphics/wscript | 15 | ||||
| -rw-r--r-- | graphics/zoom.png | bin | 928 -> 924 bytes | |||
| -rw-r--r-- | graphics/zoom_all.png | bin | 1003 -> 957 bytes | |||
| -rw-r--r-- | graphics/zoom_all_black.png | bin | 0 -> 957 bytes | |||
| -rw-r--r-- | graphics/zoom_all_white.png | bin | 0 -> 1118 bytes | |||
| -rw-r--r-- | graphics/zoom_black.png | bin | 0 -> 924 bytes | |||
| -rw-r--r-- | graphics/zoom_white.png | bin | 0 -> 1094 bytes | |||
| -rw-r--r-- | platform/osx/make_dmg.sh | 49 | ||||
| -rw-r--r-- | platform/windows/wscript | 15 | ||||
| -rw-r--r-- | src/lib/release_notes.cc | 12 | ||||
| -rw-r--r-- | src/lib/release_notes.h | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/wx/audio_dialog.cc | 11 | ||||
| -rw-r--r-- | src/wx/audio_plot.cc | 20 | ||||
| -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 | 18 | ||||
| -rw-r--r-- | src/wx/html_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/timeline.cc | 2 | ||||
| -rw-r--r-- | src/wx/timeline_dialog.cc | 10 | ||||
| -rw-r--r-- | src/wx/timeline_labels_view.cc | 4 | ||||
| -rw-r--r-- | src/wx/timeline_reels_view.cc | 6 | ||||
| -rw-r--r-- | src/wx/timeline_time_axis_view.cc | 5 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 7 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 1 | ||||
| -rw-r--r-- | test/release_notes_test.cc | 4 |
99 files changed, 1583 insertions, 554 deletions
@@ -368,11 +368,16 @@ def make_spec(filename, version, target, options, requires=None): if can_build_disk(target): print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) - print('%{_datadir}/dcpomatic2/select.png', file=f) - print('%{_datadir}/dcpomatic2/sequence.png', file=f) - print('%{_datadir}/dcpomatic2/snap.png', file=f) - print('%{_datadir}/dcpomatic2/zoom.png', file=f) - print('%{_datadir}/dcpomatic2/zoom_all.png', file=f) + print('%{_datadir}/dcpomatic2/select_white.png', file=f) + print('%{_datadir}/dcpomatic2/select_black.png', file=f) + print('%{_datadir}/dcpomatic2/sequence_white.png', file=f) + print('%{_datadir}/dcpomatic2/sequence_black.png', file=f) + print('%{_datadir}/dcpomatic2/snap_white.png', file=f) + print('%{_datadir}/dcpomatic2/snap_black.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_white.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_black.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f) print('%{_datadir}/dcpomatic2/tick.png', file=f) print('%{_datadir}/dcpomatic2/no_tick.png', file=f) print('%{_datadir}/dcpomatic2/link.png', file=f) 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/select.png b/graphics/select.png Binary files differindex e7fb24106..aa0dbdcc5 100644 --- a/graphics/select.png +++ b/graphics/select.png diff --git a/graphics/select_black.png b/graphics/select_black.png Binary files differnew file mode 100644 index 000000000..aa0dbdcc5 --- /dev/null +++ b/graphics/select_black.png diff --git a/graphics/select_white.png b/graphics/select_white.png Binary files differnew file mode 100644 index 000000000..aa48c770a --- /dev/null +++ b/graphics/select_white.png diff --git a/graphics/sequence.png b/graphics/sequence.png Binary files differindex 85475031c..c16b7096f 100644 --- a/graphics/sequence.png +++ b/graphics/sequence.png diff --git a/graphics/sequence_black.png b/graphics/sequence_black.png Binary files differnew file mode 100644 index 000000000..c16b7096f --- /dev/null +++ b/graphics/sequence_black.png diff --git a/graphics/sequence_white.png b/graphics/sequence_white.png Binary files differnew file mode 100644 index 000000000..67592d0d9 --- /dev/null +++ b/graphics/sequence_white.png diff --git a/graphics/snap.png b/graphics/snap.png Binary files differindex 5beda9454..01580dcbd 100644 --- a/graphics/snap.png +++ b/graphics/snap.png diff --git a/graphics/snap_black.png b/graphics/snap_black.png Binary files differnew file mode 100644 index 000000000..01580dcbd --- /dev/null +++ b/graphics/snap_black.png diff --git a/graphics/snap_white.png b/graphics/snap_white.png Binary files differnew file mode 100644 index 000000000..801e9c599 --- /dev/null +++ b/graphics/snap_white.png diff --git a/graphics/splash.png b/graphics/splash.png Binary files differindex 0a9488dd3..31da602b6 100644 --- a/graphics/splash.png +++ b/graphics/splash.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/src/select.svg b/graphics/src/select.svg deleted file mode 100644 index 0ebba99c6..000000000 --- a/graphics/src/select.svg +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="35mm" - height="35mm" - viewBox="0 0 35.000001 35" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="select.svg"> - <defs - id="defs2" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="4.8524935" - inkscape:cy="34.228523" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1680" - inkscape:window-height="995" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - inkscape:snap-global="false" /> - <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" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-6.3144683,15.262769)"> - <path - style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - d="M 21.604698,2.5582203 37.559549,18.494139 c 0.739437,0.413423 1.494454,0.785898 2.673133,0.04548 0.773585,-1.191683 0.420947,-1.927565 0,-2.635791 L 24.205701,-0.15491415 c -6.5e-5,-0.0684839 -1.360739,1.61587825 -2.601003,2.71313445 z" - id="path5828" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <path - style="opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - d="M 36.6434,-0.90186321 C 26.383577,2.6511488 23.447169,6.069677 19.999778,17.261513 19.762588,18.031545 11.947724,-3.2916786 7.9848587,-13.668122 Z" - id="path5884" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cscc" /> - </g> -</svg> diff --git a/graphics/src/sequence.svg b/graphics/src/sequence.svg deleted file mode 100644 index 80ff46fcb..000000000 --- a/graphics/src/sequence.svg +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="35mm" - height="35mm" - viewBox="0 0 35.000001 35" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="sequence.svg"> - <defs - id="defs2"> - <marker - inkscape:stockid="Arrow1Send" - orient="auto" - refY="0.0" - refX="0.0" - id="Arrow1Send" - style="overflow:visible;" - inkscape:isstock="true"> - <path - id="path5962" - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " - style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1" - transform="scale(0.2) rotate(180) translate(6,0)" /> - </marker> - <marker - inkscape:stockid="Arrow1Mend" - orient="auto" - refY="0.0" - refX="0.0" - id="Arrow1Mend" - style="overflow:visible;" - inkscape:isstock="true"> - <path - id="path5956" - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " - style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1" - transform="scale(0.4) rotate(180) translate(10,0)" /> - </marker> - <marker - inkscape:stockid="Arrow1Lend" - orient="auto" - refY="0.0" - refX="0.0" - id="Arrow1Lend" - style="overflow:visible;" - inkscape:isstock="true"> - <path - id="path5950" - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" - transform="scale(0.8) rotate(180) translate(12.5,0)" /> - </marker> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.646104" - inkscape:cx="29.795572" - inkscape:cy="14.875552" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1680" - inkscape:window-height="995" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - showguides="false" - inkscape:guide-bbox="true"> - <sodipodi:guide - position="-45.391614,73.531585" - orientation="-0.70710678,0.70710678" - id="guide5836" - inkscape:locked="false" /> - </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" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-6.3144683,15.262769)"> - <rect - style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - id="rect5913" - width="14.908213" - height="27.597178" - x="0.76621103" - y="-11.259599" /> - <rect - style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - id="rect5913-5" - width="15.976793" - height="27.597178" - x="30.15259" - y="-11.259599" /> - <path - style="fill:#ff0000;stroke:#000000;stroke-width:1.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 41.021535,-0.45918235 H 23.318465 V -5.2084699 L 5.3984455,2.5580121 23.188295,10.313263 V 5.9104505 h 17.83324 z" - id="path5822" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccc" /> - </g> -</svg> diff --git a/graphics/src/snap.svg b/graphics/src/snap.svg deleted file mode 100644 index 93efd695e..000000000 --- a/graphics/src/snap.svg +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="35mm" - height="35mm" - viewBox="0 0 35.000001 35" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="snap.svg"> - <defs - id="defs2" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.646104" - inkscape:cx="78.707957" - inkscape:cy="65.653714" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1680" - inkscape:window-height="995" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - showguides="false" - inkscape:guide-bbox="true"> - <sodipodi:guide - position="-45.391614,73.531585" - orientation="-0.70710678,0.70710678" - id="guide5836" - inkscape:locked="false" /> - </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" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-6.3144683,15.262769)"> - <g - id="g5892" - transform="matrix(0.89522915,0,0,0.86858374,-35.262453,13.477405)" - style="stroke-width:1.13403654"> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path5834" - d="M 51.186866,5.924622 58.796301,4.6584122 C 46.035608,-33.625874 86.727695,-33.347165 73.857373,4.7734274 l 7.329493,1.1511946 c 18.111996,-49.172029 -48.026388,-50.240233 -30,0 z" - style="fill:#ff0000;stroke:none;stroke-width:2.00157428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path5871" - d="m 49.302163,-2.6483781 1.884701,8.5729689 7.609437,-1.2661786 -1.780293,-8.6306493 z" - style="fill:#b3b3b3;stroke:none;stroke-width:0.30004713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path5871-7" - d="m 73.857373,4.7734274 2.282549,-8.6879843 6.660056,1.2661787 -1.612755,8.5730903 z" - style="fill:#b3b3b3;stroke:none;stroke-width:0.30004713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path5834-6" - d="M 51.187222,5.9246091 58.796301,4.6584122 C 46.035608,-33.625874 86.727697,-33.347165 73.857373,4.7734274 l 7.32985,1.1511817 c 18.111996,-49.1720291 -48.026389,-50.2402331 -30.000001,0 z" - style="fill:none;stroke:#000000;stroke-width:2.00157428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> -</svg> diff --git a/graphics/src/timeline_black.svg b/graphics/src/timeline_black.svg new file mode 100644 index 000000000..58e27720a --- /dev/null +++ b/graphics/src/timeline_black.svg @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="210mm" + height="297mm" + viewBox="0 0 793.70081 1122.5197" + version="1.1" + id="svg831" + inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)" + sodipodi:docname="timeline.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview833" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:document-units="px" + showgrid="true" + inkscape:zoom="4" + inkscape:cx="9.125" + inkscape:cy="143.25" + inkscape:window-width="1920" + inkscape:window-height="1043" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1"> + <inkscape:grid + type="xygrid" + id="grid1158" + spacingx="0.13229167" + spacingy="0.13229167" + empspacing="2" /> + <sodipodi:guide + position="24.077084,216.30208" + orientation="0,18" + id="guide1500" /> + <sodipodi:guide + position="30.427083,218.28646" + orientation="8.0000013,0" + id="guide1617" /> + </sodipodi:namedview> + <defs + id="defs828" /> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Bounding" + style="display:none"> + <rect + y="81" + x="-60" + height="32" + width="32" + id="timeline-select" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="-24" + height="32" + width="32" + id="timeline-zoom" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="12" + height="32" + width="32" + id="timeline-zoom_all" + style="font-variation-settings:normal;display:inline;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" /> + <rect + y="81" + x="48" + height="32" + width="32" + id="timeline-snap" + style="font-variation-settings:normal;display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="84" + height="32" + width="32" + id="timeline-sequence" + style="font-variation-settings:normal;display:inline;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" /> + </g> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <g + id="g4213" + transform="matrix(3.9027502,0,0,3.9027502,-144.46067,-233.02714)" + style="stroke-width:0.384344;stroke-miterlimit:4;stroke-dasharray:none"> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5834" + d="m 50.349285,88.262618 1.557191,-0.251405 c -2.611342,-7.601293 5.715866,-7.545956 3.08209,0.02284 l 1.499904,0.228568 c 3.706429,-9.76304 -9.828096,-9.975131 -6.139185,0 z" + style="fill:#ff0000;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5871" + d="m 49.9636,86.56046 0.385684,1.702152 1.557192,-0.251399 -0.364319,-1.713603 z" + style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5871-7" + d="m 54.988566,88.03405 0.4671,-1.724988 1.36291,0.251398 -0.330033,1.702176 z" + style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5834-6" + d="m 50.349358,88.262615 1.557118,-0.251402 c -2.611342,-7.601293 5.715867,-7.545956 3.08209,0.02284 l 1.499977,0.228565 c 3.70643,-9.76304 -9.828097,-9.97513 -6.139185,0 z" + style="fill:none;stroke:#000000;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <path + style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="M -10.453236,96.465086 3.6389414,110.54054 c 0.6531099,0.36517 1.3199842,0.69414 2.3610569,0.0402 0.6832704,-1.05256 0.3718144,-1.70252 0,-2.32807 L -8.1558906,94.068703 c -5.64e-5,-0.06049 -1.201877,1.427229 -2.2973454,2.396383 z" + id="path5828-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <ellipse + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="path5809" + cx="-11.403519" + cy="93.370117" + rx="10.950784" + ry="10.950711" /> + <path + style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m 25.586972,96.505865 13.970902,13.954315 c 0.647489,0.36203 1.308623,0.68817 2.340733,0.0398 0.677391,-1.04349 0.368609,-1.68787 0,-2.30803 L 27.864547,94.130095 c -6e-5,-0.05998 -1.191538,1.414951 -2.277575,2.37577 z" + id="path5828-3-6" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <ellipse + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="path5809-2" + cx="24.644865" + cy="93.437508" + rx="10.856544" + ry="10.856471" /> + <rect + style="fill:#cccccc;fill-opacity:1;stroke:#666666;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5806" + width="16.286842" + height="10.000005" + x="16.5" + y="88.5" + ry="0.0693992" /> + <rect + style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5913" + width="9.0000076" + height="16.999996" + x="85.499992" + y="88.500015" /> + <rect + style="display:inline;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5913-9" + width="9.0000076" + height="16.999996" + x="105.49999" + y="88.5" /> + <path + style="fill:#ff0000;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 110.5,94.500002 h -10 v -3.5 L 88.000002,97.000009 100.5,103 v -3.499997 h 10 z" + id="path5822" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <g + id="g4193" + transform="matrix(3.9193814,0,0,3.9193814,-141.96024,-235.32292)" + style="stroke-width:0.255142;stroke-miterlimit:4;stroke-dasharray:none"> + <path + style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m 24.29557,84.6902 3.665328,3.660979 c 0.169872,0.09498 0.343323,0.180545 0.614102,0.01045 0.177717,-0.273767 0.09671,-0.442822 0,-0.605523 L 24.893101,84.06691 c -1.5e-5,-0.01573 -0.312604,0.371218 -0.597531,0.623292 z" + id="path5828" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m 27.75043,83.895311 c -2.357002,0.816238 -3.031587,1.601581 -3.823561,4.172695 -0.05449,0.176901 -1.849808,-4.721711 -2.760202,-7.105504 z" + id="path5884" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscc" /> + </g> + </g> +</svg> diff --git a/graphics/src/timeline_white.svg b/graphics/src/timeline_white.svg new file mode 100644 index 000000000..14dd8ccce --- /dev/null +++ b/graphics/src/timeline_white.svg @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="210mm" + height="297mm" + viewBox="0 0 793.70081 1122.5197" + version="1.1" + id="svg831" + inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)" + sodipodi:docname="timeline_white.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview833" + pagecolor="#1f1f1f" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + inkscape:pagecheckerboard="0" + inkscape:document-units="px" + showgrid="true" + inkscape:zoom="4" + inkscape:cx="36.125" + inkscape:cy="37" + inkscape:window-width="1920" + inkscape:window-height="1011" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1"> + <inkscape:grid + type="xygrid" + id="grid1158" + spacingx="0.13229167" + spacingy="0.13229167" + empspacing="2" /> + <sodipodi:guide + position="24.077084,216.30208" + orientation="0,18" + id="guide1500" /> + <sodipodi:guide + position="30.427083,218.28646" + orientation="8.0000013,0" + id="guide1617" /> + </sodipodi:namedview> + <defs + id="defs828" /> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Bounding" + style="display:none"> + <rect + y="81" + x="-60" + height="32" + width="32" + id="timeline-select" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="-24" + height="32" + width="32" + id="timeline-zoom" + style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="12" + height="32" + width="32" + id="timeline-zoom_all" + style="font-variation-settings:normal;display:inline;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" /> + <rect + y="81" + x="48" + height="32" + width="32" + id="timeline-snap" + style="font-variation-settings:normal;display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" /> + <rect + y="81" + x="84" + height="32" + width="32" + id="timeline-sequence" + style="font-variation-settings:normal;display:inline;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" /> + </g> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5834" + d="m 52.040012,111.43981 6.077328,-0.98117 c -10.191416,-29.665949 22.307597,-29.449982 12.028627,0.0891 l 5.853751,0.89204 c 14.465266,-38.102705 -38.356604,-38.930443 -23.959706,0 z" + style="fill:#ff0000;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5871" + d="m 50.53478,104.79671 1.505228,6.64308 6.077332,-0.98115 -1.421846,-6.68777 z" + style="fill:#333333;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5871-7" + d="m 70.145967,110.54777 1.822975,-6.7322 5.319097,0.98114 -1.288037,6.64317 z" + style="fill:#333333;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path5834-6" + d="m 52.040297,111.4398 6.077043,-0.98116 c -10.191416,-29.665949 22.307601,-29.449982 12.028627,0.0891 l 5.854035,0.89203 c 14.465271,-38.102706 -38.356607,-38.930441 -23.959705,0 z" + style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="M -10.453236,96.465086 3.6389414,110.54054 c 0.6531099,0.36517 1.3199842,0.69414 2.3610569,0.0402 0.6832704,-1.05256 0.3718144,-1.70252 0,-2.32807 L -8.1558906,94.068703 c -5.64e-5,-0.06049 -1.201877,1.427229 -2.2973454,2.396383 z" + id="path5828-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <ellipse + style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="path5809" + cx="-11.403519" + cy="93.370117" + rx="10.950784" + ry="10.950711" /> + <path + style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m 25.586972,96.505865 13.970902,13.954315 c 0.647489,0.36203 1.308623,0.68817 2.340733,0.0398 0.677391,-1.04349 0.368609,-1.68787 0,-2.30803 L 27.864547,94.130095 c -6e-5,-0.05998 -1.191538,1.414951 -2.277575,2.37577 z" + id="path5828-3-6" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <ellipse + style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="path5809-2" + cx="24.644865" + cy="93.437508" + rx="10.856544" + ry="10.856471" /> + <rect + style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5806" + width="16.286842" + height="10.000005" + x="16.5" + y="88.5" + ry="0.0693992" /> + <rect + style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5913" + width="9.0000076" + height="16.999996" + x="85.499992" + y="88.500015" /> + <rect + style="display:inline;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + id="rect5913-9" + width="9.0000076" + height="16.999996" + x="105.49999" + y="88.5" /> + <path + style="fill:#ff0000;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 110.5,94.500002 h -10 v -3.5 L 88.000002,97.000009 100.5,103 v -3.499997 h 10 z" + id="path5822" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m -46.736635,96.610275 14.365819,14.348775 c 0.665793,0.37226 1.345613,0.70762 2.4069,0.041 0.69654,-1.073 0.379043,-1.73559 0,-2.37328 L -44.394683,94.167363 c -5.9e-5,-0.06165 -1.225214,1.454945 -2.341952,2.442919 z" + id="path5828" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" + d="m -33.195721,93.494801 c -9.23799,3.199149 -11.881946,6.277207 -14.985994,16.354379 -0.213567,0.69335 -7.250103,-18.506182 -10.818284,-27.849176 z" + id="path5884" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscc" /> + </g> +</svg> diff --git a/graphics/src/zoom.svg b/graphics/src/zoom.svg deleted file mode 100644 index 26e4c36b7..000000000 --- a/graphics/src/zoom.svg +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="35mm" - height="35mm" - viewBox="0 0 35.000001 35" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="zoom.svg"> - <defs - id="defs2" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.8284272" - inkscape:cx="-24.841773" - inkscape:cy="49.172909" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1680" - inkscape:window-height="995" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" /> - <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" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-6.3144683,15.262769)"> - <path - style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - d="M 21.219999,2.4159489 37.174851,18.351868 c 0.739437,0.413423 1.494454,0.785898 2.673133,0.04548 0.773585,-1.191683 0.420947,-1.927565 0,-2.635791 L 23.821002,-0.29718512 c -6.5e-5,-0.06848 -1.360739,1.61587802 -2.601003,2.71313402 z" - id="path5828-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <ellipse - style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - id="path5809" - cx="20.144106" - cy="-1.0881108" - rx="12.398235" - ry="12.398153" /> - </g> -</svg> diff --git a/graphics/src/zoom_all.svg b/graphics/src/zoom_all.svg deleted file mode 100644 index a1b253a77..000000000 --- a/graphics/src/zoom_all.svg +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="35mm" - height="35mm" - viewBox="0 0 35.000001 35" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="zoom_all.svg"> - <defs - id="defs2" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.8284272" - inkscape:cx="51.216883" - inkscape:cy="46.646647" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1680" - inkscape:window-height="995" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" /> - <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" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-6.3144683,15.262769)"> - <path - style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - d="M 21.219999,2.4159489 37.174851,18.351868 c 0.739437,0.413423 1.494454,0.785898 2.673133,0.04548 0.773585,-1.191683 0.420947,-1.927565 0,-2.635791 L 23.821002,-0.29718512 c -6.5e-5,-0.06848 -1.360739,1.61587802 -2.601003,2.71313402 z" - id="path5828-3" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccc" /> - <ellipse - style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - id="path5809" - cx="20.144106" - cy="-1.0881108" - rx="12.398235" - ry="12.398153" /> - <rect - style="opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#666666;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none" - id="rect5806" - width="17.96051" - height="10.196332" - x="11.163851" - y="-6.1862769" /> - </g> -</svg> diff --git a/graphics/update b/graphics/update index f518b5b5b..f42c3182b 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) @@ -93,8 +95,10 @@ else $INKSCAPE_EXPORT --export-filename=splash.png src/splash.svg -w 400 -h 300 # Timeline toolbar icons (all platforms) - for i in select zoom zoom_all snap sequence; do - $INKSCAPE_EXPORT --export-filename=$i.png src/$i.svg -w 32 -h 32 + for c in black white; do + for i in select zoom zoom_all snap sequence; do + inkbatch --inkscape $INKSCAPE -i timeline-$i -o ${i}_${c}.png --width 32 --height 32 src/timeline_$c.svg + done done # Playlist editor tick/no-tick diff --git a/graphics/wscript b/graphics/wscript index c87904683..c67d0695b 100644 --- a/graphics/wscript +++ b/graphics/wscript @@ -39,11 +39,16 @@ def build(bld): if not bld.env.TARGET_WINDOWS_64 and not bld.env.TARGET_WINDOWS_32 and not bld.env.DISABLE_GUI: bld.install_as('${PREFIX}/share/dcpomatic2/dcpomatic2_server_small.png', 'linux/16/dcpomatic2.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'splash.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'select.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'snap.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'select_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'select_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_black.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_white.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_black.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'me.jpg') bld.install_files('${PREFIX}/share/dcpomatic2', 'tick.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'no_tick.png') diff --git a/graphics/zoom.png b/graphics/zoom.png Binary files differindex 6a024a91f..4633c8cb3 100644 --- a/graphics/zoom.png +++ b/graphics/zoom.png diff --git a/graphics/zoom_all.png b/graphics/zoom_all.png Binary files differindex 4c2edbf28..19ccb7148 100644 --- a/graphics/zoom_all.png +++ b/graphics/zoom_all.png diff --git a/graphics/zoom_all_black.png b/graphics/zoom_all_black.png Binary files differnew file mode 100644 index 000000000..19ccb7148 --- /dev/null +++ b/graphics/zoom_all_black.png diff --git a/graphics/zoom_all_white.png b/graphics/zoom_all_white.png Binary files differnew file mode 100644 index 000000000..ed376ec37 --- /dev/null +++ b/graphics/zoom_all_white.png diff --git a/graphics/zoom_black.png b/graphics/zoom_black.png Binary files differnew file mode 100644 index 000000000..4633c8cb3 --- /dev/null +++ b/graphics/zoom_black.png diff --git a/graphics/zoom_white.png b/graphics/zoom_white.png Binary files differnew file mode 100644 index 000000000..50890f120 --- /dev/null +++ b/graphics/zoom_white.png diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 3ae60143f..40eabef1f 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -224,42 +224,29 @@ 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" cp $prefix/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf cp $prefix/src/dcpomatic/graphics/splash.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom.png "$dest" - cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest" - cp $prefix/src/dcpomatic/graphics/select.png "$dest" - cp $prefix/src/dcpomatic/graphics/snap.png "$dest" - cp $prefix/src/dcpomatic/graphics/sequence.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom*.png "$dest" + cp $prefix/src/dcpomatic/graphics/zoom_all*.png "$dest" + cp $prefix/src/dcpomatic/graphics/select*.png "$dest" + cp $prefix/src/dcpomatic/graphics/snap*.png "$dest" + cp $prefix/src/dcpomatic/graphics/sequence*.png "$dest" cp $prefix/src/dcpomatic/graphics/me.jpg "$dest" cp $prefix/src/dcpomatic/graphics/link.png "$dest" cp $prefix/src/dcpomatic/graphics/tick.png "$dest" diff --git a/platform/windows/wscript b/platform/windows/wscript index 84291b3ca..94b7fc3d3 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -306,11 +306,16 @@ File "%resources%/../../fonts/LiberationSans-Italic.ttf" File "%resources%/../../fonts/LiberationSans-Bold.ttf" File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows" File "%graphics%/splash.png" -File "%graphics%/zoom.png" -File "%graphics%/zoom_all.png" -File "%graphics%/select.png" -File "%graphics%/snap.png" -File "%graphics%/sequence.png" +File "%graphics%/zoom_white.png" +File "%graphics%/zoom_black.png" +File "%graphics%/zoom_all_white.png" +File "%graphics%/zoom_all_black.png" +File "%graphics%/select_white.png" +File "%graphics%/select_black.png" +File "%graphics%/snap_white.png" +File "%graphics%/snap_black.png" +File "%graphics%/sequence_white.png" +File "%graphics%/sequence_black.png" File "%graphics%/me.jpg" File "%graphics%/tick.png" File "%graphics%/no_tick.png" diff --git a/src/lib/release_notes.cc b/src/lib/release_notes.cc index 236713184..d69738427 100644 --- a/src/lib/release_notes.cc +++ b/src/lib/release_notes.cc @@ -31,7 +31,7 @@ using boost::optional; optional<string> -find_release_notes(optional<string> current) +find_release_notes(bool dark, optional<string> current) { auto last = Config::instance()->last_release_notes_version(); if (!current) { @@ -43,14 +43,18 @@ find_release_notes(optional<string> current) Config::instance()->set_last_release_notes_version(*current); - const string header = String::compose("<h1>DCP-o-matic %1 release notes</h1>", *current); + string const colour = dark ? "white" : "black"; + auto const span = String::compose("<span style=\"color: %1\">", colour); + + const string header = String::compose("<h1>%1DCP-o-matic %2 release notes</span></h1>", span, *current); if (!last) { - return header + + return header + span + _("In this version there are changes to the way that subtitles are positioned. " "Positioning should now be more correct, with respect to the standards, but you " "should check any subtitles in your project to make sure that they are placed " - "where you want them."); + "where you want them.") + + "</span>"; } return {}; diff --git a/src/lib/release_notes.h b/src/lib/release_notes.h index a5026b432..d0837248b 100644 --- a/src/lib/release_notes.h +++ b/src/lib/release_notes.h @@ -23,4 +23,4 @@ #include <string> -extern boost::optional<std::string> find_release_notes(boost::optional<std::string> current = boost::optional<std::string>()); +extern boost::optional<std::string> find_release_notes(bool dark, boost::optional<std::string> current = boost::optional<std::string>()); diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index eec81d3c8..001d1859e 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1746,7 +1746,7 @@ private: UpdateChecker::instance()->run (); } - auto release_notes = find_release_notes(); + auto release_notes = find_release_notes(gui_is_dark()); if (release_notes) { auto notes = new HTMLDialog(nullptr, _("Release notes"), std_to_wx(*release_notes), true); notes->Centre(); diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index a4f1dd514..e433f45fd 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -399,10 +399,13 @@ AudioDialog::setup_statistics () ) ); + wxColour const peaking = *wxRED; + wxColour const not_peaking = gui_is_dark() ? *wxWHITE : *wxBLACK; + if (peak_dB > -3) { - _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); + _sample_peak->SetForegroundColour(peaking); } else { - _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); + _sample_peak->SetForegroundColour(not_peaking); } if (_analysis->overall_true_peak()) { @@ -412,9 +415,9 @@ AudioDialog::setup_statistics () _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB)); if (peak_dB > -3) { - _true_peak->SetForegroundColour (wxColour (255, 0, 0)); + _true_peak->SetForegroundColour(peaking); } else { - _true_peak->SetForegroundColour (wxColour (0, 0, 0)); + _true_peak->SetForegroundColour(not_peaking); } } diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 59df0425b..cac939ac0 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -72,7 +72,11 @@ AudioPlot::AudioPlot(wxWindow* parent, FilmViewer& viewer) _type_visible[i] = false; } - _colours.push_back (wxColour ( 0, 0, 0)); + if (gui_is_dark()) { + _colours.push_back(wxColour(255, 255, 255)); + } else { + _colours.push_back(wxColour(0, 0, 0)); + } _colours.push_back (wxColour (255, 0, 0)); _colours.push_back (wxColour ( 0, 255, 0)); _colours.push_back (wxColour (139, 0, 204)); @@ -165,14 +169,14 @@ AudioPlot::paint () gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); if (!_analysis || _analysis->channels() == 0) { - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + gc->SetFont(gc->CreateFont(*wxNORMAL_FONT, gui_is_dark() ? *wxWHITE : *wxBLACK)); gc->DrawText (_message, 32, 32); delete gc; return; } auto h_grid = gc->CreatePath (); - gc->SetFont (gc->CreateFont (*wxSMALL_FONT)); + gc->SetFont(gc->CreateFont(*wxSMALL_FONT, gui_is_dark() ? *wxWHITE : *wxBLACK)); wxDouble db_label_height; wxDouble db_label_descent; wxDouble db_label_leading; @@ -195,7 +199,9 @@ AudioPlot::paint () gc->DrawText (std_to_wx (String::compose ("%1dB", i)), 0, y - (db_label_height / 2)); } - gc->SetPen (wxPen (wxColour (200, 200, 200))); + wxColour const grid_colour = gui_is_dark() ? wxColour(80, 80, 80) : wxColour(200, 200, 200); + + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (h_grid); /* Draw an x axis with marks */ @@ -205,8 +211,6 @@ AudioPlot::paint () DCPOMATIC_ASSERT (_analysis->samples_per_point() != 0.0); double const pps = _analysis->sample_rate() * metrics.x_scale / _analysis->samples_per_point(); - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - double const mark_interval = calculate_mark_interval (rint (128 / pps)); auto t = DCPTime::from_seconds (mark_interval); @@ -234,7 +238,7 @@ AudioPlot::paint () t += DCPTime::from_seconds (mark_interval); } - gc->SetPen (wxPen (wxColour (200, 200, 200))); + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (v_grid); if (_type_visible[AudioPoint::PEAK]) { @@ -265,7 +269,7 @@ AudioPlot::paint () axes.MoveToPoint (metrics.db_label_width, 0); axes.AddLineToPoint (metrics.db_label_width, metrics.height - metrics.y_origin); axes.AddLineToPoint (metrics.db_label_width + data_width, metrics.height - metrics.y_origin); - gc->SetPen (wxPen (wxColour (0, 0, 0))); + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (axes); if (_cursor) { 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..1aeacd3ca 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -257,7 +257,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 +615,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 +678,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 +789,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 +961,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 +1086,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 +1262,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 +1321,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 +1439,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 diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index 19c3aaf2a..c8138c8cd 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -52,6 +52,10 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html, bool ok h->SetPage (html); sizer->Add (h, 1, wxEXPAND | wxALL, 6); + if (gui_is_dark()) { + h->SetHTMLBackgroundColour(*wxBLACK); + } + h->Bind (wxEVT_HTML_LINK_CLICKED, boost::bind(&HTMLDialog::link_clicked, this, _1)); SetSizer (sizer); diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 6886daa42..a9372b6bb 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -207,7 +207,7 @@ Timeline::paint_main () if (_zoom_point) { /* Translate back as _down_point and _zoom_point do not take scroll into account */ gc->Translate (vsx * _x_scroll_rate, vsy * _y_scroll_rate); - gc->SetPen (*wxBLACK_PEN); + gc->SetPen(gui_is_dark() ? *wxWHITE_PEN : *wxBLACK_PEN); gc->SetBrush (*wxTRANSPARENT_BRUSH); gc->DrawRectangle ( min (_down_point.x, _zoom_point->x), diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 91737f204..0d05e66d6 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -63,11 +63,11 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView { auto sizer = new wxBoxSizer (wxVERTICAL); - wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG); - wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG); - wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG); - wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG); - wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG); + wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG); + wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG); + wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG); + wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG); + wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG); _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL); _toolbar->SetMargins (4, 4); diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc index 7075d4b7d..181adc5ca 100644 --- a/src/wx/timeline_labels_view.cc +++ b/src/wx/timeline_labels_view.cc @@ -21,6 +21,7 @@ #include "timeline.h" #include "timeline_labels_view.h" +#include "wx_util.h" #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <wx/graphics.h> @@ -64,7 +65,8 @@ void TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>) { int const h = _timeline.pixels_per_track (); - gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour(0, 0, 0))); + wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK; + gc->SetFont(gc->CreateFont(wxNORMAL_FONT->Bold(), colour)); int fy = 0; if (_video_tracks) { diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc index 331f6580d..2ec8f9e82 100644 --- a/src/wx/timeline_reels_view.cc +++ b/src/wx/timeline_reels_view.cc @@ -21,6 +21,7 @@ #include "timeline.h" #include "timeline_reels_view.h" +#include "wx_util.h" #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <wx/graphics.h> @@ -65,14 +66,15 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>) double const pps = _timeline.pixels_per_second().get (); - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 255), 1, wxPENSTYLE_SOLID)); + wxColour const colour = gui_is_dark() ? wxColour(182, 204, 240) : wxColour(0, 0, 255); + gc->SetPen(*wxThePenList->FindOrCreatePen(colour, 1, wxPENSTYLE_SOLID)); auto path = gc->CreatePath (); path.MoveToPoint (time_x (DCPTime (0)), _y); path.AddLineToPoint (time_x (_timeline.film()->length()), _y); gc->StrokePath (path); - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, wxColour (0, 0, 255))); + gc->SetFont(gc->CreateFont(*wxNORMAL_FONT, colour)); int reel = 1; for (auto i: _timeline.film()->reels()) { diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc index 023b42ec7..3b1b3cd99 100644 --- a/src/wx/timeline_time_axis_view.cc +++ b/src/wx/timeline_time_axis_view.cc @@ -67,7 +67,8 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> double const pps = _timeline.pixels_per_second().get (); - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); + wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK; + gc->SetPen(*wxThePenList->FindOrCreatePen(colour, 1, wxPENSTYLE_SOLID)); double const mark_interval = calculate_mark_interval (rint (128 / pps)); @@ -78,7 +79,7 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> path.AddLineToPoint (_timeline.width(), y); gc->StrokePath (path); - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + gc->SetFont(gc->CreateFont(*wxNORMAL_FONT, colour)); /* Time in seconds */ DCPTime t; diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 9d9d4c599..074f47d61 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -651,6 +651,13 @@ bitmap_path (string name) } +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)); +} + + wxSize small_button_size (wxWindow* parent, wxString text) { diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index fb1a3a001..50fb7268f 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -119,6 +119,7 @@ extern double calculate_mark_interval (double start); extern bool display_progress (wxString title, wxString task); extern bool report_errors_from_last_job (wxWindow* parent); extern wxString bitmap_path (std::string name); +extern wxString icon_path(std::string name); extern wxSize small_button_size (wxWindow* parent, wxString text); extern bool gui_is_dark (); extern double dpi_scale_factor (wxWindow* window); diff --git a/test/release_notes_test.cc b/test/release_notes_test.cc index 394de5959..c05ad2618 100644 --- a/test/release_notes_test.cc +++ b/test/release_notes_test.cc @@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE(release_notes_test1) { for (auto version: { "2.16.19", "2.16.20", "2.18.0", "2.18.1devel6" }) { Config::instance()->unset_last_release_notes_version(); - auto notes = find_release_notes(string(version)); + auto notes = find_release_notes(true, string(version)); BOOST_CHECK(notes.get_value_or("").find("In this version there are changes to the way that subtitles are positioned.") != string::npos); } } @@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(release_notes_test2) { for (auto version: { "2.16.19", "2.16.20", "2.18.0", "2.18.1devel6" }) { Config::instance()->set_last_release_notes_version("2.16.19"); - auto notes = find_release_notes(string(version)); + auto notes = find_release_notes(false, string(version)); BOOST_CHECK(!static_cast<bool>(notes)); } } |
