claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config clean-ups, auto-pause, 4:3 integer scale, and more parameters.

Browse Source
This commit is contained in:
OBattler
2023-10-13 23:30:31 +02:00
parent 903b91af86
commit 7ec58da46f
31 changed files with 340 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/languages/ca-ES.po
View File

@@ -122,7 +122,10 @@ msgid "&Square pixels (Keep ratio)"
msgstr "&Píxels quadrats (Mant. aspecte)"
msgid "&Integer scale"
msgstr "&Escalat valor sencer"
msgstr "&Escala de valor enter"
msgid "4:&3 Integer scale"
msgstr "Escala de valor enter 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "&Ajustaments EGA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Lent"
msgid "Fast"
msgstr "Ràpid"
msgid "&Auto-pause on focus loss"
msgstr "&Pausa automàtica en la pèrdua del focus"

6
src/qt/languages/cs-CZ.po
View File

@@ -124,6 +124,9 @@ msgstr "&Zachovat poměr stran"
msgid "&Integer scale"
msgstr "&Celočíselné škálování"
msgid "4:&3 Integer scale"
msgstr "4:&3 Celočíselné škálování"
msgid "E&GA/(S)VGA settings"
msgstr "Nastavení pro E&GA a (S)VGA"
@@ -1218,3 +1221,6 @@ msgstr "Pomalý"
msgid "Fast"
msgstr "Rychlý"
msgid "&Auto-pause on focus loss"
msgstr "&Automatická pauza při ztrátě zaměření okna"

5
src/qt/languages/de-DE.po
View File

@@ -124,6 +124,9 @@ msgstr "&Quadratische Pixel (Seitenverhältnis beibehalten)"
msgid "&Integer scale"
msgstr "&Integer-Skalierung"
msgid "4:&3 Integer scale"
msgstr "4:&3 Integer-Skalierung"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA-Einstellungen"
@@ -1219,3 +1222,5 @@ msgstr "Langsam"
msgid "Fast"
msgstr "Schnell"
msgid "&Auto-pause on focus loss"
msgstr "&Auto-Pause bei Fokusverlust"

5
src/qt/languages/en-GB.po
View File

@@ -124,6 +124,9 @@ msgstr "&Square pixels (Keep ratio)"
msgid "&Integer scale"
msgstr "&Integer scale"
msgid "4:&3 Integer scale"
msgstr "4:&3 Integer scale"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA settings"
@@ -1219,3 +1222,5 @@ msgstr "Slow"
msgid "Fast"
msgstr "Fast"
msgid "&Auto-pause on focus loss"
msgstr "&Auto-pause on focus loss"

5
src/qt/languages/en-US.po
View File

@@ -124,6 +124,9 @@ msgstr "&Square pixels (Keep ratio)"
msgid "&Integer scale"
msgstr "&Integer scale"
msgid "4:&3 Integer scale"
msgstr "4:&3 Integer scale"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA settings"
@@ -1219,3 +1222,5 @@ msgstr "Slow"
msgid "Fast"
msgstr "Fast"
msgid "&Auto-pause on focus loss"
msgstr "&Auto-pause on focus loss"

5
src/qt/languages/es-ES.po
View File

@@ -124,6 +124,9 @@ msgstr "&Píxeles cuadrados (Mant. aspecto)"
msgid "&Integer scale"
msgstr "&Escalado valor entero"
msgid "4:&3 Integer scale"
msgstr "Escalado valor entero 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "&Configuraciones EGA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Lenta"
msgid "Fast"
msgstr "Rápida"
msgid "&Auto-pause on focus loss"
msgstr "&Pausa automática al perder el foco"

5
src/qt/languages/fi-FI.po
View File

