refactor: [binarytool] Refactor the binarytool

Refactor the binarytool
deepin-mozart · May 15, 2024 · 1ab05c8 · 1ab05c8
1 parent 00bf35c
commit 1ab05c8
Show file tree

Hide file tree

Showing 34 changed files with 1,834 additions and 816 deletions.
diff --git a/src/plugins/binarytools/CMakeLists.txt b/src/plugins/binarytools/CMakeLists.txt
@@ -2,30 +2,23 @@ cmake_minimum_required(VERSION 3.0.2)
 
 project(binarytools)
 
-set(CXX_CPP
-    mainframe/binarytoolsconfigview.cpp
-    mainframe/binarytoolsdialog.cpp
-    mainframe/binarytoolssetting.cpp
-    mainframe/environmentview.cpp
-    binarytools.cpp
-    binarytools.json
-    )
-
-set(CXX_H
-    mainframe/binarytoolsconfigview.h
-    mainframe/binarytoolsdialog.h
-    mainframe/binarytoolssetting.h
-    mainframe/environmentview.h
-    binarytools.h
-    )
-
+FILE(GLOB_RECURSE PROJECT_SOURCES
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.json"
+)
+
+set (QRC_FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/binarytools.qrc"
+)
 
 add_library(${PROJECT_NAME}
     SHARED
-    ${CXX_CPP}
-    ${CXX_H}
-    binarytools.qrc
-    )
+    ${PROJECT_SOURCES}
+    ${QRC_FILES}
+)
 
 target_link_libraries(${PROJECT_NAME}
     framework
@@ -34,7 +27,7 @@ target_link_libraries(${PROJECT_NAME}
     services
     ${QtUseModules}
     ${PkgUserModules}
-    )
+)
 
 install_logo(${PROJECT_NAME}.svg)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_PATH})

diff --git a/src/plugins/binarytools/binarytools.cpp b/src/plugins/binarytools/binarytools.cpp
@@ -4,6 +4,7 @@
 
 #include "binarytools.h"
 #include "mainframe/binarytoolsdialog.h"
+#include "configure/binarytoolsmanager.h"
 
 #include "common/common.h"
 #include "base/abstractaction.h"
@@ -26,12 +27,15 @@ bool BinaryTools::start()
         inputAction->setShortCutInfo("Tools.Binary", action->text());
         windowService->addAction(MWM_TOOLS, inputAction);
 
-        QObject::connect(action, &QAction::triggered, [=](){
-           static BinaryToolsDialog dlg;
-           dlg.exec();
+        QObject::connect(action, &QAction::triggered, [=]() {
+            BinaryToolsDialog dlg;
+            dlg.exec();
         });
     }
 
+    const auto &tools = BinaryToolsManager::instance()->tools();
+    BinaryToolsManager::instance()->checkAndAddToToolbar(tools);
+
     return true;
 }
 

diff --git a/src/plugins/binarytools/binarytools.qrc b/src/plugins/binarytools/binarytools.qrc
@@ -1,10 +1,20 @@
 <RCC>
     <qresource prefix="/icons/deepin/builtin">
         <file>texts/binarytools_add_16px.svg</file>
-        <file>texts/binarytools_combine_16px.svg</file>
-        <file>texts/binarytools_delete_16px.svg</file>
-        <file>texts/binarytools_rename_16px.svg</file>
         <file>texts/binarytools_reset_16px.svg</file>
         <file>texts/binarytools_reduce_16px.svg</file>
+        <file>texts/binarytools_combo_16px.svg</file>
+        <file>texts/binarytools_command_16px.svg</file>
+        <file>texts/binarytools_default_16px.svg</file>
+        <file>texts/binarytools_file_16px.svg</file>
+        <file>texts/binarytools_flag_16px.svg</file>
+        <file>texts/binarytools_light_16px.svg</file>
+        <file>texts/binarytools_packing_16px.svg</file>
+        <file>texts/binarytools_signature_16px.svg</file>
+        <file>texts/binarytools_star_16px.svg</file>
+        <file>texts/binarytools_translate_16px.svg</file>
+    </qresource>
+    <qresource prefix="/">
+        <file>configure/default_binarytools.json</file>
     </qresource>
 </RCC>