From 94ce0f9613750ed99df92aec97107f0709e5fc38 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 12:16:07 +0600 Subject: [PATCH 01/16] Final round of bugfixes --- src/qt/qt_mainwindow.cpp | 8 ++++++++ src/qt/qt_settingsfloppycdrom.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 881053cdc..4383ede9a 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -88,7 +88,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-read.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); diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp index 0f4ede800..ad6bbfbbf 100644 --- a/src/qt/qt_settingsfloppycdrom.cpp +++ b/src/qt/qt_settingsfloppycdrom.cpp @@ -173,8 +173,8 @@ void SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex ¤t) { 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) { From eec8945fa3aee3437190f1d63914fbcb47831ee7 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 12:30:25 +0600 Subject: [PATCH 02/16] Implement bus tracking for hard disk creation dialog --- src/qt/qt_harddiskdialog.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp index 2ed784a42..15032f9ff 100644 --- a/src/qt/qt_harddiskdialog.cpp +++ b/src/qt/qt_harddiskdialog.cpp @@ -22,6 +22,7 @@ extern "C" { #include #include "qt_harddrive_common.hpp" +#include "qt_settings_bus_tracking.hpp" #include "qt_models_common.hpp" #include "qt_util.hpp" @@ -609,6 +610,7 @@ bool HarddiskDialog::checkAndAdjustCylinders() { void HarddiskDialog::on_comboBoxBus_currentIndexChanged(int index) { + int chanIdx = 0; if (index < 0) { return; } @@ -665,6 +667,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) { From 88789ec95d08e3c0a7c94c366356c50009e02cd6 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 12:30:56 +0600 Subject: [PATCH 03/16] Fix about dialog having wrong icon --- src/qt/qt_mainwindow.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 4383ede9a..51fed3a57 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1415,7 +1415,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-read.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(); } From ad00770410dd854475dbafe6d4ecd0af45d2fbe1 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 12:51:57 +0600 Subject: [PATCH 04/16] Fix mistyped name for alpha build icon --- src/qt/qt_mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 51fed3a57..2e7a212e1 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -91,7 +91,7 @@ MainWindow::MainWindow(QWidget *parent) : #ifdef RELEASE_BUILD this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico")); #elif defined ALPHA_BUILD - this->setWindowIcon(QIcon(":/settings/win/icons/86Box-read.ico")) + this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico")) #elif defined BETA_BUILD this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico")); #else @@ -1418,7 +1418,7 @@ void MainWindow::on_actionAbout_86Box_triggered() #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-read.ico").pixmap(32, 32)) + 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 From a637f61d4f9f60f609625965ba5501d126017851 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 15:00:02 +0600 Subject: [PATCH 05/16] Add missing copyright notices --- src/qt/evdev_mouse.cpp | 16 ++++++++++++++++ src/qt/qt.c | 14 ++++++++++++++ src/qt/qt_deviceconfig.cpp | 18 ++++++++++++++++++ src/qt/qt_filefield.cpp | 18 ++++++++++++++++++ src/qt/qt_harddiskdialog.cpp | 18 ++++++++++++++++++ src/qt/qt_harddrive_common.cpp | 16 ++++++++++++++++ src/qt/qt_hardwarerenderer.cpp | 22 +++++++++++++++++++++- src/qt/qt_joystickconfiguration.cpp | 16 ++++++++++++++++ src/qt/qt_machinestatus.cpp | 18 ++++++++++++++++++ src/qt/qt_main.cpp | 19 +++++++++++++++++++ src/qt/qt_mainwindow.cpp | 20 ++++++++++++++++++++ src/qt/qt_mediamenu.cpp | 20 ++++++++++++++++++++ src/qt/qt_models_common.cpp | 16 ++++++++++++++++ src/qt/qt_newfloppydialog.cpp | 20 ++++++++++++++++++++ src/qt/qt_platform.cpp | 19 +++++++++++++++++++ src/qt/qt_progsettings.cpp | 16 ++++++++++++++++ src/qt/qt_renderercommon.cpp | 17 +++++++++++++++++ src/qt/qt_rendererstack.cpp | 20 ++++++++++++++++++++ src/qt/qt_settings.cpp | 18 ++++++++++++++++++ src/qt/qt_settings_bus_tracking.cpp | 18 ++++++++++++++++++ src/qt/qt_settingsdisplay.cpp | 16 ++++++++++++++++ src/qt/qt_settingsfloppycdrom.cpp | 16 ++++++++++++++++ src/qt/qt_settingsharddisks.cpp | 16 ++++++++++++++++ src/qt/qt_settingsinput.cpp | 16 ++++++++++++++++ src/qt/qt_settingsmachine.cpp | 16 ++++++++++++++++ src/qt/qt_settingsnetwork.cpp | 16 ++++++++++++++++ src/qt/qt_settingsotherperipherals.cpp | 16 ++++++++++++++++ src/qt/qt_settingsotherremovable.cpp | 16 ++++++++++++++++ src/qt/qt_settingsports.cpp | 16 ++++++++++++++++ src/qt/qt_settingssound.cpp | 16 ++++++++++++++++ src/qt/qt_settingsstoragecontrollers.cpp | 16 ++++++++++++++++ src/qt/qt_softwarerenderer.cpp | 20 ++++++++++++++++++++ src/qt/qt_soundgain.cpp | 16 ++++++++++++++++ src/qt/qt_specifydimensions.cpp | 16 ++++++++++++++++ src/qt/qt_styleoverride.cpp | 18 +++++++++++++++++- src/qt/qt_ui.cpp | 18 ++++++++++++++++++ src/qt/qt_util.cpp | 18 +++++++++++++++++- src/qt/wl_mouse.cpp | 18 +++++++++++++++++- 38 files changed, 655 insertions(+), 4 deletions(-) diff --git a/src/qt/evdev_mouse.cpp b/src/qt/evdev_mouse.cpp index cb4cd4ffe..c04c8c8d6 100644 --- a/src/qt/evdev_mouse.cpp +++ b/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 #include diff --git a/src/qt/qt.c b/src/qt/qt.c index 507645c84..259f79c88 100644 --- a/src/qt/qt.c +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ /* * C functionality for Qt platform, where the C equivalent is not easily * implemented in Qt diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index 32e202e76..c51a8a49e 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.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. + * + * Device configuration UI code. + * + * + * + * Authors: Joakim L. Gilje + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2022 Cacodemon345 + */ #include "qt_deviceconfig.hpp" #include "ui_qt_deviceconfig.h" diff --git a/src/qt/qt_filefield.cpp b/src/qt/qt_filefield.cpp index 770a244e0..75523c20e 100644 --- a/src/qt/qt_filefield.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2022 Cacodemon345 + */ #include "qt_filefield.hpp" #include "ui_qt_filefield.h" diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp index 15032f9ff..3e933ddab 100644 --- a/src/qt/qt_harddiskdialog.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2022 Cacodemon345 + */ #include "qt_harddiskdialog.hpp" #include "ui_qt_harddiskdialog.h" diff --git a/src/qt/qt_harddrive_common.cpp b/src/qt/qt_harddrive_common.cpp index fbc60f627..fa08f7f2c 100644 --- a/src/qt/qt_harddrive_common.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_harddrive_common.hpp" #include diff --git a/src/qt/qt_hardwarerenderer.cpp b/src/qt/qt_hardwarerenderer.cpp index ca0e60efb..b322cbaf2 100644 --- a/src/qt/qt_hardwarerenderer.cpp +++ b/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 + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + * Copyright 2021-2022 Teemu Korhonen + */ #include "qt_hardwarerenderer.hpp" #include #include @@ -199,4 +219,4 @@ std::vector> HardwareRenderer::getBuffer buffers.push_back(std::make_tuple(imagebufs[1].get(), &buf_usage[1])); return buffers; -} \ No newline at end of file +} diff --git a/src/qt/qt_joystickconfiguration.cpp b/src/qt/qt_joystickconfiguration.cpp index 83b2f50be..594a1ef17 100644 --- a/src/qt/qt_joystickconfiguration.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_joystickconfiguration.hpp" #include "ui_qt_joystickconfiguration.h" diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp index b844ade83..47274994a 100644 --- a/src/qt/qt_machinestatus.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + */ #include "qt_machinestatus.hpp" extern "C" { diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index a6a999fa1..b95d1e9e9 100644 --- a/src/qt/qt_main.cpp +++ b/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 + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + * Copyright 2021-2022 Teemu Korhonen + */ #include #include #include diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 51fed3a57..564ef3506 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.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. + * + * Main window module. + * + * + * + * Authors: Joakim L. Gilje + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + * Copyright 2021-2022 Teemu Korhonen + */ #include "qt_mainwindow.hpp" #include "ui_qt_mainwindow.h" diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp index 2aabe04a8..8ffccffdd 100644 --- a/src/qt/qt_mediamenu.cpp +++ b/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 + * 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" diff --git a/src/qt/qt_models_common.cpp b/src/qt/qt_models_common.cpp index 892048605..eaa14bc0d 100644 --- a/src/qt/qt_models_common.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_models_common.hpp" #include diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp index 9450dfe1c..1a9d1364a 100644 --- a/src/qt/qt_newfloppydialog.cpp +++ b/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 + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2022 Cacodemon345 + * Copyright 2022 Teemu Korhonen + */ #include "qt_newfloppydialog.hpp" #include "ui_qt_newfloppydialog.h" diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index b13e2a877..97ef5d649 100644 --- a/src/qt/qt_platform.cpp +++ b/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. + * + * Main entry point module + * + * + * Authors: Joakim L. Gilje + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + * Copyright 2021-2022 Teemu Korhonen + */ #include #include diff --git a/src/qt/qt_progsettings.cpp b/src/qt/qt_progsettings.cpp index f7fbd2ea6..c51070132 100644 --- a/src/qt/qt_progsettings.cpp +++ b/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 #include "qt_progsettings.hpp" diff --git a/src/qt/qt_renderercommon.cpp b/src/qt/qt_renderercommon.cpp index 10cd72d8c..0974c1f78 100644 --- a/src/qt/qt_renderercommon.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ + #include "qt_renderercommon.hpp" #include "qt_mainwindow.hpp" diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index b07ed34f7..eff53d441 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/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 + * 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" diff --git a/src/qt/qt_settings.cpp b/src/qt/qt_settings.cpp index b7678bb8e..c8312013a 100644 --- a/src/qt/qt_settings.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + */ #include "qt_settings.hpp" #include "ui_qt_settings.h" diff --git a/src/qt/qt_settings_bus_tracking.cpp b/src/qt/qt_settings_bus_tracking.cpp index 3744c10c7..41c7990da 100644 --- a/src/qt/qt_settings_bus_tracking.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2022 Miran Grca + * Copyright 2022 Cacodemon345 + */ #include #include #include diff --git a/src/qt/qt_settingsdisplay.cpp b/src/qt/qt_settingsdisplay.cpp index 4cd604305..b3a2cfd0d 100644 --- a/src/qt/qt_settingsdisplay.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsdisplay.hpp" #include "ui_qt_settingsdisplay.h" diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp index ad6bbfbbf..4d813737f 100644 --- a/src/qt/qt_settingsfloppycdrom.cpp +++ b/src/qt/qt_settingsfloppycdrom.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. + * + * Floppy/CD-ROM devices configuration UI module. + * + * + * + * Authors: Joakim L. Gilje + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsfloppycdrom.hpp" #include "ui_qt_settingsfloppycdrom.h" diff --git a/src/qt/qt_settingsharddisks.cpp b/src/qt/qt_settingsharddisks.cpp index ac3ec67ca..692437743 100644 --- a/src/qt/qt_settingsharddisks.cpp +++ b/src/qt/qt_settingsharddisks.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. + * + * Hard disk configuration UI module. + * + * + * + * Authors: Joakim L. Gilje + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsharddisks.hpp" #include "ui_qt_settingsharddisks.h" diff --git a/src/qt/qt_settingsinput.cpp b/src/qt/qt_settingsinput.cpp index f9b99dd7a..120065a88 100644 --- a/src/qt/qt_settingsinput.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsinput.hpp" #include "ui_qt_settingsinput.h" diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp index 8a1f12be2..37d66e9c0 100644 --- a/src/qt/qt_settingsmachine.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsmachine.hpp" #include "ui_qt_settingsmachine.h" diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp index a8a6dd2fc..836e3f83d 100644 --- a/src/qt/qt_settingsnetwork.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsnetwork.hpp" #include "ui_qt_settingsnetwork.h" diff --git a/src/qt/qt_settingsotherperipherals.cpp b/src/qt/qt_settingsotherperipherals.cpp index 7fa28f812..ffa7391a8 100644 --- a/src/qt/qt_settingsotherperipherals.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsotherperipherals.hpp" #include "ui_qt_settingsotherperipherals.h" diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp index c6f089f80..7d1073752 100644 --- a/src/qt/qt_settingsotherremovable.cpp +++ b/src/qt/qt_settingsotherremovable.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 removable devices configuration UI module. + * + * + * + * Authors: Joakim L. Gilje + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsotherremovable.hpp" #include "ui_qt_settingsotherremovable.h" diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp index e2a0a4fdc..b6ead8746 100644 --- a/src/qt/qt_settingsports.cpp +++ b/src/qt/qt_settingsports.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. + * + * Serial/Parallel ports configuration UI module. + * + * + * + * Authors: Joakim L. Gilje + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsports.hpp" #include "ui_qt_settingsports.h" diff --git a/src/qt/qt_settingssound.cpp b/src/qt/qt_settingssound.cpp index fa8188567..7277f4007 100644 --- a/src/qt/qt_settingssound.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingssound.hpp" #include "ui_qt_settingssound.h" diff --git a/src/qt/qt_settingsstoragecontrollers.cpp b/src/qt/qt_settingsstoragecontrollers.cpp index 8432a300a..0b66cec0a 100644 --- a/src/qt/qt_settingsstoragecontrollers.cpp +++ b/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 + * + * Copyright 2021 Joakim L. Gilje + */ #include "qt_settingsstoragecontrollers.hpp" #include "ui_qt_settingsstoragecontrollers.h" diff --git a/src/qt/qt_softwarerenderer.cpp b/src/qt/qt_softwarerenderer.cpp index 6a935a7a5..1245fd70a 100644 --- a/src/qt/qt_softwarerenderer.cpp +++ b/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 + * Cacodemon345 + * Teemu Korhonen + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + * Copyright 2021-2022 Teemu Korhonen + */ #include "qt_softwarerenderer.hpp" #include #include diff --git a/src/qt/qt_soundgain.cpp b/src/qt/qt_soundgain.cpp index 9f02608e7..7b3f7cc04 100644 --- a/src/qt/qt_soundgain.cpp +++ b/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" diff --git a/src/qt/qt_specifydimensions.cpp b/src/qt/qt_specifydimensions.cpp index 4a5b0ea0f..caf831466 100644 --- a/src/qt/qt_specifydimensions.cpp +++ b/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" diff --git a/src/qt/qt_styleoverride.cpp b/src/qt/qt_styleoverride.cpp index 449b167aa..3beb4c2db 100644 --- a/src/qt/qt_styleoverride.cpp +++ b/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( @@ -18,4 +34,4 @@ void StyleOverride::polish(QWidget* widget) /* Disable title bar context help buttons globally as they are unused. */ if (widget->isWindow()) widget->setWindowFlag(Qt::WindowContextHelpButtonHint, false); -} \ No newline at end of file +} diff --git a/src/qt/qt_ui.cpp b/src/qt/qt_ui.cpp index d45fb889b..78e7723c9 100644 --- a/src/qt/qt_ui.cpp +++ b/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 + * Cacodemon345 + * + * Copyright 2021 Joakim L. Gilje + * Copyright 2021-2022 Cacodemon345 + */ #include #include diff --git a/src/qt/qt_util.cpp b/src/qt/qt_util.cpp index 3c41d6745..96a60004b 100644 --- a/src/qt/qt_util.cpp +++ b/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 #include #include "qt_util.hpp" @@ -28,4 +44,4 @@ namespace util return " (" % temp.join(' ') % ")" % (!last ? ";;" : ""); } -} \ No newline at end of file +} diff --git a/src/qt/wl_mouse.cpp b/src/qt/wl_mouse.cpp index b399dafd7..36a91b68e 100644 --- a/src/qt/wl_mouse.cpp +++ b/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 #include @@ -86,4 +102,4 @@ void wl_mouse_uncapture() zwp_relative_pointer_v1_destroy(rel_pointer); rel_pointer = nullptr; conf_pointer = nullptr; -} \ No newline at end of file +} From 7451e245ea31070c3a5a34ffa84105065ef32ec6 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 15:35:15 +0600 Subject: [PATCH 06/16] Copyright header fixes --- src/qt/qt_mainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 82fcb99da..8df8417cc 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -13,10 +13,12 @@ * Authors: Joakim L. Gilje * 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" From 7470c7015a212f5f91dc5f2c24d9484a1af534db Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 15:39:14 +0600 Subject: [PATCH 07/16] Don't add duplicate separator when minitrace is enabled --- src/qt/qt_mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 8df8417cc..9f7f845ea 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -377,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)); From 208a9d520565837c7ddd96c5a73daaba1d94d03c Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 15:51:59 +0600 Subject: [PATCH 08/16] Fix wrong copyright notice --- src/qt/qt_platform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 97ef5d649..95ff15eba 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -6,7 +6,7 @@ * * This file is part of the 86Box distribution. * - * Main entry point module + * Common platform functions. * * * Authors: Joakim L. Gilje From 3bb0b4d56b77aef88103e6adfa265e1c17ba3963 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 16:07:07 +0600 Subject: [PATCH 09/16] qt: Add option to configure LPT4 device --- src/qt/qt_settingsports.cpp | 7 ++++++- src/qt/qt_settingsports.hpp | 2 ++ src/qt/qt_settingsports.ui | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp index b6ead8746..6163c277e 100644 --- a/src/qt/qt_settingsports.cpp +++ b/src/qt/qt_settingsports.cpp @@ -34,7 +34,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(QString("comboBoxLpt%1").arg(i+1)); auto* model = cbox->model(); int c = 0; @@ -95,3 +95,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); +} + diff --git a/src/qt/qt_settingsports.hpp b/src/qt/qt_settingsports.hpp index e4a8a050a..c5deef80a 100644 --- a/src/qt/qt_settingsports.hpp +++ b/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; }; diff --git a/src/qt/qt_settingsports.ui b/src/qt/qt_settingsports.ui index 0e52b4f3f..a1fbb47e7 100644 --- a/src/qt/qt_settingsports.ui +++ b/src/qt/qt_settingsports.ui @@ -58,6 +58,16 @@ + + + + LPT4 Device: + + + + + + @@ -111,6 +121,13 @@ + + + + Parallel port 4 + + + From 2b62ee0be0f478205585fd25de02b66b1b226333 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 16:07:33 +0600 Subject: [PATCH 10/16] Fix yet another copyright notice --- src/qt/qt_settingsports.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp index 6163c277e..a8d9ecb05 100644 --- a/src/qt/qt_settingsports.cpp +++ b/src/qt/qt_settingsports.cpp @@ -12,6 +12,7 @@ * * Authors: Joakim L. Gilje * + * Copyright 2022 Cacodemon345 * Copyright 2021 Joakim L. Gilje */ #include "qt_settingsports.hpp" From 0cec3ad98886817d9739abe8ec4351bc3c845cfd Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 16:09:01 +0600 Subject: [PATCH 11/16] ..and fix for previous commit --- src/qt/qt_settingsports.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp index a8d9ecb05..dbabae73c 100644 --- a/src/qt/qt_settingsports.cpp +++ b/src/qt/qt_settingsports.cpp @@ -11,6 +11,7 @@ * * * Authors: Joakim L. Gilje + * Cacodemon345 * * Copyright 2022 Cacodemon345 * Copyright 2021 Joakim L. Gilje From e152f85bb9f40c49e73a242a62b2c089009b3524 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 16:11:13 +0600 Subject: [PATCH 12/16] Fix more copyright notices --- src/qt/qt_settingsfloppycdrom.cpp | 2 ++ src/qt/qt_settingsharddisks.cpp | 2 ++ src/qt/qt_settingsotherremovable.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp index 4d813737f..ba2c1d601 100644 --- a/src/qt/qt_settingsfloppycdrom.cpp +++ b/src/qt/qt_settingsfloppycdrom.cpp @@ -11,7 +11,9 @@ * * * Authors: Joakim L. Gilje + * Cacodemon345 * + * Copyright 2021-2022 Cacodemon345 * Copyright 2021 Joakim L. Gilje */ #include "qt_settingsfloppycdrom.hpp" diff --git a/src/qt/qt_settingsharddisks.cpp b/src/qt/qt_settingsharddisks.cpp index 692437743..25fc06bfe 100644 --- a/src/qt/qt_settingsharddisks.cpp +++ b/src/qt/qt_settingsharddisks.cpp @@ -11,7 +11,9 @@ * * * Authors: Joakim L. Gilje + * Cacodemon345 * + * Copyright 2021-2022 Cacodemon345 * Copyright 2021 Joakim L. Gilje */ #include "qt_settingsharddisks.hpp" diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp index 7d1073752..574fdccb5 100644 --- a/src/qt/qt_settingsotherremovable.cpp +++ b/src/qt/qt_settingsotherremovable.cpp @@ -11,7 +11,9 @@ * * * Authors: Joakim L. Gilje + * Cacodemon345 * + * Copyright 2021-2022 Cacodemon345 * Copyright 2021 Joakim L. Gilje */ #include "qt_settingsotherremovable.hpp" From 309b2362b73eaa279d857789852d4e1a886b81eb Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 7 Feb 2022 16:50:51 +0600 Subject: [PATCH 13/16] qt: Implement ui_sb_set_ready and ui_sb_set_text functions --- src/qt/qt_ui.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qt/qt_ui.cpp b/src/qt/qt_ui.cpp index 78e7723c9..c2ea294c8 100644 --- a/src/qt/qt_ui.cpp +++ b/src/qt/qt_ui.cpp @@ -100,6 +100,10 @@ void ui_sb_set_text_w(wchar_t *wstr) { main_window->statusBar()->showMessage(QString::fromWCharArray(wstr)); } +void ui_sb_set_text(char *str) { + main_window->statusBar()->showMessage(QString(str)); +} + void ui_sb_update_tip(int arg) { main_window->updateStatusBarTip(arg); @@ -115,7 +119,10 @@ void ui_sb_bugui(char *str) { } 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 From ff6793e535dfc6d885ef2a0e7153a30ace0da227 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 7 Feb 2022 05:20:20 -0500 Subject: [PATCH 14/16] More win32 UI changes --- src/win/languages/dialogs.rc | 113 ++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 1f871ffdb..4f838014c 100644 --- a/src/win/languages/dialogs.rc +++ b/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 From 1a7a93010dc4b65d911580e76587f90a1d23e355 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Mon, 7 Feb 2022 15:59:13 +0500 Subject: [PATCH 15/16] Remove the obsolete logging and defunct VRAM dumping options from the Win32 UI --- CMakeLists.txt | 1 - src/CMakeLists.txt | 4 -- src/Makefile.local | 3 - src/include/86box/86box.h | 23 -------- src/include/86box/resource.h | 11 ---- src/include/86box/video.h | 4 -- src/qt/languages/cs-CZ.po | 30 ---------- src/qt/languages/de-DE.po | 30 ---------- src/qt/languages/en-GB.po | 30 ---------- src/qt/languages/en-US.po | 30 ---------- src/qt/languages/es-ES.po | 30 ---------- src/qt/languages/fi-FI.po | 30 ---------- src/qt/languages/fr-FR.po | 30 ---------- src/qt/languages/hr-HR.po | 30 ---------- src/qt/languages/hu-HU.po | 30 ---------- src/qt/languages/it-IT.po | 30 ---------- src/qt/languages/ja-JP.po | 30 ---------- src/qt/languages/ko-KR.po | 30 ---------- src/qt/languages/pl-PL.po | 30 ---------- src/qt/languages/pt-BR.po | 30 ---------- src/qt/languages/pt-PT.po | 30 ---------- src/qt/languages/ru-RU.po | 30 ---------- src/qt/languages/sl-SI.po | 30 ---------- src/qt/languages/tr-TR.po | 30 ---------- src/qt/languages/uk-UA.po | 30 ---------- src/qt/languages/zh-CN.po | 30 ---------- src/win/86Box.rc | 27 --------- src/win/Makefile.mingw | 4 -- src/win/languages/cs-CZ.rc | 37 ------------ src/win/languages/de-DE.rc | 37 ------------ src/win/languages/en-GB.rc | 37 ------------ src/win/languages/en-US.rc | 37 ------------ src/win/languages/es-ES.rc | 37 ------------ src/win/languages/fi-FI.rc | 37 ------------ src/win/languages/fr-FR.rc | 37 ------------ src/win/languages/hr-HR.rc | 37 ------------ src/win/languages/hu-HU.rc | 37 ------------ src/win/languages/it-IT.rc | 37 ------------ src/win/languages/ja-JP.rc | 37 ------------ src/win/languages/ko-KR.rc | 37 ------------ src/win/languages/pl-PL.rc | 37 ------------ src/win/languages/pt-BR.rc | 37 ------------ src/win/languages/pt-PT.rc | 37 ------------ src/win/languages/ru-RU.rc | 37 ------------ src/win/languages/sl-SI.rc | 37 ------------ src/win/languages/tr-TR.rc | 37 ------------ src/win/languages/uk-UA.rc | 37 ------------ src/win/languages/zh-CN.rc | 37 ------------ src/win/win_ui.c | 110 ----------------------------------- 49 files changed, 1527 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8635cdc1..da97bc03d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,6 @@ 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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a502b602f..0a9fc03a1 100644 --- a/src/CMakeLists.txt +++ b/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() diff --git a/src/Makefile.local b/src/Makefile.local index 095b60024..16df56b3d 100644 --- a/src/Makefile.local +++ b/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. @@ -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 := diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h index 0947ceb66..62aaddc99 100644 --- a/src/include/86box/86box.h +++ b/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 */ diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index 4b05d1c8e..242b6c9b4 100644 --- a/src/include/86box/resource.h +++ b/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 diff --git a/src/include/86box/video.h b/src/include/86box/video.h index ebd6d3933..05b7055b3 100644 --- a/src/include/86box/video.h +++ b/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); diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 4e2135271..7f8d51957 100644 --- a/src/qt/languages/cs-CZ.po +++ b/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" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 3f2133deb..2280a68cc 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -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" diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po index d20e08705..7f8ace40d 100644 --- a/src/qt/languages/en-GB.po +++ b/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" diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po index 973ba63e9..bce66a3f8 100644 --- a/src/qt/languages/en-US.po +++ b/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" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index a0c0b9d2d..9e04d0544 100644 --- a/src/qt/languages/es-ES.po +++ b/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" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 3812b49db..85af22173 100644 --- a/src/qt/languages/fi-FI.po +++ b/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" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index d13c00585..54a85e79a 100644 --- a/src/qt/languages/fr-FR.po +++ b/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" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index e6dd3d190..210de3002 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -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ć" diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index d6426a9a3..3f44d06b6 100644 --- a/src/qt/languages/hu-HU.po +++ b/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ó" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index c60a0635a..bc8275e6b 100644 --- a/src/qt/languages/it-IT.po +++ b/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 "&?" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index 758ddec6e..38add0fc3 100644 --- a/src/qt/languages/ja-JP.po +++ b/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)" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 4664e5cc6..b06d800a4 100644 --- a/src/qt/languages/ko-KR.po +++ b/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)" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index c576cf883..1b9e05e81 100644 --- a/src/qt/languages/pl-PL.po +++ b/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" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 7a1f33529..5e9418eeb 100644 --- a/src/qt/languages/pt-BR.po +++ b/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" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index bc2ced0c2..9f6b1482a 100644 --- a/src/qt/languages/pt-PT.po +++ b/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" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index 443c6f28c..ac4802b4b 100644 --- a/src/qt/languages/ru-RU.po +++ b/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 "&Помощь" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 6bb8a66d2..d4bdedfe3 100644 --- a/src/qt/languages/sl-SI.po +++ b/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č" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index a6c36ac77..a37e71344 100644 --- a/src/qt/languages/tr-TR.po +++ b/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" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index a8dc7bd0f..d5210ad7f 100644 --- a/src/qt/languages/uk-UA.po +++ b/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 "&Допомога" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 1d5a94da7..1b00c3586 100644 --- a/src/qt/languages/zh-CN.po +++ b/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)" diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 1d9fbf06c..342870d62 100644 --- a/src/win/86Box.rc +++ b/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 diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 4362273e7..26d7239f3 100644 --- a/src/win/Makefile.mingw +++ b/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. diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index ababda8f2..2699627ae 100644 --- a/src/win/languages/cs-CZ.rc +++ b/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 diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 08f152795..2f5975975 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -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 diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 381091ca5..eec6c4699 100644 --- a/src/win/languages/en-GB.rc +++ b/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 diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 6013cea7b..e276015e1 100644 --- a/src/win/languages/en-US.rc +++ b/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 diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index ff774c894..67d2dcbfc 100644 --- a/src/win/languages/es-ES.rc +++ b/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 diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index b24e297d8..0008bd4c6 100644 --- a/src/win/languages/fi-FI.rc +++ b/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 diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index e048c5065..c7c7dcbe6 100644 --- a/src/win/languages/fr-FR.rc +++ b/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 diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 5a212cc91..ca2f49af2 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -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 diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index cc1f9aebb..ba4d14073 100644 --- a/src/win/languages/hu-HU.rc +++ b/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 diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index c941bc585..634b73e32 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -113,43 +113,6 @@ BEGIN MENUITEM "Ferma traccia\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Registra" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Attiva registrazione di BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Attiva registrazione del CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Attiva registrazione del floppy (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Attiva registrazione del controller floppy\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Attiva registrazione di IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Attiva registrazione della porta seriale\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Attiva registrazione della rete\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Punto di interruzione del registro\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "Scarica &la RAM video\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&?" BEGIN MENUITEM "&Documentazione...", IDM_DOCS diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index c3e9b2acd..fbadc32b4 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "トレース終了\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "ログ(&L)" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "BusLogicのログを有効\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "CD-ROMのログを有効\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "フロッピー(86F)のログを有効\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "フロッピーコントローラーのログを有効\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "IDEのログを有効\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "シリアルポートのログを有効\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "ネットワークのログを有効\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "ブレークポイントのログを有効(&L)\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "ビデオRAMのダンプを有効(&V)\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "ヘルプ(&H)" BEGIN MENUITEM "ドキュメント(&D)...", IDM_DOCS diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index 8d494c718..d5f8115f6 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "추적 끝내기\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "로그(&L)" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "BusLogic 로그 켜기\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "CD-ROM 로그 켜기\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "플로피 (86F) 로그 켜기\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "플로피 컨트롤러 로그 켜기\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "IDE 로그 켜기\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "직렬 포트 로그 켜기\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "네트워크 로그 켜기\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "중단점 로그 켜기(&L)\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "비디오 RAM 덤프 켜기(&V)\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "도움말(&H)" BEGIN MENUITEM "문서(&D)...", IDM_DOCS diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index eaca1fb99..1001e3c62 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "Zakończ śledzenie\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Logowanie" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Włącz logu BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Włącz logi CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Włącz logi dyskietek (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Włącz logi kontrolera dyskietek\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Włącz logi IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Włącz logi portu szeregowego\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Włącz logi sieci\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Punkt przerwania dziennika\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "Zrzuć pamięć &wideo\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Pomoc" BEGIN MENUITEM "&Dokumentacja...", IDM_DOCS diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 72cab4239..76903e4d6 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -115,43 +115,6 @@ BEGIN MENUITEM "Fim do rastreamento\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Registros" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Ativar registros da BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Ativar registros do CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Ativar registros do disquete (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Ativar registros do controlador de disquete\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Ativar registros da IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Ativar registros da porta serial\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Ativar registros da rede\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Ponto de parada no registo\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "Despejo da RAM de &vídeo\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Ajuda" BEGIN MENUITEM "&Documentação...", IDM_DOCS diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 2d8103147..1db17eb18 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "Terminar o rastreio\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Registo" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Ativar registo BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Ativar registo do CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Ativar registo de disquetes (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Ativar registo do controlador de disquetes\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Ativar registo IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Ativar registo da porta série\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Ativar registo de rede\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Ponto de paragem no registo\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "Despejo de RAM &vídeo\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Ajuda" BEGIN MENUITEM "&Documentação...", IDM_DOCS diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 0fd617d74..84f3c6e7d 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "Завершить трассировку\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Ведение журнала" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Включить журналы BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Включить журналы CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Включить журналы дискет (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Включить журналы контроллера дискет\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Включить журналы IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Включить журналы COM порта\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Включить журналы сети\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Точка останова журнала\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "&Выгрузка дампа видеопамяти\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Помощь" BEGIN MENUITEM "&Документация...", IDM_DOCS diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 1b4f1c3fa..e67ba0ab8 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "&Končaj sledenje\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Beleženje" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Omogoči beleženje za BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Omogoči beleženje za CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Omogoči beleženje za diskete (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Omogoči beleženje za disketni krmilnik\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Omogoči beleženje za IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Omogoči beleženje za serijska vrata\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Omogoči belež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 "&Zabeleži prelomno točko\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "&Izvozi pomnilnik zaslona\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Pomoč" BEGIN MENUITEM "&Dokumentacija...", IDM_DOCS diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 617f0a45a..2dd422f15 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.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 "BusLogic kayıtlarını etkinleştir\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "CD-ROM kayıtlarını etkinleştir\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Disket (86F) kayıtlarını etkinleştir\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Disket kontrolcüsü kayıtlarını etkinleştir\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "IDE kayıtlarını etkinleştir\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Seri Port kayıtlarını etkinleştir\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Ağ kayıtlarını etkinleştir\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&breakpoint'i kayıtla\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "&Video belleğini depola\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Yardım" BEGIN MENUITEM "&Dökümanlar...", IDM_DOCS diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc index 0d3e9a767..a752a5add 100644 --- a/src/win/languages/uk-UA.rc +++ b/src/win/languages/uk-UA.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "Завершити трасування\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "&Ведення журнала" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "Увімкнути журнали BusLogic\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "Увімкнути журнали CD-ROM\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "Увімкнути журнали дискет (86F)\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "Увімкнути журнали контролера дискет\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "Увімкнути журнали IDE\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "Увімкнути журнали COM порту\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "Увімкнути журнали мережі\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "&Точка зупинка журналу\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "&Вивантаження дампа відеопам'яті\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "&Допомога" BEGIN MENUITEM "&Документація...", IDM_DOCS diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 668b1a061..5ce2fcccb 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -112,43 +112,6 @@ BEGIN MENUITEM "结束追踪\tCtrl+T", IDM_ACTION_END_TRACE #endif END -#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) - POPUP "记录日志(&L)" - BEGIN -# ifdef ENABLE_BUSLOGIC_LOG - MENUITEM "启用 BusLogic 日志\tCtrl+F4", IDM_LOG_BUSLOGIC -# endif -# ifdef ENABLE_CDROM_LOG - MENUITEM "启用 CD-ROM 日志\tCtrl+F5", IDM_LOG_CDROM -# endif -# ifdef ENABLE_D86F_LOG - MENUITEM "启用软盘 (86F) 日志\tCtrl+F6", IDM_LOG_D86F -# endif -# ifdef ENABLE_FDC_LOG - MENUITEM "启用软盘控制器日志\tCtrl+F7", IDM_LOG_FDC -# endif -# ifdef ENABLE_IDE_LOG - MENUITEM "启用 IDE 日志\tCtrl+F8", IDM_LOG_IDE -# endif -# ifdef ENABLE_SERIAL_LOG - MENUITEM "启用串口日志\tCtrl+F3", IDM_LOG_SERIAL -# endif -# ifdef ENABLE_NIC_LOG - MENUITEM "启用网络日志\tCtrl+F9", IDM_LOG_NIC -# endif -# ifdef ENABLE_LOG_COMMANDS -# ifdef ENABLE_LOG_TOGGLES - MENUITEM SEPARATOR -# endif -# ifdef ENABLE_LOG_BREAKPOINT - MENUITEM "日志断点(&L)\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP - MENUITEM "创建显卡内存转储(&V)\tCtrl+F1", IDM_DUMP_VRAM -# endif -# endif - END -#endif POPUP "帮助(&H)" BEGIN MENUITEM "文档(&D)...", IDM_DOCS diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 701a306e3..be5ab760d 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -251,30 +251,6 @@ ResetAllMenus(void) CheckMenuItem(menuMain, IDM_UPDATE_ICONS, MF_UNCHECKED); -#ifdef ENABLE_LOG_TOGGLES -# ifdef ENABLE_BUSLOGIC_LOG - CheckMenuItem(menuMain, IDM_LOG_BUSLOGIC, MF_UNCHECKED); -# endif -# ifdef ENABLE_CDROM_LOG - CheckMenuItem(menuMain, IDM_LOG_CDROM, MF_UNCHECKED); -# endif -# ifdef ENABLE_D86F_LOG - CheckMenuItem(menuMain, IDM_LOG_D86F, MF_UNCHECKED); -# endif -# ifdef ENABLE_FDC_LOG - CheckMenuItem(menuMain, IDM_LOG_FDC, MF_UNCHECKED); -# endif -# ifdef ENABLE_IDE_LOG - CheckMenuItem(menuMain, IDM_LOG_IDE, MF_UNCHECKED); -# endif -# ifdef ENABLE_SERIAL_LOG - CheckMenuItem(menuMain, IDM_LOG_SERIAL, MF_UNCHECKED); -# endif -# ifdef ENABLE_NIC_LOG - CheckMenuItem(menuMain, IDM_LOG_NIC, MF_UNCHECKED); -# endif -#endif - CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FORCE43, MF_UNCHECKED); @@ -320,30 +296,6 @@ ResetAllMenus(void) CheckMenuItem(menuMain, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED); -#ifdef ENABLE_LOG_TOGGLES -# ifdef ENABLE_BUSLOGIC_LOG - CheckMenuItem(menuMain, IDM_LOG_BUSLOGIC, buslogic_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_CDROM_LOG - CheckMenuItem(menuMain, IDM_LOG_CDROM, cdrom_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_D86F_LOG - CheckMenuItem(menuMain, IDM_LOG_D86F, d86f_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_FDC_LOG - CheckMenuItem(menuMain, IDM_LOG_FDC, fdc_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_IDE_LOG - CheckMenuItem(menuMain, IDM_LOG_IDE, ide_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_SERIAL_LOG - CheckMenuItem(menuMain, IDM_LOG_SERIAL, serial_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -# ifdef ENABLE_NIC_LOG - CheckMenuItem(menuMain, IDM_LOG_NIC, nic_do_log?MF_CHECKED:MF_UNCHECKED); -# endif -#endif - CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, hide_status_bar ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, hide_tool_bar ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FORCE43, force_43?MF_CHECKED:MF_UNCHECKED); @@ -879,68 +831,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) discord_close(); break; -#ifdef ENABLE_LOG_TOGGLES -# ifdef ENABLE_BUSLOGIC_LOG - case IDM_LOG_BUSLOGIC: - buslogic_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_BUSLOGIC, buslogic_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_CDROM_LOG - case IDM_LOG_CDROM: - cdrom_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_CDROM, cdrom_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_D86F_LOG - case IDM_LOG_D86F: - d86f_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_D86F, d86f_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_FDC_LOG - case IDM_LOG_FDC: - fdc_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_FDC, fdc_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_IDE_LOG - case IDM_LOG_IDE: - ide_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_IDE, ide_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_SERIAL_LOG - case IDM_LOG_SERIAL: - serial_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_SERIAL, serial_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif - -# ifdef ENABLE_NIC_LOG - case IDM_LOG_NIC: - nic_do_log ^= 1; - CheckMenuItem(hmenu, IDM_LOG_NIC, nic_do_log ? MF_CHECKED : MF_UNCHECKED); - break; -# endif -#endif - -#ifdef ENABLE_LOG_BREAKPOINT - case IDM_LOG_BREAKPOINT: - pclog("---- LOG BREAKPOINT ----\n"); - break; -#endif - -#ifdef ENABLE_VRAM_DUMP - case IDM_DUMP_VRAM: - svga_dump_vram(); - break; -#endif default: media_menu_proc(hwnd, message, wParam, lParam); break; From 1cb301cf3b397252e85310c2e368c58c43ab64d5 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Mon, 7 Feb 2022 18:05:58 +0500 Subject: [PATCH 16/16] Refactor NIC logging --- src/Makefile.local | 2 +- src/network/net_ne2000.c | 15 +++------------ src/network/net_pcnet.c | 9 --------- src/network/net_wd8003.c | 8 +------- src/network/network.c | 9 +-------- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/Makefile.local b/src/Makefile.local index 16df56b3d..c927037d8 100644 --- a/src/Makefile.local +++ b/src/Makefile.local @@ -123,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. diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index db2a08bf1..6878e4f94 100644 --- a/src/network/net_ne2000.c +++ b/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)); diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c index 373299732..441c50f67 100644 --- a/src/network/net_pcnet.c +++ b/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; diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c index 4a8559dc4..33aa1578c 100644 --- a/src/network/net_wd8003.c +++ b/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; diff --git a/src/network/network.c b/src/network/network.c index 1112d397e..fad9eacbc 100644 --- a/src/network/network.c +++ b/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.. */