Release v0.3.0

.github/workflows/android.yml

@@ -35,7 +35,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
-      LunarCalendar_VERSION: v0.2.8
+      LunarCalendar_VERSION: v0.3.0
       VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
       ANDROID_PLATFORM: android-23
       ANDROID_NATIVE_API_LEVEL: 23

.github/workflows/build.yml

@@ -5,7 +5,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  LunarCalendar_VERSION: v0.2.8
+  LunarCalendar_VERSION: v0.3.0
 
 on:
   push:

.github/workflows/doxygen.yml

@@ -21,7 +21,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_doxygen
       DOXYGEN_VERSION: 1.9.8
-      LunarCalendar_VERSION: v0.2.8
+      LunarCalendar_VERSION: v0.3.0
       artifact_name: build_doxygen
 
     # Map the job outputs to step outputs

.github/workflows/macos.yml

@@ -35,7 +35,7 @@ jobs:
       INSTALL_DIR: ${{github.workspace}}/.cache/install_macos
       qt_modules: qtwebengine ${{matrix.qt_modules}}
       VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
-      LunarCalendar_VERSION: v0.2.8
+      LunarCalendar_VERSION: v0.3.0
       artifact_name: build_macos
 
     # Map the job outputs to step outputs

.github/workflows/mingw.yml

@@ -25,7 +25,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw
       artifact_name: build_mingw
-      LunarCalendar_VERSION: v0.2.8
+      LunarCalendar_VERSION: v0.3.0
 
     # Map the job outputs to step outputs
     outputs:

.github/workflows/msvc.yml

@@ -43,7 +43,7 @@ jobs:
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
-      LunarCalendar_VERSION: v0.2.8
+      LunarCalendar_VERSION: v0.3.0
       VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
       qt_modules: qtwebengine ${{matrix.qt_modules}}
       artifact_name: build_msvc

.github/workflows/ubuntu.yml

@@ -22,7 +22,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu
-      LunarCalendar_VERSION: 0.2.8
+      LunarCalendar_VERSION: 0.3.0
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs

.travis.yml

@@ -50,7 +50,7 @@ before_install:
   - sudo Xvfb :99 -ac &
   - export DISPLAY=:99.0
   - mkdir -p ${SOURCE_DIR}/Tools
-  - export VERSION="v0.2.8"
+  - export VERSION="v0.3.0"
 
 install:
   - cd ${SOURCE_DIR}

App/MainWindow.cpp

@@ -178,6 +178,7 @@ MainWindow::MainWindow(QWidget *parent) :
     m_pLunarCalendar->AddHoliday(10, 1, "h1");
     m_pLunarCalendar->AddHoliday(10, 1, "lh1",
                               CLunarCalendar::_CalendarType::CalendarTypeLunar);
+    m_pLunarCalendar->Update();
     //! [Add Holiday] */
 
     //*! [Add Anniversary]
@@ -192,6 +193,7 @@ MainWindow::MainWindow(QWidget *parent) :
             CLunarCalendar::_CalendarType::CalendarTypeLunar);
     m_pLunarCalendar->AddAnniversary(9, 10, "l3",
             CLunarCalendar::_CalendarType::CalendarTypeLunar);
+    m_pLunarCalendar->Update();
     //! [Add Anniversary] */
 
     //! [Instance CHandler]
@@ -236,7 +238,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
         // 没有任务
         return 0;});
-    m_pLunarCalendar->Update();
     //! [User defined tasks] */
 
     //m_pLunarCalendar->SetCalendarType(CLunarCalendar::CalendarTypeLunar);

App/android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.KangLinStudio.LunarCalendar"
 	android:installLocation="auto"
-	android:versionName="0.2.8"
+	android:versionName="0.3.0"
 	android:versionCode="0">
 
     <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="24"/>

CMakeLists.txt

@@ -98,7 +98,7 @@ endif()
 GET_VERSION(OUT_VERSION LunarCalendar_VERSION
     OUT_REVISION LunarCalendar_REVISION)
 if(NOT LunarCalendar_VERSION)
-    SET(LunarCalendar_VERSION "v0.2.8")
+    SET(LunarCalendar_VERSION "v0.3.0")
 endif()
 message("LunarCalendar_VERSION:${LunarCalendar_VERSION}")
 

