ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks to key names and labels for Qt virtual family keyboard.

This commit is contained in:
mjbudd77 2022-03-06 07:41:25 -05:00
parent a9a8898677
commit aaa66388de
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/drivers/Qt/FamilyKeyboard.cpp
View File

@ -317,7 +317,7 @@ void FamilyKeyboardWidget::contextMenuEvent(QContextMenuEvent *event)
QAction *act;
QMenu menu(this);
act = new QAction(tr("Map Key"), &menu);
act = new QAction(tr("Map Key Binding..."), &menu);
//act->setShortcut( QKeySequence(tr("E")));
connect( act, SIGNAL(triggered(void)), this, SLOT(ctxMapPhysicalKey(void)) );
menu.addAction( act );
@ -575,6 +575,7 @@ FKBConfigDialog::FKBConfigDialog(QWidget *parent)
QTreeWidgetItem *item;
QMenuBar *menuBar;
QSettings settings;
char stmp[64];
setWindowTitle( "Family Keyboard" );
@ -598,7 +599,7 @@ FKBConfigDialog::FKBConfigDialog(QWidget *parent)
item->setText(0, QString::fromStdString("FKB Key"));
item->setText(1, QString::fromStdString("SDL Binding"));
item->setTextAlignment(0, Qt::AlignLeft);
item->setTextAlignment(1, Qt::AlignCenter);
item->setTextAlignment(1, Qt::AlignLeft);
keyTree->setHeaderItem(item);
@ -606,13 +607,23 @@ FKBConfigDialog::FKBConfigDialog(QWidget *parent)
for (int i=0; i<FAMILYKEYBOARD_NUM_BUTTONS; i++)
{
int j = i*2;
item = new QTreeWidgetItem();
item->setText(0, tr(FamilyKeyBoardNames[i]));
//item->setText(1, tr(FamilyKeyBoardNames[i]));
if ( strcmp( keyNames[j], keyNames[j+1] ) == 0 )
{
sprintf( stmp, " %s ", keyNames[j] );
}
else
{
sprintf( stmp, " %s - %s ", keyNames[j], keyNames[j+1] );
}
item->setText(0, tr(stmp) );
item->setTextAlignment(0, Qt::AlignLeft);
item->setTextAlignment(1, Qt::AlignCenter);
item->setTextAlignment(1, Qt::AlignLeft);
keyTree->addTopLevelItem(item);
}
@ -633,7 +644,8 @@ FKBConfigDialog::FKBConfigDialog(QWidget *parent)
hbox->addStretch(5);
hbox->addWidget( closeButton, 1);
//keyTree->hide();
connect( keyTree, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(keyTreeItemActivated(QTreeWidgetItem*,int) ) );
keyTree->setMinimumHeight(0);
keyTree->setMaximumHeight(0);
@ -790,7 +802,7 @@ void FKBConfigDialog::updateBindingList(void)
{
QTreeWidgetItem *item = keyTree->topLevelItem(i);
item->setText(0, tr(FamilyKeyBoardNames[i]));
//item->setText(0, tr(keyNames[i*2]));
if (fkbmap[i].ButtType == BUTTC_KEYBOARD)
{
@ -844,6 +856,22 @@ void FKBConfigDialog::closeWindow(void)
deleteLater();
}
//----------------------------------------------------------------------------
void FKBConfigDialog::keyTreeItemActivated(QTreeWidgetItem *item, int column)
{
int itemIndex = keyTree->indexOfTopLevelItem( item );
if ( itemIndex < 0 )
{
return;
}
FKBKeyMapDialog *mapDialog = new FKBKeyMapDialog( itemIndex, this );
mapDialog->show();
mapDialog->enterButtonLoop();
updateBindingList();
}
//----------------------------------------------------------------------------
//*********************************************************************************
//****** Key Mapping Window
//*********************************************************************************

1
src/drivers/Qt/FamilyKeyboard.h
View File

@ -164,6 +164,7 @@ private slots:
void toggleTreeView(bool);
void keyTreeResizeDone(void);
void keyTreeHeightChange(const QVariant &);
void keyTreeItemActivated(QTreeWidgetItem *item, int column);
};
int openFamilyKeyboardDialog( QWidget *parent );