Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Screensaver] Added Date Time display #1844

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Screensaver] Added Date Time display #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0e055f
[Screensaver] Added Date Time display
bulzipke Dec 21, 2024
771b259
[Screensaver] Changed DateTime update interval to 0.1 seconds
bulzipke Dec 23, 2024
2888df6
Adjusted margin for Date and Time labels
bulzipke Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 110 additions & 2 deletions es-app/src/SystemScreenSaver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
#include "Paths.h"
#include "ApiSystem.h"

#define FADE_TIME 500
#define FADE_TIME (500)
#define DATE_TIME_UPDATE_INTERVAL (100)

SystemScreenSaver::SystemScreenSaver(Window* window) :
mVideoScreensaver(NULL),
Expand Down Expand Up @@ -532,6 +533,39 @@ GameScreenSaverBase::GameScreenSaverBase(Window* window) : GuiComponent(window),
mMarquee = nullptr;
mLabelGame = nullptr;
mLabelSystem = nullptr;
mLabelDate = nullptr;
mLabelTime = nullptr;
mDateTimeUpdateAccumulator = 0;
mDateTimeLastUpdate = 0;

if (Settings::getInstance()->getBool("ScreenSaverDateTime"))
{
auto ph = ThemeData::getMenuTheme()->Text.font->getPath();
auto sz = mViewport.h / 16.f;
auto margin = sz / 2.f;
auto font = Font::get(sz, ph);
int fh = font->getLetterHeight();

mLabelDate = new TextComponent(mWindow);
mLabelDate->setPosition(mViewport.x + margin, mViewport.y + margin);
mLabelDate->setSize(mViewport.w, sz * 0.66);
mLabelDate->setHorizontalAlignment(ALIGN_LEFT);
mLabelDate->setVerticalAlignment(ALIGN_CENTER);
mLabelDate->setColor(0xD0D0D0FF);
mLabelDate->setGlowColor(0x00000060);
mLabelDate->setGlowSize(2);
mLabelDate->setFont(ph, sz * 0.66);

mLabelTime = new TextComponent(mWindow);
mLabelTime->setPosition(mViewport.x + margin, mViewport.y + margin + mLabelDate->getSize().y() * 1.3f);
mLabelTime->setSize(mViewport.w, fh);
mLabelTime->setHorizontalAlignment(ALIGN_LEFT);
mLabelTime->setVerticalAlignment(ALIGN_CENTER);
mLabelTime->setColor(0xFFFFFFFF);
mLabelTime->setGlowColor(0x00000040);
mLabelTime->setGlowSize(3);
mLabelTime->setFont(font);
}
}

GameScreenSaverBase::~GameScreenSaverBase()
Expand Down Expand Up @@ -559,6 +593,18 @@ GameScreenSaverBase::~GameScreenSaverBase()
delete mLabelSystem;
mLabelSystem = nullptr;
}

if (mLabelDate != nullptr)
{
delete mLabelDate;
mLabelDate = nullptr;
}

if (mLabelTime != nullptr)
{
delete mLabelTime;
mLabelTime = nullptr;
}
}

#include "guis/GuiMenu.h"
Expand Down Expand Up @@ -774,6 +820,56 @@ void GameScreenSaverBase::render(const Transform4x4f& transform)
mDecoration->setOpacity(mOpacity);
mDecoration->render(transform);
}

if (mLabelDate)
{
mLabelDate->setOpacity(255);
mLabelDate->render(transform);
}

if (mLabelTime)
{
mLabelTime->setOpacity(255);
mLabelTime->render(transform);
}
}

