FEM: prefs, move general prefs to general prefs class

src/Mod/Fem/Gui/AppFemGui.cpp

@@ -33,7 +33,7 @@
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
 #include "PropertyFemMeshItem.h"
-#include "DlgSettingsFemImp.h"
+#include "DlgSettingsFemGeneralImp.h"
 #include "DlgSettingsFemCcxImp.h"
 #include "ViewProviderFemMesh.h"
 #include "ViewProviderFemMeshShape.h"
@@ -148,7 +148,7 @@ PyMODINIT_FUNC initFemGui()
 
 
     // register preferences pages
-    new Gui::PrefPageProducer<FemGui::DlgSettingsFemImp> (QT_TRANSLATE_NOOP("QObject","FEM"));
+    new Gui::PrefPageProducer<FemGui::DlgSettingsFemGeneralImp> (QT_TRANSLATE_NOOP("QObject","FEM"));
     new Gui::PrefPageProducer<FemGui::DlgSettingsFemCcxImp> (QT_TRANSLATE_NOOP("QObject","FEM"));
 
      // add resources and reloads the translators

src/Mod/Fem/Gui/CMakeLists.txt

@@ -51,8 +51,8 @@ SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
 
 set(FemGui_MOC_HDRS
-    DlgSettingsFemImp.h
     DlgSettingsFemCcxImp.h
+    DlgSettingsFemGeneralImp.h
     PropertyFemMeshItem.h
     TaskObjectName.h
     TaskCreateNodeSet.h
@@ -88,8 +88,8 @@ fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
 
 set(FemGui_UIC_SRCS
-    DlgSettingsFem.ui
     DlgSettingsFemCcx.ui
+    DlgSettingsFemGeneral.ui
     TaskCreateNodeSet.ui
     TaskObjectName.ui
     TaskFemConstraint.ui
@@ -124,12 +124,12 @@ qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
 
 SET(FemGui_DLG_SRCS
     ${FemGui_UIC_HDRS}
-    DlgSettingsFem.ui
-    DlgSettingsFemImp.cpp
-    DlgSettingsFemImp.h
     DlgSettingsFemCcx.ui
     DlgSettingsFemCcxImp.cpp
     DlgSettingsFemCcxImp.h
+    DlgSettingsFemGeneral.ui
+    DlgSettingsFemGeneralImp.cpp
+    DlgSettingsFemGeneralImp.h
     TaskFemConstraint.ui
     TaskFemConstraint.cpp
     TaskFemConstraint.h

src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>FemGui::DlgSettingsFemImp</class>
- <widget class="QWidget" name="FemGui::DlgSettingsFemImp">
+ <class>FemGui::DlgSettingsFemGeneralImp</class>
+ <widget class="QWidget" name="FemGui::DlgSettingsFemGeneralImp">
   <property name="geometry">
    <rect>
     <x>0</x>

src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp

@@ -26,23 +26,23 @@
 #include "PreCompiled.h"
 
 #include "Gui/Application.h"
-#include "DlgSettingsFemImp.h"
+#include "DlgSettingsFemGeneralImp.h"
 #include <Gui/PrefWidgets.h>
 
 using namespace FemGui;
 
-DlgSettingsFemImp::DlgSettingsFemImp( QWidget* parent )
+DlgSettingsFemGeneralImp::DlgSettingsFemGeneralImp( QWidget* parent )
   : PreferencePage( parent )
 {
     this->setupUi(this);
 }
 
-DlgSettingsFemImp::~DlgSettingsFemImp()
+DlgSettingsFemGeneralImp::~DlgSettingsFemGeneralImp()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
-void DlgSettingsFemImp::saveSettings()
+void DlgSettingsFemGeneralImp::saveSettings()
 {
     fc_analysis_working_directory->onSave();
 
@@ -58,7 +58,7 @@ void DlgSettingsFemImp::saveSettings()
     cb_hide_constraint->onSave();
 }
 
-void DlgSettingsFemImp::loadSettings()
+void DlgSettingsFemGeneralImp::loadSettings()
 {
     fc_analysis_working_directory->onRestore();
 
@@ -77,7 +77,7 @@ void DlgSettingsFemImp::loadSettings()
 /**
  * Sets the strings of the subwidgets using the current language.
  */
-void DlgSettingsFemImp::changeEvent(QEvent *e)
+void DlgSettingsFemGeneralImp::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::LanguageChange) {
     }
@@ -86,4 +86,4 @@ void DlgSettingsFemImp::changeEvent(QEvent *e)
     }
 }
 
-#include "moc_DlgSettingsFemImp.cpp"
+#include "moc_DlgSettingsFemGeneralImp.cpp"

src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h

@@ -23,21 +23,21 @@
  ***************************************************************************/
 
 
-#ifndef FEMGUI_DLGSETTINGSFEMIMP_H
-#define FEMGUI_DLGSETTINGSFEMIMP_H
+#ifndef FEMGUI_DLGSETTINGSFEMGENERALIMP_H
+#define FEMGUI_DLGSETTINGSFEMGENERALIMP_H
 
-#include "ui_DlgSettingsFem.h"
+#include "ui_DlgSettingsFemGeneral.h"
 #include <Gui/PropertyPage.h>
 
 namespace FemGui {
 
-class DlgSettingsFemImp : public Gui::Dialog::PreferencePage, public Ui_DlgSettingsFemImp
+class DlgSettingsFemGeneralImp : public Gui::Dialog::PreferencePage, public Ui_DlgSettingsFemGeneralImp
 {
     Q_OBJECT
 
 public:
-    DlgSettingsFemImp( QWidget* parent = 0 );
-    ~DlgSettingsFemImp();
+    DlgSettingsFemGeneralImp( QWidget* parent = 0 );
+    ~DlgSettingsFemGeneralImp();
 
 protected:
     void saveSettings();
@@ -47,4 +47,4 @@ protected:
 
 } // namespace FemGui
 
-#endif // FEMGUI_DLGSETTINGSFEMIMP_H
+#endif // FEMGUI_DLGSETTINGSFEMGENERALIMP_H