CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more options for variants planing

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-07-02 13:34:04 +03:00
parent 7ac2a23bc8
commit 7579fff532
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/ui/themes/CatPack.cpp
View File

@ -99,11 +99,13 @@ JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.di
QString JsonCatPack::path() QString JsonCatPack::path()
{ {
const QDateTime now = QDateTime::currentDateTime(); const QDate now = QDate::currentDate();
for (auto var : m_variants) { for (auto var : m_variants) {
QDateTime startDate(QDate(now.date().year(), var.startTime.mounth, var.startTime.day), QTime(0, 0)); QDate startDate(now.year(), var.startTime.month, var.startTime.day);
QDateTime endDate(QDate(now.date().year(), var.endTime.mounth, var.endTime.day), QTime(0, 0)); QDate endDate(now.year(), var.endTime.month, var.endTime.day);
if (startDate.daysTo(now) > 0 && now.daysTo(endDate) > 0) if (startDate.daysTo(endDate) < 0) // in this case end date should be next year
endDate = endDate.addYears(1);
if (startDate.daysTo(now) >= 0 && now.daysTo(endDate) >= 0)
return var.path; return var.path;
} }
return m_defaultPath; return m_defaultPath;

4
launcher/ui/themes/CatPack.h
View File

@ -79,9 +79,9 @@ class JsonCatPack : public BasicCatPack {
auto sp = d.split("-"); auto sp = d.split("-");
day = sp[0].toInt(); day = sp[0].toInt();
if (sp.length() >= 2) if (sp.length() >= 2)
mounth = sp[1].toInt(); month = sp[1].toInt();
} }
int mounth; int month;
int day; int day;
}; };
struct Variant { struct Variant {

2
launcher/ui/themes/ThemeManager.cpp
View File

@ -189,7 +189,7 @@ void ThemeManager::initializeCatPacks()
while (ImageFileIterator.hasNext()) { while (ImageFileIterator.hasNext()) {
QFile customCatFile(ImageFileIterator.next()); QFile customCatFile(ImageFileIterator.next());
QFileInfo customCatFileInfo(customCatFile); QFileInfo customCatFileInfo(customCatFile);
themeDebugLog() << "Loading QSS Theme from:" << customCatFileInfo.absoluteFilePath(); themeDebugLog() << "Loading CatPack from:" << customCatFileInfo.absoluteFilePath();
addCatPack(std::unique_ptr<CatPack>(new FileCatPack(customCatFileInfo))); addCatPack(std::unique_ptr<CatPack>(new FileCatPack(customCatFileInfo)));
} }
}; };