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

Used better color menu item object for hex editor color selection.

This commit is contained in:
mjbudd77 2021-07-18 18:48:40 -04:00
parent 6aa0c9fec1
commit 54aeeebb5d
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1084,7 +1084,8 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
QMenuBar *menuBar; QMenuBar *menuBar;
QMenu *fileMenu, *editMenu, *viewMenu, *colorMenu, *subMenu; QMenu *fileMenu, *editMenu, *viewMenu, *colorMenu, *subMenu;
QAction *saveROM, *closeAct; QAction *saveROM, *closeAct;
QAction *act, *actHlgt, *actHlgtRV, *actColorFG, *actColorBG; QAction *act, *actHlgt, *actHlgtRV;
ColorMenuItem *actColorFG, *actColorBG, *actRowColColor, *actAltColColor;
QActionGroup *group; QActionGroup *group;
int useNativeMenuBar; int useNativeMenuBar;
QSettings settings; QSettings settings;
@ -1345,37 +1346,43 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
colorMenu->addAction(altColHlgtAct); colorMenu->addAction(altColHlgtAct);
colorMenu->addSeparator();
// Color -> ForeGround Color // Color -> ForeGround Color
actColorFG = new QAction(tr("&ForeGround Color"), this); actColorFG = new ColorMenuItem( tr("&ForeGround Color"), "SDL.HexEditFgColor", 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 ColorMenuItem( tr("&BackGround Color"), "SDL.HexEditBgColor", 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);
// Color -> Cursor Row/Column Color // Color -> Cursor Row/Column Color
act = new QAction(tr("&Cursor Row/Column Color"), this); actRowColColor = new ColorMenuItem( tr("&Cursor Row/Column Color"), "SDL.HexEditCursorColorRC", this);
//act = new QAction(tr("&Cursor Row/Column Color"), this);
//act->setShortcuts(QKeySequence::Open); //act->setShortcuts(QKeySequence::Open);
act->setStatusTip(tr("Cursor Row/Column Color")); //act->setStatusTip(tr("Cursor Row/Column Color"));
connect(act, SIGNAL(triggered(void)), this, SLOT(pickCursorRowColumnColor(void)) ); //connect(act, SIGNAL(triggered(void)), this, SLOT(pickCursorRowColumnColor(void)) );
colorMenu->addAction(act); colorMenu->addAction(actRowColColor);
// Color -> Alternate Column Color // Color -> Alternate Column Color
act = new QAction(tr("&Alternate Column Color"), this); actAltColColor = new ColorMenuItem( tr("&Alternate Column Color"), "SDL.HexEditAltColColor", this);
//act = new QAction(tr("&Alternate Column Color"), this);
//act->setShortcuts(QKeySequence::Open); //act->setShortcuts(QKeySequence::Open);
act->setStatusTip(tr("Alternate Column Color")); //act->setStatusTip(tr("Alternate Column Color"));
connect(act, SIGNAL(triggered(void)), this, SLOT(pickAlternateColumnColor(void)) ); //connect(act, SIGNAL(triggered(void)), this, SLOT(pickAlternateColumnColor(void)) );
colorMenu->addAction(act); colorMenu->addAction(actAltColColor);
// Bookmarks Menu // Bookmarks Menu
bookmarkMenu = menuBar->addMenu(tr("&Bookmarks")); bookmarkMenu = menuBar->addMenu(tr("&Bookmarks"));
@ -1406,6 +1413,11 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent)
editor->setScrollBars( hbar, vbar ); editor->setScrollBars( hbar, vbar );
actColorFG->connectColor( &editor->fgColor );
actColorBG->connectColor( &editor->bgColor );
actRowColColor->connectColor( &editor->rowColHlgtColor );
actAltColColor->connectColor( &editor->altColHlgtColor );
//connect( vbar, SIGNAL(sliderMoved(int)), this, SLOT(vbarMoved(int)) ); //connect( vbar, SIGNAL(sliderMoved(int)), this, SLOT(vbarMoved(int)) );
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)) );