From 24793f0d82e7e30b31a80599f19af91bab527d4a Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 2 Mar 2017 21:55:04 +0100
Subject: [PATCH] fix doc strings, replace label with check box in export panel

---
 src/Mod/Mesh/App/AppMeshPy.cpp              |  8 ++--
 src/Mod/Mesh/Gui/DlgSettingsImportExport.ui | 47 +++++++++------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp
index 76d044ab551d..fcc3e23bff21 100644
--- a/src/Mod/Mesh/App/AppMeshPy.cpp
+++ b/src/Mod/Mesh/App/AppMeshPy.cpp
@@ -69,7 +69,7 @@ class Module : public Py::ExtensionModule<Module>
         );
         add_varargs_method("open",&Module::open,
             "open(string)\n"
-            "Create a new document and a Mesh::Import feature to load the file into\n"
+            "Create a new document and a Mesh feature to load the file into\n"
             "the document."
         );
         add_varargs_method("insert",&Module::importer,
@@ -127,11 +127,11 @@ class Module : public Py::ExtensionModule<Module>
         );
         initialize("The functions in this module allow working with mesh objects.\n"
                    "A set of functions are provided for reading in registered mesh\n"
-                   "file formats to either an new or exising document.\n"
+                   "file formats to either a new or exising document.\n"
                    "\n"
-                   "open(string) -- Create a new document and a Mesh::Import feature\n"
+                   "open(string) -- Create a new document and a Mesh feature\n"
                    "                to load the file into the document.\n"
-                   "insert(string, string) -- Create a Mesh::Import feature to load\n"
+                   "insert(string, string) -- Create a Mesh feature to load\n"
                    "                          the file into the given document.\n"
                    "Mesh() -- Create an empty mesh object.\n"
                    "\n");
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
index ba8c1531d0b2..684f96094745 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
@@ -14,19 +14,6 @@
    <string>Mesh Formats</string>
   </property>
   <layout class="QGridLayout">
-   <item row="1" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>61</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="GroupBox12">
      <property name="title">
@@ -68,16 +55,9 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QLabel" name="textLabel2">
-          <property name="text">
-           <string>Export AMF files using compression</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
          <widget class="Gui::PrefCheckBox" name="exportAmfCompressed">
           <property name="text">
-           <string/>
+           <string>Export AMF files using compression</string>
           </property>
           <property name="checked">
            <bool>true</bool>
@@ -95,20 +75,33 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>61</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-   <customwidget>
-     <class>Gui::QuantitySpinBox</class>
-     <extends>QWidget</extends>
-   <header>Gui/PrefWidgets.h</header>
+  <customwidget>
+   <class>Gui::QuantitySpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
   <customwidget>
    <class>Gui::PrefCheckBox</class>
    <extends>QCheckBox</extends>
-     <header>Gui/PrefWidgets.h</header>
-   </customwidget>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>