Install/Install.nsi

@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "LunarCalendar"
 !define PRODUCT_APP_NAME "LunarCalendarApp"
-!define PRODUCT_VERSION "v0.2.8"
+!define PRODUCT_VERSION "v0.3.0"
 !define PRODUCT_PUBLISHER "KangLin studio"
 !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

Src/CMakeLists.txt

@@ -38,7 +38,7 @@ endif()
 GET_VERSION(OUT_VERSION LunarCalendar_VERSION
     OUT_REVISION LunarCalendar_REVISION)
 if(NOT LunarCalendar_VERSION)
-    SET(LunarCalendar_VERSION "v0.2.8")
+    SET(LunarCalendar_VERSION "v0.3.0")
 endif()
 message("LunarCalendar_VERSION:${LunarCalendar_VERSION}")
 message("LunarCalendar_REVISION:${LunarCalendar_REVISION}")

Src/LunarCalendar.h

@@ -144,24 +144,24 @@
  * 
  * 只需要使用下列方法之一：
  * 
- * - 使用 CLunarCalendar::SetTaskHandle(QSharedPointer<CTaskHandler> handler) 处理自定义任务
+ * - 使用 CLunarCalendar::SetTaskHandle() 处理自定义任务
  *
  *   - 定义 CTaskHandler 的派生类
- * \snippet App/MainWindow.h Define CTaskHandler derived class
+ *     \snippet App/MainWindow.h Define CTaskHandler derived class
  *   - 实现 onHandle 处理函数
- * \snippet App/MainWindow.cpp Implement the onHandle function
+ *     \snippet App/MainWindow.cpp Implement the onHandle function
  *   - 定义 CHandler 变量
- * \snippet App/MainWindow.h Defined CHandler variable
+ *     \snippet App/MainWindow.h Defined CHandler variable
  *   - 实例化 CHandler
- * \snippet App/MainWindow.cpp Instance CHandler
+ *     \snippet App/MainWindow.cpp Instance CHandler
  *   - 用 SetTaskHandle 设置处理类
- * \snippet App/MainWindow.cpp Set user defined tasks with CTaskHandler
+ *     \snippet App/MainWindow.cpp Set user defined tasks with CTaskHandler
  *
  * - 使用 CLunarCalendar::SetTaskHandle(std::function<uint(const QDate& date, QStringList& tasks)> cbHandler) 处理自定义任务。
  * 需要标准C++11及以后才支持。
- * 
- * \snippet App/MainWindow.cpp User defined tasks
- * 
+ *
+ *   \snippet App/MainWindow.cpp User defined tasks
+ *
  * \subsection TaskPerformance 任务性能
  * - 节日
  * 
@@ -180,7 +180,7 @@
  * - \ref UserDefinedTasks 时，回调函数应尽快返回。不要在回调函数中做过多复杂的处理。防止阻塞 UI 线程。
  * 
  * \section 文档
- * - [开发文档](modules.html)
+ * - [开发文档](topics.html)
  * - \ref Example
  */
 
@@ -204,8 +204,21 @@
  * \snippet  App/MainWindow.cpp Add Holiday
  * - [可选]设置周年纪念日
  * \snippet App/MainWindow.cpp Add Anniversary
- * - [可选]设置自定义任务
- * \snippet App/MainWindow.cpp User defined tasks
+ * - [可选]设置自定义任务  
+ *   使用下列方法之一：
+ *   - 使用 CLunarCalendar::SetTaskHandle(std::function<uint(const QDate& date, QStringList& tasks)> cbHandler) 处理自定义任务。 需要标准C++11及以后才支持。
+ *     \snippet App/MainWindow.cpp User defined tasks
+ *   - 使用 CLunarCalendar::SetTaskHandle() 处理自定义任务
+ *     - 定义 CTaskHandler 的派生类
+ *       \snippet App/MainWindow.h Define CTaskHandler derived class
+ *     - 实现 onHandle 处理函数
+ *       \snippet App/MainWindow.cpp Implement the onHandle function
+ *     - 定义 CHandler 变量
+ *       \snippet App/MainWindow.h Defined CHandler variable
+ *     - 实例化 CHandler
+ *       \snippet App/MainWindow.cpp Instance CHandler
+ *     - 用 SetTaskHandle 设置处理类
+ *       \snippet App/MainWindow.cpp Set user defined tasks with CTaskHandler
  * - [可选]处理选择事件
  *   - 连接选择信号
  *     \snippet App/MainWindow.cpp sigSelectionChanged
