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

Changed error message window to use QMessageBox instead of QErrorMessage to have more control over display image.

This commit is contained in:
Matthew Budd 2020-07-26 22:04:31 -04:00
parent e918f8562a
commit 3528adea30
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@
#include <cstdlib> #include <cstdlib>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QErrorMessage>
#include "../../fceu.h" #include "../../fceu.h"
#include "../../fds.h" #include "../../fds.h"
@ -37,8 +36,6 @@ consoleWin_t::consoleWin_t(QWidget *parent)
{ {
int use_SDL_video = false; int use_SDL_video = false;
errorMsgBox = QErrorMessage::qtHandler();
createMainMenu(); createMainMenu();
g_config->getOption( "SDL.VideoDriver", &use_SDL_video ); g_config->getOption( "SDL.VideoDriver", &use_SDL_video );
@ -124,15 +121,15 @@ void consoleWin_t::setCyclePeriodms( int ms )
void consoleWin_t::showErrorMsgWindow() void consoleWin_t::showErrorMsgWindow()
{ {
//QErrorMessage msgBox; QMessageBox msgBox(this);
fceuWrapperLock(); fceuWrapperLock();
//msgBox.setIcon( QMessageBox::Warning ); msgBox.setIcon( QMessageBox::Critical );
//msgBox.showMessage( tr(errorMsg.c_str()) ); msgBox.setText( tr(errorMsg.c_str()) );
qWarning( errorMsg.c_str() );
errorMsg.clear(); errorMsg.clear();
fceuWrapperUnLock(); fceuWrapperUnLock();
//msgBox.exec(); msgBox.show();
msgBox.exec();
} }
void consoleWin_t::QueueErrorMsgWindow( const char *msg ) void consoleWin_t::QueueErrorMsgWindow( const char *msg )

3
src/drivers/Qt/ConsoleWindow.h
View File

@ -6,7 +6,6 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QErrorMessage>
#include <QWidget> #include <QWidget>
#include <QPushButton> #include <QPushButton>
#include <QMenu> #include <QMenu>
@ -92,8 +91,6 @@ class consoleWin_t : public QMainWindow
QAction *recMovAct; QAction *recMovAct;
QAction *recAsMovAct; QAction *recAsMovAct;
QErrorMessage *errorMsgBox;
QTimer *gameTimer; QTimer *gameTimer;
emulatorThread_t *emulatorThread; emulatorThread_t *emulatorThread;