From 26ef72c20128d133b1398346cec3acde7aaee8b8 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Tue, 3 Jun 2014 11:17:58 +0300
Subject: [PATCH] Fixed issue #152.

--HG--
branch : develop
---
 src/app/mainwindow.cpp | 10 +++++-----
 src/app/mainwindow.h   |  2 +-
 src/app/mainwindow.ui  | 15 ++++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 3ef5a7360..652abf98d 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -1292,9 +1292,9 @@ void MainWindow::Open()
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
- * @brief Options config dialog.
+ * @brief Preferences config dialog.
  */
-void MainWindow::Options()
+void MainWindow::Preferences()
 {
     ConfigDialog dlg(this);
     if (dlg.exec() == QDialog::Accepted)
@@ -1701,11 +1701,11 @@ void MainWindow::CreateMenus()
 {
     for (int i = 0; i < MaxRecentFiles; ++i)
     {
-        ui->menuFile->insertAction(ui->actionExit, recentFileActs[i]);
+        ui->menuFile->insertAction(ui->actionPreferences, recentFileActs[i]);
     }
     separatorAct = new QAction(this);
     separatorAct->setSeparator(true);
-    ui->menuFile->insertAction(ui->actionExit, separatorAct);
+    ui->menuFile->insertAction(ui->actionPreferences, separatorAct);
     UpdateRecentFileActions();
 }
 
@@ -1727,7 +1727,7 @@ void MainWindow::CreateActions()
     connect(ui->actionAbout_Qt, &QAction::triggered, this, &MainWindow::AboutQt);
     connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About);
     connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
-    connect(ui->actionOptions, &QAction::triggered, this, &MainWindow::Options);
+    connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences);
     connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);
     ui->actionPattern_properties->setEnabled(false);
 
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index 5fe2a1c1e..87925ea63 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -72,7 +72,7 @@ public slots:
     bool               SaveAs();
     bool               Save();
     void               Open();
-    void               Options();
+    void               Preferences();
     void               NewPattern();
 
     void               currentDrawChanged( int index );
diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui
index 24e0daea6..3ba2bcbfe 100644
--- a/src/app/mainwindow.ui
+++ b/src/app/mainwindow.ui
@@ -47,7 +47,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>144</width>
+         <width>150</width>
          <height>150</height>
         </rect>
        </property>
@@ -302,7 +302,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>100</width>
+         <width>150</width>
          <height>58</height>
         </rect>
        </property>
@@ -378,7 +378,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>100</width>
+         <width>150</width>
          <height>104</height>
         </rect>
        </property>
@@ -579,7 +579,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>100</width>
+         <width>150</width>
          <height>58</height>
         </rect>
        </property>
@@ -676,6 +676,8 @@
     <addaction name="actionSave"/>
     <addaction name="actionSaveAs"/>
     <addaction name="separator"/>
+    <addaction name="actionPreferences"/>
+    <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
@@ -697,7 +699,6 @@
     <addaction name="actionZoomOut"/>
     <addaction name="separator"/>
     <addaction name="actionPattern_properties"/>
-    <addaction name="actionOptions"/>
    </widget>
    <widget class="QMenu" name="menuMeasurements">
     <property name="title">
@@ -1013,9 +1014,9 @@
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionOptions">
+  <action name="actionPreferences">
    <property name="text">
-    <string>Options...</string>
+    <string>Preferences</string>
    </property>
   </action>
   <action name="actionPattern_properties">