created proper class for main menu

4 files changed, 234 insertions, 55 deletions

diff --git a/tikzit/src/gui/mainmenu.cpp b/tikzit/src/gui/mainmenu.cpp
new file mode 100644
index 0000000..6c8f395
--- /dev/null
+++ b/tikzit/src/gui/mainmenu.cpp
@@ -0,0 +1,94 @@
+#include "mainmenu.h"
+#include "tikzit.h"
+
+MainMenu::MainMenu()
+{
+    ui.setupUi(this);
+}
+
+// File
+void MainMenu::on_actionNew_triggered()
+{
+    tikzit->newDoc();
+}
+
+void MainMenu::on_actionOpen_triggered()
+{
+    tikzit->open();
+}
+
+void MainMenu::on_actionClose_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionSave_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionSave_As_triggered()
+{
+    // TODO
+}
+
+
+// Edit
+void MainMenu::on_actionUndo_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionRedo_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionCut_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionCopy_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionPaste_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionDelete_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionSelect_All_triggered()
+{
+    // TODO
+}
+
+void MainMenu::on_actionDeselect_All_triggered()
+{
+    // TODO
+}
+
+
+// Tikz
+void MainMenu::on_actionParse_triggered()
+{
+    // TODO
+}
+
+
+// View
+void MainMenu::on_actionZoom_In_triggered()
+{
+    if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomIn();
+}
+
+void MainMenu::on_actionZoom_Out_triggered()
+{
+    if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut();
+}
diff --git a/tikzit/src/gui/mainmenu.h b/tikzit/src/gui/mainmenu.h
new file mode 100644
index 0000000..d85e271
--- /dev/null
+++ b/tikzit/src/gui/mainmenu.h
@@ -0,0 +1,43 @@
+#ifndef MAINMENU_H
+#define MAINMENU_H
+
+#include "ui_mainmenu.h"
+
+#include <QMenuBar>
+
+class MainMenu : public QMenuBar
+{
+    Q_OBJECT
+public:
+    MainMenu();
+
+private:
+    Ui::MainMenu ui;
+
+public slots:
+    // File
+    void on_actionNew_triggered();
+    void on_actionOpen_triggered();
+    void on_actionClose_triggered();
+    void on_actionSave_triggered();
+    void on_actionSave_As_triggered();
+
+    // Edit
+    void on_actionUndo_triggered();
+    void on_actionRedo_triggered();
+    void on_actionCut_triggered();
+    void on_actionCopy_triggered();
+    void on_actionPaste_triggered();
+    void on_actionDelete_triggered();
+    void on_actionSelect_All_triggered();
+    void on_actionDeselect_All_triggered();
+
+    // Tikz
+    void on_actionParse_triggered();
+
+    // View
+    void on_actionZoom_In_triggered();
+    void on_actionZoom_Out_triggered();
+};
+
+#endif // MAINMENU_H
diff --git a/tikzit/src/gui/mainmenu.ui b/tikzit/src/gui/mainmenu.ui
index d3eed0a..c9b6f44 100644
--- a/tikzit/src/gui/mainmenu.ui
+++ b/tikzit/src/gui/mainmenu.ui
@@ -1,122 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
-  <class>MainMenu</class>
-  <widget class="QMenuBar" name="MainMenu">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>476</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionNew"/>
-    <addaction name="actionOpen"/>
-    <addaction name="separator"/>
-    <addaction name="actionClose"/>
-    <addaction name="actionSave"/>
-    <addaction name="actionSave_As"/>
-   </widget>
-   <widget class="QMenu" name="menuEdit">
-    <property name="title">
-     <string>Edit</string>
-    </property>
-    <addaction name="actionUndo"/>
-    <addaction name="actionRedo"/>
-    <addaction name="separator"/>
-    <addaction name="actionCut"/>
-    <addaction name="actionCopy"/>
-    <addaction name="actionPase"/>
-    <addaction name="actionDelete"/>
-    <addaction name="separator"/>
-    <addaction name="actionSelect_All"/>
-    <addaction name="actionDeselect_All"/>
-   </widget>
-   <widget class="QMenu" name="menuTikz">
-    <property name="title">
-     <string>Tikz</string>
-    </property>
-    <addaction name="actionParse"/>
-   </widget>
-   <widget class="QMenu" name="menuView">
-    <property name="title">
-     <string>View</string>
-    </property>
-    <addaction name="actionZoom_In"/>
-    <addaction name="actionZoom_Out"/>
-   </widget>
-   <addaction name="menuFile"/>
-   <addaction name="menuEdit"/>
-   <addaction name="menuView"/>
-   <addaction name="menuTikz"/>
+ <class>MainMenu</class>
+ <widget class="QMenuBar" name="MainMenu">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>476</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <widget class="QMenu" name="menuFile">
+   <property name="title">
+    <string>File</string>
+   </property>
+   <addaction name="actionNew"/>
+   <addaction name="actionOpen"/>
+   <addaction name="separator"/>
+   <addaction name="actionClose"/>
+   <addaction name="actionSave"/>
+   <addaction name="actionSave_As"/>
+  </widget>
+  <widget class="QMenu" name="menuEdit">
+   <property name="title">
+    <string>Edit</string>
+   </property>
+   <addaction name="actionUndo"/>
+   <addaction name="actionRedo"/>
+   <addaction name="separator"/>
+   <addaction name="actionCut"/>
+   <addaction name="actionCopy"/>
+   <addaction name="actionPaste"/>
+   <addaction name="actionDelete"/>
+   <addaction name="separator"/>
+   <addaction name="actionSelect_All"/>
+   <addaction name="actionDeselect_All"/>
+  </widget>
+  <widget class="QMenu" name="menuTikz">
+   <property name="title">
+    <string>Tikz</string>
+   </property>
+   <addaction name="actionParse"/>
+  </widget>
+  <widget class="QMenu" name="menuView">
+   <property name="title">
+    <string>View</string>
+   </property>
+   <addaction name="actionZoom_In"/>
+   <addaction name="actionZoom_Out"/>
+  </widget>
   <action name="actionNew">
    <property name="text">
     <string>New...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
   </action>
   <action name="actionOpen">
    <property name="text">
     <string>Open...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
   </action>
   <action name="actionClose">
    <property name="text">
     <string>Close</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+W</string>
