Merge branch 'master' into thread_cleanup

README.md

@@ -10,7 +10,7 @@ A Qt and C++ GUI for radare2 reverse engineering framework
 
 ## Disclaimer
 
-Iaitō is not aimed to the already existing radare2 user, it is focused on those whose are not yet radare2 users because of the learning curve, because they don't like CLI applications or because of the difficulty/inestability of radare2.
+Iaitō is not aimed at existing radare2 users, it is focused on those whose are not yet radare2 users because of the learning curve, they don't like CLI applications or the difficulty/instability of radare2.
 
 **IMPORTANT:** the current status is **highly unstable**, it is an alpha version aimed for developers. Users please wait for the first stable release with installers.
 

src/Iaito.pro

@@ -23,7 +23,7 @@ QT       += core gui webkit webkitwidgets
 QT_CONFIG -= no-pkg-config
 
 macx {
-	QMAKE_CXXFLAGS = -mmacosx-version-min=10.7 -std=gnu0x -stdlib=libc+
+        QMAKE_CXXFLAGS = -mmacosx-version-min=10.7 -std=gnu0x -stdlib=libc++
 		EXTSO=dylib
 } else {
 	win32 {

src/mainwindow.cpp

@@ -1111,3 +1111,8 @@ void MainWindow::on_actionReset_settings_triggered()
         settings.clear();
     }
 }
+
+void MainWindow::on_actionQuit_triggered()
+{
+    close();
+}

src/mainwindow.h

@@ -191,6 +191,8 @@ private slots:
 
     void webserverThreadFinished();
 
+    void on_actionQuit_triggered();
+
 private:
     void refreshFlagspaces();
     bool doLock;

src/mainwindow.ui

@@ -25,7 +25,7 @@
   </property>
   <property name="styleSheet">
    <string notr="true">QHeaderView::section {
-     color: drakgray;
+     color: darkgray;
      padding: 3px;
      padding-left: 10px;
      background-color: rgb(232, 232, 232);
@@ -347,6 +347,7 @@ QToolButton { /* all types of tool button */
     <addaction name="separator"/>
     <addaction name="actionRun_Script"/>
     <addaction name="separator"/>
+    <addaction name="actionQuit"/>
    </widget>
    <widget class="QMenu" name="menuTools">
     <property name="title">
@@ -1087,6 +1088,14 @@ background: rgb(64, 64, 64);</string>
     <string>Reset settings</string>
    </property>
   </action>
+  <action name="actionQuit">
+   <property name="text">
+    <string>Quit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>