void GameScreenSaverBase::update(int deltaTime)
{
if (Settings::getInstance()->getBool("ScreenSaverDateTime"))
{
mDateTimeUpdateAccumulator += deltaTime;
if (mDateTimeUpdateAccumulator >= DATE_TIME_UPDATE_INTERVAL)
{
mDateTimeUpdateAccumulator -= DATE_TIME_UPDATE_INTERVAL;

time_t now = time(NULL);
if (now != mDateTimeLastUpdate)
{
mDateTimeLastUpdate = now;

struct tm* timeinfo = localtime(&now);

const std::string& dateFormat = Settings::getInstance()->getString("ScreenSaverDateFormat");
const std::string& timeFormat = Settings::getInstance()->getString("ScreenSaverTimeFormat");

char dateBuffer[64];
char timeBuffer[64];
strftime(dateBuffer, sizeof(dateBuffer), dateFormat.c_str(), timeinfo);
strftime(timeBuffer, sizeof(timeBuffer), timeFormat.c_str(), timeinfo);

if (mLabelDate)
{
mLabelDate->setText(std::string(dateBuffer));
}

if (mLabelTime)
{
mLabelTime->setText(std::string(timeBuffer));
}
}
}
}
}

void GameScreenSaverBase::setOpacity(unsigned char opacity)
Expand Down Expand Up @@ -940,13 +1036,25 @@ void VideoScreenSaver::render(const Transform4x4f& transform)
mDecoration->render(transform);
}

if (mLabelDate)
{
mLabelDate->setOpacity(255);
mLabelDate->render(transform);
}

if (mLabelTime)
{
mLabelTime->setOpacity(255);
mLabelTime->render(transform);
}

if (Settings::DebugImage())
Renderer::drawRect(mViewport.x, mViewport.y, mViewport.w, mViewport.h, 0xFFFF0090, 0xFFFF0090);
}

