Merge pull request #284 from rb-union/release/eagle

update release/eagle from master

.github/workflows/backup-to-gitlab.yml

@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit

.github/workflows/call-api-check.yml

@@ -0,0 +1,13 @@
+name: apiCheck
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  api-check:
+    uses: linuxdeepin/.github/.github/workflows/api-check.yml@master
+    secrets: inherit

.github/workflows/call-build-distribution.yml

@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit

.github/workflows/call-chatOps.yml

@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/call-clacheck.yml

@@ -12,5 +12,4 @@ concurrency:
 jobs:
   clacheck:
     uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/call-debian-check.yml

@@ -0,0 +1,13 @@
+name: debianCheck
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  debian-check:
+    uses: linuxdeepin/.github/.github/workflows/debian-check.yml@master
+    secrets: inherit

.github/workflows/call-static-check.yml

@@ -0,0 +1,13 @@
+name: staticCheck
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  static-check:
+    uses: linuxdeepin/.github/.github/workflows/static-check.yml@master
+    secrets: inherit

.github/workflows/cppcheck.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: export
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

.obs/workflows.yml

@@ -0,0 +1,43 @@
+test_build:
+  steps:
+    - link_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:CI
+
+    - configure_repositories:
+        project: deepin:CI
+        repositories:
+          - name: deepin_develop
+            paths:
+              - target_project: deepin:CI
+                target_repository: deepin_develop
+            architectures:
+              - x86_64
+              - aarch64
+
+          - name: debian
+            paths:
+              - target_project: deepin:CI
+                target_repository: debian_sid
+            architectures:
+              - x86_64
+
+  filters:
+    event: pull_request
+
+tag_build:
+  steps:
+    - trigger_services:
+        project: deepin:Unstable:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: tag_push
+
+commit_build:
+  steps:
+    - trigger_services:
+        project: deepin:Develop:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: push

.reuse/dep5

@@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co., Ltd. <>
 Source: https://github.com/linuxdeepin/deepin-editor
 
 # ci
