Home Explore Help
Sign In
SMusatov
/
SuperSlicer
mirror of https://github.com/supermerill/SuperSlicer.git
1
0
Fork 0
Files Wiki
Browse Source

ConfigWizard: Downloads page: Info line is changed
+ Linux and OSX specific: Fixed BG color for the HTML_widget on Materials pages and InfoDialogs

YuSanka 1 year ago
parent
be9bbb7552
commit
0c82f38950
4 changed files with 69 additions and 31 deletions
Split View Show Diff Stats
  1. 45 16
      src/slic3r/GUI/ConfigWizard.cpp
  2. 18 0
      src/slic3r/GUI/GUI_App.cpp
  3. 2 0
      src/slic3r/GUI/GUI_App.hpp
  4. 4 15
      src/slic3r/GUI/MsgDialog.cpp

+ 45 - 16
src/slic3r/GUI/ConfigWizard.cpp
View File 

@@ -707,6 +707,10 @@ PageMaterials::PageMaterials(ConfigWizard *parent, Materials *materials, wxStrin
 
     list_vendor->SetMinSize(wxSize(13*em, list_h));
 
     list_profile->SetMinSize(wxSize(23*em, list_h));
 
 
+#ifdef __APPLE__
 
+    for (wxWindow* win : std::initializer_list<wxWindow*>{ list_printer, list_type, list_vendor, list_profile })
 
+        win->SetBackgroundColour(wxGetApp().get_window_default_clr());
 
+#endif
 
 
 
     grid = new wxFlexGridSizer(4, em/2, em);
 
@@ -817,19 +821,9 @@ void PageMaterials::reload_presets()
 
 
 void PageMaterials::set_compatible_printers_html_window(const std::vector<std::string>& printer_names, bool all_printers)
 
 {
 
-    const auto bgr_clr = 
-#if defined(__APPLE__)
 
-        html_window->GetParent()->GetBackgroundColour();
 
-#else 
-#if defined(_WIN32)
 
-        wxGetApp().get_window_default_clr();
 
-#else
 
-        wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
 
-#endif
 
-#endif
 
     const auto text_clr = wxGetApp().get_label_clr_default();
 
-    const auto bgr_clr_str = encode_color(ColorRGB(bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()));
 
     const auto text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
 
+    const auto bgr_clr_str = wxGetApp().get_html_bg_color(parent);
 
     wxString text;
 
     if (materials->technology == T_FFF && template_shown) {
 
         // TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
 
@@ -1468,11 +1462,43 @@ PageDownloader::PageDownloader(ConfigWizard* parent)
 
     box_allow_downloads->SetValue(box_allow_value);
 
     append(box_allow_downloads);
 
 
-    // TRN ConfigWizard : Downloader : %1% = "PrusaSlicer"
 
-    append_text(format_wxstr(_L("If enabled, %1% registers to start on custom URL on www.printables.com."
 
-        " You will be able to use button with %1% logo to open models in this %1%."
 
-        " The model will be downloaded into folder you choose bellow."
 
-    ), SLIC3R_APP_NAME));
 
+    // append info line with link on printables.com
 
+    {
 
+        const int em = parent->em_unit();
 
+        wxHtmlWindow* html_window = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxSize(60 * em, 5 * em), wxHW_SCROLLBAR_NEVER);
 
+
 
+        html_window->Bind(wxEVT_HTML_LINK_CLICKED, [](wxHtmlLinkEvent& event) {
 
+            wxGetApp().open_browser_with_warning_dialog(event.GetLinkInfo().GetHref());
 
+            event.Skip(false);
 
+            });
 
+
 
+        append(html_window);
 
+
 
+        const auto text_clr = wxGetApp().get_label_clr_default();
 
+        const auto bgr_clr_str = wxGetApp().get_html_bg_color(parent);
 
+        const auto text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
 
+
 
+        const wxString link = format_wxstr("<a href = \"%1%\">%1%</a>", "printables.com");
 
+
 
+        // TRN ConfigWizard : Downloader : %1% = "printables.com", %2% = "PrusaSlicer"
 
+        const wxString main_text = format_wxstr(_L("If enabled, you will be able to open models from the %1% "
 
+                                                   "online database with a single click (using a %2% logo button)."
 
+        ), link, SLIC3R_APP_NAME);
 
+
 
+        const wxFont& font = this->GetFont();
 
+        const int fs = font.GetPointSize();
 
+        int size[] = { fs,fs,fs,fs,fs,fs,fs };
 
+        html_window->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
 
+
 
+        html_window->SetPage(format_wxstr(
 
+            "<html><body bgcolor=%1% link=%2%>"
 
+            "<font color=%2% size=\"3\">%3%</font>"
 
+            "</body></html>"
 
+            , bgr_clr_str
 
+            , text_clr_str
 
+            , main_text
 
+        ));
 
+    }
 
 
 #ifdef __linux__
 
     append_text(wxString::Format(_L(
 
@@ -3351,6 +3377,9 @@ ConfigWizard::ConfigWizard(wxWindow *parent)
 
     : DPIDialog(parent, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(name()), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 
     , p(new priv(this))
 
 {
 
+#ifdef __APPLE__
 
+    this->SetBackgroundColour(wxGetApp().get_window_default_clr());
 
+#endif
 
     wxBusyCursor wait;
 
 
     this->SetFont(wxGetApp().normal_font());

+ 18 - 0
src/slic3r/GUI/GUI_App.cpp
View File 

@@ -1732,6 +1732,24 @@ void GUI_App::set_label_clr_sys(const wxColour& clr)
 
     app_config->set("label_clr_sys", str);
 
 }
 
 
+const std::string GUI_App::get_html_bg_color(wxWindow* html_parent)
 
+{
 
+    wxColour    bgr_clr = html_parent->GetBackgroundColour();
 
+#ifdef __APPLE__
 
+    // On macOS 10.13 and older the background color returned by wxWidgets
 
+    // is wrong, which leads to https://github.com/prusa3d/PrusaSlicer/issues/7603
 
+    // and https://github.com/prusa3d/PrusaSlicer/issues/3775. wxSYS_COLOUR_WINDOW
 
+    // may not match the window background exactly, but it seems to never end up
 
+    // as black on black.
 
+
 
+    if (wxPlatformInfo::Get().GetOSMajorVersion() == 10
 
+        && wxPlatformInfo::Get().GetOSMinorVersion() < 14)
 
+        bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 
+#endif
 
+
 
+    return encode_color(ColorRGB(bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()));
 
+}
 
+
 
 const std::string& GUI_App::get_mode_btn_color(int mode_id)
 
 {
 
     assert(0 <= mode_id && size_t(mode_id) < m_mode_palette.size());

+ 2 - 0
src/slic3r/GUI/GUI_App.hpp
View File 

@@ -222,6 +222,8 @@ public:
 
     const wxColour& get_label_clr_default() { return m_color_label_default; }
 
     const wxColour& get_window_default_clr(){ return m_color_window_default; }
 
 
+    const std::string       get_html_bg_color(wxWindow* html_parent);
 
+
 
     const std::string&      get_mode_btn_color(int mode_id);
 
     std::vector<wxColour>   get_mode_palette();
 
     void                    set_mode_palette(const std::vector<wxColour> &palette);

+ 4 - 15
src/slic3r/GUI/MsgDialog.cpp
View File 

@@ -32,6 +32,9 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
 
 	, content_sizer(new wxBoxSizer(wxVERTICAL))
 
 	, btn_sizer(new wxBoxSizer(wxHORIZONTAL))
 
 {
 
+#ifdef __APPLE__
 
+    this->SetBackgroundColour(wxGetApp().get_window_default_clr());
 
+#endif
 
 	boldfont.SetWeight(wxFONTWEIGHT_BOLD);
 
 
     this->SetFont(wxGetApp().normal_font());
 
@@ -139,22 +142,8 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
 
     wxFont      font = wxGetApp().normal_font();//wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     wxFont      monospace = wxGetApp().code_font();
 
     wxColour    text_clr = wxGetApp().get_label_clr_default();
 
-    wxColour    bgr_clr = parent->GetBackgroundColour();
 
-
 
-#ifdef __APPLE__
 
-    // On macOS 10.13 and older the background color returned by wxWidgets
 
-    // is wrong, which leads to https://github.com/prusa3d/PrusaSlicer/issues/7603
 
-    // and https://github.com/prusa3d/PrusaSlicer/issues/3775. wxSYS_COLOUR_WINDOW
 
-    // may not match the window background exactly, but it seems to never end up
 
-    // as black on black.
 
-    
-    if (wxPlatformInfo::Get().GetOSMajorVersion() == 10
 
-     && wxPlatformInfo::Get().GetOSMinorVersion() < 14)
 
-        bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 
-#endif
 
-
 
     auto        text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
 
-    auto        bgr_clr_str = encode_color(ColorRGB(bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()));
 
+    auto        bgr_clr_str = wxGetApp().get_html_bg_color(parent);
 
     const int   font_size = font.GetPointSize();
 
     int         size[] = { font_size, font_size, font_size, font_size, font_size, font_size, font_size };
 
     html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);