diff options
| author | YuSanka <yusanka@gmail.com> | 2019-05-10 16:10:17 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-05-10 16:10:37 +0300 |
| commit | ec252eb71d81ca12478dc11db0fd7f625057a083 (patch) | |
| tree | 4c95484d8112aee3d8d20cc6f3d65c0c543e6f75 /src/slic3r/GUI/Tab.hpp | |
| parent | 4df38d4c4b1c41be4b0a97c36cc33dbc2822a26e (diff) | |
More localization improvements, new POT
+ fixed crash after application closing with non-saved presets
Diffstat (limited to 'src/slic3r/GUI/Tab.hpp')
| -rw-r--r-- | src/slic3r/GUI/Tab.hpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index 5f01988f5..6bbe15f7f 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -228,12 +228,14 @@ public: int m_update_cnt = 0; public: - Tab(wxNotebook* parent, const wxString& title, const char* name); - ~Tab() {} +// Tab(wxNotebook* parent, const wxString& title, const char* name); + Tab(wxNotebook* parent, const wxString& title, Preset::Type type); + ~Tab() {} wxWindow* parent() const { return m_parent; } wxString title() const { return m_title; } - std::string name() const { return m_name; } +// std::string name() const { return m_name; } + std::string name() const { return m_presets->name(); } Preset::Type type() const { return m_type; } bool complited() const { return m_complited; } virtual bool supports_printer_technology(const PrinterTechnology tech) = 0; @@ -312,7 +314,8 @@ class TabPrint : public Tab bool is_msg_dlg_already_exist {false}; public: TabPrint(wxNotebook* parent) : - Tab(parent, _(L("Print Settings")), L("print")) {} +// Tab(parent, _(L("Print Settings")), L("print")) {} + Tab(parent, _(L("Print Settings")), Slic3r::Preset::TYPE_PRINT) {} ~TabPrint() {} ogStaticText* m_recommended_thin_wall_thickness_description_line; @@ -330,7 +333,8 @@ class TabFilament : public Tab ogStaticText* m_cooling_description_line; public: TabFilament(wxNotebook* parent) : - Tab(parent, _(L("Filament Settings")), L("filament")) {} +// Tab(parent, _(L("Filament Settings")), L("filament")) {} + Tab(parent, _(L("Filament Settings")), Slic3r::Preset::TYPE_FILAMENT) {} ~TabFilament() {} void build() override; @@ -363,7 +367,9 @@ public: PrinterTechnology m_printer_technology = ptFFF; - TabPrinter(wxNotebook* parent) : Tab(parent, _(L("Printer Settings")), L("printer")) {} +// TabPrinter(wxNotebook* parent) : Tab(parent, _(L("Printer Settings")), L("printer")) {} + TabPrinter(wxNotebook* parent) : + Tab(parent, _(L("Printer Settings")), Slic3r::Preset::TYPE_PRINTER) {} ~TabPrinter() {} void build() override; @@ -386,7 +392,8 @@ class TabSLAMaterial : public Tab { public: TabSLAMaterial(wxNotebook* parent) : - Tab(parent, _(L("Material Settings")), L("sla_material")) {} +// Tab(parent, _(L("Material Settings")), L("sla_material")) {} + Tab(parent, _(L("Material Settings")), Slic3r::Preset::TYPE_SLA_MATERIAL) {} ~TabSLAMaterial() {} void build() override; @@ -400,7 +407,8 @@ class TabSLAPrint : public Tab { public: TabSLAPrint(wxNotebook* parent) : - Tab(parent, _(L("Print Settings")), L("sla_print")) {} +// Tab(parent, _(L("Print Settings")), L("sla_print")) {} + Tab(parent, _(L("Print Settings")), Slic3r::Preset::TYPE_SLA_PRINT) {} ~TabSLAPrint() {} void build() override; void reload_config() override; |