Fixed context menu for Text

src/slic3r/GUI/GUI_Factories.cpp

@@ -469,47 +469,27 @@ void MenuFactory::append_menu_item_delete(wxMenu* menu)
 wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType type) {
     auto sub_menu = new wxMenu;
 
-    if (wxGetApp().get_mode() == comExpert && type != ModelVolumeType::INVALID) {
+    const ConfigOptionMode mode = wxGetApp().get_mode();
+
+    if (mode == comExpert   && type != ModelVolumeType::INVALID ||
+        mode == comAdvanced && type == ModelVolumeType::MODEL_PART) {
         append_menu_item(sub_menu, wxID_ANY, _L("Load") + " " + dots, "",
             [type](wxCommandEvent&) { obj_list()->load_subobject(type); }, "", menu);
         sub_menu->AppendSeparator();
     }
 
-    for (auto& item : { L("Box"), L("Cylinder"), L("Sphere"), L("Slab") })
+    if (!(type == ModelVolumeType::MODEL_PART && mode == comAdvanced))
-    {
+        for (auto& item : { L("Box"), L("Cylinder"), L("Sphere"), L("Slab") })
-        if (type == ModelVolumeType::INVALID && strncmp(item, "Slab", 4) == 0)
+        {
-            continue;
+            if (type == ModelVolumeType::INVALID && strncmp(item, "Slab", 4) == 0)
-        append_menu_item(sub_menu, wxID_ANY, _(item), "",
+                continue;
-            [type, item](wxCommandEvent&) { obj_list()->load_generic_subobject(item, type); }, "", menu);
+            append_menu_item(sub_menu, wxID_ANY, _(item), "",
-    }
+                [type, item](wxCommandEvent&) { obj_list()->load_generic_subobject(item, type); }, "", menu);
-
-    auto add_text = [type](wxCommandEvent &evt) {
-        GLCanvas3D *     canvas = plater()->canvas3D();
-        GLGizmosManager &mng = canvas->get_gizmos_manager();
-        if ((mng.get_current_type() == GLGizmosManager::Emboss ||
-            mng.open_gizmo(GLGizmosManager::Emboss))) {
-            GLGizmoEmboss *emboss = dynamic_cast<GLGizmoEmboss *>(mng.get_current());
-            assert(emboss != nullptr);
-            if (emboss == nullptr) return;
-            auto screen_position = canvas->get_popup_menu_position();
-            assert(screen_position.has_value());
-            if(!screen_position.has_value()) return;
-            ModelVolumeType volume_type = type;
-            // no selected object means create new object
-            if (volume_type == ModelVolumeType::INVALID) 
-                volume_type = ModelVolumeType::MODEL_PART;
-            emboss->create_volume(volume_type, *screen_position);
         }
-    };
 
-    if (type == ModelVolumeType::MODEL_PART 
+    append_menu_item_add_text(sub_menu, type);
-        || type == ModelVolumeType::NEGATIVE_VOLUME 
-        || type == ModelVolumeType::PARAMETER_MODIFIER
-        || type == ModelVolumeType::INVALID // cannot use gizmo without selected object
-        )
-        append_menu_item(sub_menu, wxID_ANY, _L("Text"), "", add_text, "", menu);
 
-    if (wxGetApp().get_mode() >= comAdvanced) {
+    if (mode >= comAdvanced) {
         sub_menu->AppendSeparator();
         append_menu_item(sub_menu, wxID_ANY, _L("Gallery"), "",
             [type](wxCommandEvent&) { obj_list()->load_subobject(type, true); }, "", menu);
@@ -518,28 +498,64 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty
     return sub_menu;
 }
 
+void MenuFactory::append_menu_item_add_text(wxMenu* menu, ModelVolumeType type, bool is_submenu_item/* = true*/)
+{
+    auto add_text = [type](wxCommandEvent& evt) {
+        GLCanvas3D* canvas = plater()->canvas3D();
+        GLGizmosManager& mng = canvas->get_gizmos_manager();
+        if ((mng.get_current_type() == GLGizmosManager::Emboss ||
+            mng.open_gizmo(GLGizmosManager::Emboss))) {
+            GLGizmoEmboss *emboss = dynamic_cast<GLGizmoEmboss *>(mng.get_current());
+            assert(emboss != nullptr);
+            if (emboss == nullptr) return;
+            auto screen_position = canvas->get_popup_menu_position();
+            assert(screen_position.has_value());
+            if (!screen_position.has_value()) return;
+            ModelVolumeType volume_type = type;
+            // no selected object means create new object
+            if (volume_type == ModelVolumeType::INVALID)
+                volume_type = ModelVolumeType::MODEL_PART;
+            emboss->create_volume(volume_type, *screen_position);
+        }
+    };
+
+    if (   type == ModelVolumeType::MODEL_PART
+        || type == ModelVolumeType::NEGATIVE_VOLUME
+        || type == ModelVolumeType::PARAMETER_MODIFIER
+        || type == ModelVolumeType::INVALID // cannot use gizmo without selected object
+        ) {
+        wxString item_name = is_submenu_item ? "" : _(ADD_VOLUME_MENU_ITEMS[int(type)].first) + ": ";
+        item_name += _L("Text");
+        const std::string icon_name = is_submenu_item ? "" : ADD_VOLUME_MENU_ITEMS[int(type)].second;
+        append_menu_item(menu, wxID_ANY, item_name, "", add_text, icon_name, menu);
+    }
+}
+
 void MenuFactory::append_menu_items_add_volume(wxMenu* menu)
 {
-    // Update "add" items(delete old & create new)  settings popupmenu
+    // Update "add" items(delete old & create new) items popupmenu
     for (auto& item : ADD_VOLUME_MENU_ITEMS) {
-        const auto settings_id = menu->FindItem(_(item.first));
+        const wxString item_name = _(item.first);
-        if (settings_id != wxNOT_FOUND)
+        int item_id = menu->FindItem(item_name);
-            menu->Destroy(settings_id);
+        if (item_id != wxNOT_FOUND)
+            menu->Destroy(item_id);
+
+        item_id = menu->FindItem(item_name + ": " + _L("Text"));
+        if (item_id != wxNOT_FOUND)
+            menu->Destroy(item_id);
     }
 
     // Update "Height range Modifier" item (delete old & create new)
     if (const auto range_id = menu->FindItem(_L("Height range Modifier")); range_id != wxNOT_FOUND)
         menu->Destroy(range_id);
 
-    const ConfigOptionMode mode = wxGetApp().get_mode();
+    if (const auto range_id = menu->FindItem(_L("Height range Modifier")); range_id != wxNOT_FOUND)
+        menu->Destroy(range_id);
+
+    if (wxGetApp().get_mode() == comSimple) {
+        append_menu_item_add_text(menu, ModelVolumeType::MODEL_PART, false);
+        append_menu_item_add_text(menu, ModelVolumeType::NEGATIVE_VOLUME, false);
 
-    if (mode == comAdvanced) {
-        append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::MODEL_PART)].first), "",
-            [](wxCommandEvent&) { obj_list()->load_subobject(ModelVolumeType::MODEL_PART); },
-            ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::MODEL_PART)].second, nullptr,
-            []() { return obj_list()->is_instance_or_object_selected(); }, m_parent);
-    }
-    if (mode == comSimple) {
         append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)].first), "",
             [](wxCommandEvent&) { obj_list()->load_generic_subobject(L("Box"), ModelVolumeType::SUPPORT_ENFORCER); },
             ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)].second, nullptr,
