Merge branch 'dev'

Change-Id: I881a0f4cdec849d7f777505800374622f7d980c7

README.en.md

@@ -45,6 +45,8 @@ _The **dev** branch is current development branch, build dependencies may change
 
 ## Installation
 
+   *If you install the IDE on Ubuntu by source code, please refer to the [DTK dependent installation](./docs/dtk-install-guide.en.md). After the installation of the dtk environment and the basic qt environment, you can install the IDE through the following source installation method.*
+
 1. Make sure you have installed all dependencies.
 
 ``` shell

README.md

@@ -45,6 +45,8 @@ _当前的开发分支为**dev**，编译依赖可能会在没有更新本说明
 
 ## 安装
 
+​    *如若在Ubuntu上使用源码安装方式安装IDE，请先参考[DTK依赖安装](./docs/dtk-install-guide.md)，在DTK环境以及基本qt环境安装完成后，可通过下面源码安装的方式安装本IDE。*
+
 1. 确保已经安装所有依赖库。
 
 

assets/configures/unioncode.desktop

@@ -10,6 +10,6 @@ MimeType=text/plain;application/x-code-workspace;
 Name=Deepin Union Code
 Path=/usr/bin
 StartupNotify=false
-StartupWMClass=Code
+StartupWMClass=UnionCode
 Type=Application
 X-Deepin-Vendor=user-custom

assets/translations/zh_CN.ts

@@ -2668,7 +2668,7 @@ repos path: %0</source>
     <message>
         <location filename="../../src/common/widget/outputpane.cpp" line="228"/>
         <source>Clear</source>
-        <translation>清扫</translation>
+        <translation>清除</translation>
     </message>
     <message>
         <location filename="../../src/common/widget/outputpane.cpp" line="238"/>

docs/dtk-install-guide.en.md

@@ -0,0 +1,61 @@
+## DTK Dependency Installation
+
+For deepin-unioncode, the required dependency libraries include dtkcore, dtkwidget, dtkgui, and qt5integration, and this section describes the installation of these dependencies.
+
+### 1. Source Code Pull
+
+First you need to download the source code of the dtk dependency library in the [deepin github community](https://github.com/linuxdeepin):
+
+[dtkcore](https://github.com/linuxdeepin/dtkcore)，[dtkwidget](https://github.com/linuxdeepin/dtkwidget)，[dtkgui](https://github.com/linuxdeepin/dtkgui)，[qt5integration](https://github.com/linuxdeepin/qt5integration)
+
+The dtkcore might rely on [dtkcommon](https://github.com/linuxdeepin/dtkcommon)，qt5integration will depend on the [qt5platform-plugins](https://github.com/linuxdeepin/qt5platform-plugins)
+
+### 2. Environmental Installation
+
+First you need to install the qt environment and execute the following command
+
+```shell
+sudo apt update
+sudo apt install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev qt5-private-dev
+```
+
+### 3. DTK Installation
+
+After the source code is pulled down, ensure that the required dependencies are properly installed and execute the following command in the directory location where the source code for each dependency library is located
+
+```shell
+sudo apt build-dep .
+```
+
+There are two ways to install dtk dependencies, one is the source code installation, and the second is the build-your-own-package installation. The source installation method is described in the README document of the respective dependent libraries, and will not be repeated here. This section describes how to install using a software package:
+
+In the source root of the respective dependent library, use the following command to package
+
+```shell
+dpkg-buildpackage -us -uc -b -j16
+```
+
+"-j16" Specifies the parameter for multi-core execution, which can be increased or decreased according to the number of processor cores and performance.
+
+The following errors may occur when installing dependent libraries:
+
+![image-20240605152527906](./dtk-install/error1.png)
+
+Cause: The dependent version failed to be properly packaged
+
+The solution:
+
+```shell
+vim debian/rules
+# Find "override_dh_shlibdeps:" in the opened file
+# Add "dh_shlibdeps -- dpkg-shlibdps-params =--ignore-missing-info"
+```
+
+![image-20240605153447864](./dtk-install/solution1.png)
+
+After all dependencies are successfully packaged, you can use the installation package to install the dependencies. After the installation, run commands to check whether the dependencies are successfully installed and whether their versions meet requirements.
+
+```shell
+apt policy libdtkcore5
+# Other dependencies are viewed in the same way
+```

docs/dtk-install-guide.md

@@ -0,0 +1,61 @@
+## DTK依赖安装
+
+对于Deepin-IDE，所需要的依赖库包括dtkcore，dtkwidget，dtkgui以及qt5integration，本部分介绍这几个依赖的安装。
+
+### 1. 源码拉取
+
+首先需要在深度的github社区中下载dtk依赖库的源码：
+
+[dtkcore](https://github.com/linuxdeepin/dtkcore)，[dtkwidget](https://github.com/linuxdeepin/dtkwidget)，[dtkgui](https://github.com/linuxdeepin/dtkgui)，[qt5integration](https://github.com/linuxdeepin/qt5integration)
+
+其中，dtkcore可能会依赖[dtkcommon](https://github.com/linuxdeepin/dtkcommon)，qt5integration会依赖[qt5platform-plugins](https://github.com/linuxdeepin/qt5platform-plugins)
+
+### 2. 环境安装
+
+首先需要安装qt环境，按照以下命令执行
+
+```shell
+sudo apt update
+sudo apt install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev qt5-private-dev
+```
+
+### 3. 安装
+
+源码拉下来之后，确保所需依赖都已正确安装，在每个依赖库的源码所在的目录位置执行以下命令
+
+```shell
+sudo apt build-dep .
+```
+
+接下来有两种方式来安装dtk依赖，一种是源码安装方式，第二种是自己构建软件包安装方式。源码安装方式在对应的各自依赖库的README文档中有介绍，这里不再赘述。这里介绍使用软件包安装方式：
+
+在各自依赖库的源码根目录下，使用以下命令打包
+
+```shell
+dpkg-buildpackage -us -uc -b -j16
+```
+
+-j16为多核执行，可根据处理器核数和性能酌情增减。
+
+安装依赖库时可能会出现以下错误：
+
+![image-20240605152527906](./dtk-install/error1.png)
+
+原因：依赖的版本问题导致无法正常打包
+
+解决方法：
+
+```shell
+vim debian/rules
+# 在打开的文件中找到override_dh_shlibdeps:
+# 添加dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+```
+
+![image-20240605153447864](./dtk-install/solution1.png)
+
+在所有依赖都成功打包后，可直接使用安装包进行依赖的安装，安装完成后使用命令查看依赖是否安装成功，以及依赖的版本是否满足要求。
+
+```shell
+apt policy libdtkcore5
+# 其他依赖同理
+```

