Merge branch 'master' of https://github.com/86Box/86Box

.ci/Jenkinsfile

@@ -16,6 +16,7 @@
  */
 
 def repository = 'https://github.com/86Box/86Box.git'
+def commitBrowser = 'https://github.com/86Box/86Box/commit/%s'
 def branch = 'master'
 
 def osArchs = [
@@ -195,6 +196,9 @@ pipeline {
 								/* Archive resulting artifacts. */
 								archiveArtifacts artifacts: "$packageName*"
 							}
+
+							/* Clean up. */
+							removeDir("${env.WORKSPACE_TMP}/output")
 						} catch (e) {
 							/* Mark that a failure occurred. */
 							anyFailure = true
@@ -225,12 +229,15 @@ pipeline {
 													/* Run build process. */
 													def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}"
 													dir("${dynarecNames[dynarec]}/$os - ${archNames[arch]}") {
-														runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"")
+														runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} -D QT=ON -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"")
 													}
 
 													/* Archive resulting artifacts. */
 													archiveArtifacts artifacts: "**/**/$packageName*"
 												}
+
+												/* Clean up. */
+												removeDir("${env.WORKSPACE_TMP}/output")
 											} catch (e) {
 												/* Mark that a failure occurred. */
 												anyFailure = true
@@ -272,7 +279,7 @@ pipeline {
 							    description: "**Status:** ${result}\n\u2060", /* word joiner character forces a blank line */
 							    enableArtifactsList: false,
 							    showChangeset: true,
-							    scmWebUrl: "https://github.com/86Box/86Box/commit/%s"
+							    scmWebUrl: commitBrowser
 
 						/* Notify IRC, which needs a node for whatever reason. */
 						node {

.ci/build.sh

@@ -213,8 +213,8 @@ else
 		*)	arch_deb="$arch";;
 	esac
 
-	# Establish general and architecture-specific dependencies.
-	pkgs="cmake pkg-config git tar xz-utils dpkg-dev rpm"
+	# Establish general dependencies.
+	pkgs="cmake pkg-config git tar xz-utils dpkg-dev rpm wayland-protocols"
 	if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
 	then
 		pkgs="$pkgs build-essential"
@@ -222,12 +222,17 @@ else
 		sudo dpkg --add-architecture $arch_deb
 		pkgs="$pkgs crossbuild-essential-$arch_deb"
 	fi
+
+	# Establish architecture-specific dependencies we don't want listed on the readme...
+	pkgs="$pkgs linux-libc-dev:$arch_deb extra-cmake-modules:$arch_deb qttools5-dev:$arch_deb qtbase5-private-dev:$arch_deb"
+
+	# ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
 	libpkgs=""
 	longest_libpkg=0
-	for pkg in libc6-dev linux-libc-dev libopenal-dev libfreetype6-dev libsdl2-dev libpng-dev librtmidi-dev
+	for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libglib2.0-dev
 	do
 		libpkgs="$libpkgs $pkg:$arch_deb"
-		length=$(echo -n $pkg | sed 's/-dev$//' | wc -c)
+		length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)
 		[ $length -gt $longest_libpkg ] && longest_libpkg=$length
 	done
 
@@ -392,7 +397,7 @@ then
 else
 	# Archive readme with library package versions.
 	echo Libraries used to compile this $arch build of $project: > archive_tmp/README
-	dpkg-query -f '${Package} ${Version}\n' -W $libpkgs | sed "s/-dev / /" | while IFS=" " read pkg version
+	dpkg-query -f '${Package} ${Version}\n' -W $libpkgs | sed "s/-dev / /" | sed "s/qtdeclarative/qt/" | while IFS=" " read pkg version
 	do
 		for i in $(seq $(expr $longest_libpkg - $(echo -n $pkg | wc -c)))
 		do
@@ -425,7 +430,7 @@ cd archive_tmp
 if is_windows
 then
 	# Create zip.
-	"$sevenzip" a -y -mx9 "$(cygpath -w "$cwd")\\$package_name.zip" *
+	"$sevenzip" a -y "$(cygpath -w "$cwd")\\$package_name.zip" *
 	status=$?
 elif is_mac
 then

.github/workflows/cmake.yml

@@ -260,6 +260,7 @@ jobs:
           -D DEV_BRANCH=${{ matrix.build.dev-build }}
           -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
           -D VNC=OFF
+          -D QT=OFF
           -D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
           -D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11
       - name: Build
@@ -316,7 +317,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: brew install freetype sdl2 libpng openal-soft rtmidi
+        run: brew install freetype sdl2 libpng openal-soft rtmidi qt@5
       - name: Configure CMake
         run: >-
           cmake -S . -B build
@@ -325,6 +326,9 @@ jobs:
           -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
           -D VNC=OFF
           -D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
+          -D QT=ON
+          -D Qt5_DIR=/usr/local/Cellar/qt@5/5.15.2_1/lib/cmake/Qt5
+          -D Qt5LinguistTools_DIR=/usr/local/Cellar/qt@5/5.15.2_1/lib/cmake/Qt5LinguistTools/
       - name: Build
         run: cmake --build build
       - name: Generate package

CMakeLists.txt

@@ -18,10 +18,18 @@ cmake_minimum_required(VERSION 3.16)
 cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0079 NEW)
 
-if (QT)
+if(QT)
     list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui")
 endif()
 
+if(SLIRP_EXTERNAL)
+    list(APPEND VCPKG_MANIFEST_FEATURES "slirp")
+endif()
+
+if(MUNT_EXTERNAL)
+    list(APPEND VCPKG_MANIFEST_FEATURES "munt")
+endif()
+
 project(86Box
     VERSION 3.2
     DESCRIPTION "Emulator of x86-based systems"
@@ -32,26 +40,26 @@ include(CPack)
 include(CMakeDependentOption)
 
 # Basic build options
-if(WIN32)
-    if(VCPKG_TOOLCHAIN)
-        # For vcpkg builds we have to respect the linking method used by the
-        # specified triplet.
-        set(NO_STATIC_OPTION ON)
-        if(VCPKG_TARGET_TRIPLET MATCHES "-windows-static$")
-            # `-static` triplet, use static linking
-            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-            set(STATIC_BUILD ON)
-        elseif(VCPKG_TARGET_TRIPLET MATCHES "-windows-static-md$")
-            # `-static-md` triplet, use static linking with dynamic CRT
-            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-            set(STATIC_BUILD ON)
-        elseif()
-            # Regular triplet, use dynamic linking
-            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-            set(STATIC_BUILD OFF)
-        endif()
+if(VCPKG_TOOLCHAIN)
+    # For vcpkg builds we have to respect the linking method used by the
+    # specified triplet.
+    set(NO_STATIC_OPTION ON)
+    if(VCPKG_TARGET_TRIPLET MATCHES "-static$")
+        # `-static` triplet, use static linking
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+        set(STATIC_BUILD ON)
+    elseif(VCPKG_TARGET_TRIPLET MATCHES "-static-md$")
+        # `-static-md` triplet, use static linking with dynamic CRT
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        set(STATIC_BUILD ON)
+    elseif()
+        # Regular triplet, use dynamic linking
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        set(STATIC_BUILD OFF)
     endif()
+endif()
 
+if(WIN32)
     # Prefer static builds on Windows
     set(PREFER_STATIC ON)
 
@@ -98,6 +106,7 @@ if(WIN32)
 endif()
 
 set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 
 # Optional features
 #
@@ -108,13 +117,16 @@ option(DYNAREC      "Dynamic recompiler"
 option(OPENAL       "OpenAL"                                                        ON)
 option(FLUIDSYNTH   "FluidSynth"                                                    ON)
 option(MUNT         "MUNT"                                                          ON)
-option(VRAMDUMP     "Video RAM dumping"                                             OFF)
 option(DINPUT       "DirectInput"                                                   OFF)
 option(CPPTHREADS   "C++11 threads"                                                 ON)
 option(NEW_DYNAREC  "Use the PCem v15 (\"new\") dynamic recompiler"                 OFF)
 option(MINITRACE    "Enable Chrome tracing using the modified minitrace library"    OFF)
 option(DEV_BRANCH   "Development branch"                                            OFF)
+if(NOT WIN32)
 option(QT           "QT GUI"                                                        ON)
+else()
+option(QT           "QT GUI"                                                        OFF)
+endif()
 
 # Development branch features
 #
@@ -139,7 +151,6 @@ cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"
 
 # Ditto but for Qt
 if (QT)
-    option(QT_STATIC "Statically build QT" ON)
     option(USE_QT6 "Use Qt6 instead of Qt5" OFF)
 endif()
 

cmake/flags-gcc-aarch64.cmake

@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv8-a -mfloat-abi=hard")
-string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv8-a -mfloat-abi=hard")
+string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv8-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv8-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
 
 include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)

src/CMakeLists.txt

@@ -36,10 +36,6 @@ if(DYNAREC)
     add_compile_definitions(USE_DYNAREC)
 endif()
 
-if(VRAMDUMP)
-    add_compile_definitions(ENABLE_VRAM_DUMP)
-endif()
-
 if(DEV_BRANCH)
     add_compile_definitions(DEV_BRANCH)
 endif()
@@ -83,25 +79,6 @@ if(APPLE)
     endif()
 endif()
 
-if(QT)
-  set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-  if (USE_QT6)
-      set(QT_MAJOR 6)
-  else()
-      set(QT_MAJOR 5)
-  endif()
-  
-  # if we want to use qt5-static to eliminate need for bundling qt dlls (windows)
-  #set(QT_STATIC ON)
-  # needed to build with qt5-static if both qt5 and qt5-static are installed
-  #set(CMAKE_PREFIX_PATH "path/to/qt5-static")
-  
-  find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets OpenGL REQUIRED)
-  find_package(Qt${QT_MAJOR}LinguistTools REQUIRED)
-endif()
-
 find_package(Freetype REQUIRED)
 include_directories(${FREETYPE_INCLUDE_DIRS})
 if(APPLE)
@@ -111,9 +88,20 @@ if(APPLE)
 endif()
 
 if(OPENAL)
-    find_package(OpenAL REQUIRED)
-    include_directories(${OPENAL_INCLUDE_DIR})
-    target_link_libraries(86Box ${OPENAL_LIBRARY})
+    if(VCPKG_TOOLCHAIN)
+        find_package(OpenAL CONFIG REQUIRED)
+    elseif(MINGW)
+        find_package(OpenAL MODULE REQUIRED)
+    else()
+        find_package(OpenAL REQUIRED)
+    endif()
+
+    if(TARGET OpenAL::OpenAL)
+        target_link_libraries(86Box OpenAL::OpenAL)
+    else()
+        include_directories(${OPENAL_INCLUDE_DIR})
+        target_link_libraries(86Box ${OPENAL_LIBRARY})
+    endif()
 endif()
 
 find_package(SDL2 REQUIRED)
@@ -178,90 +166,29 @@ else()
     install(TARGETS 86Box)
 endif()
 
