From e54239fdbe38064cf035d72c34bc834604a3e56c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 17 Mar 2023 22:25:38 +0800 Subject: [PATCH] update about --- resources/images/BambuStudio_about.svg | 78 +++++++++++++++++--------- src/slic3r/GUI/AboutDialog.cpp | 32 +++++------ 2 files changed, 69 insertions(+), 41 deletions(-) diff --git a/resources/images/BambuStudio_about.svg b/resources/images/BambuStudio_about.svg index 7471d2a4bed..43d9bd47292 100644 --- a/resources/images/BambuStudio_about.svg +++ b/resources/images/BambuStudio_about.svg @@ -32,9 +32,9 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" showgrid="false" - inkscape:zoom="2.1530249" - inkscape:cx="287.27025" - inkscape:cy="93.821488" + inkscape:zoom="12.179348" + inkscape:cx="278.75055" + inkscape:cy="104.93173" inkscape:window-width="3440" inkscape:window-height="1369" inkscape:window-x="-8" @@ -484,26 +484,54 @@ - Orca - Slicer + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 7acd46b20d3..64fdc9ae48c 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -220,7 +220,7 @@ AboutDialog::AboutDialog() wxPanel *m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(237)), wxTAB_TRAVERSAL); wxBoxSizer *panel_versizer = new wxBoxSizer(wxVERTICAL); - // wxBoxSizer *vesizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer *vesizer = new wxBoxSizer(wxVERTICAL); m_panel->SetSizer(panel_versizer); @@ -230,16 +230,16 @@ AboutDialog::AboutDialog() main_sizer->Add(m_panel, 1, wxEXPAND | wxALL, 0); main_sizer->Add(ver_sizer, 0, wxEXPAND | wxALL, 0); - // // logo - // m_logo_bitmap = ScalableBitmap(this, "BambuStudio_about", 250); - // m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0); - // m_logo->SetSizer(vesizer); + // logo + m_logo_bitmap = ScalableBitmap(this, "BambuStudio_about", 250); + m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0); + m_logo->SetSizer(vesizer); - // panel_versizer->Add(m_logo, 1, wxALL | wxEXPAND, 0); + panel_versizer->Add(m_logo, 1, wxALL | wxEXPAND, 0); // version { - panel_versizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5)); + vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5)); auto version_string = _L("Orca Slicer ") + " " + std::string(SoftFever_VERSION); wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize); wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on BambuStudio %s",std::string(SLIC3R_VERSION)), wxDefaultPosition, wxDefaultSize); @@ -252,14 +252,14 @@ AboutDialog::AboutDialog() #endif version_font.SetPointSize(FromDIP(16)); version->SetFont(version_font); - // version->SetForegroundColour(wxColour("#FFFFFD")); - // if(wxGetApp().dark_mode()) - // version->SetBackgroundColour(wxColour("#00675b")); - // else - // version->SetBackgroundColour(wxColour("#009688")); - - panel_versizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); - panel_versizer->Add(bs_version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); + version->SetForegroundColour(wxColour("#FFFFFD")); + bs_version->SetForegroundColour(wxColour("#FFFFFD")); + version->SetBackgroundColour(wxColour("#4d4d4d")); + bs_version->SetBackgroundColour(wxColour("#4d4d4d")); + + + vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); + vesizer->Add(bs_version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); // #if BBL_INTERNAL_TESTING // wxString build_time = wxString::Format("Build Time: %s", std::string(SLIC3R_BUILD_TIME)); // wxStaticText* build_time_text = new wxStaticText(this, wxID_ANY, build_time, wxDefaultPosition, wxDefaultSize); @@ -267,7 +267,7 @@ AboutDialog::AboutDialog() // build_time_text->SetBackgroundColour(wxColour("#00AF42")); // vesizer->Add(build_time_text, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); // #endif - panel_versizer->Add(0, 0, 1, wxEXPAND, FromDIP(5)); + vesizer->Add(0, 0, 1, wxEXPAND, FromDIP(5)); } wxBoxSizer *text_sizer_horiz = new wxBoxSizer(wxHORIZONTAL);