diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index 3f4227b7a48..bbda6cb52b9 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -76,7 +76,7 @@ jobs: export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3) ver="_V${ver//\"}" cd ${{ github.workspace }}/build_x86_64/OrcaSlicer - zip -FSrq OrcaSlicer${ver}_nightly_Mac_Intel_signed.zip ${{ github.workspace }}/build_x86_64/OrcaSlicer/OrcaSlicer.app + zip -FSrq OrcaSlicer${ver}_nightly_Mac_Intel_signed.zip OrcaSlicer.app # (wip: staple failed, error 65) # - name: Notarize the app diff --git a/resources/Icon.icns b/resources/Icon.icns index 06a665325f2..257a789b87e 100644 Binary files a/resources/Icon.icns and b/resources/Icon.icns differ diff --git a/resources/images/BambuStudio-mac_128px.png b/resources/images/BambuStudio-mac_128px.png index 6b1d06cc806..9f8d5b0fd35 100644 Binary files a/resources/images/BambuStudio-mac_128px.png and b/resources/images/BambuStudio-mac_128px.png differ diff --git a/resources/images/BambuStudio-mac_256px.ico b/resources/images/BambuStudio-mac_256px.ico index 2c3130dfcd2..6556443c1fc 100644 Binary files a/resources/images/BambuStudio-mac_256px.ico and b/resources/images/BambuStudio-mac_256px.ico differ diff --git a/resources/images/BambuStudio.icns b/resources/images/BambuStudio.icns index 7e807278155..f1fb8590a93 100644 Binary files a/resources/images/BambuStudio.icns and b/resources/images/BambuStudio.icns differ diff --git a/resources/images/BambuStudio.ico b/resources/images/BambuStudio.ico index 77bb5040546..de11c589186 100644 Binary files a/resources/images/BambuStudio.ico and b/resources/images/BambuStudio.ico differ diff --git a/resources/images/BambuStudio.png b/resources/images/BambuStudio.png index 1af136da060..8c3fea0de56 100644 Binary files a/resources/images/BambuStudio.png and b/resources/images/BambuStudio.png differ diff --git a/resources/images/BambuStudio.svg b/resources/images/BambuStudio.svg index 1bd2699a78c..66324266e96 100644 --- a/resources/images/BambuStudio.svg +++ b/resources/images/BambuStudio.svg @@ -1,7 +1,137 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/BambuStudioTitle.ico b/resources/images/BambuStudioTitle.ico index 380eada08bb..84da66f76e9 100644 Binary files a/resources/images/BambuStudioTitle.ico and b/resources/images/BambuStudioTitle.ico differ diff --git a/resources/images/BambuStudioTitle.png b/resources/images/BambuStudioTitle.png index 24bd9a9ad9e..1294143acf9 100644 Binary files a/resources/images/BambuStudioTitle.png and b/resources/images/BambuStudioTitle.png differ diff --git a/resources/images/BambuStudio_128px.png b/resources/images/BambuStudio_128px.png index 6b1d06cc806..9f8d5b0fd35 100644 Binary files a/resources/images/BambuStudio_128px.png and b/resources/images/BambuStudio_128px.png differ diff --git a/resources/images/BambuStudio_154.png b/resources/images/BambuStudio_154.png index 1af136da060..b57bfb861a0 100644 Binary files a/resources/images/BambuStudio_154.png and b/resources/images/BambuStudio_154.png differ diff --git a/resources/images/BambuStudio_154_title.png b/resources/images/BambuStudio_154_title.png index dd2c6101eed..46b07170386 100644 Binary files a/resources/images/BambuStudio_154_title.png and b/resources/images/BambuStudio_154_title.png differ diff --git a/resources/images/BambuStudio_192px.png b/resources/images/BambuStudio_192px.png index f92201bc628..6c62e03228b 100644 Binary files a/resources/images/BambuStudio_192px.png and b/resources/images/BambuStudio_192px.png differ diff --git a/resources/images/BambuStudio_192px_grayscale.png b/resources/images/BambuStudio_192px_grayscale.png index 4f1041dcdd1..a9c621827e7 100644 Binary files a/resources/images/BambuStudio_192px_grayscale.png and b/resources/images/BambuStudio_192px_grayscale.png differ diff --git a/resources/images/BambuStudio_192px_transparent.png b/resources/images/BambuStudio_192px_transparent.png index cb6f3451894..5e3751f8921 100644 Binary files a/resources/images/BambuStudio_192px_transparent.png and b/resources/images/BambuStudio_192px_transparent.png differ diff --git a/resources/images/BambuStudio_32px.png b/resources/images/BambuStudio_32px.png index ec4c3f8e5d3..424fd4f63a1 100644 Binary files a/resources/images/BambuStudio_32px.png and b/resources/images/BambuStudio_32px.png differ diff --git a/resources/images/BambuStudio_64.png b/resources/images/BambuStudio_64.png index 4a965b6a1b9..cbe614c0da0 100644 Binary files a/resources/images/BambuStudio_64.png and b/resources/images/BambuStudio_64.png differ diff --git a/resources/images/BambuStudio_about.svg b/resources/images/BambuStudio_about.svg index 66d8a596fa0..43d9bd47292 100644 --- a/resources/images/BambuStudio_about.svg +++ b/resources/images/BambuStudio_about.svg @@ -1,87 +1,537 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/OrcaSlicer.png b/resources/images/OrcaSlicer.png index 1af136da060..de088bec637 100644 Binary files a/resources/images/OrcaSlicer.png and b/resources/images/OrcaSlicer.png differ diff --git a/resources/images/OrcaSlicer_192px.png b/resources/images/OrcaSlicer_192px.png index f92201bc628..6c62e03228b 100644 Binary files a/resources/images/OrcaSlicer_192px.png and b/resources/images/OrcaSlicer_192px.png differ diff --git a/resources/images/OrcaSlicer_gradient.svg b/resources/images/OrcaSlicer_gradient.svg new file mode 100644 index 00000000000..6e3829cad19 --- /dev/null +++ b/resources/images/OrcaSlicer_gradient.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/OrcaSlicer_gradient_narrow.svg b/resources/images/OrcaSlicer_gradient_narrow.svg new file mode 100644 index 00000000000..69bf400b904 --- /dev/null +++ b/resources/images/OrcaSlicer_gradient_narrow.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/OrcaSlicer_gray.svg b/resources/images/OrcaSlicer_gray.svg new file mode 100644 index 00000000000..ef9f5de3037 --- /dev/null +++ b/resources/images/OrcaSlicer_gray.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/gcode.icns b/resources/images/gcode.icns index a2a243cb89c..cb685192367 100644 Binary files a/resources/images/gcode.icns and b/resources/images/gcode.icns differ diff --git a/resources/images/splash_logo.svg b/resources/images/splash_logo.svg index bdcba615f34..34fe2bcfc76 100644 --- a/resources/images/splash_logo.svg +++ b/resources/images/splash_logo.svg @@ -1,6 +1,99 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/studio_logo.svg b/resources/images/studio_logo.svg index ae89a13cea4..34fe2bcfc76 100644 --- a/resources/images/studio_logo.svg +++ b/resources/images/studio_logo.svg @@ -1,59 +1,99 @@ + + + id="defs6"> + + + + - - - - + inkscape:zoom="0.70710678" + inkscape:cx="443.35595" + inkscape:cy="564.27121" + inkscape:window-width="3440" + inkscape:window-height="1369" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="g8" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/web/image/logo.png b/resources/web/image/logo.png index 1af136da060..b57bfb861a0 100644 Binary files a/resources/web/image/logo.png and b/resources/web/image/logo.png differ diff --git a/resources/web/image/logo2.png b/resources/web/image/logo2.png index 9d9ab973b51..6001bba563a 100644 Binary files a/resources/web/image/logo2.png and b/resources/web/image/logo2.png differ 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);