GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-29 13:12:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force opening hyperlink on App updater.

Browse Source 
Refactored open_browser_with_warning_dialog due to poor readability - no changes to funcionality.
This commit is contained in:
David Kocik 2024-08-27 14:19:48 +02:00 committed by Lukas Matena
parent 447dd15681
commit abea96fd8a
1 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/slic3r/GUI/GUI_App.cpp
View File

@ -3544,42 +3544,64 @@ bool GUI_App::check_updates(const bool invoked_by_user)
// Applicaiton will continue. // Applicaiton will continue.
return true; return true;
} }
namespace {
bool open_dialog_hyperlink_checkbox(wxWindow* parent, AppConfig* app_config)
{
RichMessageDialog dialog(parent, _L("Open hyperlink in default browser?"), _L("PrusaSlicer: Open hyperlink"), wxICON_QUESTION | wxYES_NO);
dialog.ShowCheckBox(_L("Remember my choice"));
auto answer = dialog.ShowModal();
bool launch = answer == wxID_YES;
if (dialog.IsCheckBoxChecked()) {
wxString preferences_item = _L("Suppress to open hyperlink in browser");
wxString msg =
_L("PrusaSlicer will remember your choice.") + "\n\n" +
_L("You will not be asked about it again on hyperlinks hovering.") + "\n\n" +
format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto changes your choice."), preferences_item);
MessageDialog msg_dlg(parent, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
if (msg_dlg.ShowModal() == wxID_CANCEL)
return false;
app_config->set("suppress_hyperlinks", answer == wxID_NO ? "1" : "0");
}
return launch;
}
bool open_dialog_hyperlink(wxWindow* parent)
{
MessageDialog dialog(parent, _L("Open hyperlink in default browser?"), _L("PrusaSlicer: Open hyperlink"), wxICON_QUESTION | wxYES_NO);
return dialog.ShowModal() == wxID_YES;
}
}
bool GUI_App::open_browser_with_warning_dialog(const wxString& url, wxWindow* parent/* = nullptr*/, bool force_remember_choice /*= true*/, int flags/* = 0*/) bool GUI_App::open_browser_with_warning_dialog(const wxString& url, wxWindow* parent/* = nullptr*/, bool force_remember_choice /*= true*/, int flags/* = 0*/)
{ {
enum class SupressHyperLinksOption{
SHLO_UNCHECKED,
SHLO_ALWAYS_SUPRESS,
SHLO_ALWAYS_ALLOW
};
bool empty = app_config->get("suppress_hyperlinks").empty();
bool checked = app_config->get_bool("suppress_hyperlinks");
SupressHyperLinksOption opt_val =
(empty
? SupressHyperLinksOption::SHLO_UNCHECKED
: (checked
? SupressHyperLinksOption::SHLO_ALWAYS_SUPRESS
: SupressHyperLinksOption::SHLO_ALWAYS_ALLOW));
bool launch = true; bool launch = true;
if (opt_val == SupressHyperLinksOption::SHLO_UNCHECKED) {
// warning dialog containes a "Remember my choice" checkbox // no previous action from user
std::string option_key = "suppress_hyperlinks"; // open dialog with remember checkbox
if (force_remember_choice || app_config->get(option_key).empty()) { launch = open_dialog_hyperlink_checkbox(parent, app_config);
if (app_config->get(option_key).empty()) { } else if (opt_val == SupressHyperLinksOption::SHLO_ALWAYS_ALLOW) {
RichMessageDialog dialog(parent, _L("Open hyperlink in default browser?"), _L("PrusaSlicer: Open hyperlink"), wxICON_QUESTION | wxYES_NO); // user already set checkbox to always open
dialog.ShowCheckBox(_L("Remember my choice")); launch = true;
auto answer = dialog.ShowModal(); } else if (opt_val == SupressHyperLinksOption::SHLO_ALWAYS_SUPRESS && force_remember_choice) {
launch = answer == wxID_YES; // user already set checkbox or preferences to always supress
if (dialog.IsCheckBoxChecked()) { launch = false;
wxString preferences_item = _L("Suppress to open hyperlink in browser"); } else if (opt_val == SupressHyperLinksOption::SHLO_ALWAYS_SUPRESS && !force_remember_choice) {
wxString msg = // user already set checkbox or preferences to always supress but it is overriden
_L("PrusaSlicer will remember your choice.") + "\n\n" + // no checkbox in dialog
_L("You will not be asked about it again on hyperlinks hovering.") + "\n\n" + launch = open_dialog_hyperlink(parent);
format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto changes your choice."), preferences_item); }
MessageDialog msg_dlg(parent, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
if (msg_dlg.ShowModal() == wxID_CANCEL)
return false;
app_config->set(option_key, answer == wxID_NO ? "1" : "0");
}
}
if (launch)
launch = !app_config->get_bool(option_key);
}
// warning dialog doesn't containe a "Remember my choice" checkbox
// and will be shown only when "Suppress to open hyperlink in browser" is ON.
else if (app_config->get_bool(option_key)) {
MessageDialog dialog(parent, _L("Open hyperlink in default browser?"), _L("PrusaSlicer: Open hyperlink"), wxICON_QUESTION | wxYES_NO);
launch = dialog.ShowModal() == wxID_YES;
}
return launch && wxLaunchDefaultBrowser(url, flags); return launch && wxLaunchDefaultBrowser(url, flags);
} }
@ -3712,7 +3734,7 @@ void GUI_App::app_updater(bool from_user)
return; return;
} }
if (app_data.action == AppUpdaterURLAction::AUUA_OPEN_IN_BROWSER) { if (app_data.action == AppUpdaterURLAction::AUUA_OPEN_IN_BROWSER) {
open_browser_with_warning_dialog(from_u8(app_data.url)); open_browser_with_warning_dialog(from_u8(app_data.url), nullptr, false);
return; return;
} }
// dialog with new version download (installer or app dependent on system) including path selection // dialog with new version download (installer or app dependent on system) including path selection