Added menu item "Window->Compare presets" to compare more than one type of presets. Code refactoring for PresetComboBox: Use suffix "modified" just for PlaterPresetComboBox and TabPresetComboBox Code refactoring. wxDataViewCtrl and related functions extracted from DiffPresetDialog and UnsavedChangesDialog to the separate class DiffViewCtrl Code refactoring, Tab.cpp: Build all unregular pages on a first build of the Printer Settings Squashed commit of the following: commit 91f45a8a2d97d252337c7306dd02db607fd79c00 Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Thu Feb 4 09:34:29 2021 +0100 Fixed after merge commit 09aa502498b08c059ecdf334f5db1567739b4520 Merge: 6df8e83e10baa92fabAuthor: Vojtech Bubnik <bubnikv@gmail.com> Date: Thu Feb 4 09:31:43 2021 +0100 Merge remote-tracking branch 'remotes/origin/master' into ys_diff_dlg commit 6df8e83e1af3ba096ac39d25985b6deb2e0a245b Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Thu Feb 4 09:29:53 2021 +0100 Tiny beautification. commit e781ceaaf7c39bc073476409cc02918d9f182930 Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Wed Feb 3 18:05:19 2021 +0100 Reworked copying of PresetBundles: 1) Simplified by using the default copy constructors and copy operators. 2) Made safer by not allowing PresetCollection and PhysicalPrinterPresetCollection to be copied or instantiated outside of PresetBundle. 3) Fixed Preset::vendor pointers after copying PresetBundle. commit a8f0b7aa5156465cdb3e3dbb86feb66a64bcebc0 Author: YuSanka <yusanka@gmail.com> Date: Mon Jan 25 16:13:53 2021 +0100 DiffPresetsDialog: Show compatibility to print/printer presets selected in DiffPresetDialog commit 597451f930a4330376966d8cf3350056d4f85a73 Merge: cce5b571059017a7daAuthor: YuSanka <yusanka@gmail.com> Date: Thu Jan 21 12:14:48 2021 +0100 Merge remote-tracking branch 'origin/master' into ys_diff_dlg commit cce5b5710d1225c7eaa52d0abb4b3f66fbd3b6a1 Author: YuSanka <yusanka@gmail.com> Date: Thu Jan 21 12:11:40 2021 +0100 DiffPresetDialog: Fixed crash on ASAN build commit ad8d728d89d7a75c2ac136ea8cdbb730ab774cd9 Author: YuSanka <yusanka@gmail.com> Date: Wed Jan 20 16:38:28 2021 +0100 FullCompareDialog improvements commit 316bafbeec9bb63f731b653d296062d9e22dd02f Author: YuSanka <yusanka@gmail.com> Date: Wed Jan 20 09:25:46 2021 +0100 DiffPresetDialog improvements: * Update presets lists after save changes in edited preset or change printer_technology * Tab.cpp: Build all unregular pages on a first build of the Printer Settings commit 01171c8ef50389d0801b0ccc5746ab0c3b731b11 Author: YuSanka <yusanka@gmail.com> Date: Tue Jan 19 17:26:28 2021 +0100 DiffPresetDialog : improvements * This dialog is non-modal now * "Compare presets" menu item is moved from "View" to the "Window" menu group * Added info tooltips for the bitmap buttons between presets * Added "Show all presets" checkbox * Show full difference between printer presets with different count of extruders commit 3d38b62f3c9de8aab352ed3bcff297d5c0239b2e Merge: e50fe6de99a2310ae9Author: YuSanka <yusanka@gmail.com> Date: Mon Jan 18 10:00:18 2021 +0100 Merge remote-tracking branch 'origin/master' into ys_diff_dlg commit e50fe6de984decadfef3d4b952f0eec8ab9e6670 Author: YuSanka <yusanka@gmail.com> Date: Sat Jan 16 02:27:24 2021 +0100 DiffPresetDialog improvements Added menu item "View->Compare presets" to compare more than one type of presets commit bf08b7c8c969ad0ca631b9eeac1bc231f474e72b Author: YuSanka <yusanka@gmail.com> Date: Sat Jan 16 00:28:39 2021 +0100 Code refactoring. wxDataViewCtrl and related functions extracted from DiffPresetDialog and UnsavedChangesDialog to the separate class DiffViewCtrl commit 7aeb63032b0bc2bd06e60990c060008660a5c44f Author: YuSanka <yusanka@gmail.com> Date: Fri Jan 15 21:35:43 2021 +0100 DiffPresetDialog: first implementation commit 2f23d5af9d6b5dd670dfb7d06eedbe0e6d2960c6 Author: YuSanka <yusanka@gmail.com> Date: Thu Jan 14 16:28:43 2021 +0100 Code refactoring for PresetComboBox. Use suffix "modified" just for PlaterPresetComboBox and TabPresetComboBox
351 lines
13 KiB
C++
351 lines
13 KiB
C++
#ifndef slic3r_UnsavedChangesDialog_hpp_
|
|
#define slic3r_UnsavedChangesDialog_hpp_
|
|
|
|
#include <wx/dataview.h>
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "GUI_Utils.hpp"
|
|
#include "wxExtensions.hpp"
|
|
#include "libslic3r/PresetBundle.hpp"
|
|
|
|
class ScalableButton;
|
|
class wxStaticText;
|
|
|
|
namespace Slic3r {
|
|
namespace GUI{
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// ModelNode: a node inside DiffModel
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class ModelNode;
|
|
class PresetComboBox;
|
|
using ModelNodePtrArray = std::vector<std::unique_ptr<ModelNode>>;
|
|
|
|
// On all of 3 different platforms Bitmap+Text icon column looks different
|
|
// because of Markup text is missed or not implemented.
|
|
// As a temporary workaround, we will use:
|
|
// MSW - DataViewBitmapText (our custom renderer wxBitmap + wxString, supported Markup text)
|
|
// OSX - -//-, but Markup text is not implemented right now
|
|
// GTK - wxDataViewIconText (wxWidgets for GTK renderer wxIcon + wxString, supported Markup text)
|
|
class ModelNode
|
|
{
|
|
wxWindow* m_parent_win{ nullptr };
|
|
|
|
ModelNode* m_parent;
|
|
ModelNodePtrArray m_children;
|
|
wxBitmap m_empty_bmp;
|
|
Preset::Type m_preset_type {Preset::TYPE_INVALID};
|
|
|
|
std::string m_icon_name;
|
|
// saved values for colors if they exist
|
|
wxString m_old_color;
|
|
wxString m_new_color;
|
|
|
|
#ifdef __linux__
|
|
wxIcon get_bitmap(const wxString& color);
|
|
#else
|
|
wxBitmap get_bitmap(const wxString& color);
|
|
#endif //__linux__
|
|
|
|
public:
|
|
|
|
bool m_toggle {true};
|
|
#ifdef __linux__
|
|
wxIcon m_icon;
|
|
wxIcon m_old_color_bmp;
|
|
wxIcon m_new_color_bmp;
|
|
#else
|
|
wxBitmap m_icon;
|
|
wxBitmap m_old_color_bmp;
|
|
wxBitmap m_new_color_bmp;
|
|
#endif //__linux__
|
|
wxString m_text;
|
|
wxString m_old_value;
|
|
wxString m_new_value;
|
|
|
|
// TODO/FIXME:
|
|
// the GTK version of wxDVC (in particular wxDataViewCtrlInternal::ItemAdded)
|
|
// needs to know in advance if a node is or _will be_ a container.
|
|
// Thus implementing:
|
|
// bool IsContainer() const
|
|
// { return m_children.size()>0; }
|
|
// doesn't work with wxGTK when DiffModel::AddToClassical is called
|
|
// AND the classical node was removed (a new node temporary without children
|
|
// would be added to the control)
|
|
bool m_container {true};
|
|
|
|
// preset(root) node
|
|
ModelNode(Preset::Type preset_type, wxWindow* parent_win, const wxString& text, const std::string& icon_name);
|
|
|
|
// category node
|
|
ModelNode(ModelNode* parent, const wxString& text, const std::string& icon_name);
|
|
|
|
// group node
|
|
ModelNode(ModelNode* parent, const wxString& text);
|
|
|
|
// option node
|
|
ModelNode(ModelNode* parent, const wxString& text, const wxString& old_value, const wxString& new_value);
|
|
|
|
bool IsContainer() const { return m_container; }
|
|
bool IsToggled() const { return m_toggle; }
|
|
void Toggle(bool toggle = true) { m_toggle = toggle; }
|
|
bool IsRoot() const { return m_parent == nullptr; }
|
|
Preset::Type type() const { return m_preset_type; }
|
|
const wxString& text() const { return m_text; }
|
|
|
|
ModelNode* GetParent() { return m_parent; }
|
|
ModelNodePtrArray& GetChildren() { return m_children; }
|
|
ModelNode* GetNthChild(unsigned int n) { return m_children[n].get(); }
|
|
unsigned int GetChildCount() const { return m_children.size(); }
|
|
|
|
void Append(std::unique_ptr<ModelNode> child) { m_children.emplace_back(std::move(child)); }
|
|
|
|
void UpdateEnabling();
|
|
void UpdateIcons();
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// DiffModel
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class DiffModel : public wxDataViewModel
|
|
{
|
|
wxWindow* m_parent_win { nullptr };
|
|
ModelNodePtrArray m_preset_nodes;
|
|
|
|
wxDataViewCtrl* m_ctrl{ nullptr };
|
|
|
|
ModelNode *AddOption(ModelNode *group_node,
|
|
wxString option_name,
|
|
wxString old_value,
|
|
wxString new_value);
|
|
ModelNode *AddOptionWithGroup(ModelNode *category_node,
|
|
wxString group_name,
|
|
wxString option_name,
|
|
wxString old_value,
|
|
wxString new_value);
|
|
ModelNode *AddOptionWithGroupAndCategory(ModelNode *preset_node,
|
|
wxString category_name,
|
|
wxString group_name,
|
|
wxString option_name,
|
|
wxString old_value,
|
|
wxString new_value,
|
|
const std::string category_icon_name);
|
|
|
|
public:
|
|
enum {
|
|
colToggle,
|
|
colIconText,
|
|
colOldValue,
|
|
colNewValue,
|
|
colMax
|
|
};
|
|
|
|
DiffModel(wxWindow* parent);
|
|
~DiffModel() {}
|
|
|
|
void SetAssociatedControl(wxDataViewCtrl* ctrl) { m_ctrl = ctrl; }
|
|
|
|
wxDataViewItem AddPreset(Preset::Type type, wxString preset_name, PrinterTechnology pt);
|
|
wxDataViewItem AddOption(Preset::Type type, wxString category_name, wxString group_name, wxString option_name,
|
|
wxString old_value, wxString new_value, const std::string category_icon_name);
|
|
|
|
void UpdateItemEnabling(wxDataViewItem item);
|
|
bool IsEnabledItem(const wxDataViewItem& item);
|
|
|
|
unsigned int GetColumnCount() const override { return colMax; }
|
|
wxString GetColumnType(unsigned int col) const override;
|
|
void Rescale();
|
|
|
|
wxDataViewItem Delete(const wxDataViewItem& item);
|
|
void Clear();
|
|
|
|
wxDataViewItem GetParent(const wxDataViewItem& item) const override;
|
|
unsigned int GetChildren(const wxDataViewItem& parent, wxDataViewItemArray& array) const override;
|
|
|
|
void GetValue(wxVariant& variant, const wxDataViewItem& item, unsigned int col) const override;
|
|
bool SetValue(const wxVariant& variant, const wxDataViewItem& item, unsigned int col) override;
|
|
|
|
bool IsEnabled(const wxDataViewItem& item, unsigned int col) const override;
|
|
bool IsContainer(const wxDataViewItem& item) const override;
|
|
// Is the container just a header or an item with all columns
|
|
// In our case it is an item with all columns
|
|
bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override { return true; }
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// DiffViewCtrl
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class DiffViewCtrl : public wxDataViewCtrl
|
|
{
|
|
bool m_has_long_strings{ false };
|
|
bool m_empty_selection { false };
|
|
int m_em_unit;
|
|
|
|
struct ItemData
|
|
{
|
|
std::string opt_key;
|
|
wxString opt_name;
|
|
wxString old_val;
|
|
wxString new_val;
|
|
Preset::Type type;
|
|
bool is_long{ false };
|
|
};
|
|
|
|
// tree items related to the options
|
|
std::map<wxDataViewItem, ItemData> m_items_map;
|
|
std::map<unsigned int, int> m_columns_width;
|
|
|
|
public:
|
|
DiffViewCtrl(wxWindow* parent, wxSize size);
|
|
~DiffViewCtrl() {}
|
|
|
|
DiffModel* model{ nullptr };
|
|
|
|
void AppendBmpTextColumn(const wxString& label, unsigned model_column, int width, bool set_expander = false);
|
|
void AppendToggleColumn_(const wxString& label, unsigned model_column, int width);
|
|
void Rescale(int em = 0);
|
|
void Append(const std::string& opt_key, Preset::Type type, wxString category_name, wxString group_name, wxString option_name,
|
|
wxString old_value, wxString new_value, const std::string category_icon_name);
|
|
void Clear();
|
|
|
|
wxString get_short_string(wxString full_string);
|
|
bool has_selection() { return !m_empty_selection; }
|
|
void context_menu(wxDataViewEvent& event);
|
|
void item_value_changed(wxDataViewEvent& event);
|
|
void set_em_unit(int em) { m_em_unit = em; }
|
|
|
|
std::vector<std::string> unselected_options(Preset::Type type);
|
|
std::vector<std::string> selected_options();
|
|
};
|
|
|
|
|
|
//------------------------------------------
|
|
// UnsavedChangesDialog
|
|
//------------------------------------------
|
|
class UnsavedChangesDialog : public DPIDialog
|
|
{
|
|
DiffViewCtrl* m_tree { nullptr };
|
|
ScalableButton* m_save_btn { nullptr };
|
|
ScalableButton* m_transfer_btn { nullptr };
|
|
ScalableButton* m_discard_btn { nullptr };
|
|
wxStaticText* m_action_line { nullptr };
|
|
wxStaticText* m_info_line { nullptr };
|
|
wxCheckBox* m_remember_choice { nullptr };
|
|
|
|
bool m_has_long_strings { false };
|
|
int m_save_btn_id { wxID_ANY };
|
|
int m_move_btn_id { wxID_ANY };
|
|
int m_continue_btn_id { wxID_ANY };
|
|
|
|
std::string m_app_config_key;
|
|
|
|
enum class Action {
|
|
Undef,
|
|
Transfer,
|
|
Discard,
|
|
Save
|
|
};
|
|
|
|
static constexpr char ActTransfer[] = "transfer";
|
|
static constexpr char ActDiscard[] = "discard";
|
|
static constexpr char ActSave[] = "save";
|
|
|
|
// selected action after Dialog closing
|
|
Action m_exit_action {Action::Undef};
|
|
// preset names which are modified in SavePresetDialog and related types
|
|
std::vector<std::pair<std::string, Preset::Type>> names_and_types;
|
|
|
|
public:
|
|
UnsavedChangesDialog(const wxString& header);
|
|
UnsavedChangesDialog(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset);
|
|
~UnsavedChangesDialog() {}
|
|
|
|
void build(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, const wxString& header = "");
|
|
void update(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, const wxString& header);
|
|
void update_tree(Preset::Type type, PresetCollection *presets);
|
|
void show_info_line(Action action, std::string preset_name = "");
|
|
void update_config(Action action);
|
|
void close(Action action);
|
|
bool save(PresetCollection* dependent_presets);
|
|
|
|
bool save_preset() const { return m_exit_action == Action::Save; }
|
|
bool transfer_changes() const { return m_exit_action == Action::Transfer; }
|
|
bool discard() const { return m_exit_action == Action::Discard; }
|
|
|
|
// get full bundle of preset names and types for saving
|
|
const std::vector<std::pair<std::string, Preset::Type>>& get_names_and_types() { return names_and_types; }
|
|
// short version of the previous function, for the case, when just one preset is modified
|
|
std::string get_preset_name() { return names_and_types[0].first; }
|
|
|
|
std::vector<std::string> get_unselected_options(Preset::Type type) { return m_tree->unselected_options(type); }
|
|
std::vector<std::string> get_selected_options() { return m_tree->selected_options(); }
|
|
|
|
protected:
|
|
void on_dpi_changed(const wxRect& suggested_rect) override;
|
|
void on_sys_color_changed() override;
|
|
};
|
|
|
|
|
|
//------------------------------------------
|
|
// FullCompareDialog
|
|
//------------------------------------------
|
|
class FullCompareDialog : public wxDialog
|
|
{
|
|
public:
|
|
FullCompareDialog(const wxString& option_name, const wxString& old_value, const wxString& new_value);
|
|
~FullCompareDialog() {}
|
|
};
|
|
|
|
|
|
//------------------------------------------
|
|
// DiffPresetDialog
|
|
//------------------------------------------
|
|
class DiffPresetDialog : public DPIDialog
|
|
{
|
|
DiffViewCtrl* m_tree { nullptr };
|
|
wxStaticText* m_top_info_line { nullptr };
|
|
wxStaticText* m_bottom_info_line { nullptr };
|
|
wxCheckBox* m_show_all_presets { nullptr };
|
|
|
|
Preset::Type m_view_type { Preset::TYPE_INVALID };
|
|
PrinterTechnology m_pr_technology;
|
|
std::unique_ptr<PresetBundle> m_preset_bundle_left;
|
|
std::unique_ptr<PresetBundle> m_preset_bundle_right;
|
|
|
|
void update_tree();
|
|
void update_bundles_from_app();
|
|
void update_controls_visibility(Preset::Type type = Preset::TYPE_INVALID);
|
|
void update_compatibility(const std::string& preset_name, Preset::Type type, PresetBundle* preset_bundle);
|
|
|
|
struct DiffPresets
|
|
{
|
|
PresetComboBox* presets_left { nullptr };
|
|
ScalableButton* equal_bmp { nullptr };
|
|
PresetComboBox* presets_right { nullptr };
|
|
};
|
|
|
|
std::vector<DiffPresets> m_preset_combos;
|
|
|
|
public:
|
|
DiffPresetDialog();
|
|
~DiffPresetDialog() {}
|
|
|
|
void show(Preset::Type type = Preset::TYPE_INVALID);
|
|
void update_presets(Preset::Type type = Preset::TYPE_INVALID);
|
|
|
|
protected:
|
|
void on_dpi_changed(const wxRect& suggested_rect) override;
|
|
void on_sys_color_changed() override;
|
|
};
|
|
|
|
}
|
|
}
|
|
|
|
#endif //slic3r_UnsavedChangesDialog_hpp_
|