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

More QFileDialog show()/exec() fixes. #332

This commit is contained in:
mjbudd77 2021-02-18 23:28:31 -05:00
parent 5eb79dcf9d
commit 350f7fa468
6 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/Qt/CodeDataLogger.cpp
View File

@ -367,7 +367,6 @@ void CodeDataLoggerDialog_t::saveCdlFileAs(void)
dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal); dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret ) if ( ret )
@ -423,7 +422,6 @@ void CodeDataLoggerDialog_t::loadCdlFile(void)
dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal); dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret ) if ( ret )
@ -508,7 +506,6 @@ void CodeDataLoggerDialog_t::SaveStrippedROM(int invert)
dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal); dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret ) if ( ret )

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

@ -1221,22 +1221,21 @@ void ConsoleDebugger::edit_BM_name( int addr )
sprintf( stmp, "Specify Bookmark Name for %04X", addr ); sprintf( stmp, "Specify Bookmark Name for %04X", addr );
dialog.setWindowTitle( tr("Edit Bookmark") ); dialog.setWindowTitle( tr("Edit Bookmark") );
dialog.setLabelText( tr(stmp) ); dialog.setLabelText( tr(stmp) );
dialog.setOkButtonText( tr("Edit") ); dialog.setOkButtonText( tr("Edit") );
if ( bm != NULL ) if ( bm != NULL )
{ {
dialog.setTextValue( tr(bm->name.c_str()) ); dialog.setTextValue( tr(bm->name.c_str()) );
} }
dialog.show(); ret = dialog.exec();
ret = dialog.exec();
if ( QDialog::Accepted == ret ) if ( QDialog::Accepted == ret )
{ {
bm->name = dialog.textValue().toStdString(); bm->name = dialog.textValue().toStdString();
bmListUpdate(false); bmListUpdate(false);
} }
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void ConsoleDebugger::bmListUpdate( bool reset ) void ConsoleDebugger::bmListUpdate( bool reset )
@ -1548,22 +1547,21 @@ void ConsoleDebugger::pcSetPlaceCustom(void)
g_config->getOption("SDL.DebuggerPCLineOffset" , &ofs ); g_config->getOption("SDL.DebuggerPCLineOffset" , &ofs );
dialog.setWindowTitle( tr("PC Line Offset") ); dialog.setWindowTitle( tr("PC Line Offset") );
dialog.setLabelText( tr("Enter a line offset from 0 to 100.") ); dialog.setLabelText( tr("Enter a line offset from 0 to 100.") );
dialog.setOkButtonText( tr("Ok") ); dialog.setOkButtonText( tr("Ok") );
dialog.setInputMode( QInputDialog::IntInput ); dialog.setInputMode( QInputDialog::IntInput );
dialog.setIntRange( 0, 100 ); dialog.setIntRange( 0, 100 );
dialog.setIntValue( ofs ); dialog.setIntValue( ofs );
dialog.show(); ret = dialog.exec();
ret = dialog.exec();
if ( QDialog::Accepted == ret ) if ( QDialog::Accepted == ret )
{ {
ofs = dialog.intValue(); ofs = dialog.intValue();
asmView->setPC_placement( 5, ofs ); asmView->setPC_placement( 5, ofs );
} }
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

1
src/drivers/Qt/GamePadConf.cpp
View File

@ -818,7 +818,6 @@ void GamePadConfDialog_t::newProfileCallback(void)
dialog.setLabelText( tr("Specify New Profile Name") ); dialog.setLabelText( tr("Specify New Profile Name") );
dialog.setOkButtonText( tr("Create") ); dialog.setOkButtonText( tr("Create") );
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( QDialog::Accepted == ret ) if ( QDialog::Accepted == ret )

14
src/drivers/Qt/InputConf.cpp
View File

@ -449,7 +449,6 @@ void InputConfDialog_t::openLoadPresetFile(void)
dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal); dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret ) if ( ret )
@ -464,9 +463,9 @@ void InputConfDialog_t::openLoadPresetFile(void)
} }
if ( filename.isNull() ) if ( filename.isNull() )
{ {
return; return;
} }
qDebug() << "selected file path : " << filename.toUtf8(); qDebug() << "selected file path : " << filename.toUtf8();
fceuWrapperLock(); fceuWrapperLock();
@ -522,7 +521,6 @@ void InputConfDialog_t::openSavePresetFile(void)
dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal); dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret ) if ( ret )
@ -537,9 +535,9 @@ void InputConfDialog_t::openSavePresetFile(void)
} }
if ( filename.isNull() ) if ( filename.isNull() )
{ {
return; return;
} }
qDebug() << "selected file path : " << filename.toUtf8(); qDebug() << "selected file path : " << filename.toUtf8();
saveInputSettingsToFile( filename.toStdString().c_str() ); saveInputSettingsToFile( filename.toStdString().c_str() );

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

@ -790,7 +790,6 @@ void ppuNameTableViewerDialog_t::openColorPicker( QColor *c )
dialog.setCurrentColor( *c ); dialog.setCurrentColor( *c );
dialog.setOption( QColorDialog::DontUseNativeDialog, true ); dialog.setOption( QColorDialog::DontUseNativeDialog, true );
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret == QDialog::Accepted ) if ( ret == QDialog::Accepted )

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

@ -463,7 +463,6 @@ void ppuPatternView_t::openColorPicker( QColor *c )
dialog.setCurrentColor( *c ); dialog.setCurrentColor( *c );
dialog.setOption( QColorDialog::DontUseNativeDialog, true ); dialog.setOption( QColorDialog::DontUseNativeDialog, true );
dialog.show();
ret = dialog.exec(); ret = dialog.exec();
if ( ret == QDialog::Accepted ) if ( ret == QDialog::Accepted )