diff --git a/resources/Icon.icns b/resources/Icon.icns index e04feb5..59f90d9 100644 Binary files a/resources/Icon.icns and b/resources/Icon.icns differ diff --git a/resources/QIDIStudio.icns b/resources/QIDIStudio.icns index e04feb5..59f90d9 100644 Binary files a/resources/QIDIStudio.icns and b/resources/QIDIStudio.icns differ diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 2732169..b38175c 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -443,16 +443,16 @@ void CalibrationPresetPage::create_page_flow_coarse(wxWindow* parent, wxBoxSizer create_paragraph(parent, title_2, title_text_2, content_2, content_text_2); create_gif_images(parent, m_top_sizer, "flowratiocoarseset"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } @@ -485,18 +485,18 @@ void CalibrationPresetPage::create_page_flow_fine(wxWindow* parent, wxBoxSizer* create_paragraph(parent, title_3, title_text_3, content_3, content_text_3); create_gif_images(parent, m_top_sizer, "flowratioset"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } //w29 @@ -530,17 +530,17 @@ void CalibrationPresetPage::create_page_pa_line(wxWindow* parent, wxBoxSizer* m_ create_paragraph(parent, title_2, title_text_2, content_2, content_text_2); create_gif_images(parent, m_top_sizer, "pavalue03"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } //w29 @@ -577,17 +577,17 @@ void CalibrationPresetPage::create_page_pa_pattern(wxWindow* parent, wxBoxSizer* create_paragraph(parent, title_2, title_text_2, content_2, content_text_2); create_gif_images(parent, m_top_sizer, "pavalue03"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } //w29 @@ -631,19 +631,19 @@ void CalibrationPresetPage::create_page_pa_tower(wxWindow* parent, wxBoxSizer* m create_paragraph(parent, title_3, title_text_3, content_3, content_text_3); create_gif_images(parent, m_top_sizer, "pavalue02"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3, introduce_1]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3, introduce_1]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } void CalibrationPresetPage::create_page_max_volumetric_speed(wxWindow* parent, wxBoxSizer* m_top_sizer) { @@ -685,17 +685,17 @@ void CalibrationPresetPage::create_page_max_volumetric_speed(wxWindow* parent, w create_paragraph(parent, title_2, title_text_2, content_2, content_text_2); create_gif_images(parent, m_top_sizer, "Volumetricspeedset"); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 65ceefc..4cf05a6 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -210,17 +210,17 @@ void CalibrationPAStartPage::create_page(wxWindow* parent) m_top_sizer->Add(m_tips_panel, 0); m_top_sizer->AddSpacer(PRESET_GAP); -#ifdef __linux__ - wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce]() { - title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - introduce->SetMinSize(introduce_text->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); - Layout(); - Fit(); - }); -#endif +//#ifdef __linux__ +// wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce]() { +// title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// title_2->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// introduce->SetMinSize(introduce_text->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); +// Layout(); +// Fit(); +// }); +//#endif } //w29 diff --git a/version.inc b/version.inc index 642185e..927c845 100644 --- a/version.inc +++ b/version.inc @@ -15,4 +15,4 @@ endif() # The build_version should start from 50 in master branch -set(SLIC3R_VERSION "01.09.03.50") +set(SLIC3R_VERSION "01.09.03.51")