3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:fixed some issues with unsavechangeddialog

Browse source 
Change-Id: I5addcc4c1ddaa6a98c31a0e57028de72a606a493
This commit is contained in:
tao wang 2022-10-31 18:13:34 +08:00 • committed by Lane.Wei
parent 752e00694a
commit a8ad6e9f69
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/MainFrame.cpp
View file

@ -2929,7 +2929,7 @@ void MainFrame::open_recent_project(size_t file_id, wxString const & filename)
} }
else else
{ {
MessageDialog msg(this, _L("The project is no longer available."), _L("Error"), wxYES | wxYES_DEFAULT); MessageDialog msg(this, _L("The project is no longer available."), _L("Error"), wxOK | wxYES_DEFAULT);
if (msg.ShowModal() == wxID_YES) if (msg.ShowModal() == wxID_YES)
{ {
m_recent_projects.RemoveFileFromHistory(file_id); m_recent_projects.RemoveFileFromHistory(file_id);

7
src/slic3r/GUI/UnsavedChangesDialog.cpp
View file

@ -772,7 +772,7 @@ std::vector<std::string> DiffViewCtrl::selected_options()
static std::string none{"none"}; static std::string none{"none"};
#define UNSAVE_CHANGE_DIALOG_SCROLL_WINDOW_SIZE wxSize(FromDIP(490), FromDIP(374)) #define UNSAVE_CHANGE_DIALOG_SCROLL_WINDOW_SIZE wxSize(FromDIP(490), FromDIP(374))
#define UNSAVE_CHANGE_DIALOG_ACTION_LINE_SIZE wxSize(FromDIP(490), FromDIP(40)) #define UNSAVE_CHANGE_DIALOG_ACTION_LINE_SIZE wxSize(FromDIP(490), FromDIP(60))
#define UNSAVE_CHANGE_DIALOG_FIRST_VALUE_WIDTH FromDIP(190) #define UNSAVE_CHANGE_DIALOG_FIRST_VALUE_WIDTH FromDIP(190)
#define UNSAVE_CHANGE_DIALOG_VALUE_WIDTH FromDIP(150) #define UNSAVE_CHANGE_DIALOG_VALUE_WIDTH FromDIP(150)
#define UNSAVE_CHANGE_DIALOG_ITEM_HEIGHT FromDIP(24) #define UNSAVE_CHANGE_DIALOG_ITEM_HEIGHT FromDIP(24)
@ -952,7 +952,8 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
(*btn)->SetTextColor(wxColour(107, 107, 107)); (*btn)->SetTextColor(wxColour(107, 107, 107));
} }
(*btn)->SetMinSize(UNSAVE_CHANGE_DIALOG_BUTTON_SIZE); //(*btn)->SetMinSize(UNSAVE_CHANGE_DIALOG_BUTTON_SIZE);
(*btn)->SetMinSize(wxSize(-1,-1));
(*btn)->SetCornerRadius(FromDIP(12)); (*btn)->SetCornerRadius(FromDIP(12));
(*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent &) { (*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent &) {
@ -1377,7 +1378,7 @@ void UnsavedChangesDialog::update(Preset::Type type, PresetCollection* dependent
} }
wxString action_msg; wxString action_msg;
action_msg = format_wxstr(_L("You have changed some preset settings. \nWould you like to keep these changed settings after switching preset?")); action_msg = format_wxstr(_L("You have changed some preset settings. \nWould you like to keep these changed settings (new value) after switching preset?"));
m_action_line->SetLabel(action_msg); m_action_line->SetLabel(action_msg);
update_tree(type, presets); update_tree(type, presets);