5.0 icon updates

icons.sh

@@ -10,11 +10,12 @@ fi
 # Determine the ImageMagick executable.
 magick=magick
 $magick >/dev/null 2>&1 || magick=magick.exe
+$magick >/dev/null 2>&1 || magick=$(ls /c/Program\ Files/ImageMagick-*/magick.exe)
 
 # Convert icons to PNG.
 for i in "$1/src/qt/icons/"*.ico
 do
-	$magick convert "$i" "usage/images/$(basename $i | sed -e 's/.ico$//').png"
+	"$magick" convert "$i" "usage/images/$(basename $i | sed -e 's/.ico$//').png"
 done
 
 # Remove unnecessary icons.

include.rst

@@ -6,13 +6,19 @@
 
 .. |acpi_shutdown| image:: /usage/images/acpi_shutdown.png
 .. |acpi_shutdown_small| image:: /usage/images/acpi_shutdown_small.png
+.. |browse| image:: /usage/images/browse.png
+.. |browse_small| image:: /usage/images/browse_small.png
 .. |caps_lock_off| image:: /usage/images/caps_lock_off.png
 .. |caps_lock_off_small| image:: /usage/images/caps_lock_off_small.png
 .. |caps_lock_on| image:: /usage/images/caps_lock_on.png
 .. |caps_lock_on_small| image:: /usage/images/caps_lock_on_small.png
 .. |cartridge| image:: /usage/images/cartridge.png
+.. |cartridge_image| image:: /usage/images/cartridge_image.png
+.. |cartridge_image_small| image:: /usage/images/cartridge_image_small.png
 .. |cartridge_small| image:: /usage/images/cartridge_small.png
 .. |cassette| image:: /usage/images/cassette.png
+.. |cassette_image| image:: /usage/images/cassette_image.png
+.. |cassette_image_small| image:: /usage/images/cassette_image_small.png
 .. |cassette_small| image:: /usage/images/cassette_small.png
 .. |cdrom| image:: /usage/images/cdrom.png
 .. |cdrom_folder| image:: /usage/images/cdrom_folder.png
@@ -21,12 +27,24 @@
 .. |cdrom_host_small| image:: /usage/images/cdrom_host_small.png
 .. |cdrom_image| image:: /usage/images/cdrom_image.png
 .. |cdrom_image_small| image:: /usage/images/cdrom_image_small.png
+.. |cdrom_nomedia| image:: /usage/images/cdrom_nomedia.png
+.. |cdrom_nomedia_small| image:: /usage/images/cdrom_nomedia_small.png
 .. |cdrom_small| image:: /usage/images/cdrom_small.png
 .. |display| image:: /usage/images/display.png
 .. |display_small| image:: /usage/images/display_small.png
+.. |eject| image:: /usage/images/eject.png
+.. |eject_small| image:: /usage/images/eject_small.png
+.. |export| image:: /usage/images/export.png
+.. |export_small| image:: /usage/images/export_small.png
+.. |fast_forward| image:: /usage/images/fast_forward.png
+.. |fast_forward_small| image:: /usage/images/fast_forward_small.png
 .. |floppy_35| image:: /usage/images/floppy_35.png
+.. |floppy_35_image| image:: /usage/images/floppy_35_image.png
+.. |floppy_35_image_small| image:: /usage/images/floppy_35_image_small.png
 .. |floppy_35_small| image:: /usage/images/floppy_35_small.png
 .. |floppy_525| image:: /usage/images/floppy_525.png
+.. |floppy_525_image| image:: /usage/images/floppy_525_image.png
+.. |floppy_525_image_small| image:: /usage/images/floppy_525_image_small.png
 .. |floppy_525_small| image:: /usage/images/floppy_525_small.png
 .. |floppy_and_cdrom_drives| image:: /usage/images/floppy_and_cdrom_drives.png
 .. |floppy_and_cdrom_drives_small| image:: /usage/images/floppy_and_cdrom_drives_small.png
