.github/workflows/android.yml

@@ -35,8 +35,8 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
-      Calendar_VERSION: v1.0.10
-      VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7
+      Calendar_VERSION: v1.0.11
+      VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
       ANDROID_PLATFORM: android-23
       ANDROID_NATIVE_API_LEVEL: 23
       qt_modules: 'qtimageformats qtmultimedia qtscxml'

.github/workflows/build.yml

@@ -5,7 +5,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Calendar_VERSION: v1.0.10
+  Calendar_VERSION: v1.0.11
 
 on: 
   push:

.github/workflows/macos.yml

@@ -34,9 +34,9 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_macos
       qt_modules: qtwebengine ${{matrix.qt_modules}}
-      Calendar_VERSION: 1.0.10
+      Calendar_VERSION: 1.0.11
       artifact_name: build_macos
-      VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7
+      VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
 
     # Map the job outputs to step outputs
     outputs:

.github/workflows/msvc.yml

@@ -45,8 +45,8 @@ jobs:
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
-      Calendar_VERSION: v1.0.10
-      VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7
+      Calendar_VERSION: v1.0.11
+      VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
       qt_modules: ${{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
-      Calendar_VERSION: 1.0.10
+      Calendar_VERSION: 1.0.11
       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="v1.0.10"
+  - export VERSION="v1.0.11"
   
 install:
   - cd ${SOURCE_DIR}

LunarCalendar @ 25537d2c

-Subproject commit a70eb1eb8dfb966b9c063f4af2cfe42dc45b796f
+Subproject commit 25537d2ce4e07a3af6e2b97faa2c7a72b183e29e

App/android/AndroidManifest.xml

@@ -3,7 +3,7 @@
     package="org.KangLinStudio.Calendar"
     android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.0.10">
+    android:versionName="1.0.11">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>

CMakeLists.txt

@@ -130,7 +130,7 @@ GET_VERSION(OUT_VERSION Calendar_VERSION
     OUT_REVISION Calendar_REVISION)
 message("Calendar_VERSION:${Calendar_VERSION}; Calendar_REVISION:${Calendar_REVISION}")
 if(NOT Calendar_VERSION)
-    set(Calendar_VERSION "v1.0.10")
+    set(Calendar_VERSION "v1.0.11")
 endif()
 set(VERSION ${Calendar_VERSION})
 add_subdirectory(3th_libs/LunarCalendar/Src)

ChangeLog.md

+- v1.0.11
+  + Replace RabbitCommon::CDir::GetOpenDirectory with QFileDialog::getExistingDirectory etc
+  
+- v1.0.10
+  + Modify CI
+
 - v1.0.9
   + Add update xml
   + FIX: windows resource

ChangeLog_zh_CN.md

+- v1.0.11
+  + 用 QFileDialog::getExistingDirectory 替换 RabbitCommon::CDir::GetOpenDirectory 等
+  
+- v1.0.10
+  + 修改自动化编译
+  
 - v1.0.9
   + 增加：更新 xml 文件
   + 修复: windows 资源

Install/Install.nsi

@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Calendar"
 !define PRODUCT_APP_NAME "CalendarApp"
-!define PRODUCT_VERSION "v1.0.10"
+!define PRODUCT_VERSION "v1.0.11"
 !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"

README.md

@@ -53,15 +53,17 @@ Author: KangLin (kl222@126.com)
 - [x] Custom task
   - [x] Eye Nurse： Vision protection
 - [x] Sticky
-- [x] Cross-platform, support multiple operating systems(https://doc.qt.io/qt-5/supported-platforms.html)
+- [x] Cross-platform, support multiple operating systems
      - [x] Windows
      - [x] Linux、Unix
      - [x] Android
      - [x] Mac os
      - [ ] IOS
 
-Mac os and IOS, I don't have the corresponding equipment,
-please compile and test the students with the corresponding equipment.
+     Mac os and IOS, I don't have the corresponding equipment,
+     please compile and test the students with the corresponding equipment.
+
+   See: [Qt5](https://doc.qt.io/qt-5/supported-platforms.html), [Qt6](https://doc.qt.io/qt-6/supported-platforms.html)
 
 ### ScreentShot
 - Unix screent shot

README_zh_CN.md

@@ -53,14 +53,16 @@
 - [x] 自定义任务
   - [x] 眼睛护士: 保护视力
 - [x] 便签
-- 跨平台，支持多操作系统(https://doc.qt.io/qt-5/supported-platforms.html)
+- 跨平台，支持多操作系统
   + [x] Windows
   + [x] Linux、Unix
   + [x] Android
   + [x] Mac os
   + [ ] IOS
-  
-Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己编译，测试。
+
+    Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己编译，测试。
+
+  详见：[Qt5 支持平台](https://doc.qt.io/qt-5/supported-platforms.html)、[Qt6 支持平台](https://doc.qt.io/qt-6/supported-platforms.html)。
 
 ### 屏幕截图
 
@@ -109,9 +111,9 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己
 
 - 用 cmake
   + CMAKE 参数：
-    - [必选] Qt5_DIR: qt5 安装位置(指向Qt5Config.cmake的目录，默认为 安装目录/lib/cmake/Qt5)。  
+    - [必选] Qt5_DIR: qt5 安装位置(指向Qt5Config.cmake的目录，默认为 Qt5 安装目录/lib/cmake/Qt5)。  
                      详见：https://doc.qt.io/qt-5/cmake-get-started.html  
-             或者 Qt6_DIR: qt6 安装位置(指向Qt6Config.cmake的目录，默认为 安装目录/lib/cmake/Qt6)
+             或者 Qt6_DIR: qt6 安装位置(指向Qt6Config.cmake的目录，默认为 Qt6 安装目录/lib/cmake/Qt6)
     - [必选] RabbitCommon_DIR: 指向 RabbitCommon 源码目录
     - [可选] CMAKE_INSTALL_PREFIX: 安装前缀
   + windows 或 linux
@@ -124,6 +126,7 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己
         cmake --build . --config Release --target install
         
   + android
+    Qt版本必须大于等于6  
     - 主机是linux
       + 编译
 
@@ -133,18 +136,14 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己
                -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
                -DANDROID_ABI="armeabi-v7a with NEON" \
                -DANDROID_PLATFORM=android-18 \
-               -DQt5_DIR= \
+               -DQt6_DIR= \
                -DRabbitCommon_DIR= 
             cmake --build . --config Release
 
     　+ 安装
         - 安装库和程序
 
-              cmake --build . --config Release --target install/strip
-
-        - 生成 APK
-
-              cmake --build . --config Release --target APK
+              cmake --build . --config Release --target install
 
     - 主机是windows
       + 编译
@@ -157,17 +156,13 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己
                 -DANDROID_ABI=arm64-v8a ^
                 -DANDROID_ARM_NEON=ON ^
                 -DANDROID_PLATFORM=android-24 ^
-                -DQt5_DIR= ^
+                -DQt6_DIR= ^
                 -DRabbitCommon_DIR= 
 
       + 安装
         - 安装库和程序
 
-            cmake --build . --config Release --target install/strip
-
-        - 生成 APK
-
-            cmake --build . --config Release --target APK
+            cmake --build . --config Release --target install
 
     - 参数说明：https://developer.android.google.cn/ndk/guides/cmake
       + ANDROID_ABI: 可取下列值：

Src/FrmStickyList.cpp

@@ -93,7 +93,7 @@ void CFrmStickyList::slotLoad()
                                RabbitCommon::CDir::Instance()->GetDirUserData()
                                + QDir::separator() + "Sticky").toString();
     QFileInfo fi(szFile);
-    szFile = RabbitCommon::CDir::GetOpenFileName(this, tr("Open sticky"), fi.path()); // QFileDialog::getOpenFileName();
+    szFile = QFileDialog::getOpenFileName(this, tr("Open sticky"), fi.path()); // QFileDialog::getOpenFileName();
     if(szFile.isEmpty())
         return;
     Load(szFile);
@@ -131,7 +131,7 @@ void CFrmStickyList::slotSave()
                                RabbitCommon::CDir::Instance()->GetDirUserData()
                                + QDir::separator() + "Sticky").toString();
     QFileInfo fi(szFile);
-    szFile = RabbitCommon::CDir::GetSaveFileName(this, tr("Save sticky"), fi.path());
+    szFile = QFileDialog::getSaveFileName(this, tr("Save sticky"), fi.path());
     if(szFile.isEmpty())
         return;
 }

Src/FrmTasksList.cpp

@@ -97,14 +97,14 @@ int CFrmTasksList::Load(QString szFile)
 
 void CFrmTasksList::slotLoad()
 {
-    QString szFile = RabbitCommon::CDir::GetOpenFileName(this,
+    QString szFile = QFileDialog::getOpenFileName(this,
                        tr("Load"), QString(), tr("xml(*.xml);;All files(*.*)"));
     Load(szFile);
 }
 
 void CFrmTasksList::slotSaveAs()
 {
-    QString szFile = RabbitCommon::CDir::GetSaveFileName(this,
+    QString szFile = QFileDialog::getSaveFileName(this,
                                          tr("Save as ..."), QString(), "*.xml");
     if(szFile.lastIndexOf(".xml") == -1)
         szFile += ".xml";

Update/update.xml

 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v1.0.10</VERSION>
+    <VERSION>v1.0.11</VERSION>
     <WINDOWS>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_windows.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_windows.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_windows.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_windows.xml/download</URL>
     </WINDOWS>
     <LINUX>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_linux.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_linux.xml/download</URL>
     </LINUX>
     <LINUX_APPIMAGE>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_linux.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_linux.xml/download</URL>
     </LINUX_APPIMAGE>
 </REDIRECT>

appveyor.yml

 #TODO: Change version
-version: 'v1.0.10.{build}'
+version: 'v1.0.11.{build}'
 
 cache:
   - Package

ci/build.sh

@@ -115,10 +115,10 @@ esac
 
 export PKG_CONFIG_PATH=${ThirdLibs_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then
-    export VERSION="v1.0.10"
+    export VERSION="v1.0.11"
 fi
 if [ -z "$VERSION" ]; then
-    export VERSION="v1.0.10"
+    export VERSION="v1.0.11"
 fi
 
 export UPLOADTOOL_BODY="Release Calendar ${VERSION}.<br> The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)"

debian/changelog

-calendar (1.0.10) stable; urgency=medium
+calendar (1.0.11) stable; urgency=medium
 
   * Initial Release.
 

debian/control

@@ -3,7 +3,7 @@ Section: main
 Priority: optional
 Maintainer: Kang Lin <kl222@126.com>
 Build-Depends: debhelper (>= 6)
-Standards-Version:"v1.0.10"
+Standards-Version:"v1.0.11"
 Homepage: https://github.com/KangLin/Calendar
 Vcs-Git: https://github.com/KangLin/Calendar.git
 Vcs-Browser: https://github.com/KangLin/Calendar