Implemented undo functionality for Movie Watchlist

Author: vanpana

MovieTableModel.cpp

@@ -3,6 +3,8 @@
 //
 
 #include "MovieTableModel.h"
+#include <string>
+
 using namespace std;
 
 QVariant MovieTableModel::data(const QModelIndex &index, int role) const
@@ -26,7 +28,7 @@ QVariant MovieTableModel::data(const QModelIndex &index, int role) const
             case 1:
                 return QString::fromStdString(currentMovie.getGenre());
             case 2:
-                return QString::fromStdString(to_string(currentMovie.getLikes()));
+                return QString::fromStdString(currentMovie.getTrailer());
         }
     }
 

MovieTableModel.cpp.autosave

@@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_userMode_t {
-    QByteArrayData data[8];
-    char stringdata0[152];
+    QByteArrayData data[9];
+    char stringdata0[174];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -38,13 +38,15 @@ QT_MOC_LITERAL(3, 38, 24), // "on_trailerButton_clicked"
 QT_MOC_LITERAL(4, 63, 20), // "on_addButton_clicked"
 QT_MOC_LITERAL(5, 84, 21), // "on_nextButton_clicked"
 QT_MOC_LITERAL(6, 106, 21), // "on_openButton_clicked"
-QT_MOC_LITERAL(7, 128, 23) // "on_deleteButton_clicked"
+QT_MOC_LITERAL(7, 128, 23), // "on_deleteButton_clicked"
+QT_MOC_LITERAL(8, 152, 21) // "on_undoButton_clicked"
 
     },
     "userMode\0on_suggestionButton_clicked\0"
     "\0on_trailerButton_clicked\0"
     "on_addButton_clicked\0on_nextButton_clicked\0"
-    "on_openButton_clicked\0on_deleteButton_clicked"
+    "on_openButton_clicked\0on_deleteButton_clicked\0"
+    "on_undoButton_clicked"
 };
 #undef QT_MOC_LITERAL
 
@@ -54,27 +56,29 @@ static const uint qt_meta_data_userMode[] = {
        7,       // revision
        0,       // classname
        0,    0, // classinfo
-       6,   14, // methods
+       7,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags
-       1,    0,   44,    2, 0x08 /* Private */,
-       3,    0,   45,    2, 0x08 /* Private */,
-       4,    0,   46,    2, 0x08 /* Private */,
-       5,    0,   47,    2, 0x08 /* Private */,
-       6,    0,   48,    2, 0x08 /* Private */,
-       7,    0,   49,    2, 0x08 /* Private */,
+       1,    0,   49,    2, 0x08 /* Private */,
+       3,    0,   50,    2, 0x08 /* Private */,
+       4,    0,   51,    2, 0x08 /* Private */,
+       5,    0,   52,    2, 0x08 /* Private */,
+       6,    0,   53,    2, 0x08 /* Private */,
+       7,    0,   54,    2, 0x08 /* Private */,
+       8,    0,   55,    2, 0x08 /* Private */,
 
  // slots: parameters
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
     QMetaType::Void,
+    QMetaType::Void,
     QMetaType::Void,
 
        0        // eod
@@ -92,6 +96,7 @@ void userMode::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         case 3: _t->on_nextButton_clicked(); break;
         case 4: _t->on_openButton_clicked(); break;
         case 5: _t->on_deleteButton_clicked(); break;
+        case 6: _t->on_undoButton_clicked(); break;
         default: ;
         }
     }
@@ -123,13 +128,13 @@ int userMode::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 6)
+        if (_id < 7)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 6;
+        _id -= 7;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 6)
+        if (_id < 7)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 6;
+        _id -= 7;
     }
     return _id;
 }

moc_usermode.cpp

