From f25ae9384fde5f0e2df8b779d037611b953ba929 Mon Sep 17 00:00:00 2001
From: cosina <none@none>
Date: Thu, 16 Jan 2014 14:54:01 +0100
Subject: [PATCH] created shortcuts for main functions... i'm not shure, if
 this is crossplatform conform and if a macUser is happy with these
 shortcuts...

--HG--
branch : develop
---
 src/mainwindow.cpp | 12 ++++++------
 src/mainwindow.h   |  2 +-
 src/mainwindow.ui  | 42 ++++++++++++++++++++++++++++++++++++------
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 642074f3e..c6161507e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -261,7 +261,7 @@ void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &curso
 {
     if (checked)
     {
-        CanselTool();
+        CancelTool();
         tool = t;
         QPixmap pixmap(cursor);
         QCursor cur(pixmap, 2, 3);
@@ -453,7 +453,7 @@ void MainWindow::ToolDetail(bool checked)
 {
     if (checked)
     {
-        CanselTool();
+        CancelTool();
         tool = Tool::Detail;
         QPixmap pixmap("://cursor/new_detail_cursor.png");
         QCursor cur(pixmap, 2, 3);
@@ -731,7 +731,7 @@ void MainWindow::mouseMove(const QPointF &scenePos)
     mouseCoordinate->setText(string);
 }
 
-void MainWindow::CanselTool()
+void MainWindow::CancelTool()
 {
     switch ( tool )
     {
@@ -863,7 +863,7 @@ void MainWindow::CanselTool()
 
 void  MainWindow::ArrowTool()
 {
-    CanselTool();
+    CancelTool();
     ui->actionArrowTool->setChecked(true);
     tool = Tool::ArrowTool;
     QCursor cur(Qt::ArrowCursor);
@@ -1057,7 +1057,7 @@ void MainWindow::Clear()
     doc->clear();
     sceneDraw->clear();
     sceneDetails->clear();
-    CanselTool();
+    CancelTool();
     comboBoxDraws->clear();
     fileName.clear();
     ui->actionOptionDraw->setEnabled(false);
@@ -1300,7 +1300,7 @@ void MainWindow::AutoSavePattern()
 
 MainWindow::~MainWindow()
 {
-    CanselTool();
+    CancelTool();
     delete ui;
 
     delete pattern;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 72122d673..6a4d6587f 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -523,7 +523,7 @@ private:
     /**
      * @brief CanselTool
      */
-    void               CanselTool();
+    void               CancelTool();
     /**
      * @brief ArrowTool
      */
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index ee1fb6206..a8b6d7b7a 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -48,7 +48,7 @@
          <x>0</x>
          <y>0</y>
          <width>150</width>
-         <height>150</height>
+         <height>144</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -303,7 +303,7 @@
          <x>0</x>
          <y>0</y>
          <width>150</width>
-         <height>58</height>
+         <height>56</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -379,7 +379,7 @@
          <x>0</x>
          <y>0</y>
          <width>150</width>
-         <height>104</height>
+         <height>100</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -507,7 +507,7 @@
          <x>0</x>
          <y>0</y>
          <width>150</width>
-         <height>58</height>
+         <height>56</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -580,7 +580,7 @@
          <x>0</x>
          <y>0</y>
          <width>150</width>
-         <height>58</height>
+         <height>56</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -664,7 +664,7 @@
      <x>0</x>
      <y>0</y>
      <width>1100</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -764,6 +764,9 @@
    <property name="toolTip">
     <string>Create a new pattern</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
   </action>
   <action name="actionOpen">
    <property name="icon">
@@ -793,6 +796,9 @@
    <property name="toolTip">
     <string>Save pattern</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
   <action name="actionSaveAs">
    <property name="enabled">
@@ -809,6 +815,9 @@
    <property name="toolTip">
     <string>Save not yet saved pattern</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
   </action>
   <action name="actionDraw">
    <property name="checkable">
@@ -830,6 +839,9 @@
    <property name="toolTip">
     <string>Draw mode</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+W</string>
+   </property>
   </action>
   <action name="actionDetails">
    <property name="checkable">
@@ -848,6 +860,9 @@
    <property name="toolTip">
     <string>Details mode</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
   </action>
   <action name="actionArrowTool">
    <property name="checkable">
@@ -878,6 +893,9 @@
    <property name="toolTip">
     <string>Add new pattern piece</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+N</string>
+   </property>
   </action>
   <action name="actionOptionDraw">
    <property name="icon">
@@ -905,6 +923,9 @@
    <property name="toolTip">
     <string>Tables of variables</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+T</string>
+   </property>
   </action>
   <action name="actionHistory">
    <property name="checkable">
@@ -917,6 +938,9 @@
    <property name="text">
     <string>History</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+H</string>
+   </property>
   </action>
   <action name="actionLayout">
    <property name="icon">
@@ -929,6 +953,9 @@
    <property name="toolTip">
     <string>Create layout</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
   </action>
   <action name="actionAbout_Qt">
    <property name="text">
@@ -944,6 +971,9 @@
    <property name="text">
     <string>Exit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>