From b235513f707e2043bd69e288162d280dba13f021 Mon Sep 17 00:00:00 2001 From: wingsummer <1326224942@qq.com> Date: Mon, 23 Dec 2024 13:42:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=8D=A2=E5=8D=95=E4=BE=8B?= =?UTF-8?q?=E5=BA=93=EF=BC=9B=E5=AE=8C=E5=96=84=E6=B5=8B=E8=AF=95=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E6=8F=92=E4=BB=B6=E7=B3=BB=E7=BB=9F=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .gitmodules | 3 - 3rdparty/AngelScript | 2 +- 3rdparty/QConsoleWidget/QConsoleWidget.cpp | 26 +- 3rdparty/QConsoleWidget/QConsoleWidget.h | 43 +- .../QConsoleWidget/commandhistorymanager.cpp | 32 + .../QConsoleWidget/commandhistorymanager.h | 16 + 3rdparty/QHexView/document/qhexcursor.cpp | 2 + 3rdparty/QHexView/qhexview.cpp | 13 +- 3rdparty/SingleApplication | 1 - 3rdparty/qtsingleapplication/CMakeLists.txt | 31 + 3rdparty/qtsingleapplication/INSTALL.TXT | 254 ++++ 3rdparty/qtsingleapplication/README.TXT | 33 + 3rdparty/qtsingleapplication/common.pri | 14 + 3rdparty/qtsingleapplication/configure | 25 + 3rdparty/qtsingleapplication/configure.bat | 43 + .../qtsingleapplication/doc/html/classic.css | 284 ++++ .../doc/html/images/qt-logo.png | Bin 0 -> 4075 bytes .../qtsingleapplication/doc/html/index.html | 48 + .../qtsingleapplication-example-loader.html | 175 +++ .../qtsingleapplication-example-trivial.html | 101 ++ .../doc/html/qtsingleapplication-members.html | 235 ++++ .../html/qtsingleapplication-obsolete.html | 31 + .../doc/html/qtsingleapplication.dcf | 40 + .../doc/html/qtsingleapplication.html | 162 +++ .../doc/html/qtsingleapplication.index | 90 ++ .../doc/html/qtsingleapplication.qhp | 53 + ...singlecoreapplication-example-console.html | 118 ++ .../html/qtsinglecoreapplication-members.html | 126 ++ .../doc/html/qtsinglecoreapplication.html | 98 ++ .../doc/images/qt-logo.png | Bin 0 -> 4075 bytes 3rdparty/qtsingleapplication/doc/index.qdoc | 50 + .../qtsingleapplication/src/qtlocalpeer.cpp | 169 +++ .../qtsingleapplication/src/qtlocalpeer.h | 38 + .../qtsingleapplication/src/qtlockedfile.cpp | 325 +++++ .../qtsingleapplication/src/qtlockedfile.h | 43 + .../src/qtsingleapplication.cpp | 303 ++++ .../src/qtsingleapplication.h | 49 + .../src/qtsinglecoreapplication.cpp | 101 ++ .../src/qtsinglecoreapplication.h | 31 + CMakeLists.txt | 20 +- TestPlugin/CMakeLists.txt | 10 +- TestPlugin/ctltestform.cpp | 14 +- TestPlugin/lang/TestPlugin_zh_CN.ts | 40 +- TestPlugin/testform.ui | 44 +- TestPlugin/testplugin.cpp | 109 +- TestPlugin/testplugin.h | 12 + TestPlugin/testpluginpage.cpp | 18 + TestPlugin/testpluginpage.h | 23 + TestPlugin/testsettingpage.cpp | 26 + TestPlugin/testsettingpage.h | 32 + TestPlugin/testwingeditorviewwidget.cpp | 29 + TestPlugin/testwingeditorviewwidget.h | 27 + favicon.rc | 2 +- images/update.png | Bin 0 -> 2659 bytes lang/zh_CN/winghex.ts | 1244 +++++++++-------- mkinstaller/linuxdeploy/WingHexExplorer2.sh | 5 +- resources.qrc | 1 + src/class/appmanager.cpp | 31 +- src/class/appmanager.h | 4 +- src/class/asdebugger.cpp | 9 +- src/class/asdebugger.h | 2 + src/class/logger.cpp | 15 +- src/class/scriptmachine.cpp | 21 + src/class/scriptmachine.h | 4 + src/class/settingmanager.cpp | 22 + src/class/settingmanager.h | 12 +- src/class/wingangelapi.cpp | 50 +- src/class/wingangelapi.h | 4 +- src/class/wingupdater.cpp | 159 +++ src/class/wingupdater.h | 27 + src/components.md | 2 +- src/control/editorview.cpp | 23 +- src/control/editorview.h | 2 + src/control/scripteditor.cpp | 2 +- src/define.h | 8 + src/dialog/mainwindow.cpp | 57 +- src/dialog/mainwindow.h | 1 + src/plugin/iwingplugin.h | 4 + src/plugin/pluginsystem.cpp | 84 +- src/settings/othersettingsdialog.cpp | 24 +- src/settings/othersettingsdialog.ui | 39 + src/settings/pluginsettingdialog.cpp | 18 +- src/settings/scriptsettingdialog.cpp | 9 +- 84 files changed, 4712 insertions(+), 786 deletions(-) create mode 100644 3rdparty/QConsoleWidget/commandhistorymanager.cpp create mode 100644 3rdparty/QConsoleWidget/commandhistorymanager.h delete mode 160000 3rdparty/SingleApplication create mode 100644 3rdparty/qtsingleapplication/CMakeLists.txt create mode 100644 3rdparty/qtsingleapplication/INSTALL.TXT create mode 100644 3rdparty/qtsingleapplication/README.TXT create mode 100644 3rdparty/qtsingleapplication/common.pri create mode 100644 3rdparty/qtsingleapplication/configure create mode 100644 3rdparty/qtsingleapplication/configure.bat create mode 100644 3rdparty/qtsingleapplication/doc/html/classic.css create mode 100644 3rdparty/qtsingleapplication/doc/html/images/qt-logo.png create mode 100644 3rdparty/qtsingleapplication/doc/html/index.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication-members.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication-obsolete.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication.dcf create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication.index create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsingleapplication.qhp create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html create mode 100644 3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication.html create mode 100644 3rdparty/qtsingleapplication/doc/images/qt-logo.png create mode 100644 3rdparty/qtsingleapplication/doc/index.qdoc create mode 100644 3rdparty/qtsingleapplication/src/qtlocalpeer.cpp create mode 100644 3rdparty/qtsingleapplication/src/qtlocalpeer.h create mode 100644 3rdparty/qtsingleapplication/src/qtlockedfile.cpp create mode 100644 3rdparty/qtsingleapplication/src/qtlockedfile.h create mode 100644 3rdparty/qtsingleapplication/src/qtsingleapplication.cpp create mode 100644 3rdparty/qtsingleapplication/src/qtsingleapplication.h create mode 100644 3rdparty/qtsingleapplication/src/qtsinglecoreapplication.cpp create mode 100644 3rdparty/qtsingleapplication/src/qtsinglecoreapplication.h create mode 100644 TestPlugin/testpluginpage.cpp create mode 100644 TestPlugin/testpluginpage.h create mode 100644 TestPlugin/testsettingpage.cpp create mode 100644 TestPlugin/testsettingpage.h create mode 100644 TestPlugin/testwingeditorviewwidget.cpp create mode 100644 TestPlugin/testwingeditorviewwidget.h create mode 100644 images/update.png create mode 100644 src/class/wingupdater.cpp create mode 100644 src/class/wingupdater.h diff --git a/.gitignore b/.gitignore index 292b7ed..ab0726c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ Thumbs.db *.rc *.deb *.rpm +RC* !app.rc !favicon.rc diff --git a/.gitmodules b/.gitmodules index fe80c5f..37ec90d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "3rdparty/AngelScript"] path = 3rdparty/AngelScript url = git@github.com:Wing-summer/AngelScript.git -[submodule "3rdparty/SingleApplication"] - path = 3rdparty/SingleApplication - url = git@github.com:itay-grudev/SingleApplication.git [submodule "3rdparty/json"] path = 3rdparty/json url = git@github.com:nlohmann/json.git diff --git a/3rdparty/AngelScript b/3rdparty/AngelScript index 57ef77e..387b486 160000 --- a/3rdparty/AngelScript +++ b/3rdparty/AngelScript @@ -1 +1 @@ -Subproject commit 57ef77e4793ca14f448f485f52392ab0eefe968b +Subproject commit 387b48653eb0840765bcbf24773de50ed632ad59 diff --git a/3rdparty/QConsoleWidget/QConsoleWidget.cpp b/3rdparty/QConsoleWidget/QConsoleWidget.cpp index 34c0d76..6f75e71 100644 --- a/3rdparty/QConsoleWidget/QConsoleWidget.cpp +++ b/3rdparty/QConsoleWidget/QConsoleWidget.cpp @@ -4,7 +4,6 @@ #include "control/qcodecompletionwidget.h" #include "qdocumentline.h" #include "qformatscheme.h" -#include "utilities.h" #include "QConsoleIODevice.h" @@ -291,11 +290,6 @@ void QConsoleWidget::replaceCommandLine(const QString &str) { setCursor(bcursor); } -QString QConsoleWidget::getHistoryPath() { - QDir dir(Utilities::getAppDataPath()); - return dir.absoluteFilePath(QStringLiteral(".command_history.lst")); -} - void QConsoleWidget::write(const QString &message, const QString &sfmtID) { auto tc = cursor(); auto ascom = dynamic_cast(completionEngine()); @@ -350,23 +344,9 @@ void QConsoleWidget::writeStdErr(const QString &s) { QConsoleWidget::History QConsoleWidget::history_; QConsoleWidget::History::History(void) - : pos_(0), active_(false), maxsize_(10000) { - QFile f(QConsoleWidget::getHistoryPath()); - if (f.open(QFile::ReadOnly)) { - QTextStream is(&f); - while (!is.atEnd()) - add(is.readLine()); - } -} -QConsoleWidget::History::~History(void) { - QFile f(QConsoleWidget::getHistoryPath()); - if (f.open(QFile::WriteOnly | QFile::Truncate)) { - QTextStream os(&f); - int n = strings_.size(); - while (n > 0) - os << strings_.at(--n) << Qt::endl; - } -} + : pos_(0), active_(false), maxsize_(10000) {} + +QConsoleWidget::History::~History(void) {} void QConsoleWidget::History::add(const QString &str) { active_ = false; diff --git a/3rdparty/QConsoleWidget/QConsoleWidget.h b/3rdparty/QConsoleWidget/QConsoleWidget.h index fb31b5a..e763ffc 100644 --- a/3rdparty/QConsoleWidget/QConsoleWidget.h +++ b/3rdparty/QConsoleWidget/QConsoleWidget.h @@ -12,6 +12,26 @@ class QConsoleIODevice; class QConsoleWidget : public QEditor { Q_OBJECT +public: + struct History { + QStringList strings_; + int pos_; + QString token_; + bool active_; + int maxsize_; + History(void); + ~History(void); + void add(const QString &str); + const QString ¤tValue() const { + return pos_ == -1 ? token_ : strings_.at(pos_); + } + void activate(const QString &tk = QString()); + void deactivate() { active_ = false; } + bool isActive() const { return active_; } + bool move(bool dir); + int indexOf(bool dir, int from) const; + }; + public: enum ConsoleMode { Input, Output }; Q_ENUM(ConsoleMode) @@ -28,7 +48,7 @@ public: // write a formatted message to the console void write(const QString &message, const QString &sfmtID = {}) override; - static const QStringList &history() { return history_.strings_; } + static History &history() { return history_; } // get the current command line QString getCommandLine(); @@ -62,32 +82,11 @@ protected: // replace the command line void replaceCommandLine(const QString &str); - static QString getHistoryPath(); - // QEditor interface public slots: virtual void cut() override; private: - struct History { - QStringList strings_; - int pos_; - QString token_; - bool active_; - int maxsize_; - History(void); - ~History(void); - void add(const QString &str); - const QString ¤tValue() const { - return pos_ == -1 ? token_ : strings_.at(pos_); - } - void activate(const QString &tk = QString()); - void deactivate() { active_ = false; } - bool isActive() const { return active_; } - bool move(bool dir); - int indexOf(bool dir, int from) const; - }; - static History history_; ConsoleMode mode_; QDocumentCursor inpos_; diff --git a/3rdparty/QConsoleWidget/commandhistorymanager.cpp b/3rdparty/QConsoleWidget/commandhistorymanager.cpp new file mode 100644 index 0000000..13e4665 --- /dev/null +++ b/3rdparty/QConsoleWidget/commandhistorymanager.cpp @@ -0,0 +1,32 @@ +#include "commandhistorymanager.h" + +#include "utilities.h" + +#include + +QStringList CommandHistoryManager::load() { + QStringList ret; + QFile f(getHistoryPath()); + if (f.open(QFile::ReadOnly)) { + QTextStream is(&f); + while (!is.atEnd()) { + ret.append(is.readLine()); + } + } + return ret; +} + +void CommandHistoryManager::save(const QStringList &strings) { + QFile f(getHistoryPath()); + if (f.open(QFile::WriteOnly | QFile::Truncate)) { + QTextStream os(&f); + int n = strings.size(); + while (n > 0) + os << strings.at(--n) << Qt::endl; + } +} + +QString CommandHistoryManager::getHistoryPath() { + QDir dir(Utilities::getAppDataPath()); + return dir.absoluteFilePath(QStringLiteral(".command_history.lst")); +} diff --git a/3rdparty/QConsoleWidget/commandhistorymanager.h b/3rdparty/QConsoleWidget/commandhistorymanager.h new file mode 100644 index 0000000..1800e0b --- /dev/null +++ b/3rdparty/QConsoleWidget/commandhistorymanager.h @@ -0,0 +1,16 @@ +#ifndef COMMANDHISTORYMANAGER_H +#define COMMANDHISTORYMANAGER_H + +#include + +class CommandHistoryManager { +public: + static QStringList load(); + + static void save(const QStringList &strings); + +private: + static QString getHistoryPath(); +}; + +#endif // COMMANDHISTORYMANAGER_H diff --git a/3rdparty/QHexView/document/qhexcursor.cpp b/3rdparty/QHexView/document/qhexcursor.cpp index dea2c80..77b70c1 100644 --- a/3rdparty/QHexView/document/qhexcursor.cpp +++ b/3rdparty/QHexView/document/qhexcursor.cpp @@ -125,6 +125,7 @@ void QHexCursor::select(qsizetype line, int column, int nibbleindex, if (modes.testFlag(SelectionPreview)) { m_selection.line = line; m_selection.column = qMax(0, column); // fix the bug by wingsummer + m_selection.lineWidth = m_position.lineWidth; m_selection.nibbleindex = nibbleindex; modes.setFlag(SelectionPreview, false); @@ -136,6 +137,7 @@ void QHexCursor::select(qsizetype line, int column, int nibbleindex, sel.end.line = line; sel.end.column = column; + sel.end.lineWidth = m_position.lineWidth; sel.end.nibbleindex = nibbleindex; sel.normalize(); diff --git a/3rdparty/QHexView/qhexview.cpp b/3rdparty/QHexView/qhexview.cpp index 90af397..93336f5 100644 --- a/3rdparty/QHexView/qhexview.cpp +++ b/3rdparty/QHexView/qhexview.cpp @@ -759,9 +759,9 @@ void QHexView::moveNext(bool select) { if (select) cur->select(line, std::min(m_renderer->hexLineWidth() - 1, int(column)), nibbleindex, QHexCursor::SelectionAdd); - else - cur->moveTo(line, std::min(m_renderer->hexLineWidth() - 1, int(column)), - nibbleindex); + + cur->moveTo(line, std::min(m_renderer->hexLineWidth() - 1, int(column)), + nibbleindex); } void QHexView::movePrevious(bool select) { @@ -796,9 +796,10 @@ void QHexView::movePrevious(bool select) { } if (select) - cur->select(line, std::max(0, column), nibbleindex); - else - cur->moveTo(line, std::max(0, column), nibbleindex); + cur->select(line, std::max(0, column), nibbleindex, + QHexCursor::SelectionAdd); + + cur->moveTo(line, std::max(0, column), nibbleindex); } QHexCursor::SelectionMode QHexView::getSelectionMode() const { diff --git a/3rdparty/SingleApplication b/3rdparty/SingleApplication deleted file mode 160000 index 494772e..0000000 --- a/3rdparty/SingleApplication +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 494772e98cef0aa88124f154feb575cc60b08b38 diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt new file mode 100644 index 0000000..9c94545 --- /dev/null +++ b/3rdparty/qtsingleapplication/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.12.0) + +project(QtSingleApplication LANGUAGES CXX) + +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets Network) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Network) + +add_library( + ${PROJECT_NAME} STATIC + src/qtlocalpeer.h + src/qtsingleapplication.h + src/qtsinglecoreapplication.h + src/qtlocalpeer.cpp + src/qtsingleapplication.cpp + src/qtsinglecoreapplication.cpp + src/qtlockedfile.h + src/qtlockedfile.cpp) + +target_link_libraries( + ${PROJECT_NAME} + PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network + Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Gui) + +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) diff --git a/3rdparty/qtsingleapplication/INSTALL.TXT b/3rdparty/qtsingleapplication/INSTALL.TXT new file mode 100644 index 0000000..bbb74a9 --- /dev/null +++ b/3rdparty/qtsingleapplication/INSTALL.TXT @@ -0,0 +1,254 @@ +INSTALLATION INSTRUCTIONS + +These instructions refer to the package you are installing as +some-package.tar.gz or some-package.zip. The .zip file is intended for use +on Windows. + +The directory you choose for the installation will be referred to as +your-install-dir. + +Note to Qt Visual Studio Integration users: In the instructions below, +instead of building from command line with nmake, you can use the menu +command 'Qt->Open Solution from .pro file' on the .pro files in the +example and plugin directories, and then build from within Visual +Studio. + +Unpacking and installation +-------------------------- + +1. Unpacking the archive (if you have not done so already). + + On Unix and Mac OS X (in a terminal window): + + cd your-install-dir + gunzip some-package.tar.gz + tar xvf some-package.tar + + This creates the subdirectory some-package containing the files. + + On Windows: + + Unpack the .zip archive by right-clicking it in explorer and + choosing "Extract All...". If your version of Windows does not + have zip support, you can use the infozip tools available + from www.info-zip.org. + + If you are using the infozip tools (in a command prompt window): + cd your-install-dir + unzip some-package.zip + +2. Configuring the package. + + The configure script is called "configure" on unix/mac and + "configure.bat" on Windows. It should be run from a command line + after cd'ing to the package directory. + + You can choose whether you want to use the component by including + its source code directly into your project, or build the component + as a dynamic shared library (DLL) that is loaded into the + application at run-time. The latter may be preferable for + technical or licensing (LGPL) reasons. If you want to build a DLL, + run the configure script with the argument "-library". Also see + the note about usage below. + + (Components that are Qt plugins, e.g. styles and image formats, + are by default built as a plugin DLL.) + + The configure script will prompt you in some cases for further + information. Answer these questions and carefully read the license text + before accepting the license conditions. The package cannot be used if + you do not accept the license conditions. + +3. Building the component and examples (when required). + + If a DLL is to be built, or if you would like to build the + examples, next give the commands + + qmake + make [or nmake if your are using Microsoft Visual C++] + + The example program(s) can be found in the directory called + "examples" or "example". + + Components that are Qt plugins, e.g. styles and image formats, are + ready to be used as soon as they are built, so the rest of this + installation instruction can be skipped. + +4. Building the Qt Designer plugin (optional). + + Some of the widget components are provided with plugins for Qt + Designer. To build and install the plugin, cd into the + some-package/plugin directory and give the commands + + qmake + make [or nmake if your are using Microsoft Visual C++] + + Restart Qt Designer to make it load the new widget plugin. + + Note: If you are using the built-in Qt Designer from the Qt Visual + Studio Integration, you will need to manually copy the plugin DLL + file, i.e. copy + %QTDIR%\plugins\designer\some-component.dll + to the Qt Visual Studio Integration plugin path, typically: + C:\Program Files\Trolltech\Qt VS Integration\plugins + + Note: If you for some reason are using a Qt Designer that is built + in debug mode, you will need to build the plugin in debug mode + also. Edit the file plugin.pro in the plugin directory, changing + 'release' to 'debug' in the CONFIG line, before running qmake. + + + +Solutions components are intended to be used directly from the package +directory during development, so there is no 'make install' procedure. + + +Using a component in your project +--------------------------------- + +To use this component in your project, add the following line to the +project's .pro file (or do the equivalent in your IDE): + + include(your-install-dir/some-package/src/some-package.pri) + +This adds the package's sources and headers to the SOURCES and HEADERS +project variables respectively (or, if the component has been +configured as a DLL, it adds that library to the LIBS variable), and +updates INCLUDEPATH to contain the package's src +directory. Additionally, the .pri file may include some dependencies +needed by the package. + +To include a header file from the package in your sources, you can now +simply use: + + #include + +or alternatively, in pre-Qt 4 style: + + #include + +Refer to the documentation to see the classes and headers this +components provides. + + + +Install documentation (optional) +-------------------------------- + +The HTML documentation for the package's classes is located in the +your-install-dir/some-package/doc/html/index.html. You can open this +file and read the documentation with any web browser. + +To install the documentation into Qt Assistant (for Qt version 4.4 and +later): + +1. In Assistant, open the Edit->Preferences dialog and choose the + Documentation tab. Click the Add... button and select the file + your-install-dir/some-package/doc/html/some-package.qch + +For Qt versions prior to 4.4, do instead the following: + +1. The directory your-install-dir/some-package/doc/html contains a + file called some-package.dcf. Execute the following commands in a + shell, command prompt or terminal window: + + cd your-install-dir/some-package/doc/html/ + assistant -addContentFile some-package.dcf + +The next time you start Qt Assistant, you can access the package's +documentation. + + +Removing the documentation from assistant +----------------------------------------- + +If you have installed the documentation into Qt Assistant, and want to uninstall it, do as follows, for Qt version 4.4 and later: + +1. In Assistant, open the Edit->Preferences dialog and choose the + Documentation tab. In the list of Registered Documentation, select + the item com.nokia.qtsolutions.some-package_version, and click + the Remove button. + +For Qt versions prior to 4.4, do instead the following: + +1. The directory your-install-dir/some-package/doc/html contains a + file called some-package.dcf. Execute the following commands in a + shell, command prompt or terminal window: + + cd your-install-dir/some-package/doc/html/ + assistant -removeContentFile some-package.dcf + + + +Using the component as a DLL +---------------------------- + +1. Normal components + + The shared library (DLL) is built and placed in the + some-package/lib directory. It is intended to be used directly + from there during development. When appropriate, both debug and + release versions are built, since the run-time linker will in some + cases refuse to load a debug-built DLL into a release-built + application or vice versa. + + The following steps are taken by default to help the dynamic + linker to locate the DLL at run-time (during development): + + Unix: The some-package.pri file will add linker instructions to + add the some-package/lib directory to the rpath of the + executable. (When distributing, or if your system does not support + rpath, you can copy the shared library to another place that is + searched by the dynamic linker, e.g. the "lib" directory of your + Qt installation.) + + Mac: The full path to the library is hardcoded into the library + itself, from where it is copied into the executable at link time, + and ready by the dynamic linker at run-time. (When distributing, + you will want to edit these hardcoded paths in the same way as for + the Qt DLLs. Refer to the document "Deploying an Application on + Mac OS X" in the Qt Reference Documentation.) + + Windows: the .dll file(s) are copied into the "bin" directory of + your Qt installation. The Qt installation will already have set up + that directory to be searched by the dynamic linker. + + +2. Plugins + + For Qt Solutions plugins (e.g. image formats), both debug and + release versions of the plugin are built by default when + appropriate, since in some cases the release Qt library will not + load a debug plugin, and vice versa. The plugins are automatically + copied into the plugins directory of your Qt installation when + built, so no further setup is required. + + Plugins may also be built statically, i.e. as a library that will be + linked into your application executable, and so will not need to + be redistributed as a separate plugin DLL to end users. Static + building is required if Qt itself is built statically. To do it, + just add "static" to the CONFIG variable in the plugin/plugin.pro + file before building. Refer to the "Static Plugins" section in the + chapter "How to Create Qt Plugins" for explanation of how to use a + static plugin in your application. The source code of the example + program(s) will also typically contain the relevant instructions + as comments. + + + +Uninstalling +------------ + + The following command will remove any fils that have been + automatically placed outside the package directory itself during + installation and building + + make distclean [or nmake if your are using Microsoft Visual C++] + + If Qt Assistant documentation or Qt Designer plugins have been + installed, they can be uninstalled manually, ref. above. + + +Enjoy! :) + +- The Qt Solutions Team. diff --git a/3rdparty/qtsingleapplication/README.TXT b/3rdparty/qtsingleapplication/README.TXT new file mode 100644 index 0000000..06abb09 --- /dev/null +++ b/3rdparty/qtsingleapplication/README.TXT @@ -0,0 +1,33 @@ +Qt Solutions Component: Single Application + +The QtSingleApplication component provides support for +applications that can be only started once per user. + + + +Version history: + +2.0: - Version 1.3 ported to Qt 4. + +2.1: - Fix compilation problem on Mac. + +2.2: - Really fix the Mac compilation problem. + - Mac: fix crash due to wrong object releasing. + - Mac: Fix memory leak. + +2.3: - Windows: Force creation of internal widget to make it work + with Qt 4.2. + +2.4: - Fix the system for automatic window raising on message + reception. NOTE: minor API change. + +2.5: - Mac: Fix isRunning() to work and report correctly. + +2.6: - - initialize() is now obsolete, no longer necessary to call + it + - - Fixed race condition where multiple instances migth be started + - - QtSingleCoreApplication variant provided for non-GUI (console) + usage + - Complete reimplementation. Visible changes: + - LGPL release. + diff --git a/3rdparty/qtsingleapplication/common.pri b/3rdparty/qtsingleapplication/common.pri new file mode 100644 index 0000000..924c57c --- /dev/null +++ b/3rdparty/qtsingleapplication/common.pri @@ -0,0 +1,14 @@ +exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib + +TEMPLATE += fakelib +greaterThan(QT_MAJOR_VERSION, 5)|\ + if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\ + if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) { + QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head) +} else { + QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head) +} +TEMPLATE -= fakelib + +QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib +unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR diff --git a/3rdparty/qtsingleapplication/configure b/3rdparty/qtsingleapplication/configure new file mode 100644 index 0000000..3c4edff --- /dev/null +++ b/3rdparty/qtsingleapplication/configure @@ -0,0 +1,25 @@ +#!/bin/sh + +if [ "x$1" != "x" -a "x$1" != "x-library" ]; then + echo "Usage: $0 [-library]" + echo + echo "-library: Build the component as a dynamic library (DLL). Default is to" + echo " include the component source code directly in the application." + echo + exit 0 +fi + +rm -f config.pri +if [ "x$1" = "x-library" ]; then + echo "Configuring to build this component as a dynamic library." + echo "SOLUTIONS_LIBRARY = yes" > config.pri +fi + +echo +echo "This component is now configured." +echo +echo "To build the component library (if requested) and example(s)," +echo "run qmake and your make command." +echo +echo "To remove or reconfigure, run make distclean." +echo diff --git a/3rdparty/qtsingleapplication/configure.bat b/3rdparty/qtsingleapplication/configure.bat new file mode 100644 index 0000000..f64731e --- /dev/null +++ b/3rdparty/qtsingleapplication/configure.bat @@ -0,0 +1,43 @@ +:: Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +:: SPDX-License-Identifier: BSD-3-Clause + +@echo off + +rem +rem "Main" +rem + +if not "%1"=="" ( + if not "%1"=="-library" ( + call :PrintUsage + goto EOF + ) +) + +if exist config.pri. del config.pri +if "%1"=="-library" ( + echo Configuring to build this component as a dynamic library. + echo SOLUTIONS_LIBRARY = yes > config.pri +) + +echo . +echo This component is now configured. +echo . +echo To build the component library (if requested) and example(s), +echo run qmake and your make or nmake command. +echo . +echo To remove or reconfigure, run make (nmake) distclean. +echo . +goto EOF + +:PrintUsage +echo Usage: configure.bat [-library] +echo . +echo -library: Build the component as a dynamic library (DLL). Default is to +echo include the component source directly in the application. +echo A DLL may be preferable for technical or licensing (LGPL) reasons. +echo . +goto EOF + + +:EOF diff --git a/3rdparty/qtsingleapplication/doc/html/classic.css b/3rdparty/qtsingleapplication/doc/html/classic.css new file mode 100644 index 0000000..b8cae8e --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/classic.css @@ -0,0 +1,284 @@ +BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV { + font-family: Arial, Geneva, Helvetica, sans-serif; +} +H1 { + text-align: center; + font-size: 160%; +} +H2 { + font-size: 120%; +} +H3 { + font-size: 100%; +} + +h3.fn,span.fn +{ + background-color: #eee; + border-width: 1px; + border-style: solid; + border-color: #ddd; + font-weight: bold; + padding: 6px 0px 6px 10px; + margin: 42px 0px 0px 0px; +} + +hr { + border: 0; + color: #a0a0a0; + background-color: #ccc; + height: 1px; + width: 100%; + text-align: left; + margin: 34px 0px 34px 0px; +} + +table.valuelist { + border-width: 1px 1px 1px 1px; + border-style: solid; + border-color: #dddddd; + border-collapse: collapse; + background-color: #f0f0f0; +} + +table.indextable { + border-width: 1px 1px 1px 1px; + border-style: solid; + border-collapse: collapse; + background-color: #f0f0f0; + border-color:#555; + font-size: 100%; +} + +table td.largeindex { + border-width: 1px 1px 1px 1px; + border-collapse: collapse; + background-color: #f0f0f0; + border-color:#555; + font-size: 120%; +} + +table.valuelist th { + border-width: 1px 1px 1px 2px; + padding: 4px; + border-style: solid; + border-color: #666; + color:white; + background-color:#666; +} + +th.titleheader { + border-width: 1px 0px 1px 0px; + padding: 2px; + border-style: solid; + border-color: #666; + color:white; + background-color:#555; + background-image:url('images/gradient.png')}; + background-repeat: repeat-x; + font-size: 100%; +} + + +th.largeheader { + border-width: 1px 0px 1px 0px; + padding: 4px; + border-style: solid; + border-color: #444; + color:white; + background-color:#555555; + font-size: 120%; +} + +p { + + margin-left: 4px; + margin-top: 8px; + margin-bottom: 8px; +} + +a:link +{ + color: #0046ad; + text-decoration: none +} + +a:visited +{ + color: #672967; + text-decoration: none +} + +a.obsolete +{ + color: #661100; + text-decoration: none +} + +a.compat +{ + color: #661100; + text-decoration: none +} + +a.obsolete:visited +{ + color: #995500; + text-decoration: none +} + +a.compat:visited +{ + color: #995500; + text-decoration: none +} + +body +{ + background: #ffffff; + color: black +} + +table.generic, table.annotated +{ + border-width: 1px; + border-color:#bbb; + border-style:solid; + border-collapse:collapse; +} + +table td.memItemLeft { + width: 180px; + padding: 2px 0px 0px 8px; + margin: 4px; + border-width: 1px; + border-color: #E0E0E0; + border-style: none; + font-size: 100%; + white-space: nowrap +} + +table td.memItemRight { + padding: 2px 8px 0px 8px; + margin: 4px; + border-width: 1px; + border-color: #E0E0E0; + border-style: none; + font-size: 100%; +} + +table tr.odd { + background: #f0f0f0; + color: black; +} + +table tr.even { + background: #e4e4e4; + color: black; +} + +table.annotated th { + padding: 3px; + text-align: left +} + +table.annotated td { + padding: 3px; +} + +table tr pre +{ + padding-top: 0px; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; + border: none; + background: none +} + +tr.qt-style +{ + background: #96E066; + color: black +} + +body pre +{ + padding: 0.2em; + border: #e7e7e7 1px solid; + background: #f1f1f1; + color: black +} + +table tr.qt-code pre +{ + padding: 0.2em; + border: #e7e7e7 1px solid; + background: #f1f1f1; + color: black +} + +span.preprocessor, span.preprocessor a +{ + color: darkblue; +} + +span.comment +{ + color: darkred; + font-style: italic +} + +span.string,span.char +{ + color: darkgreen; +} + +.title +{ + text-align: center +} + +.subtitle +{ + font-size: 0.8em +} + +.small-subtitle +{ + font-size: 0.65em +} + +.qmlitem { + padding: 0; +} + +.qmlname { + white-space: nowrap; +} + +.qmltype { + text-align: center; + font-size: 160%; +} + +.qmlproto { + background-color: #eee; + border-width: 1px; + border-style: solid; + border-color: #ddd; + font-weight: bold; + padding: 6px 10px 6px 10px; + margin: 42px 0px 0px 0px; +} + +.qmlreadonly { + float: right; + color: red +} + +.qmldoc { +} + +*.qmlitem p { +} diff --git a/3rdparty/qtsingleapplication/doc/html/images/qt-logo.png b/3rdparty/qtsingleapplication/doc/html/images/qt-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..794162f5af58e7b38beebf472842fc9703ede19b GIT binary patch literal 4075 zcmb7H30qUw7R5$_N(2N2A__tfM8-gsp~yw0Ae4$j8GNEd2*JKmajJr%mxxR@0%4Fz zh&Z7IL~)=h5Fh~p1k*Z!Q$rYws0mUD$xZHghoL{<@qG#R<9@8O_u6}}y-voqt$vFa zEnlRep|RM1i_Z@D+Z}#3FZc?6-{g7xqM@N%>+iGihxm(;DgY3k-aPn11Axfo`?a#C zAK~-zfCHNU|HHlK<;yfyk@$a{ZO2UtDrwAOWqQqF>+KCnlgTxU%*`*|IM=l`i8yl@ zKf*|b$+MVjW(ND93}8Tt@DL)A=u5Op*Saz6YdjlB%g9R<02it=uE6Ad`2&6qoCNvD zl@+~yR)1w7;M7p`NWnm8{=m+B$a{~F1M*(&2JxCUW;E!R|F3# zf}`W}E#v8$?mqA>*|_izq0iwB6hcOZ)(lB4rndk9F?4#Oaxx{jvFA$rad)4y_VxJ0 zB4?EfH;Z&*O#vz3asg1`a!ka9$Ec$t>GY`KzGx#oNnUn;e!Ht5L8Wh{beozcnA)n81!3v{=okpw>LEPC*L;<|B4jBb#|gsooMmri`XeCDfw*X zlJ_T4Q89`(fC**w@d8|pbu|eDZNewKHpdnlhYpH$SB*t`&DyR?yAE4xq0N&{ew)xc zcGvvbZ1itsd!JH|S2NCazp3FA6%}^ZgK?ONn&(YVWv1y_X5&;9hDk+cTY3TDH8nML z@*%V}-^L0;^D68_5W2#ymEzd4y17lr>hWVFf`O5I;4*Q7Zs+K_dE-dn!~Ye@9-o1IQzuM|y+|q#yxI+F7g<#-f%X=IO4y=?2TtCI$iFiKzdtpk(7nn9bw0@R$i&xcf z!fzjP+KXVD^ZcVD_ii8%2ows%#lXeIU}8)fWF;;8ItJ@RP;lGn4xFIxa{L;FwGab^ zpBP5u35BZSQT^qddv*ju{f2)yQvrsv5x=Sq3?y+IsmP-#dq=nJ*}MBhVkCRLq_QUH zZk*5=zycbe!EKD*k~G!MyEy6Xij~ z?2h&|a&Y_TGWRu8k=0&KbMVzGXmtA2M9JvHn3!>$2m^+46vcok)8pmp7bS6`RS7BV zjE&n^U;5Q0@U@-LZd$OSBSV)x-KXT0+uf95QnU2!a0c%@N(p2I>UzEPRM2&)>)d7& zFb{`yp+!bceHlP_uD*LTf4Q-WhZ2dYy2xLrF?C7?dlZ>&eK0Y8w>};W^Llhi*=3r9 zWahb-P`AvN3*eHNp@JG-WPCai6UjKid&7&F^Yje?6pBWbatf0=>V$lP7-}GDYHn32 z+IzAh5bcB7-T{_Dehn8Nu6F#-U-p&78r1g#S@K_>1PwC=)VS1uz0!0J+kLT0InH4g z1)q&bpZ7XUA!=%psYN|p09xKS#Ky8vpi(LaObAu7Jc9z|XRLKxyS?xGq&U>8x_+Hx zgkx3}82dK1p5Lo86Kh^BRVT@bMEE)9+*2nf8909VtiIt7A@NB=xj{Iuc-0bicI5qe z8fMr2RIB|qxAR~Rfn>Dn-w2UE_Z|x8K18N z7_FEk@kKQ#DkMXyFiba~it1A9yHz^N~D}P zgiCdDa`HZTpHwA`6{tmAU~Ft$L>nDMpmNo4#h}^Q?A08Z4>O~qV(3%Y*t?M|(w2A2 zbPOG!j;G&+OBlx?wfvTj)W3&L;a|q#`eU(Jd8{dz>U6iis{U}11$(fpA)#60<8miw zNZ#%7yH0mEMisHgdqn7mst=wQ!w;U1<2I;Z)l&u>=FV)c&VGV?qeUTL;*u=$?m>{f ze<;SNpDw}Wz>H4+gw>(-;hu@%^?DU>EqE#t0rKC8EY?4B|8C!aW9>~XlbqnBAysK5 zY;+bYP|pNz`Lk}{0vucXV>+so?f%a;R$B51QdN3Fs$R$NH5^>uiQYhpjLAjmq_{b# z24SSq+J<*}^5qaz7#9~RRTVQO2aehXm9>{%)}Y+NLSr~%Cx9}GSxbcMiMc4W5?<=5 zgCpu?#~7I?T%;!R16e|pd>X{yUp|VgE$*)Tmmt`Q1>5PUVz{}y%bI+N_alsz1cizV zRQ-K4Ty=pd>E3SoQ?md;r(^%<2i~S|+cl)8EXy1yhhM!P?>yze|vqb~9wMixy zM{NG7vAg}jC$Hn#DMbo7N33_#+g?0+xMxRr?;Byt5b~@dLMm;1 ze5~)!>viIY+s=2Ee3&l7G)pmwNo=-cBny4bxM)QF^d?{P)|%3ve=A>X6K-B@U}a_H zOT7L}G+AfXbrSoisiiIF0u%+2db#@~M(Wq6y$+2={pg^R8H9+@sqsm;DyGF_(0&g6 z$lDZ%-k!xJ4tt8q-szN#99aFSM8e)*`E#2gvIw2+m!aZc%~@u2EW2N_-V2FxYN0dArh*_+owvm^SqV) zl9P3ucft8P7%CCJsY&l<>BQ&=Hdf>4rA!>_;h63Jxdrt4dOUn!tKQ4GUa<;tbv?u5Kfn8t~ ziA4$|31yN=F2Hdd8*@GSTQWN(qt&Og{Pl@N&=A6(+d32|NV9~rd<;pi%Q&!n^TjT{ zz{17?S~;;J7lDp`I(`fqRW28WNNTB3tbXeGwDS>X{6cat072$%rcoe+7c)w3* zdP+9npWyLl-7$3>a4$Ht)4Moy zS8?dZv)|>cj9Q*^)rM9(H(K>CnHdX@WWEPTD)-(ovehhtMPJB_*5K-xs|kfmrZ?R5 q^n7^PJomUfU@U$1kN?*do1n4%(BY1g{cSVe#sAx_KDRc}&ioHDn>RrK literal 0 HcmV?d00001 diff --git a/3rdparty/qtsingleapplication/doc/html/index.html b/3rdparty/qtsingleapplication/doc/html/index.html new file mode 100644 index 0000000..af9dab1 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/index.html @@ -0,0 +1,48 @@ + + + + + + Single Application + + + + + + + +
  Home

