From 343225dcc20ae707bb26727c4f56b8a3d7af6bb2 Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Fri, 10 Apr 2015 15:25:58 +0100
Subject: [PATCH] FEM: Show material description below combo box

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
---
 src/Mod/Fem/MechanicalMaterial.py |  4 ++++
 src/Mod/Fem/MechanicalMaterial.ui | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/MechanicalMaterial.py
index 8a6fdccb8219..03021824b995 100644
--- a/src/Mod/Fem/MechanicalMaterial.py
+++ b/src/Mod/Fem/MechanicalMaterial.py
@@ -188,6 +188,10 @@ def chooseMat(self, index):
         self.obj.Material = Material.importFCMat(str(name))
         self.form.comboBox_MaterialsInDir.setCurrentIndex(index)
         self.set_mat_params_in_combo_box(self.obj.Material)
+        gen_mat_desc = ""
+        if 'General_description' in self.obj.Material:
+            gen_mat_desc = self.obj.Material['General_description']
+        self.form.l_mat_description.setText(gen_mat_desc)
         self.print_mat_data(self.obj.Material)
 
     def add_mat_dir(self, mat_dir, icon):
diff --git a/src/Mod/Fem/MechanicalMaterial.ui b/src/Mod/Fem/MechanicalMaterial.ui
index c4d15aa4afff..fceef1b488fa 100644
--- a/src/Mod/Fem/MechanicalMaterial.ui
+++ b/src/Mod/Fem/MechanicalMaterial.ui
@@ -117,6 +117,16 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLabel" name="l_mat_description">
+     <property name="text">
+      <string>Material Description</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>