From 172f0141328de2962156fd68c859a4ec1c2b4eac Mon Sep 17 00:00:00 2001 From: Antoine C Date: Tue, 17 Dec 2024 23:22:12 +0000 Subject: [PATCH] chore: update the Christmas logo with original assets Co-authored-by: Emilien Colombier --- res/images/mixxx-icon-logo-christmas.svg | 3563 +--------------------- src/skin/legacy/launchimage.cpp | 4 +- 2 files changed, 100 insertions(+), 3467 deletions(-) diff --git a/res/images/mixxx-icon-logo-christmas.svg b/res/images/mixxx-icon-logo-christmas.svg index 014cbb539f0..34bfc093452 100644 --- a/res/images/mixxx-icon-logo-christmas.svg +++ b/res/images/mixxx-icon-logo-christmas.svg @@ -7,16 +7,22 @@ id="svg3313" sodipodi:docname="mixxx-icon-logo-christmas.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xml:space="preserve" + inkscape:export-filename="mixxx-icon-logo-christmas.svg" + inkscape:export-xdpi="300" + inkscape:export-ydpi="300" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - - - - + id="path3309" /> diff --git a/src/skin/legacy/launchimage.cpp b/src/skin/legacy/launchimage.cpp index bee5b70059f..38f89ccfc28 100644 --- a/src/skin/legacy/launchimage.cpp +++ b/src/skin/legacy/launchimage.cpp @@ -13,8 +13,8 @@ namespace { bool isIn2024ChristmasHolidays() { auto currentDate = QDate::currentDate(); - return currentDate >= QDate(2024, 12, 24) && - currentDate <= QDate(2025, 1, 6); + return (currentDate.month() == 12 && currentDate.day() >= 24) || + (currentDate.month() == 1 && currentDate.day() <= 6); } } // namespace