From 7b3b2acfd8422969c1642436b4dc852a5115ec3c Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 17 Feb 2022 22:56:39 -0500 Subject: [PATCH] Updates --- icons.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ settings/ports.rst | 4 ++-- settings/sound.rst | 2 +- usage/menubar.rst | 6 +++--- 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 icons.sh diff --git a/icons.sh b/icons.sh new file mode 100644 index 0000000..2c57dc3 --- /dev/null +++ b/icons.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Check for repository path. +if [ -z "$1" ] +then + echo Specify 86Box repository path. ImageMagick is required. + exit 1 +fi + +# Determine the ImageMagick executable. +magick=magick +$magick >/dev/null 2>&1 || magick=magick.exe + +# Convert icons to PNG. +for i in "$1/src/win/icons/"*.ico +do + $magick convert "$i" "usage/images/$(basename $i | sed -e 's/.ico$//').png" +done + +# Remove unnecessary icons. +cd usage/images +rm -f 86Box-* *_empty* *_active* *_disabled* *-1.png *-2.png + +# Get small and big icons. +for i in *-0.png +do + mv "$i" "$(echo $i | sed -e 's/-0/_small/')" +done +for i in *-3.png +do + mv "$i" "$(echo $i | sed -e 's/-3//')" +done +for i in *-4.png +do + mv "$i" "$(echo $i | sed -e 's/-4//')" +done + +# Create include.rst entries. +for i in *.png +do + echo '.. |'$(echo $i | sed -e 's/.png//')'| image:: /usage/images/'$i +done diff --git a/settings/ports.rst b/settings/ports.rst index 94733a3..8ffd2bf 100644 --- a/settings/ports.rst +++ b/settings/ports.rst @@ -22,12 +22,12 @@ Emulated device to connect to the given parallel (LPT) port. * Printed pages are saved as .png files in the ``printer`` subdirectory found in the emulated machine's directory. * Use the **EPSON LQ-2500** printer driver for best results. - * This printer will not work if the included ``freetype.dll`` file is missing from the 86Box directory. + * This printer will not work on Windows hosts if the included ``freetype.dll`` file is missing from the 86Box directory. * **Generic PostScript Printer:** PostScript-compatible printer with PDF output. * Printed documents are saved as .ps files in the ``printer`` subdirectory found in the emulated machine's directory. These files are automatically converted to .pdf once printing is completed. - * The original .ps files may remain in the directory if PDF conversion fails, or if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory. + * The original .ps files may remain in the directory if PDF conversion fails, or (on Windows hosts) if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory. * Use the generic PostScript printer driver provided by your operating system. * Windows 95 and newer do not have a generic PostScript driver; use the **Apple LaserWriter IIf** driver for grayscale, or the **Apple Color LW 12/660 PS** driver for color. diff --git a/settings/sound.rst b/settings/sound.rst index b8cee23..05fdda4 100644 --- a/settings/sound.rst +++ b/settings/sound.rst @@ -22,7 +22,7 @@ MIDI Out Device Device to output MIDI music to, for sound cards equipped with an external MIDI output. * **None:** don't output MIDI music. -* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured or if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. +* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured, or (on Windows hosts) if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. * **Roland MT-32**/**CM-32L Emulation:** emulate a Roland synthesizer module. Emulation is provided by the `Munt `_ library. * **System MIDI:** output to a MIDI device on the host system, such as the Windows software synthesizer or a USB MIDI adapter. diff --git a/usage/menubar.rst b/usage/menubar.rst index 5e1890c..aebadd8 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -11,7 +11,7 @@ Action * **Hard Reset:** force a reset of the emulated machine. Requires confirmation, which can be disabled by checking the *Don't show this message again* box. * **Ctrl+Alt+Del:** send a *Ctrl+Alt+Del* key combination to the emulated machine. You can alternatively press *Ctrl+F12* to send that combination. * **Ctrl+Alt+Esc:** send a *Ctrl+Alt+Esc* key combination to the emulated machine. -* **Pause:** pause emulation. Uncheck this option to resume emulation. +* **Pause:** pause emulation of the machine. Uncheck this option to resume emulation. .. note:: Emulation is automatically paused when the emulated machine enters ACPI sleep mode. @@ -69,7 +69,7 @@ This menu lists all storage drives attached to the emulated machine, and provide Tools ----- -* **Settings:** open the :doc:`Settings <../settings/index>` window. +* **Settings:** open the :doc:`Settings <../settings/index>` window to configure the emulated machine. * **Update status bar icons:** enable the activity lights on :doc:`status bar ` icons. Unchecking this option may improve emulation performance on low-end host systems. * **Preferences:** open the *Preferences* window, which provides the following options: @@ -78,7 +78,7 @@ Tools * **Enable Discord integration:** enable Discord Rich Presence. 86Box shares the emulated machine's name, model and CPU with other Discord users. -.. note:: Discord integration will not be available if the Discord desktop app is not running, or if the included ``discord_game_sdk.dll`` file is missing from the 86Box directory. +.. note:: Discord integration will not be available if the Discord desktop app is not running, or if (on Windows hosts) the included ``discord_game_sdk.dll`` file is missing from the 86Box directory. * **Take screenshot:** take a screenshot of the emulated display. Screenshots are saved as .png images in the ``screenshots`` subdirectory found in the emulated machine's directory. * **Sound gain:** open the :ref:`sound gain control `, which is also accessible through the status bar.