+   </property>
   </action>
   <action name="actionSave">
    <property name="text">
     <string>Save</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
   <action name="actionSave_As">
    <property name="text">
     <string>Save As...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
   </action>
   <action name="actionUndo">
    <property name="text">
     <string>Undo</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Z</string>
+   </property>
   </action>
   <action name="actionRedo">
    <property name="text">
     <string>Redo</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+Z</string>
+   </property>
   </action>
   <action name="actionCut">
    <property name="text">
     <string>Cut</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+X</string>
+   </property>
   </action>
   <action name="actionCopy">
    <property name="text">
     <string>Copy</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+C</string>
+   </property>
   </action>
-  <action name="actionPase">
+  <action name="actionPaste">
    <property name="text">
     <string>Paste</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+V</string>
+   </property>
   </action>
   <action name="actionDelete">
    <property name="text">
     <string>Delete</string>
    </property>
+   <property name="shortcut">
+    <string>Backspace</string>
+   </property>
   </action>
   <action name="actionSelect_All">
    <property name="text">
     <string>Select All</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+A</string>
+   </property>
   </action>
   <action name="actionDeselect_All">
    <property name="text">
     <string>Deselect All</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+D</string>
+   </property>
   </action>
   <action name="actionParse">
    <property name="text">
@@ -142,5 +177,11 @@
     <string>Ctrl+-</string>
    </property>
   </action>
-</widget>
+  <addaction name="menuFile"/>
+  <addaction name="menuEdit"/>
+  <addaction name="menuView"/>
+  <addaction name="menuTikz"/>
+ </widget>
+ <resources/>
+ <connections/>
 </ui>
diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp
index 0520af2..740c0eb 100644
--- a/tikzit/src/gui/mainwindow.cpp
+++ b/tikzit/src/gui/mainwindow.cpp
@@ -37,6 +37,7 @@ MainWindow::MainWindow(QWidget *parent) :
 MainWindow::~MainWindow()
 {
     tikzit->removeWindow(this);
+    delete ui;
 }
 
 void MainWindow::open(QString fileName)