@@ -124,6 +124,9 @@ msgstr "&Tasasivuiset kuvapisteet (säilytä kuvasuhde)"
msgid "&Integer scale"
msgstr "&Kokonaislukuskaalaus"
msgid "4:&3 Integer scale"
msgstr "4:&3 Kokonaislukuskaalaus"
msgid "E&GA/(S)VGA settings"
msgstr "&EGA/(S)VGA-asetukset"
@@ -1219,3 +1222,5 @@ msgstr "Hidas"
msgid "Fast"
msgstr "Nopea"
msgid "&Auto-pause on focus loss"
msgstr "&Automaattinen tauko tarkennuksen hävitessä"

6
src/qt/languages/fr-FR.po
View File

@@ -124,6 +124,9 @@ msgstr "pixels &Carrés(Keep ratio)"
msgid "&Integer scale"
msgstr "Echelle &Entière"
msgid "4:&3 Integer scale"
msgstr "Echelle Entière 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Réglages E&GA/(S)VGA"
@@ -1219,3 +1222,6 @@ msgstr "Lent"
msgid "Fast"
msgstr "Rapide"
msgid "&Auto-pause on focus loss"
msgstr "&Pause automatique à perte de mise au point"

5
src/qt/languages/hr-HR.po
View File

@@ -124,6 +124,9 @@ msgstr "&Kvadratni pikseli (zadrži omjer)"
msgid "&Integer scale"
msgstr "&Cijelobrojno skaliranje"
msgid "4:&3 Integer scale"
msgstr "4:&3 Cijelobrojno skaliranje"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA postavke"
@@ -1219,3 +1222,5 @@ msgstr "Spori"
msgid "Fast"
msgstr "Brzi"
msgid "&Auto-pause on focus loss"
msgstr "&Automatska pauza pri gubitku fokusa"

5
src/qt/languages/hu-HU.po
View File

@@ -124,6 +124,9 @@ msgstr "&Négyzetes képpontok (aránytartás)"
msgid "&Integer scale"
msgstr "&Egész tényezős nagyítás"
msgid "4:&3 Integer scale"
msgstr "4:&3 Egész tényezős nagyítás"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA beállítások"
@@ -1219,3 +1222,5 @@ msgstr "Lassú"
msgid "Fast"
msgstr "Gyors"
msgid "&Auto-pause on focus loss"
msgstr "&Automatikus szünet fókuszvesztéskor"

5
src/qt/languages/it-IT.po
View File

@@ -124,6 +124,9 @@ msgstr "&Pixel quadrati (mantiene l'aspetto)"
msgid "&Integer scale"
msgstr "&Scala intera"
msgid "4:&3 Integer scale"
msgstr "Scala intera 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Impostazioni E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Lenta"
msgid "Fast"
msgstr "Veloce"
msgid "&Auto-pause on focus loss"
msgstr "&Pausa automatica alla perdita della messa a fuoco"

5
src/qt/languages/ja-JP.po
View File

@@ -124,6 +124,9 @@ msgstr "正方形ピクセル(アスペクト比を維持)(&S)"
msgid "&Integer scale"
msgstr "整数倍(&I)"
msgid "4:&3 Integer scale"
msgstr "4:3 整数倍(&3)"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGAの設定"
@@ -1219,3 +1222,5 @@ msgstr "遅い"
msgid "Fast"
msgstr "速い"
msgid "&Auto-pause on focus loss"
msgstr "フォーカスが外れると自動ポーズ(&A)"

5
src/qt/languages/ko-KR.po
View File

@@ -124,6 +124,9 @@ msgstr "정사각형 픽셀 (비율 유지)(&S)"
msgid "&Integer scale"
msgstr "정수배 확대(&I)"
msgid "4:&3 Integer scale"
msgstr "4:3 정수배 확대(&3)"
msgid "E&GA/(S)VGA settings"
msgstr "E&GA/(S)VGA 설정"
@@ -1219,3 +1222,5 @@ msgstr "느린"
msgid "Fast"
msgstr "빠른"
msgid "&Auto-pause on focus loss"
msgstr "집중력 저하 시 자동 일시 중지(&A)"

5
src/qt/languages/pl-PL.po
View File

