chore: Merge branch 'master' into develope/main

Log: Change-Id: If94cdefb5cd8c44392f42ad65502528b6bca01c8
linuxdeepin · Jul 23, 2024 · 54061cf · 54061cf
2 parents 30dc2d5 + 17a85ae
commit 54061cf
Show file tree

Hide file tree

Showing 23 changed files with 1,552 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,9 +50,9 @@ message(STATUS "TOOLS_INSTALL_PATH ${TOOLS_INSTALL_PATH}")
 message(STATUS "CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}")
 
 # build runtime path
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/build/)
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 add_definitions(-DQT_MESSAGELOGCONTEXT)

diff --git a/README.md b/README.md
@@ -153,3 +153,7 @@ deepin-unioncode 在 [LGPL-3.0-or-later](LICENSE)下发布。
 - AI 问答
 
   ![codegeex-answer](./docs/rc/codegeex-answer.png)
+
+访问统计:
+
+![](https://profile-counter.glitch.me/deepin-unioncode/count.svg)
diff --git a/assets/translations/en_US.ts b/assets/translations/en_US.ts
@@ -105,6 +105,9 @@
         <source>e.g.*.ts,src/**/include</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BinaryToolsConfigView</name>
     <message>
         <location filename="../../src/plugins/find/gui/advancedsearchwidget.cpp" line="247"/>
         <source>Files To Include:</source>
@@ -190,6 +193,9 @@
         <source>Advanced Settings</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BinaryToolsConfigViewPrivate</name>
     <message>
         <location filename="../../src/plugins/binarytools/mainframe/advancedsettingsdialog.cpp" line="45"/>
         <source>Missing Hint:</source>
@@ -253,6 +259,9 @@
         <source>Stop Running Program</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BinaryToolsModel</name>
     <message>
         <location filename="../../src/common/widget/appoutputpane.cpp" line="139"/>
         <source>Close OutputPane</source>
@@ -988,6 +997,9 @@ storage: %2
         <source>Run CMake</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DebuggerPlugin</name>
     <message>
         <location filename="../../src/plugins/cxx/cmake/project/cmakeprojectgenerator.cpp" line="125"/>
         <source>Clear CMake</source>
@@ -1008,6 +1020,9 @@ storage: %2
         <source>File are not automatically added to the CmakeList.txt file to the Cmake project. Copy the path to the source files to the clipboard?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DetailPropertyWidget</name>
     <message>
         <location filename="../../src/plugins/cxx/cmake/project/cmakeprojectgenerator.cpp" line="392"/>
         <source>Copy to Clipboard?</source>
@@ -1187,6 +1202,11 @@ storage: %2
         <source>Please login to use CodeGeeX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/plugins/cxx/cmake/project/properties/environmentwidget.cpp" line="192"/>
+        <source>Enable Qt Debug Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeLens</name>
@@ -1645,6 +1665,9 @@ The debugee has Terminated.
         <source>Remove This Evaluator</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NotificationItemWidget</name>
     <message>
         <location filename="../../src/plugins/debugger/dap/dapdebugger.cpp" line="1183"/>
         <source>Name</source>
@@ -1864,6 +1887,9 @@ Delete anyway?</source>
         <source>The filename can&apos;t be empty!</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QAction</name>
     <message>
         <location filename="../../src/plugins/template/wizard/detailwidget.cpp" line="165"/>
         <source>The project can&apos;t be empty!</source>
@@ -2326,6 +2352,9 @@ need to manually copy the source code to this path</source>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QMenu</name>
     <message>
         <location filename="../../src/plugins/linglong/gui/generatedialog.cpp" line="193"/>
         <source>%1 is already existed</source>
@@ -4717,6 +4746,9 @@ not exists support files: %0</source>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QPushButton</name>
     <message>
         <location filename="../../src/plugins/cxx/lexer/scilexercmake.cpp" line="37"/>
         <source>Comment</source>
@@ -5857,6 +5889,14 @@ not exists support files: %0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>pathChooser</name>
+    <message>
+        <location filename="../../src/plugins/cxx/cmake/project/properties/cmakeCfgWidget/cmakeitemdelegate.cpp" line="30"/>
+        <source>Choose path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>templateMgr::ProjectGenerate</name>
     <message>