From b342cc6e20c0a97840d4e7a30d5bb447cada9f95 Mon Sep 17 00:00:00 2001 From: yw4z Date: Sun, 26 Jan 2025 03:53:28 +0300 Subject: [PATCH] Update logo usages on splash screen and about page (#8189) * Splash Logo * Update about page * remove comment --- resources/images/OrcaSlicer_about.svg | 538 +-------------------- resources/images/OrcaSlicer_about_dark.svg | 1 + resources/images/splash_logo.svg | 2 +- resources/images/splash_logo_dark.svg | 2 +- src/slic3r/GUI/AboutDialog.cpp | 36 +- 5 files changed, 22 insertions(+), 557 deletions(-) create mode 100644 resources/images/OrcaSlicer_about_dark.svg diff --git a/resources/images/OrcaSlicer_about.svg b/resources/images/OrcaSlicer_about.svg index 43d9bd472..5b675c07f 100644 --- a/resources/images/OrcaSlicer_about.svg +++ b/resources/images/OrcaSlicer_about.svg @@ -1,537 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/OrcaSlicer_about_dark.svg b/resources/images/OrcaSlicer_about_dark.svg new file mode 100644 index 000000000..efff0dc6f --- /dev/null +++ b/resources/images/OrcaSlicer_about_dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/splash_logo.svg b/resources/images/splash_logo.svg index 45a5b3be2..3bcd34637 100644 --- a/resources/images/splash_logo.svg +++ b/resources/images/splash_logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/splash_logo_dark.svg b/resources/images/splash_logo_dark.svg index 5ea2bebcb..5caad657e 100644 --- a/resources/images/splash_logo_dark.svg +++ b/resources/images/splash_logo_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 435cc62bb..05ffc6732 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -219,7 +219,7 @@ AboutDialog::AboutDialog() std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); - wxPanel *m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(237)), wxTAB_TRAVERSAL); + wxPanel* m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(125)), wxTAB_TRAVERSAL); wxBoxSizer *panel_versizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *vesizer = new wxBoxSizer(wxVERTICAL); @@ -232,8 +232,10 @@ AboutDialog::AboutDialog() main_sizer->Add(m_panel, 1, wxEXPAND | wxALL, 0); main_sizer->Add(ver_sizer, 0, wxEXPAND | wxALL, 0); + bool is_dark = wxGetApp().app_config->get("dark_color_mode") == "1"; + // logo - m_logo_bitmap = ScalableBitmap(this, "OrcaSlicer_about", 250); + m_logo_bitmap = ScalableBitmap(this, is_dark ? "OrcaSlicer_about" : "OrcaSlicer_about_dark", FromDIP(125)); m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0); m_logo->SetSizer(vesizer); @@ -242,33 +244,31 @@ AboutDialog::AboutDialog() // version { - auto _build_string_font = Label::Body_10; + auto _build_string_font = Label::Body_12; // _build_string_font.SetStyle(wxFONTSTYLE_ITALIC); - vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5)); - auto version_string = _L("Orca Slicer") + " " + std::string(SoftFever_VERSION); + vesizer->Add(0, 0, 1, wxEXPAND, FromDIP(5)); + auto version_string = std::string(SoftFever_VERSION); // _L("Orca Slicer ") + " " + std::string(SoftFever_VERSION); wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize); - wxStaticText* credits_string = new wxStaticText(this, wxID_ANY, - wxString::Format("Build %s.\nOrcaSlicer is based on PrusaSlicer and BambuStudio", - std::string(GIT_COMMIT_HASH)), - wxDefaultPosition, wxDefaultSize); + wxStaticText* credits_string = new wxStaticText(this, wxID_ANY, wxString::Format("Build %s", std::string(GIT_COMMIT_HASH)), wxDefaultPosition, wxDefaultSize); credits_string->SetFont(_build_string_font); wxFont version_font = GetFont(); #ifdef __WXMSW__ - version_font.SetPointSize(version_font.GetPointSize()-1); + version_font.SetPointSize(version_font.GetPointSize()-1); #else version_font.SetPointSize(11); #endif - version_font.SetPointSize(FromDIP(16)); + version_font.SetPointSize(FromDIP(20)); version->SetFont(version_font); - version->SetForegroundColour(wxColour("#FFFFFD")); - credits_string->SetForegroundColour(wxColour("#FFFFFD")); - version->SetBackgroundColour(wxColour("#4d4d4d")); - credits_string->SetBackgroundColour(wxColour("#4d4d4d")); + version->SetForegroundColour(wxColour("#949494")); + credits_string->SetForegroundColour(wxColour("#949494")); + version->SetBackgroundColour(wxColour("#FFFFFF")); + credits_string->SetBackgroundColour(wxColour("#FFFFFF")); - vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); - vesizer->Add(credits_string, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); -// #if BBL_INTERNAL_TESTING + vesizer->Add(version, 0, wxRIGHT | wxALIGN_RIGHT, FromDIP(20)); + vesizer->AddSpacer(FromDIP(5)); + vesizer->Add(credits_string, 0, wxRIGHT | wxALIGN_RIGHT, FromDIP(20)); + // #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); // build_time_text->SetForegroundColour(wxColour("#FFFFFE"));