Merge branch 'dev' into 'feature/web'

# Conflicts:
#   data/parcours2.json
#   mainwindow.cpp
#   mainwindow.h
#   step.cpp
#   step.h

mainwindow.h

@@ -2,7 +2,8 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-
+#include <QUndoStack>
+#include <QClipboard>
 #include "path.h"
 
 QT_BEGIN_NAMESPACE
@@ -21,7 +22,9 @@ public:
     void updatePathView();
     void updateStepView(size_t num);
     void onTextChanged();
-    void loadPath();
+    void loadNewPath();
+    void loadPath(Path* p);
+    void loadStep(Step s);
     void addNewPath();
     void addNewStep();
     void exportHTMLMap(int index);
@@ -35,6 +38,8 @@ public:
 
     int getIndexPath() const;
     void setIndexPath(int newIndexPath);
+    void exportHTMLMap();
+    void saveFile();
 
 private slots:
     void on_pushButton_clicked();
@@ -43,6 +48,22 @@ private slots:
 
     void on_toolButton_clicked();
 
+    void on_actionSave_triggered();
+
+    void on_actionopenFile_triggered();
+
+    void on_actionEditCopy_triggered();
+
+    void on_actionEditPaste_triggered();
+
+    void on_actionEditCut_triggered();
+
+    void on_pathNumber_valueChanged(int arg1);
+
+    void on_stepNumber_valueChanged(int arg1);
+
+    void on_validateBtn_clicked();
+
 private:
     Ui::MainWindow *ui;
     QString currentFile;
@@ -51,5 +72,7 @@ private:
     QList<Path*> path;
     Path* currentPath;
     void loadImage(QString fileName);
+    QUndoStack *undoStack;
+    QClipboard* Clipboard;
 };
 #endif // MAINWINDOW_H