@@ -43,9 +61,13 @@
 .. |machine| image:: /usage/images/machine.png
 .. |machine_small| image:: /usage/images/machine_small.png
 .. |mo| image:: /usage/images/mo.png
+.. |mo_image| image:: /usage/images/mo_image.png
+.. |mo_image_small| image:: /usage/images/mo_image_small.png
 .. |mo_small| image:: /usage/images/mo_small.png
 .. |network| image:: /usage/images/network.png
 .. |network_small| image:: /usage/images/network_small.png
+.. |new| image:: /usage/images/new.png
+.. |new_small| image:: /usage/images/new_small.png
 .. |num_lock_off| image:: /usage/images/num_lock_off.png
 .. |num_lock_off_small| image:: /usage/images/num_lock_off_small.png
 .. |num_lock_on| image:: /usage/images/num_lock_on.png
@@ -58,6 +80,14 @@
 .. |pause_small| image:: /usage/images/pause_small.png
 .. |ports| image:: /usage/images/ports.png
 .. |ports_small| image:: /usage/images/ports_small.png
+.. |rdisk| image:: /usage/images/rdisk.png
+.. |rdisk_image| image:: /usage/images/rdisk_image.png
+.. |rdisk_image_small| image:: /usage/images/rdisk_image_small.png
+.. |rdisk_small| image:: /usage/images/rdisk_small.png
+.. |record| image:: /usage/images/record.png
+.. |record_small| image:: /usage/images/record_small.png
+.. |rewind| image:: /usage/images/rewind.png
+.. |rewind_small| image:: /usage/images/rewind_small.png
 .. |run| image:: /usage/images/run.png
 .. |run_small| image:: /usage/images/run_small.png
 .. |scroll_lock_off| image:: /usage/images/scroll_lock_off.png
@@ -74,7 +104,11 @@
 .. |sound_small| image:: /usage/images/sound_small.png
 .. |storage_controllers| image:: /usage/images/storage_controllers.png
 .. |storage_controllers_small| image:: /usage/images/storage_controllers_small.png
+.. |superdisk| image:: /usage/images/superdisk.png
+.. |superdisk_image| image:: /usage/images/superdisk_image.png
+.. |superdisk_image_small| image:: /usage/images/superdisk_image_small.png
+.. |superdisk_small| image:: /usage/images/superdisk_small.png
 .. |warning| image:: /usage/images/warning.png
 .. |warning_small| image:: /usage/images/warning_small.png
-.. |zip| image:: /usage/images/zip.png
-.. |zip_small| image:: /usage/images/zip_small.png
+.. |write_protected| image:: /usage/images/write_protected.png
+.. |write_protected_small| image:: /usage/images/write_protected_small.png

settings/removable.rst

@@ -14,4 +14,4 @@ Up to four Magneto-Optical and four removable disk drives can be attached to the
 * **Channel**/**ID:** where to attach the drive on the selected storage bus. See :ref:`settings/hdd:Adding a new disk` for more information.
 * **Type**: drive model to identify as. A list of drive models to choose from is provided. Each model supports different types of media, while the *86BOX* model supports all types.
 
-MO / removable disk images can be inserted and removed through the :ref:`status bar <usage/statusbar:|zip| |mo| Removable disk and MO drives>` or :ref:`Media menu <usage/menubar:Media>`.
+MO / removable disk images can be inserted and removed through the :ref:`status bar <usage/statusbar:|rdisk| |mo| Removable disk and MO drives>` or :ref:`Media menu <usage/menubar:Media>`.

usage/statusbar.rst

@@ -53,8 +53,8 @@ A CD icon will appear for each configured :ref:`CD-ROM drive <settings/floppycdr
 * A list of host CD-ROM or DVD-ROM drives available for passthrough. Click on an entry to attach it to the emulated drive.
 * **Eject:** remove any disc inserted into this drive, or detach a host drive.
 
-|zip| |mo| Removable disk and MO drives
----------------------------------------
+|rdisk| |mo| Removable disk and MO drives
+-----------------------------------------
 
 A removable disk or MO icon will appear for each configured :doc:`additional removable storage drive <../settings/removable>`.