@@ -124,6 +124,9 @@ msgstr "&Kwadratowe piksele (Zachowaj proporcje)"
msgid "&Integer scale"
msgstr "&Skalowanie całkowite"
msgid "4:&3 Integer scale"
msgstr "Skalowanie całkowite 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Ustawienia E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Powolny"
msgid "Fast"
msgstr "Szybki"
msgid "&Auto-pause on focus loss"
msgstr "&Automatyczna pauza po utracie fokusu"

5
src/qt/languages/pt-BR.po
View File

@@ -124,6 +124,9 @@ msgstr "Pixel&s quadrados (manter proporção)"
msgid "&Integer scale"
msgstr "&Redimensionamento com valores inteiros"
msgid "4:&3 Integer scale"
msgstr "Redimensionamento com valores inteiros 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Configurações E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Lento"
msgid "Fast"
msgstr "Rápido"
msgid "&Auto-pause on focus loss"
msgstr "Pausa &automática ao perder o foco"

5
src/qt/languages/pt-PT.po
View File

@@ -124,6 +124,9 @@ msgstr "Pixels &quadrados (Manter rácio)"
msgid "&Integer scale"
msgstr "Escala &inteira"
msgid "4:&3 Integer scale"
msgstr "Escala inteira 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Definições E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Lento"
msgid "Fast"
msgstr "Rápido"
msgid "&Auto-pause on focus loss"
msgstr "Pausa &automática na perda de focagem"

5
src/qt/languages/ru-RU.po
View File

@@ -124,6 +124,9 @@ msgstr "&Квадратные пиксели (сохранить соотнош
msgid "&Integer scale"
msgstr "&Целочисленное масштабирование"
msgid "4:&3 Integer scale"
msgstr "4:&3 Целочисленное масштабирование"
msgid "E&GA/(S)VGA settings"
msgstr "Настройки E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Медленный"
msgid "Fast"
msgstr "Быстрый"
msgid "&Auto-pause on focus loss"
msgstr "&Автопауза при потере фокуса"

6
src/qt/languages/sk-SK.po
View File

@@ -124,6 +124,9 @@ msgstr "&Zachovať pomer strán"
msgid "&Integer scale"
msgstr "&Celočíselné škálovanie"
msgid "4:&3 Integer scale"
msgstr "4:&3 Celočíselné škálovanie"
msgid "E&GA/(S)VGA settings"
msgstr "Nastavenia pre E&GA a (S)VGA"
@@ -1218,3 +1221,6 @@ msgstr "Pomalý"
msgid "Fast"
msgstr "Rýchly"
msgid "&Auto-pause on focus loss"
msgstr "&Automatická pauza pri strate fokusu okna"

5
src/qt/languages/sl-SI.po
View File

@@ -124,6 +124,9 @@ msgstr "&Kvadratni piksli (ohrani razmerje)"
msgid "&Integer scale"
msgstr "&Celoštevilsko raztezanje"
msgid "4:&3 Integer scale"
msgstr "Celoštevilsko raztezanje 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Nastavitve E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Počasni"
msgid "Fast"
msgstr "Hitri"
msgid "&Auto-pause on focus loss"
msgstr "&Samodejni premor ob izgubi fokusa"

5
src/qt/languages/tr-TR.po
View File

@@ -124,6 +124,9 @@ msgstr "&Kare piksel (ölçeği koru)"
msgid "&Integer scale"
msgstr "Tam &sayı ölçeklemesi"
msgid "4:&3 Integer scale"
msgstr "4:&3 Tam sayı ölçeklemesi"
msgid "E&GA/(S)VGA settings"
msgstr "EGA/&(S)VGA ayarları"
@@ -1219,3 +1222,5 @@ msgstr "Yavaş"
msgid "Fast"
msgstr "Hızlı"
msgid "&Auto-pause on focus loss"
msgstr "&Odak kaybında otomatik duraklatma"

5
src/qt/languages/uk-UA.po
View File

