From c136d7157c23146dda8d2827bf2b7545582cf217 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 19:40:32 -0300 Subject: [PATCH 1/8] Add note about MO media support --- settings/removable.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/removable.rst b/settings/removable.rst index 68384a4..e58f025 100644 --- a/settings/removable.rst +++ b/settings/removable.rst @@ -12,7 +12,7 @@ Up to four Magneto-Optical and four Iomega ZIP disk drives can be attached to th * **Bus:** storage bus to attach the drive to. ATAPI (IDE) and SCSI are supported. * **Channel**/**ID:** where to attach the drive on the selected storage bus. See :ref:`settings/hdd:Adding a new disk` for more information. -* **Type** (MO only): drive model to identify as. A list of drive models to choose from is provided. +* **Type** (MO only): drive model to identify as. A list of drive models to choose from is provided. Each model supports different types of MO media, while the `86BOX` model supports all types. * **ZIP 250** (ZIP only): enable the drive to read and write 250 MB ZIP disks. MO / ZIP disk images can be inserted and removed through the :ref:`status bar ` or :ref:`Media menu `. From 33de3666d57d1318cf4e101cac1c425a3c9f1df2 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 19:41:26 -0300 Subject: [PATCH 2/8] Downgrade OpenGL version requirement --- usage/menubar.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usage/menubar.rst b/usage/menubar.rst index c12e95b..575a3ce 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -22,8 +22,8 @@ View * **Resizeable window:** allow the 86Box window to be freely resized. Unchecking this option will also return the window to its normal size. * **Remember size & position:** automatically save the size and position of the 86Box window to the emulated machine's configuration file. -* **Renderer:** select a graphical renderer for the emulated display. *SDL (Hardware)* is recommended in most cases. *OpenGL (3.3 Core)* allows for shader effects to be applied to the emulated display, however, it is not compatible with older integrated GPUs. -* **OpenGL options:** configure the *OpenGL (3.3 Core)* renderer. This submenu will be available if that renderer is selected. +* **Renderer:** select a graphical renderer for the emulated display. *SDL (Hardware)* is recommended in most cases. *OpenGL (3.0 Core)* allows for shader effects to be applied to the emulated display, however, it is not compatible with older integrated GPUs. +* **OpenGL options:** configure the *OpenGL (3.0 Core)* renderer. This submenu will be available if that renderer is selected. * **Target framerate:** select the framerate at which the emulated display is updated. *Sync with video* uses the emulated display's current refresh rate. * **VSync:** enable vertical sync. Recommended if tearing artifacts are observed. From 93df6446caa32f09cb64713812922df6db5e5565 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 19:57:24 -0300 Subject: [PATCH 3/8] Update menu bar for v3.0/v3.1 --- usage/menubar.rst | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/usage/menubar.rst b/usage/menubar.rst index 575a3ce..5e1890c 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -20,9 +20,15 @@ Action View ---- +* **Hide status bar:** hides the :doc:`status bar ` at the bottom of the window. * **Resizeable window:** allow the 86Box window to be freely resized. Unchecking this option will also return the window to its normal size. * **Remember size & position:** automatically save the size and position of the 86Box window to the emulated machine's configuration file. -* **Renderer:** select a graphical renderer for the emulated display. *SDL (Hardware)* is recommended in most cases. *OpenGL (3.0 Core)* allows for shader effects to be applied to the emulated display, however, it is not compatible with older integrated GPUs. +* **Renderer:** select a graphical renderer for the emulated display. + + * **SDL (Hardware)** is recommended in most cases. + * **SDL (Software)** and **SDL (OpenGL)** are known to perform better on some host systems. Try these if your system is struggling to maintain 100% emulation speed. + * **OpenGL (3.0 Core)** allows for shader effects to be applied to the emulated display, however, it is not compatible with older integrated GPUs. + * **OpenGL options:** configure the *OpenGL (3.0 Core)* renderer. This submenu will be available if that renderer is selected. * **Target framerate:** select the framerate at which the emulated display is updated. *Sync with video* uses the emulated display's current refresh rate. @@ -30,12 +36,13 @@ View * **Select shader:** load a .glsl shader file to apply on the emulated display. Many shaders are available for simulating CRT displays, VHS tapes and other aesthetics; the `RetroArch glsl-shaders repository `_ is a good place to start. * **Remove shader:** disable the currently-loaded shader. -.. note:: Shaders that take advantage of multipass and previous frames are not supported. +.. note:: * Shaders that take advantage of multipass and previous frames are not supported. + * ``.cg`` and ``.cgp`` shaders are not supported either, as these formats are long deprecated. * **Specify dimensions:** open a window where an exact size (in pixels) for the emulated display can be set. If checked, the *Lock to this size* box prevents changes in the emulated display's resolution from overriding the specified size. * **Force 4:3 display ratio:** stretch the emulated display to a 4:3 aspect ratio, independently of the emulated machine's screen resolution. -* **Window scale factor:** scale the emulated display to half (0.5x), normal (1x), 50% larger (1.5x) or double (2x) sizes. -* **Filter method:** select the filtering method (Nearest or Linear) to be used when scaling the emulated display. +* **Window scale factor:** scale the emulated display to half (*0.5x*), normal (*1x*), 50% larger (*1.5x*) or double (*2x*) sizes. +* **Filter method:** select the filtering method (*Nearest* or *Linear*) to be used when scaling the emulated display. * **HiDPI scaling:** automatically scale the emulated display to real size if your host system has a HiDPI display. This option can be used alongside *Window scale factor* above. * **Fullscreen:** enter full screen mode. Press *Ctrl+Alt+Page Down* to go back to windowed mode. You can also enter full screen mode by pressing *Ctrl+Alt+Page Up*. * **Fullscreen stretch mode:** select the picture mode to use when in full screen mode. @@ -48,8 +55,8 @@ View * **EGA/(S)VGA settings:** contains display settings specific to EGA, VGA and Super VGA video hardware. * **Inverted VGA monitor:** emulate a VGA monitor with inverted colors. - * **VGA screen type:** select the VGA monitor type to emulate. Color, grayscale, amber phosphor, green phosphor and white phosphor monitors can be selected. - * **Grayscale conversion type:** select the color-to-grayscale conversion profile (BT.601, BT.709 or Average) to use when a grayscale monitor is selected. + * **VGA screen type:** select the VGA monitor type to emulate. *Color*, *Grayscale*, *Amber*, *Green* and *White* phosphor monitors can be selected. + * **Grayscale conversion type:** select the color-to-grayscale conversion profile (*BT.601*, *BT.709* or *Average*) to use when a grayscale monitor is selected. * **CGA/PCjr/Tandy/EGA/(S)VGA overscan:** add an overscan border around the display. This border is only added when emulating the specified video hardware types. * **Change contrast for monochrome display:** optimize the contrast of monochrome CGA monitors for 4-color operation. From b4ba2f99d435668966e65f322e0234d76bcab44b Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 20:11:51 -0300 Subject: [PATCH 4/8] Add note about cassette machine limitations --- settings/storage.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings/storage.rst b/settings/storage.rst index c531ce4..d28250b 100644 --- a/settings/storage.rst +++ b/settings/storage.rst @@ -39,3 +39,5 @@ Cassette -------- Enable IBM cassette tape emulation. The cassette deck can be controlled through the :ref:`status bar ` or :ref:`Media menu `. + +.. note:: While cassette emulation can be enabled on any machine, it is only usable on the IBM PC, PCjr and other machines with an IBM cassette port. From 47a8afa9172c60a9d201e1a81313695f25ea9298 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 20:16:58 -0300 Subject: [PATCH 5/8] Add 4th parallel port --- settings/ports.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/settings/ports.rst b/settings/ports.rst index 94733a3..980bc72 100644 --- a/settings/ports.rst +++ b/settings/ports.rst @@ -5,7 +5,7 @@ The *Ports (COM & LPT)* page contains settings related to the emulated machine's I/O ports. -LPT1-3 Device +LPT1-4 Device ------------- Emulated device to connect to the given parallel (LPT) port. @@ -42,7 +42,9 @@ Serial port 1-4 Enable emulation of serial ports ranging from COM1 to COM4. Any ports not provided by the machine's motherboard will be emulated as generic ISA or VLB serial cards. -Parallel port 1-3 +Parallel port 1-4 ----------------- Enable emulation of parallel ports ranging from LPT1 to LPT3. Any ports not provided by the machine's motherboard will be emulated as generic ISA or VLB parallel cards. + +.. note:: The 4th parallel port is not widely supported. It is located at I/O port 268h. From cdd003a92b045bb991496f0a3b101e198f05cf53 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 20:47:48 -0300 Subject: [PATCH 6/8] Add icon conversion script and toolbar icons --- icons.sh | 42 +++++++++++++++++++++++ include.rst | 14 ++++++++ usage/images/acpi_shutdown.png | Bin 0 -> 504 bytes usage/images/acpi_shutdown_small.png | Bin 0 -> 393 bytes usage/images/cartridge.png | Bin 378 -> 378 bytes usage/images/cassette.png | Bin 450 -> 450 bytes usage/images/cdrom.png | Bin 535 -> 535 bytes usage/images/display.png | Bin 470 -> 470 bytes usage/images/floppy_35.png | Bin 395 -> 395 bytes usage/images/floppy_525.png | Bin 411 -> 411 bytes usage/images/hard_disk.png | Bin 551 -> 551 bytes usage/images/hard_reset.png | Bin 0 -> 504 bytes usage/images/hard_reset_small.png | Bin 0 -> 396 bytes usage/images/input_devices.png | Bin 512 -> 512 bytes usage/images/machine.png | Bin 547 -> 547 bytes usage/images/mo.png | Bin 667 -> 667 bytes usage/images/network.png | Bin 593 -> 593 bytes usage/images/other_peripherals.png | Bin 462 -> 462 bytes usage/images/other_removable_devices.png | Bin 609 -> 609 bytes usage/images/pause.png | Bin 0 -> 343 bytes usage/images/pause_small.png | Bin 0 -> 337 bytes usage/images/ports.png | Bin 461 -> 461 bytes usage/images/run.png | Bin 0 -> 408 bytes usage/images/run_small.png | Bin 0 -> 361 bytes usage/images/send_cad.png | Bin 0 -> 547 bytes usage/images/send_cad_small.png | Bin 0 -> 397 bytes usage/images/send_cae.png | Bin 0 -> 504 bytes usage/images/send_cae_small.png | Bin 0 -> 394 bytes usage/images/settings.png | Bin 0 -> 527 bytes usage/images/settings_small.png | Bin 0 -> 404 bytes usage/images/sound.png | Bin 466 -> 466 bytes usage/images/storage_controllers.png | Bin 450 -> 450 bytes usage/images/zip.png | Bin 477 -> 477 bytes 33 files changed, 56 insertions(+) create mode 100644 icons.sh create mode 100644 usage/images/acpi_shutdown.png create mode 100644 usage/images/acpi_shutdown_small.png create mode 100644 usage/images/hard_reset.png create mode 100644 usage/images/hard_reset_small.png create mode 100644 usage/images/pause.png create mode 100644 usage/images/pause_small.png create mode 100644 usage/images/run.png create mode 100644 usage/images/run_small.png create mode 100644 usage/images/send_cad.png create mode 100644 usage/images/send_cad_small.png create mode 100644 usage/images/send_cae.png create mode 100644 usage/images/send_cae_small.png create mode 100644 usage/images/settings.png create mode 100644 usage/images/settings_small.png 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/include.rst b/include.rst index 917558f..372044b 100644 --- a/include.rst +++ b/include.rst @@ -4,6 +4,8 @@ .. |vel| unicode:: 0x22EE :trim: +.. |acpi_shutdown| image:: /usage/images/acpi_shutdown.png +.. |acpi_shutdown_small| image:: /usage/images/acpi_shutdown_small.png .. |cartridge| image:: /usage/images/cartridge.png .. |cartridge_small| image:: /usage/images/cartridge_small.png .. |cassette| image:: /usage/images/cassette.png @@ -20,6 +22,8 @@ .. |floppy_and_cdrom_drives_small| image:: /usage/images/floppy_and_cdrom_drives_small.png .. |hard_disk| image:: /usage/images/hard_disk.png .. |hard_disk_small| image:: /usage/images/hard_disk_small.png +.. |hard_reset| image:: /usage/images/hard_reset.png +.. |hard_reset_small| image:: /usage/images/hard_reset_small.png .. |input_devices| image:: /usage/images/input_devices.png .. |input_devices_small| image:: /usage/images/input_devices_small.png .. |machine| image:: /usage/images/machine.png @@ -32,8 +36,18 @@ .. |other_peripherals_small| image:: /usage/images/other_peripherals_small.png .. |other_removable_devices| image:: /usage/images/other_removable_devices.png .. |other_removable_devices_small| image:: /usage/images/other_removable_devices_small.png +.. |pause| image:: /usage/images/pause.png +.. |pause_small| image:: /usage/images/pause_small.png .. |ports| image:: /usage/images/ports.png .. |ports_small| image:: /usage/images/ports_small.png +.. |run| image:: /usage/images/run.png +.. |run_small| image:: /usage/images/run_small.png +.. |send_cad| image:: /usage/images/send_cad.png +.. |send_cad_small| image:: /usage/images/send_cad_small.png +.. |send_cae| image:: /usage/images/send_cae.png +.. |send_cae_small| image:: /usage/images/send_cae_small.png +.. |settings| image:: /usage/images/settings.png +.. |settings_small| image:: /usage/images/settings_small.png .. |sound| image:: /usage/images/sound.png .. |sound_small| image:: /usage/images/sound_small.png .. |storage_controllers| image:: /usage/images/storage_controllers.png diff --git a/usage/images/acpi_shutdown.png b/usage/images/acpi_shutdown.png new file mode 100644 index 0000000000000000000000000000000000000000..1add56b33cd1f7f6aadf3d5a3af35bc97860ec07 GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAr#;f;tHg9GBEtl&i)T% z0U7`Q8zzHPGBB0|`2{mLJiCzw;v{*yyRiPqe+jaay~NYkmHio`Fee}HoM$hcfI`!qN3neW!ZF4!4x4@k- zSTC1BZja#sI|g^=n2G7LnIsFD<%CSRE}Z)Rfcpc>6d~Kj6OC>s|3*gVG-Q{aTz_?E z(L074Z=RQU*k|Y7t&8Ws5?ZHVxscI5af0pr820Q7)3z{eh|Y6n_@<#+#(j5ZC3_@K zf%LO;p?B7YpIfE#`xoPKK40E1FPruNeW+UE8c~vxSdwa$T$Bo=7>o>zjC2hQbqy^; w42`S|O{@%!bq$QI3=9@$Pd|X7AvZrIGp!Q0hD&DpH9!pvp00i_>zopr04EBo(f|Me literal 0 HcmV?d00001 diff --git a/usage/images/acpi_shutdown_small.png b/usage/images/acpi_shutdown_small.png new file mode 100644 index 0000000000000000000000000000000000000000..589e6dc6aaee9348cfaba1f02e658ed6eb307964 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF{>$S)4tt5GuPggAMqy4q-Z{@+Ist{! zJzX3_IIf4Dy~x{Oz`+tQ%c3ECcf(rl7nTib1`P6d>qS?7bg!#WeB$RKWZ>;{YU?`Z zoh#*{Wu(sTjAt~x?(i&^PweFK*|$Hje`u_64E|c-$Gi9OSw#aTR_>kCU(Cu|5VN>0 zsP`{}Wueefq3QGf0j*Rmag8WRNi0dVN-jzTQVd20Mn<{@hPsB9A%;d)h9*{q#<~W^ lRt5%(v!@?G(U6;;l9^VCTf-$Y{TiSK22WQ%mvv4FO#ou>d6)nI literal 0 HcmV?d00001 diff --git a/usage/images/cartridge.png b/usage/images/cartridge.png index 8cc8d5d68bb1937df6c09f3f5c4c373bf684dd85..4edb02e90cbd40295e590a1c6dbf8fcc3536a387 100644 GIT binary patch delta 80 zcmeyx^owc2N)8D@PIH;vJ3mg`SR!Fyp=)FkVrXJzYG!3>qHADmWnkdFbP0l+XkK|CSdS delta 80 zcmeyx^owc2N)BmJ35G|>7I!9YERirY)HSjQF)*+)GO;o+&^0gylCw)6znN^yD64=j U@k%2)fB^_RUHx3vIVCg!00G(;rT_o{ diff --git a/usage/images/cassette.png b/usage/images/cassette.png index bd4b06f026714b2b001290bf629575ffdfcdc4b6..3a327dddd0c5ca134fd37c4bb2163c4b7fea400d 100644 GIT binary patch delta 104 zcmX@ae296%Vh#yGPIH;vJ3mfbeJIqxNY}t5#L(Qz#KOwZQrE!P%D^CX?$kvL3=FCz zt`Q|Ei6yC4x%nxXX_X8{21bUuhK9OECLu-!RtA<7I!ADJ``$bsB2^qVqjopWMXAtple_ZBxjdCe#5}PpjzS@ oQIe8al4_NkpOTqY$zWt)WT=Zx!z+#G0H6j2Pgg&ebxsLQ0HwnoW&i*H diff --git a/usage/images/cdrom.png b/usage/images/cdrom.png index 6db224387e742d0bf566eb53a03cbc3a967c4bf7..a14cb179c0fe5f495614a0223314696cf82884a3 100644 GIT binary patch delta 83 zcmbQvGM#0@Vh#yGPIH;vJ3nq*Ey^fmple{LYiJx|Xli9(X=PxlYhY|;U@-q<^MlE^ f7-bbqLW~SR5~ffIX}$P%1|aZs^>bP0l+XkK1K<~T delta 83 zcmbQvGM#0@Vh(9h35G|>7I!wT7G;z&)HO8JHL?gXFt9Q*u`)2wH82K}vr8YpnS6^; XRsmh&l}2;`0}yz+`njxgN@xNA^z0Xx diff --git a/usage/images/display.png b/usage/images/display.png index 9f2da1a0c7497fe8d9a82fca32fe1ca6ef52fcb9..dcda9e8cb99f298bd56a7028f6803e47bc9101a3 100644 GIT binary patch delta 82 zcmcb{e2sa+CJqTfPIH;vJ3mg`byUhg*T7KM&^W}<)XKop%D`0Dz}U*bVE)JE2a{(q e$|{(I7#V;hOra9edhzWHK;Y@>=d#Wzp$Py-ofuyL delta 82 zcmcb{e2sa+CJt#)HJR

)%b>byUhw*U(Vc$RfnRz{=Rd%E&_3z}U*bz>s(9j>$6_ XWfjmR90GJ%7=Xaj)z4*}Q$iB}Bt{nL diff --git a/usage/images/floppy_35.png b/usage/images/floppy_35.png index 1224473c9b71aef57f2774811fe75514b343f3c2..afd229594cfa01bd7023cfe18ad938b08c74cc84 100644 GIT binary patch delta 82 zcmeBX?q;5_j6*_@(_Civ&W{tUT@V6q>h dtb$31kpW1;6e=OD7vIhR1fH&bF6*2UngI6M7bgG! delta 82 zcmeBX?q;5_j6+&fg5goJ#hr=k+N2D14GndTEJ6$ntc*;o3=DJ)jDh6r(#LNm`!UKY Vpi8{chz?)?0#8>zmvv4FO#tXU7e@d9 diff --git a/usage/images/floppy_525.png b/usage/images/floppy_525.png index 9573b5c12554d221327094edf5356ee06634779a..e509d4aaa322d1e5d97bbf736dc90cdb4d96a594 100644 GIT binary patch delta 82 zcmbQuJezsKG7bqrPIH;vJ3mfbH%-bw*T7KM&^W}<)XKop%D`0Dz}U*bVE)JE2b1F% eWfe?9j0`{$rceoKz4&$pAn7I!ADnbP0l+XkK7&I5d delta 83 zcmZ3^vYchYdJbt(35G|>7I!vomt>SO)HO8JHL?gXFt9Q*u`)2wH82K}vr8Ypnf!`T XRsmh&l}2;`0}yz+`njxgN@xNA2~QW} diff --git a/usage/images/hard_reset.png b/usage/images/hard_reset.png new file mode 100644 index 0000000000000000000000000000000000000000..f747259410637bfebc2fd94b0013424aca9bd0bc GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAr#;f;tHf08X6e>|7X~_ z6UhAk|G&$UG8Q06OK%A$plOskGqu5XTRDtPAmHA35gT|4V) zt(Gn80;Q`3%+(z!VhjlkDbnVfH!#0`9^a78sGPRlK8N?rjM#SzdcX0mGj=(Z!k2R+ zW%9(QD?C5GjnI58`(onN#kUn-re40b;47QEvRL0=u5@nc+q$!l9{%*-v_y5<)i<+W zhies9W}be#IoE!^>6C@PzA?7F_r7!0COj7CL)8-3h?11Vl2ohYqEsNoU}Ruqq-$WP zYiJo_Xk=w*Vr6KoYhY|;V6ZrQ`T-OTx%nxXX_dG&Tr$(I0cv3IboFyt=akR{07SO2 A5C8xG literal 0 HcmV?d00001 diff --git a/usage/images/hard_reset_small.png b/usage/images/hard_reset_small.png new file mode 100644 index 0000000000000000000000000000000000000000..9376cf0e509f520839398994618a4e6ece59db81 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFN$C6mxJ!Z&8Ul z&61K*XW0FhsrIr!hEw>aP@t`?)FK#IZ0z{p6~z);uFGQ`lx%Fx8h q&{)^N*vi0QarX2BC>nC}Q!>*kacj6_re6cpz~JfX=d#Wzp$Pz}gnJSI literal 0 HcmV?d00001 diff --git a/usage/images/input_devices.png b/usage/images/input_devices.png index 446fea598b11be63e43d9b37718734b2bccbdfc9..1027c60afa5f83bcc81444d40e8d21a5a892ebe4 100644 GIT binary patch delta 106 zcmZo*X<(VKm_tI4(_Civ&W{sU{|h(JH89jQG!8K|wKA}@GBDLOFt#!RD-l$d^=DBgQu&X%Q~loCIHPC B9$)|f delta 106 zcmZo*X<(VKm_u4rO=kP@`gapo{|h(NH8j*UvIsFSurju=GP2M$Ft#!X@Mz4&&Z1_n=8KbLh*2~7aC CtR49P delta 107 zcmZ3?vY2JUCJt#)HJR

)&nMCBztRsB37bYh)2(U|?lzVP#~YYhY|;U|`5Qbq50j qgKCLuL`h0wNvc(DeoAIqC4-TH5q1p@0lF+e4Gf;HelF{r5}E*ch#Z3e diff --git a/usage/images/mo.png b/usage/images/mo.png index cd58e611f2886c95093463df1c4739da1fd9496a..bb0e262f3f8ee06b90b38fc9ecf6f21547671bb7 100644 GIT binary patch delta 83 zcmbQuI-7OEaSjPVPIH;vJ3nqbU&<(Dple{RYiJN+WNc+%W@TumYXD>z{MKmioE*m_ gt6&mhWME}rX=Q2(k&xDlZ)X4kPgg&ebxsLQ00uu6?*IS* delta 83 zcmbQuI-7OEaSmxw35G|>7I!wDFJ+W6)HO8JHL?gXFt9Q*u`)2wH82K}vr8YpnHX@Mz4&&Z1_n=8KbLh*2~7a) CB_4(V delta 107 zcmcb}a*<`iRt{-V35G|>7I!x8wPg%9)HO8JHL?gXFt9Q*u`)2wH82K}vr8YpVPIfT pEpd$~Nl7e8waU#;$xN$cFfuU0uHltNbO2BTgQu&X%Q~loCIHm<9;N^Q diff --git a/usage/images/other_peripherals.png b/usage/images/other_peripherals.png index 3f4a4f41b5d53f6b73f869d73d3027f1525a3c92..5d56c6f4006cdd7b6bbfcd3f85da691393409ef8 100644 GIT binary patch delta 82 zcmX@de2#g-dJYLePIH;vJ3mg`en84V*T7KM&^W}<)XKop%D`0Dz}U*bVE)JE2a_i< e$|{(I7#V;hOra9edhzWHK;Y@>=d#Wzp$Py!dl))%b>en84l*U(Vc$RfnRz{=Rd%E&_3z}U*bz>s(9j>!`l XWfjmR90GJ%7=Xaj)z4*}Q$iB}8zdIS diff --git a/usage/images/other_removable_devices.png b/usage/images/other_removable_devices.png index 96d556695ee7bbe64d1d97c1be32bd9f2d0c5333..68e0ba2504c59223474d613b87e360a913ee0e70 100644 GIT binary patch delta 107 zcmaFJ@{nc1Sq=$7PIH;vJ3nr`YRVXHple{LYiJx|Xli9(X=PxlYhY|;U@-q<^8*G3 z2GtVRh?11Vl2ohQ{FKbJN(LhXBcN(ST_ckaBLk2IQ>X@Mz4&&Z1_n=8KbLh*2~7YA CydKT~ delta 107 zcmaFJ@{nc1Sq^DYHJR

)&m>YRVXHsB37bYh)2(U|?lzVP#~YYhY|;U|`5Qbq50j qgKCLuL`h0wNvc(DeoAIqC4-TH5q1p@0lF+e4Gf;HelF{r5}E+bi5*w~ diff --git a/usage/images/pause.png b/usage/images/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..82bf0ecea3be965446b610da68c26b953e949496 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAr#;f;tHg9Rx$j)(g$Sx zU&ZkM|NrLs@9TgZ#*!evUY)*tyVL3Xm2c>21sKVuZ; z$kfxtF+}5hazcU#5F{`#Ni+v~dY)`x>^!*Q(IXDQ1|v7twtfbKOS}>jB+eW=b}WIB zgPFl(rtxuWvs3Lr15`^~BT7;dOH!?pi&B9UgOP!ek*V!Z literal 0 HcmV?d00001 diff --git a/usage/images/pause_small.png b/usage/images/pause_small.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cd2df892e9316d5a9b75e6a2bbaf18c14ee646 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFQz@c^t@LFY)wsWq-yf%*n?)=h;gq zppd?&i(?4K_2dKr5s?HDk(7i4fgq!VkRUcg8D5FdmY0VGL`)JySPXl5d1v(YN-}Wm z<+hp-EZGUvs#@Y2QIe8al4_M)lnSI6j0}v7bPWu34J|_qjjRk!tPG8H4UDY}3>Ifk fKY*ekH$NpatrE9}OJ@2tKn)C@u6{1-oD!M=d#Wzp$Pyv%or>H delta 82 zcmX@he3p5_Vh(9hHJR

)%aWeOk&;*U(Vc$RfnRz{=Rd%E&_3z}U*bz>s(9j>!`k XWfjmR90GJ%7=Xaj)z4*}Q$iB}7IhZ3 diff --git a/usage/images/run.png b/usage/images/run.png new file mode 100644 index 0000000000000000000000000000000000000000..05244e7b2edb0d737f30662a8a2975b668e7c646 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAr#;f;tHf08W!;C@S;ov`GRYS&nW%>2OBXsUXn*ldj@`#(#D&msqGS_8aWqN-T(8Qy+e(`NxhcljC4Ftaa^ z-5|TcKH!b`wT8djH?~HvkathgF6i)Ca1!VO)e_f;l9a@fRIB8oR3OD*WME{ZYhb8r zXc=N?WMyb#WoWExU~FYzusD1A0Td0n`6-!cmAExrGSjaCYGCkm^>bP0l+XkKxp#ds literal 0 HcmV?d00001 diff --git a/usage/images/run_small.png b/usage/images/run_small.png new file mode 100644 index 0000000000000000000000000000000000000000..fc37d25b411a4024a74b049d815055ae5de2252c GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFy>tQ! zxqG@ehHzZhJ$sOsL4kwWVU|UMik^ZWgU*A)f73r*{Pa?_HDSiFgVO|r`~odvqhAy) zJlxu+`9t;3##6_i#@L)M{n?!va4Vqh=teHTe}^-Hu4Payag8WRNi0dVN-jzTQVd20 zMn<{@hPsB9A%;d)h9*{q#<~W^Rt5%(v!@?G(U6;;l9^VCTf-$Y{TiSK22WQ%mvv4F FO#n27ZEXMm literal 0 HcmV?d00001 diff --git a/usage/images/send_cad.png b/usage/images/send_cad.png new file mode 100644 index 0000000000000000000000000000000000000000..be98e80cd9f196c285bbf0c034240184d33efbbe GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgp%vg0;tEpG&~V_uf&c&i z1KB_h1CX(E=cA8*e*gXd_y7NY|Np=H{`cR%f0O3h?F1@dED7=pW^j0RBMrn!@^*J& z7Uc2y1mv)nc>21sKVuZ;=%uHNV~EE2wG+)GbfuZQ|4cCz9Tw$uC&k5gw8cyyBGZM(AlJW|ND{UQpYdW-qv1n za?<=YSs}bP`ljvK@+xLJOBLILMQ1l}QNG~km^ruVjYM`CXy1^;vlx*_kOE(+)0St>oTX=Xz3s z#q5u6*UXCT5C1WzOibCx+cLEp=xNmw*NBpo#FA92K-fE@M`PhVH|XN zy>tQ!rFyzJhHzZ>J#~<`L4l|Bp}SIfV9bFREHXQaUT{of^(kOT+O>~W&#eBEerDpG zHH;C57HVF*n_XYwJ}=TR@KMmL4Wbh#F%;i3-NU=HO=^9g2D6gv38CMd-z3j(&^g4b zkme+R=`Z6NF|i+ICBGAa7OIxGMwFx^mZVxG7o`Fz1|tI_BV7YST|>(dLnA9g6Dvbw oT?1n)1B1oc(+{9%$jwj5OsmAL;gXqt4NwDvr>mdKI;Vst0C^XB82|tP literal 0 HcmV?d00001 diff --git a/usage/images/send_cae.png b/usage/images/send_cae.png new file mode 100644 index 0000000000000000000000000000000000000000..d95c41d73f4316af1bd27844b86ca6617c5adc1b GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAsXNl;tEpG&~V_uf&c&i zgV_u~+VAN8I3S0yB*-tA!Qt7BG!Q4r+uem(kjLi}ki%Z$>Fdh=j8T}Ak9W?qmrg*T z%bqTdAsXkmP6*^Xq#)pOeaYYLP3#-0n9QF_3tKcqzF_s(`Cl+5qU$Tex#KD}Y%^H> zgkS6Mxr(RQ9?=dcKeAj*{KK5*v&H@^SNKl8cIvnU%Zp1FGo5O7M;v$%QFdfXlY6xB zf##TAL++UjwK86siMMj3+r^Y8bwo`Q(wNlI6;bxtJn;MW8NXyh`gdO~QCP0|G@*JC z!?&u=PgjIwCKhI0ywS~bE?IY%I>QQ4)7O087VSIhy;D>+g*W-k?OWYqJ0)t&*cs08 zW!o{;&Dk$mcO?GwKgMlcemmah=l=kDPqoA~q9i4;B-JXpC>2OC7#SED=^7a78d`=J w8d({dSQ#4Y8W>v{7%a}7egH*7ZhlH;S|x4`m(28QfEpM)UHx3vIVCg!0I++m2><{9 literal 0 HcmV?d00001 diff --git a/usage/images/send_cae_small.png b/usage/images/send_cae_small.png new file mode 100644 index 0000000000000000000000000000000000000000..9879e3cede79d03e327c5249d7f46be2114ecec8 GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFK-fE@M`PhVH|XNy>tQ! zrFyzJhHzZ>J>$sLpdi3{L9l54Q_e+x3A^UCzGL0W-E!|gN9{$|4~cSzpHB|Zc5<0* zDVShy@~J&cj#2FVrXw5^y^h`6@yO`yS{{|~`Hj;KJEXoe@;d0}k$#!w)tz=PjlYeB zYc8|T{3z6SvEHl{XrXF}YeY#(Vo9o1a#1RfVlXl=GSW3L)HSpWF*LF=G_f)?)-^D; lGB8-2J^cWRhTQy=%(P0}8ZMdX*8nvzc)I$ztaD0e0sxJleJ=n2 literal 0 HcmV?d00001 diff --git a/usage/images/settings.png b/usage/images/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..eb129fde6c233e2aa1f7c19b68d1f225e7dfe867 GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgArasc;tEpG(D48Ne<0() zfddVVbqx&+Kwi8=O21V2eb!z>x6Mm5zAEtqbj@?SvMBHU z0`b~cnnxG8vfKWgcxq$zMKS-Ek#|@d?zioYVLae4W#2!>5A#~h&!mSi8`Mp21bSJu z#5JNMC9x#cD!C{XNHG{07#Zmr80s2Yh8P-I8Jbub8tWPuTNxNE&Ype%MMG|WN@iLm WZVi{r^lN|`7(8A5T-G@yGywq3R=lqO literal 0 HcmV?d00001 diff --git a/usage/images/settings_small.png b/usage/images/settings_small.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5eb1f4c39325587e20ccee626d3a32dee6365b GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF?NMQuI$ekg*o|n=RAAq z1Qg2mba4#fxSpJlAR;1=z`&@e>Y6HWcEzJdPcj&U3JOISja_0|comiU*w!pO$mn3& z#pdX>>XgFKRbH8%E7=^}CPZaPOgN|@F-0tgE6IR;snmv5tju3Gt~w-(d wLnA9g6DvbwT?1n)1B1oc(+{9%$jwj5OsmAL;gXqt4NwDvr>mdKI;Vst0Dh-=D*ylh literal 0 HcmV?d00001 diff --git a/usage/images/sound.png b/usage/images/sound.png index 5a12149c1a15f7f8b55d44a7eafadad99d2d638c..cdf8be2693470e745c6d66ea44e8998df21d93cc 100644 GIT binary patch delta 106 zcmcb_e2IC&N)8D@PIH;vJ3mg`cq-gL*T7KM&^W}<)XKop%D`0Dz}U*bVE)JE2Mi1h zswJ)wB`Jv|saCo9DVb@N3`Pb7I!9YJQZ%JYiOuzWD#OuU}a=tWniFdU<@Q@mp*>Oz`&qd o;u=wsl30>zm7AZEnO4bQWMG6{!z+#G0H6j2Pgg&ebxsLQ0O}4N`Tzg` diff --git a/usage/images/storage_controllers.png b/usage/images/storage_controllers.png index ba965c0f9c72268318455184000dd83778a0e7c5..740831e1a5fba35609f1e515843d128241cabedf 100644 GIT binary patch delta 104 zcmX@ae295M8Ha=*r@74TogXLGy$>}o(lsy%F*LU_v9L0<)HN`+GB8M;J9QBQ1A}Ub zYeY#(Vo9o1ZhlH;S|x*#fsvuEp`oskNr;hwm4T&|sVPK*v|fBWPy>UftDnm{r-UW| DfW;ka delta 104 zcmX@ae295M8Hco}n#}g)_3tLuy$>}s)HSjQF)*+)wy-j?&^0i&GB7aYow|d8fkCyz pHKHUXu_V=d#Wzp$Py>CKzu3 delta 82 zcmcc1e3yB`G7f1`3C5`@99|RG-HbP0l+XkKzC{*B From 3fc1fcc32c6af28d83ac9f0d59ce2f56f717213f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 20:51:08 -0300 Subject: [PATCH 7/8] Fix references to parallel port settings --- settings/network.rst | 2 +- settings/sound.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/network.rst b/settings/network.rst index 785f064..6d65b65 100644 --- a/settings/network.rst +++ b/settings/network.rst @@ -30,4 +30,4 @@ Network card to emulate. Only cards supported by the machine's expansion buses w The *Configure* button opens a new window with settings specific to the selected network card, such as the I/O port and IRQ for ISA cards. -The **[LPT] Parallel Port Internet Protocol** network adapter requires a **PLIP Network** device to be attached to a :ref:`parallel port `. +The **[LPT] Parallel Port Internet Protocol** network adapter requires a **PLIP Network** device to be attached to a :ref:`parallel port `. diff --git a/settings/sound.rst b/settings/sound.rst index b8cee23..1721754 100644 --- a/settings/sound.rst +++ b/settings/sound.rst @@ -5,7 +5,7 @@ The *Sound* page contains settings related to the emulated machine's audio hardware. -Parallel port sound devices such as the **Disney Sound Source** and **Covox Speech Thing** are not present on this page; they can be configured through the :ref:`Ports page `. +Parallel port sound devices such as the **Disney Sound Source** and **Covox Speech Thing** are not present on this page; they can be configured through the :ref:`Ports page `. Sound card ---------- From 7e7bf0cfc297dc3c2988f1381af5fd07111e9b52 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 31 Jan 2022 21:12:41 -0300 Subject: [PATCH 8/8] Add toolbar documentation --- index.rst | 1 + usage/menubar.rst | 8 +++----- usage/toolbar.rst | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 usage/toolbar.rst diff --git a/index.rst b/index.rst index 894bacc..60b39e0 100644 --- a/index.rst +++ b/index.rst @@ -26,6 +26,7 @@ Contents usage/gettingstarted usage/menubar + usage/toolbar usage/statusbar settings/index diff --git a/usage/menubar.rst b/usage/menubar.rst index 5e1890c..f5bf585 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -11,16 +11,14 @@ 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. - -.. note:: Emulation is automatically paused when the emulated machine enters ACPI sleep mode. - +* **Pause:** pause emulation of the machine. Uncheck this option to resume emulation. * **Exit:** quit 86Box. Requires confirmation, which can be disabled by checking the *Don't show this message again* box. View ---- * **Hide status bar:** hides the :doc:`status bar ` at the bottom of the window. +* **Hide toolbar:** hides the :doc:`toolbar ` below the menu bar. * **Resizeable window:** allow the 86Box window to be freely resized. Unchecking this option will also return the window to its normal size. * **Remember size & position:** automatically save the size and position of the 86Box window to the emulated machine's configuration file. * **Renderer:** select a graphical renderer for the emulated display. @@ -69,7 +67,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: diff --git a/usage/toolbar.rst b/usage/toolbar.rst new file mode 100644 index 0000000..2f74996 --- /dev/null +++ b/usage/toolbar.rst @@ -0,0 +1,42 @@ +.. include:: /include.rst + +Toolbar +======= + +The toolbar located at the top of the 86Box window (right below the :doc:`menu bar `) has two purposes: it provides quick actions for the emulated machine on its left hand side, and displays status information on its right hand side. + +|pause| |run| Pause/resume execution +------------------------------------ + +Pause emulation of the machine. Press again to resume emulation. + +.. note:: Emulation is automatically paused when the emulated machine enters ACPI sleep mode. + +|hard_reset| 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. + +|acpi_shutdown| ACPI shutdown +----------------------------- + +Initiate a clean shutdown of the emulated machine. Only available on machines with ACPI soft power off capability. + +|send_cad| |send_cae| Press Ctrl+Alt+Del/Ctrl+Alt+Esc +------------------------------------------------------- + +Send a *Ctrl+Alt+Del* (left-most icon) or *Ctrl+Alt+Esc* (right-most icon) key combination to the emulated machine. You can alternatively press *Ctrl+F12* to send a *Ctrl+Alt+Del* combination. + +|settings| Settings +------------------- + +Open the :doc:`Settings <../settings/index>` window to configure the emulated machine. + +Status area +----------- + +The right hand side of the toolbar displays status information, such as: + +* **Emulation speed** in percentage. If this number stays consistently below 100%, your host system is not keeping up with emulating the configured hardware. +* **Mouse state** (captured or released) if a :ref:`mouse ` is enabled. +* **Pause indicator** if emulation is paused.