Single Application
+

+ +

Description

+

The QtSingleApplication component provides support for applications that can be only started once per user.

+

For some applications it is useful or even critical that they are started only once by any user. Future attempts to start the application should activate any already running instance, and possibly perform requested actions, e.g. loading a file, in that instance.

+

The QtSingleApplication class provides an interface to detect a running instance, and to send command strings to that instance. For console (non-GUI) applications, the QtSingleCoreApplication variant is provided, which avoids dependency on QtGui.

+ +

Classes

+ + +

Examples

+ + +

Tested platforms

+
    +
  • Qt 4.4, 4.5 / Windows XP / MSVC.NET 2005
    • +
  • Qt 4.4, 4.5 / Linux / gcc
    • +
  • Qt 4.4, 4.5 / MacOS X 10.5 / gcc
    • +
+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html new file mode 100644 index 0000000..6a36632 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html @@ -0,0 +1,175 @@ + + + + + + Loading Documents + + + + + + + +
  Home

Loading Documents
+

+

The application in this example loads or prints the documents passed as commandline parameters to further instances of this application.

+
 /****************************************************************************
+ **
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the Qt Solutions component.
+ **
+ ** You may use this file under the terms of the BSD license as follows:
+ **
+ ** "Redistribution and use in source and binary forms, with or without
+ ** modification, are permitted provided that the following conditions are
+ ** met:
+ **   * Redistributions of source code must retain the above copyright
+ **     notice, this list of conditions and the following disclaimer.
+ **   * Redistributions in binary form must reproduce the above copyright
+ **     notice, this list of conditions and the following disclaimer in
+ **     the documentation and/or other materials provided with the
+ **     distribution.
+ **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ **     the names of its contributors may be used to endorse or promote
+ **     products derived from this software without specific prior written
+ **     permission.
+ **
+ ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ **
+ ****************************************************************************/
+
+ #include <qtsingleapplication.h>
+ #include <QtCore/QFile>
+ #include <QtGui/QMainWindow>
+ #include <QtGui/QPrinter>
+ #include <QtGui/QPainter>
+ #include <QtGui/QTextEdit>
+ #include <QtGui/QMdiArea>
+ #include <QtCore/QTextStream>
+
+ class MainWindow : public QMainWindow
+ {
+     Q_OBJECT
+ public:
+     MainWindow();
+
+ public slots:
+     void handleMessage(const QString& message);
+
+ signals:
+     void needToShow();
+
+ private:
+     QMdiArea *workspace;
+ };
+

The user interface in this application is a QMainWindow subclass with a QMdiArea as the central widget. It implements a slot handleMessage() that will be connected to the messageReceived() signal of the QtSingleApplication class.

+
 MainWindow::MainWindow()
+ {
+     workspace = new QMdiArea(this);
+
+     setCentralWidget(workspace);
+ }
+

The MainWindow constructor creates a minimal user interface.

+
 void MainWindow::handleMessage(const QString& message)
+ {
+     enum Action {
+         Nothing,
+         Open,
+         Print
+     } action;
+
+     action = Nothing;
+     QString filename = message;
+     if (message.toLower().startsWith("/print ")) {
+         filename = filename.mid(7);
+         action = Print;
+     } else if (!message.isEmpty()) {
+         action = Open;
+     }
+     if (action == Nothing) {
+         emit needToShow();
+         return;
+     }
+
+     QFile file(filename);
+     QString contents;
+     if (file.open(QIODevice::ReadOnly))
+         contents = file.readAll();
+     else
+         contents = "[[Error: Could not load file " + filename + "]]";
+
+     QTextEdit *view = new QTextEdit;
+     view->setPlainText(contents);
+
+     switch(action) {
+

The handleMessage() slot interprets the message passed in as a filename that can be prepended with /print to indicate that the file should just be printed rather than loaded.

+
     case Print:
+         {
+             QPrinter printer;
+             view->print(&printer);
+             delete view;
+         }
+         break;
+
+     case Open:
+         {
+             workspace->addSubWindow(view);
+             view->setWindowTitle(message);
+             view->show();
+             emit needToShow();
+         }
+         break;
+     default:
+         break;
+     };
+ }
+

Loading the file will also activate the window.

+
 #include "main.moc"
+
+ int main(int argc, char **argv)
+ {
+     QtSingleApplication instance("File loader QtSingleApplication example", argc, argv);
+     QString message;
+     for (int a = 1; a < argc; ++a) {
+         message += argv[a];
+         if (a < argc-1)
+             message += " ";
+     }
+
+     if (instance.sendMessage(message))
+         return 0;
+

The main entry point function creates a QtSingleApplication object, and creates a message to send to a running instance of the application. If the message was sent successfully the process exits immediately.

+
     MainWindow mw;
+     mw.handleMessage(message);
+     mw.show();
+
+     QObject::connect(&instance, SIGNAL(messageReceived(const QString&)),
+                      &mw, SLOT(handleMessage(const QString&)));
+
+     instance.setActivationWindow(&mw, false);
+     QObject::connect(&mw, SIGNAL(needToShow()), &instance, SLOT(activateWindow()));
+
+     return instance.exec();
+ }
+

If the message could not be sent the application starts up. Note that false is passed to the call to setActivationWindow() to prevent automatic activation for every message received, e.g. when the application should just print a file. Instead, the message handling function determines whether activation is requested, and signals that by emitting the needToShow() signal. This is then simply connected directly to QtSingleApplication's activateWindow() slot.

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html new file mode 100644 index 0000000..5e60cfa --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html @@ -0,0 +1,101 @@ + + + + + + A Trivial Example + + + + + + + +
  Home

A Trivial Example
+

+

The application in this example has a log-view that displays messages sent by further instances of the same application.

+

The example demonstrates the use of the QtSingleApplication class to detect and communicate with a running instance of the application using the sendMessage() API. The messageReceived() signal is used to display received messages in a QTextEdit log.

