mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #5861 from lemondrops/patch-9a

Browse Source 
Two fixes to the keybind UI
This commit is contained in:
Miran Grča
2025-08-01 17:15:02 +02:00
committed by GitHub
parent a16f28fab5 daba54cb84
commit 9b8a2b8361
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/qt_settingsinput.cpp
View File

@@ -21,6 +21,7 @@
#include <QDebug>
#include <QKeySequence>
#include <QMessageBox>
#include <string>
extern "C" {
@@ -56,7 +57,7 @@ SettingsInput::SettingsInput(QWidget *parent)
horizontalHeader.append(tr("Keybind"));
QTableWidget *keyTable = ui->tableKeys;
keyTable->setRowCount(10);
keyTable->setRowCount(NUM_ACCELS);
keyTable->setColumnCount(3);
keyTable->setColumnHidden(2, true);
keyTable->setColumnWidth(0, 200);
@@ -236,7 +237,7 @@ SettingsInput::on_tableKeys_cellDoubleClicked(int row, int col)
for(int x = 0; x < NUM_ACCELS; x++) {
if(QString::fromStdString(acc_keys_t[x].seq) == keyseq.toString(QKeySequence::PortableText)) {
// That key is already in use
main_window->showMessage(MBX_ANSI & MBX_INFO, tr("Bind conflict"), tr("This key combo is already in use."), false);
QMessageBox::warning(this, tr("Bind conflict"), tr("This key combo is already in use."), QMessageBox::StandardButton::Ok);
return;
}
}