@@ -331,7 +344,8 @@ public Q_SLOTS:
 
     /*!
      * \ref UserDefinedTasks 类
-     * \see SetTaskHandle
+     * \snippet App/MainWindow.h Define CTaskHandler derived class
+     * \see SetTaskHandle \ref UserDefinedTasks
      */
     class CTaskHandler
     {
@@ -347,6 +361,9 @@ public Q_SLOTS:
          *            - 不设置此值。只返回任务数。表示只显示圆点，不显示内容。
          * \return 任务数。
          *    \note 数据在 tasks 中增加了新值。则返回0。否则返回新的任务数
+         * \details 例子：
+         * \snippet App/MainWindow.cpp Implement the onHandle function
+         * \see \ref UserDefinedTasks
          *
          * \image html Docs/image/Task.png
          */
@@ -355,10 +372,20 @@ public Q_SLOTS:
     /*!
      * \brief 处理 \ref UserDefinedTasks
      * \param handler 任务处理类（CTaskHandler）
-     *
+     * \details 使用方法：
+     * - 定义 CTaskHandler 的派生类
+     * \snippet App/MainWindow.h Define CTaskHandler derived class
+     * - 实现 onHandle 处理函数
+     * \snippet App/MainWindow.cpp Implement the onHandle function
+     * - 定义 CHandler 变量
+     * \snippet App/MainWindow.h Defined CHandler variable
+     * - 实例化 CHandler
+     * \snippet App/MainWindow.cpp Instance CHandler
+     * - 用 SetTaskHandle 设置处理类
+     * \snippet App/MainWindow.cpp Set user defined tasks with CTaskHandler
+     * 
+     * \see \ref UserDefinedTasks
      * \image html Docs/image/Task.png
-     *
-     * \see CTaskHandler
      */
     int SetTaskHandle(QSharedPointer<CTaskHandler> handler);
 
@@ -374,10 +401,12 @@ public Q_SLOTS:
      *            - 不设置此值。只返回任务数。表示只显示圆点，不显示内容。
      *      \return 任务数。
      *         \note 数据在 tasks 中增加了新值。则返回0。否则返回新的任务数
-     * 
+     * \details 例子：
      * \snippet App/MainWindow.cpp User defined tasks
      *
      * \note 需要 c++ 标准 11
+     * 
+     * \see \ref UserDefinedTasks
      *
      * \image html Docs/image/Task.png
      */

Update/update.xml

@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v0.2.8</VERSION>
+    <VERSION>v0.3.0</VERSION>
 </REDIRECT>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 'v0.2.8.{build}'
+version: 'v0.3.0.{build}'
 
 cache:
     - Package

ci/build.sh

@@ -109,10 +109,10 @@ case ${BUILD_TARGERT} in
 esac
 
 if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then
-    export VERSION="v0.2.8"
+    export VERSION="v0.3.0"
 fi
 if [ -z "$VERSION" ]; then
-    export VERSION="v0.2.8"
+    export VERSION="v0.3.0"
 fi
 export UPLOADTOOL_BODY="Release LunarCalendar-${VERSION}.<br> The change see [ChangeLog.md](ChangeLog.md)"
 #export UPLOADTOOL_PR_BODY=

debian/changelog

@@ -1,4 +1,4 @@
-lunarcalendar (0.2.8) stable; urgency=medium
+lunarcalendar (0.3.0) stable; urgency=medium
 
   * Initial Release.
 

debian/control

@@ -3,7 +3,7 @@ Section: main
 Priority: optional
 Maintainer: Kang Lin <[email protected]>
 Build-Depends: debhelper (>= 6), cmake
-Standards-Version:"v0.2.8"
+Standards-Version:"v0.3.0"
 Homepage: https://github.com/KangLin/LunarCalendar
 Vcs-Git: https://github.com/KangLin/LunarCalendar.git
 Vcs-Browser: https://github.com/KangLin/LunarCalendar