From 24792721613a632c67a91dea932c9c533f6a7fe7 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@f169173b-cf89-36c8-b27e-44dbe73f0c83>
Date: Mon, 14 Jul 2014 01:40:50 +0000
Subject: [PATCH] GUI: Changed "Save" for "Export", moved Export to File menu

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1558 f169173b-cf89-36c8-b27e-44dbe73f0c83
---
 guilib/src/MainWindow.cpp          | 12 ++++++------
 guilib/src/ui/mainWindow.ui        | 11 ++++++-----
 guilib/src/ui/preferencesDialog.ui |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/guilib/src/MainWindow.cpp b/guilib/src/MainWindow.cpp
index 3315c210..af61cb57 100644
--- a/guilib/src/MainWindow.cpp
+++ b/guilib/src/MainWindow.cpp
@@ -2809,8 +2809,8 @@ void MainWindow::savePointClouds()
 	int button = QMessageBox::question(this,
 			tr("One or multiple files?"),
 			tr("Merge all clouds together?"
-			   "\n\nNote that all saving parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
-			   "Preferences -> GUI -> 3D Rendering under Saving column.")
+			   "\n\nNote that all cloud generation parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
+			   "Preferences -> GUI -> 3D Rendering under Exporting column.")
 			   .arg(_preferencesDialog->getCloudDecimation(2))
 			   .arg(_preferencesDialog->getCloudVoxelSize(2))
 			   .arg(_preferencesDialog->getCloudMaxDepth(2)),
@@ -2882,8 +2882,8 @@ void MainWindow::saveMeshes()
 			tr("Merge all clouds together before surface reconstruction?\n"
 			   " Yes: Output a single mesh for the merged clouds.\n"
 			   " No: Output a mesh for each cloud."
-			   "\n\nNote that all saving parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
-			   "Preferences -> GUI -> 3D Rendering under Saving column.")
+			   "\n\nNote that all cloud generation parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
+			   "Preferences -> GUI -> 3D Rendering under Exporting column.")
 			   .arg(_preferencesDialog->getCloudDecimation(2))
 			   .arg(_preferencesDialog->getCloudVoxelSize(2))
 			   .arg(_preferencesDialog->getCloudMaxDepth(2)),
@@ -2972,7 +2972,7 @@ void MainWindow::viewPointClouds()
 	int button = QMessageBox::question(this,
 		tr("One or multiple clouds?"),
 		tr("Merge all clouds together?"
-		   "\n\nNote that all saving parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
+		   "\n\nNote that all cloud generation parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
 		   "Preferences -> GUI -> 3D Rendering under High res view column.")
 		   .arg(_preferencesDialog->getCloudDecimation(2))
 		   .arg(_preferencesDialog->getCloudVoxelSize(2))
@@ -3076,7 +3076,7 @@ void MainWindow::viewMeshes()
 		tr("Merge all clouds together before surface reconstruction?\n"
 		   " Yes: Output a single mesh for the merged clouds.\n"
 		   " No: Output a mesh for each cloud."
-		   "\n\nNote that all saving parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
+		   "\n\nNote that all cloud generation parameters [decimation=%1, voxel=%2m, max depth=%3m] can be found in "
 		   "Preferences -> GUI -> 3D Rendering under High res view column.")
 		   .arg(_preferencesDialog->getCloudDecimation(2))
 		   .arg(_preferencesDialog->getCloudVoxelSize(2))
diff --git a/guilib/src/ui/mainWindow.ui b/guilib/src/ui/mainWindow.ui
index d2437e67..9e89e7ce 100644
--- a/guilib/src/ui/mainWindow.ui
+++ b/guilib/src/ui/mainWindow.ui
@@ -27,13 +27,16 @@
      <x>0</x>
      <y>0</y>
      <width>1012</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>
     </property>
+    <addaction name="actionSave_point_cloud"/>
+    <addaction name="actionSave_mesh_ply_vtk_stl"/>
+    <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>
    <widget class="QMenu" name="menuEdit">
@@ -60,9 +63,7 @@
     <addaction name="actionData_recorder"/>
     <addaction name="separator"/>
     <addaction name="actionView_high_res_point_cloud"/>
-    <addaction name="actionSave_point_cloud"/>
     <addaction name="actionView_point_cloud_as_mesh"/>
-    <addaction name="actionSave_mesh_ply_vtk_stl"/>
    </widget>
    <widget class="QMenu" name="menu6">
     <property name="title">
@@ -917,7 +918,7 @@
   </action>
   <action name="actionSave_point_cloud">
    <property name="text">
-    <string>Save high-res point clouds (*.pcd *.ply *.vtk)...</string>
+    <string>Export point clouds (*.pcd *.ply *.vtk)...</string>
    </property>
   </action>
   <action name="actionDownload_all_clouds">
@@ -973,7 +974,7 @@
   </action>
   <action name="actionSave_mesh_ply_vtk_stl">
    <property name="text">
-    <string>Save meshes (*.ply *.vtk)...</string>
+    <string>Export meshes (*.ply *.vtk)...</string>
    </property>
   </action>
   <action name="actionTrigger_a_new_map">
diff --git a/guilib/src/ui/preferencesDialog.ui b/guilib/src/ui/preferencesDialog.ui
index 83cdd4b4..4754cc9b 100644
--- a/guilib/src/ui/preferencesDialog.ui
+++ b/guilib/src/ui/preferencesDialog.ui
@@ -63,7 +63,7 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-313</y>
+            <y>0</y>
             <width>709</width>
             <height>853</height>
            </rect>
@@ -458,7 +458,7 @@ Show a yellow background when the number of odometry inliers goes under this thr
                        <item row="0" column="2">
                         <widget class="QLabel" name="label_159">
                          <property name="text">
-                          <string>Saving/
+                          <string>Exporting/
 High-res view</string>
                          </property>
                          <property name="alignment">