GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 22:45:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

UnsavedChangesDialog: Unselect custom G-codes by default

Browse Source 
(SPE-2238)
This commit is contained in:
YuSanka 2024-04-25 15:22:11 +02:00 committed by Lukas Matena
parent d8bf4fed18
commit 23e5000904
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -598,6 +598,29 @@ static std::string get_pure_opt_key(std::string opt_key)
return opt_key;
}
wxDataViewItem DiffModel::GetItemByName(wxString name)
{
// add items
for (std::unique_ptr<ModelNode>& preset : m_preset_nodes) {
for (std::unique_ptr<ModelNode>& category : preset->GetChildren()) {
if (category->text().Contains(name))
return wxDataViewItem((void*)category.get());
for (std::unique_ptr<ModelNode>& group : category->GetChildren()) {
if (group->text().Contains(name))
return wxDataViewItem((void*)group.get());
for (std::unique_ptr<ModelNode>& option : group->GetChildren())
if (option->text().Contains(name))
return wxDataViewItem((void*)option.get());
}
}
}
return wxDataViewItem(nullptr);
}
// ----------------------------------------------------------------------------
// DiffViewCtrl
// ----------------------------------------------------------------------------
@ -742,12 +765,7 @@ void DiffViewCtrl::item_value_changed(wxDataViewEvent& event)
return;
wxDataViewItem item = event.GetItem();
model->UpdateItemEnabling(item);
Refresh();
// update an enabling of the "save/move" buttons
m_empty_selection = selected_options().empty();
update_item_enabling(item);
}
bool DiffViewCtrl::has_unselected_options()
@ -759,6 +777,16 @@ bool DiffViewCtrl::has_unselected_options()
return false;
}
void DiffViewCtrl::update_item_enabling(wxDataViewItem item)
{
model->UpdateItemEnabling(item);
Refresh();
// update an enabling of the "save/move" buttons
m_empty_selection = selected_options().empty();
}
std::vector<std::string> DiffViewCtrl::options(Preset::Type type, bool selected)
{
std::vector<std::string> ret;
@ -1299,6 +1327,8 @@ void UnsavedChangesDialog::update_tree(Preset::Type type, PresetCollection* pres
m_tree->Append("extruders_count", type, _L("General"), _L("Capabilities"), local_label, old_val, mod_val, new_val, category_icon_map.at("General"));
}
wxString custom_gcode_local_name = wxEmptyString;
for (const std::string& opt_key : dirty_options) {
const Search::Option& option = searcher.get_option(opt_key, type);
if (option.opt_key() != opt_key) {
@ -1308,10 +1338,23 @@ void UnsavedChangesDialog::update_tree(Preset::Type type, PresetCollection* pres
continue;
}
if (custom_gcode_local_name.IsEmpty() && boost::nowide::narrow(option.category) == "Custom G-code")
custom_gcode_local_name = option.category_local;
m_tree->Append(opt_key, type, option.category_local, option.group_local, option.label_local,
get_string_value(opt_key, old_config), get_string_value(opt_key, mod_config),
m_tree->has_new_value_column() ? get_string_value(opt_key, new_config) : "", category_icon_map.at(option.category));
}
// Unselect all Custom-Gcodes
if (!custom_gcode_local_name.IsEmpty()) {
wxDataViewItem item = m_tree->model->GetItemByName(custom_gcode_local_name);
if (item.IsOk()) {
wxVariant variant = false;
m_tree->model->SetValue(variant, item, DiffModel::colToggle);
m_tree->update_item_enabling(item);
}
}
}
// Revert sort of searcher back

2
src/slic3r/GUI/UnsavedChangesDialog.hpp
View File

@ -175,6 +175,7 @@ public:
wxDataViewItem Delete(const wxDataViewItem& item);
void Clear();
wxDataViewItem GetItemByName(wxString name);
wxDataViewItem GetParent(const wxDataViewItem& item) const override;
unsigned int GetChildren(const wxDataViewItem& parent, wxDataViewItemArray& array) const override;
@ -241,6 +242,7 @@ public:
bool has_unselected_options();
bool has_long_strings() { return m_has_long_strings; }
bool has_new_value_column() { return this->GetColumnCount() == DiffModel::colMax; }
void update_item_enabling(wxDataViewItem item);
std::vector<std::string> options(Preset::Type type, bool selected);
std::vector<std::string> selected_options();