mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-17 14:02:35 +00:00
Kris AustinandNoisyfox
82759d3899
* fix: make the error dialog caret point at the character it's blaming Custom G-code parse errors print the offending line with a '^' under the character that broke, positioned with spaces so it only lines up in a fixed-width font. Since v2.3.2 these dialogs rendered entirely in the proportional UI font, so the caret drifted left of its column and landed on unrelated text. Render only the code excerpts (the offending source line and its caret) in the fixed-width face, leaving the surrounding prose in the UI font, and reserve the horizontal scrollbar's height so a long line does not clip. Rename the flag to has_code_excerpts to match what it now means. Fixes #14869 * refactor(GUI): use <code> instead of <tt> for error excerpts wxHTML maps <tt>, <code>, <kbd> and <samp> to the same fixed-width handler, so this renders identically. <code> is the non-deprecated tag and matches what the original code used. * fix(GUI): align the error caret with real spaces, not The caret line was padded with so its spaces would survive inline HTML. wxHTML measures every glyph by its font extent, so where the fixed font lacks a U+00A0 glyph the fallback renders it about twice as wide, and the all- caret line outran the source, drifting the ^ to the right. Wrap the excerpts in a small <excerpt> tag, registered on the dialog's own parser, that switches on wxHTML literal-whitespace mode so the caret uses real spaces that match the source column in any font. It sits inside <code> for the fixed face; <pre> would do both but forces a blank line above it. --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
90 lines
3.8 KiB
C++
90 lines
3.8 KiB
C++
#ifndef slic3r_GUI_hpp_
|
|
#define slic3r_GUI_hpp_
|
|
|
|
namespace boost { class any; }
|
|
namespace boost::filesystem { class path; }
|
|
|
|
#include <wx/string.h>
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/Preset.hpp"
|
|
|
|
class wxWindow;
|
|
class wxMenuBar;
|
|
class wxComboCtrl;
|
|
class wxFileDialog;
|
|
class wxTopLevelWindow;
|
|
|
|
namespace Slic3r {
|
|
|
|
class AppConfig;
|
|
class DynamicPrintConfig;
|
|
class Print;
|
|
|
|
namespace GUI {
|
|
|
|
void disable_screensaver();
|
|
void enable_screensaver();
|
|
bool debugged();
|
|
void break_to_debugger();
|
|
|
|
// Platform specific Ctrl+/Alt+ (Windows, Linux) vs. ⌘/⌥ (OSX) prefixes
|
|
extern const std::string& shortkey_ctrl_prefix();
|
|
extern const std::string& shortkey_alt_prefix();
|
|
extern const std::string& shortkey_shift_prefix(); // Shift is the same on all platforms, but we provide a function for consistency with Ctrl/Alt prefixes
|
|
|
|
extern AppConfig* get_app_config();
|
|
|
|
extern void add_menus(wxMenuBar *menu, int event_preferences_changed, int event_language_change);
|
|
|
|
// Change option value in config
|
|
void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt_key, const boost::any& value, int opt_index = 0);
|
|
|
|
// If has_code_excerpts is true, code excerpts (a source line and the caret line below it) render
|
|
// monospaced so the caret aligns. Used for placeholder-parser errors.
|
|
void show_error(wxWindow* parent, const wxString& message, bool has_code_excerpts = false);
|
|
void show_error(wxWindow* parent, const char* message, bool has_code_excerpts = false);
|
|
inline void show_error(wxWindow* parent, const std::string& message, bool has_code_excerpts = false) { show_error(parent, message.c_str(), has_code_excerpts); }
|
|
void show_error_id(int id, const std::string& message); // For Perl
|
|
void show_info(wxWindow* parent, const wxString& message, const wxString& title = wxString());
|
|
void show_info(wxWindow* parent, const char* message, const char* title = nullptr);
|
|
inline void show_info(wxWindow* parent, const std::string& message,const std::string& title = std::string()) { show_info(parent, message.c_str(), title.c_str()); }
|
|
void warning_catcher(wxWindow* parent, const wxString& message);
|
|
void show_substitutions_info(const PresetsConfigSubstitutions& presets_config_substitutions);
|
|
void show_substitutions_info(const ConfigSubstitutions& config_substitutions, const std::string& filename);
|
|
|
|
// Creates a wxCheckListBoxComboPopup inside the given wxComboCtrl, filled with the given text and items.
|
|
// Items data must be separated by '|', and contain the item name to be shown followed by its initial value (0 for false, 1 for true).
|
|
// For example "Item1|0|Item2|1|Item3|0", and so on.
|
|
void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, const std::string& items);
|
|
|
|
// Returns the current state of the items listed in the wxCheckListBoxComboPopup contained in the given wxComboCtrl,
|
|
// encoded inside an unsigned int.
|
|
unsigned int combochecklist_get_flags(wxComboCtrl* comboCtrl);
|
|
|
|
// Sets the current state of the items listed in the wxCheckListBoxComboPopup contained in the given wxComboCtrl,
|
|
// with the flags encoded in the given unsigned int.
|
|
void combochecklist_set_flags(wxComboCtrl* comboCtrl, unsigned int flags);
|
|
|
|
// wxString conversions:
|
|
|
|
// wxString from std::string in UTF8
|
|
wxString from_u8(const std::string &str);
|
|
// std::string in UTF8 from wxString
|
|
std::string into_u8(const wxString &str);
|
|
// wxString from boost path
|
|
wxString from_path(const boost::filesystem::path &path);
|
|
// boost path from wxString
|
|
boost::filesystem::path into_path(const wxString &str);
|
|
|
|
// Display an About dialog
|
|
extern void about();
|
|
// Ask the destop to open the datadir using the default file explorer.
|
|
extern void desktop_open_datadir_folder();
|
|
// Ask the destop to open one folder
|
|
extern void desktop_open_any_folder(const std::string& path);
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|
|
|
|
#endif
|