Merge branch 'dev' into 'feature/styleTool'

# Conflicts:
#   mainwindow.cpp
#   mainwindow.h
#   mainwindow.ui

mainwindow.h

@@ -22,9 +22,25 @@ 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);
+    void loadAndExportPaths(QStringList fichiers);
+    QString getCurrentFile() const;
+    void setCurrentFile(const QString &newCurrentFile);
+    QList<Path *> getPath() const;
+    void setPath(const QList<Path *> &newPath);
+    Path *getCurrentPath() const;
+    void setCurrentPath(Path *newCurrentPath);
+    void saveAsFile();
+    void copyText();
+    void pastText();
+    void cutText();
+    int getIndexPath() const;
+    void setIndexPath(int newIndexPath);
     void exportHTMLMap();
     void setBold();
     void setItalic();
@@ -33,6 +49,8 @@ public:
     void setOverline();
     void setSize();
     void setFont();
+    void saveFile();
+    void newPath();
 
 private slots:
     void on_pushButton_clicked();
@@ -41,8 +59,9 @@ private slots:
 
     void on_toolButton_clicked();
 
-    void on_actionopenFile_triggered();
+    void on_actionSave_triggered();
 
+    void on_actionopenFile_triggered();
 
     void on_actionEditCopy_triggered();
 
@@ -78,9 +97,35 @@ private slots:
 
     void on_actionFont_size_triggered();
 
+    void on_pathNumber_valueChanged(int arg1);
+
+    void on_stepNumber_valueChanged(int arg1);
+
+    void on_validateBtn_clicked();
+
+    void on_actionSave_as_triggered();
+
+    void on_exportHTMLBtn_clicked();
+
+    void on_actionSaveFile_triggered();
+
+    void on_actionSaveAsFile_triggered();
+
+    void on_actionCopy_triggered();
+
+    void on_actionPast_triggered();
+
+    void on_actionCut_triggered();
+
+    void on_actionNew_triggered();
+
+    void on_actionNewFile_triggered();
+
+
 private:
     Ui::MainWindow *ui;
     QString currentFile;
+    static int indexPath;
     bool textChanged;
     QList<Path*> path;
     Path* currentPath;