From 10278a95b6c98891416483f8ba8df1285ef9190f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sun, 13 Apr 2025 09:58:54 -0300 Subject: [PATCH 1/3] Backport environment updates from v4.3 --- .readthedocs.yaml | 11 +++++++---- conf.py | 4 ++-- requirements.txt | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c485e54..aec4fdc 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,12 +1,15 @@ version: 2 build: - os: "ubuntu-22.04" + os: "ubuntu-24.04" tools: - python: "3.11" - -formats: all + python: "3.13" python: install: - requirements: requirements.txt + +sphinx: + configuration: conf.py + +formats: all diff --git a/conf.py b/conf.py index 88baf48..ebe4508 100644 --- a/conf.py +++ b/conf.py @@ -3,7 +3,7 @@ # This file only contains a selection of the most common options. For a full # list see the documentation: # https://www.sphinx-doc.org/en/master/usage/configuration.html -import sphinx_rtd_theme +import sphinx_rtd_theme, time # -- Path setup -------------------------------------------------------------- @@ -19,7 +19,7 @@ import sphinx_rtd_theme # -- Project information ----------------------------------------------------- project = '86Box' -copyright = '2020-2023, 86Box Project' +copyright = f'2020-{time.strftime("%Y")}, 86Box Project' author = '86Box Project' diff --git a/requirements.txt b/requirements.txt index 1e9b3e2..d0d58e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -Sphinx==5.3.0 -sphinx-rtd-theme==1.0.0 -linuxdoc==20211220 +Sphinx==7.4.7 +sphinx-rtd-theme==3.0.2 +linuxdoc==20240924 From c91926976ce755e2fd583e59bb7de3bc28545d3a Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sun, 13 Apr 2025 10:58:46 -0300 Subject: [PATCH 2/3] Backport Sphinx 8 upgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d0d58e7..47ed188 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -Sphinx==7.4.7 +Sphinx==8.2.3 sphinx-rtd-theme==3.0.2 linuxdoc==20240924 From 6cfae537d7d7be585c530f480e7f9d336b1b0ae7 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 14 Apr 2025 22:58:52 -0300 Subject: [PATCH 3/3] Media history for remaining removable drives --- usage/statusbar.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usage/statusbar.rst b/usage/statusbar.rst index 8622d22..ba641a5 100644 --- a/usage/statusbar.rst +++ b/usage/statusbar.rst @@ -13,20 +13,26 @@ A cassette tape icon will appear if :ref:`IBM cassette emulation ` into the deck. Dragging and dropping an image file on the icon will also load it. * **Existing image (Write-protected):** insert a cassette tape image file into the deck as a read-only tape. +* A history of the last few images that were loaded into the deck. Click on an entry to load it back. * **Record:** start recording data to the cassette tape. Not available if the tape is read-only. * **Play:** start playing the cassette tape. * **Rewind to the beginning:** rewind the cassette tape to its beginning. * **Fast forward to the end:** fast forward the cassette tape to its end. * **Eject:** remove the currently-inserted cassette tape from the deck. +.. note:: **86Box 4.2.1:** The image history has been added. + |cartridge| PCjr cartridges --------------------------- Two cartridge icons will appear if the **IBM PCjr** is being emulated. Each icon corresponds to a cartridge slot on the PCjr's front panel. * **Image:** insert a :ref:`cartridge image file ` into this slot. Inserting a cartridge will reset the PCjr. Dragging and dropping an image file on the icon will also load it. +* A history of the last few images that were loaded into this slot. Click on an entry to load it back. * **Eject:** remove the currently-inserted cartridge from this slot. +.. note:: **86Box 4.2.1:** The image history has been added. + |floppy_35| |floppy_525| Floppy drives -------------------------------------- @@ -59,8 +65,10 @@ A ZIP or MO icon will appear for each configured :doc:`additional removable stor * **New image:** create a new disk image file. Opens the *New Image* window, which lets you select the image size and where to save the file. * **Existing image:** insert a :ref:`disk image file ` into this drive. Dragging and dropping an image file on the icon will also load it. * **Existing image (Write-protected):** insert a disk image file into this drive as a read-only disk. +* A history of the last few images that were loaded into this drive. Click on an entry to load it back. * **Eject:** remove the currently-inserted disk from this drive. -* **Reload previous image:** reinsert the last disk image file selected through the *Existing image* options. + +.. note:: **86Box 4.2.1:** The image history has replaced the **Reload previous image** option. |hard_disk| Hard disks ----------------------