feat: 十六进制的编辑视图优化改动；

Author: Wing-summer

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(PROJECT_VERSION "2.3.1")
+set(PROJECT_VERSION "2.3.2")
 
 find_package(Qt6 REQUIRED COMPONENTS Widgets Network Concurrent PrintSupport
                                      Xml LinguistTools)
@@ -378,6 +378,8 @@ set(CLASS_SRC
     src/class/changedstringlist.cpp
     src/class/editorviewcontext.h
     src/class/editorviewcontext.cpp
+    src/class/compositeiconengine.h
+    src/class/compositeiconengine.cpp
     src/class/consolehighlighanim.h
     src/class/consolehighlighanim.cpp
     src/class/angellsp.h

README.md

@@ -177,3 +177,4 @@
 ## 插件库
 
 - [WingAsm](https://github.com/Wing-summer/WingAsm) : 一个提供汇编和反汇编的插件，作者 **寂静的羽夏** ，协议 **APGL-v3.0** 。
+- [WingHexNote](https://github.com/Wing-summer/WingHexNote) : 一个羽云十六进制编辑器2的笔记插件，作者 **寂静的羽夏** ，协议 **APGL-v3.0** 。

README_en.md

@@ -178,3 +178,4 @@ Of course, there are other repositories as mirror for Chinese users (which will
 ## Plugins
 
 - [WingAsm](https://github.com/Wing-summer/WingAsm) : A plugin that provides assembly and disassembly features. Author: **wingsummer**. License: **APGL-v3.0**.
+- [WingHexNote](https://github.com/Wing-summer/WingAsm) : A note plugin for WingHexExplorer2. Author: **wingsummer**. License: **APGL-v3.0**.

lang/en_US/winghex_en_US.ts

@@ -1,3 +1,20 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
 #include "class/appmanager.h"
 #include "class/languagemanager.h"
 #include "class/settingmanager.h"

lang/zh_CN/winghex_zh_CN.ts

@@ -0,0 +1,48 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
+#include "compositeiconengine.h"
+
+#include <QPainter>
+
+CompositeIconEngine::CompositeIconEngine(const QIcon &main,
+                                         const QIcon &overlay)
+    : mainIcon(main), overlayIcon(overlay) {}
+
+QIconEngine *CompositeIconEngine::clone() const {
+    return new CompositeIconEngine(mainIcon, overlayIcon);
+}
+
+void CompositeIconEngine::paint(QPainter *painter, const QRect &rect,
+                                QIcon::Mode mode, QIcon::State state) {
+    mainIcon.paint(painter, rect, Qt::AlignCenter, mode, state);
+    auto w = rect.width() / 2;
+    auto h = rect.height() / 2;
+    auto x = rect.x() + w;
+    auto y = rect.y() + h;
+    QRect overlayRect(x, y, w, h);
+    overlayIcon.paint(painter, overlayRect, Qt::AlignCenter, mode, state);
+}
+
+QPixmap CompositeIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
+                                    QIcon::State state) {
+    QPixmap pixmap(size);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    paint(&painter, QRect(QPoint(0, 0), size), mode, state);
+    return pixmap;
+}

lang/zh_TW/winghex_zh_TW.ts

@@ -0,0 +1,41 @@
+/*==============================================================================
+** Copyright (C) 2024-2027 WingSummer
+**
+** This program is free software: you can redistribute it and/or modify it under
+** the terms of the GNU Affero General Public License as published by the Free
+** Software Foundation, version 3.
+**
+** This program is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+** FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+** details.
+**
+** You should have received a copy of the GNU Affero General Public License
+** along with this program. If not, see <https://www.gnu.org/licenses/>.
+** =============================================================================
+*/
+
+#ifndef COMPOSITEICONENGINE_H
+#define COMPOSITEICONENGINE_H
+
+#include <QIconEngine>
+
+class CompositeIconEngine : public QIconEngine {
+public:
+    explicit CompositeIconEngine(const QIcon &main, const QIcon &overlay);
+
+public:
+    QIconEngine *clone() const override;
+
+    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode,
+               QIcon::State state) override;
+
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode,
+                   QIcon::State state) override;
+
+private:
+    QIcon mainIcon;
+    QIcon overlayIcon;
+};
+
+#endif // COMPOSITEICONENGINE_H

main.cpp

@@ -54,11 +54,15 @@ PluginSystem::PluginSystem(QObject *parent) : QObject(parent) {
         auto m = mobj->method(i);
         if (m.methodType() == QMetaMethod::Slot &&
             m.access() == QMetaMethod::Public) {
+            auto total = m.parameterCount();
+            if (total < 1 || m.parameterMetaType(0) !=
+                                 QMetaType::fromType<const QObject *>()) {
+                continue;
+            }
+
             WingHex::FunctionSig msig;
             msig.fnName = m.name();
-
-            auto total = m.parameterCount();
-            msig.types.reserve(total);
+            msig.types.reserve(total - 1);
 
             for (int i = 1; i < total; ++i) {
                 auto mt = m.parameterType(i);
@@ -4251,13 +4255,14 @@ void PluginSystem::loadPlugin(IWingPlugin *p, PluginInfo &meta,
     QTranslator *p_tr = nullptr;
 
     try {
-        if (!p->pluginName().trimmed().length()) {
+        auto name = p->pluginName();
+        if (name.trimmed().isEmpty()) {
             throw tr("ErrLoadPluginNoName");
         }
 
         // dependencies had been checked
 
-        Q_EMIT pluginLoading(p->pluginName());
+        Q_EMIT pluginLoading(name);
 
         p_tr = LanguageManager::instance().try2LoadPluginLang(meta.id);
 
@@ -4318,6 +4323,11 @@ void PluginSystem::loadPlugin(IWingDevice *p, PluginInfo &meta,
     QTranslator *p_tr = nullptr;
 
     try {
+        auto name = p->pluginName();
+        if (name.trimmed().isEmpty()) {
+            throw tr("ErrLoadPluginNoName");
+        }
+
         Logger::debug(tr("ExtPluginAuthor :") + meta.author);
         Logger::debug(tr("ExtPluginWidgetRegister"));