-Files: .github/*
+Files: .github/* .obs/workflows.yml
 Copyright: UnionTech Software Technology Co., Ltd.
 License: CC0-1.0
 
@@ -39,7 +39,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
 License: CC0-1.0
 
 # config files
-Files: com.deepin.editor.daemon.service com.deepin.editor.policy deepin-editor.desktop
+Files: com.deepin.editor.daemon.service com.deepin.editor.policy deepin-editor.desktop misc/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: CC0-1.0
 
@@ -71,4 +71,4 @@ License: GPL-2.0-or-later
 # cpp-stub
 Files: tests/src/stub.h
 Copyright: 2019 coolxv
-License: MIT
+License: MIT

.tx/config

@@ -3,13 +3,13 @@ host = https://www.transifex.com
 minimum_perc = 80
 mode = developer
 
-[deepin-editor.deepin-editor]
+[o:linuxdeepin:p:deepin-editor:r:deepin-editor]
 file_filter = translations/deepin-editor_<lang>.ts
 source_file = translations/deepin-editor.ts
 source_lang = en
 type = QT
 
-[deepin-editor.deepin-editor-desktop-ts]
+[o:linuxdeepin:p:deepin-editor:r:deepin-editor-desktop-ts]
 file_filter = translations/desktop/desktop_<lang>.ts
 source_file = translations/desktop/desktop.ts
 source_lang = en

.tx/deepin.conf

@@ -0,0 +1,3 @@
+[transifex]
+branch = m20
+

CMakeLists.txt

@@ -1,10 +1,13 @@
 cmake_minimum_required(VERSION 3.7)
 
-if (NOT DEFINED VERSION)
-    set(VERSION 1.2.2)
-endif ()
+set(VERSION "6.0.0" CACHE STRING "Application version")
 
-project(deepin-editor)
+project(deepin-editor
+    VERSION ${VERSION}
+    DESCRIPTION "Text editor for DDE"
+    HOMEPAGE_URL "https://github.com/linuxdeepin/deepin-editor"
+    LANGUAGES CXX C
+)
 
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 11)
@@ -18,6 +21,16 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sw_64")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mieee")
 endif ()
 
+# 设置软件版本
+include_directories(${PROJECT_BINARY_DIR})
+configure_file(${PROJECT_SOURCE_DIR}/src/environments.h.in ${PROJECT_BINARY_DIR}/environments.h @ONLY)
+
+# 玲珑路径配置
+add_definitions(-DLINGLONG_PREFIX=\"${CMAKE_INSTALL_PREFIX}/\")
+# 高亮文件路径配置
+set(KF5_HIGHLIGHT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/deepin-editor/org.kde.syntax-highlighing)
+add_definitions(-DKF5_HIGHLIGHT_PATH=\"${KF5_HIGHLIGHT_INSTALL_PATH}\")
+
 add_subdirectory(src)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")

com.deepin.editor.policy

@@ -4,8 +4,8 @@
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
 <policyconfig>
   <action id="com.deepin.editor.saveFile">
-    <description>write file to /etc</description>
-    <message>Save file to filesystem</message>
+    <description>Save file with administrator privilege</description>
+    <message>Save file with administrator privilege</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin</allow_active>

debian/changelog

@@ -1,4 +1,152 @@
-deepin-editor (5.9.6-1) unstable; urgency=low
+deepin-editor (6.0.18) unstable; urgency=medium
+
+  * fix: Change default search to be case insensitive(Bug: 262733)
+  * fix: Wrong case sensitive config(Bug: 262733)
+
+ -- renbin <[email protected]>  Wed, 03 Jul 2024 18:14:32 +0800
+
+deepin-editor (6.0.17) unstable; urgency=medium
+
+  * feat: Change default shortcuts popup position(Task: 332267)(Influence: Shortcuts)
+
+ -- renbin <[email protected]>  Wed, 27 Mar 2024 15:37:32 +0800
+
+deepin-editor (6.0.16) unstable; urgency=medium
+
+  * feat: add new tab to the end
+    Thanks to Cloud
+  * chore: remove duplicate value for key "MimeType" in desktop file
+    Thanks to hotime
+  * fix: Shortcut 'Ctrl + M cursor' move to row indentation
+         not implemented (Bug: 233877)
+  * fix: Shortcuts Alt + P / N match the help (Bug: 233883)
+  * fix: the Column Edit cannot align the selected columns (Bug: 234517)
+  * fix: After column editing,lines are not withdrawn together (Bug: 241475)
+
+ -- renbin <[email protected]>  Thu, 01 Feb 2024 14:10:32 +0800
+
+deepin-editor (6.0.15) unstable; urgency=medium
+
+  * fix: Tab height error under low version dtk. 
+
+ -- renbin <[email protected]>  Wed, 25 Oct 2023 13:28:05 +0800
+
+deepin-editor (6.0.14) unstable; urgency=medium
+
+  * fix: Add support mimetype mod/toml.(Bug: 210815, 212273)(Influence: SupportFormat)
+  * fix: Add mimetype toml in .desktop(Bug: 210815)
+  * feat: adapt compact mode.(Task: 292061)(Influence: UI)
+  * fix: Adapt compact mode for findbar and replacebar.(Bug: 220159)
+
+ -- renbin <[email protected]>  Thu, 19 Oct 2023 13:25:37 +0800
+
+deepin-editor (6.0.13) unstable; urgency=medium
+
+  * fix: Add support mimetype mod/toml.(Bug: 210815, 212273)(Influence: SupportFormat)
+  * fix: Add mimetype toml in .desktop(Bug: 210815)
+
+ -- Deepin Packages Builder <[email protected]>  Fri, 08 Sep 2023 14:21:02 +0800
+
+deepin-editor (6.0.12) unstable; urgency=medium
+
+  * fix: onPressedLineNumber() may cause process hangs.(Bug: 215591)(Influence: LineNumber)
+
+ -- renbin <[email protected]>  Thu, 31 Aug 2023 16:04:59 +0800
+
+deepin-editor (6.0.11) unstable; urgency=medium
+
+  * fix: Document in maximumized window is incomplete.(Bug: 172681)(Influence: SyntaxHighlight)
+  * fix: Redo drag text error.(Bug: 196349)(Influence: DragText UnitTest)
+  * fix: Redo drag text from other app error.(Influence: DragText)
+  * fix: Roll back gb18030 midification.(Influence: GB18030 Encoding)
+  * feat: Merge zpd requirement.(Task: 29499)
+  * fix: failed unit test case.(Influence: UT)
+
+ -- Deepin Packages Builder <[email protected]>  Fri, 21 Jul 2023 14:29:57 +0800
+
+deepin-editor (6.0.10) unstable; urgency=medium
+
+  * chore: 更新翻译配置和翻译文件(Influence: 翻译配置 翻译文件)
+  * chore: 更新藏文翻译文件 (#251)(Influence: 翻译文件)
+
+ -- Deepin Packages Builder <[email protected]>  Wed, 24 May 2023 13:20:03 +0800
+
+deepin-editor (6.0.9) unstable; urgency=medium
+
+  * fix: deepin-editor searching problem(Bug: 4203)
+
+ -- Deepin Packages Builder <[email protected]>  Thu, 11 May 2023 13:36:30 +0800
+
+deepin-editor (6.0.8) unstable; urgency=medium
+
+  * fix: 修复未正确记录日志(Influence: 日志文件)
+
+ -- Deepin Packages Builder <[email protected]>  Tue, 25 Apr 2023 10:52:41 +0800
+
+deepin-editor (6.0.7) unstable; urgency=medium
+
+  * fix: 修复最小化后，双击文件无法弹出编辑器窗口(Bug: 194029)(Influence: 激活窗口)
+  * fix: 修复另存255长度文件名的文件权限不足问题(Bug: 192375)(Influence: 长文件名另存)
+  * fix: 修复设置界面中字体和字号选项未对齐(Influence: 设置界面)
+  * fix: 修复高分屏1.5缩放下图标模糊(Bug: 171749)(Influence: 高分屏缩放显示)
+  * fix: 修复VBScript文件未高亮问题(Bug: 154719)(Influence: vbs格式高亮 授权文件)
+  * chore: remove redundant code for linglong.  
+
+ -- Deepin Packages Builder <[email protected]>  Thu, 20 Apr 2023 15:02:15 +0800
+
+deepin-editor (6.0.6) unstable; urgency=medium
+
+  * fix: 修复使用特殊字体时，序号显示不全(Bug: 188417)(Influence: 序号显示)
+  * fix: 修复加载完小文件时，行号显示不全问题(Influence: 行号显示)
+  * fix: 修复GB18030部分编码转换错误问题(Influence: 编码转换)
+  * fix: 修复源编码为UTF-8时编码转换空白的问题(Influence: 编码转换)
+  * feat: 适配GB18030-2022规范兼容2005标准(Bug: 193311)(Influence: 编码转换 GB18030显示 另存)
+  * fix: 更新翻译显示(Bug: 110761)
+
+ -- Deepin Packages Builder <[email protected]>  Thu, 13 Apr 2023 13:51:25 +0800
+
+deepin-editor (6.0.5) unstable; urgency=medium
+
+  * Fix application palette change bug. 
+
+ -- Deepin Packages Builder <[email protected]> Thu, 16 Mar 2023 09:42:02 +0800
+
+deepin-editor (6.0.4) unstable; urgency=medium
+
+  * Update version to distinguish pro/community.
+  * Fix cursor position error when editing multi-byte encoding text.
+
+ -- Deepin Packages Builder <[email protected]> Fri, 10 Mar 2023 10:19:21 +0800
+
+deepin-editor (6.0.3) unstable; urgency=medium
+
+  * Improve GB18030 text encoding recognition rate.
+  * Fix print large document bug.
+
+ -- Deepin Packages Builder <[email protected]>  Tue, 07 Mar 2023 10:43:27 +0800
+
+deepin-editor (6.0.2) unstable; urgency=medium
+
+  * Improve text search and highlight color.
+
+ -- renbin <[email protected]>  Thu, 16 Feb 2023 14:42:04 +0800
+
+deepin-editor (6.0.1) unstable; urgency=medium
+
+  * Improve convert text encoding.
+  * Adaptor V23 DDE DBus interface.
+  * Fix debian rules error. 
+
+ -- renbin <[email protected]>  Tue, 14 Feb 2023 15:04:06 +0800
+
+deepin-editor (6.0.0) unstable; urgency=low
+
+  * New version 6.0.0
+  * Sync v23 source code from gerrit.
+
+ -- renbin <[email protected]>  Wed, 11 Jan 2023 14:04:01 +0000
+
+deepin-editor (5.10.13) unstable; urgency=low
 
   [ Hu Feng <[email protected]> Fri, 19 Feb 2021 15:32:28 +0800 ]
   * debian/control