+
 /****************************************************************************
+ **
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the Qt Solutions component.
+ **
+ ** You may use this file under the terms of the BSD license as follows:
+ **
+ ** "Redistribution and use in source and binary forms, with or without
+ ** modification, are permitted provided that the following conditions are
+ ** met:
+ **   * Redistributions of source code must retain the above copyright
+ **     notice, this list of conditions and the following disclaimer.
+ **   * Redistributions in binary form must reproduce the above copyright
+ **     notice, this list of conditions and the following disclaimer in
+ **     the documentation and/or other materials provided with the
+ **     distribution.
+ **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ **     the names of its contributors may be used to endorse or promote
+ **     products derived from this software without specific prior written
+ **     permission.
+ **
+ ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ **
+ ****************************************************************************/
+
+ #include <qtsingleapplication.h>
+ #include <QtGui/QTextEdit>
+
+ class TextEdit : public QTextEdit
+ {
+     Q_OBJECT
+ public:
+     TextEdit(QWidget *parent = 0)
+         : QTextEdit(parent)
+     {}
+ public slots:
+     void append(const QString &str)
+     {
+         QTextEdit::append(str);
+     }
+ };
+
+ #include "main.moc"
+
+ int main(int argc, char **argv)
+ {
+     QtSingleApplication instance(argc, argv);
+

The example has only the main entry point function. A QtSingleApplication object is created immediately.

+
     if (instance.sendMessage("Wake up!"))
+         return 0;
+

If another instance of this application is already running, sendMessage() will succeed, and this instance just exits immediately.

+
     TextEdit logview;
+     logview.setReadOnly(true);
+     logview.show();
+

Otherwise the instance continues as normal and creates the user interface.

+
     instance.setActivationWindow(&logview);
+
+     QObject::connect(&instance, SIGNAL(messageReceived(const QString&)),
+                      &logview, SLOT(append(const QString&)));
+
+     return instance.exec();
+

The logview object is also set as the application's activation window. Every time a message is received, the window will be raised and activated automatically.

+

The messageReceived() signal is also connected to the QTextEdit's append() slot. Every message received from further instances of this application will be displayed in the log.

+

Finally the event loop is entered.

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-members.html b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-members.html new file mode 100644 index 0000000..c995ce3 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-members.html @@ -0,0 +1,235 @@ + + + + + + List of All Members for QtSingleApplication + + + + + + + +
  Home

List of All Members for QtSingleApplication

+

This is the complete list of members for QtSingleApplication, including inherited members.

+

+ +
+

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-obsolete.html b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-obsolete.html new file mode 100644 index 0000000..0d07dfa --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication-obsolete.html @@ -0,0 +1,31 @@ + + + + + + Obsolete Members for QtSingleApplication + + + + + + + +
  Home

Obsolete Members for QtSingleApplication

+

The following class members are obsolete. They are provided to keep old source code working. We strongly advise against using them in new code.

+

+

Public Functions

+ + +
void initialize ( bool dummy = true )   (obsolete)
+
+

Member Function Documentation

+

void QtSingleApplication::initialize ( bool dummy = true )

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.dcf b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.dcf new file mode 100644 index 0000000..d81f87f --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.dcf @@ -0,0 +1,40 @@ + + +
+
+ QtSingleApplication + activateWindow + activationWindow + id + isRunning + messageReceived + sendMessage + setActivationWindow +
+
+
+
+ QtSingleCoreApplication + id + isRunning + messageReceived + sendMessage +
+
+
+
+
+ A non-GUI example +
+
+ A Trivial Example +
+
+ Loading Documents +
+
+ Single Application +
+
+
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.html b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.html new file mode 100644 index 0000000..2754a3b --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.html @@ -0,0 +1,162 @@ + + + + + + QtSingleApplication Class Reference + + + + + + + +
  Home

QtSingleApplication Class Reference

+

The QtSingleApplication class provides an API to detect and communicate with running instances of an application. More...

+
 #include <QtSingleApplication>

Inherits QApplication.

+ +
+ +

Public Functions

+ + + + + + + + + + + +
QtSingleApplication ( int & argc, char ** argv, bool GUIenabled = true )
QtSingleApplication ( const QString & appId, int & argc, char ** argv )
QtSingleApplication ( int & argc, char ** argv, Type type )
QtSingleApplication ( Display * dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )
QtSingleApplication ( Display * dpy, int & argc, char ** argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )
QtSingleApplication ( Display * dpy, const QString & appId, int argc, char ** argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )
QWidget * activationWindow () const
QString id () const
bool isRunning ()
void setActivationWindow ( QWidget * aw, bool activateOnMessage = true )
+ +
+ +

Public Slots

+ + + +
void activateWindow ()
bool sendMessage ( const QString & message, int timeout = 5000 )
+ +
+ +

Signals

+ + +
void messageReceived ( const QString & message )
+ +

Additional Inherited Members

+ + +
+

Detailed Description

+

The QtSingleApplication class provides an API to detect and communicate with running instances of an application.

+

This class allows you to create applications where only one instance should be running at a time. I.e., if the user tries to launch another instance, the already running instance will be activated instead. Another usecase is a client-server system, where the first started instance will assume the role of server, and the later instances will act as clients of that server.

+

By default, the full path of the executable file is used to determine whether two processes are instances of the same application. You can also provide an explicit identifier string that will be compared instead.

+

The application should create the QtSingleApplication object early in the startup phase, and call isRunning() to find out if another instance of this application is already running. If isRunning() returns false, it means that no other instance is running, and this instance has assumed the role as the running instance. In this case, the application should continue with the initialization of the application user interface before entering the event loop with exec(), as normal.

+

The messageReceived() signal will be emitted when the running application receives messages from another instance of the same application. When a message is received it might be helpful to the user to raise the application so that it becomes visible. To facilitate this, QtSingleApplication provides the setActivationWindow() function and the activateWindow() slot.

+

If isRunning() returns true, another instance is already running. It may be alerted to the fact that another instance has started by using the sendMessage() function. Also data such as startup parameters (e.g. the name of the file the user wanted this new instance to open) can be passed to the running instance with this function. Then, the application should terminate (or enter client mode).

+

If isRunning() returns true, but sendMessage() fails, that is an indication that the running instance is frozen.

+

Here's an example that shows how to convert an existing application to use QtSingleApplication. It is very simple and does not make use of all QtSingleApplication's functionality (see the examples for that).

+
 // Original
+ int main(int argc, char **argv)
+ {
+     QApplication app(argc, argv);
+
+     MyMainWidget mmw;
+     mmw.show();
+     return app.exec();
+ }
+
+ // Single instance
+ int main(int argc, char **argv)
+ {
+     QtSingleApplication app(argc, argv);
+
+     if (app.isRunning())
+         return !app.sendMessage(someDataString);
+
+     MyMainWidget mmw;
+     app.setActivationWindow(&mmw);
+     mmw.show();
+     return app.exec();
+ }
+

Once this QtSingleApplication instance is destroyed (normally when the process exits or crashes), when the user next attempts to run the application this instance will not, of course, be encountered. The next instance to call isRunning() or sendMessage() will assume the role as the new running instance.

+

For console (non-GUI) applications, QtSingleCoreApplication may be used instead of this class, to avoid the dependency on the QtGui library.

+

See also QtSingleCoreApplication.

+
+

Member Function Documentation

+

QtSingleApplication::QtSingleApplication ( int & argc, char ** argv, bool GUIenabled = true )

+

Creates a QtSingleApplication object. The application identifier will be QCoreApplication::applicationFilePath(). argc, argv, and GUIenabled are passed on to the QAppliation constructor.

+

If you are creating a console application (i.e. setting GUIenabled to false), you may consider using QtSingleCoreApplication instead.

+

QtSingleApplication::QtSingleApplication ( const QString & appId, int & argc, char ** argv )

+

Creates a QtSingleApplication object with the application identifier appId. argc and argv are passed on to the QAppliation constructor.

+

QtSingleApplication::QtSingleApplication ( int & argc, char ** argv, Type type )

+

Creates a QtSingleApplication object. The application identifier will be QCoreApplication::applicationFilePath(). argc, argv, and type are passed on to the QAppliation constructor.

+

QtSingleApplication::QtSingleApplication ( Display * dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )

+

Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier will be QCoreApplication::applicationFilePath(). dpy, visual, and cmap are passed on to the QApplication constructor.

+

QtSingleApplication::QtSingleApplication ( Display * dpy, int & argc, char ** argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )

+

Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier will be QCoreApplication::applicationFilePath(). dpy, argc, argv, visual, and cmap are passed on to the QApplication constructor.

+

QtSingleApplication::QtSingleApplication ( Display * dpy, const QString & appId, int argc, char ** argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0 )

+

Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier will be appId. dpy, argc, argv, visual, and cmap are passed on to the QApplication constructor.

+

void QtSingleApplication::activateWindow ()   [slot]

+

De-minimizes, raises, and activates this application's activation window. This function does nothing if no activation window has been set.

+

This is a convenience function to show the user that this application instance has been activated when he has tried to start another instance.

+

This function should typically be called in response to the messageReceived() signal. By default, that will happen automatically, if an activation window has been set.

+

See also setActivationWindow(), messageReceived(), and initialize().

+

QWidget * QtSingleApplication::activationWindow () const

+

Returns the applications activation window if one has been set by calling setActivationWindow(), otherwise returns 0.

+

See also setActivationWindow().

+

QString QtSingleApplication::id () const

+

Returns the application identifier. Two processes with the same identifier will be regarded as instances of the same application.

+

bool QtSingleApplication::isRunning ()

+

Returns true if another instance of this application is running; otherwise false.

+

This function does not find instances of this application that are being run by a different user (on Windows: that are running in another session).

+

See also sendMessage().

+

void QtSingleApplication::messageReceived ( const QString & message )   [signal]

+

This signal is emitted when the current instance receives a message from another instance of this application.

+

See also sendMessage(), setActivationWindow(), and activateWindow().

+

bool QtSingleApplication::sendMessage ( const QString & message, int timeout = 5000 )   [slot]

+

Tries to send the text message to the currently running instance. The QtSingleApplication object in the running instance will emit the messageReceived() signal when it receives the message.

+

This function returns true if the message has been sent to, and processed by, the current instance. If there is no instance currently running, or if the running instance fails to process the message within timeout milliseconds, this function return false.

+

See also isRunning() and messageReceived().

+

void QtSingleApplication::setActivationWindow ( QWidget * aw, bool activateOnMessage = true )

+

Sets the activation window of this application to aw. The activation window is the widget that will be activated by activateWindow(). This is typically the application's main window.

+

If activateOnMessage is true (the default), the window will be activated automatically every time a message is received, just prior to the messageReceived() signal being emitted.

+

See also activationWindow(), activateWindow(), and messageReceived().

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.index b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.index new file mode 100644 index 0000000..56052c2 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.index @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.qhp b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.qhp new file mode 100644 index 0000000..ff42d9d --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsingleapplication.qhp @@ -0,0 +1,53 @@ + + + com.nokia.qtsolutions.qtsingleapplication_head + qdoc + + qt + solutions + qtsingleapplication + + + qt + solutions + qtsingleapplication + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + qtsingleapplication.html + index.html + qtsingleapplication-example-trivial.html + qtsinglecoreapplication.html + qtsingleapplication-example-loader.html + qtsinglecoreapplication-example-console.html + classic.css + images/qt-logo.png + + + diff --git a/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html new file mode 100644 index 0000000..18a9ae8 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html @@ -0,0 +1,118 @@ + + + + + + A non-GUI example + + + + + + + +
  Home

A non-GUI example
+

+

This example shows how to use the single-application functionality in a console application. It does not require the QtGui library at all.

+

The only differences from the GUI application usage demonstrated in the other examples are:

+

1) The .pro file should include qtsinglecoreapplication.pri instead of qtsingleapplication.pri

+

2) The class name is QtSingleCoreApplication instead of QtSingleApplication.

+

3) No calls are made regarding window activation, for obvious reasons.

+

console.pro:

+
 TEMPLATE   = app
+ CONFIG    += console
+ SOURCES   += main.cpp
+ include(../../src/qtsinglecoreapplication.pri)
+ QT -= gui
+

main.cpp:

+
 /****************************************************************************
+ **
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the Qt Solutions component.
+ **
+ ** You may use this file under the terms of the BSD license as follows:
+ **
+ ** "Redistribution and use in source and binary forms, with or without
+ ** modification, are permitted provided that the following conditions are
+ ** met:
+ **   * Redistributions of source code must retain the above copyright
+ **     notice, this list of conditions and the following disclaimer.
+ **   * Redistributions in binary form must reproduce the above copyright
+ **     notice, this list of conditions and the following disclaimer in
+ **     the documentation and/or other materials provided with the
+ **     distribution.
+ **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ **     the names of its contributors may be used to endorse or promote
+ **     products derived from this software without specific prior written
+ **     permission.
+ **
+ ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ **
+ ****************************************************************************/
+
+ #include "qtsinglecoreapplication.h"
+ #include <QtCore/QDebug>
+
+ void report(const QString& msg)
+ {
+     qDebug("[%i] %s", (int)QCoreApplication::applicationPid(), qPrintable(msg));
+ }
+
+ class MainClass : public QObject
+ {
+     Q_OBJECT
+ public:
+     MainClass()
+         : QObject()
+         {}
+
+ public slots:
+     void handleMessage(const QString& message)
+         {
+             report( "Message received: \"" + message + "\"");
+         }
+ };
+
+ int main(int argc, char **argv)
+ {
+     report("Starting up");
+
+     QtSingleCoreApplication app(argc, argv);
+
+     if (app.isRunning()) {
+         QString msg(QString("Hi master, I am %1.").arg(QCoreApplication::applicationPid()));
+         bool sentok = app.sendMessage(msg, 2000);
+         QString rep("Another instance is running, so I will exit.");
+         rep += sentok ? " Message sent ok." : " Message sending failed; the other instance may be frozen.";
+         report(rep);
+         return 0;
+     } else {
+         report("No other instance is running; so I will.");
+         MainClass mainObj;
+         QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
+                          &mainObj, SLOT(handleMessage(const QString&)));
+         return app.exec();
+     }
+ }
+
+ #include "main.moc"
+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html new file mode 100644 index 0000000..69fb858 --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html @@ -0,0 +1,126 @@ + + + + + + List of All Members for QtSingleCoreApplication + + + + + + + +
  Home

List of All Members for QtSingleCoreApplication

+

This is the complete list of members for QtSingleCoreApplication, including inherited members.

+

+ +
+

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication.html b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication.html new file mode 100644 index 0000000..a20cf2f --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/html/qtsinglecoreapplication.html @@ -0,0 +1,98 @@ + + + + + + QtSingleCoreApplication Class Reference + + + + + + + +
  Home

QtSingleCoreApplication Class Reference

+

A variant of the QtSingleApplication class for non-GUI applications. More...

+
 #include <QtSingleCoreApplication>

Inherits QCoreApplication.

+ +
+ +

Public Functions

+ + + + + +
QtSingleCoreApplication ( int & argc, char ** argv )
QtSingleCoreApplication ( const QString & appId, int & argc, char ** argv )
QString id () const
bool isRunning ()
+ +
+ +

Public Slots

+ + +
bool sendMessage ( const QString & message, int timeout = 5000 )
+ +
+ +

Signals

+ + +
void messageReceived ( const QString & message )
+ +

Additional Inherited Members

+ + +
+

Detailed Description

+

A variant of the QtSingleApplication class for non-GUI applications.

+

This class is a variant of QtSingleApplication suited for use in console (non-GUI) applications. It is an extension of QCoreApplication (instead of QApplication). It does not require the QtGui library.

+

The API and usage is identical to QtSingleApplication, except that functions relating to the "activation window" are not present, for obvious reasons. Please refer to the QtSingleApplication documentation for explanation of the usage.

+

A QtSingleCoreApplication instance can communicate to a QtSingleApplication instance if they share the same application id. Hence, this class can be used to create a light-weight command-line tool that sends commands to a GUI application.

+

See also QtSingleApplication.

+
+

Member Function Documentation

+

QtSingleCoreApplication::QtSingleCoreApplication ( int & argc, char ** argv )

+

Creates a QtSingleCoreApplication object. The application identifier will be QCoreApplication::applicationFilePath(). argc and argv are passed on to the QCoreAppliation constructor.

+

QtSingleCoreApplication::QtSingleCoreApplication ( const QString & appId, int & argc, char ** argv )

+

Creates a QtSingleCoreApplication object with the application identifier appId. argc and argv are passed on to the QCoreAppliation constructor.

+

QString QtSingleCoreApplication::id () const

+

Returns the application identifier. Two processes with the same identifier will be regarded as instances of the same application.

+

bool QtSingleCoreApplication::isRunning ()

+

Returns true if another instance of this application is running; otherwise false.

+

This function does not find instances of this application that are being run by a different user (on Windows: that are running in another session).

+

See also sendMessage().

+

void QtSingleCoreApplication::messageReceived ( const QString & message )   [signal]

+

This signal is emitted when the current instance receives a message from another instance of this application.

+

See also sendMessage().

+

bool QtSingleCoreApplication::sendMessage ( const QString & message, int timeout = 5000 )   [slot]

+

Tries to send the text message to the currently running instance. The QtSingleCoreApplication object in the running instance will emit the messageReceived() signal when it receives the message.

+

This function returns true if the message has been sent to, and processed by, the current instance. If there is no instance currently running, or if the running instance fails to process the message within timeout milliseconds, this function return false.

+

See also isRunning() and messageReceived().

+

