undoable removeComponent action

3 files changed, 53 insertions, 19 deletions

diff --git a/src/gui/actions.py b/src/gui/actions.py
new file mode 100644
index 0000000..5cf64e1
--- /dev/null
+++ b/src/gui/actions.py
@@ -0,0 +1,37 @@
+'''
+    QCommand classes for every undoable user action performed in the MainWindow
+'''
+from PyQt5.QtWidgets import QUndoCommand
+
+
+class RemoveComponent(QUndoCommand):
+    def __init__(self, parent, selectedRows):
+        super().__init__('Remove component')
+        self.parent = parent
+        componentList = self.parent.window.listWidget_componentList
+        self.selectedRows = [
+            componentList.row(selected) for selected in selectedRows
+        ]
+        self.components = [
+            parent.core.selectedComponents[i] for i in self.selectedRows
+        ]
+
+    def redo(self):
+        stackedWidget = self.parent.window.stackedWidget
+        componentList = self.parent.window.listWidget_componentList
+        for index in self.selectedRows:
+            stackedWidget.removeWidget(self.parent.pages[index])
+            componentList.takeItem(index)
+            self.parent.core.removeComponent(index)
+            self.parent.pages.pop(index)
+            self.parent.changeComponentWidget()
+        self.parent.drawPreview()
+
+    def undo(self):
+        componentList = self.parent.window.listWidget_componentList
+        for index, comp in zip(self.selectedRows, self.components):
+            self.parent.core.insertComponent(
+                index, comp, self.parent
+            )
+        self.parent.drawPreview()
+
diff --git a/src/gui/mainwindow.py b/src/gui/mainwindow.py
index af6e190..2edb750 100644
--- a/src/gui/mainwindow.py
+++ b/src/gui/mainwindow.py
@@ -16,9 +16,10 @@ import time
 import logging
 
 from core import Core
-import preview_thread
-from preview_win import PreviewWindow
-from presetmanager import PresetManager
+import gui.preview_thread as preview_thread
+from gui.preview_win import PreviewWindow
+from gui.presetmanager import PresetManager
+from gui.actions import *
 from toolkit import disableWhenEncoding, disableWhenOpeningProject, checkOutput
 
 
@@ -43,9 +44,12 @@ class MainWindow(QtWidgets.QMainWindow):
         QtWidgets.QMainWindow.__init__(self)
         self.window = window
         self.core = Core()
+        Core.mode = 'GUI'
         log.debug(
             'Main thread id: {}'.format(int(QtCore.QThread.currentThreadId())))
 
+        self.undoStack = QtWidgets.QUndoStack(self)
+
         # widgets of component settings
         self.pages = []
         self.lastAutosave = time.time()
@@ -62,7 +66,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.presetManager = PresetManager(
             uic.loadUi(
-                os.path.join(Core.wd, 'presetmanager.ui')), self)
+                os.path.join(Core.wd, 'gui', 'presetmanager.ui')), self)
 
         # Create the preview window and its thread, queues, and timers
         log.debug('Creating preview window')
@@ -298,6 +302,9 @@ class MainWindow(QtWidgets.QMainWindow):
         QtWidgets.QShortcut("Ctrl+A", self.window, self.openSaveProjectDialog)
         QtWidgets.QShortcut("Ctrl+O", self.window, self.openOpenProjectDialog)
         QtWidgets.QShortcut("Ctrl+N", self.window, self.createNewProject)
+        QtWidgets.QShortcut("Ctrl+Z", self.window, self.undoStack.undo)
+        QtWidgets.QShortcut("Ctrl+Y", self.window, self.undoStack.redo)
+        QtWidgets.QShortcut("Ctrl+Shift+Z", self.window, self.undoStack.redo)
 
         # Hotkeys for component list
         for inskey in ("Ctrl+T", QtCore.Qt.Key_Insert):
@@ -685,15 +692,10 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def removeComponent(self):
         componentList = self.window.listWidget_componentList
-
-        for selected in componentList.selectedItems():
-            index = componentList.row(selected)
-            self.window.stackedWidget.removeWidget(self.pages[index])
-            componentList.takeItem(index)
-            self.core.removeComponent(index)
-            self.pages.pop(index)
-            self.changeComponentWidget()
-        self.drawPreview()
+        selected = componentList.selectedItems()
+        if selected:
+            action = RemoveComponent(self, selected)
+            self.undoStack.push(action)
 
     @disableWhenEncoding
     def moveComponent(self, change):
diff --git a/src/gui/presetmanager.py b/src/gui/presetmanager.py
index b1eeb34..1cc0887 100644
--- a/src/gui/presetmanager.py
+++ b/src/gui/presetmanager.py
@@ -302,7 +302,7 @@ class PresetManager(QtWidgets.QDialog):
                     self.findPresets()
                     self.drawPresetList()
                     for i, comp in enumerate(self.core.selectedComponents):
-                        if getPresetDir(comp) == path \
+                        if self.core.getPresetDir(comp) == path \
                                 and comp.currentPreset == oldName:
                             self.core.openPreset(newPath, i, newName)
                             self.parent.updateComponentTitle(i, False)
@@ -351,8 +351,3 @@ class PresetManager(QtWidgets.QDialog):
 
     def clearPresetListSelection(self):
         self.window.listWidget_presets.setCurrentRow(-1)
-
-
-def getPresetDir(comp):
-    '''Get the preset subdir for a particular version of a component'''
-    return os.path.join(Core.presetDir, str(comp), str(comp.version))