-# prepare everything for Qt5 bundle creation
-if (APPLE AND QT)
-    set(prefix "86Box.app/Contents")
-    set(INSTALL_RUNTIME_DIR "${prefix}/MacOS")
-    set(INSTALL_CMAKE_DIR "${prefix}/Resources")
-endif()
-
-# loads a macro to install Qt5 plugins on macOS
-# based on https://stackoverflow.com/questions/35612687/cmake-macos-x-bundle-with-bundleutiliies-for-qt-application
-macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var _prefix)
-    get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
-    if(EXISTS "${_qt_plugin_path}")
-        get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
-        get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
-        get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
-        set(_qt_plugin_dest "${_prefix}/PlugIns/${_qt_plugin_type}")
-        install(FILES "${_qt_plugin_path}"
-            DESTINATION "${_qt_plugin_dest}")
-        set(${_qt_plugins_var}
-            "${${_qt_plugins_var}};\$ENV{DEST_DIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
-    else()
-        message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
-    endif()
-endmacro()
-
-# Install our dependencies to the macOS bundle
-if(APPLE)
-    if (NOT QT)
-        install(CODE "
-            include(BundleUtilities)
-            get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
-            fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"\" \"\")"
-        COMPONENT Runtime)
-    endif()
-    
-    if(QT)
-    # using the install_qt5_plugin to add Qt plugins into the macOS app bundle
-    if (USE_QT6)
-        install_qt5_plugin("Qt6::QCocoaIntegrationPlugin" QT_PLUGINS ${prefix})
-    else()
-        install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS ${prefix})
-        install_qt5_plugin("Qt5::QMacStylePlugin" QT_PLUGINS ${prefix})
-        install_qt5_plugin("Qt5::QICOPlugin" QT_PLUGINS ${prefix})
-        install_qt5_plugin("Qt5::QICNSPlugin" QT_PLUGINS ${prefix})
-    endif()
-    
-    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-        "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-        DESTINATION "${INSTALL_CMAKE_DIR}")
-
-    # Note Mac specific extension .app
-    set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/86Box.app")
-
-    # Directories to look for dependencies
-    set(DIRS "${CMAKE_BINARY_DIR}")
-
-    # Path used for searching by FIND_XXX(), with appropriate suffixes added
-    if(CMAKE_PREFIX_PATH)
-        foreach(dir ${CMAKE_PREFIX_PATH})
-            list(APPEND DIRS "${dir}/bin" "${dir}/lib")
-    endforeach()
-    endif()
-
-    # Append Qt's lib folder which is two levels above Qt5Widgets_DIR
-    list(APPEND DIRS "${Qt5Widgets_DIR}/../..")
-
-    include(InstallRequiredSystemLibraries)
-
-    message(STATUS "APPS: ${APPS}")
-    message(STATUS "QT_PLUGINS: ${QT_PLUGINS}")
-    message(STATUS "DIRS: ${DIRS}")
-
-    install(CODE "include(BundleUtilities)
-        fixup_bundle(\"${APPS}\" \"${QT_PLUGINS}\" \"${DIRS}\")")
-    endif()    
-endif()
-
 
 # Install our dependencies if using vcpkg
 if(VCPKG_TOOLCHAIN)
     x_vcpkg_install_local_dependencies(TARGETS 86Box DESTINATION ".")
 endif()
 
+
+# Install other dependencies
+if(WIN32)
+    install(CODE "
+        include(BundleUtilities)
+        get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
+        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$<TARGET_FILE_NAME:86Box>\" \"\" \"\")"
+    COMPONENT Runtime)
+elseif(APPLE AND NOT QT)
+    install(CODE "
+        include(BundleUtilities)
+        get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
+        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"\" \"\")"
+    COMPONENT Runtime)
+endif()
+
+
 # Install the PDB file on Windows builds
 if(MSVC)
     # CMake fully supports PDB files on MSVC-compatible compilers

src/Makefile.local

@@ -30,8 +30,6 @@ STUFF	:=
 
 # Add feature selections here.
 # -DANSI_CFG forces the config file to ANSI encoding.
-# -DENABLE_VRAM_DUMP enables Video Ram dumping.
-# -DENABLE_LOG_BREAKPOINT enables extra logging.
 # Root logging:
 # -DENABLE_ACPI_LOG=N sets logging level at N.
 # -DENABLE_APM_LOG=N sets logging level at N.
@@ -125,7 +123,7 @@ STUFF	:=
 # -DENABLE_3COM503_LOG=N sets logging level at N.
 # -DENABLE_DP8390_LOG=N sets logging level at N.
 # -DENABLE_NETWORK_LOG=N sets logging level at N.
-# -DENABLE_NIC_LOG=N sets logging level at N.
+# -DENABLE_NE2K_LOG=N sets logging level at N.
 # -DENABLE_PCAP_LOG=N sets logging level at N.
 # -DENABLE_PCNET_LOG=N sets logging level at N.
 # -DENABLE_SLIRP_LOG=N sets logging level at N.
@@ -168,7 +166,6 @@ STUFF	:=
 # -DENABLE_DISCORD_LOG=N sets logging level at N.
 # -DENABLE_DYNLD_LOG=N sets logging level at N.
 # -DENABLE_JOYSTICK_LOG=N sets logging level at N.
-# -DENABLE_LOG_TOGGLES=N sets logging level at N.
 # -DENABLE_SDL_LOG=N sets logging level at N.
 # -DENABLE_SETTINGS_LOG=N sets logging level at N.
 EXTRAS		:=

src/chipset/scamp.c

@@ -729,7 +729,7 @@ scamp_write(uint16_t addr, uint8_t val, void *priv)
 			recalc_ems(dev);
 		}
 		if (dev->ems_autoinc)
-			dev->ems_index = (dev->ems_index + 1) & 0x1f;
+			dev->ems_index = (dev->ems_index + 1) & 0x3f;
 		break;
 		
 	case 0xec:
@@ -795,9 +795,9 @@ scamp_read(uint16_t addr, void *priv)
 		break;
 	case 0xeb:
 		if (dev->ems_index < 0x24)
-			ret = dev->ems[dev->ems_index] = (dev->ems[dev->ems_index] >> 8) & 0xfc;
+			ret = (dev->ems[dev->ems_index] >> 8) | 0xfc;
 		if (dev->ems_autoinc)
-			dev->ems_index = (dev->ems_index + 1) & 0x1f;
+			dev->ems_index = (dev->ems_index + 1) & 0x3f;
 		break;		
 
 	case 0xed:

src/include/86box/86box.h

@@ -36,19 +36,6 @@
 /* Default language 0xFFFF = from system, 0x409 = en-US */
 #define DEFAULT_LANGUAGE 0x0409
 
-#if defined(ENABLE_BUSLOGIC_LOG) || \
-    defined(ENABLE_CDROM_LOG) || \
-    defined(ENABLE_D86F_LOG) || \
-    defined(ENABLE_FDC_LOG) || \
-    defined(ENABLE_IDE_LOG) || \
-    defined(ENABLE_NIC_LOG)
-# define ENABLE_LOG_TOGGLES	1
-#endif
-
-#if defined(ENABLE_LOG_BREAKPOINT) || defined(ENABLE_VRAM_DUMP)
-# define ENABLE_LOG_COMMANDS	1
-#endif
-
 #ifdef MIN
 #undef MIN
 #endif
@@ -143,16 +130,6 @@ extern int	is_pentium;			/* TODO: Move back to cpu/cpu.h when it's figured out,
 extern int	fixed_size_x, fixed_size_y;
 
 
-#ifdef ENABLE_LOG_TOGGLES
-extern int	buslogic_do_log;
-extern int	cdrom_do_log;
-extern int	d86f_do_log;
-extern int	fdc_do_log;
-extern int	ide_do_log;
-extern int	serial_do_log;
-extern int	nic_do_log;
-#endif
-
 extern char	exe_path[2048];			/* path (dir) of executable */
 extern char	usr_path[1024];			/* path (dir) of user data */
 extern char	cfg_path[1024];			/* full path of config file */

src/include/86box/resource.h

@@ -411,17 +411,6 @@
 #define IDM_VID_GL_SHADER	40107
 #define IDM_VID_GL_NOSHADER	40108
 
-#define IDM_LOG_BREAKPOINT	51201
-#define IDM_DUMP_VRAM		51202	// should be an Action
-
-#define IDM_LOG_SERIAL		51211
-#define IDM_LOG_D86F		51212
-#define IDM_LOG_FDC		51213
-#define IDM_LOG_IDE		51214
-#define IDM_LOG_CDROM		51215
-#define IDM_LOG_NIC		51216
-#define IDM_LOG_BUSLOGIC	51217
-
 /*
  * We need 7 bits for CDROM (2 bits ID and 5 bits for host drive),
  * and 5 bits for Removable Disks (5 bits for ID), so we use an

src/include/86box/ui.h

@@ -74,6 +74,7 @@ extern void	ui_sb_update_icon_state(int tag, int active);
 extern void	ui_sb_set_text_w(wchar_t *wstr);
 extern void	ui_sb_set_text(char *str);
 extern void	ui_sb_bugui(char *str);
+extern void	ui_sb_mt32lcd(char *str);
 
 #ifdef __cplusplus
 }

src/include/86box/video.h

@@ -188,10 +188,6 @@ extern void	loadfont(char *s, int format);
 extern int	get_actual_size_x(void);
 extern int	get_actual_size_y(void);
 
-#ifdef ENABLE_VRAM_DUMP
-extern void	svga_dump_vram(void);
-#endif
-
 extern uint32_t	video_color_transform(uint32_t color);
 
 extern void	agpgart_set_aperture(void *handle, uint32_t base, uint32_t size, int enable);

src/network/CMakeLists.txt

@@ -16,5 +16,14 @@
 add_library(net OBJECT network.c net_pcap.c net_slirp.c net_dp8390.c net_3c503.c
     net_ne2000.c net_pcnet.c net_wd8003.c net_plip.c)
 
-add_subdirectory(slirp)
-target_link_libraries(86Box slirp)
+option(SLIRP_EXTERNAL "Link against the system-provided libslirp library" OFF)
+mark_as_advanced(SLIRP_EXTERNAL)
+
+if(SLIRP_EXTERNAL)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(SLIRP REQUIRED IMPORTED_TARGET slirp)
+    target_link_libraries(86Box PkgConfig::SLIRP)
+else()
+    add_subdirectory(slirp)
+    target_link_libraries(86Box slirp)
+endif()

src/network/net_ne2000.c

@@ -124,15 +124,15 @@ typedef struct {
 } nic_t;
 
 
-#ifdef ENABLE_NIC_LOG
-int nic_do_log = ENABLE_NIC_LOG;
+#ifdef ENABLE_NE2K_LOG
+int ne2k_do_log = ENABLE_NE2K_LOG;
 
 static void
 nelog(int lvl, const char *fmt, ...)
 {
     va_list ap;
 
-    if (nic_do_log >= lvl) {
+    if (ne2k_do_log >= lvl) {
 	va_start(ap, fmt);
 	pclog_ex(fmt, ap);
 	va_end(ap);
@@ -920,15 +920,6 @@ nic_init(const device_t *info)
     uint32_t mac;
     char *rom;
     nic_t *dev;
-#ifdef ENABLE_NIC_LOG
-    int i;
-#endif
-
-    /* Get the desired debug level. */
-#ifdef ENABLE_NIC_LOG
-    i = device_get_config_int("debug");
-    if (i > 0) nic_do_log = i;
-#endif
 
     dev = malloc(sizeof(nic_t));
     memset(dev, 0x00, sizeof(nic_t));

src/network/net_pcnet.c

