Add undo/redo support (#59)

* Add undo/redo support

* Update Qt to 6.4.3 in CI

.clang-format

@@ -15,5 +15,7 @@ SpacesInCStyleCastParentheses: 'false'
 SpacesInContainerLiterals: 'false'
 SpacesInParentheses: 'false'
 SpacesInSquareBrackets: 'false'
+BraceWrapping:
+  BeforeLambdaBody: 'true'
 
 ...

.github/workflows/build_test.yml

@@ -22,7 +22,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - GCC
@@ -117,7 +117,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - MSVC
@@ -200,7 +200,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
 

.github/workflows/release_assets.yml

@@ -20,7 +20,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - GCC
@@ -112,7 +112,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - MSVC
@@ -177,7 +177,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
 
@@ -238,7 +238,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - GCC
@@ -302,7 +302,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
           - MSVC
@@ -349,7 +349,7 @@ jobs:
         qt_version:
           - 5.15.2 # OS LTS
           - 6.2.4 # LTS Standard
-          - 6.4.2 # latest
+          - 6.4.3 # latest
         compiler:
           - Clang
 

CMakeLists.txt

@@ -181,6 +181,8 @@ if(WIN32)
         # Enable all warnings in application code
         /Wall /permissive- /WX
         # Disable some warnings
+        # C4371: 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member'
+        /wd4371
         # C4464: relative include path contains '..
         /wd4464
         # C4702: unreachable code
@@ -215,6 +217,7 @@ target_sources(${PROJECT_NAME} PRIVATE
     src/devicepathview.cpp
     src/devicepathproxymodel.cpp
     src/driveinfo.cpp
+    src/efibootdata.cpp
     src/efibooteditor.cpp
 )
 
@@ -252,13 +255,16 @@ target_sources(${PROJECT_NAME} PRIVATE
     include/bootentrylistmodel.h
     include/bootentrylistview.h
     include/bootentrywidget.h
+    include/commands.h
     include/compat.h
+    include/disableundoredo.h
     include/filepathdelegate.h
     include/filepathdialog.h
     include/devicepathview.h
     include/devicepathproxymodel.h
     include/driveinfo.h
     include/efiboot.h
+    include/efibootdata.h
     include/efibooteditor.h
     include/efivar-lite/efiboot-loadopt.h
     include/efivar-lite/efivar-dp.h

include/bootentry.h

@@ -497,7 +497,7 @@ class BootEntry
     QString description = "New entry";
     QVector<File_path::ANY> device_path = {};
     QString optional_data = "";
-    EFIBoot::Load_option_attribute attributes = EFIBoot::Load_option_attribute::EMPTY;
+    uint32_t attributes = EFIBoot::Load_option_attribute::EMPTY;
     uint32_t efi_attributes = EFIBoot::EFI_VARIABLE_ATTRIBUTE_DEFAULTS;
 
     bool is_current_boot = false;
@@ -516,8 +516,9 @@ class BootEntry
     QJsonObject toJSON() const;
 
     QString formatDevicePath(bool refresh = true) const;
+    QString getTitle() const;
 
-    bool changeOptionalDataFormat(OptionalDataFormat format);
+    bool changeOptionalDataFormat(OptionalDataFormat format, bool test = false);
 
 private:
     QByteArray getRawOptionalData() const;

include/bootentryform.h

@@ -17,6 +17,14 @@ class BootEntryForm: public QWidget
 {
     Q_OBJECT
 
+private:
+    std::unique_ptr<Ui::BootEntryForm> ui;
+    BootEntryListModel *entries_list_model{nullptr};
+    DevicePathProxyModel device_path_proxy_model{};
+    QModelIndex current_index{};
+    const BootEntry *current_item{nullptr};
+    bool changing_optional_data_format{false};
+
 public:
     explicit BootEntryForm(QWidget *parent = nullptr);
     BootEntryForm(const BootEntryForm &) = delete;
@@ -28,20 +36,13 @@ class BootEntryForm: public QWidget
     void setBootEntryListModel(BootEntryListModel &model);
     void setItem(const QModelIndex &index, const BootEntry *item);
 
-private:
-    std::unique_ptr<Ui::BootEntryForm> ui;
-    BootEntryListModel *entries_list_model = nullptr;
-    DevicePathProxyModel device_path_proxy_model{};
-    QModelIndex current_index = {};
-    const BootEntry *current_item = nullptr;
-
 private slots:
-    void indexEdited(const QString &text);
-    void descriptionEdited(const QString &text);
-    void optionalDataFormatChanged(int format);
+    void setIndex(const QString &text);
+    void setDescription(const QString &text);
+    void setOptionalDataFormat(int format);
     void optionalDataEdited();
-    void attributeActiveChanged(int state);
-    void attributeHiddenChanged(int state);
-    void attributeForceReconnectChanged(int state);
-    void categoryChanged(int index);
+    void setAttribute(int state);
+
+private:
+    uint32_t getAttributes() const;
 };

include/bootentrylistmodel.h

@@ -4,39 +4,71 @@
 #include "bootentry.h"
 #include <QAbstractListModel>
 #include <QList>
+#include <QUndoStack>
 
 typedef std::function<bool(BootEntry &)> Change_fn;
 
 class BootEntryListModel: public QAbstractListModel
 {
     Q_OBJECT
+
+    friend class EFIBootData;
+    friend class InsertRemoveBootEntryCommand;
+    friend class InsertBootEntryCommand;
+    friend class RemoveBootEntryCommand;
+    friend class MoveBootEntryCommand;
+
+    template <class Type>
+    friend class SetBootEntryValueCommand;
+    friend class ChangeOptionalDataFormatCommand;
+    friend class SetBootEntryFilePathCommand;
+    friend class InsertRemoveBootEntryFilePathCommand;
+    friend class InsertBootEntryFilePathCommand;
+    friend class RemoveBootEntryFilePathCommand;
+    friend class MoveBootEntryFilePathCommand;
+
 public:
+    const QString name;
     const bool readonly;
 
 private:
-    QVector<BootEntry> entries = {};
-    QModelIndex next_boot = {};
+    QVector<BootEntry> entries{};
+    QModelIndex next_boot{};
+    QUndoStack *undo_stack{nullptr};
 
 public:
-    explicit BootEntryListModel(QObject *parent = nullptr, bool readonly_ = false);
+    explicit BootEntryListModel(const QString &name_, bool readonly_ = false, QObject *parent = nullptr);
     BootEntryListModel(const BootEntryListModel &) = delete;
     BootEntryListModel &operator=(const BootEntryListModel &) = delete;
 
+    void setUndoStack(QUndoStack *undo_stack_);
+    QUndoStack *getUndoStack() const;
+
     // Header:
     QVariant headerData(int, Qt::Orientation, int = Qt::DisplayRole) const override { return {}; }
 
     // Basic functionality:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    bool changeData(const QModelIndex &index, const Change_fn &change_fn, int role = Qt::EditRole);
     void setNextBootEntry(const QModelIndex &index, bool value);
 
+    void setEntryFilePath(const QModelIndex &index, int row, const File_path::ANY &file_path);
+    void insertEntryFilePath(const QModelIndex &index, int row, const File_path::ANY &file_path);
+    void removeEntryFilePath(const QModelIndex &index, int row);
+    void moveEntryFilePath(const QModelIndex &index, int source_row, int destination_row);
+    void clearEntryDevicePath(const QModelIndex &index);
+    void setEntryIndex(const QModelIndex &index, uint16_t value);
+    void setEntryDescription(const QModelIndex &index, const QString &text);
+    bool changeEntryOptionalDataFormat(const QModelIndex &index, int format);
+    void setEntryOptionalData(const QModelIndex &index, const QString &text);
+    void setEntryAttributes(const QModelIndex &index, uint32_t value);
+    void setEntryNextBoot(const QModelIndex &index, bool value);
+
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
     // Add data:
     bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
-    bool appendRow(const BootEntry &data, const QModelIndex &parent = QModelIndex());
 
     // Remove data:
     bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
@@ -47,4 +79,7 @@ class BootEntryListModel: public QAbstractListModel
     void clear();
 
     const QVector<BootEntry> &getEntries() const { return entries; }
+
+private:
+    bool appendRow(const BootEntry &data, const QModelIndex &parent = QModelIndex());
 };

include/bootentrylistview.h

@@ -33,4 +33,7 @@ public slots:
     void removeCurrentRow();
     void moveCurrentRowUp();
     void moveCurrentRowDown();
+
+    void rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow);
+    void rowsChanged(const QModelIndex &parent, int first, int last);
 };