From 042004fb04ca45065df2bfffb73e7a5047ef70f2 Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Wed, 5 Jul 2023 16:46:52 +0800 Subject: [PATCH] ENH: adjust wiki position Change-Id: I7b84395f081fb2fd0e6980b12a9d0795f66a359f --- src/slic3r/GUI/CalibrationWizardPage.cpp | 25 +++++++++++++ src/slic3r/GUI/CalibrationWizardPage.hpp | 3 ++ .../GUI/CalibrationWizardPresetPage.cpp | 1 + src/slic3r/GUI/CalibrationWizardStartPage.cpp | 35 ------------------- src/slic3r/GUI/CalibrationWizardStartPage.hpp | 3 -- 5 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index ce94502ea..fc4421c1b 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -367,6 +367,12 @@ CaliPageCaption::CaliPageCaption(wxWindow* parent, CalibMode cali_mode, m_help_btn->SetBackgroundColour(*wxWHITE); caption_sizer->Add(m_help_btn, 0, wxALIGN_CENTER); + caption_sizer->AddStretchSpacer(); + + m_wiki_url = get_calibration_wiki_page(cali_mode); + create_wiki(this); + caption_sizer->Add(m_wiki_text, 0); + top_sizer->Add(caption_sizer, 1, wxEXPAND); top_sizer->AddSpacer(FromDIP(35)); this->SetSizer(top_sizer); @@ -406,6 +412,25 @@ void CaliPageCaption::init_bitmaps() { m_help_bmp_hover = ScalableBitmap(this, "cali_page_caption_help_hover", 30); } +void CaliPageCaption::create_wiki(wxWindow* parent) +{ + m_wiki_text = new wxStaticText(parent, wxID_ANY, _L("Wiki")); + m_wiki_text->SetFont(Label::Head_14); + m_wiki_text->SetForegroundColour({ 0, 88, 220 }); + m_wiki_text->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent& e) { + e.Skip(); + SetCursor(wxCURSOR_HAND); + }); + m_wiki_text->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent& e) { + e.Skip(); + SetCursor(wxCURSOR_ARROW); + }); + m_wiki_text->Bind(wxEVT_LEFT_UP, [this](wxMouseEvent& e) { + if (!m_wiki_url.empty()) + wxLaunchDefaultBrowser(m_wiki_url); + }); +} + void CaliPageCaption::show_prev_btn(bool show) { m_prev_btn->Show(show); diff --git a/src/slic3r/GUI/CalibrationWizardPage.hpp b/src/slic3r/GUI/CalibrationWizardPage.hpp index 6743612e2..468a5f327 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPage.hpp @@ -128,7 +128,10 @@ protected: private: void init_bitmaps(); + void create_wiki(wxWindow* parent); + wxStaticText* m_wiki_text; + wxString m_wiki_url; ScalableBitmap m_prev_bmp_normal; ScalableBitmap m_prev_bmp_hover; ScalableBitmap m_help_bmp_normal; diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index f8414e184..201610365 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1377,6 +1377,7 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) } // init default for filament source + // TODO if user change ams/ext, need to update if ( !obj->has_ams() || (obj->m_tray_now == std::to_string(VIRTUAL_TRAY_ID)) ) { m_ext_spool_radiobox->SetValue(true); diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 4034a926f..c9de76a02 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -11,25 +11,6 @@ CalibrationStartPage::CalibrationStartPage(wxWindow* parent, wxWindowID id, cons m_top_sizer = new wxBoxSizer(wxVERTICAL); } -void CalibrationStartPage::create_wiki(wxWindow* parent) -{ - m_wiki_text = new wxStaticText(parent, wxID_ANY, _L("Wiki")); - m_wiki_text->SetFont(Label::Head_14); - m_wiki_text->SetForegroundColour({ 0, 88, 220 }); - m_wiki_text->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent& e) { - e.Skip(); - SetCursor(wxCURSOR_HAND); - }); - m_wiki_text->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent& e) { - e.Skip(); - SetCursor(wxCURSOR_ARROW); - }); - m_wiki_text->Bind(wxEVT_LEFT_UP, [this](wxMouseEvent& e) { - if (!m_wiki_url.empty()) - wxLaunchDefaultBrowser(m_wiki_url); - }); -} - void CalibrationStartPage::create_when(wxWindow* parent, wxString title, wxString content) { m_when_title = new wxStaticText(this, wxID_ANY, title); @@ -67,8 +48,6 @@ CalibrationPAStartPage::CalibrationPAStartPage(wxWindow* parent, wxWindowID id, m_cali_mode = CalibMode::Calib_PA_Line; m_page_type = CaliPageType::CALI_PAGE_START; - m_wiki_url = get_calibration_wiki_page(m_cali_mode); - create_page(this); this->SetSizer(m_top_sizer); @@ -102,12 +81,8 @@ void CalibrationPAStartPage::create_page(wxWindow* parent) about_text->Wrap(CALIBRATION_TEXT_MAX_LENGTH); m_top_sizer->Add(about_text); - m_top_sizer->AddSpacer(PRESET_GAP); - create_wiki(parent); - m_top_sizer->Add(m_wiki_text, 0); - m_action_panel = new CaliPageActionPanel(parent, CalibMode::Calib_PA_Line, CaliPageType::CALI_PAGE_START); m_top_sizer->Add(m_action_panel, 0, wxEXPAND, 0); @@ -168,8 +143,6 @@ CalibrationFlowRateStartPage::CalibrationFlowRateStartPage(wxWindow* parent, wxW { m_cali_mode = CalibMode::Calib_Flow_Rate; - m_wiki_url = get_calibration_wiki_page(m_cali_mode); - create_page(this); this->SetSizer(m_top_sizer); @@ -210,9 +183,6 @@ void CalibrationFlowRateStartPage::create_page(wxWindow* parent) m_top_sizer->AddSpacer(PRESET_GAP); - create_wiki(parent); - m_top_sizer->Add(m_wiki_text, 0); - m_action_panel = new CaliPageActionPanel(parent, CalibMode::Calib_Flow_Rate, CaliPageType::CALI_PAGE_START); m_top_sizer->Add(m_action_panel, 0, wxEXPAND, 0); @@ -265,8 +235,6 @@ CalibrationMaxVolumetricSpeedStartPage::CalibrationMaxVolumetricSpeedStartPage(w { m_cali_mode = CalibMode::Calib_Vol_speed_Tower; - m_wiki_url = get_calibration_wiki_page(m_cali_mode); - create_page(this); this->SetSizer(m_top_sizer); @@ -305,9 +273,6 @@ void CalibrationMaxVolumetricSpeedStartPage::create_page(wxWindow* parent) m_top_sizer->AddSpacer(PRESET_GAP); - create_wiki(parent); - m_top_sizer->Add(m_wiki_text, 0); - m_action_panel = new CaliPageActionPanel(parent, m_cali_mode, CaliPageType::CALI_PAGE_START); m_top_sizer->Add(m_action_panel, 0, wxEXPAND, 0); diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.hpp b/src/slic3r/GUI/CalibrationWizardStartPage.hpp index 914b3d622..25323d5a2 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp @@ -18,17 +18,14 @@ public: protected: CalibMode m_cali_mode; - wxString m_wiki_url; wxBoxSizer* m_top_sizer; wxBoxSizer* m_images_sizer; - wxStaticText* m_wiki_text; wxStaticText* m_when_title; wxStaticText* m_when_content; wxStaticBitmap* m_before_bmp; wxStaticBitmap* m_after_bmp; - void create_wiki(wxWindow* parent); void create_when(wxWindow* parent, wxString title, wxString content); void create_bitmap(wxWindow* parent, const wxBitmap& before_img, const wxBitmap& after_img); void create_bitmap(wxWindow* parent, std::string before_img, std::string after_img);