@@ -2905,18 +2905,9 @@ pcnet_init(const device_t *info)
 {
     uint32_t mac;
     nic_t *dev;
-#ifdef ENABLE_NIC_LOG
-    int i;
-#endif
     int c;
     uint16_t checksum;
 
-    /* Get the desired debug level. */
-#ifdef ENABLE_NIC_LOG
-    i = device_get_config_int("debug");
-    if (i > 0) pcnet_do_log = i;
-#endif
-
     dev = malloc(sizeof(nic_t));
     memset(dev, 0x00, sizeof(nic_t));
     dev->name = info->name;

src/network/net_wd8003.c

@@ -120,7 +120,7 @@ typedef struct {
 
 
 #ifdef ENABLE_WD_LOG
-int WE_do_log = ENABLE_WD_LOG;
+int wd_do_log = ENABLE_WD_LOG;
 
 static void
 wdlog(const char *fmt, ...)
@@ -596,12 +596,6 @@ wd_init(const device_t *info)
     uint32_t mac;
     wd_t *dev;
 
-    /* Get the desired debug level. */
-#ifdef ENABLE_NIC_LOG
-    i = device_get_config_int("debug");
-    if (i > 0) WE_do_log = i;
-#endif
-
     dev = malloc(sizeof(wd_t));
     memset(dev, 0x00, sizeof(wd_t));
     dev->name = info->name;

src/network/network.c

@@ -112,9 +112,6 @@ char		network_host[522];
 netdev_t	network_devs[32];
 int		network_rx_pause = 0,
 		network_tx_pause = 0;
-#ifdef ENABLE_NIC_LOG
-int		nic_do_log = ENABLE_NIC_LOG;
-#endif
 
 
 /* Local variables. */
@@ -490,13 +487,9 @@ network_reset(void)
 {
     int i = -1;
 
-#ifdef ENABLE_NIC_LOG
-    network_log("NETWORK: reset (type=%d, card=%d) debug=%d\n",
-			network_type, network_card, nic_do_log);
-#else
     network_log("NETWORK: reset (type=%d, card=%d)\n",
 				network_type, network_card);
-#endif
+
     ui_sb_update_icon(SB_NETWORK, 0);
 
     /* Just in case.. */

src/qt/CMakeLists.txt

@@ -3,8 +3,25 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+if (USE_QT6)
+    set(QT_MAJOR 6)
+else()
+    set(QT_MAJOR 5)
+endif()
+
+set(QT_STATIC ${STATIC_BUILD})
+
+if(QT_STATIC AND MINGW)
+    set(CMAKE_PREFIX_PATH "$ENV{MSYSTEM_PREFIX}/qt${QT_MAJOR}-static")
+endif()
 
 find_package(Threads REQUIRED)
+find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets OpenGL REQUIRED)
+find_package(Qt${QT_MAJOR}LinguistTools REQUIRED)
 
 add_library(plat STATIC
     qt.c
@@ -172,6 +189,71 @@ if (WIN32)
     qt_import_plugins(plat INCLUDE Qt${QT_MAJOR}::QWindowsIntegrationPlugin Qt${QT_MAJOR}::QICOPlugin QWindowsVistaStylePlugin)
 endif()
 
+# loads a macro to install Qt5 plugins on macOS
+# based on https://stackoverflow.com/questions/35612687/cmake-macos-x-bundle-with-bundleutiliies-for-qt-application
+macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var _prefix)
+    get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
+    if(EXISTS "${_qt_plugin_path}")
+        get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
+        get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
+        get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
+        set(_qt_plugin_dest "${_prefix}/PlugIns/${_qt_plugin_type}")
+        install(FILES "${_qt_plugin_path}"
+            DESTINATION "${_qt_plugin_dest}")
+        set(${_qt_plugins_var}
+            "${${_qt_plugins_var}};\$ENV{DEST_DIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
+    else()
+        message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
+    endif()
+endmacro()
+
+if (APPLE AND CMAKE_MACOSX_BUNDLE)
+    set(prefix "86Box.app/Contents")
+    set(INSTALL_RUNTIME_DIR "${prefix}/MacOS")
+    set(INSTALL_CMAKE_DIR "${prefix}/Resources")
+
+    # using the install_qt5_plugin to add Qt plugins into the macOS app bundle
+    if (USE_QT6)
+        install_qt5_plugin("Qt6::QCocoaIntegrationPlugin" QT_PLUGINS ${prefix})
+    else()
+        install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS ${prefix})
+        install_qt5_plugin("Qt5::QMacStylePlugin" QT_PLUGINS ${prefix})
+        install_qt5_plugin("Qt5::QICOPlugin" QT_PLUGINS ${prefix})
+        install_qt5_plugin("Qt5::QICNSPlugin" QT_PLUGINS ${prefix})
+    endif()
+    
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        DESTINATION "${INSTALL_CMAKE_DIR}")
+
+    # Note Mac specific extension .app
+    set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/86Box.app")
+
+    # Directories to look for dependencies
+    set(DIRS "${CMAKE_BINARY_DIR}")
+
+    # Path used for searching by FIND_XXX(), with appropriate suffixes added
+    if(CMAKE_PREFIX_PATH)
+        foreach(dir ${CMAKE_PREFIX_PATH})
+            list(APPEND DIRS "${dir}/bin" "${dir}/lib")
+        endforeach()
+    endif()
+
+    # Append Qt's lib folder which is two levels above Qt5Widgets_DIR
+    list(APPEND DIRS "${Qt5Widgets_DIR}/../..")
+
+    include(InstallRequiredSystemLibraries)
+
+    message(STATUS "APPS: ${APPS}")
+    message(STATUS "QT_PLUGINS: ${QT_PLUGINS}")
+    message(STATUS "DIRS: ${DIRS}")
+
+    install(CODE "
+        include(BundleUtilities)
+        fixup_bundle(\"${APPS}\" \"${QT_PLUGINS}\" \"${DIRS}\")")
+endif()
+
 if (UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
     target_link_libraries(ui PRIVATE X11::X11)

src/qt/evdev_mouse.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Linux/FreeBSD libevdev mouse input module.
+ *
+ *
+ *
+ * Authors:	Cacodemon345
+ *
+ *		Copyright 2021-2022 Cacodemon345
+ */
 #include "evdev_mouse.hpp"
 #include <libevdev/libevdev.h>
 #include <unistd.h>

src/qt/languages/cs-CZ.po

@@ -178,36 +178,6 @@ msgstr "Začít trace\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Zastavit trace\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Záznamy"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Povolit záznamy BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Povolit záznamy CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Povolit záznamy diskety (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Povolit záznamy disketového řadiče\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Povolit záznamy IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Povolit záznamy sériového portu\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Povolit záznamy sítě\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "Zaznamenat do &logu zarážku\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Zaznamenat obsah &video RAM\tCtrl+F1"
-
 msgid "&Help"
 msgstr "Ná&pověda"
 

src/qt/languages/de-DE.po

@@ -29,7 +29,7 @@ msgid "&Hide status bar"
 msgstr "&Statusleiste ausblenden"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Werkzeugleiste &ausblenden"
 
 msgid "&Resizeable window"
 msgstr "&Größenverstellbares Fenster"
@@ -178,36 +178,6 @@ msgstr "Tracing starten\tStrg+T"
 msgid "End trace\tCtrl+T"
 msgstr "Tracing beenden\tStrg+T"
 
-msgid "&Logging"
-msgstr "&Logging"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogic-Logs aktivieren\tStrg+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROM-Logs aktivieren\tStrg+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Disketten (86F)-Logs aktivieren\tStrg+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Diskettencontroller-Logs aktivieren\tStrg+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDE-Logs aktivieren\tStrg+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Seriell-Port-Logs aktivieren\tStrg+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Netzwerk-Logs aktivieren\tStrg+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Breakpoint für die Log-Datei\tStrg+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Video-RAM dumpen\tStrg+F1"
-
 msgid "&Help"
 msgstr "&Hilfe"
 
@@ -350,7 +320,7 @@ msgid "Machine type:"
 msgstr "Systemtyp:"
 
 msgid "Machine:"
-msgstr "Maschine:"
+msgstr "System:"
 
 msgid "Configure"
 msgstr "Einstellen"
@@ -842,7 +812,7 @@ msgid "Do you want to save the settings?"
 msgstr "Möchten Sie die Einstellungen speichern?"
 
 msgid "This will hard reset the emulated machine."
-msgstr "Dies wird zu einem Hard-Reset der emulierten Maschine führen."
+msgstr "Dies wird zu einem Hard-Reset des emulierten Systems führen."
 
 msgid "Save"
 msgstr "Speichern"
@@ -956,22 +926,22 @@ msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer
 msgstr "Der OpenGL (3.0-Kern)-Renderer konnte nicht initialisiert werden. Bitte benutzen Sie einen anderen Renderer."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Fortsetzen"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Pausieren"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Strg+Alt+Entf drücken"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Strg+Alt+Esc drücken"
 
 msgid "Hard reset"
-msgstr "Hard reset"
+msgstr "Hard-Reset"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "ACPI-basiertes Herunterfahren"
 
 msgid "Hard disk (%s)"
 msgstr "Festplatte (%s)"

src/qt/languages/en-GB.po

@@ -178,36 +178,6 @@ msgstr "Begin trace\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "End trace\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Logging"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Enable BusLogic logs\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Enable CD-ROM logs\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Enable floppy (86F) logs\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Enable floppy controller logs\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Enable IDE logs\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Enable Serial Port logs\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Enable Network logs\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Log breakpoint\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Dump &video RAM\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Help"
 

src/qt/languages/en-US.po

@@ -178,36 +178,6 @@ msgstr "Begin trace\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "End trace\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Logging"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Enable BusLogic logs\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Enable CD-ROM logs\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Enable floppy (86F) logs\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Enable floppy controller logs\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Enable IDE logs\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Enable Serial Port logs\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Enable Network logs\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Log breakpoint\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Dump &video RAM\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Help"
 

src/qt/languages/es-ES.po

@@ -178,36 +178,6 @@ msgstr "Comenzar traza\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Terminar traza\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Trazas"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Habilitar trazas de BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Habilitar trazas de CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Habilitar trazas de disquete (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Habilitar trazas de controladora de disquete\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Habilitar trazas de IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Habilitar trazas de Puerto Serie\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Habilitar trazas de Red\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Punto de ruptura de traza\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Volcar RAM de &video\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Ayuda"
 

src/qt/languages/fi-FI.po

@@ -178,36 +178,6 @@ msgstr "Aloita jäljitys\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Lopeta jäljitys\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Lokitus"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogic-lokitus päällä\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROM-lokitus päällä\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Levykelokitus (86F) päällä\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Levykekontrollerin lokitus päällä\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDE-lokitus päällä\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Sarjaporttilokitus päällä\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Verkkolokitus päällä\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Kirjaa keskeytyskohdat\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Tallenna &videomuistin vedos\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Ohje"
 

src/qt/languages/fr-FR.po

@@ -178,36 +178,6 @@ msgstr "Démarrer traces\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Finir traces\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Journalisation"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Activer journaux de BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Activer journaux du CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Activer journaux des disquettes (86F)s\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Activer journaux du contrôleur de disquettes\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Activer journaux de IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Activer journaux de port série\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Activer journaux du réseau\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Point d'arrêt du journal\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Vidage de la mémoire &vidéo\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Aide"
 

src/qt/languages/hr-HR.po

@@ -29,7 +29,7 @@ msgid "&Hide status bar"
 msgstr "&Sakrij statusni redak"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "&Sakrij alatni redak"
 
 msgid "&Resizeable window"
 msgstr "&Prozor s promjenjivim veličinama"
@@ -178,36 +178,6 @@ msgstr "Z&apočni praćenje\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "&Svrši praćenje\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Logging"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Omogući bilježenje za BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Omogući bilježenje za CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Omogući bilježenje za diskete (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Omogući bilježenje za disketni krmilnik\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Omogući bilježenje za IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Omogući bilježenje za serijska vrata\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Omogući bilježenje za omrežje\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Zabilježi prekidnu točku\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Ispiši memoriju zaslona\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Pomoć"
 
@@ -956,22 +926,22 @@ msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer
 msgstr "Nije moguće inicijalizirati OpenGL (3.0 jezgra) renderer. Molimte koristite drugi renderer."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Nastavi"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Pauziraj"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Stisni Ctrl+Alt+Del"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Stisni Ctrl+Alt+Esc"
 
 msgid "Hard reset"
-msgstr "Hard reset"
+msgstr "Ponovno pokretanje"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "ACPI bazirano gašenje"
 
 msgid "Hard disk (%s)"
 msgstr "Tvrdi disk (%s)"

src/qt/languages/hu-HU.po

@@ -178,36 +178,6 @@ msgstr "Nyomkövetés megkezdése\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Nyomkövetés befejezése\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Naplózás"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogic naplók engedélyezése\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROM naplók engedélyezése\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Hajlékonylemez (86F) naplók engedélyezése\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Hajlékonylemez-vezérlő naplók engedélyezése\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDE naplók engedélyezése\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Soros port naplók engedélyezése\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Hálózati naplók engedélyezése\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "Töréspontok &naplózása\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Videómemória lementése\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Súgó"
 

src/qt/languages/it-IT.po

@@ -178,36 +178,6 @@ msgstr "Inizia traccia\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Ferma traccia\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Registra"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Attiva registrazione di BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Attiva registrazione del CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Attiva registrazione del floppy (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Attiva registrazione del controller floppy\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Attiva registrazione di IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Attiva registrazione della porta seriale\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Attiva registrazione della rete\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Punto di interruzione del registro\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Scarica &la RAM video\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&?"
 

src/qt/languages/ja-JP.po

@@ -178,36 +178,6 @@ msgstr "トレース開始\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "トレース終了\tCtrl+T"
 
-msgid "&Logging"
-msgstr "ログ(&L)"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogicのログを有効\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROMのログを有効\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "フロッピー(86F)のログを有効\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "フロッピーコントローラーのログを有効\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDEのログを有効\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "シリアルポートのログを有効\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "ネットワークのログを有効\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "ブレークポイントのログを有効(&L)\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "ビデオRAMのダンプを有効(&V)\tCtrl+F1"
-
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 

src/qt/languages/ko-KR.po

@@ -178,36 +178,6 @@ msgstr "추적 시작하기\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "추적 끝내기\tCtrl+T"
 
-msgid "&Logging"
-msgstr "로그(&L)"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogic 로그 켜기\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROM 로그 켜기\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "플로피 (86F) 로그 켜기\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "플로피 컨트롤러 로그 켜기\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDE 로그 켜기\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "직렬 포트 로그 켜기\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "네트워크 로그 켜기\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "중단점 로그 켜기(&L)\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "비디오 RAM 덤프 켜기(&V)\tCtrl+F1"
-
 msgid "&Help"
 msgstr "도움말(&H)"
 

src/qt/languages/pl-PL.po

@@ -178,36 +178,6 @@ msgstr "Rozpocznij śledzenie\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Zakończ śledzenie\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Logowanie"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Włącz logu BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Włącz logi CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Włącz logi dyskietek (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Włącz logi kontrolera dyskietek\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Włącz logi IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Włącz logi portu szeregowego\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Włącz logi sieci\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Punkt przerwania dziennika\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Zrzuć pamięć &wideo\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Pomoc"
 

src/qt/languages/pt-BR.po

@@ -178,36 +178,6 @@ msgstr "Inicio do rastreamento\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Fim do rastreamento\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Registros"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Ativar registros da BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Ativar registros do CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Ativar registros do disquete (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Ativar registros do controlador de disquete\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Ativar registros da IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Ativar registros da porta serial\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Ativar registros da rede\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Ponto de parada no registo\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Despejo da RAM de &vídeo\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Ajuda"
 

src/qt/languages/pt-PT.po

@@ -178,36 +178,6 @@ msgstr "Iniciar o rastreio\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Terminar o rastreio\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Registo"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Ativar registo BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Ativar registo do CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Ativar registo de disquetes (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Ativar registo do controlador de disquetes\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Ativar registo IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Ativar registo da porta série\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Ativar registo de rede\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Ponto de paragem no registo\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "Despejo de RAM &vídeo\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Ajuda"
 

src/qt/languages/ru-RU.po

@@ -178,36 +178,6 @@ msgstr "Начать трассировку\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Завершить трассировку\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Ведение журнала"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Включить журналы BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Включить журналы CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Включить журналы дискет (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Включить журналы контроллера дискет\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Включить журналы IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Включить журналы COM порта\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Включить журналы сети\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Точка останова журнала\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Выгрузка дампа видеопамяти\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Помощь"
 

src/qt/languages/sl-SI.po

@@ -178,36 +178,6 @@ msgstr "Z&ačni sledenje\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "&Končaj sledenje\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Beleženje"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Omogoči beleženje za BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Omogoči beleženje za CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Omogoči beleženje za diskete (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Omogoči beleženje za disketni krmilnik\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Omogoči beleženje za IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Omogoči beleženje za serijska vrata\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Omogoči beleženje za omrežje\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Zabeleži prelomno točko\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Izvozi pomnilnik zaslona\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Pomoč"
 

src/qt/languages/tr-TR.po

@@ -178,36 +178,6 @@ msgstr "Begin trace\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "End trace\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Logging"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "BusLogic kayıtlarını etkinleştir\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "CD-ROM kayıtlarını etkinleştir\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Disket (86F) kayıtlarını etkinleştir\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Disket kontrolcüsü kayıtlarını etkinleştir\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "IDE kayıtlarını etkinleştir\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Seri Port kayıtlarını etkinleştir\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Ağ kayıtlarını etkinleştir\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&breakpoint'i kayıtla\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Video belleğini depola\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Yardım"
 

src/qt/languages/uk-UA.po

@@ -178,36 +178,6 @@ msgstr "Почати трасування\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "Завершити трасування\tCtrl+T"
 
-msgid "&Logging"
-msgstr "&Ведення журнала"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "Увімкнути журнали BusLogic\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "Увімкнути журнали CD-ROM\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "Увімкнути журнали дискет (86F)\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "Увімкнути журнали контролера дискет\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "Увімкнути журнали IDE\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "Увімкнути журнали COM порту\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "Увімкнути журнали мережі\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "&Точка зупинка журналу\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "&Вивантаження дампа відеопам'яті\tCtrl+F1"
-
 msgid "&Help"
 msgstr "&Допомога"
 

src/qt/languages/zh-CN.po

@@ -178,36 +178,6 @@ msgstr "开始追踪\tCtrl+T"
 msgid "End trace\tCtrl+T"
 msgstr "结束追踪\tCtrl+T"
 
-msgid "&Logging"
-msgstr "记录日志(&L)"
-
-msgid "Enable BusLogic logs\tCtrl+F4"
-msgstr "启用 BusLogic 日志\tCtrl+F4"
-
-msgid "Enable CD-ROM logs\tCtrl+F5"
-msgstr "启用 CD-ROM 日志\tCtrl+F5"
-
-msgid "Enable floppy (86F) logs\tCtrl+F6"
-msgstr "启用软盘 (86F) 日志\tCtrl+F6"
-
-msgid "Enable floppy controller logs\tCtrl+F7"
-msgstr "启用软盘控制器日志\tCtrl+F7"
-
-msgid "Enable IDE logs\tCtrl+F8"
-msgstr "启用 IDE 日志\tCtrl+F8"
-
-msgid "Enable Serial Port logs\tCtrl+F3"
-msgstr "启用串口日志\tCtrl+F3"
-
-msgid "Enable Network logs\tCtrl+F9"
-msgstr "启用网络日志\tCtrl+F9"
-
-msgid "&Log breakpoint\tCtrl+F10"
-msgstr "日志断点(&L)\tCtrl+F10"
-
-msgid "Dump &video RAM\tCtrl+F1"
-msgstr "创建显卡内存转储(&V)\tCtrl+F1"
-
 msgid "&Help"
 msgstr "帮助(&H)"
 

src/qt/qt.c

@@ -1,3 +1,17 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 /*
  * C functionality for Qt platform, where the C equivalent is not easily
  * implemented in Qt

src/qt/qt_deviceconfig.cpp

@@ -1,5 +1,24 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Device configuration UI code.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2022 Cacodemon345
+ */
 #include "qt_deviceconfig.hpp"
 #include "ui_qt_deviceconfig.h"
+#include "qt_settings.hpp"
 
 #include <QDebug>
 #include <QComboBox>
@@ -29,8 +48,8 @@ DeviceConfig::~DeviceConfig()
     delete ui;
 }
 
-void DeviceConfig::ConfigureDevice(const _device_* device, int instance) {
-    DeviceConfig dc;
+void DeviceConfig::ConfigureDevice(const _device_* device, int instance, Settings* settings) {
+    DeviceConfig dc(settings);
     dc.setWindowTitle(QString("%1 Device Configuration").arg(device->name));
 
     device_context_t device_context;

src/qt/qt_deviceconfig.hpp

@@ -3,6 +3,8 @@
 
 #include <QDialog>
 
+#include "qt_settings.hpp"
+
 extern "C" {
 struct _device_;
 }
@@ -11,6 +13,8 @@ namespace Ui {
 class DeviceConfig;
 }
 
+class Settings;
+
 class DeviceConfig : public QDialog
 {
     Q_OBJECT
@@ -19,7 +23,7 @@ public:
     explicit DeviceConfig(QWidget *parent = nullptr);
     ~DeviceConfig();
 
-    static void ConfigureDevice(const _device_* device, int instance = 0);
+    static void ConfigureDevice(const _device_* device, int instance = 0, Settings* settings = nullptr);
     static QString DeviceName(const _device_* device, const char* internalName, int bus);
 private:
     Ui::DeviceConfig *ui;

src/qt/qt_filefield.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		File field widget.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2022 Cacodemon345
+ */
 #include "qt_filefield.hpp"
 #include "ui_qt_filefield.h"
 

src/qt/qt_harddiskdialog.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Hard disk dialog code.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2022 Cacodemon345
+ */
 #include "qt_harddiskdialog.hpp"
 #include "ui_qt_harddiskdialog.h"
 
@@ -22,6 +40,7 @@ extern "C" {
 #include <QStringBuilder>
 
 #include "qt_harddrive_common.hpp"
+#include "qt_settings_bus_tracking.hpp"
 #include "qt_models_common.hpp"
 #include "qt_util.hpp"
 
@@ -609,6 +628,7 @@ bool HarddiskDialog::checkAndAdjustCylinders() {
 
 
 void HarddiskDialog::on_comboBoxBus_currentIndexChanged(int index) {
+    int chanIdx = 0;
     if (index < 0) {
         return;
     }
@@ -665,6 +685,27 @@ void HarddiskDialog::on_comboBoxBus_currentIndexChanged(int index) {
     ui->lineEditSectors->setValidator(new QIntValidator(1, max_sectors, this));
 
     Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt());
+    switch (ui->comboBoxBus->currentData().toInt())
+    {
+        case HDD_BUS_MFM:
+            chanIdx = (Harddrives::busTrackClass->next_free_mfm_channel());
+            break;
+        case HDD_BUS_XTA:
+            chanIdx = (Harddrives::busTrackClass->next_free_xta_channel());
+            break;
+        case HDD_BUS_ESDI:
+            chanIdx = (Harddrives::busTrackClass->next_free_esdi_channel());
+            break;
+        case HDD_BUS_ATAPI:
+        case HDD_BUS_IDE:
+            chanIdx = (Harddrives::busTrackClass->next_free_ide_channel());
+            break;
+        case HDD_BUS_SCSI:
+            chanIdx = (Harddrives::busTrackClass->next_free_scsi_id());
+            break;
+    }
+
+    ui->comboBoxChannel->setCurrentIndex(chanIdx);
 }
 
 void HarddiskDialog::on_lineEditSize_textEdited(const QString &text) {

src/qt/qt_harddrive_common.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Common storage devices module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_harddrive_common.hpp"
 
 #include <cstdint>

src/qt/qt_hardwarerenderer.cpp

@@ -1,3 +1,23 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Hardware renderer module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ */
 #include "qt_hardwarerenderer.hpp"
 #include <QApplication>
 #include <QVector2D>
@@ -199,4 +219,4 @@ std::vector<std::tuple<uint8_t*, std::atomic_flag*>> HardwareRenderer::getBuffer
     buffers.push_back(std::make_tuple(imagebufs[1].get(), &buf_usage[1]));
 
     return buffers;
-}
+}

src/qt/qt_joystickconfiguration.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Joystick configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_joystickconfiguration.hpp"
 #include "ui_qt_joystickconfiguration.h"
 

src/qt/qt_machinestatus.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Joystick configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ */
 #include "qt_machinestatus.hpp"
 
 extern "C" {

src/qt/qt_main.cpp

@@ -1,3 +1,22 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *      Main entry point module
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ */
 #include <QApplication>
 #include <QSurfaceFormat>
 #include <QDebug>

src/qt/qt_mainwindow.cpp

@@ -1,3 +1,25 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Main window module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *          dob205
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ *      Copyright 2022 dob205
+ */
 #include "qt_mainwindow.hpp"
 #include "ui_qt_mainwindow.h"
 
@@ -88,7 +110,15 @@ MainWindow::MainWindow(QWidget *parent) :
     auto toolbar_label = new QLabel();
     ui->toolBar->addWidget(toolbar_label);
 
+#ifdef RELEASE_BUILD
+    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
+#elif defined ALPHA_BUILD
+    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
+#elif defined BETA_BUILD
     this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
+#else
+    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
+#endif
     this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
     this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
 
@@ -347,7 +377,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
 #ifdef MTR_ENABLED
     {
-        ui->menuTools->addSeparator();
         ui->actionBegin_trace->setVisible(true);
         ui->actionEnd_trace->setVisible(true);
         ui->actionBegin_trace->setShortcut(QKeySequence(Qt::Key_Control + Qt::Key_T));
@@ -386,6 +415,8 @@ MainWindow::MainWindow(QWidget *parent) :
         });
     }
 #endif
+
+    ui->toolBar->setIconSize(QSize(16 * screen()->devicePixelRatio(), 16 * screen()->devicePixelRatio()));
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) {
@@ -1407,7 +1438,15 @@ void MainWindow::on_actionAbout_86Box_triggered()
     {
         QDesktopServices::openUrl(QUrl("https://86box.net/"));
     });
+#ifdef RELEASE_BUILD
+    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-green.ico").pixmap(32, 32));
+#elif defined ALPHA_BUILD
+    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-red.ico").pixmap(32, 32));
+#elif defined BETA_BUILD
     msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-yellow.ico").pixmap(32, 32));
+#else
+    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-gray.ico").pixmap(32, 32));
+#endif
     msgBox.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
     msgBox.exec();
 }

src/qt/qt_mainwindow.ui

@@ -317,7 +317,7 @@
     <string>&amp;Settings...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::PreferencesRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
    <property name="iconVisibleInMenu">
     <bool>false</bool>
@@ -632,7 +632,7 @@
     <string>&amp;Preferences...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::NoRole</enum>
+    <enum>QAction::PreferencesRole</enum>
    </property>
   </action>
   <action name="actionEnable_Discord_integration">
@@ -648,7 +648,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Hide tool bar</string>
+    <string>Hide &amp;toolbar</string>
    </property>
    <property name="toolTip">
     <string>Hide tool bar</string>

src/qt/qt_mediamenu.cpp

@@ -1,3 +1,23 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Media menu UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ */
 #include "qt_mediamenu.hpp"
 
 #include "qt_machinestatus.hpp"

src/qt/qt_models_common.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Common storage devices module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_models_common.hpp"
 
 #include <QAbstractItemModel>

src/qt/qt_newfloppydialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Common storage devices module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2022 Cacodemon345
+ *      Copyright 2022 Teemu Korhonen
+ */
 #include "qt_newfloppydialog.hpp"
 #include "ui_qt_newfloppydialog.h"
 

src/qt/qt_platform.cpp

@@ -1,3 +1,22 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *      Common platform functions.
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ */
 #include <cstdio>
 
 #include <mutex>

src/qt/qt_progsettings.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Program settings UI module.
+ *
+ *
+ *
+ * Authors: Cacodemon345
+ *
+ *      Copyright 2021-2022 Cacodemon345
+ */
 #include <QDebug>
 
 #include "qt_progsettings.hpp"
@@ -14,6 +30,7 @@
 extern "C"
 {
 #include <86box/86box.h>
+#include <86box/version.h>
 #include <86box/config.h>
 #include <86box/plat.h>
 }
@@ -104,6 +121,7 @@ void ProgSettings::accept()
     reloadStrings();
     update_mouse_msg();
     main_window->ui->retranslateUi(main_window);
+    main_window->setWindowTitle(QString("%1 - %2 %3").arg(vm_name, EMU_NAME, EMU_VERSION_FULL));
     QString msg = main_window->status->getMessage();
     main_window->status.reset(new MachineStatus(main_window));
     main_window->refreshMediaMenu();

src/qt/qt_renderercommon.cpp

@@ -1,3 +1,20 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Program settings UI module.
+ *
+ *
+ *
+ * Authors: Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *      Copyright 2021 Joakim L. Gilje
+ */
+
 #include "qt_renderercommon.hpp"
 #include "qt_mainwindow.hpp"
 

src/qt/qt_rendererstack.cpp

@@ -1,3 +1,23 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Program settings UI module.
+ *
+ *
+ *
+ * Authors: Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *      Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2021 Teemu Korhonen
+ *      Copyright 2021-2022 Cacodemon345
+ */
 #include "qt_rendererstack.hpp"
 #include "ui_qt_rendererstack.h"
 

src/qt/qt_settings.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Program settings UI module.
+ *
+ *
+ *
+ * Authors: Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *      Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ */
 #include "qt_settings.hpp"
 #include "ui_qt_settings.h"
 
@@ -79,6 +97,7 @@ int SettingsModel::rowCount(const QModelIndex &parent) const {
     return pages.size();
 }
 
+Settings* Settings::settings = nullptr;;
 Settings::Settings(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::Settings)
@@ -124,6 +143,8 @@ Settings::Settings(QWidget *parent) :
     connect(ui->listView->selectionModel(), &QItemSelectionModel::currentChanged, this, [this](const QModelIndex &current, const QModelIndex &previous) {
         ui->stackedWidget->setCurrentIndex(current.row());
     });
+
+    Settings::settings = this;
 }
 
 Settings::~Settings()
@@ -131,6 +152,7 @@ Settings::~Settings()
     delete ui;
     delete Harddrives::busTrackClass;
     Harddrives::busTrackClass = nullptr;
+    Settings::settings = nullptr;
 }
 
 void Settings::save() {

src/qt/qt_settings.hpp

@@ -28,6 +28,7 @@ public:
     ~Settings();
      void save();
 
+     static Settings* settings;
 protected slots:
      void accept() override;
 

src/qt/qt_settings_bus_tracking.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Program settings UI module.
+ *
+ *
+ *
+ * Authors: Miran Grca <mgrca8@gmail.com>
+ *          Cacodemon345
+ *
+ *      Copyright 2022 Miran Grca
+ *      Copyright 2022 Cacodemon345
+ */
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>

src/qt/qt_settingsdisplay.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Display settings UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsdisplay.hpp"
 #include "ui_qt_settingsdisplay.h"
 
@@ -77,11 +93,11 @@ void SettingsDisplay::onCurrentMachineChanged(int machineId) {
 
 void SettingsDisplay::on_pushButtonConfigure_clicked() {
     auto* device = video_card_getdevice(ui->comboBoxVideo->currentData().toInt());
-    DeviceConfig::ConfigureDevice(device);
+    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsDisplay::on_pushButtonConfigureVoodoo_clicked() {
-    DeviceConfig::ConfigureDevice(&voodoo_device);
+    DeviceConfig::ConfigureDevice(&voodoo_device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index) {

src/qt/qt_settingsfloppycdrom.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Floppy/CD-ROM devices configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *      Copyright 2021-2022 Cacodemon345
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsfloppycdrom.hpp"
 #include "ui_qt_settingsfloppycdrom.h"
 
@@ -173,8 +191,8 @@ void SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current) {
     if (! match.isEmpty()) {
         ui->comboBoxChannel->setCurrentIndex(match.first().row());
     }
-    else ui->comboBoxChannel->setCurrentIndex(8);
-    ui->comboBoxSpeed->setCurrentIndex(speed - 1);
+
+    ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
 }
 
 void SettingsFloppyCDROM::on_checkBoxTurboTimings_stateChanged(int arg1) {

src/qt/qt_settingsharddisks.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Hard disk configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *      Copyright 2021-2022 Cacodemon345
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsharddisks.hpp"
 #include "ui_qt_settingsharddisks.h"
 

src/qt/qt_settingsinput.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Mouse/Joystick configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsinput.hpp"
 #include "ui_qt_settingsinput.h"
 
@@ -106,7 +122,7 @@ void SettingsInput::on_comboBoxJoystick_currentIndexChanged(int index) {
 
 void SettingsInput::on_pushButtonConfigureMouse_clicked() {
     int mouseId = ui->comboBoxMouse->currentData().toInt();
-    DeviceConfig::ConfigureDevice(mouse_get_device(mouseId));
+    DeviceConfig::ConfigureDevice(mouse_get_device(mouseId), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 static int get_axis(JoystickConfiguration& jc, int axis, int joystick_nr) {

src/qt/qt_settingsmachine.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Machine selection and configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsmachine.hpp"
 #include "ui_qt_settingsmachine.h"
 
@@ -266,5 +282,5 @@ void SettingsMachine::on_pushButtonConfigure_clicked() {
     // deviceconfig_inst_open
     int machineId = ui->comboBoxMachine->currentData().toInt();
     const auto* device = machine_getdevice(machineId);
-    DeviceConfig::ConfigureDevice(device);
+    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings*>(Settings::settings));
 }

src/qt/qt_settingsnetwork.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Network devices configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsnetwork.hpp"
 #include "ui_qt_settingsnetwork.h"
 
@@ -108,6 +124,6 @@ void SettingsNetwork::on_comboBoxAdapter_currentIndexChanged(int index) {
 }
 
 void SettingsNetwork::on_pushButtonConfigure_clicked() {
-    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxAdapter->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxAdapter->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 

src/qt/qt_settingsotherperipherals.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Other peripherals configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsotherperipherals.hpp"
 #include "ui_qt_settingsotherperipherals.h"
 
@@ -111,7 +127,7 @@ void SettingsOtherPeripherals::on_comboBoxRTC_currentIndexChanged(int index) {
 }
 
 void SettingsOtherPeripherals::on_pushButtonConfigureRTC_clicked() {
-    DeviceConfig::ConfigureDevice(isartc_get_device(ui->comboBoxRTC->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(isartc_get_device(ui->comboBoxRTC->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsOtherPeripherals::on_comboBoxCard1_currentIndexChanged(int index) {
@@ -122,7 +138,7 @@ void SettingsOtherPeripherals::on_comboBoxCard1_currentIndexChanged(int index) {
 }
 
 void SettingsOtherPeripherals::on_pushButtonConfigureCard1_clicked() {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard1->currentData().toInt()), 1);
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard1->currentData().toInt()), 1, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsOtherPeripherals::on_comboBoxCard2_currentIndexChanged(int index) {
@@ -133,7 +149,7 @@ void SettingsOtherPeripherals::on_comboBoxCard2_currentIndexChanged(int index) {
 }
 
 void SettingsOtherPeripherals::on_pushButtonConfigureCard2_clicked() {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard2->currentData().toInt()), 2);
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard2->currentData().toInt()), 2, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsOtherPeripherals::on_comboBoxCard3_currentIndexChanged(int index) {
@@ -144,7 +160,7 @@ void SettingsOtherPeripherals::on_comboBoxCard3_currentIndexChanged(int index) {
 }
 
 void SettingsOtherPeripherals::on_pushButtonConfigureCard3_clicked() {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard3->currentData().toInt()), 3);
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard3->currentData().toInt()), 3, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsOtherPeripherals::on_comboBoxCard4_currentIndexChanged(int index) {
@@ -155,5 +171,5 @@ void SettingsOtherPeripherals::on_comboBoxCard4_currentIndexChanged(int index) {
 }
 
 void SettingsOtherPeripherals::on_pushButtonConfigureCard4_clicked() {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard4->currentData().toInt()), 4);
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard4->currentData().toInt()), 4, qobject_cast<Settings*>(Settings::settings));
 }

src/qt/qt_settingsotherremovable.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Other removable devices configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *      Copyright 2021-2022 Cacodemon345
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsotherremovable.hpp"
 #include "ui_qt_settingsotherremovable.h"
 

src/qt/qt_settingsports.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Serial/Parallel ports configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *      Copyright 2022 Cacodemon345
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsports.hpp"
 #include "ui_qt_settingsports.h"
 
@@ -18,7 +36,7 @@ SettingsPorts::SettingsPorts(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    for (int i = 0; i < 3; i++) {
+    for (int i = 0; i < 4; i++) {
         auto* cbox = findChild<QComboBox*>(QString("comboBoxLpt%1").arg(i+1));
         auto* model = cbox->model();
         int c = 0;
@@ -79,3 +97,8 @@ void SettingsPorts::on_checkBoxParallel3_stateChanged(int state) {
     ui->comboBoxLpt3->setEnabled(state == Qt::Checked);
 }
 
+
+void SettingsPorts::on_checkBoxParallel4_stateChanged(int state) {
+    ui->comboBoxLpt4->setEnabled(state == Qt::Checked);
+}
+

src/qt/qt_settingsports.hpp

@@ -21,6 +21,8 @@ private slots:
     void on_checkBoxParallel2_stateChanged(int arg1);
     void on_checkBoxParallel1_stateChanged(int arg1);
 
+    void on_checkBoxParallel4_stateChanged(int arg1);
+
 private:
     Ui::SettingsPorts *ui;
 };

src/qt/qt_settingsports.ui

@@ -58,6 +58,16 @@
      <item row="2" column="1">
       <widget class="QComboBox" name="comboBoxLpt3"/>
      </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>LPT4 Device:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="comboBoxLpt4"/>
+     </item>
     </layout>
    </item>
    <item>
@@ -111,6 +121,13 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel4">
+       <property name="text">
+        <string>Parallel port 4</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

src/qt/qt_settingssound.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Sound/MIDI devices configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingssound.hpp"
 #include "ui_qt_settingssound.h"
 
@@ -161,7 +177,7 @@ void SettingsSound::on_comboBoxSoundCard_currentIndexChanged(int index) {
 
 
 void SettingsSound::on_pushButtonConfigureSoundCard_clicked() {
-    DeviceConfig::ConfigureDevice(sound_card_getdevice(ui->comboBoxSoundCard->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(sound_card_getdevice(ui->comboBoxSoundCard->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsSound::on_comboBoxMidiOut_currentIndexChanged(int index) {
@@ -174,7 +190,7 @@ void SettingsSound::on_comboBoxMidiOut_currentIndexChanged(int index) {
 }
 
 void SettingsSound::on_pushButtonConfigureMidiOut_clicked() {
-    DeviceConfig::ConfigureDevice(midi_device_getdevice(ui->comboBoxMidiOut->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(midi_device_getdevice(ui->comboBoxMidiOut->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsSound::on_comboBoxMidiIn_currentIndexChanged(int index) {
@@ -187,7 +203,7 @@ void SettingsSound::on_comboBoxMidiIn_currentIndexChanged(int index) {
 }
 
 void SettingsSound::on_pushButtonConfigureMidiIn_clicked() {
-    DeviceConfig::ConfigureDevice(midi_in_device_getdevice(ui->comboBoxMidiIn->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(midi_in_device_getdevice(ui->comboBoxMidiIn->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsSound::on_checkBoxMPU401_stateChanged(int state) {
@@ -208,20 +224,20 @@ void SettingsSound::on_checkBoxGUS_stateChanged(int state) {
 
 void SettingsSound::on_pushButtonConfigureMPU401_clicked() {
     if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0) {
-        DeviceConfig::ConfigureDevice(&mpu401_mca_device);
+        DeviceConfig::ConfigureDevice(&mpu401_mca_device, 0, qobject_cast<Settings*>(Settings::settings));
     } else {
-        DeviceConfig::ConfigureDevice(&mpu401_device);
+        DeviceConfig::ConfigureDevice(&mpu401_device, 0, qobject_cast<Settings*>(Settings::settings));
     }
 }
 
 void SettingsSound::on_pushButtonConfigureSSI2001_clicked() {
-    DeviceConfig::ConfigureDevice(&ssi2001_device);
+    DeviceConfig::ConfigureDevice(&ssi2001_device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsSound::on_pushButtonConfigureCMS_clicked() {
-    DeviceConfig::ConfigureDevice(&cms_device);
+    DeviceConfig::ConfigureDevice(&cms_device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsSound::on_pushButtonConfigureGUS_clicked() {
-    DeviceConfig::ConfigureDevice(&gus_device);
+    DeviceConfig::ConfigureDevice(&gus_device, 0, qobject_cast<Settings*>(Settings::settings));
 }

src/qt/qt_settingsstoragecontrollers.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Storage devices configuration UI module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ */
 #include "qt_settingsstoragecontrollers.hpp"
 #include "ui_qt_settingsstoragecontrollers.h"
 
@@ -172,19 +188,19 @@ void SettingsStorageControllers::on_checkBoxQuaternaryIDE_stateChanged(int arg1)
 }
 
 void SettingsStorageControllers::on_pushButtonHD_clicked() {
-    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonFD_clicked() {
-    DeviceConfig::ConfigureDevice(fdc_card_getdevice(ui->comboBoxFD->currentData().toInt()));
+    DeviceConfig::ConfigureDevice(fdc_card_getdevice(ui->comboBoxFD->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonTertiaryIDE_clicked() {
-    DeviceConfig::ConfigureDevice(&ide_ter_device);
+    DeviceConfig::ConfigureDevice(&ide_ter_device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonQuaternaryIDE_clicked() {
-    DeviceConfig::ConfigureDevice(&ide_qua_device);
+    DeviceConfig::ConfigureDevice(&ide_qua_device, 0, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_comboBoxSCSI1_currentIndexChanged(int index) {
@@ -217,17 +233,17 @@ void SettingsStorageControllers::on_comboBoxSCSI4_currentIndexChanged(int index)
 
 
 void SettingsStorageControllers::on_pushButtonSCSI1_clicked() {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI1->currentData().toInt()), 1);
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI1->currentData().toInt()), 1, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonSCSI2_clicked() {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI2->currentData().toInt()), 2);
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI2->currentData().toInt()), 2, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonSCSI3_clicked() {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI3->currentData().toInt()), 3);
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI3->currentData().toInt()), 3, qobject_cast<Settings*>(Settings::settings));
 }
 
 void SettingsStorageControllers::on_pushButtonSCSI4_clicked() {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI4->currentData().toInt()), 4);
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI4->currentData().toInt()), 4, qobject_cast<Settings*>(Settings::settings));
 }

src/qt/qt_softwarerenderer.cpp

@@ -1,3 +1,23 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Software renderer module.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ *      Copyright 2021-2022 Teemu Korhonen
+ */
 #include "qt_softwarerenderer.hpp"
 #include <QApplication>
 #include <QPainter>

src/qt/qt_soundgain.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Sound gain dialog UI module.
+ *
+ *
+ *
+ * Authors:	Cacodemon345
+ *
+ *		Copyright 2021-2022 Cacodemon345
+ */
 #include "qt_soundgain.hpp"
 #include "ui_qt_soundgain.h"
 

src/qt/qt_specifydimensions.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Specify dimensions UI module.
+ *
+ *
+ *
+ * Authors:	Cacodemon345
+ *
+ *		Copyright 2021-2022 Cacodemon345
+ */
 #include "qt_specifydimensions.h"
 #include "ui_qt_specifydimensions.h"
 

src/qt/qt_styleoverride.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Style override class.
+ *
+ *
+ *
+ * Authors:	Teemu Korhonen
+ *
+ *		Copyright 2022 Teemu Korhonen
+ */
 #include "qt_styleoverride.hpp"
 
 int StyleOverride::styleHint(
@@ -15,7 +31,14 @@ int StyleOverride::styleHint(
 
 void StyleOverride::polish(QWidget* widget)
 {
+    QProxyStyle::polish(widget);
     /* Disable title bar context help buttons globally as they are unused. */
-    if (widget->isWindow())
+    if (widget->isWindow()) {
+        if (widget->layout() && widget->minimumSize() == widget->maximumSize()) {
+            widget->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
+            widget->layout()->setSizeConstraint(QLayout::SetFixedSize);
+            widget->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+        }
         widget->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
-}
+    }
+}

src/qt/qt_styleoverride.hpp

@@ -3,6 +3,7 @@
 
 #include <QProxyStyle>
 #include <QWidget>
+#include <QLayout>
 
 class StyleOverride : public QProxyStyle
 {
@@ -16,4 +17,4 @@ public:
     void polish(QWidget* widget) override;
 };
 
-#endif
+#endif

src/qt/qt_ui.cpp

@@ -1,3 +1,21 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Common UI functions.
+ *
+ *
+ *
+ * Authors:	Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *
+ *		Copyright 2021 Joakim L. Gilje
+ *      Copyright 2021-2022 Cacodemon345
+ */
 #include <cstdint>
 
 #include <QDebug>
@@ -10,6 +28,8 @@
 
 MainWindow* main_window = nullptr;
 
+static QString sb_text, sb_buguitext, sb_mt32lcdtext;
+
 extern "C" {
 
 #include <86box/plat.h>
@@ -78,8 +98,24 @@ int	ui_msgbox(int flags, void *message) {
     return ui_msgbox_header(flags, nullptr, message);
 }
 
+void ui_sb_update_text() {
+    emit main_window->statusBarMessage( !sb_mt32lcdtext.isEmpty() ? sb_mt32lcdtext : sb_text.isEmpty() ? sb_buguitext : sb_text);
+}
+
+void ui_sb_mt32lcd(char* str)
+{
+    sb_mt32lcdtext = QString(str);
+    ui_sb_update_text();
+}
+
 void ui_sb_set_text_w(wchar_t *wstr) {
-    main_window->statusBar()->showMessage(QString::fromWCharArray(wstr));
+    sb_text = QString::fromWCharArray(wstr);
+    ui_sb_update_text();
+}
+
+void ui_sb_set_text(char *str) {
+    sb_text = str;
+    ui_sb_update_text();
 }
 
 void
@@ -93,11 +129,15 @@ ui_sb_update_panes() {
 }
 
 void ui_sb_bugui(char *str) {
-    main_window->statusBarMessage(str);
+    sb_buguitext = str;
+    ui_sb_update_text();;
 }
 
 void ui_sb_set_ready(int ready) {
-    qDebug() << Q_FUNC_INFO << ready;
+    if (ready == 0) {
+        ui_sb_bugui(nullptr);
+        ui_sb_set_text(nullptr);
+    }
 }
 
 void

src/qt/qt_util.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Utility functions.
+ *
+ *
+ *
+ * Authors:	Teemu Korhonen
+ *
+ *		Copyright 2022 Teemu Korhonen
+ */
 #include <QStringBuilder>
 #include <QStringList>
 #include "qt_util.hpp"
@@ -28,4 +44,4 @@ namespace util
         return " (" % temp.join(' ') % ")" % (!last ? ";;" : "");
     }
 
-}
+}

src/qt/wl_mouse.cpp

@@ -1,3 +1,19 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Wayland mouse input module.
+ *
+ *
+ *
+ * Authors:	Cacodemon345
+ *
+ *		Copyright 2021-2022 Cacodemon345
+ */
 #include "wl_mouse.hpp"
 #include <QGuiApplication>
 #include <wayland-client-core.h>
@@ -86,4 +102,4 @@ void wl_mouse_uncapture()
     zwp_relative_pointer_v1_destroy(rel_pointer);
     rel_pointer = nullptr;
     conf_pointer = nullptr;
-}
+}

src/sound/CMakeLists.txt

@@ -33,8 +33,17 @@ if(MUNT)
     target_compile_definitions(snd PRIVATE USE_MUNT)
     target_sources(snd PRIVATE midi_mt32.c)
 
-    add_subdirectory(munt)
-    target_link_libraries(86Box mt32emu)
+    option(MUNT_EXTERNAL "Link against the system-provided MUNT library" OFF)
+    mark_as_advanced(MUNT_EXTERNAL)
+
+    if(MUNT_EXTERNAL)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(MT32EMU REQUIRED IMPORTED_TARGET mt32emu)
+        target_link_libraries(86Box PkgConfig::MT32EMU)
+    else()
+        add_subdirectory(munt)
+        target_link_libraries(86Box mt32emu)
+    endif()
 endif()
 
 if(PAS16)

src/sound/midi_mt32.c

@@ -9,6 +9,7 @@
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/plat.h>
+#include <86box/ui.h>
 #include <86box/sound.h>
 #include <86box/midi.h>
 
@@ -18,7 +19,46 @@ extern void givealbuffer_midi(void *buf, uint32_t size);
 extern void al_set_midi(int freq, int buf_size);
 #endif
 
-static const mt32emu_report_handler_i_v0 handler_v0 = {
+static void display_mt32_message(void *instance_data, const char *message);
+
+static const mt32emu_report_handler_i_v0 handler_mt32_v0 = {
+        /** Returns the actual interface version ID */
+        NULL, //mt32emu_report_handler_version (*getVersionID)(mt32emu_report_handler_i i);
+
+        /** Callback for debug messages, in vprintf() format */
+        NULL, //void (*printDebug)(void *instance_data, const char *fmt, va_list list);
+        /** Callbacks for reporting errors */
+        NULL, //void (*onErrorControlROM)(void *instance_data);
+        NULL, //void (*onErrorPCMROM)(void *instance_data);
+        /** Callback for reporting about displaying a new custom message on LCD */
+        display_mt32_message, //void (*showLCDMessage)(void *instance_data, const char *message);
+        /** Callback for reporting actual processing of a MIDI message */
+        NULL, //void (*onMIDIMessagePlayed)(void *instance_data);
+        /**
+         * Callback for reporting an overflow of the input MIDI queue.
+         * Returns MT32EMU_BOOL_TRUE if a recovery action was taken
+         * and yet another attempt to enqueue the MIDI event is desired.
+         */
+        NULL, //mt32emu_boolean (*onMIDIQueueOverflow)(void *instance_data);
+        /**
+         * Callback invoked when a System Realtime MIDI message is detected in functions
+         * mt32emu_parse_stream and mt32emu_play_short_message and the likes.
+         */
+        NULL, //void (*onMIDISystemRealtime)(void *instance_data, mt32emu_bit8u system_realtime);
+        /** Callbacks for reporting system events */
+        NULL, //void (*onDeviceReset)(void *instance_data);
+        NULL, //void (*onDeviceReconfig)(void *instance_data);
+        /** Callbacks for reporting changes of reverb settings */
+        NULL, //void (*onNewReverbMode)(void *instance_data, mt32emu_bit8u mode);
+        NULL, //void (*onNewReverbTime)(void *instance_data, mt32emu_bit8u time);
+        NULL, //void (*onNewReverbLevel)(void *instance_data, mt32emu_bit8u level);
+        /** Callbacks for reporting various information */
+        NULL, //void (*onPolyStateChanged)(void *instance_data, mt32emu_bit8u part_num);
+        NULL, //void (*onProgramChanged)(void *instance_data, mt32emu_bit8u part_num, const char *sound_group_name, const char *patch_name);
+};
+
+/** Alternate report handler for Roland CM-32L */
+static const mt32emu_report_handler_i_v0 handler_cm32l_v0 = {
         /** Returns the actual interface version ID */
         NULL, //mt32emu_report_handler_version (*getVersionID)(mt32emu_report_handler_i i);
 
@@ -54,7 +94,8 @@ static const mt32emu_report_handler_i_v0 handler_v0 = {
         NULL, //void (*onProgramChanged)(void *instance_data, mt32emu_bit8u part_num, const char *sound_group_name, const char *patch_name);
 };
 
-static const mt32emu_report_handler_i handler = { &handler_v0 };
+static const mt32emu_report_handler_i handler_mt32 = { &handler_mt32_v0 };
+static const mt32emu_report_handler_i handler_cm32l = { &handler_cm32l_v0 };
 
 static mt32emu_context context = NULL;
 static int roms_present[2] = {-1, -1};
@@ -96,6 +137,20 @@ static float* buffer = NULL;
 static int16_t* buffer_int16 = NULL;
 static int midi_pos = 0;
 
+static void display_mt32_message(void *instance_data, const char *message)
+{
+    int sz = 0;
+    char* ui_msg = NULL;
+
+    sz = snprintf(NULL, 0, "MT-32: %s", message);
+    ui_msg = calloc(sz + 1, 1);
+    if (ui_msg)
+    {
+        snprintf(ui_msg, sz, "MT-32: %s", message);
+        ui_sb_mt32lcd(ui_msg);
+    }
+}
+
 void mt32_stream(float* stream, int len)
 {
         if (context) mt32emu_render_float(context, stream, len);
@@ -176,7 +231,7 @@ void* mt32emu_init(char *control_rom, char *pcm_rom)
 	midi_device_t* dev;
         char fn[512];
 
-        context = mt32emu_create_context(handler, NULL);
+        context = mt32emu_create_context(strstr(control_rom, "CM32L_CONTROL.ROM") ? handler_cm32l : handler_mt32, NULL);
 
         if (!rom_getfile(control_rom, fn, 512)) return 0;
         if (!mt32_check("mt32emu_add_rom_file", mt32emu_add_rom_file(context, fn), MT32EMU_RC_ADDED_CONTROL_ROM)) return 0;

src/unix/unix.c

@@ -1267,3 +1267,9 @@ void endblit()
 {
     SDL_UnlockMutex(blitmtx);
 }
+
+/* API */
+void
+ui_sb_mt32lcd(char* str)
+{
+}

src/video/vid_ati_mach64.c

@@ -385,7 +385,7 @@ void mach64_out(uint16_t addr, uint8_t val, void *p)
                 case 0x1cf:
                 mach64->regs[mach64->index & 0x3f] = val;
                 if ((mach64->index & 0x3f) == 0x36)
-                        mach64_recalctimings(svga);
+                        svga_recalctimings(svga);
                 break;
                 
                 case 0x3C6: case 0x3C7: case 0x3C8: case 0x3C9:
@@ -3393,8 +3393,10 @@ static void *mach64gx_init(const device_t *info)
         mach64->config_stat0 = (5 << 9) | (3 << 3); /*ATI-68860, 256Kx16 DRAM*/
         if (info->flags & DEVICE_PCI)
                 mach64->config_stat0 |= 0; /*PCI, 256Kx16 DRAM*/
-        else if ((info->flags & DEVICE_VLB) || (info->flags & DEVICE_ISA))
+        else if (info->flags & DEVICE_VLB)
                 mach64->config_stat0 |= 1; /*VLB, 256Kx16 DRAM*/
+		else if (info->flags & DEVICE_ISA)
+				mach64->config_stat0 |= 7; /*ISA 16-bit, 256k16 DRAM*/
 
         ati_eeprom_load(&mach64->eeprom, "mach64.nvr", 1);
 

src/win/86Box.rc

@@ -37,33 +37,6 @@
 
 MainAccel ACCELERATORS MOVEABLE PURE 
 BEGIN
-#ifdef ENABLE_VRAM_DUMP
-    VK_F1,   IDM_DUMP_VRAM,          CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_SERIAL_LOG
-    VK_F3,   IDM_LOG_SERIAL,         CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_BUSLOGIC_LOG
-    VK_F4,   IDM_LOG_BUSLOGIC,       CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_CDROM_LOG
-    VK_F5,   IDM_LOG_CDROM,          CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_D86F_LOG
-    VK_F6,   IDM_LOG_D86F,           CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_FDC_LOG
-    VK_F7,   IDM_LOG_FDC,            CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_IDE_LOG
-    VK_F8,   IDM_LOG_IDE,            CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_NIC_LOG
-    VK_F9,   IDM_LOG_NIC,            CONTROL, VIRTKEY
-#endif
-#ifdef ENABLE_LOG_BREAKPOINT
-    VK_F10,  IDM_LOG_BREAKPOINT,     CONTROL, VIRTKEY
-#endif
 #ifdef MTR_ENABLED
     "T",     IDM_ACTION_TRACE,       CONTROL, VIRTKEY
 #endif

src/win/CMakeLists.txt

@@ -54,4 +54,4 @@ else()
 endif()
 
 target_link_libraries(86Box advapi32 comctl32 comdlg32 gdi32 shell32 iphlpapi
-    dxguid imm32 hid setupapi uxtheme version winmm psapi)
+    dxguid imm32 hid setupapi uxtheme version winmm psapi ws2_32)

src/win/Makefile.mingw

@@ -316,10 +316,6 @@ ifeq ($(RELEASE), y)
 OPTS		+= -DRELEASE_BUILD
 RFLAGS		+= -DRELEASE_BUILD
 endif
-ifeq ($(VRAMDUMP), y)
-OPTS		+= -DENABLE_VRAM_DUMP
-RFLAGS		+= -DENABLE_VRAM_DUMP
-endif
 
 
 # Optional modules.

src/win/languages/cs-CZ.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "Zastavit trace\tCtrl+T",			IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Záznamy"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Povolit záznamy BusLogic\tCtrl+F4",		IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Povolit záznamy CD-ROM\tCtrl+F5",		IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Povolit záznamy diskety (86F)\tCtrl+F6",	IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Povolit záznamy disketového řadiče\tCtrl+F7",	IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Povolit záznamy IDE\tCtrl+F8",		IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Povolit záznamy sériového portu\tCtrl+F3",	IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Povolit záznamy sítě\tCtrl+F9",		IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "Zaznamenat do &logu zarážku\tCtrl+F10",	IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Zaznamenat obsah &video RAM\tCtrl+F1",	IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "Ná&pověda"
     BEGIN
         MENUITEM "&Dokumentace",				IDM_DOCS

src/win/languages/de-DE.rc

@@ -32,7 +32,7 @@ BEGIN
     POPUP "&Ansicht"
     BEGIN
         MENUITEM "&Statusleiste ausblenden",		IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar",		IDM_VID_HIDE_TOOLBAR
+        MENUITEM "&Werkzeugleiste ausblenden",		IDM_VID_HIDE_TOOLBAR
         MENUITEM SEPARATOR
         MENUITEM "&Größenverstellbares Fenster",          IDM_VID_RESIZE
         MENUITEM "&Größe && Position merken",  IDM_VID_REMEMBER
@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "Tracing beenden\tStrg+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Logging"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "BusLogic-Logs aktivieren\tStrg+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "CD-ROM-Logs aktivieren\tStrg+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Disketten (86F)-Logs aktivieren\tStrg+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Diskettencontroller-Logs aktivieren\tStrg+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "IDE-Logs aktivieren\tStrg+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Seriell-Port-Logs aktivieren\tStrg+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Netzwerk-Logs aktivieren\tStrg+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Breakpoint für die Log-Datei\tStrg+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "&Video-RAM dumpen\tStrg+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Hilfe"
     BEGIN
         MENUITEM "&Dokumentation...",           IDM_DOCS
@@ -292,10 +255,10 @@ END
 #define STR_LOCK_TO_SIZE	"Feste Größe"
 
 #define STR_MACHINE_TYPE	"Systemtyp:"
-#define STR_MACHINE		"Maschine:"
+#define STR_MACHINE		"System:"
 #define STR_CONFIGURE		"Einstellen"
 #define STR_CPU_TYPE		"CPU-Typ:"
-#define STR_CPU_SPEED		"Geschwindigkeit:"
+#define STR_CPU_SPEED		"Takt:"
 #define STR_FPU			"FPU-Einheit:"
 #define STR_WAIT_STATES		"Wartezustände:"
 #define STR_MB			"MB"
@@ -487,7 +450,7 @@ BEGIN
     IDS_2119	"Beenden"
     IDS_2120	"Keine ROMs gefunden"
     IDS_2121	"Möchten Sie die Einstellungen speichern?"
-    IDS_2122	"Dies wird zu einem Hard-Reset der emulierten Maschine führen."
+    IDS_2122	"Dies wird zu einem Hard-Reset des emulierten Systems führen."
     IDS_2123	"Speichern"
     IDS_2124	"Über 86Box"
     IDS_2125	"86Box Version " EMU_VERSION
@@ -540,13 +503,13 @@ BEGIN
     IDS_2151	"Cartridgeimages (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Alle Dateien (*.*)\0*.*\0"
     IDS_2152	"Fehler bei der Rendererinitialisierung"
     IDS_2153	"Der OpenGL (3.0-Kern)-Renderer konnte nicht initialisiert werden. Bitte benutzen Sie einen anderen Renderer."
-    IDS_2154	"Resume execution"
-    IDS_2155	"Pause execution"
-    IDS_2156	"Press Ctrl+Alt+Del"
-    IDS_2157	"Press Ctrl+Alt+Esc"
-    IDS_2158	"Hard reset"
-    IDS_2159	"ACPI shutdown"
-    IDS_2160	"Settings"
+    IDS_2154	"Fortsetzen"
+    IDS_2155	"Pausieren"
+    IDS_2156	"Strg+Alt+Entf drücken"
+    IDS_2157	"Strg+Alt+Esc drücken"
+    IDS_2158	"Hard-Reset"
+    IDS_2159	"ACPI-basiertes Herunterfahren"
+    IDS_2160	"Optionen"
 END
 
 STRINGTABLE DISCARDABLE 

src/win/languages/dialogs.rc

@@ -193,13 +193,13 @@ BEGIN
     LTEXT           STR_CPU_TYPE, IDT_CPU_TYPE,
                     CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_CPU_TYPE,
-                    CFG_COMBO_BOX_LEFT, 45, 115, CFG_COMBO_HEIGHT,
+                    CFG_COMBO_BOX_LEFT, 45, 110, CFG_COMBO_HEIGHT,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CPU_SPEED, IDT_CPU_SPEED,
-                    225, 47, 24, CFG_PANE_LTEXT_HEIGHT
+                    216, 47, 34, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_CPU_SPEED,
-                    255, 45, 106, CFG_COMBO_HEIGHT,
+                    252, 45, 109, CFG_COMBO_HEIGHT,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_FPU,IDT_FPU,
@@ -286,16 +286,16 @@ BEGIN
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     PUSHBUTTON      STR_JOY1, IDC_JOY1,
-                    CFG_HMARGIN, 44, 80, CFG_BTN_HEIGHT
+                    CFG_HMARGIN, 44, 84, CFG_BTN_HEIGHT
 
     PUSHBUTTON      STR_JOY2, IDC_JOY2,
-                    99, 44, 80, CFG_BTN_HEIGHT
+                    96, 44, 84, CFG_BTN_HEIGHT
 
     PUSHBUTTON      STR_JOY3, IDC_JOY3,
-                    195, 44, 80, CFG_BTN_HEIGHT
+                    187, 44, 84, CFG_BTN_HEIGHT
 
     PUSHBUTTON      STR_JOY4, IDC_JOY4,
-                    290, 44, 80, CFG_BTN_HEIGHT
+                    277, 44, 84, CFG_BTN_HEIGHT
 END
 
 DLG_CFG_SOUND DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
@@ -453,19 +453,19 @@ BEGIN
 
     CONTROL         STR_PARALLEL1, IDC_CHECK_PARALLEL1,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    147, 83, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
+                    167, 83, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
 
     CONTROL         STR_PARALLEL2, IDC_CHECK_PARALLEL2,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    147, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
+                    167, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
 
     CONTROL         STR_PARALLEL3, IDC_CHECK_PARALLEL3,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    147, 121, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
+                    167, 121, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
 
     CONTROL         STR_PARALLEL4, IDC_CHECK_PARALLEL4,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    147, 140, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
+                    167, 140, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
 END
 
 DLG_CFG_STORAGE DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
@@ -550,35 +550,38 @@ BEGIN
                     "SysListView32",
                     LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
                     WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 182
-
-    PUSHBUTTON      STR_NEW, IDC_BUTTON_HDD_ADD_NEW,
-                    80, 206, 62, CFG_BTN_HEIGHT
-    PUSHBUTTON      STR_EXISTING, IDC_BUTTON_HDD_ADD,
-                    153, 206, 62, CFG_BTN_HEIGHT
-    PUSHBUTTON      STR_REMOVE, IDC_BUTTON_HDD_REMOVE,
-                    222, 206, 62, CFG_BTN_HEIGHT
+                    CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 162
 
     LTEXT           STR_BUS,IDT_BUS,
-                    CFG_HMARGIN, 119, 24, CFG_PANE_LTEXT_HEIGHT
+                    CFG_HMARGIN, 188, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_HD_BUS,
-                    33, 117, 90, 12,CBS_DROPDOWNLIST | 
+                    33, 186, 130, 12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CHANNEL, IDT_CHANNEL,
-                    131, 119, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 188, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_HD_CHANNEL,
-                    170, 117, 90, 12,
+                    221, 186, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO_HD_CHANNEL_IDE,
-                    170, 117, 90, 12,
+                    221, 186, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_ID, IDT_ID,
-                    131, 119, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 188, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_HD_ID,
-                    170, 117, 90, 12,
+                    221, 186, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    PUSHBUTTON      STR_NEW, IDC_BUTTON_HDD_ADD_NEW,
+                    CFG_HMARGIN, 207, 112, CFG_BTN_HEIGHT
+
+    PUSHBUTTON      STR_EXISTING, IDC_BUTTON_HDD_ADD,
+                    128, 207, 112, CFG_BTN_HEIGHT
+
+    PUSHBUTTON      STR_REMOVE, IDC_BUTTON_HDD_REMOVE,
+                    249, 207, 112, CFG_BTN_HEIGHT
+
 END
 
 DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE  0, 0, 219, 151
@@ -680,16 +683,16 @@ BEGIN
     LTEXT           STR_TYPE, IDT_FDD_TYPE,
                     CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_FD_TYPE,
-                    33, 85, 90, 12,
+                    33, 85, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     CONTROL         STR_TURBO, IDC_CHECKTURBO,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    131, 86, 64, CFG_CHECKBOX_HEIGHT
+                    186, 86, 84, CFG_CHECKBOX_HEIGHT
 
     CONTROL         STR_CHECKBPB, IDC_CHECKBPB,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    196, 86, 64, CFG_CHECKBOX_HEIGHT
+                    272, 86, 84, CFG_CHECKBOX_HEIGHT
 
     LTEXT           STR_CDROM_DRIVES, IDT_CD_DRIVES,
                     CFG_HMARGIN, 107, 258, CFG_PANE_LTEXT_HEIGHT
@@ -702,25 +705,25 @@ BEGIN
     LTEXT           STR_BUS, IDT_CD_BUS,
                     CFG_HMARGIN, 187, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_CD_BUS,
-                    33, 185, 90, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_CD_ID,
-                    131, 187, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_ID,
-                    170, 185, 90, 12,
+                    33, 185, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CHANNEL, IDT_CD_CHANNEL,
-                    131, 187, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 187, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_CD_CHANNEL_IDE,
-                    170, 185, 90, 12,
+                    221, 185, 140, 12,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT           STR_ID, IDT_CD_ID,
+                    181, 187, 38, CFG_PANE_LTEXT_HEIGHT
+    COMBOBOX        IDC_COMBO_CD_ID,
+                    221, 185, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CD_SPEED, IDT_CD_SPEED,
                     CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_CD_SPEED,
-                    33, 205, 90, 12,
+                    33, 205, 328, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -740,25 +743,25 @@ BEGIN
     LTEXT           STR_BUS, IDT_MO_BUS,
                     CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_MO_BUS,
-                    33, 85, 90, 12,
+                    33, 85, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_ID, IDT_MO_ID,
-                    131, 87, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 87, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_MO_ID,
-                    170, 85, 90, 12,
+                    221, 85, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CHANNEL, IDT_MO_CHANNEL,
-                    131, 87, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 87, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_MO_CHANNEL_IDE,
-                    170, 85, 90, 12,
+                    221, 85, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_TYPE, IDT_MO_TYPE,
                     CFG_HMARGIN, 107, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_MO_TYPE,
-                    33, 105, 120, 12,
+                    33, 105, 328, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_ZIP_DRIVES, IDT_ZIP_DRIVES,
@@ -772,24 +775,24 @@ BEGIN
     LTEXT           STR_BUS, IDT_ZIP_BUS,
                     CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_ZIP_BUS,
-                    33, 205, 90, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_ZIP_ID,
-                    131, 207, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ZIP_ID,
-                    170, 205, 90, 12,
+                    33, 205, 140, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     LTEXT           STR_CHANNEL, IDT_ZIP_CHANNEL,
-                    131, 207, 38, CFG_PANE_LTEXT_HEIGHT
+                    181, 207, 38, CFG_PANE_LTEXT_HEIGHT
     COMBOBOX        IDC_COMBO_ZIP_CHANNEL_IDE,
-                    170, 205, 90, 12,
+                    221, 205, 105, 12,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT           STR_ID, IDT_ZIP_ID,
+                    181, 207, 38, CFG_PANE_LTEXT_HEIGHT
+    COMBOBOX        IDC_COMBO_ZIP_ID,
+                    221, 205, 105, 12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     CONTROL         STR_250, IDC_CHECK250,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    268, 205, 44, CFG_CHECKBOX_HEIGHT
+                    329, 206, 44, CFG_CHECKBOX_HEIGHT
 END
 
 DLG_CFG_PERIPHERALS DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT

src/win/languages/en-GB.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "End trace\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Logging"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Help"
     BEGIN
         MENUITEM "&Documentation...",           IDM_DOCS

src/win/languages/en-US.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "End trace\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Logging"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Help"
     BEGIN
         MENUITEM "&Documentation...",           IDM_DOCS

src/win/languages/es-ES.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "Terminar traza\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Trazas"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Habilitar trazas de BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Habilitar trazas de CD-ROM\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Habilitar trazas de disquete (86F)\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Habilitar trazas de controladora de disquete\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Habilitar trazas de IDE\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Habilitar trazas de Puerto Serie\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Habilitar trazas de Red\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Punto de ruptura de traza\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Volcar RAM de &video\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Ayuda"
     BEGIN
         MENUITEM "&Documentación...",           IDM_DOCS

src/win/languages/fi-FI.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "Lopeta jäljitys\tCtrl+T",                             IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Lokitus"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "BusLogic-lokitus päällä\tCtrl+F4",                    IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "CD-ROM-lokitus päällä\tCtrl+F5",                      IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Levykelokitus (86F) päällä\tCtrl+F6",                 IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Levykekontrollerin lokitus päällä\tCtrl+F7",          IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "IDE-lokitus päällä\tCtrl+F8",                         IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Sarjaporttilokitus päällä\tCtrl+F3",                  IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Verkkolokitus päällä\tCtrl+F9",                       IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-    MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Kirjaa keskeytyskohdat\tCtrl+F10",                   IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Tallenna &videomuistin vedos\tCtrl+F1",               IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Ohje"
     BEGIN
         MENUITEM "&Dokumentaatio...",                                   IDM_DOCS

src/win/languages/fr-FR.rc

@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "Finir traces\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Journalisation"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Activer journaux de BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Activer journaux du CD-ROM\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Activer journaux des disquettes (86F)s\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Activer journaux du contrôleur de disquettes\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Activer journaux de IDE\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Activer journaux de port série\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Activer journaux du réseau\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Point d'arrêt du journal\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "Vidage de la mémoire &vidéo\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Aide"
     BEGIN
         MENUITEM "&Documentation...",           IDM_DOCS

src/win/languages/hr-HR.rc

@@ -32,7 +32,7 @@ BEGIN
     POPUP "&Pogled"
     BEGIN
         MENUITEM "&Sakrij statusni redak",		IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar",		IDM_VID_HIDE_TOOLBAR
+        MENUITEM "&Sakrij alatni redak",		IDM_VID_HIDE_TOOLBAR
         MENUITEM SEPARATOR
         MENUITEM "&Prozor s promjenjivim veličinama",          IDM_VID_RESIZE
         MENUITEM "&Zapamtite veličinu i položaj",  IDM_VID_REMEMBER
@@ -112,43 +112,6 @@ BEGIN
         MENUITEM "&Svrši praćenje\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Logging"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "Omogući bilježenje za BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "Omogući bilježenje za CD-ROM\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Omogući bilježenje za diskete (86F)\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Omogući bilježenje za disketni krmilnik\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "Omogući bilježenje za IDE\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Omogući bilježenje za serijska vrata\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Omogući bilježenje za omrežje\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "&Zabilježi prekidnu točku\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "&Ispiši memoriju zaslona\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Pomoć"
     BEGIN
         MENUITEM "&Dokumentacija...",           IDM_DOCS
@@ -540,13 +503,13 @@ BEGIN
     IDS_2151	"Slike kasete (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Sve datoteke (*.*)\0*.*\0"
     IDS_2152	"Nije moguće inicijalizirati renderer"
     IDS_2153	"Nije moguće inicijalizirati OpenGL (3.0 jezgra) renderer. Molimte koristite drugi renderer."
-    IDS_2154	"Resume execution"
-    IDS_2155	"Pause execution"
-    IDS_2156	"Press Ctrl+Alt+Del"
-    IDS_2157	"Press Ctrl+Alt+Esc"
-    IDS_2158	"Hard reset"
-    IDS_2159	"ACPI shutdown"
-    IDS_2160	"Settings"
+    IDS_2154	"Nastavi"
+    IDS_2155	"Pauziraj"
+    IDS_2156	"Stisni Ctrl+Alt+Del"
+    IDS_2157	"Stisni Ctrl+Alt+Esc"
+    IDS_2158	"Ponovno pokretanje"
+    IDS_2159	"ACPI bazirano gašenje"
+    IDS_2160	"Postavke"
 END
 
 STRINGTABLE DISCARDABLE 

src/win/languages/hu-HU.rc

@@ -117,43 +117,6 @@ BEGIN
         MENUITEM "Nyomkövetés befejezése\tCtrl+T",           IDM_ACTION_END_TRACE
 #endif
     END
-#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
-    POPUP "&Naplózás"
-    BEGIN
-# ifdef ENABLE_BUSLOGIC_LOG
-        MENUITEM "BusLogic naplók engedélyezése\tCtrl+F4", IDM_LOG_BUSLOGIC
-# endif
-# ifdef ENABLE_CDROM_LOG
-        MENUITEM "CD-ROM naplók engedélyezése\tCtrl+F5", IDM_LOG_CDROM
-# endif
-# ifdef ENABLE_D86F_LOG
-        MENUITEM "Hajlékonylemez (86F) naplók engedélyezése\tCtrl+F6", IDM_LOG_D86F
-# endif
-# ifdef ENABLE_FDC_LOG
-        MENUITEM "Hajlékonylemez-vezérlő naplók engedélyezése\tCtrl+F7", IDM_LOG_FDC
-# endif
-# ifdef ENABLE_IDE_LOG
-        MENUITEM "IDE naplók engedélyezése\tCtrl+F8", IDM_LOG_IDE
-# endif
-# ifdef ENABLE_SERIAL_LOG
-        MENUITEM "Soros port naplók engedélyezése\tCtrl+F3", IDM_LOG_SERIAL
-# endif
-# ifdef ENABLE_NIC_LOG
-        MENUITEM "Hálózati naplók engedélyezése\tCtrl+F9", IDM_LOG_NIC
-# endif
-# ifdef ENABLE_LOG_COMMANDS
-#  ifdef ENABLE_LOG_TOGGLES
-	MENUITEM SEPARATOR
-#  endif
-#  ifdef ENABLE_LOG_BREAKPOINT
-        MENUITEM "Töréspontok &naplózása\tCtrl+F10", IDM_LOG_BREAKPOINT
-#  endif
-#  ifdef ENABLE_VRAM_DUMP
-        MENUITEM "&Videómemória lementése\tCtrl+F1", IDM_DUMP_VRAM
-#  endif
-# endif
-    END
-#endif
     POPUP "&Súgó"
     BEGIN
         MENUITEM "&Dokumentáció...",           IDM_DOCS