@@ -7,6 +7,7 @@ using namespace std;
 WatchList::WatchList(string type)
 {
     this->movieList = vector<Movie>();
+    this->backupList = vector<vector<Movie> >();
     this->currentPos = 0;
     this->maximumPos = 0;
     this->suggestions = vector<Movie>();
@@ -15,6 +16,7 @@ WatchList::WatchList(string type)
 
 void WatchList::add()
 {
+    backupList.push_back(getArray());
     this->movieList.push_back(this->suggestions[this->currentPos]);
     this->suggestions.erase(this->suggestions.begin() + this->currentPos);
     this->currentPos--;
@@ -35,6 +37,7 @@ int WatchList::getPosition(string name)
 
 int WatchList::del(string title)
 {
+    backupList.push_back(getArray());
     int pos = getPosition(title);
 
     if (pos == -1)

repository/watchlist.cpp

@@ -12,6 +12,7 @@ class WatchList
 protected:
     vector<Movie> movieList;
     vector<Movie> suggestions;
+    vector<vector<Movie> > backupList;
     int currentPos, maximumPos;
     string type;
 
@@ -47,6 +48,8 @@ class WatchList
     virtual void openInApp() = 0;
 
     string getType() const { return this->type; }
+
+    void undo() { this->movieList = backupList[backupList.size() - 1]; backupList.pop_back(); };
 };
 
 class CSVWatchList : public WatchList
@@ -60,4 +63,4 @@ class HTMLWatchList : public WatchList
     void saveToFile();
     void openInApp();
 };
-#endif //LMDB_WATCHLIST_H
+#endif //LMDB_WATCHLIST_H

repository/watchlist.h

@@ -39,6 +39,7 @@ class Ui_userMode
     QListWidget *items;
     QPushButton *openButton;
     QTableView *tableView;
+    QPushButton *undoButton;
 
     void setupUi(QDialog *userMode)
     {
@@ -82,6 +83,9 @@ class Ui_userMode
         tableView = new QTableView(userMode);
         tableView->setObjectName(QStringLiteral("tableView"));
         tableView->setGeometry(QRect(70, 210, 256, 192));
+        undoButton = new QPushButton(userMode);
+        undoButton->setObjectName(QStringLiteral("undoButton"));
+        undoButton->setGeometry(QRect(10, 390, 61, 32));
 
         retranslateUi(userMode);
 
@@ -98,6 +102,7 @@ class Ui_userMode
         addButton->setText(QApplication::translate("userMode", "Add Movie", Q_NULLPTR));
         nextButton->setText(QApplication::translate("userMode", "Next Movie", Q_NULLPTR));
         openButton->setText(QApplication::translate("userMode", "Open in App", Q_NULLPTR));
+        undoButton->setText(QApplication::translate("userMode", "Undo", Q_NULLPTR));
     } // retranslateUi
 
 };

ui_usermode.h

@@ -2,6 +2,9 @@
 #include "ui_usermode.h"
 #include "MovieTableModel.h"
 
+void userMode::updateTable()
+ { MovieTableModel *mymodel = new MovieTableModel(wlist); ui->tableView->setModel(mymodel); }
+
 userMode::userMode(Controller ctrl, WatchList *wlist, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::userMode)
@@ -98,3 +101,15 @@ void userMode::on_deleteButton_clicked()
 
     this->updateTable();
 }
+
+void userMode::on_undoButton_clicked()
+{
+    this->wlist->undo();
+
+    ui->items->clear();
+
+    for (Movie mov: wlist->getArray())
+        ui->items->addItem(QString::fromStdString(mov.toStr()));
+
+    this->updateTable();
+}

usermode.cpp

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include "repository/watchlist.h"
 #include "controller/controller.h"
+#include "MovieTableModel.h"
 
 namespace Ui {
 class userMode;
@@ -13,9 +14,14 @@ class userMode : public QDialog
 {
     Q_OBJECT
 
+private:
+    Ui::userMode *ui;
+    Controller ctrl;
+    WatchList *wlist;
+
 public:
     explicit userMode(Controller ctrl, WatchList *wlist, QWidget *parent = 0);
-    void updateTable() { MovieTableModel *mymodel = new MovieTableModel(wlist); ui->tableView->setModel(mymodel); }
+    void updateTable();
     ~userMode();
 
 private slots:
@@ -31,10 +37,9 @@ private slots:
 
     void on_deleteButton_clicked();
 
-private:
-    Ui::userMode *ui;
-    Controller ctrl;
-    WatchList *wlist;
+    void on_undoButton_clicked();
+
+
 };
 
 #endif // USERMODE_H

usermode.h

@@ -157,6 +157,19 @@
     </rect>
    </property>
   </widget>
+  <widget class="QPushButton" name="undoButton">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>390</y>
+     <width>61</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Undo</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>