Use LunarCalendar v1.0.0

KangLin · Jan 4, 2024 · 8577665 · 8577665
1 parent 2432d43
commit 8577665
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,9 @@
+- v1.0.17
+  + Use LunarCalendar v1.0.0
+
 - v1.0.16
   + Add android permissions
-  + LunarCalendar v0.3.2
+  + Use LunarCalendar v0.3.2
 
 - v1.0.15
   + CI

diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
@@ -1,6 +1,9 @@
+- v1.0.17
+  + 使用 LunarCalendar v1.0.0
+
 - v1.0.16
   + 增加 android 动态权限
-  + LunarCalendar v0.3.2
+  + 使用 LunarCalendar v0.3.2
 
 - v1.0.15
   + 自动化编译

diff --git a/Src/Global/TasksTools.cpp b/Src/Global/TasksTools.cpp
@@ -30,13 +30,10 @@ void CTasksTools::InitTranslator()
     m_Translator.load(RabbitCommon::CDir::Instance()->GetDirTranslations()
                       + "/Tasks_" + QLocale::system().name() + ".qm");
     qApp->installTranslator(&m_Translator);
-
-    CLunarCalendar::InitResource();
 }
 
 void CTasksTools::CLeanTranslator()
 {
-    CLunarCalendar::CLeanResource();
     qApp->removeTranslator(&m_Translator);
 }
+1 −1		.github/workflows/android.yml
+1 −1		.github/workflows/build.yml
+1 −1		.github/workflows/doxygen.yml
+1 −1		.github/workflows/macos.yml
+1 −1		.github/workflows/mingw.yml
+1 −1		.github/workflows/msvc.yml
+1 −1		.github/workflows/ubuntu.yml
+1 −1		.gitignore
+1 −1		.travis.yml
+1 −1		App/android/AndroidManifest.xml
+1 −9		App/main.cpp
+2 −2		CMakeLists.txt
+3 −0		ChangeLog.md
+1 −1		Docs/Developer.md
+0 −6		Docs/User.md
+0 −0		Docs/doxygen/Doxyfile.in
+10 −5		Docs/doxygen/footer.html
+1 −1		Install/Install.nsi
+1 −18		README.md
+1 −1		README_zh_CN.md
+1 −1		Src/CMakeLists.txt
+8 −3		Src/LunarCalendar.cpp
+13 −25		Src/LunarCalendar.h
+29 −22		Src/LunarCalendarDelegate.cpp
+51 −52		Src/LunarCalendarModel.cpp
+18 −6		Src/LunarCalendarModel.h
+11 −0		Src/Resource/database/holidays.sql
+1 −1		Update/update.xml
+1 −1		appveyor.yml
+2 −2		ci/build.sh
+1 −1		debian/changelog
+1 −1		debian/control