diff --git a/frame/util/themeappicon.cpp b/frame/util/themeappicon.cpp
index c19512fdd..349cb8b69 100644
--- a/frame/util/themeappicon.cpp
+++ b/frame/util/themeappicon.cpp
@@ -95,7 +95,7 @@ bool ThemeAppIcon::getIcon(QPixmap &pix, const QString iconName, const int size,
QString name = QStandardPaths::standardLocations(QStandardPaths::TempLocation).first() + "/" + QString::number(QDate::currentDate().year())
+ "_" + QString::number(QDate::currentDate().dayOfYear()) + ".svg";
- if (!createCalendarIcon(name)) {
+ if (!createCalendarIcon(QDate::currentDate(), name)) {
qWarning() << "file: "<< name << " ,create failed!";
}
@@ -169,128 +169,122 @@ bool ThemeAppIcon::getIcon(QPixmap &pix, const QString iconName, const int size,
return ret;
}
-bool ThemeAppIcon::createCalendarIcon(const QString &fileName)
+bool ThemeAppIcon::createCalendarIcon(const QDate &date, const QString &fileName)
{
- static const QByteArrayList dayList= {"\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
- , ""
+ static const QByteArrayList &dayList= { "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
};
- static const QByteArrayList monthList= {"\n"
- , "\n"
- , "\n"
- "MAR\n"
- "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
+ static const QByteArrayList &monthList= { "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
};
- static const QByteArrayList weekList= {"\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- , "\n"
- };
+ static const QByteArrayList &weekList= { "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"
+ , "\n"};
if (!QFile(fileName).exists()) {
// create svg
QFile file(fileName);
- if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
return false;
- }
- file.write(QByteArray("\n"));
+ file.write(QByteArray(" \n"
+ ""));
file.close();
}
diff --git a/frame/util/themeappicon.h b/frame/util/themeappicon.h
index 35fb218c6..e96687c5f 100644
--- a/frame/util/themeappicon.h
+++ b/frame/util/themeappicon.h
@@ -35,7 +35,7 @@ public:
static bool getIcon(QPixmap &pix, const QString iconName, const int size, bool reObtain = false);
private:
- static bool createCalendarIcon(const QString &fileName);
+ static bool createCalendarIcon(const QDate &date, const QString &fileName);
};
#endif // THEMEAPPICON_H
diff --git a/tests/util/ut_themeappicon.cpp b/tests/util/ut_themeappicon.cpp
index 82986ac9a..4a9c6fccb 100644
--- a/tests/util/ut_themeappicon.cpp
+++ b/tests/util/ut_themeappicon.cpp
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
@@ -86,6 +87,6 @@ TEST_F(Ut_ThemeAppIcon, getIcon_test4)
TEST_F(Ut_ThemeAppIcon, createCalendarIcon_test)
{
const QString &filePath = "/tmp/calendar.svg";
- ASSERT_TRUE(ThemeAppIcon::createCalendarIcon(filePath));
+ ASSERT_TRUE(ThemeAppIcon::createCalendarIcon(QDate::currentDate(), filePath));
QFile::remove(filePath);
}