+ + + + +
Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Solutions
+ diff --git a/3rdparty/qtsingleapplication/doc/images/qt-logo.png b/3rdparty/qtsingleapplication/doc/images/qt-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..794162f5af58e7b38beebf472842fc9703ede19b GIT binary patch literal 4075 zcmb7H30qUw7R5$_N(2N2A__tfM8-gsp~yw0Ae4$j8GNEd2*JKmajJr%mxxR@0%4Fz zh&Z7IL~)=h5Fh~p1k*Z!Q$rYws0mUD$xZHghoL{<@qG#R<9@8O_u6}}y-voqt$vFa zEnlRep|RM1i_Z@D+Z}#3FZc?6-{g7xqM@N%>+iGihxm(;DgY3k-aPn11Axfo`?a#C zAK~-zfCHNU|HHlK<;yfyk@$a{ZO2UtDrwAOWqQqF>+KCnlgTxU%*`*|IM=l`i8yl@ zKf*|b$+MVjW(ND93}8Tt@DL)A=u5Op*Saz6YdjlB%g9R<02it=uE6Ad`2&6qoCNvD zl@+~yR)1w7;M7p`NWnm8{=m+B$a{~F1M*(&2JxCUW;E!R|F3# zf}`W}E#v8$?mqA>*|_izq0iwB6hcOZ)(lB4rndk9F?4#Oaxx{jvFA$rad)4y_VxJ0 zB4?EfH;Z&*O#vz3asg1`a!ka9$Ec$t>GY`KzGx#oNnUn;e!Ht5L8Wh{beozcnA)n81!3v{=okpw>LEPC*L;<|B4jBb#|gsooMmri`XeCDfw*X zlJ_T4Q89`(fC**w@d8|pbu|eDZNewKHpdnlhYpH$SB*t`&DyR?yAE4xq0N&{ew)xc zcGvvbZ1itsd!JH|S2NCazp3FA6%}^ZgK?ONn&(YVWv1y_X5&;9hDk+cTY3TDH8nML z@*%V}-^L0;^D68_5W2#ymEzd4y17lr>hWVFf`O5I;4*Q7Zs+K_dE-dn!~Ye@9-o1IQzuM|y+|q#yxI+F7g<#-f%X=IO4y=?2TtCI$iFiKzdtpk(7nn9bw0@R$i&xcf z!fzjP+KXVD^ZcVD_ii8%2ows%#lXeIU}8)fWF;;8ItJ@RP;lGn4xFIxa{L;FwGab^ zpBP5u35BZSQT^qddv*ju{f2)yQvrsv5x=Sq3?y+IsmP-#dq=nJ*}MBhVkCRLq_QUH zZk*5=zycbe!EKD*k~G!MyEy6Xij~ z?2h&|a&Y_TGWRu8k=0&KbMVzGXmtA2M9JvHn3!>$2m^+46vcok)8pmp7bS6`RS7BV zjE&n^U;5Q0@U@-LZd$OSBSV)x-KXT0+uf95QnU2!a0c%@N(p2I>UzEPRM2&)>)d7& zFb{`yp+!bceHlP_uD*LTf4Q-WhZ2dYy2xLrF?C7?dlZ>&eK0Y8w>};W^Llhi*=3r9 zWahb-P`AvN3*eHNp@JG-WPCai6UjKid&7&F^Yje?6pBWbatf0=>V$lP7-}GDYHn32 z+IzAh5bcB7-T{_Dehn8Nu6F#-U-p&78r1g#S@K_>1PwC=)VS1uz0!0J+kLT0InH4g z1)q&bpZ7XUA!=%psYN|p09xKS#Ky8vpi(LaObAu7Jc9z|XRLKxyS?xGq&U>8x_+Hx zgkx3}82dK1p5Lo86Kh^BRVT@bMEE)9+*2nf8909VtiIt7A@NB=xj{Iuc-0bicI5qe z8fMr2RIB|qxAR~Rfn>Dn-w2UE_Z|x8K18N z7_FEk@kKQ#DkMXyFiba~it1A9yHz^N~D}P zgiCdDa`HZTpHwA`6{tmAU~Ft$L>nDMpmNo4#h}^Q?A08Z4>O~qV(3%Y*t?M|(w2A2 zbPOG!j;G&+OBlx?wfvTj)W3&L;a|q#`eU(Jd8{dz>U6iis{U}11$(fpA)#60<8miw zNZ#%7yH0mEMisHgdqn7mst=wQ!w;U1<2I;Z)l&u>=FV)c&VGV?qeUTL;*u=$?m>{f ze<;SNpDw}Wz>H4+gw>(-;hu@%^?DU>EqE#t0rKC8EY?4B|8C!aW9>~XlbqnBAysK5 zY;+bYP|pNz`Lk}{0vucXV>+so?f%a;R$B51QdN3Fs$R$NH5^>uiQYhpjLAjmq_{b# z24SSq+J<*}^5qaz7#9~RRTVQO2aehXm9>{%)}Y+NLSr~%Cx9}GSxbcMiMc4W5?<=5 zgCpu?#~7I?T%;!R16e|pd>X{yUp|VgE$*)Tmmt`Q1>5PUVz{}y%bI+N_alsz1cizV zRQ-K4Ty=pd>E3SoQ?md;r(^%<2i~S|+cl)8EXy1yhhM!P?>yze|vqb~9wMixy zM{NG7vAg}jC$Hn#DMbo7N33_#+g?0+xMxRr?;Byt5b~@dLMm;1 ze5~)!>viIY+s=2Ee3&l7G)pmwNo=-cBny4bxM)QF^d?{P)|%3ve=A>X6K-B@U}a_H zOT7L}G+AfXbrSoisiiIF0u%+2db#@~M(Wq6y$+2={pg^R8H9+@sqsm;DyGF_(0&g6 z$lDZ%-k!xJ4tt8q-szN#99aFSM8e)*`E#2gvIw2+m!aZc%~@u2EW2N_-V2FxYN0dArh*_+owvm^SqV) zl9P3ucft8P7%CCJsY&l<>BQ&=Hdf>4rA!>_;h63Jxdrt4dOUn!tKQ4GUa<;tbv?u5Kfn8t~ ziA4$|31yN=F2Hdd8*@GSTQWN(qt&Og{Pl@N&=A6(+d32|NV9~rd<;pi%Q&!n^TjT{ zz{17?S~;;J7lDp`I(`fqRW28WNNTB3tbXeGwDS>X{6cat072$%rcoe+7c)w3* zdP+9npWyLl-7$3>a4$Ht)4Moy zS8?dZv)|>cj9Q*^)rM9(H(K>CnHdX@WWEPTD)-(ovehhtMPJB_*5K-xs|kfmrZ?R5 q^n7^PJomUfU@U$1kN?*do1n4%(BY1g{cSVe#sAx_KDRc}&ioHDn>RrK literal 0 HcmV?d00001 diff --git a/3rdparty/qtsingleapplication/doc/index.qdoc b/3rdparty/qtsingleapplication/doc/index.qdoc new file mode 100644 index 0000000..796dffe --- /dev/null +++ b/3rdparty/qtsingleapplication/doc/index.qdoc @@ -0,0 +1,50 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +/*! + \page index.html + \title Single Application + + \section1 Description + + The QtSingleApplication component provides support + for applications that can be only started once per user. + + + + For some applications it is useful or even critical that they are started + only once by any user. Future attempts to start the application should + activate any already running instance, and possibly perform requested + actions, e.g. loading a file, in that instance. + + The QtSingleApplication class provides an interface to detect a running + instance, and to send command strings to that instance. + For console (non-GUI) applications, the QtSingleCoreApplication variant is provided, which avoids dependency on QtGui. + + + + + \section1 Classes + \list + \i QtSingleApplication \i QtSingleCoreApplication\endlist + + \section1 Examples + \list + \i \link qtsingleapplication-example-trivial.html A Trivial Example \endlink \i \link qtsingleapplication-example-loader.html Loading Documents \endlink \i \link qtsinglecoreapplication-example-console.html A Non-GUI Example \endlink \endlist + + + + + + + \section1 Tested platforms + \list + \i Qt 4.4, 4.5 / Windows XP / MSVC.NET 2005 + \i Qt 4.4, 4.5 / Linux / gcc + \i Qt 4.4, 4.5 / MacOS X 10.5 / gcc + \endlist + + + + +*/ diff --git a/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp b/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp new file mode 100644 index 0000000..4720792 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp @@ -0,0 +1,169 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#include "qtlocalpeer.h" +#include +#include +#include +#include + +#if defined(Q_OS_WIN) +#include +#include +typedef BOOL(WINAPI *PProcessIdToSessionId)(DWORD, DWORD *); +static PProcessIdToSessionId pProcessIdToSessionId = 0; +#endif +#if defined(Q_OS_UNIX) +#include +#include +#include +#endif + +#include "qtlockedfile.h" + +const char *QtLocalPeer::ack = "ack"; + +QtLocalPeer::QtLocalPeer(QObject *parent, const QString &appId) + : QObject(parent), id(appId) { + QString prefix = id; + if (id.isEmpty()) { + id = QCoreApplication::applicationFilePath(); +#if defined(Q_OS_WIN) + id = id.toLower(); +#endif + prefix = id.section(QLatin1Char('/'), -1); + } + prefix.remove(QRegularExpression("[^a-zA-Z]")); + prefix.truncate(6); + + QByteArray idc = id.toUtf8(); + quint16 idNum = +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + qChecksum(idc); +#else + qChecksum(idc.constData(), idc.size()); +#endif + socketName = QLatin1String("qtsingleapp-") + prefix + QLatin1Char('-') + + QString::number(idNum, 16); + +#if defined(Q_OS_WIN) + if (!pProcessIdToSessionId) { + QLibrary lib("kernel32"); + pProcessIdToSessionId = + (PProcessIdToSessionId)lib.resolve("ProcessIdToSessionId"); + } + if (pProcessIdToSessionId) { + DWORD sessionId = 0; + pProcessIdToSessionId(GetCurrentProcessId(), &sessionId); + socketName += QLatin1Char('-') + QString::number(sessionId, 16); + } +#else + socketName += QLatin1Char('-') + QString::number(::getuid(), 16); +#endif + + server = new QLocalServer(this); + QString lockName = QDir(QDir::tempPath()).absolutePath() + + QLatin1Char('/') + socketName + + QLatin1String("-lockfile"); + lockFile.setFileName(lockName); + lockFile.open(QIODevice::ReadWrite); +} + +bool QtLocalPeer::isClient() { + if (lockFile.isLocked()) + return false; + + if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false)) + return true; + + bool res = server->listen(socketName); +#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)) + // ### Workaround + if (!res && server->serverError() == QAbstractSocket::AddressInUseError) { + QFile::remove(QDir::cleanPath(QDir::tempPath()) + QLatin1Char('/') + + socketName); + res = server->listen(socketName); + } +#endif + if (!res) + qWarning("QtSingleCoreApplication: listen on local socket failed, %s", + qPrintable(server->errorString())); + QObject::connect(server, SIGNAL(newConnection()), + SLOT(receiveConnection())); + return false; +} + +bool QtLocalPeer::sendMessage(const QByteArray &uMsg, int timeout) { + if (!isClient()) + return false; + + QLocalSocket socket; + bool connOk = false; + for (int i = 0; i < 2; i++) { + // Try twice, in case the other instance is just starting up + socket.connectToServer(socketName); + connOk = socket.waitForConnected(timeout / 2); + if (connOk || i) + break; + int ms = 250; +#if defined(Q_OS_WIN) + Sleep(DWORD(ms)); +#else + struct timespec ts = {ms / 1000, (ms % 1000) * 1000 * 1000}; + nanosleep(&ts, NULL); +#endif + } + if (!connOk) + return false; + + QDataStream ds(&socket); + ds.writeBytes(uMsg.constData(), uMsg.size()); + bool res = socket.waitForBytesWritten(timeout); + if (res) { + res &= socket.waitForReadyRead(timeout); // wait for ack + if (res) + res &= (socket.read(qstrlen(ack)) == ack); + } + return res; +} + +void QtLocalPeer::receiveConnection() { + QLocalSocket *socket = server->nextPendingConnection(); + if (!socket) + return; + + while (true) { + if (socket->state() == QLocalSocket::UnconnectedState) { + qWarning("QtLocalPeer: Peer disconnected"); + delete socket; + return; + } + if (socket->bytesAvailable() >= qint64(sizeof(quint32))) + break; + socket->waitForReadyRead(); + } + + QDataStream ds(socket); + QByteArray uMsg; + quint32 remaining; + ds >> remaining; + uMsg.resize(remaining); + int got = 0; + char *uMsgBuf = uMsg.data(); + do { + got = ds.readRawData(uMsgBuf, remaining); + remaining -= got; + uMsgBuf += got; + } while (remaining && got >= 0 && socket->waitForReadyRead(2000)); + if (got < 0) { + qWarning("QtLocalPeer: Message reception failed %s", + socket->errorString().toLatin1().constData()); + delete socket; + return; + } + socket->write(ack, qstrlen(ack)); + socket->waitForBytesWritten(1000); + socket->waitForDisconnected(1000); // make sure client reads ack + delete socket; + emit messageReceived(uMsg); // ### (might take a long time to return) +} diff --git a/3rdparty/qtsingleapplication/src/qtlocalpeer.h b/3rdparty/qtsingleapplication/src/qtlocalpeer.h new file mode 100644 index 0000000..6bdb303 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtlocalpeer.h @@ -0,0 +1,38 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#ifndef QTLOCALPEER_H +#define QTLOCALPEER_H + +#include +#include +#include + +#include "qtlockedfile.h" + +class QtLocalPeer : public QObject { + Q_OBJECT + +public: + QtLocalPeer(QObject *parent = nullptr, const QString &appId = QString()); + bool isClient(); + bool sendMessage(const QByteArray &uMsg, int timeout); + QString applicationId() const { return id; } + +Q_SIGNALS: + void messageReceived(const QByteArray &message); + +protected Q_SLOTS: + void receiveConnection(); + +protected: + QString id; + QString socketName; + QLocalServer *server; + QtLP_Private::QtLockedFile lockFile; + +private: + static const char *ack; +}; + +#endif // QTLOCALPEER_H diff --git a/3rdparty/qtsingleapplication/src/qtlockedfile.cpp b/3rdparty/qtsingleapplication/src/qtlockedfile.cpp new file mode 100644 index 0000000..247c9bf --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtlockedfile.cpp @@ -0,0 +1,325 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#include "qtlockedfile.h" + +#ifdef Q_OS_WIN + +#include + +#define MUTEX_PREFIX "QtLockedFile mutex " +// Maximum number of concurrent read locks. Must not be greater than +// MAXIMUM_WAIT_OBJECTS +#define MAX_READERS MAXIMUM_WAIT_OBJECTS + +#if QT_VERSION >= 0x050000 +#define QT_WA(unicode, ansi) unicode +#endif + +#include + +#else +#include +#include +#include +#include +#endif + +using namespace QtLP_Private; + +#ifdef Q_OS_WIN +Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate) { + if (mutexname.isEmpty()) { + QFileInfo fi(*this); + mutexname = + QString::fromLatin1(MUTEX_PREFIX) + fi.absoluteFilePath().toLower(); + } + QString mname(mutexname); + if (idx >= 0) + mname += QString::number(idx); + + Qt::HANDLE mutex; + if (doCreate) { + QT_WA({ mutex = CreateMutexW(NULL, FALSE, LPCWSTR(mname.utf16())); }, + { + mutex = CreateMutexA(NULL, FALSE, + mname.toLocal8Bit().constData()); + }); + if (!mutex) { + qErrnoWarning("QtLockedFile::lock(): CreateMutex failed"); + return 0; + } + } else { + QT_WA( + { + mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, + LPCWSTR(mname.utf16())); + }, + { + mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, + mname.toLocal8Bit().constData()); + }); + if (!mutex) { + if (GetLastError() != ERROR_FILE_NOT_FOUND) + qErrnoWarning("QtLockedFile::lock(): OpenMutex failed"); + return 0; + } + } + return mutex; +} + +bool QtLockedFile::waitMutex(Qt::HANDLE mutex, bool doBlock) { + Q_ASSERT(mutex); + DWORD res = WaitForSingleObject(mutex, doBlock ? INFINITE : 0); + switch (res) { + case WAIT_OBJECT_0: + case WAIT_ABANDONED: + return true; + break; + case WAIT_TIMEOUT: + break; + default: + qErrnoWarning("QtLockedFile::lock(): WaitForSingleObject failed"); + } + return false; +} +#endif + +/*! + \class QtLockedFile + + \brief The QtLockedFile class extends QFile with advisory locking + functions. + + A file may be locked in read or write mode. Multiple instances of + \e QtLockedFile, created in multiple processes running on the same + machine, may have a file locked in read mode. Exactly one instance + may have it locked in write mode. A read and a write lock cannot + exist simultaneously on the same file. + + The file locks are advisory. This means that nothing prevents + another process from manipulating a locked file using QFile or + file system functions offered by the OS. Serialization is only + guaranteed if all processes that access the file use + QLockedFile. Also, while holding a lock on a file, a process + must not open the same file again (through any API), or locks + can be unexpectedly lost. + + The lock provided by an instance of \e QtLockedFile is released + whenever the program terminates. This is true even when the + program crashes and no destructors are called. +*/ + +/*! \enum QtLockedFile::LockMode + + This enum describes the available lock modes. + + \value ReadLock A read lock. + \value WriteLock A write lock. + \value NoLock Neither a read lock nor a write lock. +*/ + +/*! + Constructs an unlocked \e QtLockedFile object. This constructor + behaves in the same way as \e QFile::QFile(). + + \sa QFile::QFile() +*/ +QtLockedFile::QtLockedFile() : QFile() { +#ifdef Q_OS_WIN + wmutex = nullptr; + rmutex = nullptr; +#endif + m_lock_mode = NoLock; +} + +/*! + Constructs an unlocked QtLockedFile object with file \a name. This + constructor behaves in the same way as \e QFile::QFile(const + QString&). + + \sa QFile::QFile() +*/ +QtLockedFile::QtLockedFile(const QString &name) : QFile(name) { +#ifdef Q_OS_WIN + wmutex = nullptr; + rmutex = nullptr; +#endif + m_lock_mode = NoLock; +} + +bool QtLockedFile::lock(LockMode mode, bool block) { + if (!isOpen()) { + qWarning("QtLockedFile::lock(): file is not opened"); + return false; + } + + if (mode == NoLock) + return unlock(); + + if (mode == m_lock_mode) + return true; + + if (m_lock_mode != NoLock) + unlock(); + +#ifdef Q_OS_WIN + if (!wmutex && !(wmutex = getMutexHandle(-1, true))) + return false; + + if (!waitMutex(wmutex, block)) + return false; + + if (mode == ReadLock) { + int idx = 0; + for (; idx < MAX_READERS; idx++) { + rmutex = getMutexHandle(idx, false); + if (!rmutex || waitMutex(rmutex, false)) + break; + CloseHandle(rmutex); + } + bool ok = true; + if (idx >= MAX_READERS) { + qWarning("QtLockedFile::lock(): too many readers"); + rmutex = 0; + ok = false; + } else if (!rmutex) { + rmutex = getMutexHandle(idx, true); + if (!rmutex || !waitMutex(rmutex, false)) + ok = false; + } + if (!ok && rmutex) { + CloseHandle(rmutex); + rmutex = 0; + } + ReleaseMutex(wmutex); + if (!ok) + return false; + } else { + Q_ASSERT(rmutexes.isEmpty()); + for (int i = 0; i < MAX_READERS; i++) { + Qt::HANDLE mutex = getMutexHandle(i, false); + if (mutex) + rmutexes.append(mutex); + } + if (rmutexes.size()) { + DWORD res = + WaitForMultipleObjects(rmutexes.size(), rmutexes.constData(), + TRUE, block ? INFINITE : 0); + if (res != WAIT_OBJECT_0 && res != WAIT_ABANDONED) { + if (res != WAIT_TIMEOUT) + qErrnoWarning( + "QtLockedFile::lock(): WaitForMultipleObjects failed"); + m_lock_mode = + WriteLock; // trick unlock() to clean up - semiyucky + unlock(); + return false; + } + } + } +#else + struct flock fl; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK; + int cmd = block ? F_SETLKW : F_SETLK; + int ret = fcntl(handle(), cmd, &fl); + + if (ret == -1) { + if (errno != EINTR && errno != EAGAIN) + qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); + return false; + } +#endif + + m_lock_mode = mode; + return true; +} + +bool QtLockedFile::unlock() { + if (!isOpen()) { + qWarning("QtLockedFile::unlock(): file is not opened"); + return false; + } + + if (!isLocked()) + return true; + +#ifdef Q_OS_WIN + if (m_lock_mode == ReadLock) { + ReleaseMutex(rmutex); + CloseHandle(rmutex); + rmutex = 0; + } else { + foreach (Qt::HANDLE mutex, rmutexes) { + ReleaseMutex(mutex); + CloseHandle(mutex); + } + rmutexes.clear(); + ReleaseMutex(wmutex); + } +#else + struct flock fl; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + fl.l_type = F_UNLCK; + int ret = fcntl(handle(), F_SETLKW, &fl); + + if (ret == -1) { + qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); + return false; + } +#endif + + m_lock_mode = NoLock; + return true; +} + +QtLockedFile::~QtLockedFile() { + if (isOpen()) + unlock(); + +#ifdef Q_OS_WIN + if (wmutex) + CloseHandle(wmutex); +#endif +} + +/*! + Returns \e true if this object has a in read or write lock; + otherwise returns \e false. + + \sa lockMode() +*/ +bool QtLockedFile::isLocked() const { return m_lock_mode != NoLock; } + +/*! + Returns the type of lock currently held by this object, or \e + QtLockedFile::NoLock. + + \sa isLocked() +*/ +QtLockedFile::LockMode QtLockedFile::lockMode() const { return m_lock_mode; } + +/*! + Opens the file in OpenMode \a mode. + +This is identical to QFile::open(), with the one exception that the +Truncate mode flag is disallowed. Truncation would conflict with the +advisory file locking, since the file would be modified before the +write lock is obtained. If truncation is required, use resize(0) +after obtaining the write lock. + +Returns true if successful; otherwise false. + +\sa QFile::open(), QFile::resize() +*/ +bool QtLockedFile::open(OpenMode mode) { + if (mode & QIODevice::Truncate) { + qWarning("QtLockedFile::open(): Truncate mode not allowed."); + return false; + } + return QFile::open(mode); +} diff --git a/3rdparty/qtsingleapplication/src/qtlockedfile.h b/3rdparty/qtsingleapplication/src/qtlockedfile.h new file mode 100644 index 0000000..8e04c01 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtlockedfile.h @@ -0,0 +1,43 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#ifndef QTLOCKEDFILE_H +#define QTLOCKEDFILE_H + +#include +#ifdef Q_OS_WIN +#include +#endif + +namespace QtLP_Private { + +class QtLockedFile : public QFile { +public: + enum LockMode { NoLock = 0, ReadLock, WriteLock }; + + QtLockedFile(); + QtLockedFile(const QString &name); + ~QtLockedFile(); + + bool open(OpenMode mode); + + bool lock(LockMode mode, bool block = true); + bool unlock(); + bool isLocked() const; + LockMode lockMode() const; + +private: +#ifdef Q_OS_WIN + Qt::HANDLE wmutex; + Qt::HANDLE rmutex; + QVector rmutexes; + QString mutexname; + + Qt::HANDLE getMutexHandle(int idx, bool doCreate); + bool waitMutex(Qt::HANDLE mutex, bool doBlock); + +#endif + LockMode m_lock_mode; +}; +} // namespace QtLP_Private +#endif diff --git a/3rdparty/qtsingleapplication/src/qtsingleapplication.cpp b/3rdparty/qtsingleapplication/src/qtsingleapplication.cpp new file mode 100644 index 0000000..26db1f0 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtsingleapplication.cpp @@ -0,0 +1,303 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#include "qtsingleapplication.h" +#include "qtlocalpeer.h" +#include + +#include + +#ifdef Q_OS_UNIX +#include +#include +#include +#endif + +#ifdef Q_OS_WIN +#ifndef NOMINMAX +#define NOMINMAX 1 +#endif +#include +#include +#endif + +/*! + \class QtSingleApplication qtsingleapplication.h + \brief The QtSingleApplication class provides an API to detect and + communicate with running instances of an application. + + This class allows you to create applications where only one + instance should be running at a time. I.e., if the user tries to + launch another instance, the already running instance will be + activated instead. Another usecase is a client-server system, + where the first started instance will assume the role of server, + and the later instances will act as clients of that server. + + By default, the full path of the executable file is used to + determine whether two processes are instances of the same + application. You can also provide an explicit identifier string + that will be compared instead. + + The application should create the QtSingleApplication object early + in the startup phase, and call isRunning() to find out if another + instance of this application is already running. If isRunning() + returns false, it means that no other instance is running, and + this instance has assumed the role as the running instance. In + this case, the application should continue with the initialization + of the application user interface before entering the event loop + with exec(), as normal. + + The messageReceived() signal will be emitted when the running + application receives messages from another instance of the same + application. When a message is received it might be helpful to the + user to raise the application so that it becomes visible. To + facilitate this, QtSingleApplication provides the + setActivationWindow() function and the activateWindow() slot. + + If isRunning() returns true, another instance is already + running. It may be alerted to the fact that another instance has + started by using the sendMessage() function. Also data such as + startup parameters (e.g. the name of the file the user wanted this + new instance to open) can be passed to the running instance with + this function. Then, the application should terminate (or enter + client mode). + + If isRunning() returns true, but sendMessage() fails, that is an + indication that the running instance is frozen. + + Here's an example that shows how to convert an existing + application to use QtSingleApplication. It is very simple and does + not make use of all QtSingleApplication's functionality (see the + examples for that). + + \code + // Original + int main(int argc, char **argv) + { + QApplication app(argc, argv); + + MyMainWidget mmw; + mmw.show(); + return app.exec(); + } + + // Single instance + int main(int argc, char **argv) + { + QtSingleApplication app(argc, argv); + + if (app.isRunning()) + return !app.sendMessage(someDataString); + + MyMainWidget mmw; + app.setActivationWindow(&mmw); + mmw.show(); + return app.exec(); + } + \endcode + + Once this QtSingleApplication instance is destroyed (normally when + the process exits or crashes), when the user next attempts to run the + application this instance will not, of course, be encountered. The + next instance to call isRunning() or sendMessage() will assume the + role as the new running instance. + + For console (non-GUI) applications, QtSingleCoreApplication may be + used instead of this class, to avoid the dependency on the QtGui + library. + + \sa QtSingleCoreApplication +*/ + +void QtSingleApplication::sysInit(const QString &appId) { + actWin = nullptr; + + peer = new QtLocalPeer(this, appId); + connect(peer, &QtLocalPeer::messageReceived, this, + &QtSingleApplication::messageReceived); +} + +/*! + Creates a QtSingleApplication object. The application identifier + will be QCoreApplication::applicationFilePath(). \a argc, \a + argv, and \a GUIenabled are passed on to the QAppliation constructor. + + If you are creating a console application (i.e. setting \a + GUIenabled to false), you may consider using + QtSingleCoreApplication instead. +*/ + +QtSingleApplication::QtSingleApplication(int &argc, char **argv, + bool GUIenabled) + : QApplication(argc, argv, GUIenabled) { + sysInit(genBlockServerName()); +} + +/*! + Creates a QtSingleApplication object with the application + identifier \a appId. \a argc and \a argv are passed on to the + QAppliation constructor. +*/ + +QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, + char **argv) + : QApplication(argc, argv) { + sysInit(appId); +} + +/*! + Returns true if another instance of this application is running; + otherwise false. + + This function does not find instances of this application that are + being run by a different user (on Windows: that are running in + another session). + + \sa sendMessage() +*/ + +bool QtSingleApplication::isRunning() { return peer->isClient(); } + +/*! + Tries to send the text \a message to the currently running + instance. The QtSingleApplication object in the running instance + will emit the messageReceived() signal when it receives the + message. + + This function returns true if the message has been sent to, and + processed by, the current instance. If there is no instance + currently running, or if the running instance fails to process the + message within \a timeout milliseconds, this function return false. + + \sa isRunning(), messageReceived() +*/ +bool QtSingleApplication::sendMessage(const QByteArray &message, int timeout) { + return peer->sendMessage(message, timeout); +} + +/*! + Returns the application identifier. Two processes with the same + identifier will be regarded as instances of the same application. +*/ +QString QtSingleApplication::id() const { return peer->applicationId(); } + +/*! + Sets the activation window of this application to \a aw. The + activation window is the widget that will be activated by + activateWindow(). This is typically the application's main window. + + If \a activateOnMessage is true (the default), the window will be + activated automatically every time a message is received, just prior + to the messageReceived() signal being emitted. + + \sa activateWindow(), messageReceived() +*/ + +void QtSingleApplication::setActivationWindow(QWidget *aw, + bool activateOnMessage) { + actWin = aw; + if (activateOnMessage) + connect(peer, &QtLocalPeer::messageReceived, this, + &QtSingleApplication::activateWindow); + else + disconnect(peer, &QtLocalPeer::messageReceived, this, + &QtSingleApplication::activateWindow); +} + +/*! + Returns the applications activation window if one has been set by + calling setActivationWindow(), otherwise returns 0. + + \sa setActivationWindow() +*/ +QWidget *QtSingleApplication::activationWindow() const { return actWin; } + +/*! + De-minimizes, raises, and activates this application's activation window. + This function does nothing if no activation window has been set. + + This is a convenience function to show the user that this + application instance has been activated when he has tried to start + another instance. + + This function should typically be called in response to the + messageReceived() signal. By default, that will happen + automatically, if an activation window has been set. + + \sa setActivationWindow(), messageReceived(), initialize() +*/ +void QtSingleApplication::activateWindow() { + if (actWin) { + actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized); + actWin->raise(); + actWin->activateWindow(); + } +} + +QString QtSingleApplication::genBlockServerName() const { +#ifdef Q_OS_MACOS + // Maximum key size on macOS is PSHMNAMLEN (31). + QCryptographicHash appData(QCryptographicHash::Md5); +#else + QCryptographicHash appData(QCryptographicHash::Sha256); +#endif +#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0) + appData.addData("SingleApplication", 17); +#else + appData.addData(QByteArrayView{"SingleApplication"}); +#endif + appData.addData(applicationName().toUtf8()); + appData.addData(organizationName().toUtf8()); + appData.addData(organizationDomain().toUtf8()); + + // User level block requires a user specific data in the hash + appData.addData(getUsername().toUtf8()); + + // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with + // server naming requirements. + return QString::fromUtf8(appData.result().toBase64().replace("/", "_")); +} + +/*! + \fn void QtSingleApplication::messageReceived(const QString& message) + + This signal is emitted when the current instance receives a \a + message from another instance of this application. + + \sa sendMessage(), setActivationWindow(), activateWindow() +*/ + +/*! + \fn void QtSingleApplication::initialize(bool dummy = true) + + \obsolete +*/ +QString QtSingleApplication::getUsername() const { +#ifdef Q_OS_WIN + wchar_t username[UNLEN + 1]; + // Specifies size of the buffer on input + DWORD usernameLength = UNLEN + 1; + if (GetUserNameW(username, &usernameLength)) + return QString::fromWCharArray(username); +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + return QString::fromLocal8Bit(qgetenv("USERNAME")); +#else + return qEnvironmentVariable("USERNAME"); +#endif +#endif +#ifdef Q_OS_UNIX + QString username; + uid_t uid = geteuid(); + struct passwd *pw = getpwuid(uid); + if (pw) + username = QString::fromLocal8Bit(pw->pw_name); + if (username.isEmpty()) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + username = QString::fromLocal8Bit(qgetenv("USER")); +#else + username = qEnvironmentVariable("USER"); +#endif + } + return username; +#endif +} diff --git a/3rdparty/qtsingleapplication/src/qtsingleapplication.h b/3rdparty/qtsingleapplication/src/qtsingleapplication.h new file mode 100644 index 0000000..f494cbf --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtsingleapplication.h @@ -0,0 +1,49 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#ifndef QTSINGLEAPPLICATION_H +#define QTSINGLEAPPLICATION_H + +#include + +class QtLocalPeer; + +class QtSingleApplication : public QApplication { + Q_OBJECT + +public: + explicit QtSingleApplication(int &argc, char **argv, + bool GUIenabled = true); + explicit QtSingleApplication(const QString &id, int &argc, char **argv); + +public: + bool isRunning(); + QString id() const; + + void setActivationWindow(QWidget *aw, bool activateOnMessage = true); + QWidget *activationWindow() const; + + // Obsolete: + void initialize(bool dummy = true) { + isRunning(); + Q_UNUSED(dummy) + } + +public Q_SLOTS: + bool sendMessage(const QByteArray &message, int timeout = 5000); + void activateWindow(); + +Q_SIGNALS: + void messageReceived(const QByteArray &message); + +private: + QString genBlockServerName() const; + QString getUsername() const; + +private: + void sysInit(const QString &appId); + QtLocalPeer *peer; + QWidget *actWin; +}; + +#endif // QTSINGLEAPPLICATION_H diff --git a/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.cpp b/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.cpp new file mode 100644 index 0000000..7a35114 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.cpp @@ -0,0 +1,101 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#include "qtsinglecoreapplication.h" +#include "qtlocalpeer.h" + +/*! + \class QtSingleCoreApplication qtsinglecoreapplication.h + \brief A variant of the QtSingleApplication class for non-GUI applications. + + This class is a variant of QtSingleApplication suited for use in + console (non-GUI) applications. It is an extension of + QCoreApplication (instead of QApplication). It does not require + the QtGui library. + + The API and usage is identical to QtSingleApplication, except that + functions relating to the "activation window" are not present, for + obvious reasons. Please refer to the QtSingleApplication + documentation for explanation of the usage. + + A QtSingleCoreApplication instance can communicate to a + QtSingleApplication instance if they share the same application + id. Hence, this class can be used to create a light-weight + command-line tool that sends commands to a GUI application. + + \sa QtSingleApplication +*/ + +/*! + Creates a QtSingleCoreApplication object. The application identifier + will be QCoreApplication::applicationFilePath(). \a argc and \a + argv are passed on to the QCoreAppliation constructor. +*/ + +QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv) + : QCoreApplication(argc, argv) { + peer = new QtLocalPeer(this); + connect(peer, SIGNAL(messageReceived(const QString &)), + SIGNAL(messageReceived(const QString &))); +} + +/*! + Creates a QtSingleCoreApplication object with the application + identifier \a appId. \a argc and \a argv are passed on to the + QCoreAppliation constructor. +*/ +QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, + int &argc, char **argv) + : QCoreApplication(argc, argv) { + peer = new QtLocalPeer(this, appId); + connect(peer, SIGNAL(messageReceived(const QString &)), + SIGNAL(messageReceived(const QString &))); +} + +/*! + Returns true if another instance of this application is running; + otherwise false. + + This function does not find instances of this application that are + being run by a different user (on Windows: that are running in + another session). + + \sa sendMessage() +*/ + +bool QtSingleCoreApplication::isRunning() { return peer->isClient(); } + +/*! + Tries to send the text \a message to the currently running + instance. The QtSingleCoreApplication object in the running instance + will emit the messageReceived() signal when it receives the + message. + + This function returns true if the message has been sent to, and + processed by, the current instance. If there is no instance + currently running, or if the running instance fails to process the + message within \a timeout milliseconds, this function return false. + + \sa isRunning(), messageReceived() +*/ + +bool QtSingleCoreApplication::sendMessage(const QByteArray &message, + int timeout) { + return peer->sendMessage(message, timeout); +} + +/*! + Returns the application identifier. Two processes with the same + identifier will be regarded as instances of the same application. +*/ + +QString QtSingleCoreApplication::id() const { return peer->applicationId(); } + +/*! + \fn void QtSingleCoreApplication::messageReceived(const QString& message) + + This signal is emitted when the current instance receives a \a + message from another instance of this application. + + \sa sendMessage() +*/ diff --git a/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.h b/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.h new file mode 100644 index 0000000..15c9f83 --- /dev/null +++ b/3rdparty/qtsingleapplication/src/qtsinglecoreapplication.h @@ -0,0 +1,31 @@ +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// SPDX-License-Identifier: BSD-3-Clause + +#ifndef QTSINGLECOREAPPLICATION_H +#define QTSINGLECOREAPPLICATION_H + +#include + +class QtLocalPeer; + +class QtSingleCoreApplication : public QCoreApplication { + Q_OBJECT + +public: + QtSingleCoreApplication(int &argc, char **argv); + QtSingleCoreApplication(const QString &id, int &argc, char **argv); + + bool isRunning(); + QString id() const; + +public Q_SLOTS: + bool sendMessage(const QByteArray &message, int timeout = 5000); + +Q_SIGNALS: + void messageReceived(const QString &message); + +private: + QtLocalPeer *peer; +}; + +#endif // QTSINGLECOREAPPLICATION_H diff --git a/CMakeLists.txt b/CMakeLists.txt index 182e349..a1e2607 100644 --- a/CMakeLists.txt +++ b/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.0.0-beta") +set(PROJECT_VERSION "2.0.0") find_package( QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network Concurrent @@ -99,10 +99,7 @@ set(ANGEL_SCRIPT_ADDON ${ANGEL_SCRIPT_ADDON_ROOT}/weakref/weakref.cpp ${ANGEL_SCRIPT_ADDON_ROOT}/weakref/weakref.h) -set(QAPPLICATION_CLASS - QApplication - CACHE STRING "Inheritance class for SingleApplication") -add_subdirectory(3rdparty/SingleApplication) +add_subdirectory(3rdparty/qtsingleapplication) set(RIBBON_SRC 3rdparty/QWingRibbon/ribbon.cpp @@ -121,7 +118,9 @@ set(QCONSOLEWIDGET_SRC 3rdparty/QConsoleWidget/QConsoleIODevice.cpp 3rdparty/QConsoleWidget/QConsoleIODevice.h 3rdparty/QConsoleWidget/QConsoleWidget.cpp - 3rdparty/QConsoleWidget/QConsoleWidget.h) + 3rdparty/QConsoleWidget/QConsoleWidget.h + 3rdparty/QConsoleWidget/commandhistorymanager.h + 3rdparty/QConsoleWidget/commandhistorymanager.cpp) set(DIALOG_SRC src/dialog/framelessmainwindow.h @@ -251,7 +250,9 @@ set(CLASS_SRC src/class/aspreprocesser.h src/class/aspreprocesser.cpp src/class/layoutmanager.h - src/class/layoutmanager.cpp) + src/class/layoutmanager.cpp + src/class/wingupdater.h + src/class/wingupdater.cpp) if(WINGHEX_USE_FRAMELESS) set(WIDGET_FRAME_SRC @@ -366,7 +367,6 @@ set(TRANSLATION_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qcodeedit2 ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/Qt-Advanced-Docking-System/src ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QWingRibbon - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SingleApplication ${CMAKE_CURRENT_SOURCE_DIR}/src) if(${QT_VERSION_MAJOR} EQUAL 5) qt5_create_translation(QM_FILES ${TRANSLATION_PATH} ${TS_FILES} OPTIONS @@ -486,7 +486,7 @@ if(WINGHEX_USE_FRAMELESS) Qt${QT_VERSION_MAJOR}::GuiPrivate Qt${QT_VERSION_MAJOR}::CorePrivate Qt${QT_VERSION_MAJOR}::Xml - SingleApplication::SingleApplication + QtSingleApplication::QtSingleApplication QWKCore QWKWidgets QHexView @@ -505,7 +505,7 @@ else() Qt${QT_VERSION_MAJOR}::GuiPrivate Qt${QT_VERSION_MAJOR}::CorePrivate Qt${QT_VERSION_MAJOR}::Xml - SingleApplication::SingleApplication + QtSingleApplication::QtSingleApplication QHexView QCodeEditor2 QJsonModel diff --git a/TestPlugin/CMakeLists.txt b/TestPlugin/CMakeLists.txt index 8d8e274..d7954f8 100644 --- a/TestPlugin/CMakeLists.txt +++ b/TestPlugin/CMakeLists.txt @@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_INCLUDE_CURRENT_DIR TRUE) + # Test mode, please configure the main program directory to facilitate debugging # 测试模式，启用请配置主程序目录，方便调试 @@ -87,7 +89,13 @@ add_library( ctltestform.cpp ctltestform.ui testtablemodel.h - testtablemodel.cpp) + testtablemodel.cpp + testsettingpage.h + testsettingpage.cpp + testwingeditorviewwidget.h + testwingeditorviewwidget.cpp + testpluginpage.h + testpluginpage.cpp) set_target_properties(TestPlugin PROPERTIES SUFFIX ".wingplg") diff --git a/TestPlugin/ctltestform.cpp b/TestPlugin/ctltestform.cpp index 6d2b828..244ba52 100644 --- a/TestPlugin/ctltestform.cpp +++ b/TestPlugin/ctltestform.cpp @@ -133,9 +133,10 @@ void CtlTestForm::on_btnInt64_clicked() { void CtlTestForm::on_btnFloat_clicked() { bool ok; - auto ret = emit _plg->inputbox.getDouble(this, QStringLiteral("Test"), - tr("PleaseInputFloat"), 0, FLT_MIN, - FLT_MAX, 0.0, &ok); + auto limit = std::numeric_limits(); + auto ret = emit _plg->inputbox.getDouble( + this, QStringLiteral("Test"), tr("PleaseInputFloat"), 0, limit.min(), + limit.max(), 0.0, &ok); if (ok) { auto buffer = float(ret); if (ui->rbInsert->isChecked()) { @@ -158,9 +159,10 @@ void CtlTestForm::on_btnFloat_clicked() { void CtlTestForm::on_btnDouble_clicked() { bool ok; - auto ret = emit _plg->inputbox.getDouble(this, QStringLiteral("Test"), - tr("PleaseInputFloat"), 0, DBL_MIN, - DBL_MAX, 0.0, &ok); + auto limit = std::numeric_limits(); + auto ret = emit _plg->inputbox.getDouble( + this, QStringLiteral("Test"), tr("PleaseInputFloat"), 0, limit.min(), + limit.max(), 0.0, &ok); if (ok) { auto buffer = double(ret); if (ui->rbInsert->isChecked()) { diff --git a/TestPlugin/lang/TestPlugin_zh_CN.ts b/TestPlugin/lang/TestPlugin_zh_CN.ts index e39b1cc..c0b34b9 100644 --- a/TestPlugin/lang/TestPlugin_zh_CN.ts +++ b/TestPlugin/lang/TestPlugin_zh_CN.ts @@ -54,18 +54,18 @@ 请输入64位整数 - - + + PleaseInputFloat 请输入单精度浮点数 - + PleaseInputString 请输入字符串 - + PleaseInputByteArray(00 23 5A) 请输入字节数组（举例：00 23 5A） @@ -316,32 +316,48 @@ TestPlugin - + Test 测试 - - - - + + + + TestPlugin 测试插件 - + Button - 按钮 - - + Click 点击 - + A Test Plugin for WingHexExplorer2. 一个用来测试羽云十六进制编辑器2的插件 + + TestPluginPage + + + TestPluginPage + 测试插件页 + + + + TestWingEditorViewWidget + + + TestWingEditorView + 测试插件编辑视图 + + diff --git a/TestPlugin/testform.ui b/TestPlugin/testform.ui index d211a33..69fb7dc 100644 --- a/TestPlugin/testform.ui +++ b/TestPlugin/testform.ui @@ -23,7 +23,7 @@ - 4 + 0 @@ -57,7 +57,7 @@ Tip: MaybeCanNotSeen - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -237,7 +237,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -257,7 +257,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -268,8 +268,8 @@ 0 0 - 570 - 49 + 566 + 58 @@ -312,7 +312,7 @@ - QLayout::SetMinAndMaxSize + QLayout::SizeConstraint::SetMinAndMaxSize @@ -388,7 +388,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -408,7 +408,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -419,8 +419,8 @@ 0 0 - 570 - 49 + 566 + 58 @@ -459,7 +459,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -814,7 +814,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -834,7 +834,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -883,7 +883,7 @@ - QLayout::SetMinAndMaxSize + QLayout::SizeConstraint::SetMinAndMaxSize @@ -891,7 +891,7 @@ WingSummer - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -998,7 +998,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -1057,7 +1057,7 @@ - QLayout::SetMinAndMaxSize + QLayout::SizeConstraint::SetMinAndMaxSize @@ -1117,7 +1117,7 @@ WingSummer - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1213,7 +1213,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -1246,7 +1246,7 @@ - QLayout::SetMinAndMaxSize + QLayout::SizeConstraint::SetMinAndMaxSize @@ -1345,7 +1345,7 @@ WingSummer - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter diff --git a/TestPlugin/testplugin.cpp b/TestPlugin/testplugin.cpp index 9e4b437..98871d4 100644 --- a/TestPlugin/testplugin.cpp +++ b/TestPlugin/testplugin.cpp @@ -20,6 +20,9 @@ #include "testplugin.h" #include "testform.h" +#include "testpluginpage.h" +#include "testsettingpage.h" +#include "testwingeditorviewwidget.h" TestPlugin::TestPlugin() : puid(QStringLiteral("TestPlugin2")) { // 在构造函数中，所有的 API 都无法调用。插件的翻译文件也不会自动加载。 @@ -28,6 +31,25 @@ TestPlugin::TestPlugin() : puid(QStringLiteral("TestPlugin2")) { // 插件的语言文件会在初始化前自动加载，如果初始化失败则会被卸载 // 初始化会传递一个配置类，插件系统会统一管理放到统一的地方，使用 INI 保存 // 你可以自行管理，但不建议，统一管理方便使用者备份和转移插件配置 + + { + WingHex::IWingPlugin::ScriptFnInfo info; + info.fn = + std::bind(QOverload::of(&TestPlugin::test_a), + this, std::placeholders::_1); + info.ret = MetaType::Void; + _scriptInfo.insert(QStringLiteral("test_a"), info); + } + + { + WingHex::IWingPlugin::ScriptFnInfo info; + info.fn = + std::bind(QOverload::of(&TestPlugin::test_b), + this, std::placeholders::_1); + info.ret = MetaType::Void; + info.params.append(qMakePair(MetaType::String, QStringLiteral("info"))); + _scriptInfo.insert(QStringLiteral("test_b"), info); + } } TestPlugin::~TestPlugin() {} @@ -101,6 +123,50 @@ bool TestPlugin::init(const std::unique_ptr &set) { _rtbinfo.append(rtinfo); } + { + auto sp = new TestSettingPage(QStringLiteral("Test1"), + QStringLiteral("This is a Test1")); + _setpages.insert(sp, true); + } + + { + auto sp = new TestSettingPage(QStringLiteral("Test2"), + QStringLiteral("This is a Test2")); + _setpages.insert(sp, false); + } + + { + WingHex::WingDockWidgetInfo info; + auto lbl = new QLabel(QStringLiteral("DockTest1")); + lbl->setAlignment(Qt::AlignCenter); + info.widget = lbl; + info.widgetName = QStringLiteral("DockTest1"); + info.area = Qt::LeftDockWidgetArea; + _winfo.append(info); + } + + { + auto ev = new TestWingEditorViewWidget; + _evws.append(ev); + } + + { + auto pp = new TestPluginPage; + _plgps.append(pp); + } + + _tmenu = new QMenu(QStringLiteral("TestPlugin")); + auto micon = QIcon(QStringLiteral(":/images/TestPlugin/images/btn.png")); + _tmenu->setIcon(micon); + for (int i = 0; i < 5; ++i) { + auto a = new QAction( + micon, QStringLiteral("Test - ") + QString::number(i), _tmenu); + connect(a, &QAction::triggered, this, [this, a]() { + emit msgbox.information(nullptr, QStringLiteral("Test"), a->text()); + }); + _tmenu->addAction(a); + } + return true; } @@ -108,6 +174,15 @@ void TestPlugin::unload(std::unique_ptr &set) { // 设个数字，那就是 5 测试一下配置是否正常工作 set->setValue("Test", 5); + for (auto p = _setpages.constKeyValueBegin(); + p != _setpages.constKeyValueEnd(); ++p) { + p->first->deleteLater(); + } + + for (auto &item : _winfo) { + item.widget->deleteLater(); + } + _tform->close(); _tform->deleteLater(); } @@ -123,7 +198,7 @@ const QString TestPlugin::pluginComment() const { } QList TestPlugin::registeredDockWidgets() const { - return {}; + return _winfo; } QMenu *TestPlugin::registeredHexContextMenu() const { return _tmenu; } @@ -134,19 +209,41 @@ TestPlugin::registeredRibbonTools() const { } QHash TestPlugin::registeredSettingPages() const { - return {}; + return _setpages; } -QList TestPlugin::registeredPages() const { return {}; } +QList TestPlugin::registeredPages() const { + return _plgps; +} QList TestPlugin::registeredEditorViewWidgets() const { - return {}; + return _evws; } QString TestPlugin::getPuid() const { return puid; } -QHash -TestPlugin::registeredScriptFn() { +QVariant TestPlugin::test_a(const QVariantList &) { + test_a(); return {}; } + +QVariant TestPlugin::test_b(const QVariantList ¶ms) { + if (params.isEmpty()) { + return {}; + } + auto arg0 = params.first().toString(); + test_b(arg0); + return {}; +} + +void TestPlugin::test_a() { emit debug(__FUNCTION__); } + +void TestPlugin::test_b(const QString &a) { + emit warn(__FUNCTION__ + QStringLiteral(" : ") % a); +} + +QHash +TestPlugin::registeredScriptFn() { + return _scriptInfo; +} diff --git a/TestPlugin/testplugin.h b/TestPlugin/testplugin.h index 1152460..0c5397e 100644 --- a/TestPlugin/testplugin.h +++ b/TestPlugin/testplugin.h @@ -71,12 +71,24 @@ public: private: QString getPuid() const; + QVariant test_a(const QVariantList &); + QVariant test_b(const QVariantList ¶ms); + +private: + void test_a(); + void test_b(const QString &a); + private: QDialog *_tform = nullptr; QMenu *_tmenu = nullptr; const QString puid; + QHash _scriptInfo; + QList _winfo; QList _rtbinfo; + QHash _setpages; + QList _evws; + QList _plgps; }; #endif // TESTPLUGIN_H diff --git a/TestPlugin/testpluginpage.cpp b/TestPlugin/testpluginpage.cpp new file mode 100644 index 0000000..c85160d --- /dev/null +++ b/TestPlugin/testpluginpage.cpp @@ -0,0 +1,18 @@ +#include "testpluginpage.h" + +#include + +TestPluginPage::TestPluginPage(QWidget *parent) : WingHex::PluginPage(parent) { + auto layout = new QVBoxLayout(this); + _lbl = new QLabel(QStringLiteral("TestPluginPage"), this); + _lbl->setAlignment(Qt::AlignCenter); + layout->addWidget(_lbl); +} + +QIcon TestPluginPage::categoryIcon() const { + return QIcon(QStringLiteral(":/images/TestPlugin/images/btn.png")); +} + +QString TestPluginPage::name() const { return tr("TestPluginPage"); } + +QString TestPluginPage::id() const { return QStringLiteral("TestPluginPage"); } diff --git a/TestPlugin/testpluginpage.h b/TestPlugin/testpluginpage.h new file mode 100644 index 0000000..712ddbd --- /dev/null +++ b/TestPlugin/testpluginpage.h @@ -0,0 +1,23 @@ +#ifndef TESTPLUGINPAGE_H +#define TESTPLUGINPAGE_H + +#include "settingpage.h" + +#include + +class TestPluginPage : public WingHex::PluginPage { + Q_OBJECT +public: + explicit TestPluginPage(QWidget *parent = nullptr); + + // PageBase interface +public: + virtual QIcon categoryIcon() const override; + virtual QString name() const override; + virtual QString id() const override; + +private: + QLabel *_lbl = nullptr; +}; + +#endif // TESTPLUGINPAGE_H diff --git a/TestPlugin/testsettingpage.cpp b/TestPlugin/testsettingpage.cpp new file mode 100644 index 0000000..41d6e7b --- /dev/null +++ b/TestPlugin/testsettingpage.cpp @@ -0,0 +1,26 @@ +#include "testsettingpage.h" + +#include + +TestSettingPage::TestSettingPage(const QString &id, const QString &content, + QWidget *parent) + : WingHex::SettingPage(parent), _id(id) { + auto layout = new QVBoxLayout(this); + _lbl = new QLabel(content, this); + _lbl->setAlignment(Qt::AlignCenter); + layout->addWidget(_lbl); +} + +QIcon TestSettingPage::categoryIcon() const { + return QIcon(QStringLiteral(":/images/TestPlugin/images/btn.png")); +} + +QString TestSettingPage::name() const { return _id; } + +QString TestSettingPage::id() const { return _id; } + +void TestSettingPage::apply() {} + +void TestSettingPage::reset() {} + +void TestSettingPage::cancel() {} diff --git a/TestPlugin/testsettingpage.h b/TestPlugin/testsettingpage.h new file mode 100644 index 0000000..2c4b591 --- /dev/null +++ b/TestPlugin/testsettingpage.h @@ -0,0 +1,32 @@ +#ifndef TESTSETTINGPAGE_H +#define TESTSETTINGPAGE_H + +#include "settingpage.h" + +#include + +class TestSettingPage : public WingHex::SettingPage { + Q_OBJECT +public: + explicit TestSettingPage(const QString &id, const QString &content, + QWidget *parent = nullptr); + + // PageBase interface +public: + virtual QIcon categoryIcon() const override; + virtual QString name() const override; + virtual QString id() const override; + + // SettingPage interface +public: + virtual void apply() override; + virtual void reset() override; + virtual void cancel() override; + +private: + QLabel *_lbl = nullptr; + + QString _id; +}; + +#endif // TESTSETTINGPAGE_H diff --git a/TestPlugin/testwingeditorviewwidget.cpp b/TestPlugin/testwingeditorviewwidget.cpp new file mode 100644 index 0000000..5c93f76 --- /dev/null +++ b/TestPlugin/testwingeditorviewwidget.cpp @@ -0,0 +1,29 @@ +#include "testwingeditorviewwidget.h" + +#include + +TestWingEditorViewWidget::TestWingEditorViewWidget(QWidget *parent) + : WingHex::WingEditorViewWidget(parent) { + auto layout = new QVBoxLayout(this); + auto lbl = new QLabel(QStringLiteral("TestWingEditorView"), this); + lbl->setAlignment(Qt::AlignCenter); + layout->addWidget(lbl); +} + +QIcon TestWingEditorViewWidget::icon() const { + return QIcon(QStringLiteral(":/images/TestPlugin/images/btn.png")); +} + +QString TestWingEditorViewWidget::name() const { + return tr("TestWingEditorView"); +} + +QString TestWingEditorViewWidget::id() const { + return QStringLiteral("TestWingEditorView"); +} + +void TestWingEditorViewWidget::toggled(bool isVisible) {} + +WingHex::WingEditorViewWidget *TestWingEditorViewWidget::clone() { + return nullptr; +} diff --git a/TestPlugin/testwingeditorviewwidget.h b/TestPlugin/testwingeditorviewwidget.h new file mode 100644 index 0000000..6b0c0a2 --- /dev/null +++ b/TestPlugin/testwingeditorviewwidget.h @@ -0,0 +1,27 @@ +#ifndef TESTWINGEDITORVIEWWIDGET_H +#define TESTWINGEDITORVIEWWIDGET_H + +#include "iwingplugin.h" + +#include + +class TestWingEditorViewWidget : public WingHex::WingEditorViewWidget { + Q_OBJECT +public: + explicit TestWingEditorViewWidget(QWidget *parent = nullptr); + + // WingEditorViewWidget interface +public: + virtual QIcon icon() const override; + virtual QString name() const override; + virtual QString id() const override; + +public slots: + virtual void toggled(bool isVisible) override; + virtual WingHex::WingEditorViewWidget *clone() override; + +private: + QLabel *_lbl = nullptr; +}; + +#endif // TESTWINGEDITORVIEWWIDGET_H diff --git a/favicon.rc b/favicon.rc index b9e84f1..0c4b7b2 100644 --- a/favicon.rc +++ b/favicon.rc @@ -74,7 +74,7 @@ BEGIN VALUE "LegalCopyright", "AGPL-3.0" VALUE "OriginalFilename", "WingHexExplorer2.exe" VALUE "ProductName", "ʮƱ༭2" - VALUE "ProductVersion", "1.0.0" + VALUE "ProductVersion", "2.0.0" END END BLOCK "VarFileInfo" diff --git a/images/update.png b/images/update.png new file mode 100644 index 0000000000000000000000000000000000000000..9abd4f744d41bf3fd0ac57faec89c87c8734f394 GIT binary patch literal 2659 zcmeH}`8$+t8^_1E>86o;@QA|PqZ!eo2wAe;j2TO*u@s6_mMl?1;!$HPGcm@PlBU;E zS&GWr!kZRR6h#w*$ctjAsF^ZlE6a1gf5h|K`@?meznsVQJwE4g9^dbEcDENzMR}bv z27^&?ccXZtwf%nwR7CGv{yPbtW+wWnFg);+q^SDcKs+w?`xUjf!oI zX`NqBeO>B1zW!6^%d5Qw>oWb3^n!F#QzH9S4m1gi;`BG_GBe(|L=wEN_St+ws>rNWF+%}1j9E&E!mw%?-S0fl4}7h zHx=Xw;Bv_Zy~UH<5kL)vz+`ez}E?cpnH*T|h zD$IcOyen9T0H{JMP;u4?gV(4&I4(=!o`!yc{si)3?{y zz<{53ncZH61;>c4DTY)Gl5-_2L={zY$@#gPgJEj8bTsRMFq@?@c|}VOFv`A=ZvRgS zA9eh`+$g@(A2-Ci_z8pA^YZc2lp(i~akL->dSVkSQv*)YGkZ=w8k1UJ9UnZKqb<)k4n z$v#!1(@D}*nCU(URme-}+t4;ZyuJIv== zjgzfNM(%5ooNkFT_t&`i{yr?ThegSe45BU`#Un^_cICxI~^YUe;K zd-1|&Zm}0n+R#(-)-TMilj}ls4;F#^vk~VK{RC_3znHq+{qyPzTiETeZ`la_UIMA* zpupY3WjuN$;aS@G!?G78uG~m%^9<7WFZXoL@o%@&31&>gfr-GqmDY7NnXcSTG3EL| z1l2%wRab{0jpNR@M4l%YG{J+==$jG!4 zcaDHN%@?O?g8E{@&D|@ZGolseecEL+`@|KBo7oeIenISPlDsBhbLmgZ@k*nNV#LmP zd(85*@ZP80WbISC>)%0I~m_g zlRZ4$Q3AJjH|msyl%X^N$K1`qL>@5&vS$tlz^Dv#y4 zw7|eE?SLv+Wtec@awZdAdU@!}j$~LNf6Bt7?({uH0+N~WQJ$PCk``<1v_3N*iJ=+>k*}EtHtJ)`>Z>v4x^v;|sv_(A5 zfKf`~BJ2grU2_US@ia)`Xs*ctB3u9Sm6ZX4?%nAy9dq`D(p%fZA=hB=DkHoOKs25b z+1N|nY5*Nz!OBOdo)87E!!*3Cy%~XAkNv;t7@gq`s+2#!^-DU}}cA z?h%mz4>>l0(U3W>SjxBXiWwcEHR$Yx&9o}Om3p|CnH4!^v-(VV6n6wcE~ z>3z770ZTVjJ=MU1eCPbYIW$JnS}iU*V-WAp^e?3tW<&l(MIUrL%Jxyi>Q2xcz9&Rk z4sgFRS9`%q+1%;tBn0vyPF7Ks|Ho3u)N|+0@5b%)lWps>eiaLl^Iwz8cPk0~wV8(U z_hucyqQHlj@sy`|R?2^LaW24YGwWz`FivBNNriN+M)RD>)`!Eut2pD}@aKeeYnxtA z{eFQylnGJZ#QJK#_xvVapS7}Rd-@#jz2`+uQ)b0<`Jjy)a9qz+Qi-Od#c5w#6h|mu z)o6j@yvUFGgyNiPt}8-AQZ!GO6l0jysuyQPD9$>^ni3S}lUz^mIuu7tt3QDTs$IyS zCpzKC#p_947^HaBj?_p1BIObKgy^FDU__eaVg4aeNHf;=3lh5Js8$W}L%tJP1|W+Q z9y9@%3Evo<_ec!b6d<%PXmM&*O@}*12kN6@!}D+cp3L!rd93D-`vj`T4W%wJOqhlv zFt*e-m}ROt&MJ&by2md%Jy@;|R^Trx$@(%XZ*Ns2#SZ0G$W;!irq}R$qSv-WeLdpI zOEIXXY}s3A{427^3-01LJ-#`pKAuo)GnJzXRIkL3rqpYNk9WXoCXL~zyhJ$DRDr%J n9|lf&pN;8cFPa%qhhLuYw~JF|xIfyC{u(jvu3nT{=Md)K618{V literal 0 HcmV?d00001 diff --git a/lang/zh_CN/winghex.ts b/lang/zh_CN/winghex.ts index 285414e..b02b2c2 100644 --- a/lang/zh_CN/winghex.ts +++ b/lang/zh_CN/winghex.ts @@ -76,17 +76,17 @@ AppManager - + GenericCallNotFullySupported 该软件脚本系统不完全支持通用调用，故软件将会退出。 - + SetupClang 启动 Clang 服务 - + OpeningFiles 打开文件 @@ -377,72 +377,72 @@ EditorView - + Cut 剪切 - + CutHex 剪切（十六进制） - + Copy 复制 - + CopyHex 复制（十六进制） - + Paste 粘贴 - + PasteHex 粘贴（十六进制） - + Delete 删除 - + Find 查找 - + Goto 跳转 - + Fill 填充 - + MetaData 标注 - + BookMark 书签 - + Encoding 编码 - + Untitled 未命名 @@ -788,57 +788,57 @@ Logger - + [Trace] 【跟踪】 - + [Warn] 【警告】 - + [Info] 【信息】 - + [Debug] 【调试】 - + [Error] 【错误】 - + Critial 崩溃 - + Error 错误 - + Warning 警告 - + Info 信息 - + Debug 调试 - + Trace 跟踪 @@ -846,18 +846,18 @@ MainWindow - + File 文件 - - + + View 视图 - + About 关于 @@ -878,352 +878,352 @@ 选长： - + Edit 编辑 - + Script 脚本 - - - + + + Plugin 插件 - + Setting 设置 - - + + Log 日志 - + ExportFindResult 导出搜索结果 - + ClearFindResult 清空记录 - + FindResult 搜索结果 - - - + + + Copy 复制 - - - - + + + + CopyToClipBoard 数据已拷贝到粘贴板 - + LittleEndian 小端 - + BigEndian 大端 - + Number 数值 - - + + CheckSum 校验和 - - + + DeleteBookMark 删除书签 - - + + ClearBookMark 清空书签 - - - - + + + + BookMark 书签 - + DecodeText 解码字符串 - + ScriptConsole 脚本控制台 - + DVList 可视化列表 - + DVTree 可视化树数据 - + DVTable 可视化表格 - + DVText 可视化文本 - - + + Basic 基础 - + New 新建 - + OpenF 打开文件 - + OpenFR 打开局部文件 - + OpenWorkSpace 打开工作区 - + OpenD 打开驱动器 - + RecentFiles 最近打开 - + Reload 重新加载 - - + + Save 保存 - + SaveAs 另存为 - + Export 导出 - + SaveSel 保存选区字节 - - - - + + + + General 基本 - + Undo 撤销 - + Redo 恢复 - + Cut 剪切 - + Paste 粘贴 - + Delete 删除 - + Clone 克隆 - + Lookup 查询 - + Find 查找 - + Goto 跳转 - + Encoding 编码 - + FileInfo 文件信息 - - + + Hex 十六进制 - + CutHex 剪切（十六进制） - + CopyHex 复制（十六进制） - + PasteHex 粘贴（十六进制） - - + + Fill 填充 - + FillZero 填充零 - - - - - + + + + + MetaData 标注 - + DeleteMetadata 删除标注 - + ClearMetadata 清空标注 - + MetaDataEdit 编辑标注 - + DeleteMetaData 删除标注 - + ClearMetaData 清空标注 - + Display 显示 - + ViewText 文本预览 - + Scale 缩放 - + SetupRecent 启动最近文件服务 - + SetupUI 初始化界面 - + SetupDocking 启动 Dock 服务 @@ -1278,520 +1278,546 @@ 恢复 Dock 布局 - + SetupWaiting 启动即将完成 - + SetupFinished 启动完毕 - + ResetScale 重置缩放 - + ShowMetafg 标注前景色 - + ShowMetabg 标注背景色 - + ShowMetaComment 批注 - + MetaShowAll 显示所有标注 - + MetaHideAll 隐藏所有标注 - + FileStatus 文件状态 - + InfoSave 是否保存 - + ReadOnly 可读写 - + SetLocked 启用/禁用锁定编辑 - + ErrUnLock 锁定编辑失败 - + SetOver 启用/禁用改变大小 - + ErrUnOver 锁定文件大小失败 - + InfoCanOverLimit 当前编辑处于受限模式！ - + Window 窗体 - + Editor 编辑器 - + Tools 工具 - + HexEditorLayout 编辑器布局 - + SetBaseAddr 设置基址 - + addressBase 基址 - + inputAddressBase 请输入基址 - + WarnBigBaseAddress 基址过大，你得到的地址将会不正确！ - + ErrBaseAddress 非法基址输入 - + SetColInfo 显示/隐藏地址栏 - + SetHeaderInfo 显示/隐藏表头 - + SetAsciiString 显示/隐藏解码字符串 - + Layout 布局 - + Fullscreen 全屏 - + Default 默认 - + RestoreLayout 恢复布局 - - + + SaveLayout 保存布局 - + ExportLog 导出日志 - + ClearLog 清空日志 - + ScriptEditor 脚本编辑器 - + Scripts 脚本仓库 - + PluginFunctions 插件功能 - + ScriptSetting 脚本设置 - + PluginSettings 插件设置 - + Info 信息 - + Software 软件 - + Sponsor 赞助 - + + CheckUpdate + 检查更新 + + + Wiki 网页 Wiki - + AboutQT 关于 QT - + SetPageIDEmptyTryUseName 设置页 ID 为空，尝试使用名称作为 ID - + SetPageDupNameIgnored 设置页重复的 ID 名称，已忽略加载 - + Plugin %1 contains a duplicate ID (%2) that is already registered by plugin %3 插件 %1 包含重复 ID (%2)，该 ID 已被插件 %3 注册 - - + + ChooseFile 选择文件 - - - - + + - - - + + + + - - - - - + + + + + + Error 错误 - - + - + + FileNotExist 文件不存在！ - - + - - + + + FilePermission 因文件权限无法继续！ - + ProjectFile (*.wingpro) 项目文件 (*.wingpro) - + Root Required! 需要管理员权限继续操作！ - + ReloadSuccessfully 文件重新加载成功！ - + ReloadUnSuccessfully 文件重新加载失败！ - - - + + + ChooseSaveFile 请选择保存文件路径： - + NoMoreClone 克隆已到上限，无法继续操作！ - + FindFininishBusy 查找任务繁忙，请勿重复查找！ - + MayTooMuchFindResult 搜索数量已到达上限，结果可能不全，建议请按区段搜索。 - + SaveLayoutSuccess 保存布局成功 - + SaveLayoutError 保存布局失败 - + ConfirmSave 正在关闭未保存的文件或工作区，你确定保存吗？ - + ConfirmAPPSave 你尝试关闭程序，但仍存在未保存的文件或工作区，你确定保存这些更改吗？ - - + + SaveSuccessfully 保存成功！ - - + + SaveWSError 保存工作区错误！ - - - + + + Warn 警告 - + ScriptObjShow 脚本对象 - - - + + + SourceChanged 局部打开原始文件更改！ - - + + SaveSourceFileError 由于原文件更改，保存文件失败！ - + SaveUnSuccessfully 保存失败！ - + ChooseExportFile 请选择导出文件路径： - + ExportSuccessfully 导出成功！ - + ExportSourceFileError 由于原文件更改，导出文件失败！ - + ExportUnSuccessfully 导出失败！ - + SaveSelSuccess 保存选区字节成功！ - + SaveSelError 保存选区字节失败，因文件不具有可写权限！ - - + + CutToClipBoard 数据已剪切到粘贴板！ - - + + UnCutToClipBoard 由于保持大小限制，数据剪切到粘贴板失败！ - - + + UnCopyToClipBoard 由于保持大小限制，数据剪切到复制板失败！ - + FindFininish 查找结果完毕！ - + PleaseInputFill 请输入填充字节值 - + FillInputError 填充字节输入错误 - - + + InputComment 请输入批注： - - - + + + NoSelection 没有选区，无法继续的操作！ - + NoMetaData 无可编辑标记 - + EmptyFindResult 没有可导出的搜索结果！ - + SaveFindResult 导出搜索结果成功！ - + SaveFindResultError 导出结果失败！ - + TooManyBytesDecode 超出解码字节限制…… - + ExportLogError 导出日志失败！ - + ExportLogSuccess 导出日志成功，路径： - + ClearLogSuccess 清空日志成功！ - + + BadNetwork + 无法与远程服务器的更新检查建立连接，请检查网络。 + + + + NewestVersion + 当前软件为最新版本 + + + + + OlderVersion + 你使用的软件为老版本，建议到 Github 和 Gitee 的仓库发行版下载更新。 + + + + CheckingUpdate + 检查更新中…… + + + Too much opened files 打开的文件过多，无法继续操作！ - + CopyLimit 拷贝字节超出限制 - + ErrOpenFileBelow 打开文件出现错误（由于权限不足），如下为打开错误的文件： @@ -1920,13 +1946,28 @@ Level 级别 + + + Count + 数量 + + + + Update + 更新 + + + + CheckWhenStartup + 启动检查更新 + DontShowSplash 不显示启动窗体 - + Others 杂项 @@ -1959,27 +2000,27 @@ 插件： - + Plugin 插件 - + pluginName 插件名 - + pluginAuthor 插件作者 - + pluginVersion 插件版本 - + pluginComment 插件说明 @@ -2037,17 +2078,37 @@ 注册插件对象中…… - + + EmptyNameDockWidget: + 空的贴边组件名： + + + + InvalidNameDockWidget: + 无效贴边组件名： + + + + InvalidNullDockWidget: + 无效空贴边组件： + + + Not allowed operation in non-UI thread 该操作在非 UI 线程非法 - + + UnsafePluginDir + 不安全的插件目录，请将插件目录设置为仅管理员账户可写 + + + FoundPluginCount 总计发现插件数目： - + PluginLoadingFinished 加载插件完毕！ @@ -2843,1550 +2904,1550 @@ Do you wish to keep up to date by reloading the file? ScriptMachine - + AngelScript callstack: AngelScript 调用堆栈： - + - Exception '%1' in '%2' — 在 ‘%2’ 中发生异常 ‘%1’ - + Script failed to build 脚本编译失败 - + Cannot find 'int main()' or 'void main()' 无法找到程序入口点： "int main()" 或者 "void main()" - + Debugging, waiting for commands. 调试中，等待调试命令。 - + Failed while initializing global variables 初始化全局变量失败 - + The script failed with an exception 异常被抛出，脚本执行失败 - + The script was aborted 脚本被终止 - + The script terminated unexpectedly 脚本异常退出 - + '%1' is already declared "%1" 已被声明 - + Abstract class '%1' cannot be instantiated 无法实例化抽象类 "%1" - + Accessing private property '%1' of parent class 非法访问父类的私有属性 "%1" - + Attribute '%1' informed multiple times 属性 "%1" 已被多次通知 - + Can't form arrays of subtype '%1' 无法创建子类型 "%1" 的数组 - + Can't inherit from class '%1' marked as final 无法从标记为 final 的类 "%1" 继承 - + Cannot access non-static member '%1' like this 无法和像使用 this 一样访问非静态成员 "%1" - + Can't construct handle '%1'. Use ref cast instead 无法构造句柄 "%1" 。请改用引用强制转换 - + Can't implicitly convert from '%1' to '%2'. 无法从 "%1' 隐式转换为 "%2"。 - + Compiling %1 正在编译 %1 - + Compiling auto generated %1 编译自动生成的 %1 - + Implemented property accessor '%1' does not expect index argument 已实现的属性访问器 "%1" 不需要索引参数 - + Implemented property accessor '%1' expects index argument 已实现的属性访问器 "%1" 需要索引参数 - + Data type can't be '%1' 数据类型不能为 "%1" - + All subsequent parameters after the first default value must have default values in function '%1' 在函数 "%1" 中，第一个默认值之后的所有后续参数都必须具有默认值 - + The method in the derived class must have the same return type as in the base class: '%1' 派生类中的方法必须具有与基类相同的返回类型："%1" - + The name of the destructor '%1::~%2' must be the same as the class 析构函数 "%1::~%2" 的名称必须与类相同 - + Expected '%1' 应为 "%1" - + Expected '%1' or '%2' 应为 ”%1“ 或 ”%2“ - + Expression must be of boolean type, instead found '%1' 表达式必须是布尔类型，但实际使用的是 "%1" - + Expression '%1' is a data type 表达式 "%1" 是一种数据类型 - + External shared entity '%1' not found 未找到外部共享实体 "%1" - + External shared entity '%1' cannot redefine the original entity 外部共享实体 "%1" 无法重新定义原始实体 - + Failed while compiling default arg for parameter %1 in function '%2' 为函数 "%2" 中的参数 %1 编译默认参数时失败 - + Function '%1' not found 未找到函数 "%1" - + The property '%1' has mismatching types for the get and set accessors 属性 "%1" 的 get 和 set 访问器类型不匹配 - + Variable '%1' hides another variable of same name in outer scope 变量 "%1" 隐藏了外部作用域中另一个同名变量 - + Identifier '%1' is not a data type 标识符 "%1" 不是数据类型 - + Identifier '%1' is not a data type in global namespace 标识符 "%1" 不是全局命名空间中的数据类型 - + Identifier '%1' is not a data type in namespace '%2' or parent 标识符 "%1" 不是命名空间 "%2" 或其父级中的数据类型 - + Illegal operation on '%1' 对 "%1" 的非法操作 - + Illegal variable name '%1'. 非法变量名 "%1"。 - + Illegal access to inherited private property '%1' 非法访问继承的私有属性 "%1" - + Initialization lists cannot be used with '%1' 初始化列表不能与 "%1" 一起使用 - + Attempting to instantiate invalid template type '%1<%2>' 尝试实例化无效的模板类型 "%1<%2>" - + Instead found '%1' 而是找到了 "%1" - + Instead found identifier '%1' 而是找到标识符 "%1" - + Instead found reserved keyword '%1' 而是找到了保留关键字 "%1" - + Interface '%1' cannot be instantiated 无法实例化接口 "%1" - + Invalid unicode escape sequence, expected %1 hex digits 无效的 Unicode 转义序列，预期为 %1 个十六进制数字 - + Method '%1' declared as final and cannot be overridden 方法 "%1" 已声明为 final，因此无法被覆盖 - + Method '%1' marked as override but does not replace any base class or interface method 方法 "%1" 标记为覆盖，但并未替换任何基类或接口方法 - + Method '%1::%2' is missing the return type, nor is it the same name as object to be a constructor 方法 "%1::%2" 缺少返回类型，并且其名称与构造函数对象不同 - + Method '%1' is not part of object '%2' 方法 "%1" 不是对象 "%2" 的一部分 - + Missing implementation of '%1' 缺少 "%1" 的实现 - + Missing definition of '%1' 缺少 "%1" 的定义 - + Mixin class cannot be declared as '%1' Mixin 类不能声明为 "%1" - + Multiple matching signatures to '%1' "%1" 有多个匹配的签名 - + Found multiple get accessors for property '%1' 发现属性 "%1" 的多个 get 访问器 - + Found multiple set accessors for property '%1' 发现属性 "%1" 的多个集合访问器 - + Namespace '%1' doesn't exist. 命名空间 "%1" 不存在。 - - - - - - - - - - - - + + + + + + + + + + + + Name conflict. 名称冲突。 - + '%1' is an extended data type. "%1" 是扩展数据类型。 - + '%1' is a global property. "%1" 是全局属性。 - + '%1' is a named type. "%1" 是被命名的类型。 - + '%1' is a funcdef. "%1" 是一个函数签名定义。 - + '%1' is a global function. "%1" 是一个全局函数。 - + '%1' is a mixin class. "%1" 是一个 Mixin 类。 - + '%1' is a virtual property. "%1" 是虚拟属性。 - + '%1' is a class. "%1" 是一个类。 - + '%1' is an interface. "%1" 是一个接口。 - + '%1' is an object property. "%1" 是一个对象属性。 - + '%1' is a class method. "%1" 是一个类方法。 - + '%1' is already used. ”%1“ 已被使用。 - + No appropriate opHndlAssign method found in '%1' for handle assignment 在 "%1" 中未找到适当的 opHndlAssign 方法用于句柄分配 - + No conversion from '%1' to '%2' available. 无法进行从 "%1" 到 "%2" 的转换。 - + No conversion from '%1' to math type available. 无法将 "%1" 转换为数学类型。 - + No default constructor for object of type '%1'. "%1" 类型对象没有默认构造函数。 - + No appropriate opAssign method found in '%1' for value assignment 在 "%1" 中未找到适合赋值的 opAssign 方法 - + No copy constructor for object of type '%1'. 没有 "%1" 类型对象的复制构造函数。 - + No matching signatures to '%1' 没有与 "%1" 匹配的签名 - + No matching operator that takes the type '%1' found 未找到采用类型 "%1" 的匹配运算符 - + No matching operator that takes the types '%1' and '%2' found 未找到采用类型 "%1" 和 "%2" 的匹配运算符 - + No matching symbol '%1' 没有匹配的符号 "%1" - + Expression doesn't form a function call. '%1' evaluates to the non-function type '%2' 表达式不构成函数调用。"%1" 计算结果为非函数类型 "%2" - + '%1' is not declared "%1" 未被声明 - + '%1' is not initialized. ”%1“ 未初始化。 - + '%1' is not a member of '%2' ”%1“ 不是 ”%2“ 的成员 - + Type '%1' doesn't support the indexing operator 类型 "%1" 不支持索引运算符 - + Parameter type can't be '%1', because the type cannot be instantiated. 参数类型不能是 "%1"，因为该类型无法实例化。 - + Previous error occurred while attempting to compile initialization list for type '%1' 尝试编译类型 "%1" 的初始化列表时发生先前的错误 - + Illegal call to private method '%1' 非法调用私有方法 "%1" - + Illegal access to private property '%1' 非法访问私有属性 "%1" - + Illegal call to protected method '%1' 非法调用受保护的方法 "%1" - + Illegal access to protected property '%1' 非法访问受保护的属性 "%1" - + Return type can't be '%1' 返回类型不能是 "%1" - + Shared code cannot access non-shared global variable '%1' 共享代码无法访问非共享全局变量 "%1" - + Shared code cannot call non-shared function '%1' 共享代码无法调用非共享函数 "%1" - + Shared type cannot implement non-shared interface '%1' 共享类型无法实现非共享接口 "%1" - + Shared class cannot inherit from non-shared class '%1' 共享类不能从非共享类 "%1" 继承 - + Shared code cannot use non-shared type '%1' 共享代码不能使用非共享类型 "%1" - + Shared type '%1' doesn't match the original declaration in other module 共享类型 "%1" 与其他模块中的原始声明不匹配 - + Template '%1' expects %2 sub type(s) 模板 "%1" 需要 %2 个子类型 - + Type '%1' cannot be a reference 类型 "%1" 不能是引用 - + Type '%1' is not available for this module 类型 "%1" 不适用于此模块 - + Type '%1' is not a template type 类型 "%1" 不是模板类型 - + Unexpected token '%1' 意外标记 "%1" - + Use of uninitialized global variable '%1'. 使用未初始化的全局变量 "%1"。 - + Unknown scope '%1' 未知作用域 "%1" - + Where '%1' is '%2' 其中 "%1" 是 "%2" - + Failed to initialize global variable '%1' 无法初始化全局变量 "%1" - + Exception '%1' in '%2' "%2" 中的异常 "%1" - + Type '%1' is missing behaviours 类型 "%1" 缺少的行为 - + Can't pass type '%1' by value unless the application type is informed in the registration 除非在注册时告知应用程序类型，否则无法按值传递类型 "%1" - + Can't return type '%1' by value unless the application type is informed in the registration 除非在注册时告知应用程序类型，否则无法按值返回类型 "%1" - + Don't support passing type '%1' by value to application in native calling convention on this platform 不支持在此平台上按照本机调用约定将类型 "%1" 按值传递给应用程序 - + Don't support returning type '%1' by value from application in native calling convention on this platform 不支持在此平台上按照本机调用约定从应用程序返回类型 "%1" 的值 - + Object {%1}. GC cannot destroy an object of type '%2' as it doesn't know how many references to there are. 对象 {%1}。GC 无法销毁类型为 "%2" 的对象，因为它不知道有多少个引用。 - + Object {%1}. GC cannot destroy an object of type '%2' as it can't see all references. Current ref count is %3. 对象 {%1}。GC 无法销毁类型为 "%2" 的对象，因为它无法看到所有引用。当前引用计数为 %3。 - + Object type '%1' doesn't exist 对象类型 "%1" 不存在 - + Cannot register. The template type instance '%1' has already been generated. 无法注册。模板类型实例 "%1" 已生成。 - + Template type '%1' doesn't exist 模板类型 "%1" 不存在 - + Template subtype '%1' doesn't exist 模板子类型 "%1" 不存在 - + Failed to read subtype of template type '%1' 无法读取模板类型 "%1" 的子类型 - + Failed in call to function '%1' (Code: %2, %3) 调用函数 "%1" 失败（代码：%2，%3） - + Failed in call to function '%1' with '%2' (Code: %3, %4) 使用 "%2" 调用函数 "%1" 失败（代码：%3，%4） - + Failed in call to function '%1' with '%2' and '%3' (Code: %4, %5) 使用 "%2" 和 "%3" 调用函数 "%1" 失败（代码：%4，%5） - + Type '%1' is still used by function '%2' 类型 "%1" 仍被函数 "%2" 使用 - + The builtin type in previous message is named '%1' 上一条消息中的内置类型名为 "%1" - + The function in previous message is named '%1'. The func type is %2 上一条消息中的函数名为 "%1"。函数类型为 %2 - + The script object of type '%1' is being resurrected illegally during destruction 类型为 "%1" 的脚本对象在销毁过程中被非法复活 - + LoadByteCode failed. The bytecode is invalid. Number of bytes read from stream: %1 LoadByteCode 失败。字节码无效。从流中读取的字节数：%1 - + Function '%1' appears to have been compiled without JIT entry points 函数 "%1" 似乎已在无 JIT 入口点的情况下进行编译 - + There is an external reference to an object in module '%1', preventing it from being deleted 存在对模块 "%1" 中对象的外部引用，导致无法删除该对象 - + Output argument expression is not assignable 输出参数表达式不可分配 - + Auto is not allowed here 这里禁止使用 auto 关键字 - + Can't find unambiguous implicit conversion to make both expressions have the same type 无法找到明确的隐式转换来使两个表达式具有相同的类型 - + Both conditions must call constructor 两个条件都必须调用构造函数 - + Base class doesn't have default constructor. Make explicit call to base constructor 基类没有默认构造函数。明确调用基类构造函数 - + Base class doesn't have copy constructor or default constructor and assign operator. Make explicit call to base constructor 基类没有复制构造函数或默认构造函数和赋值运算符。明确调用基类构造函数 - + Candidates are: 候选包括： - + Can't call a constructor in loops 无法在循环中调用构造函数 - + Can't call a constructor in switch 无法在 switch 中调用构造函数 - + Can't call a constructor multiple times 无法多次调用构造函数 - + Can't create delegate 无法创建委托 - + Can't create delegate for types that do not support handles 无法为不支持句柄的类型创建委托 - + Cannot flag function that will not be auto generated as deleted 无法将不会自动生成的函数标记为已删除 - + Conflict with explicit declaration of function and deleted function 与函数的显式声明和已删除函数冲突 - + Can't implement itself, or another interface that implements this interface 无法实现自身，也无法实现此接口的其他接口 - + Can't inherit from multiple classes 不能从多个类继承 - + Can't inherit from itself, or another class that inherits from this class 不能从其自身或从该类继承的其他类继承 - + Can't pass class method as arg directly. Use a delegate object instead 无法直接将类方法作为参数传递。请改用委托对象 - + Unable to resolve auto type 无法解析自动类型 - + Can't return reference to local value. 无法返回对本地值的引用。 - + Can't return value when return type is 'void' 返回类型为 "void" 时无法返回值 - + Implicit conversion changed sign of value 隐式转换改变了值的符号 - + A class cannot be both abstract and final 一个类不能同时是 abstract 和 final - + Compound assignments with property accessors on value types are not supported 不支持对值类型使用属性访问器的复合赋值 - + Compound assignments with indexed property accessors are not supported 不支持使用索引属性访问器的复合赋值 - + Compound assignments with property accessors require both get and set accessors 具有属性访问器的复合赋值需要 get 和 set 访问器 - + Variables cannot be declared in switch cases, except inside statement blocks 变量不能在 switch 语句中声明，除非在语句块内 - + The default case must be the last one default 情况必须是最后一个 - + The type of the default argument expression doesn't match the function parameter type 默认参数表达式的类型与函数参数类型不匹配 - + Deleted functions cannot have implementation 已删除的函数不能有实现 - + The destructor must not have any parameters 析构函数不能有任何参数 - + Value assignment on reference types is not allowed. Did you mean to do a handle assignment? 不允许对引用类型进行值分配。是要进行句柄分配吗？ - + Compound assignment on reference types is not allowed 不允许对引用类型进行复合赋值 - + Duplicate named argument 重复命名参数 - + Duplicate switch case 重复的 switch case - + Else with empty statement else 中使用空语句 - + Empty list element is not allowed 不允许空列表元素 - + Empty switch statement 空的 switch 语句 - + Expected constant 应为常量 - + Expected data type 应为数据类型 - + Expected expression value 应为表达值 - + Expected identifier 应为标识符 - + Expected a list enclosed by { } to match pattern 应为用 { } 括起来的列表与模式匹配 - + Expected method or property 应为方法或属性 - + Expected one of: 应为为以下之一： - + Expected operator 应为操作符 - + Expected post operator 应为右操作符 - + Expected pre operator 应为左操作符 - + Expected string 应为字符串 - + Expression doesn't evaluate to a function 表达式无法计算函数值 - + Previous error occurred while attempting to create a temporary copy of object 尝试创建对象的临时副本时发生上一个错误 - + Float value truncated in implicit conversion to integer 浮点值在隐式转换为整数时被截断 - + Found multiple matching enum values 找到多个匹配的枚举值 - + A function with the same name and parameters already exists 具有相同名称和参数的函数已存在 - + Global variables have been disabled by the application 全局变量已被应用程序禁用 - + It is not allowed to perform a handle assignment on a non-handle property 不允许对非句柄属性执行句柄分配 - + The operand is implicitly converted to handle in order to compare them 操作数被隐式转换为句柄，以便进行比较 - + Handle to handle is not allowed 不允许使用句柄 - + If with empty statement 如果带有空语句 - + Illegal member type 非法成员类型 - + Illegal operation on this datatype 对该数据类型的非法操作 - + Illegal target type for reference cast 非法引用转换的目标类型 - + Interfaces can only implement other interfaces 接口只能实现其他接口 - + Invalid 'break' 无效的 break 关键字 - + Invalid character literal 无效的字符 - + Invalid 'continue' 无效的 continue 关键字 - + Invalid escape sequence 无效的转义序列 - + Invalid expression: ambiguous name 无效表达式：二义性名称 - + Invalid expression: stand-alone anonymous function 无效表达式：独立匿名函数 - + Invalid operation on method 方法操作无效 - + Invalid reference. Property accessors cannot be used in combined read/write operations 引用无效。属性访问器不能用于组合读/写操作。 - + Invalid scope resolution 范围解析无效 - + Invalid signature for virtual property 虚拟属性签名无效 - + Invalid type 类型无效 - + Invalid unicode code point 无效的 Unicode 代码点 - + Invalid unicode sequence in source 源代码中的 Unicode 序列无效 - + Invalid use of named arguments 命名参数的使用无效 - + The method cannot be named with the class name 该方法不能以类名命名 - + Mixin classes cannot have constructors or destructors Mixin 类不能有构造函数或析构函数 - + Mixin class cannot inherit from classes Mixin 类不能从类继承 - + Mixin classes cannot have child types Mixin 类不能有子类型 - + Found more than one matching operator 找到多个匹配的运算符 - + Multiline strings are not allowed in this application 此应用程序不允许使用多行字符串 - + Only objects have constructors 只有对象才有构造函数 - + Must return a value 必须返回一个值 - + Detected named argument with old syntax 检测到具有旧语法的命名参数 - + No appropriate indexing operator found 未找到合适的索引运算符 - + No appropriate opEquals method found 未找到合适的 opEquals 方法 - + The application doesn't support the default array type. 该应用程序不支持默认数组类型。 - + Non-const method call on read-only object reference 只读对象引用上的非常量方法调用 - + Non-terminated string literal 未终止的字符串 - + Not all paths return a value 并非所有路径都会返回值 - + Not enough values to match pattern 没有足够的值来模式匹配 - + Implicit conversion of value is not exact 值的隐式转换并不准确 - + Expression is not an l-value 表达式不是左值 - + Not a valid reference 无效引用 - + Not a valid lvalue 不是有效的左值 - + Nothing was built in the module 模块中没有构建任何内容 - + Object handle is not supported for this type 此类型不支持对象句柄 - + Only object types that support object handles can use &inout. Use &in or &out instead 只有支持对象句柄的对象类型才能使用 &inout。请改用 &in 或 &out - + A cast operator has one argument 强制类型转换运算符有一个参数 - + The code must contain one and only one function 代码必须包含一个且只能包含一个函数 - + The code must contain one and only one global variable 代码必须包含一个且只能有一个全局变量 - + Both operands must be handles when comparing identity 比较时，两个操作数都必须是句柄 - + The overloaded functions are identical on initial parameters without default arguments 重载函数在初始参数上相同，没有默认参数 - + Parameter already declared 参数已声明 - + Positional arguments cannot be passed after named arguments 位置参数不能在命名参数之后传递 - + Potentially matching non-const method is hidden on read-only object reference 可能匹配的非 const 方法隐藏在只读对象引用中 - + Property accessor with index must have 1 and only 1 index argument 带索引的属性访问器必须有 1 个且只能有 1 个索引参数 - + Property accessors have been disabled by the application 应用程序已禁用属性访问器 - + Property accessor must be implemented 必须实现属性访问器 - + Class properties cannot be declared as const 类属性不能声明为 const - + The property has no get accessor 该属性没有 get 访问器 - + The property has no set accessor 该属性没有设置访问器 - + Virtual property must have at least one get or set accessor 虚拟属性必须至少有一个 get 或 set 访问器 - + Resulting reference cannot be returned. Returned references must not refer to local variables. 无法返回结果引用。返回的引用不得引用局部变量。 - + Resulting reference cannot be returned. There are deferred arguments that may invalidate it. 无法返回结果引用。存在可能使其无效的延迟参数。 - + Resulting reference cannot be returned. The expression uses objects that during cleanup may invalidate it. 无法返回结果引用。表达式使用的对象在清理过程中可能会使其失效。 - + Reference is read-only 引用是只读的 - + Reference is temporary 参考是临时的 - + Reference types cannot be passed by value in function parameters 引用类型不能在函数参数中按值传递 - + Reference types cannot be returned by value from functions 引用类型不能通过函数返回值 - + The script section is empty 脚本节区为空 - + Signed/Unsigned mismatch 有符号/无符号不匹配 - + Strings are not recognized by the application 应用程序无法识别字符串 - + Case expressions must be literal constants case 表达式必须是文字常量 - + Switch expressions must be integral numbers switch 表达式必须是整数 - + The function has too many jump labels to handle. Split the function into smaller ones. 该函数的跳转标签过多，无法处理。请将函数拆分为较小的函数。 - + Too many values to match pattern 与模式匹配的值过多 - + Unexpected end of file 意外的文件结束 - + Unexpected variable declaration 意外的变量声明 - + Unreachable code 无法访问的代码 - + Virtual property contains unrecognized aspect 虚拟属性包含未被认可的部分 - + Unused script node 未使用的脚本节点 - + Value is too large for data type 对于数据类型来说，值太大 - + Void cannot be an operand in expressions void 不能作为表达式中的操作数 - + Warnings are treated as errors by the application 应用程序将警告视为错误 - + While parsing argument list 解析参数列表时 - + While parsing expression 解析表达式时 - + While parsing initialization list 解析初始化列表时 - + While parsing namespace 解析命名空间时 - + While parsing statement block 解析语句块时 - + Previous error occurred while including mixin 包含 mixin 时发生先前错误 - + Autohandles cannot be used with types that have been registered with NOCOUNT 自动句柄不能与已使用 NOCOUNT 注册的类型一起使用 - + First parameter to template factory must be a reference. This will be used to pass the object type of the template 模板工厂的第一个参数必须是引用。这将用于传递模板的对象类型 - + Invalid configuration. Verify the registered application interface. 配置无效。请验证已注册的应用程序接口。 - + A value type must be registered with a non-zero size 值类型必须注册为非零大小 - + The behaviour is not compatible with the type 行为与类型不兼容 - + A garbage collected ref type must have the addref, release, and all gc behaviours 垃圾收集引用类型必须具有 addref、release 和所有 gc 行为 - + A garbage collected value type must have the gc enum references behaviour 垃圾收集值类型必须具有 gc 枚举引用行为 - + A scoped reference type must have the release behaviour 作用域引用类型必须具有释放行为 - + A reference type must have the addref and release behaviours 引用类型必须具有 addref 和 release 行为 - + A non-pod value type must have at least one constructor and the destructor behaviours 非 pod 值类型必须至少有一个构造函数和析构函数行为 - + Template list factory expects two reference parameters. The last is the pointer to the initialization buffer 模板列表工厂需要两个引用参数。最后一个是指向初始化缓冲区的指针 - + List factory expects only one reference parameter. The pointer to the initialization buffer will be passed in this parameter 列表工厂仅需要一个引用参数。指向初始化缓冲区的指针将在此参数中传递 - + AddScriptObjectToGC called with null pointer 使用空指针调用 AddScriptObjectToGC - + An exception occurred in a nested call 嵌套调用中发生异常 - + Uh oh! The engine's reference count is increasing while it is being destroyed. Make sure references needed for clean-up are immediately released 哎呀！引擎的引用计数在被销毁时不断增加。确保立即释放清理所需的引用 - + The module is still in use and cannot be rebuilt. Discard it and request another module 该模块仍在使用中，无法重建。丢弃它并请求另一个模块 - + Property 属性 - + System function 系统函数 - + Variable declaration 变量声明 - + Stack overflow 栈溢出 - + Null pointer access 空指针访问 - + Divide by zero 除以零 - + Overflow in integer division 整数除法溢出 - + Overflow in exponent operation 指数运算溢出 - + Unrecognized byte code 无法识别的字节码 - + Invalid calling convention 无效调用约定 - + Unbound function called 未绑定的函数被调用 - + Out of range 越界 - + Caught an exception from the application 捕获应用程序异常 - + Mismatching types in value assignment 值分配中的类型不匹配 - + Too many nested calls 嵌套调用过多 @@ -4430,37 +4491,37 @@ Do you wish to keep up to date by reloading the file? ScriptSettingDialog - + Script 脚本 - + RawName: 源名称： - + Name: 名称： - + Author: 作者： - + License: 协议： - + HomePage: 主页： - + Comment: 说明： @@ -5052,17 +5113,22 @@ Do you wish to keep up to date by reloading the file? WingAngelAPI - + AngelScriptService AngelScript 服务 - + A internal plugin that provides AngelScript scripts with the ability to call the host API. 为 AngelScript 脚本提供调用主机 API 能力的内部插件。 - + + RegisterScriptFnInvalidSig: + 因脚本函数签名非法而注册失败： + + + NotSupportedQMetaType: 不支持的 QT 数据元类型： @@ -5253,7 +5319,7 @@ Do you wish to keep up to date by reloading the file? asDebugger - + {no engine} {无引擎} diff --git a/mkinstaller/linuxdeploy/WingHexExplorer2.sh b/mkinstaller/linuxdeploy/WingHexExplorer2.sh index 203d791..7fe065d 100755 --- a/mkinstaller/linuxdeploy/WingHexExplorer2.sh +++ b/mkinstaller/linuxdeploy/WingHexExplorer2.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash SCRIPT_DIR="/opt/WingHexExplorer2" -cd "$SCRIPT_DIR" || exit 1 ABS_PATHS=() @@ -10,10 +9,12 @@ for path in "$@"; do abs_path=$(realpath "$path" 2>/dev/null) if [ -z "$abs_path" ]; then - abs_path=$(readlink -f "$path" 2>/dev/null || echo "$path") + abs_path="$path" fi ABS_PATHS+=("$abs_path") done +cd "$SCRIPT_DIR" || exit 1 + env LD_LIBRARY_PATH="$SCRIPT_DIR/lib" "$SCRIPT_DIR/WingHexExplorer2" "${ABS_PATHS[@]}" diff --git a/resources.qrc b/resources.qrc index 1dff9eb..d138357 100644 --- a/resources.qrc +++ b/resources.qrc @@ -102,6 +102,7 @@ images/unlock.png images/unover.png images/unsaved.png + images/update.png images/viewtxt.png images/wiki.png images/win.png diff --git a/src/class/appmanager.cpp b/src/class/appmanager.cpp index 4ee1183..c8b4b9f 100644 --- a/src/class/appmanager.cpp +++ b/src/class/appmanager.cpp @@ -19,6 +19,8 @@ #include +#include "QConsoleWidget/QConsoleWidget.h" +#include "QConsoleWidget/commandhistorymanager.h" #include "angelscript.h" #include "clangformatmanager.h" #include "dbghelper.h" @@ -35,11 +37,11 @@ AppManager *AppManager::_instance = nullptr; AppManager::AppManager(int &argc, char *argv[]) - : SingleApplication(argc, argv, true) { + : QtSingleApplication(argc, argv) { ASSERT_SINGLETON; auto args = arguments(); - if (isSecondary()) { + if (this->isRunning()) { QByteArray buffer; QDataStream out(&buffer, QIODevice::WriteOnly); if (args.size() > 1) { @@ -83,22 +85,18 @@ AppManager::AppManager(int &argc, char *argv[]) ClangFormatManager::instance(); } + auto cmdlist = CommandHistoryManager::load(); + auto &his = QConsoleWidget::history(); + for (auto &cmd : cmdlist) { + his.add(cmd); + } + _w = new MainWindow(splash); - connect(this, &SingleApplication::instanceStarted, this, [this] { - Q_ASSERT(_w); - if (!_w->isEnabled()) { - return; - } - _w->show(); - _w->activateWindow(); - _w->raise(); - }); - - connect(this, &SingleApplication::receivedMessage, this, - [this](quint32 instanceId, QByteArray message) { - Q_UNUSED(instanceId); + setActivationWindow(_w); + connect(this, &QtSingleApplication::messageReceived, this, + [this](QByteArray message) { Q_ASSERT(_w); if (!_w->isEnabled()) { return; @@ -111,8 +109,6 @@ AppManager::AppManager(int &argc, char *argv[]) openFile(param); } _w->show(); - _w->activateWindow(); - _w->raise(); }); if (splash) @@ -132,6 +128,7 @@ AppManager::AppManager(int &argc, char *argv[]) AppManager::~AppManager() { ClangFormatManager::instance().save(); + CommandHistoryManager::save(QConsoleWidget::history().strings_); _w->deleteLater(); _w = nullptr; diff --git a/src/class/appmanager.h b/src/class/appmanager.h index 43bd31b..576af3f 100644 --- a/src/class/appmanager.h +++ b/src/class/appmanager.h @@ -18,10 +18,10 @@ #ifndef APPMANAGER_H #define APPMANAGER_H -#include "SingleApplication/singleapplication.h" #include "dialog/mainwindow.h" +#include "qtsingleapplication/src/qtsingleapplication.h" -class AppManager : public SingleApplication { +class AppManager : public QtSingleApplication { Q_OBJECT public: explicit AppManager(int &argc, char *argv[]); diff --git a/src/class/asdebugger.cpp b/src/class/asdebugger.cpp index 2bd1edd..8acdfec 100644 --- a/src/class/asdebugger.cpp +++ b/src/class/asdebugger.cpp @@ -16,6 +16,7 @@ */ #include "asdebugger.h" +#include "define.h" #include #include @@ -82,7 +83,7 @@ void asDebugger::lineCallback(asIScriptContext *ctx) { // for(auto i = 0; i < 5 ; i++) this line will break twice at first if (ctx->GetUserData() == nullptr) { auto dbgContext = new ContextDbgInfo; - ctx->SetUserData(dbgContext); + ctx->SetUserData(dbgContext, AsUserDataType::UserData_ContextDbgInfo); } else { auto dbgContext = reinterpret_cast(ctx->GetUserData()); @@ -455,6 +456,12 @@ asDebugger::GCStatistic asDebugger::gcStatistics() { void asDebugger::runDebugAction(DebugAction action) { m_action = action; } +void asDebugger::deleteDbgContextInfo(void *info) { + if (info) { + delete reinterpret_cast(info); + } +} + asDebugger::DebugAction asDebugger::currentState() const { return m_action; } void asDebugger::setEngine(asIScriptEngine *engine) { diff --git a/src/class/asdebugger.h b/src/class/asdebugger.h index db36d17..a5887d4 100644 --- a/src/class/asdebugger.h +++ b/src/class/asdebugger.h @@ -118,6 +118,8 @@ public: DebugAction currentState() const; + static void deleteDbgContextInfo(void *info); + private: QVector globalVariables(asIScriptContext *ctx); QVector localVariables(asIScriptContext *ctx); diff --git a/src/class/logger.cpp b/src/class/logger.cpp index 90a54bd..75247c6 100644 --- a/src/class/logger.cpp +++ b/src/class/logger.cpp @@ -21,6 +21,7 @@ #include #include +#include "settingmanager.h" #include "utilities.h" #define INFOLOG(msg) "" + msg + "" @@ -41,6 +42,15 @@ Logger::Logger(QObject *parent) QDir logDir; logDir.mkpath(logPath); logDir.setPath(logPath); + + // clean up log files if too much + auto logs = logDir.entryInfoList({"*.log"}, QDir::Files, QDir::Time); + auto total = logs.size(); + for (decltype(total) i = SettingManager::instance().logCount() - 1; + i < total; ++i) { + QFile::remove(logs.at(i).absoluteFilePath()); + } + auto path = logDir.absoluteFilePath(newFileName); _file = QSharedPointer(new QFile(path)); if (_file->open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -48,11 +58,12 @@ Logger::Logger(QObject *parent) } connect(this, &Logger::log, this, [this](const QString &message) { + static QRegularExpression exp("<[^>]*>"); auto str = message; - *_stream << str.remove(QRegularExpression("<[^>]*>")) << Qt::endl; + *_stream << str.remove(exp) << Qt::endl; }); - if (qEnvironmentVariableIntValue("debug")) { + if (qEnvironmentVariableIntValue("WING_DEBUG")) { setLogLevel(Level::q4DEBUG); } else { #ifdef QT_DEBUG diff --git a/src/class/scriptmachine.cpp b/src/class/scriptmachine.cpp index 461fc0a..c3984db 100644 --- a/src/class/scriptmachine.cpp +++ b/src/class/scriptmachine.cpp @@ -27,6 +27,7 @@ #include "AngelScript/sdk/add_on/scriptmath/scriptmathcomplex.h" #include "AngelScript/sdk/add_on/weakref/weakref.h" #include "class/asbuilder.h" +#include "define.h" #include "plugin/pluginsystem.h" #include "scriptaddon/scriptcolor.h" #include "scriptaddon/scriptjson.h" @@ -71,6 +72,14 @@ bool ScriptMachine::configureEngine(asIScriptEngine *engine) { return false; } + engine->SetContextUserDataCleanupCallback( + &ScriptMachine::cleanUpDbgContext, + AsUserDataType::UserData_ContextDbgInfo); + + engine->SetFunctionUserDataCleanupCallback( + &ScriptMachine::cleanUpPluginSysIDFunction, + AsUserDataType::UserData_PluginFn); + RegisterScriptArray(engine, false); RegisterQString(engine); RegisterScriptRegex(engine); @@ -430,6 +439,18 @@ void ScriptMachine::messageCallback(const asSMessageInfo *msg, void *param) { emit ins->onOutput(t, info); } +void ScriptMachine::cleanUpDbgContext(asIScriptContext *context) { + auto dbgContext = + context->GetUserData(AsUserDataType::UserData_ContextDbgInfo); + asDebugger::deleteDbgContextInfo(dbgContext); +} + +void ScriptMachine::cleanUpPluginSysIDFunction(asIScriptFunction *fn) { + // do nothing + // UserData_API is readonly and it will delete later by its allocator + // UserData_PluginFn is just an id, not a valid pointer to data +} + asITypeInfo *ScriptMachine::typeInfo(RegisteredType type) const { if (type < RegisteredType::tMAXCOUNT && type >= 0) { return _rtypes.at(type); diff --git a/src/class/scriptmachine.h b/src/class/scriptmachine.h index 9e79dbd..e6da45f 100644 --- a/src/class/scriptmachine.h +++ b/src/class/scriptmachine.h @@ -123,6 +123,10 @@ private: private: static void messageCallback(const asSMessageInfo *msg, void *param); + static void cleanUpDbgContext(asIScriptContext *context); + + static void cleanUpPluginSysIDFunction(asIScriptFunction *fn); + static asIScriptContext *requestContextCallback(asIScriptEngine *engine, void *param); static void returnContextCallback(asIScriptEngine *engine, diff --git a/src/class/settingmanager.cpp b/src/class/settingmanager.cpp index fc8e73a..4e1bd3e 100644 --- a/src/class/settingmanager.cpp +++ b/src/class/settingmanager.cpp @@ -69,6 +69,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QString, OTHER_USE_NATIVE_TITLEBAR, ("sys.nativeTitleBar")) Q_GLOBAL_STATIC_WITH_ARGS(QString, OTHER_DONT_USE_SPLASH, ("sys.dontUseSplash")) Q_GLOBAL_STATIC_WITH_ARGS(QString, OTHER_LOG_LEVEL, ("sys.loglevel")) +Q_GLOBAL_STATIC_WITH_ARGS(QString, OTHER_LOG_COUNT, ("sys.logCount")) +Q_GLOBAL_STATIC_WITH_ARGS(QString, OTHER_CHECK_UPDATE, ("sys.checkUpdate")) Q_GLOBAL_STATIC_WITH_ARGS(QString, CODEEDIT_FONT, ("codeedit.font")) Q_GLOBAL_STATIC_WITH_ARGS(QString, CODEEDIT_FONT_SIZE, ("codeedit.fontsize")) @@ -143,9 +145,13 @@ void SettingManager::load() { #endif READ_CONFIG_INT_POSITIVE(m_logLevel, OTHER_LOG_LEVEL, Logger::defaultLevel()); + READ_CONFIG_BOOL(m_checkUpdate, OTHER_CHECK_UPDATE, false); m_logLevel = qBound(int(Logger::LEVEL_BEGIN), m_logLevel, int(Logger::LEVEL_LAST)); + READ_CONFIG_INT_POSITIVE(m_logCount, OTHER_LOG_COUNT, 20); + m_logCount = qBound(qsizetype(20), m_logCount, qsizetype(100)); + m_editorEncoding = READ_CONFIG(EDITOR_ENCODING, QStringLiteral("ASCII")).toString(); auto encodings = Utilities::getEncodings(); @@ -204,6 +210,18 @@ QVariantList SettingManager::getVarList( return varlist; } +qsizetype SettingManager::logCount() const { return m_logCount; } + +void SettingManager::setLogCount(qsizetype newLogCount) { + m_logCount = newLogCount; +} + +bool SettingManager::checkUpdate() const { return m_checkUpdate; } + +void SettingManager::setCheckUpdate(bool newCheckUpdate) { + m_checkUpdate = newCheckUpdate; +} + bool SettingManager::dontUseSplash() const { return m_dontUseSplash; } void SettingManager::setDontUseSplash(bool newDontUseSplash) { @@ -491,7 +509,9 @@ void SettingManager::save(SETTINGS cat) { WRITE_CONFIG_SET(OTHER_USE_NATIVE_TITLEBAR, m_useNativeTitleBar); #endif WRITE_CONFIG_SET(OTHER_DONT_USE_SPLASH, m_dontUseSplash); + WRITE_CONFIG_SET(OTHER_CHECK_UPDATE, m_checkUpdate); WRITE_CONFIG_SET(OTHER_LOG_LEVEL, m_logLevel); + WRITE_CONFIG_SET(OTHER_LOG_COUNT, m_logCount); } if (cat.testFlag(SETTING::CODEEDIT)) { saveCodeEditorConfig(); @@ -533,7 +553,9 @@ void SettingManager::reset(SETTINGS cat) { WRITE_CONFIG_SET(OTHER_USE_NATIVE_TITLEBAR, false); #endif WRITE_CONFIG_SET(OTHER_DONT_USE_SPLASH, false); + WRITE_CONFIG_SET(OTHER_CHECK_UPDATE, false); WRITE_CONFIG_SET(OTHER_LOG_LEVEL, Logger::defaultLevel()); + WRITE_CONFIG_SET(OTHER_LOG_COUNT, 20); } load(); } diff --git a/src/class/settingmanager.h b/src/class/settingmanager.h index e72042f..01afcb7 100644 --- a/src/class/settingmanager.h +++ b/src/class/settingmanager.h @@ -73,7 +73,9 @@ private: OTHER_USESYS_FILEDIALOG = 1u << 24, OTHER_USE_NATIVE_TITLEBAR = 1u << 25, OTHER_DONT_USE_SPLASH = 1u << 26, - OTHER_LOG_LEVEL = 1u << 27 + OTHER_LOG_LEVEL = 1u << 27, + OTHER_CHECK_UPDATE = 1u << 28, + OTHER_LOG_COUNT = 1u << 29, }; Q_DECLARE_FLAGS(SETTING_ITEMS, SETTING_ITEM) @@ -168,6 +170,12 @@ public: bool dontUseSplash() const; void setDontUseSplash(bool newDontUseSplash); + bool checkUpdate() const; + void setCheckUpdate(bool newCheckUpdate); + + qsizetype logCount() const; + void setLogCount(qsizetype newLogCount); + signals: void sigEditorfontSizeChanged(int v); void sigDecodeStrlimitChanged(int v); @@ -223,7 +231,9 @@ private: bool m_dontUseSplash = false; bool m_useNativeFileDialog = true; bool m_useNativeTitleBar = false; + bool m_checkUpdate = false; int m_logLevel = 0; + qsizetype m_logCount = 20; private: QFont _defaultFont; diff --git a/src/class/wingangelapi.cpp b/src/class/wingangelapi.cpp index 169148e..9bd78d9 100644 --- a/src/class/wingangelapi.cpp +++ b/src/class/wingangelapi.cpp @@ -23,6 +23,7 @@ #include "class/scriptmachine.h" #include "class/wingfiledialog.h" #include "class/winginputdialog.h" +#include "define.h" #include "scriptaddon/scriptqdictionary.h" #include @@ -80,8 +81,8 @@ const QString WingAngelAPI::pluginComment() const { void WingAngelAPI::registerScriptFns(const QString &ns, const QHash &rfns) { - Q_ASSERT(ns.isEmpty()); - if (rfns.empty()) { + Q_ASSERT(!ns.isEmpty()); + if (rfns.isEmpty()) { return; } @@ -1172,14 +1173,17 @@ void WingAngelAPI::installScriptFns(asIScriptEngine *engine) { p++) { auto sig = p->first; auto id = p->second; - WrapperFn fn = std::bind(&WingAngelAPI::script_call, this, engine, - id, std::placeholders::_1); - _sfn_wraps[engine][id] = fn; auto r = engine->RegisterGlobalFunction( - sig.toUtf8(), asMETHOD(WrapperFn, operator()), asCALL_GENERIC, - &_sfn_wraps[engine][id]); - Q_ASSERT(r >= 0); - Q_UNUSED(r); + sig.toUtf8(), asFUNCTION(script_call), asCALL_GENERIC); + if (r >= 0) { + // r is the AngelScript function ID + auto fn = engine->GetFunctionById(r); + fn->SetUserData(this, AsUserDataType::UserData_API); + fn->SetUserData(reinterpret_cast(id), + AsUserDataType::UserData_PluginFn); + } else { + emit warn(tr("RegisterScriptFnInvalidSig:") + sig); + } } engine->SetDefaultNamespace(""); @@ -1647,9 +1651,11 @@ void WingAngelAPI::qvariantCastOp( } }; #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - auto type = QMetaType::Type(var.userType()); + auto type = + var.isNull() ? QMetaType::Type::Void : QMetaType::Type(var.userType()); #else - auto type = QMetaType::Type(var.typeId()); + auto type = + var.isNull() ? QMetaType::Type::Void : QMetaType::Type(var.typeId()); #endif switch (type) { case QMetaType::Type::Bool: @@ -1757,11 +1763,11 @@ void WingAngelAPI::qvariantCastOp( case QMetaType::QColor: fn(new QColor(var.value()), type); break; + case QMetaType::Void: + break; default: Logger::critical(tr("NotSupportedQMetaType:") + QMetaType(type).name()); break; - case QMetaType::Void: - break; } } @@ -1918,10 +1924,18 @@ bool WingAngelAPI::isTempBuffered(QMetaType::Type type) { } } -void WingAngelAPI::script_call(asIScriptEngine *engine, qsizetype id, - asIScriptGeneric *gen) { - Q_ASSERT(id >= 0 && id < _sfns.size()); - if (id < 0 || id >= _sfns.size()) { +void WingAngelAPI::script_call(asIScriptGeneric *gen) { + auto fn = gen->GetFunction(); + + auto p = reinterpret_cast( + fn->GetUserData(AsUserDataType::UserData_API)); + auto id = reinterpret_cast( + fn->GetUserData(AsUserDataType::UserData_PluginFn)); + auto engine = fn->GetEngine(); + + Q_ASSERT(p); + Q_ASSERT(id >= 0 && id < p->_sfns.size()); + if (id < 0 || id >= p->_sfns.size()) { return; } @@ -1934,7 +1948,7 @@ void WingAngelAPI::script_call(asIScriptEngine *engine, qsizetype id, params.append(obj); } - auto ret = _sfns.at(id).fn(params); + auto ret = p->_sfns.at(id).fn(params); auto op = [](asIScriptGeneric *gen, void *addr, QMetaType::Type type) { auto b = isTempBuffered(type); if (b) { diff --git a/src/class/wingangelapi.h b/src/class/wingangelapi.h index 50df9f9..ea5dc7d 100644 --- a/src/class/wingangelapi.h +++ b/src/class/wingangelapi.h @@ -122,8 +122,7 @@ private: static bool isTempBuffered(QMetaType::Type type); - void script_call(asIScriptEngine *engine, qsizetype id, - asIScriptGeneric *gen); + static void script_call(asIScriptGeneric *gen); private: QString _InputBox_getItem(int stringID, const QString &title, @@ -180,7 +179,6 @@ private: private: std::vector _fnbuffer; QVector _sfns; - QHash> _sfn_wraps; QHash> _rfns; }; diff --git a/src/class/wingupdater.cpp b/src/class/wingupdater.cpp new file mode 100644 index 0000000..09d65f4 --- /dev/null +++ b/src/class/wingupdater.cpp @@ -0,0 +1,159 @@ +#include "wingupdater.h" + +#include "languagemanager.h" + +#include +#include +#include +#include +#include + +bool WingUpdater::checkUpdate(bool *ok) { + QNetworkAccessManager manager; + QUrl url; + + // Github is not easy to access for Chinese people, + // Gitee mirror instead +#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) + if (LanguageManager::instance().defaultLocale().territory() == +#else + if (LanguageManager::instance().defaultLocale().country() == +#endif + QLocale::China) { + url = + QUrl(QStringLiteral("https://gitee.com/wing-cloud/WingHexExplorer2/" + "raw/updater/WINGHEX_VERSION")); + } else { + url = QUrl(QStringLiteral( + "https://raw.githubusercontent.com/Wing-summer/WingHexExplorer2/" + "updater/WINGHEX_VERSION")); + } + + QNetworkRequest request(url); + +#ifdef Q_OS_WIN + request.setRawHeader( + "User-Agent", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, " + "like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.59"); +#else + request.setRawHeader( + "User-Agent", + "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, " + "like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.59"); +#endif + + QEventLoop loop; + + auto *reply = manager.get(request); + QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); + loop.exec(); + + if (reply->error() == QNetworkReply::NoError) { + // Successfully received the response + auto version = reply->readAll(); + if (ok) { + *ok = true; + } + auto ret = versionCompare(version); + return ret; + } else { + // Handle errors + if (ok) { + *ok = false; + } + } + + reply->deleteLater(); + + return true; +} + +bool WingUpdater::versionCompare(const QString &version) { + return compareVersions(WINGHEX_VERSION, version) >= 0; +} + +int WingUpdater::compareVersions(const QString &version1, + const QString &version2) { + // Extract main version and beta part + QString main1, beta1; + parseVersion(version1, main1, beta1); + QString main2, beta2; + parseVersion(version2, main2, beta2); + + // Compare main version + int mainComparison = compareMainVersions(main1, main2); + if (mainComparison != 0) { + return mainComparison; + } + + // Compare beta part + return compareBetaVersions(beta1, beta2); +} + +void WingUpdater::parseVersion(const QString &version, QString &mainPart, + QString &betaPart) { + static QRegularExpression regex(R"((.*?)(-beta(\d*)?)?$)"); + QRegularExpressionMatch match = regex.match(version); + + if (match.hasMatch()) { + mainPart = match.captured(1); + betaPart = match.captured(2); // Full beta string, e.g., "-beta2" + } else { + mainPart = version; + betaPart.clear(); + } +} + +int WingUpdater::compareMainVersions(const QString &main1, + const QString &main2) { + QStringList parts1 = main1.split('.', Qt::SkipEmptyParts); + QStringList parts2 = main2.split('.', Qt::SkipEmptyParts); + + int maxParts = qMax(parts1.size(), parts2.size()); + for (int i = 0; i < maxParts; ++i) { + int v1 = i < parts1.size() ? parts1[i].toInt() : 0; + int v2 = i < parts2.size() ? parts2[i].toInt() : 0; + + if (v1 < v2) + return -1; + else if (v1 > v2) + return 1; + } + return 0; +} + +int WingUpdater::compareBetaVersions(const QString &beta1, + const QString &beta2) { + if (beta1.isEmpty() && beta2.isEmpty()) { + return 0; // Both are not beta versions + } + if (beta1.isEmpty()) { + return 1; // Non-beta is greater + } + if (beta2.isEmpty()) { + return -1; // Beta is less + } + + // Extract numeric beta suffix + int betaNum1 = extractBetaNumber(beta1); + int betaNum2 = extractBetaNumber(beta2); + + if (betaNum1 < betaNum2) { + return -1; + } else if (betaNum1 > betaNum2) { + return 1; + } + return 0; // Both beta versions are equal +} + +int WingUpdater::extractBetaNumber(const QString &beta) { + static QRegularExpression regex(R"(-beta(\d*))"); + QRegularExpressionMatch match = regex.match(beta); + + if (match.hasMatch()) { + QString number = match.captured(1); + return number.isEmpty() ? 0 : number.toInt(); + } + return 0; // No numeric suffix +} diff --git a/src/class/wingupdater.h b/src/class/wingupdater.h new file mode 100644 index 0000000..5d835d4 --- /dev/null +++ b/src/class/wingupdater.h @@ -0,0 +1,27 @@ +#ifndef WINGUPDATER_H +#define WINGUPDATER_H + +#include + +class WingUpdater { +public: + static bool checkUpdate(bool *ok = nullptr); + +private: + static bool versionCompare(const QString &version); + + static int compareVersions(const QString &version1, + const QString &version2); + +private: + static void parseVersion(const QString &version, QString &mainPart, + QString &betaPart); + + static int compareMainVersions(const QString &main1, const QString &main2); + + static int compareBetaVersions(const QString &beta1, const QString &beta2); + + static int extractBetaNumber(const QString &beta); +}; + +#endif // WINGUPDATER_H diff --git a/src/components.md b/src/components.md index 53c722a..f8b21e2 100644 --- a/src/components.md +++ b/src/components.md @@ -4,7 +4,7 @@ * [Qt-Advanced-Docking-System](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System) (LGPL) * [QCodeEditor2](https://sourceforge.net/projects/edyuk) (GPL, **FORK**) * [QWingRibbon](https://github.com/martijnkoopman/Qt-Ribbon-Widget) (LGPL, **FORK**) -* [SingleApplication](https://github.com/itay-grudev/SingleApplication) (MIT) +* [QtSingleApplication](https://github.com/qtproject/qt-solutions/tree/master/qtsingleapplication) (BSD-3-Clause) * [QPathEdit](https://github.com/Skycoder42/QPathEdit) (MIT) * [QWindowKit](https://github.com/stdware/qwindowkit) (Apache v2.0) * [AngelScript](https://github.com/codecat/angelscript-mirror) (zlib license) diff --git a/src/control/editorview.cpp b/src/control/editorview.cpp index 66bf423..fec57f4 100644 --- a/src/control/editorview.cpp +++ b/src/control/editorview.cpp @@ -35,7 +35,8 @@ constexpr qsizetype FILEMAXBUFFER = 0x6400000; // 100MB constexpr auto CLONE_LIMIT = 5; -EditorView::EditorView(QWidget *parent) : ads::CDockWidget(QString(), parent) { +EditorView::EditorView(QWidget *parent) + : ads::CDockWidget(nullptr, QString(), parent) { this->setFeatures( CDockWidget::DockWidgetFocusable | CDockWidget::DockWidgetMovable | CDockWidget::DockWidgetClosable | CDockWidget::DockWidgetPinnable | @@ -134,25 +135,37 @@ EditorView::~EditorView() {} void EditorView::registerView(WingEditorViewWidget *view) { Q_ASSERT(view); m_others << view; + m_stack->addWidget(view); } void EditorView::switchView(qsizetype index) { if (index < 0) { - m_stack->setCurrentWidget(m_hex); + m_stack->setCurrentWidget(m_hexContainer); } else { m_stack->setCurrentWidget(m_others.at(index)); } emit viewChanged(index); } +void EditorView::switchView(WingEditorViewWidget *w) { + if (w) { + if (m_others.contains(w)) { + m_stack->setCurrentWidget(w); + emit viewChanged(m_others.indexOf(w)); + } + } else { + m_stack->setCurrentWidget(m_hexContainer); + emit viewChanged(-1); + } +} + void EditorView::registerQMenu(QMenu *menu) { if (menu == nullptr) { return; } - static bool hasRegistered = false; - if (!hasRegistered) { + if (!_hasRegistered) { m_menu->addSeparator(); - hasRegistered = true; + _hasRegistered = true; } m_menu->addMenu(menu); } diff --git a/src/control/editorview.h b/src/control/editorview.h index 945f5b6..e8eaafb 100644 --- a/src/control/editorview.h +++ b/src/control/editorview.h @@ -89,6 +89,7 @@ public slots: void registerView(WingHex::WingEditorViewWidget *view); void switchView(qsizetype index); + void switchView(WingEditorViewWidget *w); void registerQMenu(QMenu *menu); FindError find(const QByteArray &data, const FindDialog::Result &result); @@ -165,6 +166,7 @@ private: QStackedWidget *m_stack = nullptr; GotoWidget *m_goto = nullptr; QWidget *m_hexContainer = nullptr; + bool _hasRegistered = false; QHexView *m_hex = nullptr; QMenu *m_menu = nullptr; diff --git a/src/control/scripteditor.cpp b/src/control/scripteditor.cpp index 5e4d011..8661905 100644 --- a/src/control/scripteditor.cpp +++ b/src/control/scripteditor.cpp @@ -28,7 +28,7 @@ #include "class/clangformatmanager.h" ScriptEditor::ScriptEditor(QWidget *parent) - : ads::CDockWidget(QString(), parent) { + : ads::CDockWidget(nullptr, QString(), parent) { this->setFeatures( CDockWidget::DockWidgetFocusable | CDockWidget::DockWidgetMovable | CDockWidget::DockWidgetClosable | CDockWidget::DockWidgetPinnable | diff --git a/src/define.h b/src/define.h index 40ede74..b44749a 100644 --- a/src/define.h +++ b/src/define.h @@ -8,4 +8,12 @@ enum class CrashCode : int { GenericCallNotSupported }; +namespace AsUserDataType { +enum AsUserDataType { + UserData_ContextDbgInfo, + UserData_API, + UserData_PluginFn, +}; +} + #endif // DEFINE_H diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index ad62bb3..fb7854c 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -34,6 +34,7 @@ #include "class/wingfiledialog.h" #include "class/winginputdialog.h" #include "class/wingmessagebox.h" +#include "class/wingupdater.h" #include "control/toast.h" #include "driverselectordialog.h" #include "encodingdialog.h" @@ -103,7 +104,6 @@ MainWindow::MainWindow(SplashDialog *splash) : FramelessMainWindow() { if (splash) splash->setInfoText(tr("SetupDocking")); buildUpDockSystem(cw); - _defaultLayout = m_dock->saveState(); layout->addWidget(m_dock, 1); @@ -219,6 +219,8 @@ MainWindow::MainWindow(SplashDialog *splash) : FramelessMainWindow() { // load saved docking layout if (splash) splash->setInfoText(tr("SetupDockingLayout")); + + _defaultLayout = m_dock->saveState(); m_dock->restoreState(set.dockLayout()); m_lastusedpath = set.lastUsedPath(); @@ -285,6 +287,26 @@ void MainWindow::buildUpRibbonBar() { app->openFile(f); } }); + + // check update if set + if (set.checkUpdate()) { + ExecAsync( + []() -> int { + bool ok = false; + auto newest = WingUpdater::checkUpdate(&ok); + if (ok) { + return newest ? 1 : 0; + } else { + return -1; + } + }, + [this](int status) { + if (status == 0) { + WingMessageBox::warning(this, qAppName(), + tr("OlderVersion")); + } + }); + } } void MainWindow::buildUpDockSystem(QWidget *container) { @@ -1290,6 +1312,9 @@ RibbonTabContent *MainWindow::buildAboutPage(RibbonTabContent *tab) { addPannelAction(pannel, QStringLiteral("qt"), tr("AboutQT"), [this] { WingMessageBox::aboutQt(this); }); + addPannelAction(pannel, QStringLiteral("update"), tr("CheckUpdate"), + &MainWindow::on_update); + return tab; } @@ -1397,7 +1422,7 @@ void MainWindow::installPluginEditorWidgets() { QHash names; auto &log = Logger::instance(); - auto menu = m_toolBtneditors.value(EDITOR_WINS); + auto menu = m_toolBtneditors.value(EDITOR_WINS)->menu(); for (auto p = m_editorViewWidgets.begin(); p != m_editorViewWidgets.end(); ++p) { for (auto &w : p.value()) { @@ -1410,12 +1435,12 @@ void MainWindow::installPluginEditorWidgets() { continue; } - menu->addAction(newAction(w->icon(), w->name(), [this] { + menu->addAction(newAction(w->icon(), w->name(), [this, w] { auto editor = currentEditor(); if (editor == nullptr) { return; } - editor->switchView(m_editorViewWidgets.size()); + editor->switchView(w); })); names.insert(w->id(), p.key()); @@ -2494,6 +2519,30 @@ void MainWindow::on_wiki() { QUrl(QStringLiteral("https://www.cnblogs.com/wingsummer/p/18286419"))); } +void MainWindow::on_update() { + ExecAsync( + []() -> int { + bool ok = false; + auto newest = WingUpdater::checkUpdate(&ok); + if (ok) { + return newest ? 1 : 0; + } else { + return -1; + } + }, + [this](int status) { + if (status < 0) { + WingMessageBox::critical(this, qAppName(), tr("BadNetwork")); + } else if (status == 0) { + WingMessageBox::warning(this, qAppName(), tr("OlderVersion")); + } else { + WingMessageBox::information(this, qAppName(), + tr("NewestVersion")); + } + }, + tr("CheckingUpdate")); +} + QString MainWindow::saveLog() { QDir ndir(Utilities::getAppDataPath()); ndir.mkpath(QStringLiteral("log")); // 确保日志存放目录存在 diff --git a/src/dialog/mainwindow.h b/src/dialog/mainwindow.h index 262e980..ed9be40 100644 --- a/src/dialog/mainwindow.h +++ b/src/dialog/mainwindow.h @@ -203,6 +203,7 @@ private slots: void on_about(); void on_sponsor(); void on_wiki(); + void on_update(); public: ErrFile openFile(const QString &file, EditorView **editor); diff --git a/src/plugin/iwingplugin.h b/src/plugin/iwingplugin.h index 074b6b6..925bc36 100644 --- a/src/plugin/iwingplugin.h +++ b/src/plugin/iwingplugin.h @@ -463,6 +463,10 @@ struct WingRibbonToolBoxInfo { class WingEditorViewWidget : public QWidget { Q_OBJECT +public: + explicit WingEditorViewWidget(QWidget *parent = nullptr) + : QWidget(parent) {} + public: virtual QIcon icon() const = 0; diff --git a/src/plugin/pluginsystem.cpp b/src/plugin/pluginsystem.cpp index cb3995d..7b001d5 100644 --- a/src/plugin/pluginsystem.cpp +++ b/src/plugin/pluginsystem.cpp @@ -221,7 +221,7 @@ void PluginSystem::registerFns(IWingPlugin *plg) { } Q_ASSERT(_angelplg); - _angelplg->registerScriptFns(plg->pluginName(), rfns); + _angelplg->registerScriptFns(plg->metaObject()->className(), rfns); } QString PluginSystem::type2AngelScriptString(IWingPlugin::MetaType type, @@ -314,7 +314,7 @@ QString PluginSystem::getScriptFnSig(const QString &fnName, QStringList params; for (auto ¶m : fninfo.params) { - params << type2AngelScriptString(fninfo.ret, true) + + params << type2AngelScriptString(param.first, true) + QStringLiteral(" ") + param.second; } @@ -435,8 +435,39 @@ bool PluginSystem::loadPlugin(IWingPlugin *p, auto dockWidgets = p->registeredDockWidgets(); if (!dockWidgets.isEmpty()) { for (auto &info : dockWidgets) { - auto dw = _win->buildDockWidget(_win->m_dock, info.widgetName, - info.displayName, info.widget, + auto widgetName = info.widgetName.trimmed(); + auto displayName = info.displayName.trimmed(); + if (displayName.isEmpty()) { + displayName = widgetName; + } + if (widgetName.isEmpty()) { + Logger::warning(tr("EmptyNameDockWidget:") % + QStringLiteral("{ ") % p->pluginName() % + QStringLiteral(" }")); + continue; + } + + auto inch = std::find_if_not( + widgetName.begin(), widgetName.end(), + [](const QChar &ch) { return ch.isLetterOrNumber(); }); + if (inch != widgetName.end()) { + Logger::warning(tr("InvalidNameDockWidget:") % + QStringLiteral("{ ") % p->pluginName() % + QStringLiteral(" } ") % widgetName); + continue; + } + + if (info.widget == nullptr) { + Logger::warning(tr("InvalidNullDockWidget:") % + QStringLiteral("{ ") % p->pluginName() % + QStringLiteral(" } ") % widgetName % + QStringLiteral(" ( ") % displayName % + QStringLiteral(" )")); + continue; + } + + auto dw = _win->buildDockWidget(_win->m_dock, widgetName, + displayName, info.widget, MainWindow::PLUGIN_VIEWS); switch (info.area) { case Qt::LeftDockWidgetArea: { @@ -2079,23 +2110,24 @@ QWidget *PluginSystem::mainWindow() const { return _win; } void PluginSystem::LoadPlugin() { Q_ASSERT(_win); - _angelplg = new WingAngelAPI; - - auto ret = loadPlugin(_angelplg, std::nullopt); - Q_ASSERT(ret); - Q_UNUSED(ret); - auto &set = SettingManager::instance(); - if (!set.enablePlugin()) { - return; + if (set.scriptEnabled()) { + _angelplg = new WingAngelAPI; + + auto ret = loadPlugin(_angelplg, std::nullopt); + Q_ASSERT(ret); + Q_UNUSED(ret); } - if (Utilities::isRoot() && !set.enablePlgInRoot()) { + + bool ok; + auto displg = qEnvironmentVariableIntValue("WING_DISABLE_PLUGIN", &ok); + if (displg > 0 || !set.enablePlugin()) { return; } #ifdef QT_DEBUG - QDir plugindir(QCoreApplication::applicationDirPath() + - QStringLiteral("/plugin")); + QDir plugindir(QCoreApplication::applicationDirPath() + QDir::separator() + + QStringLiteral("plugin")); // 这是我的插件调试目录，如果调试插件，请更换路径 #ifdef Q_OS_WIN plugindir.setNameFilters({"*.dll", "*.wingplg"}); @@ -2103,10 +2135,28 @@ void PluginSystem::LoadPlugin() { plugindir.setNameFilters({"*.so", "*.wingplg"}); #endif #else - QDir plugindir(QCoreApplication::applicationDirPath() + - QStringLiteral("/plugin")); + QDir plugindir(QCoreApplication::applicationDirPath() + QDir::separator() + + QStringLiteral("plugin")); plugindir.setNameFilters({"*.wingplg"}); #endif + + if (Utilities::isRoot()) { + if (!set.enablePlgInRoot()) { + return; + } + } else { + auto testFileName = plugindir.absoluteFilePath( + QUuid::createUuid().toString(QUuid::Id128)); + + QFile f(testFileName); + if (f.open(QFile::WriteOnly)) { + f.close(); + f.remove(); + Logger::warning(QStringLiteral("") % tr("UnsafePluginDir") % + QStringLiteral("")); + } + } + auto plgs = plugindir.entryInfoList(); Logger::info(tr("FoundPluginCount") + QString::number(plgs.count())); diff --git a/src/settings/othersettingsdialog.cpp b/src/settings/othersettingsdialog.cpp index 3849ca1..e32b3fe 100644 --- a/src/settings/othersettingsdialog.cpp +++ b/src/settings/othersettingsdialog.cpp @@ -41,8 +41,24 @@ OtherSettingsDialog::OtherSettingsDialog(QWidget *parent) Utilities::addSpecialMark(ui->cbDontShowSplash); Utilities::addSpecialMark(ui->cbNativeTitile); Utilities::addSpecialMark(ui->lblLevel); - connect(ui->cbNativeTitile, &QCheckBox::stateChanged, this, - &OtherSettingsDialog::optionNeedRestartChanged); + Utilities::addSpecialMark(ui->cbCheckWhenStartup); + + connect(ui->cbNativeTitile, +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + &QCheckBox::checkStateChanged, +#else + &QCheckBox::stateChanged, +#endif + this, &OtherSettingsDialog::optionNeedRestartChanged); + + connect(ui->cbCheckWhenStartup, +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + &QCheckBox::checkStateChanged, +#else + &QCheckBox::stateChanged, +#endif + this, &OtherSettingsDialog::optionNeedRestartChanged); + connect(ui->cbLogLevel, QOverload::of(&QComboBox::currentIndexChanged), this, &OtherSettingsDialog::optionNeedRestartChanged); @@ -56,6 +72,7 @@ void OtherSettingsDialog::reload() { auto &set = SettingManager::instance(); ui->cbDontShowSplash->setChecked(set.dontUseSplash()); ui->cbNativeFileDialog->setChecked(set.useNativeFileDialog()); + ui->cbCheckWhenStartup->setChecked(set.checkUpdate()); #ifdef WINGHEX_USE_FRAMELESS ui->cbNativeTitile->setChecked(set.useNativeTitleBar()); #endif @@ -75,12 +92,13 @@ void OtherSettingsDialog::apply() { #ifdef WINGHEX_USE_FRAMELESS set.setUseNativeTitleBar(ui->cbNativeTitile->isChecked()); #endif + set.setCheckUpdate(ui->cbCheckWhenStartup->isChecked()); set.setLogLevel(ui->cbLogLevel->currentIndex()); set.save(SettingManager::OTHER); } void OtherSettingsDialog::reset() { - SettingManager::instance().reset(SettingManager::SETTING::APP); + SettingManager::instance().reset(SettingManager::SETTING::OTHER); reload(); } diff --git a/src/settings/othersettingsdialog.ui b/src/settings/othersettingsdialog.ui index ad55e50..c4f7392 100644 --- a/src/settings/othersettingsdialog.ui +++ b/src/settings/othersettingsdialog.ui @@ -72,6 +72,45 @@ + + + + Count + + + + + + + 20 + + + 100 + + + + + + + + + + + 0 + 0 + + + + Update + + + + + + CheckWhenStartup + + + diff --git a/src/settings/pluginsettingdialog.cpp b/src/settings/pluginsettingdialog.cpp index 04ae29f..5d3abab 100644 --- a/src/settings/pluginsettingdialog.cpp +++ b/src/settings/pluginsettingdialog.cpp @@ -28,10 +28,20 @@ PluginSettingDialog::PluginSettingDialog(QWidget *parent) Utilities::addSpecialMark(ui->cbEnablePlugin); Utilities::addSpecialMark(ui->cbEnablePluginRoot); - connect(ui->cbEnablePlugin, &QCheckBox::stateChanged, this, - &PluginSettingDialog::optionNeedRestartChanged); - connect(ui->cbEnablePluginRoot, &QCheckBox::stateChanged, this, - &PluginSettingDialog::optionNeedRestartChanged); + connect(ui->cbEnablePlugin, +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + &QCheckBox::checkStateChanged, +#else + &QCheckBox::stateChanged, +#endif + this, &PluginSettingDialog::optionNeedRestartChanged); + connect(ui->cbEnablePluginRoot, +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + &QCheckBox::checkStateChanged, +#else + &QCheckBox::stateChanged, +#endif + this, &PluginSettingDialog::optionNeedRestartChanged); reload(); diff --git a/src/settings/scriptsettingdialog.cpp b/src/settings/scriptsettingdialog.cpp index 6249315..c0fedf2 100644 --- a/src/settings/scriptsettingdialog.cpp +++ b/src/settings/scriptsettingdialog.cpp @@ -29,8 +29,13 @@ ScriptSettingDialog::ScriptSettingDialog(QWidget *parent) Utilities::addSpecialMark(ui->cbEnable); Utilities::addSpecialMark(ui->cbAllowUsrScript); - connect(ui->cbAllowUsrScript, &QCheckBox::stateChanged, this, - &ScriptSettingDialog::optionNeedRestartChanged); + connect(ui->cbAllowUsrScript, +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + &QCheckBox::checkStateChanged, +#else + &QCheckBox::stateChanged, +#endif + this, &ScriptSettingDialog::optionNeedRestartChanged); loadData(); }