hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2009 from Wallacoloo/undo-redo-greyout

Browse Source 
Grey out edit->undo/redo actions if there's nothing left to undo/redo
This commit is contained in:
Tres Finocchiaro
2015-04-27 18:17:42 +00:00
parent 6c615dbcd4 035f48fb1d
commit df9a1537b3
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/MainWindow.h
View File

@@ -121,6 +121,7 @@ public slots:
void updatePlayPauseIcons();
void updateUndoRedoButtons();
void undo();
void redo();
@@ -167,6 +168,8 @@ private:
} m_keyMods;
QMenu * m_toolsMenu;
QAction * m_undoAction;
QAction * m_redoAction;
QList<PluginView *> m_tools;
QBasicTimer m_updateTimer;

3
include/ProjectJournal.h
View File

@@ -45,6 +45,9 @@ public:
void undo();
void redo();
bool canUndo() const;
bool canRedo() const;
void addJournalCheckPoint( JournallingObject *jo );
bool isJournalling() const

9
src/core/ProjectJournal.cpp
View File

@@ -97,6 +97,15 @@ void ProjectJournal::redo()
}
}
bool ProjectJournal::canUndo() const
{
return !m_undoCheckPoints.isEmpty();
}
bool ProjectJournal::canRedo() const
{
return !m_redoCheckPoints.isEmpty();
}

13
src/gui/MainWindow.cpp
View File

@@ -288,11 +288,11 @@ void MainWindow::finalize()
QMenu * edit_menu = new QMenu( this );
menuBar()->addMenu( edit_menu )->setText( tr( "&Edit" ) );
edit_menu->addAction( embed::getIconPixmap( "edit_undo" ),
m_undoAction = edit_menu->addAction( embed::getIconPixmap( "edit_undo" ),
tr( "Undo" ),
this, SLOT( undo() ),
Qt::CTRL + Qt::Key_Z );
edit_menu->addAction( embed::getIconPixmap( "edit_redo" ),
m_redoAction = edit_menu->addAction( embed::getIconPixmap( "edit_redo" ),
tr( "Redo" ),
this, SLOT( redo() ),
Qt::CTRL + Qt::Key_Y );
@@ -300,6 +300,7 @@ void MainWindow::finalize()
edit_menu->addAction( embed::getIconPixmap( "setup_general" ),
tr( "Settings" ),
this, SLOT( showSettingsDialog() ) );
connect( edit_menu, SIGNAL(aboutToShow()), this, SLOT(updateUndoRedoButtons()) );
m_viewMenu = new QMenu( this );
menuBar()->addMenu( m_viewMenu )->setText( tr( "&View" ) );
@@ -1182,6 +1183,14 @@ void MainWindow::updatePlayPauseIcons()
}
void MainWindow::updateUndoRedoButtons()
{
// when the edit menu is shown, grey out the undo/redo buttons if there's nothing to undo/redo
// else, un-grey them
m_undoAction->setEnabled(Engine::projectJournal()->canUndo());
m_redoAction->setEnabled(Engine::projectJournal()->canRedo());
}
void MainWindow::undo()