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

Added more accelerators for Qt menu items.

This commit is contained in:
mjbudd77 2021-02-16 21:44:47 -05:00
parent 08df12db74
commit 7e3086d92c
8 changed files with 339 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
src/drivers/Qt/ConsoleDebugger.cpp
View File

@ -109,7 +109,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
menuBar = new QMenuBar(this); menuBar = new QMenuBar(this);
// This is needed for menu bar to show up on MacOS // This is needed for menu bar to show up on MacOS
g_config->getOption( "SDL.UseNativeMenuBar", &useNativeMenuBar ); g_config->getOption( "SDL.UseNativeMenuBar", &useNativeMenuBar );
menuBar->setNativeMenuBar( useNativeMenuBar ? true : false ); menuBar->setNativeMenuBar( useNativeMenuBar ? true : false );
@ -118,69 +118,69 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
// Menu Start // Menu Start
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Debug // Debug
debugMenu = menuBar->addMenu(tr("&Debug")); debugMenu = menuBar->addMenu(tr("&Debug"));
// Debug -> Run // Debug -> Run
act = new QAction(tr("Run"), this); act = new QAction(tr("&Run"), this);
act->setShortcut(QKeySequence( tr("F5") ) ); act->setShortcut(QKeySequence( tr("F5") ) );
act->setStatusTip(tr("Run")); act->setStatusTip(tr("Run"));
connect( act, SIGNAL(triggered()), this, SLOT(debugRunCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugRunCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Step Into // Debug -> Step Into
act = new QAction(tr("Step Into"), this); act = new QAction(tr("Step &Into"), this);
act->setShortcut(QKeySequence( tr("F11") ) ); act->setShortcut(QKeySequence( tr("F11") ) );
act->setStatusTip(tr("Step Into")); act->setStatusTip(tr("Step Into"));
connect( act, SIGNAL(triggered()), this, SLOT(debugStepIntoCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugStepIntoCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Step Out // Debug -> Step Out
act = new QAction(tr("Step Out"), this); act = new QAction(tr("&Step Out"), this);
act->setShortcut(QKeySequence( tr("Shift+F11") ) ); act->setShortcut(QKeySequence( tr("Shift+F11") ) );
act->setStatusTip(tr("Step Out")); act->setStatusTip(tr("Step Out"));
connect( act, SIGNAL(triggered()), this, SLOT(debugStepOutCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugStepOutCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Step Over // Debug -> Step Over
act = new QAction(tr("Step Over"), this); act = new QAction(tr("Step &Over"), this);
act->setShortcut(QKeySequence( tr("F10") ) ); act->setShortcut(QKeySequence( tr("F10") ) );
act->setStatusTip(tr("Step Over")); act->setStatusTip(tr("Step Over"));
connect( act, SIGNAL(triggered()), this, SLOT(debugStepOverCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugStepOverCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Run to Selected Line // Debug -> Run to Selected Line
act = new QAction(tr("Run to Selected Line"), this); act = new QAction(tr("Run to S&elected Line"), this);
act->setShortcut(QKeySequence( tr("F1") ) ); act->setShortcut(QKeySequence( tr("F1") ) );
act->setStatusTip(tr("Run to Selected Line")); act->setStatusTip(tr("Run to Selected Line"));
connect( act, SIGNAL(triggered()), this, SLOT(debugRunToCursorCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugRunToCursorCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Run Line // Debug -> Run Line
act = new QAction(tr("Run Line"), this); act = new QAction(tr("Run &Line"), this);
act->setShortcut(QKeySequence( tr("F6") ) ); act->setShortcut(QKeySequence( tr("F6") ) );
act->setStatusTip(tr("Run Line")); act->setStatusTip(tr("Run Line"));
connect( act, SIGNAL(triggered()), this, SLOT(debugRunLineCB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugRunLineCB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Debug -> Run 128 Lines // Debug -> Run 128 Lines
act = new QAction(tr("Run 128 Lines"), this); act = new QAction(tr("Run &128 Lines"), this);
act->setShortcut(QKeySequence( tr("F7") ) ); act->setShortcut(QKeySequence( tr("F7") ) );
act->setStatusTip(tr("Run 128 Lines")); act->setStatusTip(tr("Run 128 Lines"));
connect( act, SIGNAL(triggered()), this, SLOT(debugRunLine128CB(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(debugRunLine128CB(void)) );
debugMenu->addAction(act); debugMenu->addAction(act);
// Options // Options
optMenu = menuBar->addMenu(tr("Options")); optMenu = menuBar->addMenu(tr("&Options"));
// Options -> PC Position // Options -> PC Position
subMenu = optMenu->addMenu(tr("PC Line Positioning")); subMenu = optMenu->addMenu(tr("&PC Line Positioning"));
actGroup = new QActionGroup(this); actGroup = new QActionGroup(this);
actGroup->setExclusive(true); actGroup->setExclusive(true);
@ -188,56 +188,56 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
g_config->getOption( "SDL.DebuggerPCPlacement", &opt ); g_config->getOption( "SDL.DebuggerPCPlacement", &opt );
// Options -> PC Position -> Top Line // Options -> PC Position -> Top Line
act = new QAction(tr("Top Line"), this); act = new QAction(tr("&Top Line"), this);
act->setStatusTip(tr("Top Line")); act->setStatusTip(tr("Top Line"));
act->setCheckable(true); act->setCheckable(true);
act->setChecked( opt == 0 ); act->setChecked( opt == 0 );
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceTop(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceTop(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
// Options -> PC Position -> Upper Mid-Line // Options -> PC Position -> Upper Mid-Line
act = new QAction(tr("Upper Mid-Line"), this); act = new QAction(tr("&Upper Mid-Line"), this);
act->setStatusTip(tr("Upper Mid-Line")); act->setStatusTip(tr("Upper Mid-Line"));
act->setCheckable(true); act->setCheckable(true);
act->setChecked( opt == 1 ); act->setChecked( opt == 1 );
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceUpperMid(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceUpperMid(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
// Options -> PC Position -> Center Line // Options -> PC Position -> Center Line
act = new QAction(tr("Center Line"), this); act = new QAction(tr("&Center Line"), this);
act->setStatusTip(tr("Center Line")); act->setStatusTip(tr("Center Line"));
act->setCheckable(true); act->setCheckable(true);
act->setChecked( opt == 2 ); act->setChecked( opt == 2 );
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceCenter(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceCenter(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
// Options -> PC Position -> Lower Mid-Line // Options -> PC Position -> Lower Mid-Line
act = new QAction(tr("Lower Mid-Line"), this); act = new QAction(tr("&Lower Mid-Line"), this);
act->setStatusTip(tr("Lower Mid-Line")); act->setStatusTip(tr("Lower Mid-Line"));
act->setCheckable(true); act->setCheckable(true);
act->setChecked( opt == 3 ); act->setChecked( opt == 3 );
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceLowerMid(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceLowerMid(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
// Options -> PC Position -> Bottom // Options -> PC Position -> Bottom
act = new QAction(tr("Bottom Line"), this); act = new QAction(tr("&Bottom Line"), this);
act->setStatusTip(tr("Bottom Line")); act->setStatusTip(tr("Bottom Line"));
act->setCheckable(true); act->setCheckable(true);
act->setChecked( opt == 4 ); act->setChecked( opt == 4 );
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceBottom(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceBottom(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
// Options -> PC Position -> Custom Line // Options -> PC Position -> Custom Line
act = new QAction(tr("Custom Line Offset"), this); act = new QAction(tr("Custom Line &Offset"), this);
act->setStatusTip(tr("Custom Line Offset")); act->setStatusTip(tr("Custom Line Offset"));
act->setChecked( opt == 5 ); act->setChecked( opt == 5 );
act->setCheckable(true); act->setCheckable(true);
connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceCustom(void)) ); connect( act, SIGNAL(triggered()), this, SLOT(pcSetPlaceCustom(void)) );
actGroup->addAction(act); actGroup->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
@ -258,7 +258,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
asmLineSelLbl->setWordWrap( true ); asmLineSelLbl->setWordWrap( true );
asmView->setScrollBars( hbar, vbar ); asmView->setScrollBars( hbar, vbar );
grid->addWidget( asmView, 0, 0 ); grid->addWidget( asmView, 0, 0 );
grid->addWidget( vbar , 0, 1 ); grid->addWidget( vbar , 0, 1 );
@ -293,31 +293,31 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
button = new QPushButton( tr("Run") ); button = new QPushButton( tr("Run") );
grid->addWidget( button, 0, 0, Qt::AlignLeft ); grid->addWidget( button, 0, 0, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunCB(void)) );
button = new QPushButton( tr("Step Into") ); button = new QPushButton( tr("Step Into") );
grid->addWidget( button, 0, 1, Qt::AlignLeft ); grid->addWidget( button, 0, 1, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepIntoCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepIntoCB(void)) );
button = new QPushButton( tr("Step Out") ); button = new QPushButton( tr("Step Out") );
grid->addWidget( button, 1, 0, Qt::AlignLeft ); grid->addWidget( button, 1, 0, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepOutCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepOutCB(void)) );
button = new QPushButton( tr("Step Over") ); button = new QPushButton( tr("Step Over") );
grid->addWidget( button, 1, 1, Qt::AlignLeft ); grid->addWidget( button, 1, 1, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepOverCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugStepOverCB(void)) );
button = new QPushButton( tr("Run Line") ); button = new QPushButton( tr("Run Line") );
grid->addWidget( button, 2, 0, Qt::AlignLeft ); grid->addWidget( button, 2, 0, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunLineCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunLineCB(void)) );
button = new QPushButton( tr("128 Lines") ); button = new QPushButton( tr("128 Lines") );
grid->addWidget( button, 2, 1, Qt::AlignLeft ); grid->addWidget( button, 2, 1, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunLine128CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(debugRunLine128CB(void)) );
button = new QPushButton( tr("Seek To:") ); button = new QPushButton( tr("Seek To:") );
grid->addWidget( button, 3, 0, Qt::AlignLeft ); grid->addWidget( button, 3, 0, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(seekToCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(seekToCB(void)) );
seekEntry = new QLineEdit(); seekEntry = new QLineEdit();
seekEntry->setFont( font ); seekEntry->setFont( font );
@ -342,7 +342,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
button = new QPushButton( tr("Seek PC") ); button = new QPushButton( tr("Seek PC") );
grid->addWidget( button, 4, 1, Qt::AlignLeft ); grid->addWidget( button, 4, 1, Qt::AlignLeft );
connect( button, SIGNAL(clicked(void)), this, SLOT(seekPCCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(seekPCCB(void)) );
hbox = new QHBoxLayout(); hbox = new QHBoxLayout();
lbl = new QLabel( tr("A:") ); lbl = new QLabel( tr("A:") );
@ -421,19 +421,19 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
hbox = new QHBoxLayout(); hbox = new QHBoxLayout();
button = new QPushButton( tr("Add") ); button = new QPushButton( tr("Add") );
hbox->addWidget( button ); hbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(add_BP_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(add_BP_CB(void)) );
button = new QPushButton( tr("Delete") ); button = new QPushButton( tr("Delete") );
hbox->addWidget( button ); hbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(delete_BP_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(delete_BP_CB(void)) );
button = new QPushButton( tr("Edit") ); button = new QPushButton( tr("Edit") );
hbox->addWidget( button ); hbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(edit_BP_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(edit_BP_CB(void)) );
brkBadOpsCbox = new QCheckBox( tr("Break on Bad Opcodes") ); brkBadOpsCbox = new QCheckBox( tr("Break on Bad Opcodes") );
brkBadOpsCbox->setChecked( FCEUI_Debugger().badopbreak ); brkBadOpsCbox->setChecked( FCEUI_Debugger().badopbreak );
connect( brkBadOpsCbox, SIGNAL(stateChanged(int)), this, SLOT(breakOnBadOpcodeCB(int)) ); connect( brkBadOpsCbox, SIGNAL(stateChanged(int)), this, SLOT(breakOnBadOpcodeCB(int)) );
vbox->addWidget( bpTree ); vbox->addWidget( bpTree );
vbox->addLayout( hbox ); vbox->addLayout( hbox );
@ -516,7 +516,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
cpuCycExdVal->setValidator( validator ); cpuCycExdVal->setValidator( validator );
cpuCycExdVal->setAlignment(Qt::AlignLeft); cpuCycExdVal->setAlignment(Qt::AlignLeft);
cpuCycExdVal->setMaximumWidth( 18 * fontCharWidth ); cpuCycExdVal->setMaximumWidth( 18 * fontCharWidth );
cpuCycExdVal->setCursorPosition(0); cpuCycExdVal->setCursorPosition(0);
connect( cpuCycExdVal, SIGNAL(textEdited(const QString &)), this, SLOT(cpuCycleThresChanged(const QString &))); connect( cpuCycExdVal, SIGNAL(textEdited(const QString &)), this, SLOT(cpuCycleThresChanged(const QString &)));
validator = new fceuDecIntValidtor( 0, 0x3FFFFFFF, this ); validator = new fceuDecIntValidtor( 0, 0x3FFFFFFF, this );
@ -525,14 +525,14 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
instrExdVal->setValidator( validator ); instrExdVal->setValidator( validator );
instrExdVal->setAlignment(Qt::AlignLeft); instrExdVal->setAlignment(Qt::AlignLeft);
instrExdVal->setMaximumWidth( 18 * fontCharWidth ); instrExdVal->setMaximumWidth( 18 * fontCharWidth );
instrExdVal->setCursorPosition(0); instrExdVal->setCursorPosition(0);
connect( instrExdVal, SIGNAL(textEdited(const QString &)), this, SLOT(instructionsThresChanged(const QString &))); connect( instrExdVal, SIGNAL(textEdited(const QString &)), this, SLOT(instructionsThresChanged(const QString &)));
brkCpuCycExd->setChecked( break_on_cycles ); brkCpuCycExd->setChecked( break_on_cycles );
connect( brkCpuCycExd, SIGNAL(stateChanged(int)), this, SLOT(breakOnCyclesCB(int)) ); connect( brkCpuCycExd, SIGNAL(stateChanged(int)), this, SLOT(breakOnCyclesCB(int)) );
brkInstrsExd->setChecked( break_on_instructions ); brkInstrsExd->setChecked( break_on_instructions );
connect( brkInstrsExd, SIGNAL(stateChanged(int)), this, SLOT(breakOnInstructionsCB(int)) ); connect( brkInstrsExd, SIGNAL(stateChanged(int)), this, SLOT(breakOnInstructionsCB(int)) );
hbox3 = new QHBoxLayout(); hbox3 = new QHBoxLayout();
hbox = new QHBoxLayout(); hbox = new QHBoxLayout();
@ -568,15 +568,15 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
button = new QPushButton( tr("Add") ); button = new QPushButton( tr("Add") );
vbox->addWidget( button ); vbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(add_BM_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(add_BM_CB(void)) );
button = new QPushButton( tr("Delete") ); button = new QPushButton( tr("Delete") );
vbox->addWidget( button ); vbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(delete_BM_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(delete_BM_CB(void)) );
button = new QPushButton( tr("Name") ); button = new QPushButton( tr("Name") );
vbox->addWidget( button ); vbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(edit_BM_CB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(edit_BM_CB(void)) );
hbox->addWidget( bmTree ); hbox->addWidget( bmTree );
hbox->addLayout( vbox ); hbox->addLayout( vbox );
@ -587,7 +587,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
frame = new QFrame(); frame = new QFrame();
vbox = new QVBoxLayout(); vbox = new QVBoxLayout();
button = new QPushButton( tr("Reset Counters") ); button = new QPushButton( tr("Reset Counters") );
connect( button, SIGNAL(clicked(void)), this, SLOT(resetCountersCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(resetCountersCB(void)) );
vbox->addWidget( button ); vbox->addWidget( button );
vbox->addWidget( frame ); vbox->addWidget( frame );
hbox3->addLayout( vbox ); hbox3->addLayout( vbox );
@ -603,14 +603,14 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
symDbgChkBox->setChecked(true); symDbgChkBox->setChecked(true);
regNamChkBox->setChecked(true); regNamChkBox->setChecked(true);
connect( romOfsChkBox, SIGNAL(stateChanged(int)), this, SLOT(displayROMoffsetCB(int)) ); connect( romOfsChkBox, SIGNAL(stateChanged(int)), this, SLOT(displayROMoffsetCB(int)) );
connect( symDbgChkBox, SIGNAL(stateChanged(int)), this, SLOT(symbolDebugEnableCB(int)) ); connect( symDbgChkBox, SIGNAL(stateChanged(int)), this, SLOT(symbolDebugEnableCB(int)) );
connect( regNamChkBox, SIGNAL(stateChanged(int)), this, SLOT(registerNameEnableCB(int)) ); connect( regNamChkBox, SIGNAL(stateChanged(int)), this, SLOT(registerNameEnableCB(int)) );
button = new QPushButton( tr("Reload Symbols") ); button = new QPushButton( tr("Reload Symbols") );
vbox->addWidget( button ); vbox->addWidget( button );
connect( button, SIGNAL(clicked(void)), this, SLOT(reloadSymbolsCB(void)) ); connect( button, SIGNAL(clicked(void)), this, SLOT(reloadSymbolsCB(void)) );
button = new QPushButton( tr("ROM Patcher") ); button = new QPushButton( tr("ROM Patcher") );
vbox->addWidget( button ); vbox->addWidget( button );
@ -637,8 +637,8 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
g_config->getOption( "SDL.AutoLoadDebugFiles", &opt ); g_config->getOption( "SDL.AutoLoadDebugFiles", &opt );
debFileChkBox->setChecked( opt ); debFileChkBox->setChecked( opt );
connect( autoOpenChkBox, SIGNAL(stateChanged(int)), this, SLOT(autoOpenDebugCB(int)) ); connect( autoOpenChkBox, SIGNAL(stateChanged(int)), this, SLOT(autoOpenDebugCB(int)) );
connect( debFileChkBox , SIGNAL(stateChanged(int)), this, SLOT(debFileAutoLoadCB(int)) ); connect( debFileChkBox , SIGNAL(stateChanged(int)), this, SLOT(debFileAutoLoadCB(int)) );
button->setEnabled(false); // TODO button->setEnabled(false); // TODO
@ -657,9 +657,9 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
periodicTimer = new QTimer( this ); periodicTimer = new QTimer( this );
connect( periodicTimer, &QTimer::timeout, this, &ConsoleDebugger::updatePeriodic ); connect( periodicTimer, &QTimer::timeout, this, &ConsoleDebugger::updatePeriodic );
connect( hbar, SIGNAL(valueChanged(int)), this, SLOT(hbarChanged(int)) ); connect( hbar, SIGNAL(valueChanged(int)), this, SLOT(hbarChanged(int)) );
connect( vbar, SIGNAL(valueChanged(int)), this, SLOT(vbarChanged(int)) ); connect( vbar, SIGNAL(valueChanged(int)), this, SLOT(vbarChanged(int)) );
bpListUpdate( false ); bpListUpdate( false );

138
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -309,7 +309,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu = menubar->addMenu(tr("&File")); fileMenu = menubar->addMenu(tr("&File"));
// File -> Open ROM // File -> Open ROM
openROM = new QAction(tr("Open ROM"), this); openROM = new QAction(tr("&Open ROM"), this);
openROM->setShortcuts(QKeySequence::Open); openROM->setShortcuts(QKeySequence::Open);
openROM->setStatusTip(tr("Open ROM File")); openROM->setStatusTip(tr("Open ROM File"));
//openROM->setIcon( QIcon(":icons/rom.png") ); //openROM->setIcon( QIcon(":icons/rom.png") );
@ -320,7 +320,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(openROM); fileMenu->addAction(openROM);
// File -> Close ROM // File -> Close ROM
closeROM = new QAction(tr("Close ROM"), this); closeROM = new QAction(tr("&Close ROM"), this);
closeROM->setShortcut( QKeySequence(tr("Ctrl+C"))); closeROM->setShortcut( QKeySequence(tr("Ctrl+C")));
closeROM->setStatusTip(tr("Close Loaded ROM")); closeROM->setStatusTip(tr("Close Loaded ROM"));
closeROM->setIcon( style->standardIcon( QStyle::SP_BrowserStop ) ); closeROM->setIcon( style->standardIcon( QStyle::SP_BrowserStop ) );
@ -331,7 +331,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addSeparator(); fileMenu->addSeparator();
// File -> Play NSF // File -> Play NSF
playNSF = new QAction(tr("Play NSF"), this); playNSF = new QAction(tr("Play &NSF"), this);
playNSF->setShortcut( QKeySequence(tr("Ctrl+N"))); playNSF->setShortcut( QKeySequence(tr("Ctrl+N")));
playNSF->setStatusTip(tr("Play NSF")); playNSF->setStatusTip(tr("Play NSF"));
connect(playNSF, SIGNAL(triggered()), this, SLOT(loadNSF(void)) ); connect(playNSF, SIGNAL(triggered()), this, SLOT(loadNSF(void)) );
@ -341,7 +341,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addSeparator(); fileMenu->addSeparator();
// File -> Load State From // File -> Load State From
loadStateAct = new QAction(tr("Load State From"), this); loadStateAct = new QAction(tr("Load State &From"), this);
//loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N"))); //loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N")));
loadStateAct->setStatusTip(tr("Load State From")); loadStateAct->setStatusTip(tr("Load State From"));
loadStateAct->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) ); loadStateAct->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) );
@ -350,7 +350,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(loadStateAct); fileMenu->addAction(loadStateAct);
// File -> Save State As // File -> Save State As
saveStateAct = new QAction(tr("Save State As"), this); saveStateAct = new QAction(tr("Save State &As"), this);
//loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N"))); //loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N")));
saveStateAct->setStatusTip(tr("Save State As")); saveStateAct->setStatusTip(tr("Save State As"));
saveStateAct->setIcon( style->standardIcon( QStyle::SP_DialogSaveButton ) ); saveStateAct->setIcon( style->standardIcon( QStyle::SP_DialogSaveButton ) );
@ -359,7 +359,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(saveStateAct); fileMenu->addAction(saveStateAct);
// File -> Quick Load // File -> Quick Load
quickLoadAct = new QAction(tr("Quick Load"), this); quickLoadAct = new QAction(tr("Quick &Load"), this);
quickLoadAct->setShortcut( QKeySequence(tr("F7"))); quickLoadAct->setShortcut( QKeySequence(tr("F7")));
quickLoadAct->setStatusTip(tr("Quick Load")); quickLoadAct->setStatusTip(tr("Quick Load"));
connect(quickLoadAct, SIGNAL(triggered()), this, SLOT(quickLoad(void)) ); connect(quickLoadAct, SIGNAL(triggered()), this, SLOT(quickLoad(void)) );
@ -367,7 +367,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(quickLoadAct); fileMenu->addAction(quickLoadAct);
// File -> Quick Save // File -> Quick Save
quickSaveAct = new QAction(tr("Quick Save"), this); quickSaveAct = new QAction(tr("Quick &Save"), this);
quickSaveAct->setShortcut( QKeySequence(tr("F5"))); quickSaveAct->setShortcut( QKeySequence(tr("F5")));
quickSaveAct->setStatusTip(tr("Quick Save")); quickSaveAct->setStatusTip(tr("Quick Save"));
connect(quickSaveAct, SIGNAL(triggered()), this, SLOT(quickSave(void)) ); connect(quickSaveAct, SIGNAL(triggered()), this, SLOT(quickSave(void)) );
@ -375,7 +375,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(quickSaveAct); fileMenu->addAction(quickSaveAct);
// File -> Change State // File -> Change State
subMenu = fileMenu->addMenu(tr("Change State")); subMenu = fileMenu->addMenu(tr("Change &State"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
@ -384,7 +384,7 @@ void consoleWin_t::createMainMenu(void)
{ {
char stmp[8]; char stmp[8];
sprintf( stmp, "%i", i ); sprintf( stmp, "&%i", i );
state[i] = new QAction(tr(stmp), this); state[i] = new QAction(tr(stmp), this);
state[i]->setCheckable(true); state[i]->setCheckable(true);
@ -409,7 +409,7 @@ void consoleWin_t::createMainMenu(void)
#ifdef _S9XLUA_H #ifdef _S9XLUA_H
// File -> Quick Save // File -> Quick Save
loadLuaAct = new QAction(tr("Load Lua Script"), this); loadLuaAct = new QAction(tr("Load &Lua Script"), this);
//loadLuaAct->setShortcut( QKeySequence(tr("F5"))); //loadLuaAct->setShortcut( QKeySequence(tr("F5")));
loadLuaAct->setStatusTip(tr("Load Lua Script")); loadLuaAct->setStatusTip(tr("Load Lua Script"));
//loadLuaAct->setIcon( QIcon(":icons/lua-logo.png") ); //loadLuaAct->setIcon( QIcon(":icons/lua-logo.png") );
@ -423,7 +423,7 @@ void consoleWin_t::createMainMenu(void)
#endif #endif
// File -> Screenshort // File -> Screenshort
scrShotAct = new QAction(tr("Screenshot"), this); scrShotAct = new QAction(tr("Screens&hot"), this);
scrShotAct->setShortcut( QKeySequence(tr("F12"))); scrShotAct->setShortcut( QKeySequence(tr("F12")));
scrShotAct->setStatusTip(tr("Screenshot")); scrShotAct->setStatusTip(tr("Screenshot"));
scrShotAct->setIcon( QIcon(":icons/camera.png") ); scrShotAct->setIcon( QIcon(":icons/camera.png") );
@ -432,7 +432,7 @@ void consoleWin_t::createMainMenu(void)
fileMenu->addAction(scrShotAct); fileMenu->addAction(scrShotAct);
// File -> Quit // File -> Quit
quitAct = new QAction(tr("Quit"), this); quitAct = new QAction(tr("&Quit"), this);
quitAct->setShortcut( QKeySequence(tr("Ctrl+Q"))); quitAct->setShortcut( QKeySequence(tr("Ctrl+Q")));
quitAct->setStatusTip(tr("Quit the Application")); quitAct->setStatusTip(tr("Quit the Application"));
//quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); //quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) );
@ -446,7 +446,7 @@ void consoleWin_t::createMainMenu(void)
optMenu = menubar->addMenu(tr("&Options")); optMenu = menubar->addMenu(tr("&Options"));
// Options -> Input Config // Options -> Input Config
inputConfig = new QAction(tr("Input Config"), this); inputConfig = new QAction(tr("&Input Config"), this);
//inputConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //inputConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
inputConfig->setStatusTip(tr("Input Configure")); inputConfig->setStatusTip(tr("Input Configure"));
inputConfig->setIcon( QIcon(":icons/input-gaming.png") ); inputConfig->setIcon( QIcon(":icons/input-gaming.png") );
@ -455,7 +455,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(inputConfig); optMenu->addAction(inputConfig);
// Options -> GamePad Config // Options -> GamePad Config
gamePadConfig = new QAction(tr("GamePad Config"), this); gamePadConfig = new QAction(tr("&GamePad Config"), this);
//gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
gamePadConfig->setStatusTip(tr("GamePad Configure")); gamePadConfig->setStatusTip(tr("GamePad Configure"));
gamePadConfig->setIcon( QIcon(":icons/input-gaming-symbolic.png") ); gamePadConfig->setIcon( QIcon(":icons/input-gaming-symbolic.png") );
@ -464,7 +464,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(gamePadConfig); optMenu->addAction(gamePadConfig);
// Options -> Sound Config // Options -> Sound Config
gameSoundConfig = new QAction(tr("Sound Config"), this); gameSoundConfig = new QAction(tr("&Sound Config"), this);
//gameSoundConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //gameSoundConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
gameSoundConfig->setStatusTip(tr("Sound Configure")); gameSoundConfig->setStatusTip(tr("Sound Configure"));
gameSoundConfig->setIcon( style->standardIcon( QStyle::SP_MediaVolume ) ); gameSoundConfig->setIcon( style->standardIcon( QStyle::SP_MediaVolume ) );
@ -473,7 +473,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(gameSoundConfig); optMenu->addAction(gameSoundConfig);
// Options -> Video Config // Options -> Video Config
gameVideoConfig = new QAction(tr("Video Config"), this); gameVideoConfig = new QAction(tr("&Video Config"), this);
//gameVideoConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //gameVideoConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
gameVideoConfig->setStatusTip(tr("Video Preferences")); gameVideoConfig->setStatusTip(tr("Video Preferences"));
gameVideoConfig->setIcon( style->standardIcon( QStyle::SP_ComputerIcon ) ); gameVideoConfig->setIcon( style->standardIcon( QStyle::SP_ComputerIcon ) );
@ -482,7 +482,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(gameVideoConfig); optMenu->addAction(gameVideoConfig);
// Options -> HotKey Config // Options -> HotKey Config
hotkeyConfig = new QAction(tr("Hotkey Config"), this); hotkeyConfig = new QAction(tr("Hot&Key Config"), this);
//hotkeyConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //hotkeyConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
hotkeyConfig->setStatusTip(tr("Hotkey Configure")); hotkeyConfig->setStatusTip(tr("Hotkey Configure"));
hotkeyConfig->setIcon( QIcon(":icons/input-keyboard.png") ); hotkeyConfig->setIcon( QIcon(":icons/input-keyboard.png") );
@ -491,7 +491,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(hotkeyConfig); optMenu->addAction(hotkeyConfig);
// Options -> Palette Config // Options -> Palette Config
paletteConfig = new QAction(tr("Palette Config"), this); paletteConfig = new QAction(tr("&Palette Config"), this);
//paletteConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //paletteConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
paletteConfig->setStatusTip(tr("Palette Configure")); paletteConfig->setStatusTip(tr("Palette Configure"));
paletteConfig->setIcon( QIcon(":icons/graphics-palette.png") ); paletteConfig->setIcon( QIcon(":icons/graphics-palette.png") );
@ -500,7 +500,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(paletteConfig); optMenu->addAction(paletteConfig);
// Options -> GUI Config // Options -> GUI Config
guiConfig = new QAction(tr("GUI Config"), this); guiConfig = new QAction(tr("G&UI Config"), this);
//guiConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //guiConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
guiConfig->setStatusTip(tr("GUI Configure")); guiConfig->setStatusTip(tr("GUI Configure"));
guiConfig->setIcon( style->standardIcon( QStyle::SP_TitleBarNormalButton ) ); guiConfig->setIcon( style->standardIcon( QStyle::SP_TitleBarNormalButton ) );
@ -509,7 +509,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(guiConfig); optMenu->addAction(guiConfig);
// Options -> Timing Config // Options -> Timing Config
timingConfig = new QAction(tr("Timing Config"), this); timingConfig = new QAction(tr("&Timing Config"), this);
//timingConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //timingConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
timingConfig->setStatusTip(tr("Timing Configure")); timingConfig->setStatusTip(tr("Timing Configure"));
timingConfig->setIcon( QIcon(":icons/timer.png") ); timingConfig->setIcon( QIcon(":icons/timer.png") );
@ -518,7 +518,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(timingConfig); optMenu->addAction(timingConfig);
// Options -> Movie Options // Options -> Movie Options
movieConfig = new QAction(tr("Movie Options"), this); movieConfig = new QAction(tr("&Movie Options"), this);
//movieConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); //movieConfig->setShortcut( QKeySequence(tr("Ctrl+C")));
movieConfig->setStatusTip(tr("Movie Options")); movieConfig->setStatusTip(tr("Movie Options"));
movieConfig->setIcon( QIcon(":icons/movie.png") ); movieConfig->setIcon( QIcon(":icons/movie.png") );
@ -527,7 +527,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(movieConfig); optMenu->addAction(movieConfig);
// Options -> Auto-Resume // Options -> Auto-Resume
autoResume = new QAction(tr("Auto-Resume Play"), this); autoResume = new QAction(tr("Auto-&Resume Play"), this);
//autoResume->setShortcut( QKeySequence(tr("Ctrl+C"))); //autoResume->setShortcut( QKeySequence(tr("Ctrl+C")));
autoResume->setCheckable(true); autoResume->setCheckable(true);
autoResume->setStatusTip(tr("Auto-Resume Play")); autoResume->setStatusTip(tr("Auto-Resume Play"));
@ -538,7 +538,7 @@ void consoleWin_t::createMainMenu(void)
optMenu->addSeparator(); optMenu->addSeparator();
// Options -> Full Screen // Options -> Full Screen
fullscreen = new QAction(tr("Fullscreen"), this); fullscreen = new QAction(tr("&Fullscreen"), this);
fullscreen->setShortcut( QKeySequence(tr("Alt+Return"))); fullscreen->setShortcut( QKeySequence(tr("Alt+Return")));
fullscreen->setStatusTip(tr("Fullscreen")); fullscreen->setStatusTip(tr("Fullscreen"));
fullscreen->setIcon( QIcon(":icons/view-fullscreen.png") ); fullscreen->setIcon( QIcon(":icons/view-fullscreen.png") );
@ -547,8 +547,8 @@ void consoleWin_t::createMainMenu(void)
optMenu->addAction(fullscreen); optMenu->addAction(fullscreen);
// Options -> Hide Menu Screen // Options -> Hide Menu Screen
act = new QAction(tr("Hide Menu"), this); act = new QAction(tr("&Hide Menu"), this);
act->setShortcut( QKeySequence(tr("Alt+M"))); act->setShortcut( QKeySequence(tr("Alt+/")));
act->setStatusTip(tr("Hide Menu")); act->setStatusTip(tr("Hide Menu"));
act->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); act->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) );
connect(act, SIGNAL(triggered()), this, SLOT(toggleMenuVis(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(toggleMenuVis(void)) );
@ -560,7 +560,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu = menubar->addMenu(tr("&Emulation")); emuMenu = menubar->addMenu(tr("&Emulation"));
// Emulation -> Power // Emulation -> Power
powerAct = new QAction(tr("Power"), this); powerAct = new QAction(tr("&Power"), this);
//powerAct->setShortcut( QKeySequence(tr("Ctrl+P"))); //powerAct->setShortcut( QKeySequence(tr("Ctrl+P")));
powerAct->setStatusTip(tr("Power On Console")); powerAct->setStatusTip(tr("Power On Console"));
powerAct->setIcon( QIcon(":icons/power.png") ); powerAct->setIcon( QIcon(":icons/power.png") );
@ -569,7 +569,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addAction(powerAct); emuMenu->addAction(powerAct);
// Emulation -> Reset // Emulation -> Reset
resetAct = new QAction(tr("Reset"), this); resetAct = new QAction(tr("&Reset"), this);
//resetAct->setShortcut( QKeySequence(tr("Ctrl+R"))); //resetAct->setShortcut( QKeySequence(tr("Ctrl+R")));
resetAct->setStatusTip(tr("Reset Console")); resetAct->setStatusTip(tr("Reset Console"));
resetAct->setIcon( style->standardIcon( QStyle::SP_DialogResetButton ) ); resetAct->setIcon( style->standardIcon( QStyle::SP_DialogResetButton ) );
@ -578,7 +578,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addAction(resetAct); emuMenu->addAction(resetAct);
// Emulation -> Soft Reset // Emulation -> Soft Reset
sresetAct = new QAction(tr("Soft Reset"), this); sresetAct = new QAction(tr("&Soft Reset"), this);
//sresetAct->setShortcut( QKeySequence(tr("Ctrl+R"))); //sresetAct->setShortcut( QKeySequence(tr("Ctrl+R")));
sresetAct->setStatusTip(tr("Soft Reset of Console")); sresetAct->setStatusTip(tr("Soft Reset of Console"));
sresetAct->setIcon( style->standardIcon( QStyle::SP_BrowserReload ) ); sresetAct->setIcon( style->standardIcon( QStyle::SP_BrowserReload ) );
@ -587,7 +587,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addAction(sresetAct); emuMenu->addAction(sresetAct);
// Emulation -> Pause // Emulation -> Pause
pauseAct = new QAction(tr("Pause"), this); pauseAct = new QAction(tr("&Pause"), this);
pauseAct->setShortcut( QKeySequence(tr("Pause"))); pauseAct->setShortcut( QKeySequence(tr("Pause")));
pauseAct->setStatusTip(tr("Pause Console")); pauseAct->setStatusTip(tr("Pause Console"));
pauseAct->setIcon( style->standardIcon( QStyle::SP_MediaPause ) ); pauseAct->setIcon( style->standardIcon( QStyle::SP_MediaPause ) );
@ -598,7 +598,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addSeparator(); emuMenu->addSeparator();
// Emulation -> Enable Game Genie // Emulation -> Enable Game Genie
gameGenieAct = new QAction(tr("Enable Game Genie"), this); gameGenieAct = new QAction(tr("Enable Game &Genie"), this);
//gameGenieAct->setShortcut( QKeySequence(tr("Ctrl+G"))); //gameGenieAct->setShortcut( QKeySequence(tr("Ctrl+G")));
gameGenieAct->setCheckable(true); gameGenieAct->setCheckable(true);
gameGenieAct->setStatusTip(tr("Enable Game Genie")); gameGenieAct->setStatusTip(tr("Enable Game Genie"));
@ -619,7 +619,7 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addSeparator(); emuMenu->addSeparator();
// Emulation -> Insert Coin // Emulation -> Insert Coin
insCoinAct = new QAction(tr("Insert Coin"), this); insCoinAct = new QAction(tr("&Insert Coin"), this);
//insCoinAct->setShortcut( QKeySequence(tr("Ctrl+G"))); //insCoinAct->setShortcut( QKeySequence(tr("Ctrl+G")));
insCoinAct->setStatusTip(tr("Insert Coin")); insCoinAct->setStatusTip(tr("Insert Coin"));
connect(insCoinAct, SIGNAL(triggered()), this, SLOT(insertCoin(void)) ); connect(insCoinAct, SIGNAL(triggered()), this, SLOT(insertCoin(void)) );
@ -629,10 +629,10 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addSeparator(); emuMenu->addSeparator();
// Emulation -> FDS // Emulation -> FDS
subMenu = emuMenu->addMenu(tr("FDS")); subMenu = emuMenu->addMenu(tr("&FDS"));
// Emulation -> FDS -> Switch Disk // Emulation -> FDS -> Switch Disk
fdsSwitchAct = new QAction(tr("Switch Disk"), this); fdsSwitchAct = new QAction(tr("&Switch Disk"), this);
//fdsSwitchAct->setShortcut( QKeySequence(tr("Ctrl+G"))); //fdsSwitchAct->setShortcut( QKeySequence(tr("Ctrl+G")));
fdsSwitchAct->setStatusTip(tr("Switch Disk")); fdsSwitchAct->setStatusTip(tr("Switch Disk"));
connect(fdsSwitchAct, SIGNAL(triggered()), this, SLOT(fdsSwitchDisk(void)) ); connect(fdsSwitchAct, SIGNAL(triggered()), this, SLOT(fdsSwitchDisk(void)) );
@ -640,7 +640,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(fdsSwitchAct); subMenu->addAction(fdsSwitchAct);
// Emulation -> FDS -> Eject Disk // Emulation -> FDS -> Eject Disk
fdsEjectAct = new QAction(tr("Eject Disk"), this); fdsEjectAct = new QAction(tr("&Eject Disk"), this);
//fdsEjectAct->setShortcut( QKeySequence(tr("Ctrl+G"))); //fdsEjectAct->setShortcut( QKeySequence(tr("Ctrl+G")));
fdsEjectAct->setStatusTip(tr("Eject Disk")); fdsEjectAct->setStatusTip(tr("Eject Disk"));
connect(fdsEjectAct, SIGNAL(triggered()), this, SLOT(fdsEjectDisk(void)) ); connect(fdsEjectAct, SIGNAL(triggered()), this, SLOT(fdsEjectDisk(void)) );
@ -648,7 +648,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(fdsEjectAct); subMenu->addAction(fdsEjectAct);
// Emulation -> FDS -> Load BIOS // Emulation -> FDS -> Load BIOS
fdsLoadBiosAct = new QAction(tr("Load BIOS"), this); fdsLoadBiosAct = new QAction(tr("&Load BIOS"), this);
//fdsLoadBiosAct->setShortcut( QKeySequence(tr("Ctrl+G"))); //fdsLoadBiosAct->setShortcut( QKeySequence(tr("Ctrl+G")));
fdsLoadBiosAct->setStatusTip(tr("Load BIOS")); fdsLoadBiosAct->setStatusTip(tr("Load BIOS"));
connect(fdsLoadBiosAct, SIGNAL(triggered()), this, SLOT(fdsLoadBiosFile(void)) ); connect(fdsLoadBiosAct, SIGNAL(triggered()), this, SLOT(fdsLoadBiosFile(void)) );
@ -658,10 +658,10 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addSeparator(); emuMenu->addSeparator();
// Emulation -> Speed // Emulation -> Speed
subMenu = emuMenu->addMenu(tr("Speed")); subMenu = emuMenu->addMenu(tr("&Speed"));
// Emulation -> Speed -> Speed Up // Emulation -> Speed -> Speed Up
act = new QAction(tr("Speed Up"), this); act = new QAction(tr("Speed &Up"), this);
act->setShortcut( QKeySequence(tr("="))); act->setShortcut( QKeySequence(tr("=")));
act->setStatusTip(tr("Speed Up")); act->setStatusTip(tr("Speed Up"));
act->setIcon( style->standardIcon( QStyle::SP_MediaSeekForward ) ); act->setIcon( style->standardIcon( QStyle::SP_MediaSeekForward ) );
@ -670,7 +670,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(act); subMenu->addAction(act);
// Emulation -> Speed -> Slow Down // Emulation -> Speed -> Slow Down
act = new QAction(tr("Slow Down"), this); act = new QAction(tr("Slow &Down"), this);
act->setShortcut( QKeySequence(tr("-"))); act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Slow Down")); act->setStatusTip(tr("Slow Down"));
act->setIcon( style->standardIcon( QStyle::SP_MediaSeekBackward ) ); act->setIcon( style->standardIcon( QStyle::SP_MediaSeekBackward ) );
@ -681,7 +681,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addSeparator(); subMenu->addSeparator();
// Emulation -> Speed -> Slowest Speed // Emulation -> Speed -> Slowest Speed
act = new QAction(tr("Slowest"), this); act = new QAction(tr("&Slowest"), this);
//act->setShortcut( QKeySequence(tr("-"))); //act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Slowest")); act->setStatusTip(tr("Slowest"));
act->setIcon( style->standardIcon( QStyle::SP_MediaSkipBackward ) ); act->setIcon( style->standardIcon( QStyle::SP_MediaSkipBackward ) );
@ -690,7 +690,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(act); subMenu->addAction(act);
// Emulation -> Speed -> Normal Speed // Emulation -> Speed -> Normal Speed
act = new QAction(tr("Normal"), this); act = new QAction(tr("&Normal"), this);
//act->setShortcut( QKeySequence(tr("-"))); //act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Normal")); act->setStatusTip(tr("Normal"));
act->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) ); act->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) );
@ -699,7 +699,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(act); subMenu->addAction(act);
// Emulation -> Speed -> Fastest Speed // Emulation -> Speed -> Fastest Speed
act = new QAction(tr("Turbo"), this); act = new QAction(tr("&Turbo"), this);
//act->setShortcut( QKeySequence(tr("-"))); //act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Turbo (Fastest)")); act->setStatusTip(tr("Turbo (Fastest)"));
act->setIcon( style->standardIcon( QStyle::SP_MediaSkipForward ) ); act->setIcon( style->standardIcon( QStyle::SP_MediaSkipForward ) );
@ -708,7 +708,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addAction(act); subMenu->addAction(act);
// Emulation -> Speed -> Custom Speed // Emulation -> Speed -> Custom Speed
act = new QAction(tr("Custom"), this); act = new QAction(tr("&Custom"), this);
//act->setShortcut( QKeySequence(tr("-"))); //act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Custom")); act->setStatusTip(tr("Custom"));
connect(act, SIGNAL(triggered()), this, SLOT(emuCustomSpd(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(emuCustomSpd(void)) );
@ -718,7 +718,7 @@ void consoleWin_t::createMainMenu(void)
subMenu->addSeparator(); subMenu->addSeparator();
// Emulation -> Speed -> Set Frame Advance Delay // Emulation -> Speed -> Set Frame Advance Delay
act = new QAction(tr("Set Frame Advance Delay"), this); act = new QAction(tr("Set Frame &Advance Delay"), this);
//act->setShortcut( QKeySequence(tr("-"))); //act->setShortcut( QKeySequence(tr("-")));
act->setStatusTip(tr("Set Frame Advance Delay")); act->setStatusTip(tr("Set Frame Advance Delay"));
connect(act, SIGNAL(triggered()), this, SLOT(emuSetFrameAdvDelay(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(emuSetFrameAdvDelay(void)) );
@ -728,18 +728,18 @@ void consoleWin_t::createMainMenu(void)
emuMenu->addSeparator(); emuMenu->addSeparator();
// Emulation -> AutoFire Pattern // Emulation -> AutoFire Pattern
subMenu = emuMenu->addMenu(tr("AutoFire Pattern")); subMenu = emuMenu->addMenu(tr("&AutoFire Pattern"));
// Emulation -> AutoFire Pattern -> # On Frames // Emulation -> AutoFire Pattern -> # On Frames
act = new QAction(tr("# On Frames"), this); act = new QAction(tr("# O&N Frames"), this);
act->setStatusTip(tr("# On Frames")); act->setStatusTip(tr("# ON Frames"));
connect(act, SIGNAL(triggered()), this, SLOT(setAutoFireOnFrames(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(setAutoFireOnFrames(void)) );
subMenu->addAction(act); subMenu->addAction(act);
// Emulation -> AutoFire Pattern -> # Off Frames // Emulation -> AutoFire Pattern -> # Off Frames
act = new QAction(tr("# Off Frames"), this); act = new QAction(tr("# O&FF Frames"), this);
act->setStatusTip(tr("# Off Frames")); act->setStatusTip(tr("# OFF Frames"));
connect(act, SIGNAL(triggered()), this, SLOT(setAutoFireOffFrames(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(setAutoFireOffFrames(void)) );
subMenu->addAction(act); subMenu->addAction(act);
@ -749,7 +749,7 @@ void consoleWin_t::createMainMenu(void)
toolsMenu = menubar->addMenu(tr("&Tools")); toolsMenu = menubar->addMenu(tr("&Tools"));
// Tools -> Cheats // Tools -> Cheats
cheatsAct = new QAction(tr("Cheats..."), this); cheatsAct = new QAction(tr("&Cheats..."), this);
//cheatsAct->setShortcut( QKeySequence(tr("Shift+F7"))); //cheatsAct->setShortcut( QKeySequence(tr("Shift+F7")));
cheatsAct->setStatusTip(tr("Open Cheat Window")); cheatsAct->setStatusTip(tr("Open Cheat Window"));
connect(cheatsAct, SIGNAL(triggered()), this, SLOT(openCheats(void)) ); connect(cheatsAct, SIGNAL(triggered()), this, SLOT(openCheats(void)) );
@ -757,7 +757,7 @@ void consoleWin_t::createMainMenu(void)
toolsMenu->addAction(cheatsAct); toolsMenu->addAction(cheatsAct);
// Tools -> RAM Search // Tools -> RAM Search
ramSearchAct = new QAction(tr("RAM Search..."), this); ramSearchAct = new QAction(tr("RAM &Search..."), this);
//ramSearchAct->setShortcut( QKeySequence(tr("Shift+F7"))); //ramSearchAct->setShortcut( QKeySequence(tr("Shift+F7")));
ramSearchAct->setStatusTip(tr("Open RAM Search Window")); ramSearchAct->setStatusTip(tr("Open RAM Search Window"));
connect(ramSearchAct, SIGNAL(triggered()), this, SLOT(openRamSearch(void)) ); connect(ramSearchAct, SIGNAL(triggered()), this, SLOT(openRamSearch(void)) );
@ -765,7 +765,7 @@ void consoleWin_t::createMainMenu(void)
toolsMenu->addAction(ramSearchAct); toolsMenu->addAction(ramSearchAct);
// Tools -> RAM Watch // Tools -> RAM Watch
ramWatchAct = new QAction(tr("RAM Watch..."), this); ramWatchAct = new QAction(tr("RAM &Watch..."), this);
//ramWatchAct->setShortcut( QKeySequence(tr("Shift+F7"))); //ramWatchAct->setShortcut( QKeySequence(tr("Shift+F7")));
ramWatchAct->setStatusTip(tr("Open RAM Watch Window")); ramWatchAct->setStatusTip(tr("Open RAM Watch Window"));
connect(ramWatchAct, SIGNAL(triggered()), this, SLOT(openRamWatch(void)) ); connect(ramWatchAct, SIGNAL(triggered()), this, SLOT(openRamWatch(void)) );
@ -773,7 +773,7 @@ void consoleWin_t::createMainMenu(void)
toolsMenu->addAction(ramWatchAct); toolsMenu->addAction(ramWatchAct);
// Tools -> Frame Timing // Tools -> Frame Timing
act = new QAction(tr("Frame Timing ..."), this); act = new QAction(tr("&Frame Timing ..."), this);
//act->setShortcut( QKeySequence(tr("Shift+F7"))); //act->setShortcut( QKeySequence(tr("Shift+F7")));
act->setStatusTip(tr("Open Frame Timing Window")); act->setStatusTip(tr("Open Frame Timing Window"));
connect(act, SIGNAL(triggered()), this, SLOT(openTimingStatWin(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(openTimingStatWin(void)) );
@ -781,7 +781,7 @@ void consoleWin_t::createMainMenu(void)
toolsMenu->addAction(act); toolsMenu->addAction(act);
// Tools -> Palette Editor // Tools -> Palette Editor
act = new QAction(tr("Palette Editor ..."), this); act = new QAction(tr("&Palette Editor ..."), this);
//act->setShortcut( QKeySequence(tr("Shift+F7"))); //act->setShortcut( QKeySequence(tr("Shift+F7")));
act->setStatusTip(tr("Open Palette Editor Window")); act->setStatusTip(tr("Open Palette Editor Window"));
connect(act, SIGNAL(triggered()), this, SLOT(openPaletteEditorWin(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(openPaletteEditorWin(void)) );
@ -793,7 +793,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu = menubar->addMenu(tr("&Debug")); debugMenu = menubar->addMenu(tr("&Debug"));
// Debug -> Debugger // Debug -> Debugger
debuggerAct = new QAction(tr("Debugger..."), this); debuggerAct = new QAction(tr("&Debugger..."), this);
//debuggerAct->setShortcut( QKeySequence(tr("Shift+F7"))); //debuggerAct->setShortcut( QKeySequence(tr("Shift+F7")));
debuggerAct->setStatusTip(tr("Open 6502 Debugger")); debuggerAct->setStatusTip(tr("Open 6502 Debugger"));
connect(debuggerAct, SIGNAL(triggered()), this, SLOT(openDebugWindow(void)) ); connect(debuggerAct, SIGNAL(triggered()), this, SLOT(openDebugWindow(void)) );
@ -801,7 +801,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(debuggerAct); debugMenu->addAction(debuggerAct);
// Debug -> Hex Editor // Debug -> Hex Editor
hexEditAct = new QAction(tr("Hex Editor..."), this); hexEditAct = new QAction(tr("&Hex Editor..."), this);
//hexEditAct->setShortcut( QKeySequence(tr("Shift+F7"))); //hexEditAct->setShortcut( QKeySequence(tr("Shift+F7")));
hexEditAct->setStatusTip(tr("Open Memory Hex Editor")); hexEditAct->setStatusTip(tr("Open Memory Hex Editor"));
connect(hexEditAct, SIGNAL(triggered()), this, SLOT(openHexEditor(void)) ); connect(hexEditAct, SIGNAL(triggered()), this, SLOT(openHexEditor(void)) );
@ -809,7 +809,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(hexEditAct); debugMenu->addAction(hexEditAct);
// Debug -> PPU Viewer // Debug -> PPU Viewer
ppuViewAct = new QAction(tr("PPU Viewer..."), this); ppuViewAct = new QAction(tr("&PPU Viewer..."), this);
//ppuViewAct->setShortcut( QKeySequence(tr("Shift+F7"))); //ppuViewAct->setShortcut( QKeySequence(tr("Shift+F7")));
ppuViewAct->setStatusTip(tr("Open PPU Viewer")); ppuViewAct->setStatusTip(tr("Open PPU Viewer"));
connect(ppuViewAct, SIGNAL(triggered()), this, SLOT(openPPUViewer(void)) ); connect(ppuViewAct, SIGNAL(triggered()), this, SLOT(openPPUViewer(void)) );
@ -817,7 +817,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(ppuViewAct); debugMenu->addAction(ppuViewAct);
// Debug -> Name Table Viewer // Debug -> Name Table Viewer
ntViewAct = new QAction(tr("Name Table Viewer..."), this); ntViewAct = new QAction(tr("&Name Table Viewer..."), this);
//ntViewAct->setShortcut( QKeySequence(tr("Shift+F7"))); //ntViewAct->setShortcut( QKeySequence(tr("Shift+F7")));
ntViewAct->setStatusTip(tr("Open Name Table Viewer")); ntViewAct->setStatusTip(tr("Open Name Table Viewer"));
connect(ntViewAct, SIGNAL(triggered()), this, SLOT(openNTViewer(void)) ); connect(ntViewAct, SIGNAL(triggered()), this, SLOT(openNTViewer(void)) );
@ -825,7 +825,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(ntViewAct); debugMenu->addAction(ntViewAct);
// Debug -> Trace Logger // Debug -> Trace Logger
traceLogAct = new QAction(tr("Trace Logger..."), this); traceLogAct = new QAction(tr("&Trace Logger..."), this);
//traceLogAct->setShortcut( QKeySequence(tr("Shift+F7"))); //traceLogAct->setShortcut( QKeySequence(tr("Shift+F7")));
traceLogAct->setStatusTip(tr("Open Trace Logger")); traceLogAct->setStatusTip(tr("Open Trace Logger"));
connect(traceLogAct, SIGNAL(triggered()), this, SLOT(openTraceLogger(void)) ); connect(traceLogAct, SIGNAL(triggered()), this, SLOT(openTraceLogger(void)) );
@ -833,7 +833,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(traceLogAct); debugMenu->addAction(traceLogAct);
// Debug -> Code/Data Logger // Debug -> Code/Data Logger
codeDataLogAct = new QAction(tr("Code/Data Logger..."), this); codeDataLogAct = new QAction(tr("&Code/Data Logger..."), this);
//codeDataLogAct->setShortcut( QKeySequence(tr("Shift+F7"))); //codeDataLogAct->setShortcut( QKeySequence(tr("Shift+F7")));
codeDataLogAct->setStatusTip(tr("Open Code Data Logger")); codeDataLogAct->setStatusTip(tr("Open Code Data Logger"));
connect(codeDataLogAct, SIGNAL(triggered()), this, SLOT(openCodeDataLogger(void)) ); connect(codeDataLogAct, SIGNAL(triggered()), this, SLOT(openCodeDataLogger(void)) );
@ -841,7 +841,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(codeDataLogAct); debugMenu->addAction(codeDataLogAct);
// Debug -> Game Genie Encode/Decode Viewer // Debug -> Game Genie Encode/Decode Viewer
ggEncodeAct = new QAction(tr("Game Genie Encode/Decode"), this); ggEncodeAct = new QAction(tr("&Game Genie Encode/Decode"), this);
//ggEncodeAct->setShortcut( QKeySequence(tr("Shift+F7"))); //ggEncodeAct->setShortcut( QKeySequence(tr("Shift+F7")));
ggEncodeAct->setStatusTip(tr("Open Game Genie Encode/Decode")); ggEncodeAct->setStatusTip(tr("Open Game Genie Encode/Decode"));
connect(ggEncodeAct, SIGNAL(triggered()), this, SLOT(openGGEncoder(void)) ); connect(ggEncodeAct, SIGNAL(triggered()), this, SLOT(openGGEncoder(void)) );
@ -849,7 +849,7 @@ void consoleWin_t::createMainMenu(void)
debugMenu->addAction(ggEncodeAct); debugMenu->addAction(ggEncodeAct);
// Debug -> iNES Header Editor // Debug -> iNES Header Editor
iNesEditAct = new QAction(tr("iNES Header Editor..."), this); iNesEditAct = new QAction(tr("&iNES Header Editor..."), this);
//iNesEditAct->setShortcut( QKeySequence(tr("Shift+F7"))); //iNesEditAct->setShortcut( QKeySequence(tr("Shift+F7")));
iNesEditAct->setStatusTip(tr("Open iNES Header Editor")); iNesEditAct->setStatusTip(tr("Open iNES Header Editor"));
connect(iNesEditAct, SIGNAL(triggered()), this, SLOT(openNesHeaderEditor(void)) ); connect(iNesEditAct, SIGNAL(triggered()), this, SLOT(openNesHeaderEditor(void)) );
@ -858,10 +858,10 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Movie // Movie
movieMenu = menubar->addMenu(tr("Movie")); movieMenu = menubar->addMenu(tr("&Movie"));
// Movie -> Play // Movie -> Play
openMovAct = new QAction(tr("Play"), this); openMovAct = new QAction(tr("&Play"), this);
openMovAct->setShortcut( QKeySequence(tr("Shift+F7"))); openMovAct->setShortcut( QKeySequence(tr("Shift+F7")));
openMovAct->setStatusTip(tr("Play Movie File")); openMovAct->setStatusTip(tr("Play Movie File"));
openMovAct->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) ); openMovAct->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) );
@ -870,7 +870,7 @@ void consoleWin_t::createMainMenu(void)
movieMenu->addAction(openMovAct); movieMenu->addAction(openMovAct);
// Movie -> Stop // Movie -> Stop
stopMovAct = new QAction(tr("Stop"), this); stopMovAct = new QAction(tr("&Stop"), this);
//stopMovAct->setShortcut( QKeySequence(tr("Shift+F7"))); //stopMovAct->setShortcut( QKeySequence(tr("Shift+F7")));
stopMovAct->setStatusTip(tr("Stop Movie Recording")); stopMovAct->setStatusTip(tr("Stop Movie Recording"));
stopMovAct->setIcon( style->standardIcon( QStyle::SP_MediaStop ) ); stopMovAct->setIcon( style->standardIcon( QStyle::SP_MediaStop ) );
@ -881,7 +881,7 @@ void consoleWin_t::createMainMenu(void)
movieMenu->addSeparator(); movieMenu->addSeparator();
// Movie -> Record // Movie -> Record
recMovAct = new QAction(tr("Record"), this); recMovAct = new QAction(tr("&Record"), this);
recMovAct->setShortcut( QKeySequence(tr("Shift+F5"))); recMovAct->setShortcut( QKeySequence(tr("Shift+F5")));
recMovAct->setStatusTip(tr("Record Movie")); recMovAct->setStatusTip(tr("Record Movie"));
recMovAct->setIcon( QIcon(":icons/media-record.png") ); recMovAct->setIcon( QIcon(":icons/media-record.png") );
@ -890,7 +890,7 @@ void consoleWin_t::createMainMenu(void)
movieMenu->addAction(recMovAct); movieMenu->addAction(recMovAct);
// Movie -> Record As // Movie -> Record As
recAsMovAct = new QAction(tr("Record As"), this); recAsMovAct = new QAction(tr("Record &As"), this);
//recAsMovAct->setShortcut( QKeySequence(tr("Shift+F5"))); //recAsMovAct->setShortcut( QKeySequence(tr("Shift+F5")));
recAsMovAct->setStatusTip(tr("Record Movie")); recAsMovAct->setStatusTip(tr("Record Movie"));
connect(recAsMovAct, SIGNAL(triggered()), this, SLOT(recordMovieAs(void)) ); connect(recAsMovAct, SIGNAL(triggered()), this, SLOT(recordMovieAs(void)) );
@ -902,7 +902,7 @@ void consoleWin_t::createMainMenu(void)
helpMenu = menubar->addMenu(tr("&Help")); helpMenu = menubar->addMenu(tr("&Help"));
// Help -> About FCEUX // Help -> About FCEUX
aboutAct = new QAction(tr("About FCEUX"), this); aboutAct = new QAction(tr("&About FCEUX"), this);
aboutAct->setStatusTip(tr("About FCEUX")); aboutAct->setStatusTip(tr("About FCEUX"));
aboutAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxInformation ) ); aboutAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxInformation ) );
connect(aboutAct, SIGNAL(triggered()), this, SLOT(aboutFCEUX(void)) ); connect(aboutAct, SIGNAL(triggered()), this, SLOT(aboutFCEUX(void)) );
@ -910,7 +910,7 @@ void consoleWin_t::createMainMenu(void)
helpMenu->addAction(aboutAct); helpMenu->addAction(aboutAct);
// Help -> About Qt // Help -> About Qt
aboutActQt = new QAction(tr("About Qt"), this); aboutActQt = new QAction(tr("About &Qt"), this);
aboutActQt->setStatusTip(tr("About Qt")); aboutActQt->setStatusTip(tr("About Qt"));
aboutActQt->setIcon( style->standardIcon( QStyle::SP_TitleBarMenuButton ) ); aboutActQt->setIcon( style->standardIcon( QStyle::SP_TitleBarMenuButton ) );
connect(aboutActQt, SIGNAL(triggered()), this, SLOT(aboutQt(void)) ); connect(aboutActQt, SIGNAL(triggered()), this, SLOT(aboutQt(void)) );
@ -918,7 +918,7 @@ void consoleWin_t::createMainMenu(void)
helpMenu->addAction(aboutActQt); helpMenu->addAction(aboutActQt);
// Help -> Message Log // Help -> Message Log
msgLogAct = new QAction(tr("Message Log"), this); msgLogAct = new QAction(tr("&Message Log"), this);
msgLogAct->setStatusTip(tr("Message Log")); msgLogAct->setStatusTip(tr("Message Log"));
msgLogAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxWarning ) ); msgLogAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxWarning ) );
connect(msgLogAct, SIGNAL(triggered()), this, SLOT(openMsgLogWin(void)) ); connect(msgLogAct, SIGNAL(triggered()), this, SLOT(openMsgLogWin(void)) );

112
src/drivers/Qt/HexEditor.cpp
View File

@ -891,7 +891,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
fileMenu = menuBar->addMenu(tr("&File")); fileMenu = menuBar->addMenu(tr("&File"));
// File -> Save ROM // File -> Save ROM
saveROM = new QAction(tr("Save ROM"), this); saveROM = new QAction(tr("&Save ROM"), this);
//saveROM->setShortcut(QKeySequence::Open); //saveROM->setShortcut(QKeySequence::Open);
saveROM->setStatusTip(tr("Save ROM File")); saveROM->setStatusTip(tr("Save ROM File"));
connect(saveROM, SIGNAL(triggered()), this, SLOT(saveRomFile(void)) ); connect(saveROM, SIGNAL(triggered()), this, SLOT(saveRomFile(void)) );
@ -899,7 +899,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
fileMenu->addAction(saveROM); fileMenu->addAction(saveROM);
// File -> Save ROM As // File -> Save ROM As
saveROM = new QAction(tr("Save ROM As"), this); saveROM = new QAction(tr("Save ROM &As"), this);
//saveROM->setShortcut(QKeySequence::Open); //saveROM->setShortcut(QKeySequence::Open);
saveROM->setStatusTip(tr("Save ROM File As")); saveROM->setStatusTip(tr("Save ROM File As"));
connect(saveROM, SIGNAL(triggered()), this, SLOT(saveRomFileAs(void)) ); connect(saveROM, SIGNAL(triggered()), this, SLOT(saveRomFileAs(void)) );
@ -907,7 +907,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
fileMenu->addAction(saveROM); fileMenu->addAction(saveROM);
// File -> Goto Address // File -> Goto Address
gotoAddrAct = new QAction(tr("Goto Address"), this); gotoAddrAct = new QAction(tr("&Goto Address"), this);
gotoAddrAct->setShortcut(QKeySequence(tr("Ctrl+A"))); gotoAddrAct->setShortcut(QKeySequence(tr("Ctrl+A")));
gotoAddrAct->setStatusTip(tr("Goto Address")); gotoAddrAct->setStatusTip(tr("Goto Address"));
connect(gotoAddrAct, SIGNAL(triggered()), this, SLOT(openGotoAddrDialog(void)) ); connect(gotoAddrAct, SIGNAL(triggered()), this, SLOT(openGotoAddrDialog(void)) );
@ -917,7 +917,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
fileMenu->addSeparator(); fileMenu->addSeparator();
// File -> Close // File -> Close
closeAct = new QAction(tr("Close"), this); closeAct = new QAction(tr("&Close"), this);
closeAct->setShortcut(QKeySequence(tr("Esc"))); closeAct->setShortcut(QKeySequence(tr("Esc")));
closeAct->setStatusTip(tr("Close Window")); closeAct->setStatusTip(tr("Close Window"));
connect(closeAct, SIGNAL(triggered()), this, SLOT(closeWindow(void)) ); connect(closeAct, SIGNAL(triggered()), this, SLOT(closeWindow(void)) );
@ -928,7 +928,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
editMenu = menuBar->addMenu(tr("&Edit")); editMenu = menuBar->addMenu(tr("&Edit"));
// Edit -> Undo // Edit -> Undo
undoEditAct = new QAction(tr("Undo"), this); undoEditAct = new QAction(tr("&Undo"), this);
undoEditAct->setShortcut(QKeySequence(tr("U"))); undoEditAct->setShortcut(QKeySequence(tr("U")));
undoEditAct->setStatusTip(tr("Undo Edit")); undoEditAct->setStatusTip(tr("Undo Edit"));
undoEditAct->setEnabled(false); undoEditAct->setEnabled(false);
@ -938,7 +938,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
editMenu->addSeparator(); editMenu->addSeparator();
// Edit -> Copy // Edit -> Copy
act = new QAction(tr("Copy"), this); act = new QAction(tr("&Copy"), this);
act->setShortcut(QKeySequence(tr("Ctrl+C"))); act->setShortcut(QKeySequence(tr("Ctrl+C")));
act->setStatusTip(tr("Copy")); act->setStatusTip(tr("Copy"));
connect(act, SIGNAL(triggered()), this, SLOT(copyToClipboard(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(copyToClipboard(void)) );
@ -946,7 +946,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
editMenu->addAction(act); editMenu->addAction(act);
// Edit -> Paste // Edit -> Paste
act = new QAction(tr("Paste"), this); act = new QAction(tr("&Paste"), this);
act->setShortcut(QKeySequence(tr("Ctrl+V"))); act->setShortcut(QKeySequence(tr("Ctrl+V")));
act->setStatusTip(tr("Paste")); act->setStatusTip(tr("Paste"));
connect(act, SIGNAL(triggered()), this, SLOT(pasteFromClipboard(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(pasteFromClipboard(void)) );
@ -955,7 +955,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
editMenu->addSeparator(); editMenu->addSeparator();
// Edit -> Find // Edit -> Find
act = new QAction(tr("Find"), this); act = new QAction(tr("&Find"), this);
act->setShortcut(QKeySequence(tr("Ctrl+F"))); act->setShortcut(QKeySequence(tr("Ctrl+F")));
act->setStatusTip(tr("Find")); act->setStatusTip(tr("Find"));
connect(act, SIGNAL(triggered()), this, SLOT(openFindDialog(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(openFindDialog(void)) );
@ -970,7 +970,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
group->setExclusive(true); group->setExclusive(true);
// View -> RAM // View -> RAM
viewRAM = new QAction(tr("RAM"), this); viewRAM = new QAction(tr("&RAM"), this);
//viewRAM->setShortcuts(QKeySequence::Open); //viewRAM->setShortcuts(QKeySequence::Open);
viewRAM->setStatusTip(tr("View RAM")); viewRAM->setStatusTip(tr("View RAM"));
viewRAM->setCheckable(true); viewRAM->setCheckable(true);
@ -980,78 +980,78 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
viewMenu->addAction(viewRAM); viewMenu->addAction(viewRAM);
// View -> PPU // View -> PPU
viewPPU = new QAction(tr("PPU"), this); viewPPU = new QAction(tr("&PPU"), this);
//viewPPU->setShortcuts(QKeySequence::Open); //viewPPU->setShortcuts(QKeySequence::Open);
viewPPU->setStatusTip(tr("View PPU")); viewPPU->setStatusTip(tr("View PPU"));
viewPPU->setCheckable(true); viewPPU->setCheckable(true);
connect(viewPPU, SIGNAL(triggered()), this, SLOT(setViewPPU(void)) ); connect(viewPPU, SIGNAL(triggered()), this, SLOT(setViewPPU(void)) );
group->addAction(viewPPU); group->addAction(viewPPU);
viewMenu->addAction(viewPPU); viewMenu->addAction(viewPPU);
// View -> OAM // View -> OAM
viewOAM = new QAction(tr("OAM"), this); viewOAM = new QAction(tr("&OAM"), this);
//viewOAM->setShortcuts(QKeySequence::Open); //viewOAM->setShortcuts(QKeySequence::Open);
viewOAM->setStatusTip(tr("View OAM")); viewOAM->setStatusTip(tr("View OAM"));
viewOAM->setCheckable(true); viewOAM->setCheckable(true);
connect(viewOAM, SIGNAL(triggered()), this, SLOT(setViewOAM(void)) ); connect(viewOAM, SIGNAL(triggered()), this, SLOT(setViewOAM(void)) );
group->addAction(viewOAM); group->addAction(viewOAM);
viewMenu->addAction(viewOAM); viewMenu->addAction(viewOAM);
// View -> ROM // View -> ROM
viewROM = new QAction(tr("ROM"), this); viewROM = new QAction(tr("&ROM"), this);
//viewROM->setShortcuts(QKeySequence::Open); //viewROM->setShortcuts(QKeySequence::Open);
viewROM->setStatusTip(tr("View ROM")); viewROM->setStatusTip(tr("View ROM"));
viewROM->setCheckable(true); viewROM->setCheckable(true);
connect(viewROM, SIGNAL(triggered()), this, SLOT(setViewROM(void)) ); connect(viewROM, SIGNAL(triggered()), this, SLOT(setViewROM(void)) );
group->addAction(viewROM); group->addAction(viewROM);
viewMenu->addAction(viewROM); viewMenu->addAction(viewROM);
viewRAM->setChecked(true); // Set default view viewRAM->setChecked(true); // Set default view
// Color Menu // Color Menu
colorMenu = menuBar->addMenu(tr("Color")); colorMenu = menuBar->addMenu(tr("&Color"));
// Color -> Highlight Activity // Color -> Highlight Activity
actHlgt = new QAction(tr("Highlight Activity"), this); actHlgt = new QAction(tr("Highlight &Activity"), this);
//actHlgt->setShortcuts(QKeySequence::Open); //actHlgt->setShortcuts(QKeySequence::Open);
actHlgt->setStatusTip(tr("Highlight Activity")); actHlgt->setStatusTip(tr("Highlight Activity"));
actHlgt->setCheckable(true); actHlgt->setCheckable(true);
actHlgt->setChecked(true); actHlgt->setChecked(true);
connect(actHlgt, SIGNAL(triggered(bool)), this, SLOT(actvHighlightCB(bool)) ); connect(actHlgt, SIGNAL(triggered(bool)), this, SLOT(actvHighlightCB(bool)) );
colorMenu->addAction(actHlgt); colorMenu->addAction(actHlgt);
// Color -> Highlight Reverse Video // Color -> Highlight Reverse Video
actHlgtRV = new QAction(tr("Highlight Reverse Video"), this); actHlgtRV = new QAction(tr("Highlight &Reverse Video"), this);
//actHlgtRV->setShortcuts(QKeySequence::Open); //actHlgtRV->setShortcuts(QKeySequence::Open);
actHlgtRV->setStatusTip(tr("Highlight Reverse Video")); actHlgtRV->setStatusTip(tr("Highlight Reverse Video"));
actHlgtRV->setCheckable(true); actHlgtRV->setCheckable(true);
actHlgtRV->setChecked(true); actHlgtRV->setChecked(true);
connect(actHlgtRV, SIGNAL(triggered(bool)), this, SLOT(actvHighlightRVCB(bool)) ); connect(actHlgtRV, SIGNAL(triggered(bool)), this, SLOT(actvHighlightRVCB(bool)) );
colorMenu->addAction(actHlgtRV); colorMenu->addAction(actHlgtRV);
// Color -> ForeGround Color // Color -> ForeGround Color
actColorFG = new QAction(tr("ForeGround Color"), this); actColorFG = new QAction(tr("&ForeGround Color"), this);
//actColorFG->setShortcuts(QKeySequence::Open); //actColorFG->setShortcuts(QKeySequence::Open);
actColorFG->setStatusTip(tr("ForeGround Color")); actColorFG->setStatusTip(tr("ForeGround Color"));
connect(actColorFG, SIGNAL(triggered(void)), this, SLOT(pickForeGroundColor(void)) ); connect(actColorFG, SIGNAL(triggered(void)), this, SLOT(pickForeGroundColor(void)) );
colorMenu->addAction(actColorFG); colorMenu->addAction(actColorFG);
// Color -> BackGround Color // Color -> BackGround Color
actColorBG = new QAction(tr("BackGround Color"), this); actColorBG = new QAction(tr("&BackGround Color"), this);
//actColorBG->setShortcuts(QKeySequence::Open); //actColorBG->setShortcuts(QKeySequence::Open);
actColorBG->setStatusTip(tr("BackGround Color")); actColorBG->setStatusTip(tr("BackGround Color"));
connect(actColorBG, SIGNAL(triggered(void)), this, SLOT(pickBackGroundColor(void)) ); connect(actColorBG, SIGNAL(triggered(void)), this, SLOT(pickBackGroundColor(void)) );
colorMenu->addAction(actColorBG); colorMenu->addAction(actColorBG);
// Bookmarks Menu // Bookmarks Menu
bookmarkMenu = menuBar->addMenu(tr("&Bookmarks")); bookmarkMenu = menuBar->addMenu(tr("&Bookmarks"));
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Menu End // Menu End
@ -1172,12 +1172,12 @@ void HexEditorDialog_t::populateBookmarkMenu(void)
bookmarkMenu->clear(); bookmarkMenu->clear();
// Bookmarks -> Remove All Bookmarks // Bookmarks -> Remove All Bookmarks
act = new QAction(tr("Remove All Bookmarks"), bookmarkMenu); act = new QAction(tr("&Remove All Bookmarks"), bookmarkMenu);
//act->setShortcuts(QKeySequence::Open); //act->setShortcuts(QKeySequence::Open);
act->setStatusTip(tr("Remove All Bookmarks")); act->setStatusTip(tr("Remove All Bookmarks"));
connect(act, SIGNAL(triggered(void)), this, SLOT(removeAllBookmarks(void)) ); connect(act, SIGNAL(triggered(void)), this, SLOT(removeAllBookmarks(void)) );
bookmarkMenu->addAction(act); bookmarkMenu->addAction(act);
bookmarkMenu->addSeparator(); bookmarkMenu->addSeparator();
for (int i=0; i<hbm.size(); i++) for (int i=0; i<hbm.size(); i++)
@ -1188,9 +1188,9 @@ void HexEditorDialog_t::populateBookmarkMenu(void)
{ {
//printf("%p %p \n", b, editor ); //printf("%p %p \n", b, editor );
hAct = new HexBookMarkMenuAction(tr(b->desc), bookmarkMenu); hAct = new HexBookMarkMenuAction(tr(b->desc), bookmarkMenu);
bookmarkMenu->addAction(hAct); bookmarkMenu->addAction(hAct);
hAct->bm = b; hAct->qedit = editor; hAct->bm = b; hAct->qedit = editor;
connect(hAct, SIGNAL(triggered(void)), hAct, SLOT(activateCB(void)) ); connect(hAct, SIGNAL(triggered(void)), hAct, SLOT(activateCB(void)) );
} }
} }
} }

32
src/drivers/Qt/NameTableViewer.cpp
View File

@ -152,7 +152,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu = menuBar->addMenu(tr("&View")); viewMenu = menuBar->addMenu(tr("&View"));
// View -> Show Scroll Lines // View -> Show Scroll Lines
act = new QAction(tr("Show Scroll Lines"), this); act = new QAction(tr("Show &Scroll Lines"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(drawScrollLines); act->setChecked(drawScrollLines);
@ -163,7 +163,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Show Tile Grid // View -> Show Tile Grid
act = new QAction(tr("Show Tile Grid"), this); act = new QAction(tr("Show &Tile Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(drawTileGridLines); act->setChecked(drawTileGridLines);
@ -174,7 +174,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Show Attr Grid // View -> Show Attr Grid
act = new QAction(tr("Show Attr Grid"), this); act = new QAction(tr("Show &Attr Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(drawAttrGridLines); act->setChecked(drawAttrGridLines);
@ -185,7 +185,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Show Attributes // View -> Show Attributes
act = new QAction(tr("Show Attributes"), this); act = new QAction(tr("Show &Attributes"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(attview); act->setChecked(attview);
@ -196,7 +196,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Ignore Palette // View -> Ignore Palette
act = new QAction(tr("Ignore Palette"), this); act = new QAction(tr("&Ignore Palette"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(attview); act->setChecked(attview);
@ -207,7 +207,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Image Zoom // View -> Image Zoom
subMenu = viewMenu->addMenu( tr("Image Zoom")); subMenu = viewMenu->addMenu( tr("Image &Zoom"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
@ -216,7 +216,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
{ {
char stmp[8]; char stmp[8];
sprintf( stmp, "%ix", i+1 ); sprintf( stmp, "&%ix", i+1 );
zoomAct[i] = new QAction(tr(stmp), this); zoomAct[i] = new QAction(tr(stmp), this);
zoomAct[i]->setCheckable(true); zoomAct[i]->setCheckable(true);
@ -234,18 +234,18 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addSeparator(); viewMenu->addSeparator();
// View -> Tile Focus // View -> Tile Focus
subMenu = viewMenu->addMenu( tr("Tile Focus")); subMenu = viewMenu->addMenu( tr("Tile &Focus"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
focusAct[0] = new QAction(tr("Click"), this); focusAct[0] = new QAction(tr("&Click"), this);
focusAct[0]->setCheckable(true); focusAct[0]->setCheckable(true);
group->addAction(focusAct[0]); group->addAction(focusAct[0]);
subMenu->addAction(focusAct[0]); subMenu->addAction(focusAct[0]);
connect(focusAct[0], SIGNAL(triggered()), this, SLOT(setClickFocus(void)) ); connect(focusAct[0], SIGNAL(triggered()), this, SLOT(setClickFocus(void)) );
focusAct[1] = new QAction(tr("Hover"), this); focusAct[1] = new QAction(tr("&Hover"), this);
focusAct[1]->setCheckable(true); focusAct[1]->setCheckable(true);
focusAct[1]->setChecked(false); focusAct[1]->setChecked(false);
group->addAction(focusAct[1]); group->addAction(focusAct[1]);
@ -255,7 +255,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addSeparator(); viewMenu->addSeparator();
// View -> Refresh // View -> Refresh
act = new QAction(tr("Refresh"), this); act = new QAction(tr("&Refresh"), this);
act->setShortcut( QKeySequence(tr("F5") ) ); act->setShortcut( QKeySequence(tr("F5") ) );
act->setStatusTip(tr("Refresh")); act->setStatusTip(tr("Refresh"));
connect(act, SIGNAL(triggered()), this, SLOT(forceRefresh()) ); connect(act, SIGNAL(triggered()), this, SLOT(forceRefresh()) );
@ -263,7 +263,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View -> Auto Refresh Rate // View -> Auto Refresh Rate
subMenu = viewMenu->addMenu( tr("Auto Refresh Rate")); subMenu = viewMenu->addMenu( tr("Auto &Refresh Rate"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
@ -301,10 +301,10 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
connect(rateAct[4], SIGNAL(triggered()), this, SLOT(changeRate16(void)) ); connect(rateAct[4], SIGNAL(triggered()), this, SLOT(changeRate16(void)) );
// Colors // Colors
colorMenu = menuBar->addMenu(tr("Colors")); colorMenu = menuBar->addMenu(tr("&Colors"));
// Colors -> Tile Selector // Colors -> Tile Selector
act = new QAction(tr("Tile Selector"), this); act = new QAction(tr("Tile &Selector"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Selector")); act->setStatusTip(tr("Tile Selector"));
connect(act, SIGNAL(triggered()), this, SLOT(setTileSelectorColor()) ); connect(act, SIGNAL(triggered()), this, SLOT(setTileSelectorColor()) );
@ -312,7 +312,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// Colors -> Tile Grid // Colors -> Tile Grid
act = new QAction(tr("Tile Grid"), this); act = new QAction(tr("Tile &Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Grid")); act->setStatusTip(tr("Tile Grid"));
connect(act, SIGNAL(triggered()), this, SLOT(setTileGridColor()) ); connect(act, SIGNAL(triggered()), this, SLOT(setTileGridColor()) );
@ -320,7 +320,7 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// Colors -> Attr Grid // Colors -> Attr Grid
act = new QAction(tr("Attr Grid"), this); act = new QAction(tr("&Attr Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Attr Grid")); act->setStatusTip(tr("Attr Grid"));
connect(act, SIGNAL(triggered()), this, SLOT(setAttrGridColor()) ); connect(act, SIGNAL(triggered()), this, SLOT(setAttrGridColor()) );

8
src/drivers/Qt/PaletteEditor.cpp
View File

@ -75,7 +75,7 @@ PaletteEditorDialog_t::PaletteEditorDialog_t(QWidget *parent)
fileMenu = menuBar->addMenu(tr("&File")); fileMenu = menuBar->addMenu(tr("&File"));
// File -> Open // File -> Open
act = new QAction(tr("Open"), this); act = new QAction(tr("&Open"), this);
act->setShortcut(QKeySequence::Open); act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Open Palette From File")); act->setStatusTip(tr("Open Palette From File"));
connect(act, SIGNAL(triggered()), this, SLOT(openPaletteFileDialog(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(openPaletteFileDialog(void)) );
@ -83,7 +83,7 @@ PaletteEditorDialog_t::PaletteEditorDialog_t(QWidget *parent)
fileMenu->addAction(act); fileMenu->addAction(act);
// File -> Save // File -> Save
act = new QAction(tr("Save"), this); act = new QAction(tr("&Save"), this);
act->setShortcut( QKeySequence::Save ); act->setShortcut( QKeySequence::Save );
act->setStatusTip(tr("Save Palette To File")); act->setStatusTip(tr("Save Palette To File"));
connect(act, SIGNAL(triggered()), this, SLOT(savePaletteFileDialog(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(savePaletteFileDialog(void)) );
@ -91,10 +91,10 @@ PaletteEditorDialog_t::PaletteEditorDialog_t(QWidget *parent)
fileMenu->addAction(act); fileMenu->addAction(act);
// Memory // Memory
memMenu = menuBar->addMenu(tr("Memory")); memMenu = menuBar->addMenu(tr("&Memory"));
// Emulator -> Write To // Emulator -> Write To
act = new QAction(tr("Write To"), this); act = new QAction(tr("&Write To"), this);
act->setShortcut( QKeySequence(tr("F5"))); act->setShortcut( QKeySequence(tr("F5")));
act->setStatusTip(tr("Write to Active Color Palette")); act->setStatusTip(tr("Write to Active Color Palette"));
connect(act, SIGNAL(triggered()), this, SLOT(setActivePalette(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(setActivePalette(void)) );

172
src/drivers/Qt/RamWatch.cpp
View File

@ -104,118 +104,118 @@ RamWatchDialog_t::RamWatchDialog_t(QWidget *parent)
// Menu // Menu
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// File // File
fileMenu = menuBar->addMenu(tr("&File")); fileMenu = menuBar->addMenu(tr("&File"));
// File -> New List // File -> New List
menuAct = new QAction(tr("New List"), this); menuAct = new QAction(tr("&New List"), this);
menuAct->setShortcut( QKeySequence(tr("Ctrl+N")) ); menuAct->setShortcut( QKeySequence(tr("Ctrl+N")) );
menuAct->setStatusTip(tr("New List")); menuAct->setStatusTip(tr("New List"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(newListCB(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(newListCB(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
// File -> Open // File -> Open
menuAct = new QAction(tr("Open"), this); menuAct = new QAction(tr("&Open"), this);
menuAct->setShortcut( QKeySequence(tr("Ctrl+O")) ); menuAct->setShortcut( QKeySequence(tr("Ctrl+O")) );
menuAct->setStatusTip(tr("Open Watch File")); menuAct->setStatusTip(tr("Open Watch File"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(openListCB(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(openListCB(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
// File -> Save // File -> Save
menuAct = new QAction(tr("Save"), this); menuAct = new QAction(tr("&Save"), this);
menuAct->setShortcut( QKeySequence(tr("Ctrl+S")) ); menuAct->setShortcut( QKeySequence(tr("Ctrl+S")) );
menuAct->setStatusTip(tr("Save Watch File")); menuAct->setStatusTip(tr("Save Watch File"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(saveListCB(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(saveListCB(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
// File -> Save As // File -> Save As
menuAct = new QAction(tr("Save As"), this); menuAct = new QAction(tr("Save &As"), this);
menuAct->setShortcut( QKeySequence(tr("Ctrl+Shift+S")) ); menuAct->setShortcut( QKeySequence(tr("Ctrl+Shift+S")) );
menuAct->setStatusTip(tr("Save As Watch File")); menuAct->setStatusTip(tr("Save As Watch File"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(saveListAs(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(saveListAs(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
// File -> Append // File -> Append
menuAct = new QAction(tr("Append from File"), this); menuAct = new QAction(tr("&Append from File"), this);
//menuAct->setShortcut( QKeySequence(tr("Ctrl+A")) ); //menuAct->setShortcut( QKeySequence(tr("Ctrl+A")) );
menuAct->setStatusTip(tr("Append from File")); menuAct->setStatusTip(tr("Append from File"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(appendListCB(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(appendListCB(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
fileMenu->addSeparator(); fileMenu->addSeparator();
// File -> Append // File -> Append
menuAct = new QAction(tr("Close"), this); menuAct = new QAction(tr("&Close"), this);
menuAct->setShortcut( QKeySequence(tr("Alt+F4")) ); menuAct->setShortcut( QKeySequence(tr("Alt+F4")) );
menuAct->setStatusTip(tr("Close Window")); menuAct->setStatusTip(tr("Close Window"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(closeWindow(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(closeWindow(void)) );
fileMenu->addAction(menuAct); fileMenu->addAction(menuAct);
// Watch // Watch
watchMenu = menuBar->addMenu(tr("&Watch")); watchMenu = menuBar->addMenu(tr("&Watch"));
// Watch -> New Watch // Watch -> New Watch
menuAct = new QAction(tr("New Watch"), this); menuAct = new QAction(tr("&New Watch"), this);
menuAct->setShortcut( QKeySequence(tr("N")) ); menuAct->setShortcut( QKeySequence(tr("N")) );
menuAct->setStatusTip(tr("New Watch")); menuAct->setStatusTip(tr("New Watch"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(newWatchClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(newWatchClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
// Watch -> Edit Watch // Watch -> Edit Watch
menuAct = new QAction(tr("Edit Watch"), this); menuAct = new QAction(tr("&Edit Watch"), this);
menuAct->setShortcut( QKeySequence(tr("E")) ); menuAct->setShortcut( QKeySequence(tr("E")) );
menuAct->setStatusTip(tr("Edit Watch")); menuAct->setStatusTip(tr("Edit Watch"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(editWatchClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(editWatchClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
// Watch -> Remove Watch // Watch -> Remove Watch
menuAct = new QAction(tr("Remove Watch"), this); menuAct = new QAction(tr("&Remove Watch"), this);
menuAct->setShortcut( QKeySequence(tr("R")) ); menuAct->setShortcut( QKeySequence(tr("R")) );
menuAct->setStatusTip(tr("Remove Watch")); menuAct->setStatusTip(tr("Remove Watch"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(removeWatchClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(removeWatchClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
// Watch -> Duplicate Watch // Watch -> Duplicate Watch
menuAct = new QAction(tr("Duplicate Watch"), this); menuAct = new QAction(tr("Duplic&ate Watch"), this);
menuAct->setShortcut( QKeySequence(tr("A")) ); menuAct->setShortcut( QKeySequence(tr("A")) );
menuAct->setStatusTip(tr("Duplicate Watch")); menuAct->setStatusTip(tr("Duplicate Watch"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(dupWatchClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(dupWatchClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
// Watch -> Add Separator // Watch -> Add Separator
menuAct = new QAction(tr("Add Separator"), this); menuAct = new QAction(tr("Add &Separator"), this);
menuAct->setShortcut( QKeySequence(tr("S")) ); menuAct->setShortcut( QKeySequence(tr("S")) );
menuAct->setStatusTip(tr("Add Separator")); menuAct->setStatusTip(tr("Add Separator"));
//connect(menuAct, SIGNAL(triggered()), this, SLOT(newListCB(void)) ); //connect(menuAct, SIGNAL(triggered()), this, SLOT(newListCB(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
watchMenu->addSeparator(); watchMenu->addSeparator();
// Watch -> Move Up // Watch -> Move Up
menuAct = new QAction(tr("Move Up"), this); menuAct = new QAction(tr("Move &Up"), this);
menuAct->setShortcut( QKeySequence(tr("U")) ); menuAct->setShortcut( QKeySequence(tr("U")) );
menuAct->setStatusTip(tr("Move Up")); menuAct->setStatusTip(tr("Move Up"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(moveWatchUpClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(moveWatchUpClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
// Watch -> Move Down // Watch -> Move Down
menuAct = new QAction(tr("Move Down"), this); menuAct = new QAction(tr("Move &Down"), this);
menuAct->setShortcut( QKeySequence(tr("D")) ); menuAct->setShortcut( QKeySequence(tr("D")) );
menuAct->setStatusTip(tr("Move Down")); menuAct->setStatusTip(tr("Move Down"));
connect(menuAct, SIGNAL(triggered()), this, SLOT(moveWatchDownClicked(void)) ); connect(menuAct, SIGNAL(triggered()), this, SLOT(moveWatchDownClicked(void)) );
watchMenu->addAction(menuAct); watchMenu->addAction(menuAct);
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// End Menu // End Menu
@ -296,11 +296,11 @@ RamWatchDialog_t::RamWatchDialog_t(QWidget *parent)
setLayout( mainLayout ); setLayout( mainLayout );
ramWatchMainWin = this; ramWatchMainWin = this;
updateTimer = new QTimer( this ); updateTimer = new QTimer( this );
connect( updateTimer, &QTimer::timeout, this, &RamWatchDialog_t::periodicUpdate ); connect( updateTimer, &QTimer::timeout, this, &RamWatchDialog_t::periodicUpdate );
updateTimer->start( 100 ); // 10hz updateTimer->start( 100 ); // 10hz
} }
@ -309,10 +309,10 @@ RamWatchDialog_t::~RamWatchDialog_t(void)
{ {
updateTimer->stop(); updateTimer->stop();
if ( ramWatchMainWin == this ) if ( ramWatchMainWin == this )
{ {
ramWatchMainWin = NULL; ramWatchMainWin = NULL;
} }
printf("Destroy RAM Watch Config Window\n"); printf("Destroy RAM Watch Config Window\n");
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
src/drivers/Qt/input.cpp
View File

@ -610,7 +610,7 @@ static void KeyboardCommands (void)
// Alt-M to toggle Main Menu Visibility // Alt-M to toggle Main Menu Visibility
if ( is_alt ) if ( is_alt )
{ {
if (keyonly (M)) if (keyonly (SLASH))
{ {
if ( consoleWindow ) if ( consoleWindow )
{ {

28
src/drivers/Qt/ppuViewer.cpp
View File

@ -234,10 +234,10 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
// Menu // Menu
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// View1 // View1
viewMenu = menuBar->addMenu(tr("&View1")); viewMenu = menuBar->addMenu(tr("View&1"));
// View1 -> Toggle Grid // View1 -> Toggle Grid
act = new QAction(tr("Toggle Grid"), this); act = new QAction(tr("Toggle &Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
//act->setCheckable(true); //act->setCheckable(true);
//act->setChecked( patternView[0]->getDrawTileGrid() ); //act->setChecked( patternView[0]->getDrawTileGrid() );
@ -247,10 +247,10 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View1 -> Colors // View1 -> Colors
colorMenu = viewMenu->addMenu(tr("Colors")); colorMenu = viewMenu->addMenu(tr("&Colors"));
// View1 -> Colors -> Tile Selector // View1 -> Colors -> Tile Selector
act = new QAction(tr("Tile Selector"), this); act = new QAction(tr("Tile &Selector"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Selector")); act->setStatusTip(tr("Tile Selector"));
connect(act, SIGNAL(triggered()), patternView[0], SLOT(setTileSelectorColor()) ); connect(act, SIGNAL(triggered()), patternView[0], SLOT(setTileSelectorColor()) );
@ -258,7 +258,7 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// View1 -> Colors -> Tile Grid // View1 -> Colors -> Tile Grid
act = new QAction(tr("Tile Grid"), this); act = new QAction(tr("Tile &Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Grid")); act->setStatusTip(tr("Tile Grid"));
connect(act, SIGNAL(triggered()), patternView[0], SLOT(setTileGridColor()) ); connect(act, SIGNAL(triggered()), patternView[0], SLOT(setTileGridColor()) );
@ -266,10 +266,10 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// View2 // View2
viewMenu = menuBar->addMenu(tr("View2")); viewMenu = menuBar->addMenu(tr("View&2"));
// View2 -> Toggle Grid // View2 -> Toggle Grid
act = new QAction(tr("Toggle Grid"), this); act = new QAction(tr("Toggle &Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
//act->setCheckable(true); //act->setCheckable(true);
//act->setChecked( patternView[1]->getDrawTileGrid() ); //act->setChecked( patternView[1]->getDrawTileGrid() );
@ -279,10 +279,10 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
viewMenu->addAction(act); viewMenu->addAction(act);
// View2 -> Colors // View2 -> Colors
colorMenu = viewMenu->addMenu(tr("Colors")); colorMenu = viewMenu->addMenu(tr("&Colors"));
// View2 -> Colors -> Tile Selector // View2 -> Colors -> Tile Selector
act = new QAction(tr("Tile Selector"), this); act = new QAction(tr("Tile &Selector"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Selector")); act->setStatusTip(tr("Tile Selector"));
connect(act, SIGNAL(triggered()), patternView[1], SLOT(setTileSelectorColor()) ); connect(act, SIGNAL(triggered()), patternView[1], SLOT(setTileSelectorColor()) );
@ -290,7 +290,7 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// View2 -> Colors -> Tile Grid // View2 -> Colors -> Tile Grid
act = new QAction(tr("Tile Grid"), this); act = new QAction(tr("Tile &Grid"), this);
//act->setShortcut(QKeySequence::Open); //act->setShortcut(QKeySequence::Open);
act->setStatusTip(tr("Tile Grid")); act->setStatusTip(tr("Tile Grid"));
connect(act, SIGNAL(triggered()), patternView[1], SLOT(setTileGridColor()) ); connect(act, SIGNAL(triggered()), patternView[1], SLOT(setTileGridColor()) );
@ -298,21 +298,21 @@ ppuViewerDialog_t::ppuViewerDialog_t(QWidget *parent)
colorMenu->addAction(act); colorMenu->addAction(act);
// Options // Options
optMenu = menuBar->addMenu(tr("Options")); optMenu = menuBar->addMenu(tr("&Options"));
// Options -> Focus // Options -> Focus
subMenu = optMenu->addMenu(tr("Focus Policy")); subMenu = optMenu->addMenu(tr("&Focus Policy"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
act = new QAction(tr("Click"), this); act = new QAction(tr("&Click"), this);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(true); act->setChecked(true);
group->addAction(act); group->addAction(act);
subMenu->addAction(act); subMenu->addAction(act);
connect(act, SIGNAL(triggered()), this, SLOT(setClickFocus(void)) ); connect(act, SIGNAL(triggered()), this, SLOT(setClickFocus(void)) );
act = new QAction(tr("Hover"), this); act = new QAction(tr("&Hover"), this);
act->setCheckable(true); act->setCheckable(true);
act->setChecked(false); act->setChecked(false);
group->addAction(act); group->addAction(act);