QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-01-31 00:48:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

version update

Browse Source
This commit is contained in:
QIDI TECH
2024-09-03 16:19:35 +08:00
parent 4626916f7c
commit b787d6f029
5 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/Icon.icns
View File

Binary file not shown.

BIN
resources/QIDIStudio.icns
View File

Binary file not shown.

136
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@@ -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_paragraph(parent, title_2, title_text_2, content_2, content_text_2);
create_gif_images(parent, m_top_sizer, "flowratiocoarseset"); create_gif_images(parent, m_top_sizer, "flowratiocoarseset");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2]() { // wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2]() {
title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#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_paragraph(parent, title_3, title_text_3, content_3, content_text_3);
create_gif_images(parent, m_top_sizer, "flowratioset"); create_gif_images(parent, m_top_sizer, "flowratioset");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3]() { // 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_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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() }); // title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_1->SetMinSize(content_1->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_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // content_3->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }
//w29 //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_paragraph(parent, title_2, title_text_2, content_2, content_text_2);
create_gif_images(parent, m_top_sizer, "pavalue03"); create_gif_images(parent, m_top_sizer, "pavalue03");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { // wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() {
title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_2->SetMinSize(content_2->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() }); // introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }
//w29 //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_paragraph(parent, title_2, title_text_2, content_2, content_text_2);
create_gif_images(parent, m_top_sizer, "pavalue03"); create_gif_images(parent, m_top_sizer, "pavalue03");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { // wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() {
title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_2->SetMinSize(content_2->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() }); // introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }
//w29 //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_paragraph(parent, title_3, title_text_3, content_3, content_text_3);
create_gif_images(parent, m_top_sizer, "pavalue02"); create_gif_images(parent, m_top_sizer, "pavalue02");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, title_3, content_1, content_2, content_3, introduce_1]() { // 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_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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() }); // title_3->SetMinSize(title_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_1->SetMinSize(content_1->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_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_3->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() }); // introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }
void CalibrationPresetPage::create_page_max_volumetric_speed(wxWindow* parent, wxBoxSizer* m_top_sizer) { 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_paragraph(parent, title_2, title_text_2, content_2, content_text_2);
create_gif_images(parent, m_top_sizer, "Volumetricspeedset"); create_gif_images(parent, m_top_sizer, "Volumetricspeedset");
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() { // wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce_1]() {
title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_2->SetMinSize(content_2->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() }); // introduce_1->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }

22
src/slic3r/GUI/CalibrationWizardStartPage.cpp
View File

@@ -210,17 +210,17 @@ void CalibrationPAStartPage::create_page(wxWindow* parent)
m_top_sizer->Add(m_tips_panel, 0); m_top_sizer->Add(m_tips_panel, 0);
m_top_sizer->AddSpacer(PRESET_GAP); m_top_sizer->AddSpacer(PRESET_GAP);
#ifdef __linux__ //#ifdef __linux__
wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce]() { // wxGetApp().CallAfter([this, title_1, title_2, content_1, content_2, introduce]() {
title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // title_1->SetMinSize(title_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
title_2->SetMinSize(title_2->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_1->SetMinSize(content_1->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // content_2->SetMinSize(content_2->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
introduce->SetMinSize(introduce_text->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() }); // introduce->SetMinSize(introduce_text->GetSize() + wxSize{ 0, wxWindow::GetCharHeight() });
Layout(); // Layout();
Fit(); // Fit();
}); // });
#endif //#endif
} }
//w29 //w29

2
version.inc
View File

@@ -15,4 +15,4 @@ endif()
# The build_version should start from 50 in master branch # The build_version should start from 50 in master branch
set(SLIC3R_VERSION "01.09.03.50") set(SLIC3R_VERSION "01.09.03.51")