diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-07-23 23:41:23 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-11 16:22:27 -0700 |
commit | 43c3885249fb867e7c33c8b3b5846d44e908774f (patch) | |
tree | 3675041ca82295a94c3bc48e9812e26543faacae /desktop-widgets/mainwindow.cpp | |
parent | f427226b3b605523bc8285dbdaaa7f6993af6e6a (diff) | |
download | subsurface-43c3885249fb867e7c33c8b3b5846d44e908774f.tar.gz |
Undo: isolate undo-commands
This refactors the undo-commands (which are now only "commands").
- Move everything in namespace Command. This allows shortening of
names without polluting the global namespace. Moreover, the prefix
Command:: will immediately signal that the undo-machinery is
invoked. This is more terse than UndoCommands::instance()->...
- Remove the Undo in front of the class-names. Creating an "UndoX"
object to do "X" is paradoxical.
- Create a base class for all commands that defines the Qt-translation
functions. Thus all translations end up in the "Command" context.
- Add a workToBeDone() function, which signals whether this should be
added to the UndoStack. Thus the caller doesn't have to check itself
whether this any work will be done. Note: Qt5.9 introduces "setObsolete"
which does the same.
- Split into public and internal header files. In the public header
file only export the function calls, thus hiding all implementation
details from the caller.
- Split in different translation units: One for the stubs, one for
the base classes and one for groups of commands. Currently, there
is only one class of commands: divelist-commands.
- Move the undoStack from the MainWindow class into commands_base.cpp.
If we want to implement MDI, this can easily be moved into an
appropriate Document class.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
-rw-r--r-- | desktop-widgets/mainwindow.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 06f6b8968..d55913e25 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -37,6 +37,7 @@ #include "core/settings/qPrefTechnicalDetails.h" #include "desktop-widgets/about.h" +#include "desktop-widgets/command.h" #include "desktop-widgets/divecomputermanagementdialog.h" #include "desktop-widgets/divelistview.h" #include "desktop-widgets/divelogexportdialog.h" @@ -48,7 +49,6 @@ #include "desktop-widgets/mapwidget.h" #include "desktop-widgets/subsurfacewebservices.h" #include "desktop-widgets/tab-widgets/maintab.h" -#include "desktop-widgets/undocommands.h" #include "desktop-widgets/updatemanager.h" #include "desktop-widgets/usersurvey.h" @@ -258,9 +258,8 @@ MainWindow::MainWindow() : QMainWindow(), memset(&what, 0, sizeof(what)); updateManager = new UpdateManager(this); - undoStack = new QUndoStack(this); - QAction *undoAction = undoStack->createUndoAction(this, tr("&Undo")); - QAction *redoAction = undoStack->createRedoAction(this, tr("&Redo")); + QAction *undoAction = Command::undoAction(this); + QAction *redoAction = Command::redoAction(this); undoAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Z)); redoAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Z)); QList<QAction*>undoRedoActions; @@ -620,7 +619,7 @@ void MainWindow::on_actionCloudstorageopen_triggered() process_loaded_dives(); if (autogroup) autogroup_dives(); - undoStack->clear(); + Command::clear(); hideProgressBar(); refreshDisplay(); } @@ -1075,9 +1074,9 @@ void MainWindow::on_actionAutoGroup_triggered() { set_autogroup(ui.actionAutoGroup->isChecked()); if (autogroup) - undoStack->push(new UndoAutogroupDives); + Command::autogroupDives(); else - undoStack->push(new UndoRemoveAutogenTrips); + Command::removeAutogenTrips(); refreshDisplay(); mark_divelist_changed(true); } @@ -1745,7 +1744,7 @@ void MainWindow::importFiles(const QStringList fileNames) process_imported_dives(&table, false, false); if (autogroup) autogroup_dives(); - undoStack->clear(); + Command::clear(); refreshDisplay(); } @@ -1770,7 +1769,7 @@ void MainWindow::loadFiles(const QStringList fileNames) process_loaded_dives(); if (autogroup) autogroup_dives(); - undoStack->clear(); + Command::clear(); refreshDisplay(); |