Added one more "special" application icon.

This commit is contained in:
LoRd_MuldeR 2011-12-25 22:29:04 +01:00
parent 144e60b6e5
commit 805d3f7393
7 changed files with 35 additions and 5 deletions

View File

@ -7,6 +7,7 @@
<file>MainIcon3.png</file> <file>MainIcon3.png</file>
<file>MainIcon4.png</file> <file>MainIcon4.png</file>
<file>MainIcon5.png</file> <file>MainIcon5.png</file>
<file>MainIcon6.png</file>
<file>icons/add.png</file> <file>icons/add.png</file>
<file>icons/accept.png</file> <file>icons/accept.png</file>
<file>icons/application_view_list.png</file> <file>icons/application_view_list.png</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
res/MainIcon6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 12 #define VER_LAMEXP_PATCH 12
#define VER_LAMEXP_BUILD 842 #define VER_LAMEXP_BUILD 844
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

View File

@ -733,24 +733,49 @@ static bool lamexp_computus(const QDate &date)
} }
} }
/*
* Check for Thanksgiving
*/
static bool lamexp_thanksgiving(const QDate &date)
{
int day = 0;
switch(QDate(date.year(), 11, 1).dayOfWeek())
{
case 1: day = 25; break;
case 2: day = 24; break;
case 3: day = 23; break;
case 4: day = 22; break;
case 5: day = 28; break;
case 6: day = 27; break;
case 7: day = 26; break;
}
return (date.month() == 11) && (date.day() == day);
}
/* /*
* Initialize app icon * Initialize app icon
*/ */
static QIcon lamexp_init_icon(const QDate &date, const QTime &time) static QIcon lamexp_init_icon(const QDate &date, const QTime &time)
{ {
if(((date.month() == 1) && (date.day() == 1)) || ((date.month() == 12) && (date.day() == 31) && (time.hour() > 20))) if(lamexp_thanksgiving(date))
{
return QIcon(":/MainIcon6.png");
}
else if(((date.month() == 12) && (date.day() == 31) && (time.hour() >= 20)) || ((date.month() == 1) && (date.day() == 1) && (time.hour() <= 19)))
{ {
return QIcon(":/MainIcon5.png"); return QIcon(":/MainIcon5.png");
} }
else if(((date.month() == 10) && (date.day() == 31)) || ((date.month() == 11) && (date.day() == 1) && (time.hour() < 7))) else if(((date.month() == 10) && (date.day() == 31) && (time.hour() >= 12)) || ((date.month() == 11) && (date.day() == 1) && (time.hour() <= 11)))
{ {
return QIcon(":/MainIcon4.png"); return QIcon(":/MainIcon4.png");
} }
else if(lamexp_computus(date)) else if((date.month() == 12) && (date.day() >= 24) && (date.day() <= 26))
{ {
return QIcon(":/MainIcon3.png"); return QIcon(":/MainIcon3.png");
} }
else if((date.month() == 12) && (date.day() >= 24) && (date.day() <= 26)) else if(lamexp_computus(date))
{ {
return QIcon(":/MainIcon2.png"); return QIcon(":/MainIcon2.png");
} }

View File

@ -88,6 +88,10 @@ static int lamexp_main(int argc, char* argv[])
//Check for expiration //Check for expiration
if(lamexp_version_demo()) if(lamexp_version_demo())
{ {
if(QDate::currentDate().addDays(1) < lamexp_version_date())
{
qFatal("System's date (%s) is before LameXP build date (%s). Huh?", QDate::currentDate().toString(Qt::ISODate).toLatin1().constData(), lamexp_version_date().toString(Qt::ISODate).toLatin1().constData());
}
qWarning(QString("Note: This demo (pre-release) version of LameXP will expire at %1.\n").arg(lamexp_version_expires().toString(Qt::ISODate)).toLatin1().constData()); qWarning(QString("Note: This demo (pre-release) version of LameXP will expire at %1.\n").arg(lamexp_version_expires().toString(Qt::ISODate)).toLatin1().constData());
} }