atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

expose undoview with ctrl+E, fix redo shortcut

Browse source
This commit is contained in:
garakmon 2020-08-03 21:12:13 -04:00 committed by garak
parent 392e595a03
commit d121701da0
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mainwindow.cpp
View file

@ -103,7 +103,6 @@ void MainWindow::initWindow() {
} }
void MainWindow::initExtraShortcuts() { void MainWindow::initExtraShortcuts() {
new QShortcut(QKeySequence("Ctrl+Shift+Z"), this, SLOT(redo()));
new QShortcut(QKeySequence("Ctrl+0"), this, SLOT(resetMapViewScale())); new QShortcut(QKeySequence("Ctrl+0"), this, SLOT(resetMapViewScale()));
new QShortcut(QKeySequence("Ctrl+G"), ui->checkBox_ToggleGrid, SLOT(toggle())); new QShortcut(QKeySequence("Ctrl+G"), ui->checkBox_ToggleGrid, SLOT(toggle()));
new QShortcut(QKeySequence("Ctrl+D"), this, SLOT(duplicate())); new QShortcut(QKeySequence("Ctrl+D"), this, SLOT(duplicate()));
@ -155,21 +154,21 @@ void MainWindow::initEditor() {
undoAction->setShortcut(QKeySequence("Ctrl+Z")); undoAction->setShortcut(QKeySequence("Ctrl+Z"));
redoAction = editor->editGroup.createRedoAction(this, tr("&Redo")); redoAction = editor->editGroup.createRedoAction(this, tr("&Redo"));
redoAction->setShortcut(QKeySequence("Ctrl+Y")); redoAction->setShortcuts({QKeySequence("Ctrl+Y"), QKeySequence("Ctrl+Shift+Z")});
ui->menuEdit->addAction(undoAction); ui->menuEdit->addAction(undoAction);
ui->menuEdit->addAction(redoAction); ui->menuEdit->addAction(redoAction);
// TODO: show history UndoView here
QUndoView *undoView = new QUndoView(&editor->editGroup); QUndoView *undoView = new QUndoView(&editor->editGroup);
undoView->setWindowTitle(tr("Edit History")); undoView->setWindowTitle(tr("Edit History"));
undoView->show();
undoView->setAttribute(Qt::WA_QuitOnClose, false); undoView->setAttribute(Qt::WA_QuitOnClose, false);
//ui->comboBox_History->setMinimumContentsLength(20); // Show the EditHistory dialog with Ctrl+E
//ui->comboBox_History->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); QAction *showHistory = new QAction("Show Edit History...");
//ui->comboBox_History->setModel(undoView->model()); showHistory->setShortcut(QKeySequence("Ctrl+E"));
//ui->comboBox_History->setView(undoView); connect(showHistory, &QAction::triggered, [undoView](){ undoView->show(); });
ui->menuEdit->addAction(showHistory);
// Toggle an asterisk in the window title when the undo state is changed // Toggle an asterisk in the window title when the undo state is changed
connect(&editor->editGroup, &QUndoGroup::cleanChanged, this, &MainWindow::showWindowTitle); connect(&editor->editGroup, &QUndoGroup::cleanChanged, this, &MainWindow::showWindowTitle);