diff --git a/icons.sh b/icons.sh index 46233b8..92abb19 100644 --- a/icons.sh +++ b/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. diff --git a/include.rst b/include.rst index 7d43c1e..70eb924 100644 --- a/include.rst +++ b/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 diff --git a/settings/removable.rst b/settings/removable.rst index 9734b49..a78a3bf 100644 --- a/settings/removable.rst +++ b/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 ` or :ref:`Media menu `. +MO / removable disk images can be inserted and removed through the :ref:`status bar ` or :ref:`Media menu `. diff --git a/usage/images/browse.png b/usage/images/browse.png new file mode 100644 index 0000000..ab89869 Binary files /dev/null and b/usage/images/browse.png differ diff --git a/usage/images/browse_small.png b/usage/images/browse_small.png new file mode 100644 index 0000000..c5e3cc4 Binary files /dev/null and b/usage/images/browse_small.png differ diff --git a/usage/images/cartridge_image.png b/usage/images/cartridge_image.png new file mode 100644 index 0000000..fc1ec58 Binary files /dev/null and b/usage/images/cartridge_image.png differ diff --git a/usage/images/cartridge_image_small.png b/usage/images/cartridge_image_small.png new file mode 100644 index 0000000..d993f81 Binary files /dev/null and b/usage/images/cartridge_image_small.png differ diff --git a/usage/images/cassette_image.png b/usage/images/cassette_image.png new file mode 100644 index 0000000..9105542 Binary files /dev/null and b/usage/images/cassette_image.png differ diff --git a/usage/images/cassette_image_small.png b/usage/images/cassette_image_small.png new file mode 100644 index 0000000..ddf853f Binary files /dev/null and b/usage/images/cassette_image_small.png differ diff --git a/usage/images/cdrom_nomedia.png b/usage/images/cdrom_nomedia.png new file mode 100644 index 0000000..9c10fd9 Binary files /dev/null and b/usage/images/cdrom_nomedia.png differ diff --git a/usage/images/cdrom_nomedia_small.png b/usage/images/cdrom_nomedia_small.png new file mode 100644 index 0000000..6c16ca0 Binary files /dev/null and b/usage/images/cdrom_nomedia_small.png differ diff --git a/usage/images/eject.png b/usage/images/eject.png new file mode 100644 index 0000000..2551a93 Binary files /dev/null and b/usage/images/eject.png differ diff --git a/usage/images/eject_small.png b/usage/images/eject_small.png new file mode 100644 index 0000000..98190d4 Binary files /dev/null and b/usage/images/eject_small.png differ diff --git a/usage/images/export.png b/usage/images/export.png new file mode 100644 index 0000000..3ee6490 Binary files /dev/null and b/usage/images/export.png differ diff --git a/usage/images/export_small.png b/usage/images/export_small.png new file mode 100644 index 0000000..6fd53ed Binary files /dev/null and b/usage/images/export_small.png differ diff --git a/usage/images/fast_forward.png b/usage/images/fast_forward.png new file mode 100644 index 0000000..4da3123 Binary files /dev/null and b/usage/images/fast_forward.png differ diff --git a/usage/images/fast_forward_small.png b/usage/images/fast_forward_small.png new file mode 100644 index 0000000..554f77e Binary files /dev/null and b/usage/images/fast_forward_small.png differ diff --git a/usage/images/floppy_35_image.png b/usage/images/floppy_35_image.png new file mode 100644 index 0000000..141cb0a Binary files /dev/null and b/usage/images/floppy_35_image.png differ diff --git a/usage/images/floppy_35_image_small.png b/usage/images/floppy_35_image_small.png new file mode 100644 index 0000000..c4a6699 Binary files /dev/null and b/usage/images/floppy_35_image_small.png differ diff --git a/usage/images/floppy_525_image.png b/usage/images/floppy_525_image.png new file mode 100644 index 0000000..c8dc924 Binary files /dev/null and b/usage/images/floppy_525_image.png differ diff --git a/usage/images/floppy_525_image_small.png b/usage/images/floppy_525_image_small.png new file mode 100644 index 0000000..7e36859 Binary files /dev/null and b/usage/images/floppy_525_image_small.png differ diff --git a/usage/images/mo_image.png b/usage/images/mo_image.png new file mode 100644 index 0000000..8141855 Binary files /dev/null and b/usage/images/mo_image.png differ diff --git a/usage/images/mo_image_small.png b/usage/images/mo_image_small.png new file mode 100644 index 0000000..662d834 Binary files /dev/null and b/usage/images/mo_image_small.png differ diff --git a/usage/images/new.png b/usage/images/new.png new file mode 100644 index 0000000..4602bb6 Binary files /dev/null and b/usage/images/new.png differ diff --git a/usage/images/new_small.png b/usage/images/new_small.png new file mode 100644 index 0000000..9635b6a Binary files /dev/null and b/usage/images/new_small.png differ diff --git a/usage/images/zip.png b/usage/images/rdisk.png similarity index 55% rename from usage/images/zip.png rename to usage/images/rdisk.png index 263ec08..cdf1269 100644 Binary files a/usage/images/zip.png and b/usage/images/rdisk.png differ diff --git a/usage/images/rdisk_image.png b/usage/images/rdisk_image.png new file mode 100644 index 0000000..526dfba Binary files /dev/null and b/usage/images/rdisk_image.png differ diff --git a/usage/images/rdisk_image_small.png b/usage/images/rdisk_image_small.png new file mode 100644 index 0000000..ab40750 Binary files /dev/null and b/usage/images/rdisk_image_small.png differ diff --git a/usage/images/rdisk_small.png b/usage/images/rdisk_small.png new file mode 100644 index 0000000..e0ac837 Binary files /dev/null and b/usage/images/rdisk_small.png differ diff --git a/usage/images/record.png b/usage/images/record.png new file mode 100644 index 0000000..1f1fb63 Binary files /dev/null and b/usage/images/record.png differ diff --git a/usage/images/record_small.png b/usage/images/record_small.png new file mode 100644 index 0000000..7818bad Binary files /dev/null and b/usage/images/record_small.png differ diff --git a/usage/images/rewind.png b/usage/images/rewind.png new file mode 100644 index 0000000..e62d718 Binary files /dev/null and b/usage/images/rewind.png differ diff --git a/usage/images/rewind_small.png b/usage/images/rewind_small.png new file mode 100644 index 0000000..08ae602 Binary files /dev/null and b/usage/images/rewind_small.png differ diff --git a/usage/images/run.png b/usage/images/run.png index c4883ab..f4d6d25 100644 Binary files a/usage/images/run.png and b/usage/images/run.png differ diff --git a/usage/images/run_small.png b/usage/images/run_small.png index 777be36..fbccea5 100644 Binary files a/usage/images/run_small.png and b/usage/images/run_small.png differ diff --git a/usage/images/superdisk.png b/usage/images/superdisk.png new file mode 100644 index 0000000..7afba38 Binary files /dev/null and b/usage/images/superdisk.png differ diff --git a/usage/images/superdisk_image.png b/usage/images/superdisk_image.png new file mode 100644 index 0000000..c5b78cd Binary files /dev/null and b/usage/images/superdisk_image.png differ diff --git a/usage/images/superdisk_image_small.png b/usage/images/superdisk_image_small.png new file mode 100644 index 0000000..0e0814c Binary files /dev/null and b/usage/images/superdisk_image_small.png differ diff --git a/usage/images/superdisk_small.png b/usage/images/superdisk_small.png new file mode 100644 index 0000000..ca5a5cc Binary files /dev/null and b/usage/images/superdisk_small.png differ diff --git a/usage/images/write_protected.png b/usage/images/write_protected.png new file mode 100644 index 0000000..3b64d34 Binary files /dev/null and b/usage/images/write_protected.png differ diff --git a/usage/images/write_protected_small.png b/usage/images/write_protected_small.png new file mode 100644 index 0000000..c4c56b1 Binary files /dev/null and b/usage/images/write_protected_small.png differ diff --git a/usage/images/zip_small.png b/usage/images/zip_small.png deleted file mode 100644 index 4d21b50..0000000 Binary files a/usage/images/zip_small.png and /dev/null differ diff --git a/usage/statusbar.rst b/usage/statusbar.rst index abc90d9..c12fa65 100644 --- a/usage/statusbar.rst +++ b/usage/statusbar.rst @@ -53,8 +53,8 @@ A CD icon will appear for each configured :ref:`CD-ROM drive `.