3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reworked splash screen (#5257)

Browse source 
* Reworked splash screen

* Fine tune placements

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
yw4z 2024-05-22 18:24:50 +03:00 • committed by GitHub
parent f13dc1fdcd
commit 0a7f787e30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

137
resources/images/splash_logo.svg
View file

@ -1,136 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="814.987"
height="1023.9927"
viewBox="0 0 814.987 1023.9927"
sodipodi:docname="splash_logo.svg"
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs6">
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath16">
<path
d="M 0,792 H 612 V 0 H 0 Z"
id="path14" />
</clipPath>
<filter
style="color-interpolation-filters:sRGB;"
inkscape:label="Drop Shadow"
id="filter398"
x="-0.122229"
y="-0.10200664"
width="1.244458"
height="1.2040133">
<feFlood
flood-opacity="0.498039"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood388" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite390" />
<feGaussianBlur
in="composite1"
stdDeviation="30.5296"
result="blur"
id="feGaussianBlur392" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset394" />
<feComposite
in="SourceGraphic"
in2="offset"
operator="over"
result="composite2"
id="feComposite396" />
</filter>
</defs>
<sodipodi:namedview
id="namedview4"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.70710678"
inkscape:cx="321.73359"
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" />
<g
id="g8"
inkscape:groupmode="layer"
inkscape:label="OrcaS"
transform="matrix(1.3333333,0,0,-1.3333333,1.3995581e-8,1055.9963)">
<g
id="g10"
transform="translate(1.2589521,16.062441)"
style="filter:url(#filter398)">
<g
id="g12"
clip-path="url(#clipPath16)">
<g
id="g18"
transform="translate(59.7287,115.3517)">
<path
d="m 0,0 c 53.332,-53.285 126.698,-86.317 207.744,-86.646 164.049,-0.664 298.355,134.38 297.699,299.337 -0.324,81.496 -33.176,155.271 -86.17,208.899 z"
style="fill:#292826;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path20" />
</g>
<g
id="g22"
transform="translate(479.0017,536.9419)">
<path
d="m 0,0 -419.273,-421.59 c 0.298,-0.298 0.606,-0.587 0.906,-0.884 146.894,74.925 348.023,206.579 486.003,316.297 C 52.756,-65.97 29.506,-29.859 0,0"
style="fill:#009789;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path24" />
</g>
<g
id="g26"
transform="translate(397.0372,747)">
<path
d="m 0,0 c -163.742,0 -296.482,-133.473 -296.482,-298.121 0,-81.979 32.915,-156.223 86.172,-210.117 l 419.273,421.59 C 155.364,-33.096 81.529,0 0,0"
style="fill:#292826;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path28" />
</g>
<g
id="g30"
transform="translate(397.0372,747)">
<path
d="m 0,0 c -56.714,0 -109.702,-16.022 -154.751,-43.796 -24.127,6.312 -54.061,11.37 -88.437,11.157 -59.938,-0.372 -108.713,-16.603 -141.822,-31.784 -8.218,-3.768 -6.898,-15.967 1.941,-17.829 21.801,-4.593 50.498,-14.324 78.883,-35.28 17.931,-13.238 31.574,-27.883 41.856,-41.597 -21.794,-41.504 -34.152,-88.793 -34.152,-138.992 0,-29.952 4.412,-58.865 12.586,-86.137 12.54,27.79 25.699,46.391 29.916,52.184 27.229,37.41 56.015,56.883 98.542,85.651 31.328,21.193 74.856,46.047 199.916,97.449 0,0 39.121,11.017 91.587,42.212 20.912,12.433 36.823,24.17 41.863,42.526 0.355,1.293 0.677,2.57 0.973,3.83 C 129.175,-22.506 67.208,0 0,0"
style="fill:#262523;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path32" />
</g>
<g
id="g34"
transform="translate(446.5563,646.8041)">
<path
d="m 0,0 c 10.875,-19.229 -10.891,-52.305 -48.616,-73.879 -37.725,-21.573 -77.124,-23.474 -88,-4.245 -10.875,19.229 10.891,52.305 48.617,73.879 C -50.274,17.328 -10.875,19.229 0,0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path36" />
</g>
</g>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="480" height="480" viewBox="0 0 480 480"><rect x="168.974" y="80.544" width="142.052" height="142.052" rx="17" style="fill:#e9e9e9"/><path d="M199.693,192.309a43.716,43.716,0,0,0,30.813,12.851,44.266,44.266,0,0,0,31.375-75.382Z" style="fill:#292826"/><path d="M261.881,129.778l-62.188,62.531c.044.044.09.087.135.131,21.787-11.113,51.619-30.64,72.085-46.914a44.288,44.288,0,0,0-10.032-15.748" style="fill:#009789"/><path d="M249.723,97.98a44.268,44.268,0,0,0-31.193,75.383l62.187-62.531A43.712,43.712,0,0,0,249.723,97.98" style="fill:#292826"/><path d="M249.723,97.98a43.59,43.59,0,0,0-22.952,6.5,50.592,50.592,0,0,0-13.118-1.655,51.253,51.253,0,0,0-21.035,4.715,1.4,1.4,0,0,0,.288,2.644,29.994,29.994,0,0,1,17.908,11.4,44.554,44.554,0,0,0-3.2,33.391,44.117,44.117,0,0,1,4.438-7.74c4.038-5.549,8.308-8.437,14.616-12.7,4.646-3.143,11.1-6.83,29.652-14.454a63.117,63.117,0,0,0,13.584-6.261c3.1-1.844,5.462-3.585,6.209-6.307q.079-.288.144-.568a43.612,43.612,0,0,0-26.535-8.96" style="fill:#262523"/><path d="M257.068,112.841c1.613,2.853-1.615,7.758-7.211,10.958s-11.439,3.482-13.052.63,1.615-7.758,7.211-10.958,11.439-3.482,13.052-.63" style="fill:#fff"/><path d="M225.746,278.771a2.2,2.2,0,0,0-2.2,2.2v21.99a2.2,2.2,0,0,0,4.4,0V280.97A2.2,2.2,0,0,0,225.746,278.771Z" style="fill:#949494"/><path d="M283.441,278.771h-5.255a13.194,13.194,0,0,0,0,26.388h5.255a2.2,2.2,0,1,0,0-4.4h-5.255a8.8,8.8,0,1,1,0-17.592h5.255a2.2,2.2,0,0,0,0-4.4Z" style="fill:#949494"/><path d="M283.441,289.766h-6.392a2.2,2.2,0,1,0,0,4.4h6.392a2.2,2.2,0,1,0,0-4.4Z" style="fill:#949494"/><path d="M181.812,305.159H171.16a2.187,2.187,0,0,1,0-4.373h10.652a3.318,3.318,0,1,0,0-6.635h-5.148a7.691,7.691,0,0,1,0-15.381h8.706a2.187,2.187,0,0,1,0,4.373h-8.706a3.318,3.318,0,1,0,0,6.635h5.148a7.691,7.691,0,0,1,0,15.381Z" style="fill:#949494"/><path d="M253.771,299.308a8.8,8.8,0,1,1-.01-14.692,2.205,2.205,0,0,0,2.783-.262h0a2.192,2.192,0,0,0-.294-3.363,13.194,13.194,0,1,0-.085,22,2.213,2.213,0,0,0,.38-3.418l0,0A2.2,2.2,0,0,0,253.771,299.308Z" style="fill:#949494"/><path d="M213.55,300.761H207.2a5.5,5.5,0,0,1-5.5-5.5V280.969a2.2,2.2,0,1,0-4.4,0v14.294a9.907,9.907,0,0,0,9.895,9.9h6.355a2.2,2.2,0,1,0,0-4.4Z" style="fill:#949494"/><path d="M308.827,283.169h-2.2a8.8,8.8,0,0,0-8.792,8.719V302.96a2.2,2.2,0,0,1-4.4,0V291.888a13.207,13.207,0,0,1,13.19-13.117h2.2a2.2,2.2,0,1,1,0,4.4Z" style="fill:#949494"/><path d="M186.65,238.448a12.236,12.236,0,1,1-12.236,12.235,12.25,12.25,0,0,1,12.236-12.235m0-5.441a17.676,17.676,0,1,0,17.676,17.676,17.676,17.676,0,0,0-17.676-17.676Z" style="fill:#949494"/><path d="M308.306,233.007a2.72,2.72,0,0,0-2.72,2.721v2.218a17.676,17.676,0,1,0,0,25.475v2.218a2.72,2.72,0,1,0,5.44,0V235.728A2.72,2.72,0,0,0,308.306,233.007ZM293.35,262.919a12.236,12.236,0,1,1,12.236-12.236A12.25,12.25,0,0,1,293.35,262.919Z" style="fill:#949494"/><path d="M232.518,233.007H229.8a17.676,17.676,0,0,0-17.676,17.676v14.956a2.72,2.72,0,1,0,5.44,0V250.683A12.25,12.25,0,0,1,229.8,238.448h2.72a2.721,2.721,0,0,0,0-5.441Z" style="fill:#949494"/><path d="M265.11,260.773a12.235,12.235,0,1,1-.04-20.207,2.757,2.757,0,0,0,3.52-.279h0a2.74,2.74,0,0,0-.433-4.207,17.676,17.676,0,1,0,.036,29.182,2.732,2.732,0,0,0,.4-4.185l0,0A2.724,2.724,0,0,0,265.11,260.773Z" style="fill:#949494"/></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

1
resources/images/splash_logo_dark.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="480" height="480" viewBox="0 0 480 480"><rect x="168.974" y="78.742" width="142.052" height="142.052" rx="17" style="fill:#949494"/><path d="M225.746,276.969a2.2,2.2,0,0,0-2.2,2.2v21.989a2.2,2.2,0,0,0,4.4,0V279.168A2.2,2.2,0,0,0,225.746,276.969Z" style="fill:#949494"/><path d="M283.441,276.969h-5.255a13.194,13.194,0,0,0,0,26.387h5.255a2.2,2.2,0,1,0,0-4.4h-5.255a8.8,8.8,0,1,1,0-17.591h5.255a2.2,2.2,0,0,0,0-4.4Z" style="fill:#949494"/><path d="M283.441,287.964h-6.392a2.2,2.2,0,1,0,0,4.4h6.392a2.2,2.2,0,1,0,0-4.4Z" style="fill:#949494"/><path d="M181.812,303.356H171.16a2.187,2.187,0,0,1,0-4.373h10.652a3.317,3.317,0,1,0,0-6.634h-5.148a7.691,7.691,0,0,1,0-15.381h8.706a2.187,2.187,0,0,1,0,4.373h-8.706a3.318,3.318,0,1,0,0,6.635h5.148a7.69,7.69,0,1,1,0,15.38Z" style="fill:#949494"/><path d="M199.693,190.506a43.712,43.712,0,0,0,30.813,12.852,44.267,44.267,0,0,0,31.375-75.383Z" style="fill:#292826"/><path d="M261.881,127.975l-62.188,62.531c.044.044.09.087.135.131,21.787-11.113,51.619-30.64,72.085-46.913a44.3,44.3,0,0,0-10.032-15.749" style="fill:#009789"/><path d="M249.723,96.178a44.268,44.268,0,0,0-31.193,75.383l62.187-62.531a43.712,43.712,0,0,0-30.994-12.852" style="fill:#292826"/><path d="M249.723,96.178a43.581,43.581,0,0,0-22.952,6.5,50.549,50.549,0,0,0-13.118-1.655,51.271,51.271,0,0,0-21.035,4.714,1.4,1.4,0,0,0,.288,2.645,29.987,29.987,0,0,1,17.908,11.4,44.556,44.556,0,0,0-3.2,33.392,44.117,44.117,0,0,1,4.438-7.74c4.038-5.549,8.308-8.437,14.616-12.7,4.646-3.144,11.1-6.83,29.652-14.454a63.117,63.117,0,0,0,13.584-6.261c3.1-1.844,5.462-3.585,6.209-6.307q.079-.288.144-.569a43.617,43.617,0,0,0-26.535-8.959" style="fill:#262523"/><path d="M257.068,111.039c1.613,2.852-1.615,7.758-7.211,10.958s-11.439,3.482-13.052.63,1.615-7.758,7.211-10.958,11.439-3.482,13.052-.63" style="fill:#949494"/><path d="M253.771,297.505a8.8,8.8,0,1,1-.01-14.692,2.207,2.207,0,0,0,2.783-.261h0a2.192,2.192,0,0,0-.294-3.363,13.193,13.193,0,1,0-.085,22,2.213,2.213,0,0,0,.38-3.418l0,0A2.2,2.2,0,0,0,253.771,297.505Z" style="fill:#949494"/><path d="M213.55,298.958H207.2a5.5,5.5,0,0,1-5.5-5.5V279.167a2.2,2.2,0,0,0-4.4,0v14.294a9.906,9.906,0,0,0,9.895,9.895h6.355a2.2,2.2,0,1,0,0-4.4Z" style="fill:#949494"/><path d="M308.827,281.367h-2.2a8.8,8.8,0,0,0-8.792,8.719v11.071a2.2,2.2,0,0,1-4.4,0V290.086a13.206,13.206,0,0,1,13.19-13.117h2.2a2.2,2.2,0,0,1,0,4.4Z" style="fill:#949494"/><path d="M186.65,236.645a12.236,12.236,0,1,1-12.236,12.236,12.25,12.25,0,0,1,12.236-12.236m0-5.44a17.676,17.676,0,1,0,17.676,17.676,17.676,17.676,0,0,0-17.676-17.676Z" style="fill:#949494"/><path d="M308.306,231.205a2.72,2.72,0,0,0-2.72,2.72v2.218a17.676,17.676,0,1,0,0,25.476v2.218a2.72,2.72,0,0,0,5.44,0V233.925A2.72,2.72,0,0,0,308.306,231.205ZM293.35,261.117a12.236,12.236,0,1,1,12.236-12.236A12.25,12.25,0,0,1,293.35,261.117Z" style="fill:#949494"/><path d="M232.518,231.205H229.8a17.676,17.676,0,0,0-17.676,17.676v14.956a2.72,2.72,0,0,0,5.44,0V248.881A12.25,12.25,0,0,1,229.8,236.645h2.72a2.72,2.72,0,0,0,0-5.44Z" style="fill:#949494"/><path d="M265.11,258.971a12.236,12.236,0,1,1-.04-20.207,2.757,2.757,0,0,0,3.52-.279h0a2.74,2.74,0,0,0-.433-4.207,17.676,17.676,0,1,0,.036,29.182,2.733,2.733,0,0,0,.4-4.186h0A2.723,2.723,0,0,0,265.11,258.971Z" style="fill:#949494"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

81
src/slic3r/GUI/GUI_App.cpp
View file

@ -275,8 +275,11 @@ public:
// init constant texts and scale fonts
m_constant_text.init(Label::Body_16);
scale_font(m_constant_text.title_font, 2.0f);
scale_font(m_constant_text.version_font, 1.2f);
// ORCA scale all fonts with monitor scale
scale_font(m_constant_text.version_font, m_scale * 2);
scale_font(m_constant_text.based_on_font, m_scale * 1.5f);
scale_font(m_constant_text.credits_font, m_scale * 2);
// this font will be used for the action string
m_action_font = m_constant_text.credits_font;
@ -316,51 +319,41 @@ public:
if (!bmp.IsOk())
return;
bool is_dark = wxGetApp().app_config->get("dark_color_mode") == "1";
// use a memory DC to draw directly onto the bitmap
wxMemoryDC memDc(bmp);
int top_margin = FromDIP(75 * m_scale);
int width = bmp.GetWidth();
int height = bmp.GetHeight();
// draw title and version
int text_padding = FromDIP(3 * m_scale);
memDc.SetFont(m_constant_text.title_font);
int title_height = memDc.GetTextExtent(m_constant_text.title).GetHeight();
int title_width = memDc.GetTextExtent(m_constant_text.title).GetWidth();
memDc.SetFont(m_constant_text.version_font);
int version_height = memDc.GetTextExtent(m_constant_text.version).GetHeight();
int version_width = memDc.GetTextExtent(m_constant_text.version).GetWidth();
int split_width = (width + title_width - version_width) / 2;
wxRect title_rect(wxPoint(0, top_margin), wxPoint(split_width - text_padding, top_margin + title_height));
memDc.SetTextForeground(StateColor::darkModeColorFor(wxColour(38, 46, 48)));
memDc.SetFont(m_constant_text.title_font);
memDc.DrawLabel(m_constant_text.title, title_rect, wxALIGN_RIGHT | wxALIGN_BOTTOM);
//BBS align bottom of title and version text
wxRect version_rect(wxPoint(split_width + text_padding, top_margin), wxPoint(width, top_margin + title_height - text_padding));
// Logo
BitmapCache bmp_cache;
wxBitmap logo_bmp = *bmp_cache.load_svg(is_dark ? "splash_logo_dark" : "splash_logo", width, height); // use with full width & height
memDc.DrawBitmap(logo_bmp, 0, 0, true);
// Version
memDc.SetFont(m_constant_text.version_font);
memDc.SetTextForeground(StateColor::darkModeColorFor(wxColor(134, 134, 134)));
memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM);
wxSize version_ext = memDc.GetTextExtent(m_constant_text.version);
wxRect version_rect(
wxPoint(0, int(height * 0.70)),
wxPoint(width, int(height * 0.70) + version_ext.GetHeight())
);
memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_CENTER);
// Dynamic Text
m_action_line_y_position = int(height * 0.83);
// Based on Text
memDc.SetFont(m_constant_text.based_on_font);
auto bs_version = wxString::Format("Based on PrusaSlicer and BambuStudio").ToStdString();
memDc.SetFont(Label::Body_12);
wxSize text_rect = memDc.GetTextExtent(bs_version);
int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth()/2;
int start_y = version_rect.GetBottom() + 10;
wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect));
memDc.DrawLabel(bs_version, internal_sign_rect, wxALIGN_RIGHT);
// load bitmap for logo
BitmapCache bmp_cache;
int logo_margin = FromDIP(72 * m_scale);
int logo_size = FromDIP(122 * m_scale);
int logo_width = FromDIP(94 * m_scale);
wxBitmap logo_bmp = *bmp_cache.load_svg("splash_logo", logo_size, logo_size);
int logo_y = top_margin + title_rect.GetHeight() + logo_margin;
memDc.DrawBitmap(logo_bmp, (width - logo_width) / 2, logo_y, true);
// calculate position for the dynamic text
int text_margin = FromDIP(80 * m_scale);
m_action_line_y_position = logo_y + logo_size + text_margin;
wxSize based_on_ext = memDc.GetTextExtent(bs_version);
wxRect based_on_rect(
wxPoint(0, height - based_on_ext.GetHeight() * 2),
wxPoint(width, height - based_on_ext.GetHeight())
);
memDc.DrawLabel(bs_version, based_on_rect, wxALIGN_CENTER);
}
static wxBitmap MakeBitmap()
@ -440,21 +433,23 @@ private:
wxFont title_font;
wxFont version_font;
wxFont credits_font;
wxFont based_on_font;
void init(wxFont init_font)
{
// title
title = wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME;
//title = wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME;
// dynamically get the version to display
version = _L("V") + " " + GUI_App::format_display_version();
version = GUI_App::format_display_version();
// credits infornation
credits = "";
title_font = Label::Head_16;
version_font = Label::Body_16;
credits_font = init_font;
//title_font = Label::Head_16;
version_font = Label::Body_13;
based_on_font = Label::Body_8;
credits_font = Label::Body_8;
}
}
m_constant_text;