void VideoScreenSaver::update(int deltaTime)
{
GameScreenSaverBase::update(deltaTime);
GameScreenSaverBase::update(deltaTime);

if (mVideo)
{
Expand Down
6 changes: 6 additions & 0 deletions es-app/src/SystemScreenSaver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,23 @@ class GameScreenSaverBase : public GuiComponent
virtual void setGame(FileData* mCurrentGame);

void render(const Transform4x4f& transform) override;
void update(int deltaTime) override;

void setOpacity(unsigned char opacity) override;

protected:
ImageComponent* mMarquee;
TextComponent* mLabelGame;
TextComponent* mLabelSystem;
TextComponent* mLabelDate;
TextComponent* mLabelTime;

ImageComponent* mDecoration;

Renderer::Rect mViewport;

int mDateTimeUpdateAccumulator;
time_t mDateTimeLastUpdate;
};

class ImageScreenSaver : public GameScreenSaverBase
Expand Down
64 changes: 64 additions & 0 deletions es-app/src/guis/GuiGeneralScreensaverOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,38 @@ void GuiGeneralScreensaverOptions::addVideoScreensaverOptions(int selectItem)
addWithLabel(_("SHOW GAME INFO"), ss_info);
addSaveFunc([ss_info, this] { Settings::getInstance()->setString("ScreenSaverGameInfo", ss_info->getSelected()); });

// SHOW DATE TIME
{
bool showDateTime = Settings::getInstance()->getBool("ScreenSaverDateTime");

auto datetime_screensaver = std::make_shared<SwitchComponent>(mWindow);
datetime_screensaver->setState(showDateTime);
addWithLabel(_("SHOW DATE TIME"), datetime_screensaver, selectItem == 2);

datetime_screensaver->setOnChangedCallback([this, datetime_screensaver]()
{
if (Settings::getInstance()->setBool("ScreenSaverDateTime", datetime_screensaver->getState()))
{
Window* pw = mWindow;
delete this;
pw->pushGui(new GuiGeneralScreensaverOptions(pw, 2));
}
});

if (showDateTime)
{
auto sss_date_format = std::make_shared< OptionListComponent<std::string> >(mWindow, _("DATE FORMAT"), false);
sss_date_format->addRange({ "%Y-%m-%d", "%d-%m-%Y", "%A, %B %d", "%b %d, %Y" }, Settings::getInstance()->getString("ScreenSaverDateFormat"));
addWithLabel(_("DATE FORMAT"), sss_date_format);
addSaveFunc([sss_date_format] { Settings::getInstance()->setString("ScreenSaverDateFormat", sss_date_format->getSelected()); });

auto sss_time_format = std::make_shared< OptionListComponent<std::string> >(mWindow, _("TIME FORMAT"), false);
sss_time_format->addRange({ "%H:%M:%S", "%I:%M %p", "%p %I:%M" }, Settings::getInstance()->getString("ScreenSaverTimeFormat"));
addWithLabel(_("TIME FORMAT"), sss_time_format);
addSaveFunc([sss_time_format] { Settings::getInstance()->setString("ScreenSaverTimeFormat", sss_time_format->getSelected()); });
}
}

bool advancedOptions = true;

#ifdef _RPI_
Expand Down Expand Up @@ -213,6 +245,38 @@ void GuiGeneralScreensaverOptions::addSlideShowScreensaverOptions(int selectItem
addWithLabel(_("SHOW GAME INFO"), ss_controls);
addSaveFunc([ss_controls] { Settings::getInstance()->setBool("SlideshowScreenSaverGameName", ss_controls->getState()); });

// SHOW DATE TIME
{
bool showDateTime = Settings::getInstance()->getBool("ScreenSaverDateTime");

auto datetime_screensaver = std::make_shared<SwitchComponent>(mWindow);
datetime_screensaver->setState(showDateTime);
addWithLabel(_("SHOW DATE TIME"), datetime_screensaver, selectItem == 2);

datetime_screensaver->setOnChangedCallback([this, datetime_screensaver]()
{
if (Settings::getInstance()->setBool("ScreenSaverDateTime", datetime_screensaver->getState()))
{
Window* pw = mWindow;
delete this;
pw->pushGui(new GuiGeneralScreensaverOptions(pw, 2));
}
});

if (showDateTime)
{
auto sss_date_format = std::make_shared< OptionListComponent<std::string> >(mWindow, _("DATE FORMAT"), false);
sss_date_format->addRange({ "%Y-%m-%d", "%d-%m-%Y", "%A, %B %d", "%b %d, %Y"}, Settings::getInstance()->getString("ScreenSaverDateFormat"));
addWithLabel(_("DATE FORMAT"), sss_date_format);
addSaveFunc([sss_date_format] { Settings::getInstance()->setString("ScreenSaverDateFormat", sss_date_format->getSelected()); });

auto sss_time_format = std::make_shared< OptionListComponent<std::string> >(mWindow, _("TIME FORMAT"), false);
sss_time_format->addRange({ "%H:%M:%S", "%I:%M %p", "%p %I:%M"}, Settings::getInstance()->getString("ScreenSaverTimeFormat"));
addWithLabel(_("TIME FORMAT"), sss_time_format);
addSaveFunc([sss_time_format] { Settings::getInstance()->setString("ScreenSaverTimeFormat", sss_time_format->getSelected()); });
}
}

auto marquee_screensaver = std::make_shared<SwitchComponent>(mWindow);
marquee_screensaver->setState(Settings::getInstance()->getBool("ScreenSaverMarquee"));
addWithLabel(_("USE MARQUEE AS GAME INFO"), marquee_screensaver);
Expand Down
5 changes: 4 additions & 1 deletion es-core/src/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,10 @@ void Settings::setDefaults()
mStringMap["ScrapperLogoSrc"] = "wheel";
mBoolMap["ScrapeVideos"] = false;
mBoolMap["ScrapeShortTitle"] = false;


mBoolMap["ScreenSaverDateTime"] = false;
mStringMap["ScreenSaverDateFormat"] = "%Y-%m-%d";
mStringMap["ScreenSaverTimeFormat"] = "%H:%M:%S";
mBoolMap["ScreenSaverMarquee"] = true;
mBoolMap["ScreenSaverControls"] = true;
mStringMap["ScreenSaverGameInfo"] = "never";
Expand Down