Revert "feat: DTK Changed-Top toolbar and Left navigation toolbar"

This reverts commit d6dfde8.
linuxdeepin · Nov 17, 2023 · bf42b4c · bf42b4c
1 parent abe6244
commit bf42b4c
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 114 deletions.
diff --git a/src/plugins/codeeditor/mainframe/toolbarmanager.cpp b/src/plugins/codeeditor/mainframe/toolbarmanager.cpp
@@ -63,6 +63,7 @@ bool ToolBarManager::addActionItem(const QString &id, QAction *action, const QSt
             break;
         }
     }
+
     d->toolbar->insertAction(before, action);
 
     if (currentIterator.value() == nullptr)

diff --git a/src/plugins/collaborators/collaborators.cpp b/src/plugins/collaborators/collaborators.cpp
@@ -20,9 +20,9 @@ bool Collaborators::start()
     auto &ctx = dpfInstance.serviceContext();
     WindowService *windowService = ctx.service<WindowService>(WindowService::name());
     if (windowService) {
-        if (windowService->addNavigation) {
-            windowService->addNavigation("Git");
-            windowService->addNavigation("Svn");
+        if (windowService->addActionNavigation) {
+            windowService->addActionNavigation("Git", new AbstractAction(new QAction(QIcon::fromTheme("git"), QAction::tr("Git"))));
+            windowService->addActionNavigation("Svn", new AbstractAction(new QAction(QIcon::fromTheme("svn"), QAction::tr("Svn"))));
         }
         if (windowService->addCentralNavigation) {
             windowService->addCentralNavigation("Git",

diff --git a/src/plugins/core/core.qrc b/src/plugins/core/core.qrc
@@ -68,7 +68,11 @@
         <file>images/open_file.png</file>
         <file>images/open_project.png</file>
         <file>images/reverse.png</file>
-        <file>images/down_arrow.png</file>    
+        <file>images/down_arrow.png</file>
+        <file>images/recent.svg</file>
+        <file>images/svn.svg</file>
+        <file>images/edit.svg</file>
+        <file>images/git.svg</file>        
     </qresource>
     <qresource prefix="/icons/deepin/">
         <file>builtin/actions/recent_20px.svg</file>

diff --git a/src/plugins/core/images/edit.svg b/src/plugins/core/images/edit.svg
diff --git a/src/plugins/core/images/git.svg b/src/plugins/core/images/git.svg
diff --git a/src/plugins/core/images/recent.svg b/src/plugins/core/images/recent.svg
diff --git a/src/plugins/core/images/svn.svg b/src/plugins/core/images/svn.svg
-Original file line number
+Diff line change
@@ Expand Up @@
                 break;
             }
         }
         d->toolbar->insertAction(before, action);
         if (currentIterator.value() == nullptr)
@@ Expand Down @@