@@ -124,6 +124,9 @@ msgstr "&Квадратні пікселі (зберегти відношенн
msgid "&Integer scale"
msgstr "&Цілісночисленне масштабування"
msgid "4:&3 Integer scale"
msgstr "Цілісночисленне масштабування 4:&3"
msgid "E&GA/(S)VGA settings"
msgstr "Налаштування E&GA/(S)VGA"
@@ -1219,3 +1222,5 @@ msgstr "Повільний"
msgid "Fast"
msgstr "Швидкий"
msgid "&Auto-pause on focus loss"
msgstr "&Автопауза при втраті фокусу"

6
src/qt/languages/zh-CN.po
View File

@@ -124,6 +124,9 @@ msgstr "保持比例(&S)"
msgid "&Integer scale"
msgstr "整数比例(&I)"
msgid "4:&3 Integer scale"
msgstr "4:3 整数比例(&3)"
msgid "E&GA/(S)VGA settings"
msgstr "EGA/(S)VGA 设置(&G)"
@@ -1219,3 +1222,6 @@ msgstr "慢"
msgid "Fast"
msgstr "快"
msgid "&Auto-pause on focus loss"
msgstr "&失焦自动暂停"

5
src/qt/languages/zh-TW.po
View File

@@ -124,6 +124,9 @@ msgstr "保持比例(&S)"
msgid "&Integer scale"
msgstr "整數比例(&I)"
msgid "4:&3 Integer scale"
msgstr "4:3 整數比例(&3)"
msgid "E&GA/(S)VGA settings"
msgstr "EGA/(S)VGA 設定(&G)"
@@ -1219,3 +1222,5 @@ msgstr "慢"
msgid "Fast"
msgstr "快"
msgid "&Auto-pause on focus loss"
msgstr "&失去焦點時自動暫停"

40
src/qt/qt_mainwindow.cpp
View File

