Fixed controls layout on right panel.

+ Split ObjectManipulation class to ObjectManipulation and ObjectSettings
+ fixed typo-bug in GetItemByVolumeId

1 files changed, 49 insertions, 0 deletions

diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp
new file mode 100644
index 000000000..7b58d4c4e
--- /dev/null
+++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp
@@ -0,0 +1,49 @@
+#ifndef slic3r_GUI_ObjectSettings_hpp_
+#define slic3r_GUI_ObjectSettings_hpp_
+
+#include <memory>
+#include <wx/panel.h>
+
+class wxBoxSizer;
+
+namespace Slic3r {
+namespace GUI {
+class ConfigOptionsGroup;
+
+class OG_Settings
+{
+protected:
+    std::shared_ptr<ConfigOptionsGroup> m_og;
+    wxWindow* m_parent;
+public:
+    OG_Settings(wxWindow* parent, const bool staticbox);
+    ~OG_Settings() {}
+
+    virtual bool        IsShown();
+    virtual void        Show(const bool show);
+    virtual void        Hide();
+    virtual void        UpdateAndShow(const bool show);
+
+    wxSizer*            get_sizer();
+    ConfigOptionsGroup* get_og() { return m_og.get(); }
+};
+
+
+class ObjectSettings : public OG_Settings
+{
+    // sizer for extra Object/Part's settings
+    wxBoxSizer* m_settings_list_sizer{ nullptr };  
+    // option groups for settings
+    std::vector <std::shared_ptr<ConfigOptionsGroup>> m_og_settings;
+
+public:
+    ObjectSettings(wxWindow* parent);
+    ~ObjectSettings() {}
+
+    void        update_settings_list();
+    void        UpdateAndShow(const bool show) override;
+};
+
+}}
+
+#endif // slic3r_GUI_ObjectSettings_hpp_