src/common/find/abstractdocumentfind.h

@@ -18,11 +18,11 @@ class AbstractDocumentFind : public QObject
 
     virtual void findNext(const QString &txt) = 0;
     virtual void findPrevious(const QString &txt) = 0;
-    virtual void replace(const QString &before, const QString &after) {};
-    virtual void replaceFind(const QString &before, const QString &after) {};
-    virtual void replaceAll(const QString &before, const QString &after) {};
-    virtual void findStringChanged() {};
-    virtual bool supportsReplace() const { return true; };
+    virtual void replace(const QString &before, const QString &after) {}
+    virtual void replaceFind(const QString &before, const QString &after) {}
+    virtual void replaceAll(const QString &before, const QString &after) {}
+    virtual void findStringChanged() {}
+    virtual bool supportsReplace() const { return true; }
 };
 
 #endif   // ABSTRACTDOCUMENTFIND_H

src/common/util/eventdefinitions.h

@@ -20,7 +20,7 @@ OPI_OBJECT(project,
            OPI_INTERFACE(openProject, "kitName", "language", "workspace")
            OPI_INTERFACE(activeProject, "kitName", "language", "workspace")
            // out
-           OPI_INTERFACE(activedProject, "projectInfo")
+           OPI_INTERFACE(activatedProject, "projectInfo")
            OPI_INTERFACE(deletedProject, "projectInfo")
            OPI_INTERFACE(createdProject, "projectInfo")
            OPI_INTERFACE(projectUpdated, "projectInfo")
@@ -43,6 +43,7 @@ OPI_OBJECT(editor,
            OPI_INTERFACE(back)
            OPI_INTERFACE(forward)
            OPI_INTERFACE(gotoLine, "fileName", "line")
+           OPI_INTERFACE(gotoPosition, "fileName", "line", "column")
 
            // (AnnotationType)type
            OPI_INTERFACE(addAnnotation, "fileName", "title", "content", "line", "type")

src/plugins/builder/mainframe/buildmanager.cpp

@@ -395,13 +395,13 @@ void BuildManager::slotResetBuildUI()
     uiController.switchContext(tr("&Build"));
 }
 
-void BuildManager::setActivedProjectInfo(const QString &kitName, const QString &workingDir)
+void BuildManager::setActivatedProjectInfo(const QString &kitName, const QString &workingDir)
 {
     d->activedKitName = kitName;
     d->activedWorkingDir = workingDir;
 }
 
-void BuildManager::clearActivedProjectInfo()
+void BuildManager::clearActivatedProjectInfo()
 {
     d->activedKitName.clear();
     d->activedWorkingDir.clear();

src/plugins/builder/mainframe/buildmanager.h

@@ -33,8 +33,8 @@ class BuildManager : public QObject
     ProblemOutputPane *getProblemOutputPane() const;
     DTK_WIDGET_NAMESPACE::DWidget *getCompileWidget() const;
 
-    void setActivedProjectInfo(const QString &kitName, const QString &workingDir);
-    void clearActivedProjectInfo();
+    void setActivatedProjectInfo(const QString &kitName, const QString &workingDir);
+    void clearActivatedProjectInfo();
 
     bool handleCommand(const QList<BuildCommandInfo> &info, bool isSynchronous);
 

src/plugins/builder/transceiver/builderreceiver.cpp

@@ -25,18 +25,18 @@ QStringList BuilderReceiver::topics()
 
 void BuilderReceiver::eventProcess(const dpf::Event &event)
 {
-    if (event.data() == project.activedProject.name) {
-        QVariant proInfoVar = event.property(project.activedProject.pKeys[0]);
+    if (event.data() == project.activatedProject.name) {
+        QVariant proInfoVar = event.property(project.activatedProject.pKeys[0]);
         dpfservice::ProjectInfo projectInfo = qvariant_cast<dpfservice::ProjectInfo>(proInfoVar);
-        BuildManager::instance()->setActivedProjectInfo(projectInfo.kitName(), projectInfo.workspaceFolder());
+        BuildManager::instance()->setActivatedProjectInfo(projectInfo.kitName(), projectInfo.workspaceFolder());
     } else if (event.data() == project.createdProject.name) {
         QVariant proInfoVar = event.property(project.createdProject.pKeys[0]);
         dpfservice::ProjectInfo projectInfo = qvariant_cast<dpfservice::ProjectInfo>(proInfoVar);
-        BuildManager::instance()->setActivedProjectInfo(projectInfo.kitName(), projectInfo.workspaceFolder());
+        BuildManager::instance()->setActivatedProjectInfo(projectInfo.kitName(), projectInfo.workspaceFolder());
     } else if (event.data() == project.deletedProject.name) {
         QVariant proInfoVar = event.property(project.deletedProject.pKeys[0]);
         dpfservice::ProjectInfo projectInfo = qvariant_cast<dpfservice::ProjectInfo>(proInfoVar);
-        BuildManager::instance()->clearActivedProjectInfo();
+        BuildManager::instance()->clearActivatedProjectInfo();
     } else if (event.data() == symbol.parseDone.name) {
         bool bSuccess = event.property("success").toBool();
         if(!bSuccess) {

src/plugins/codeeditor/codeeditor.cpp

@@ -10,6 +10,7 @@
 #include "gui/settings/editorsettingswidget.h"
 #include "lexer/lexermanager.h"
 #include "utils/editorutils.h"
+#include "status/statusinfomanager.h"
 
 #include "base/abstractmenu.h"
 #include "base/abstractaction.h"
@@ -166,6 +167,9 @@ void CodeEditor::initEditorService()
     editorService->registerWidget = std::bind(&WorkspaceWidget::registerWidget, workspaceWidget, _1, _2);
     editorService->switchWidget = std::bind(&WorkspaceWidget::switchWidget, workspaceWidget, _1);
     editorService->switchDefaultWidget = std::bind(&WorkspaceWidget::switchDefaultWidget, workspaceWidget);
+    editorService->openedFiles = std::bind(&WorkspaceWidget::openedFiles, workspaceWidget);
+    editorService->fileText = std::bind(&WorkspaceWidget::fileText, workspaceWidget, _1);
+    editorService->replaceAll = std::bind(&WorkspaceWidget::replaceAll, workspaceWidget, _1, _2, _3, _4, _5);
 
     LexerManager::instance()->init(editorService);
 }
@@ -190,6 +194,8 @@ void CodeEditor::initWindowService()
         windowService->addAction(MWM_FILE, new AbstractAction(sep));
 
         windowService->addContextWidget(QTabWidget::tr("Search &Results"), new AbstractWidget(CodeLens::instance()), true);
+
+        StatusInfoManager::instance()->init(windowService);
     }
 }
 

src/plugins/codeeditor/find/editordocumentfind.cpp

@@ -30,7 +30,8 @@ class EditorDocumentFindPrivate
     void adjustFindStartPosition(TextEditor *editor);
     void dealWithZeroFound(TextEditor *editor);
     bool findStep(const QString &text, bool isForward);
-    void doReplaceAll(TextEditor *editor, const QString &findText, const QString &replaceText);
+    void doReplaceAll(TextEditor *editor, const QString &findText,
+                      const QString &replaceText, bool caseSensitive = false, bool wholeWords = false);
     int buildSearchFlags(bool re, bool cs, bool wo, bool wrap, bool forward, FindNextType findNextType, bool posix, bool cxx11);
 
 public:
@@ -115,13 +116,14 @@ bool EditorDocumentFindPrivate::findStep(const QString &text, bool isForward)
     return ret;
 }
 
-void EditorDocumentFindPrivate::doReplaceAll(TextEditor *editor, const QString &findText, const QString &replaceText)
+void EditorDocumentFindPrivate::doReplaceAll(TextEditor *editor, const QString &findText,
+                                             const QString &replaceText, bool caseSensitive, bool wholeWords)
 {
     int srcPosition = editor->cursorPosition();
     int firstDisLineNum = editor->SendScintilla(TextEditor::SCI_GETFIRSTVISIBLELINE);
     editor->beginUndoAction();
 
-    int flags = buildSearchFlags(false, false, false, false, true, FINDNEXTTYPE_REPLACENEXT, 0, 0);
+    int flags = buildSearchFlags(false, caseSensitive, wholeWords, false, true, FINDNEXTTYPE_REPLACENEXT, 0, 0);
     editor->SendScintilla(TextEditor::SCI_SETSEARCHFLAGS, flags);
 
     FindReplaceInfo findReplaceInfo;
@@ -266,3 +268,16 @@ void EditorDocumentFind::findStringChanged()
 {
     d->isFindFirst = true;
 }
+
+void EditorDocumentFind::replaceAll(TextEditor *editor, const QString &before,
+                                    const QString &after, bool caseSensitive, bool wholeWords)
+{
+    if (before.isEmpty())
+        return;
+
+    if (!editor || editor->isReadOnly())
+        return;
+
+    d->doReplaceAll(editor, before, after, caseSensitive, wholeWords);
+    d->isFindFirst = true;
+}

src/plugins/codeeditor/find/editordocumentfind.h

@@ -7,6 +7,7 @@
 
 #include "common/find/abstractdocumentfind.h"
 
+class TextEditor;
 class EditorDocumentFindPrivate;
 class EditorDocumentFind : public AbstractDocumentFind
 {
@@ -22,8 +23,11 @@ class EditorDocumentFind : public AbstractDocumentFind
     virtual void replaceAll(const QString &before, const QString &after) override;
     virtual void findStringChanged() override;
 
+    void replaceAll(TextEditor *editor, const QString &before,
+                    const QString &after, bool caseSensitive, bool wholeWords);
+
 private:
     EditorDocumentFindPrivate *const d;
 };
 
-#endif // EDITORDOCUMENTFIND_H
+#endif   // EDITORDOCUMENTFIND_H

src/plugins/codeeditor/gui/private/tabwidget_p.h

@@ -8,6 +8,8 @@
 #include "gui/tabwidget.h"
 #include "gui/tabbar.h"
 #include "gui/texteditor.h"
+#include "gui/recent/recentopenwidget.h"
+#include "find/editordocumentfind.h"
 
 #include "common/util/eventdefinitions.h"
 
@@ -70,6 +72,10 @@ public slots:
     PosRecord curPosRecord;
     QList<PosRecord> prePosRecord;
     QList<PosRecord> nextPosRecord;
+
+    QVector<QString> recentOpenedFiles;
+    RecentOpenWidget *openedWidget { nullptr };
+    EditorDocumentFind *docFind { nullptr };
 };
 
 #endif   // TABWIDGET_P_H

src/plugins/codeeditor/gui/private/workspacewidget_p.h

@@ -62,6 +62,7 @@ public slots:
     void handleRenameSymbol();
     void handleSetModifiedAutoReload(const QString &fileName, bool flag);
     void handleSetComment();
+    void handleShowOpenedFiles();
 
 public:
     WorkspaceWidget *q;