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

Moved TAS history view to tabbed widget with branches/bookmarks for Qt GUI.

This commit is contained in:
mjbudd77 2021-12-12 13:05:26 -05:00
parent 53d721b560
commit 465f7d725d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/Qt/TasEditor/TasEditorWindow.cpp
View File

@ -1042,7 +1042,7 @@ void TasEditorWindow::buildSideControlPanel(void)
recorderGBox = new QGroupBox( tr("Recorder") ); recorderGBox = new QGroupBox( tr("Recorder") );
splicerGBox = new QGroupBox( tr("Splicer") ); splicerGBox = new QGroupBox( tr("Splicer") );
//luaGBox = new QGroupBox( tr("Lua") ); //luaGBox = new QGroupBox( tr("Lua") );
historyGBox = new QGroupBox( tr("History") ); //historyGBox = new QGroupBox( tr("History") );
bbFrame = new QFrame(); bbFrame = new QFrame();
bbFrame->setFrameShape( QFrame::StyledPanel ); bbFrame->setFrameShape( QFrame::StyledPanel );
@ -1151,6 +1151,7 @@ void TasEditorWindow::buildSideControlPanel(void)
bkmkBrnchStack = new QTabWidget(); bkmkBrnchStack = new QTabWidget();
bkmkBrnchStack->addTab( scrollArea, tr("Bookmarks") ); bkmkBrnchStack->addTab( scrollArea, tr("Bookmarks") );
bkmkBrnchStack->addTab( &branches , tr("Branches") ); bkmkBrnchStack->addTab( &branches , tr("Branches") );
bkmkBrnchStack->addTab( histTree , tr("History") );
taseditorConfig.displayBranchesTree = 0; taseditorConfig.displayBranchesTree = 0;
@ -1158,16 +1159,16 @@ void TasEditorWindow::buildSideControlPanel(void)
vbox->addWidget( bkmkBrnchStack ); vbox->addWidget( bkmkBrnchStack );
bbFrame->setLayout( vbox ); bbFrame->setLayout( vbox );
vbox = new QVBoxLayout(); //vbox = new QVBoxLayout();
vbox->addWidget( histTree ); //vbox->addWidget( histTree );
historyGBox->setLayout( vbox ); //historyGBox->setLayout( vbox );
ctlPanelMainVbox->addWidget( playbackGBox ); ctlPanelMainVbox->addWidget( playbackGBox );
ctlPanelMainVbox->addWidget( recorderGBox ); ctlPanelMainVbox->addWidget( recorderGBox );
ctlPanelMainVbox->addWidget( splicerGBox ); ctlPanelMainVbox->addWidget( splicerGBox );
//ctlPanelMainVbox->addWidget( luaGBox ); //ctlPanelMainVbox->addWidget( luaGBox );
ctlPanelMainVbox->addWidget( bbFrame ); ctlPanelMainVbox->addWidget( bbFrame );
ctlPanelMainVbox->addWidget( historyGBox ); //ctlPanelMainVbox->addWidget( historyGBox );
hbox = new QHBoxLayout(); hbox = new QHBoxLayout();
hbox->addWidget( prevMkrBtn ); hbox->addWidget( prevMkrBtn );
@ -1271,6 +1272,7 @@ void TasEditorWindow::initHotKeys(void)
hotkeyShortcut[HK_FULLSCREEN ]->setEnabled(false); hotkeyShortcut[HK_FULLSCREEN ]->setEnabled(false);
hotkeyShortcut[HK_MAIN_MENU_HIDE]->setEnabled(false); hotkeyShortcut[HK_MAIN_MENU_HIDE]->setEnabled(false);
hotkeyShortcut[HK_LOAD_LUA ]->setEnabled(false); hotkeyShortcut[HK_LOAD_LUA ]->setEnabled(false);
hotkeyShortcut[HK_FA_LAG_SKIP ]->setEnabled(false);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void TasEditorWindow::activateHotkey( int hkIdx, QShortcut *shortcut ) void TasEditorWindow::activateHotkey( int hkIdx, QShortcut *shortcut )

2
src/drivers/Qt/TasEditor/TasEditorWindow.h
View File

@ -375,7 +375,7 @@ class TasEditorWindow : public QDialog
QGroupBox *recorderGBox; QGroupBox *recorderGBox;
QGroupBox *splicerGBox; QGroupBox *splicerGBox;
//QGroupBox *luaGBox; //QGroupBox *luaGBox;
QGroupBox *historyGBox; //QGroupBox *historyGBox;
QFrame *bbFrame; QFrame *bbFrame;
QPushButton *rewindMkrBtn; QPushButton *rewindMkrBtn;