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

Minor menu fixes for Qt GUI.

This commit is contained in:
mjbudd77 2021-08-05 19:37:28 -04:00
parent 3fe7e4e02e
commit f3af816eda
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,7 +709,7 @@ int FCEUD_AviGetFormatOpts( std::vector <std::string> &formatList )
s.assign("Unknown"); s.assign("Unknown");
break; break;
case AVI_RGB24: case AVI_RGB24:
s.assign("RGB 24"); s.assign("RGB24 (Uncompressed)");
break; break;
case AVI_I420: case AVI_I420:
s.assign("I420 (YUV 4:2:0)"); s.assign("I420 (YUV 4:2:0)");

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

@ -914,8 +914,8 @@ void consoleWin_t::createMainMenu(void)
Hotkeys[ HK_SAVE_STATE ].setAction( quickSaveAct ); Hotkeys[ HK_SAVE_STATE ].setAction( quickSaveAct );
connect( Hotkeys[ HK_SAVE_STATE ].getShortcut(), SIGNAL(activated()), this, SLOT(quickSave(void)) ); connect( Hotkeys[ HK_SAVE_STATE ].getShortcut(), SIGNAL(activated()), this, SLOT(quickSave(void)) );
// File -> Change State // File -> Change State Slot
subMenu = fileMenu->addMenu(tr("Change &State")); subMenu = fileMenu->addMenu(tr("Change &State Slot"));
group = new QActionGroup(this); group = new QActionGroup(this);
group->setExclusive(true); group->setExclusive(true);
@ -924,7 +924,7 @@ void consoleWin_t::createMainMenu(void)
{ {
char stmp[8]; char stmp[8];
sprintf( stmp, "&%i", i ); sprintf( stmp, "Slot &%i", i );
state[i] = new QAction(tr(stmp), this); state[i] = new QAction(tr(stmp), this);
state[i]->setCheckable(true); state[i]->setCheckable(true);
@ -3473,6 +3473,7 @@ void consoleWin_t::recordMovieAs(void)
dialog.setViewMode(QFileDialog::List); dialog.setViewMode(QFileDialog::List);
dialog.setFilter( QDir::AllEntries | QDir::AllDirs | QDir::Hidden ); dialog.setFilter( QDir::AllEntries | QDir::AllDirs | QDir::Hidden );
dialog.setLabelText( QFileDialog::Accept, tr("Save") ); dialog.setLabelText( QFileDialog::Accept, tr("Save") );
dialog.setDefaultSuffix( tr(".fm2") );
g_config->getOption ("SDL.LastOpenMovie", &last ); g_config->getOption ("SDL.LastOpenMovie", &last );
@ -4042,8 +4043,8 @@ void consoleWin_t::updatePeriodic(void)
openMovAct->setEnabled( FCEU_IsValidUI( FCEUI_PLAYMOVIE ) ); openMovAct->setEnabled( FCEU_IsValidUI( FCEUI_PLAYMOVIE ) );
recMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) ); recMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
recAsMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) ); recAsMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
recAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) ); recAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEU_IsValidUI( FCEUI_STOPAVI ) );
recAsAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) ); recAsAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEU_IsValidUI( FCEUI_STOPAVI ) );
stopAviAct->setEnabled( FCEU_IsValidUI( FCEUI_STOPAVI ) ); stopAviAct->setEnabled( FCEU_IsValidUI( FCEUI_STOPAVI ) );
recWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() ); recWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() );
recAsWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() ); recAsWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() );

10
src/drivers/Qt/config.cpp
View File

@ -32,6 +32,7 @@
#include "Qt/sdl.h" #include "Qt/sdl.h"
#include "Qt/sdl-video.h" #include "Qt/sdl-video.h"
#include "Qt/AviRecord.h"
#include "Qt/unix-netplay.h" #include "Qt/unix-netplay.h"
#ifdef WIN32 #ifdef WIN32
@ -582,7 +583,14 @@ InitConfig()
config->addOption("pauseframe", "SDL.PauseFrame", 0); config->addOption("pauseframe", "SDL.PauseFrame", 0);
config->addOption("recordhud", "SDL.RecordHUD", 1); config->addOption("recordhud", "SDL.RecordHUD", 1);
config->addOption("moviemsg", "SDL.MovieMsg", 1); config->addOption("moviemsg", "SDL.MovieMsg", 1);
config->addOption("SDL.AviVideoFormat", 0);
#ifdef _USE_X264
config->addOption("SDL.AviVideoFormat", AVI_X264);
#elif WIN32
config->addOption("SDL.AviVideoFormat", AVI_VFW);
#else
config->addOption("SDL.AviVideoFormat", AVI_RGB24);
#endif
// Hex Editor Options // Hex Editor Options
config->addOption("hexEditBgColor", "SDL.HexEditBgColor", "#000000"); config->addOption("hexEditBgColor", "SDL.HexEditBgColor", "#000000");