@@ -552,11 +568,9 @@ void MenuFactory::append_menu_items_add_volume(wxMenu* menu)
         return;
     }
 
-    for (size_t type = (mode == comExpert ? 0 : 1); type < ADD_VOLUME_MENU_ITEMS.size(); type++)
+    int type = 0;
-    {
+    for (auto& item : ADD_VOLUME_MENU_ITEMS) {
-        auto& item = ADD_VOLUME_MENU_ITEMS[type];
+        wxMenu* sub_menu = append_submenu_add_generic(menu, ModelVolumeType(type++));
-
-        wxMenu* sub_menu = append_submenu_add_generic(menu, ModelVolumeType(type));
         append_submenu(menu, sub_menu, wxID_ANY, _(item.first), "", item.second,
             []() { return obj_list()->is_instance_or_object_selected(); }, m_parent);
     }
@@ -1061,6 +1075,8 @@ void MenuFactory::create_text_part_menu()
 
     append_menu_item_delete(menu);
     append_menu_item_edit_text(menu);
+    append_menu_item_fix_through_netfabb(menu);
+    append_menu_item_simplify(menu);
 
     append_immutable_part_menu_items(menu);
 }

src/slic3r/GUI/GUI_Factories.hpp

@@ -90,6 +90,7 @@ private:
     void        create_instance_menu();
 
     wxMenu*     append_submenu_add_generic(wxMenu* menu, ModelVolumeType type);
+    void        append_menu_item_add_text(wxMenu* menu, ModelVolumeType type, bool is_submenu_item = true);
     void        append_menu_items_add_volume(wxMenu* menu);
     wxMenuItem* append_menu_item_layers_editing(wxMenu* menu);
     wxMenuItem* append_menu_item_settings(wxMenu* menu);

src/slic3r/GUI/Plater.cpp

@@ -4496,8 +4496,12 @@ void Plater::priv::on_right_click(RBtnEvent& evt)
 #else
             const bool is_part = selection.is_single_volume() || selection.is_single_modifier();
 #endif // ENABLE_WORLD_COORDINATE
-            menu = is_some_full_instances   ? menus.object_menu() :
+            if (is_some_full_instances)
-                   is_part                  ? menus.part_menu()   : menus.multi_selection_menu();
+                menu = menus.object_menu();
+            else if (is_part)
+                menu = selection.is_single_text() ? menus.text_part_menu() : menus.part_menu();
+            else
+                menu = menus.multi_selection_menu();
         }
     }
 

src/slic3r/GUI/Selection.cpp

@@ -564,6 +564,17 @@ bool Selection::is_sla_compliant() const
     return true;
 }
 
+bool Selection::is_single_text() const
+{
+    if (!is_single_volume_or_modifier())
+        return false;
+
+    const GLVolume* gl_volume = (*m_volumes)[*m_list.begin()];
+    const ModelVolume* model_volume = m_model->objects[gl_volume->object_idx()]->volumes[gl_volume->volume_idx()];
+    
+    return model_volume && model_volume->text_configuration.has_value();
+}
+
 bool Selection::contains_all_volumes(const std::vector<unsigned int>& volume_idxs) const
 {
     for (unsigned int i : volume_idxs) {

src/slic3r/GUI/Selection.hpp

@@ -328,6 +328,7 @@ public:
 #if ENABLE_WORLD_COORDINATE
     bool is_single_volume_or_modifier() const { return is_single_volume() || is_single_modifier(); }
 #endif // ENABLE_WORLD_COORDINATE
+    bool is_single_text() const;
 
     bool contains_volume(unsigned int volume_idx) const { return m_list.find(volume_idx) != m_list.end(); }
     // returns true if the selection contains all the given indices