RELEASE: bump version to 2.10.2

altairwei · altairwei · commit db2e8abb7bec · 2022-02-12T10:24:14.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@
 
 cmake_minimum_required(VERSION 3.0)
 
-project(WizNotePlus VERSION 2.10.1)
+project(WizNotePlus VERSION 2.10.2)
 
 #============================================================================
 # Options and Variables
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ README **中文** | [English](doc/README-en.md)
 
 **为知笔记 Plus** 项目致力于提高 [为知笔记跨平台客户端](https://github.com/WizTeam/WizQTClient) 的可用性，以达到或者超越 Windows 平台特有客户端的水平。此项目致力于实现一个对开发者友好的插件系统，促进氛围良好的第三方开发者社区的建成。本项目在遵循 GPLv3 协议的情况下由第三方开发者发起并维护，欢迎任何有意愿参与项目贡献的开发者或用户联系 altair_wei@outlook.com 。
 
-[![release](https://img.shields.io/badge/release-v2.10.1-green.svg)](https://github.com/altairwei/WizNotePlus/releases) [![license](https://img.shields.io/badge/license-GPLv3-green.svg)](https://github.com/altairwei/WizNotePlus/blob/master/LICENSE) [![build](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml/badge.svg)](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml)
+[![release](https://img.shields.io/badge/release-v2.10.2-green.svg)](https://github.com/altairwei/WizNotePlus/releases) [![license](https://img.shields.io/badge/license-GPLv3-green.svg)](https://github.com/altairwei/WizNotePlus/blob/master/LICENSE) [![build](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml/badge.svg)](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml)
 
 ## 为知社区
 
diff --git a/build/common/wiznote2.desktop b/build/common/wiznote2.desktop
@@ -3,7 +3,7 @@ Name=WizNotePlus
 Name[en]=WizNotePlus
 Name[zh_CN]=为知笔记 Plus
 Name[zh_TW]=爲知筆記 Plus
-X-AppImage-Version=2.10.1
+X-AppImage-Version=2.10.2
 Comment=cloud based note-taking application
 Comment[zh_CN]=开源云笔记
 Comment[zh_TW]=開源雲筆記
diff --git a/build/osx/Info.plist b/build/osx/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-    <string>2.10.1</string>
+    <string>2.10.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>CFBundleName</key>
diff --git a/conanfile.py b/conanfile.py
@@ -40,7 +40,7 @@ def parse_version():
     """
     Generate build version from local git repository.
     """
-    wiznoteplus_version = "2.10.1-stable.0"
+    wiznoteplus_version = "2.10.2-stable.0"
     if os.path.exists(".git"):
         wiznoteplus_version = subprocess.check_output(
             ["git", "describe", "--tags"]).decode("utf-8").strip()
diff --git a/dist/changes-2.10.2-en-US.md b/dist/changes-2.10.2-en-US.md
@@ -0,0 +1,25 @@
+# WizNotePlus v2.10.2 Release Notes
+
+## System Requirements
+
+Now precompiled WizNotePlus package is built against Qt 5.14.2, and minimum system requirements are listed below:
+
+* Linux: GLIBC_2.17
+* MacOS: macOS 10.13
+* Windows: Windows 7
+
+## Bug fixes
+
+The following updates were sponsored by @JingbenShi668
+
+* Disable command+up/down shortcuts on Mac. #214
+* Lower the minimum width limit of the main window. #215
+* Add "Close" button to the "Search and Replace Dialog" of the internal rich text editor. #218
+* Modify rich text editor code block style to fix text overflow issue. #216
+
+## Known Issues
+
+* On Windows, WizNotePlus don't sync contents with external editor such as Typora by accident. #88
+* On MacOS, disable `ShowSystemTrayIcon` will cause application crash for next start. #76
+* Document markup will show position shifts on clients of different platforms.
+* Notes cannot be saved occasionally when the separate document window is closed.
diff --git a/dist/changes-2.10.2-zh-CN.md b/dist/changes-2.10.2-zh-CN.md
@@ -0,0 +1,25 @@
+# WizNotePlus v2.10.2 更新日志
+
+## 系统要求
+
+预编译的 WizNotePlus 软件包基于 Qt 5.14.2 构建，最低系统需求如下：
+
+* Linux 最低要求 GLIBC_2.17
+* MacOS 最低要求 macOS 10.13
+* Windows 最低要求 Windows 7
+
+## 问题修复
+
+以下更新由 @JingbenShi668 赞助：
+
+* 在 Mac 端禁用 command+up/down 快捷键。#214
+* 降低软件主窗口最小宽度的限制。#215
+* 为内部富文本编辑器 “搜索替换对话框” 添加 “关闭” 按钮。#218
+* 修改富文本编辑器代码块样式，解决文本溢出问题。#216
+
+## 已知问题
+
+* Windows 平台外部编辑器 Typora 保存时，有时会出现 WizNote 不同步更新的状况。#88
+* MacOS 下“显示系统托盘图标”设置会导致程序崩溃。#76
+* 笔记标注在不同平台的客户端上会有位置偏差。
+* 单独笔记窗口在关闭时，偶尔会无法自动保存笔记内容。
diff --git a/doc/README-en.md b/doc/README-en.md
@@ -10,7 +10,7 @@ README [中文](../README.md) | **English**
 
 The **WizNotePlus** project is dedicated to improving the usability of cross-platform client **[WizQTClient](https://github.com/WizTeam/WizQTClient)** to meet or exceed that of the Windows platform-specific client. In order to reach the goal, we need to implement a developer-friendly plugin system and promote the establishment of a third-party developer community with good atmosphere. This project is initiated and maintained by third-party developers in compliance with the GPLv3 agreement. Any developer or user who wishes to participate in the project is welcome to contact `altair_wei@outlook.com` .
 
-[![release](https://img.shields.io/badge/release-v2.10.1-green.svg)](https://github.com/altairwei/WizNotePlus/releases) [![license](https://img.shields.io/badge/license-GPLv3-green.svg)](https://github.com/altairwei/WizNotePlus/blob/master/LICENSE) [![build](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml/badge.svg)](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml)
+[![release](https://img.shields.io/badge/release-v2.10.2-green.svg)](https://github.com/altairwei/WizNotePlus/releases) [![license](https://img.shields.io/badge/license-GPLv3-green.svg)](https://github.com/altairwei/WizNotePlus/blob/master/LICENSE) [![build](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml/badge.svg)](https://github.com/altairwei/WizNotePlus/actions/workflows/build.yml)
 
 ## Features
 
diff --git a/i18n/wiznote_zh_CN.ts b/i18n/wiznote_zh_CN.ts
@@ -1473,12 +1473,12 @@
         <translation>下载附件 %1 ...</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2369"/>
+        <location filename="../src/WizMainWindow.cpp" line="2367"/>
         <source>Your {p} business service has expired.</source>
         <translation>您的{p}企业服务已到期。</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2371"/>
+        <location filename="../src/WizMainWindow.cpp" line="2369"/>
         <location filename="../src/sync/WizSync.cpp" line="18"/>
         <source>Group notes count limit exceeded!</source>
         <translation>群组笔记数目超出限制！</translation>
@@ -1641,15 +1641,15 @@
         <translation>%1 的团队服务已到期，暂时无法上传新创建或修改的笔记，请及时付费哦。</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2366"/>
+        <location filename="../src/WizMainWindow.cpp" line="2364"/>
         <location filename="../src/sync/WizSync.cpp" line="676"/>
         <location filename="../src/sync/WizSync.cpp" line="845"/>
         <location filename="../src/sync/WizSync.cpp" line="1005"/>
         <source>User service of has expired, please upgrade to VIP.</source>
         <translation>用户服务已到期，请升级到VIP。</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2363"/>
+        <location filename="../src/WizMainWindow.cpp" line="2361"/>
         <location filename="../src/sync/WizSync.cpp" line="684"/>
         <location filename="../src/sync/WizSync.cpp" line="853"/>
         <location filename="../src/sync/WizSync.cpp" line="1011"/>
@@ -4377,11 +4377,11 @@ Go to create a note</source>
         <location filename="../src/WizMainWindow.cpp" line="1310"/>
         <location filename="../src/WizMainWindow.cpp" line="1316"/>
         <location filename="../src/WizMainWindow.cpp" line="1336"/>
-        <location filename="../src/WizMainWindow.cpp" line="2348"/>
-        <location filename="../src/WizMainWindow.cpp" line="2404"/>
-        <location filename="../src/WizMainWindow.cpp" line="2407"/>
-        <location filename="../src/WizMainWindow.cpp" line="2410"/>
-        <location filename="../src/WizMainWindow.cpp" line="4071"/>
+        <location filename="../src/WizMainWindow.cpp" line="2346"/>
+        <location filename="../src/WizMainWindow.cpp" line="2402"/>
+        <location filename="../src/WizMainWindow.cpp" line="2405"/>
+        <location filename="../src/WizMainWindow.cpp" line="2408"/>
+        <location filename="../src/WizMainWindow.cpp" line="4069"/>
         <source>Info</source>
         <translation>提示</translation>
     </message>
@@ -4466,83 +4466,83 @@ Go to create a note</source>
         <translation>帐户设置</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4157"/>
+        <location filename="../src/WizMainWindow.cpp" line="4155"/>
         <source>New Note</source>
         <translation>新建笔记</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2066"/>
+        <location filename="../src/WizMainWindow.cpp" line="2064"/>
         <source>Unread documents</source>
         <translation>未读笔记</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2082"/>
+        <location filename="../src/WizMainWindow.cpp" line="2080"/>
         <source>Mark all documents read</source>
         <translation>将所有未读笔记标记为已读</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2357"/>
-        <location filename="../src/WizMainWindow.cpp" line="2374"/>
+        <location filename="../src/WizMainWindow.cpp" line="2355"/>
+        <location filename="../src/WizMainWindow.cpp" line="2372"/>
         <source>Sync failed</source>
         <translation>同步失败</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2357"/>
+        <location filename="../src/WizMainWindow.cpp" line="2355"/>
         <source>Bad network connection, can not sync now. Please try again later. (code: %1)</source>
         <translation>网络错误，现在无法同步。请稍后重试：(错误码：%1)</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2361"/>
+        <location filename="../src/WizMainWindow.cpp" line="2359"/>
         <source>There is something wrong with sync service. Please try again later. (code: %1)</source>
         <translation>服务端返回错误：同步异常，请稍后重试。（错误码：%1）</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2865"/>
+        <location filename="../src/WizMainWindow.cpp" line="2863"/>
         <source>Mark all as readed</source>
         <translation>标记为已读</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="2865"/>
+        <location filename="../src/WizMainWindow.cpp" line="2863"/>
         <source>Mark all documents as readed.</source>
         <translation>将所有未读笔记标记为已读。</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="3238"/>
+        <location filename="../src/WizMainWindow.cpp" line="3236"/>
         <source>Searching...</source>
         <translation>正在搜索...</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4072"/>
+        <location filename="../src/WizMainWindow.cpp" line="4070"/>
         <source>Can&apos;t find the specified attachment, may be it has been deleted.</source>
         <translation>找不到指定附件，该附件可能已被删除.</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4154"/>
+        <location filename="../src/WizMainWindow.cpp" line="4152"/>
         <source>Show/Hide MainWindow</source>
         <translation>显示/隐藏主窗口</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4162"/>
+        <location filename="../src/WizMainWindow.cpp" line="4160"/>
         <source>Hide TrayIcon</source>
         <translation>隐藏托盘图标</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4166"/>
+        <location filename="../src/WizMainWindow.cpp" line="4164"/>
         <source>Logout</source>
         <translation>注销</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4168"/>
+        <location filename="../src/WizMainWindow.cpp" line="4166"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4522"/>
+        <location filename="../src/WizMainWindow.cpp" line="4520"/>
         <source>Downloading attachment file  %1 ...</source>
         <translation>下载附件 %1 ...</translation>
     </message>
     <message>
-        <location filename="../src/WizMainWindow.cpp" line="4523"/>
+        <location filename="../src/WizMainWindow.cpp" line="4521"/>
         <source>Downloading</source>
         <translation>正在下载</translation>
     </message>
diff --git a/i18n/wiznote_zh_TW.ts b/i18n/wiznote_zh_TW.ts
diff --git a/src/WizDef.h b/src/WizDef.h