@@ -211,7 +211,11 @@ MainWindow::MainWindow(QWidget *parent)
connect(this, &MainWindow::hardResetCompleted, this, [this]() {
ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA));
QApplication::setOverrideCursor(Qt::ArrowCursor);
#ifdef USE_WACOM
ui->menuTablet_tool->menuAction()->setVisible(mouse_mode >= 1);
#else
ui->menuTablet_tool->menuAction()->setVisible(false);
#endif
});
connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection);
@@ -268,8 +272,20 @@ MainWindow::MainWindow(QWidget *parent)
});
connect(qApp, &QGuiApplication::applicationStateChanged, [this](Qt::ApplicationState state) {
if (mouse_capture && state != Qt::ApplicationState::ApplicationActive)
emit setMouseCapture(false);
if (state == Qt::ApplicationState::ApplicationActive) {
if (auto_paused) {
plat_pause(0);
auto_paused = 0;
}
} else {
if (mouse_capture)
emit setMouseCapture(false);
if (do_auto_pause && !dopause) {
auto_paused = 1;
plat_pause(1);
}
}
});
connect(this, &MainWindow::resizeContents, this, [this](int w, int h) {
@@ -530,6 +546,9 @@ MainWindow::MainWindow(QWidget *parent)
case FULLSCR_SCALE_INT:
ui->actionFullScreen_int->setChecked(true);
break;
case FULLSCR_SCALE_INT43:
ui->actionFullScreen_int43->setChecked(true);
break;
}
actGroup = new QActionGroup(this);
actGroup->addAction(ui->actionFullScreen_stretch);
@@ -583,6 +602,9 @@ MainWindow::MainWindow(QWidget *parent)
if (vid_cga_contrast > 0) {
ui->actionChange_contrast_for_monochrome_display->setChecked(true);
}
if (do_auto_pause > 0) {
ui->actionAuto_pause->setChecked(true);
}
#ifdef Q_OS_MACOS
ui->actionCtrl_Alt_Del->setShortcutVisibleInContextMenu(true);
@@ -1559,6 +1581,13 @@ MainWindow::on_actionFullScreen_int_triggered()
update_fullscreen_scale_checkboxes(ui, ui->actionFullScreen_int);
}
void
MainWindow::on_actionFullScreen_int43_triggered()
{
video_fullscreen_scale = FULLSCR_SCALE_INT43;
update_fullscreen_scale_checkboxes(ui, ui->actionFullScreen_int43);
}
static void
update_greyscale_checkboxes(Ui::MainWindow *ui, QAction *selected, int value)
{
@@ -1709,6 +1738,13 @@ MainWindow::on_actionForce_4_3_display_ratio_triggered()
video_toggle_option(ui->actionForce_4_3_display_ratio, &force_43);
}
void
MainWindow::on_actionAuto_pause_triggered()
{
do_auto_pause ^= 1;
ui->actionAuto_pause->setChecked(do_auto_pause > 0 ? true : false);
}
void
MainWindow::on_actionRemember_size_and_position_triggered()
{

2
src/qt/qt_mainwindow.hpp
View File

@@ -69,6 +69,7 @@ private slots:
void on_actionFullscreen_triggered();
void on_actionSettings_triggered();
void on_actionExit_triggered();
void on_actionAuto_pause_triggered();
void on_actionPause_triggered();
void on_actionCtrl_Alt_Del_triggered();
void on_actionCtrl_Alt_Esc_triggered();
@@ -90,6 +91,7 @@ private slots:
void on_actionLinear_triggered();
void on_actionNearest_triggered();
void on_actionFullScreen_int_triggered();
void on_actionFullScreen_int43_triggered();
void on_actionFullScreen_keepRatio_triggered();
void on_actionFullScreen_43_triggered();
void on_actionFullScreen_stretch_triggered();

23
src/qt/qt_mainwindow.ui
View File

@@ -68,17 +68,19 @@
<addaction name="actionPen"/>
<addaction name="actionCursor_Puck"/>
</widget>
<addaction name="actionAuto_pause"/>
<addaction name="separator"/>
<addaction name="actionKeyboard_requires_capture"/>
<addaction name="actionRight_CTRL_is_left_ALT"/>
<addaction name="menuTablet_tool"/>
<addaction name="separator"/>
<addaction name="actionPause"/>
<addaction name="separator"/>
<addaction name="actionHard_Reset"/>
<addaction name="actionCtrl_Alt_Del"/>
<addaction name="separator"/>
<addaction name="actionCtrl_Alt_Esc"/>
<addaction name="separator"/>
<addaction name="actionPause"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuTools">
@@ -148,6 +150,7 @@
<addaction name="actionFullScreen_43"/>
<addaction name="actionFullScreen_keepRatio"/>
<addaction name="actionFullScreen_int"/>
<addaction name="actionFullScreen_int43"/>
</widget>
<widget class="QMenu" name="menuEGA_S_VGA_settings">
<property name="title">
@@ -263,6 +266,14 @@
<addaction name="separator"/>
<addaction name="actionSettings"/>
</widget>
<action name="actionAuto_pause">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Auto-pause on focus loss</string>
</property>
</action>
<action name="actionKeyboard_requires_capture">
<property name="checkable">
<bool>true</bool>
@@ -586,6 +597,14 @@
<string>&amp;Integer scale</string>
</property>
</action>
<action name="actionFullScreen_int43">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>4:&amp;3 Integer scale</string>
</property>
</action>
<action name="actionInverted_VGA_monitor">
<property name="checkable">
<bool>true</bool>

7
src/qt/qt_renderercommon.cpp
View File

@@ -76,7 +76,12 @@ RendererCommon::onResize(int width, int height)
switch (video_fullscreen_scale) {
case FULLSCR_SCALE_INT:
gsr = gw / gh;
case FULLSCR_SCALE_INT43:
if (video_fullscreen_scale == FULLSCR_SCALE_INT43)
gsr = 4.0 / 3.0;
else
gsr = gw / gh;
if (gsr <= hsr) {
dw = hh * gsr;
dh = hh;