mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-28 03:11:47 +00:00
Make sure settings tab are still marked as modified even if modified variant is not currently selected
This commit is contained in:
+14
-4
@@ -251,6 +251,7 @@ protected:
|
||||
std::vector<Preset::Type> m_dependent_tabs;
|
||||
enum OptStatus { osSystemValue = 1, osInitValue = 2 };
|
||||
std::map<std::string, int> m_options_list;
|
||||
std::map<std::string, int> m_all_extruder_options_status;
|
||||
int m_opt_status_value = 0;
|
||||
|
||||
bool m_is_modified_values{ false };
|
||||
@@ -307,8 +308,9 @@ public:
|
||||
int m_update_cnt = 0;
|
||||
|
||||
ModeSwitchButton *m_mode_view = nullptr;
|
||||
SwitchButton *m_extruder_switch = nullptr;
|
||||
MultiSwitchButton *m_variant_combo = nullptr;
|
||||
MultiSwitchButton * m_extruder_switch = nullptr;
|
||||
MultiSwitchButton * m_variant_combo = nullptr;
|
||||
std::vector<NozzleVolumeType> m_actual_nozzle_volumes;
|
||||
|
||||
public:
|
||||
// BBS
|
||||
@@ -361,8 +363,11 @@ public:
|
||||
void decorate();
|
||||
void update_changed_ui();
|
||||
void get_sys_and_mod_flags(const std::string& opt_key, bool& sys_page, bool& modified_page);
|
||||
void update_changed_tree_ui();
|
||||
void update_changed_tree_ui();
|
||||
void update_undo_buttons();
|
||||
void update_extruder_switch_colors();
|
||||
void update_all_extruder_options_status();
|
||||
void check_extruder_options_status(int index, bool &sys_extruder, bool &modified_extruder, const std::vector<PageShp>& pages_to_check);
|
||||
|
||||
void on_roll_back_value(const bool to_sys = false);
|
||||
|
||||
@@ -431,7 +436,12 @@ public:
|
||||
|
||||
void update_extruder_variants(int extruder_id = -1);
|
||||
void switch_excluder(int extruder_id = -1);
|
||||
std::vector<wxString> generate_extruder_options();
|
||||
void parse_extruder_selection(int selection, int &extruder_id, NozzleVolumeType &nozzle_type);
|
||||
int calculate_selection_index_for_extruder(int extruder_id, NozzleVolumeType nozzle_type);
|
||||
int get_current_active_extruder();
|
||||
|
||||
std::vector<wxString> generate_extruder_options();
|
||||
NozzleVolumeType get_actual_nozzle_volume_type(int extruder_id);
|
||||
|
||||
protected:
|
||||
void create_line_with_widget(ConfigOptionsGroup* optgroup, const std::string& opt_key, const std::string& path, widget_t widget);
|
||||
|
||||
Reference in New Issue
Block a user