software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
wuhai 2024-03-20 16:59:03 +08:00
parent 91d57435df
commit d45e340f84
17 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -71,8 +71,8 @@ list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistant
list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistantFactory.cpp)
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CMAKE_FILES})
list(APPEND X_TOOLS_SOURCE xTools.qrc)
if (WIN32)
list(APPEND X_TOOLS_SOURCE xTools.rc)
if(WIN32)
list(APPEND X_TOOLS_SOURCE xTools.rc)
endif()
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants)
@ -86,8 +86,8 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBoxUI)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/ASCII/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Base64/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Broadcast/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/CRCCalculator/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileChecker/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/CRC/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/mDNS/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Number/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Ping/Source)

4
Source/Assistants/CMakeLists.txt
View File

@ -33,6 +33,7 @@ macro(x_tools_add_assistant dir_name app_name)
endif()
endmacro()
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CRC)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/mDNS)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Ping)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ASCII)
@ -40,5 +41,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Base64)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Number)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/String)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Broadcast)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FileChecker)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CRCCalculator)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FileCheck)

2
Source/Assistants/CRC/CMakeLists.txt
View File

@ -4,5 +4,5 @@ set(APP_ASSISTANT_OWN_LIBS Qt${QT_VERSION_MAJOR}::Widgets)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source)
x_tools_add_assistant("CRCCalculator" "CrcAssistant")
x_tools_add_assistant("CRC" "CrcAssistant")
x_tools_3rd_setup_glog(CrcAssistant)

32
Source/Assistants/CRC/Source/xToolsCRCAssistant.cpp
View File

@ -6,8 +6,8 @@
* xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
* code directory.
**************************************************************************************************/
#include "xToolsCRCCalculatorAssistant.h"
#include "ui_xToolsCRCCalculatorAssistant.h"
#include "xToolsCRCAssistant.h"
#include "ui_xToolsCRCAssistant.h"
#include <QComboBox>
#include <QDesktopServices>
@ -16,10 +16,10 @@
#include "xToolsCrcInterface.h"
xToolsCRCCalculatorAssistant::xToolsCRCCalculatorAssistant(QWidget* parent)
xToolsCRCAssistant::xToolsCRCAssistant(QWidget* parent)
: QWidget(parent)
, m_crcInterface(new xToolsCrcInterface)
, ui(new Ui::xToolsCRCCalculatorAssistant)
, ui(new Ui::xToolsCRCAssistant)
{
ui->setupUi(this);
m_widthComboBox = ui->comboBoxWidth;
@ -63,18 +63,18 @@ xToolsCRCCalculatorAssistant::xToolsCRCCalculatorAssistant(QWidget* parent)
connect(m_parameterComboBox,
QOverload<int>::of(&QComboBox::currentIndexChanged),
this,
&xToolsCRCCalculatorAssistant::changedParameterModel);
connect(m_calculatedBt, &QPushButton::clicked, this, &xToolsCRCCalculatorAssistant::calculate);
connect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCCalculatorAssistant::textFormatControl);
&xToolsCRCAssistant::changedParameterModel);
connect(m_calculatedBt, &QPushButton::clicked, this, &xToolsCRCAssistant::calculate);
connect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCAssistant::textFormatControl);
}
xToolsCRCCalculatorAssistant::~xToolsCRCCalculatorAssistant()
xToolsCRCAssistant::~xToolsCRCAssistant()
{
delete m_crcInterface;
delete ui;
}
void xToolsCRCCalculatorAssistant::initParameterModel()
void xToolsCRCAssistant::initParameterModel()
{
m_parameterComboBox->clear();
QStringList list = m_crcInterface->supportedParameterModels();
@ -93,7 +93,7 @@ void xToolsCRCCalculatorAssistant::initParameterModel()
m_labelPolyFormula->setText(m_crcInterface->friendlyPoly(model));
}
void xToolsCRCCalculatorAssistant::calculate()
void xToolsCRCAssistant::calculate()
{
QByteArray inputArray;
if (m_hexRadioBt->isChecked()) {
@ -151,12 +151,12 @@ void xToolsCRCCalculatorAssistant::calculate()
m_binCRCOutput->setText(crcBinString);
}
void xToolsCRCCalculatorAssistant::textFormatControl()
void xToolsCRCAssistant::textFormatControl()
{
if (m_asciiRadioBt->isChecked()) {
return;
}
disconnect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCCalculatorAssistant::textFormatControl);
disconnect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCAssistant::textFormatControl);
QString strTemp;
QString plaintext = m_inputTextEdit->toPlainText();
@ -170,11 +170,11 @@ void xToolsCRCCalculatorAssistant::textFormatControl()
}
m_inputTextEdit->setText(strTemp.toUpper());
m_inputTextEdit->moveCursor(QTextCursor::End);
connect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCCalculatorAssistant::textFormatControl);
connect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCAssistant::textFormatControl);
}
void xToolsCRCCalculatorAssistant::changedParameterModel(int index)
void xToolsCRCAssistant::changedParameterModel(int index)
{
Q_UNUSED(index)
QMetaEnum models = QMetaEnum::fromType<xToolsCrcInterface::SAKEnumCrcAlgorithm>();
@ -205,7 +205,7 @@ void xToolsCRCCalculatorAssistant::changedParameterModel(int index)
m_labelPolyFormula->setText(m_crcInterface->friendlyPoly(model));
}
bool xToolsCRCCalculatorAssistant::eventFilter(QObject* watched, QEvent* event)
bool xToolsCRCAssistant::eventFilter(QObject* watched, QEvent* event)
{
if (event->type() == QEvent::MouseButtonDblClick) {
if (watched == m_labelInfo) {

10
Source/Assistants/CRC/Source/xToolsCRCAssistant.h
View File

@ -21,16 +21,16 @@
#include <QTextEdit>
namespace Ui {
class xToolsCRCCalculatorAssistant;
class xToolsCRCAssistant;
}
class xToolsCrcInterface;
class xToolsCRCCalculatorAssistant : public QWidget
class xToolsCRCAssistant : public QWidget
{
Q_OBJECT
public:
Q_INVOKABLE xToolsCRCCalculatorAssistant(QWidget* parent = Q_NULLPTR);
~xToolsCRCCalculatorAssistant();
Q_INVOKABLE xToolsCRCAssistant(QWidget* parent = Q_NULLPTR);
~xToolsCRCAssistant();
protected:
bool eventFilter(QObject* watched, QEvent* event);
@ -38,7 +38,7 @@ protected:
private:
xToolsCrcInterface* m_crcInterface;
Ui::xToolsCRCCalculatorAssistant* ui;
Ui::xToolsCRCAssistant* ui;
QComboBox* m_widthComboBox;
QComboBox* m_parameterComboBox;
QCheckBox* m_refinCheckBox;

8
Source/Assistants/CRC/Source/xToolsCRCAssistant.ui
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>xToolsCRCCalculatorAssistant</class>
<widget class="QWidget" name="xToolsCRCCalculatorAssistant">
<class>xToolsCRCAssistant</class>
<widget class="QWidget" name="xToolsCRCAssistant">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>728</width>
<height>314</height>
<height>322</height>
</rect>
</property>
<property name="windowTitle">
@ -224,7 +224,7 @@ p, li { white-space: pre-wrap; }
hr { height: 1px; border-width: 0; }
li.unchecked::marker { content: &quot;\2610&quot;; }
li.checked::marker { content: &quot;\2612&quot;; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Microsoft YaHei UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'SimSun';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>

4
Source/Assistants/CRC/main.cpp
View File

@ -6,11 +6,11 @@
* QtSwissArmyKnife is licensed according to the terms in the file LICENCE in the root of the source
* code directory.
**************************************************************************************************/
#include "xToolsCRCCalculatorAssistant.h"
#include "xToolsCRCAssistant.h"
#include "xToolsUi.h"
int main(int argc, char* argv[])
{
const QString appName = QObject::tr("CRC Assistant");
return sakExec<xToolsCRCCalculatorAssistant>(argc, argv, appName);
return sakExec<xToolsCRCAssistant>(argc, argv, appName);
}

2
Source/Assistants/FileCheck/CMakeLists.txt
View File

@ -3,5 +3,5 @@ set(APP_ASSISTANT_OWN_LIBS Qt${QT_VERSION_MAJOR}::Widgets)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source)
x_tools_add_assistant("FileChecker" "FileCheckAssistant")
x_tools_add_assistant("FileCheck" "FileCheckAssistant")
x_tools_3rd_setup_glog(FileCheckAssistant)

12
Source/Assistants/FileCheck/Source/xToolsCryptographicHashCalculator.cpp
View File

@ -13,9 +13,9 @@
#include <QDebug>
#include <QFile>
#include "xToolsFileCheckerAssistant.h"
#include "xToolsFileCheckAssistant.h"
xToolsCryptographicHashCalculator::xToolsCryptographicHashCalculator(xToolsFileCheckerAssistant* controller,
xToolsCryptographicHashCalculator::xToolsCryptographicHashCalculator(xToolsFileCheckAssistant* controller,
QObject* parent)
: QThread(parent)
, m_cryptographicHashController(controller)
@ -23,19 +23,19 @@ xToolsCryptographicHashCalculator::xToolsCryptographicHashCalculator(xToolsFileC
connect(this,
&xToolsCryptographicHashCalculator::updateResult,
controller,
&xToolsFileCheckerAssistant::updateResult);
&xToolsFileCheckAssistant::updateResult);
connect(this,
&xToolsCryptographicHashCalculator::outputMessage,
controller,
&xToolsFileCheckerAssistant::outputMessage);
&xToolsFileCheckAssistant::outputMessage);
connect(this,
&xToolsCryptographicHashCalculator::updateProgressBar,
controller,
&xToolsFileCheckerAssistant::updateProgressBar);
&xToolsFileCheckAssistant::updateProgressBar);
connect(this,
&xToolsCryptographicHashCalculator::remainTimeChanged,
controller,
&xToolsFileCheckerAssistant::changeRemainTime);
&xToolsFileCheckAssistant::changeRemainTime);
}
void xToolsCryptographicHashCalculator::run()

6
Source/Assistants/FileCheck/Source/xToolsCryptographicHashCalculator.h
View File

@ -10,12 +10,12 @@
#include <QThread>
class xToolsFileCheckerAssistant;
class xToolsFileCheckAssistant;
class xToolsCryptographicHashCalculator : public QThread
{
Q_OBJECT
public:
xToolsCryptographicHashCalculator(xToolsFileCheckerAssistant* controller, QObject* parent = Q_NULLPTR);
xToolsCryptographicHashCalculator(xToolsFileCheckAssistant* controller, QObject* parent = Q_NULLPTR);
signals:
void outputMessage(QString msg, bool isErrMsg);
@ -25,7 +25,7 @@ signals:
void remainTimeChanged(QString remainTime);
private:
xToolsFileCheckerAssistant* m_cryptographicHashController;
xToolsFileCheckAssistant* m_cryptographicHashController;
QList<qint64> m_consumeTimeList;
private:

40
Source/Assistants/FileCheck/Source/xToolsFileCheckAssistant.cpp
View File

@ -6,8 +6,8 @@
* xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
* code directory.
**************************************************************************************************/
#include "xToolsFileCheckerAssistant.h"
#include "ui_xToolsFileCheckerAssistant.h"
#include "xToolsFileCheckAssistant.h"
#include "ui_xToolsFileCheckAssistant.h"
#include <QDebug>
#include <QFileDialog>
@ -15,12 +15,12 @@
#include "xToolsCryptographicHashCalculator.h"
xToolsFileCheckerAssistant::xToolsFileCheckerAssistant(QWidget* parent)
xToolsFileCheckAssistant::xToolsFileCheckAssistant(QWidget* parent)
: QWidget(parent)
, m_fileName(QString("C:/Windows/explorer.exe"))
, m_algorithm(QCryptographicHash::Md5)
, m_calculator(Q_NULLPTR)
, ui(new Ui::xToolsFileCheckerAssistant)
, ui(new Ui::xToolsFileCheckAssistant)
{
ui->setupUi(this);
@ -58,7 +58,7 @@ xToolsFileCheckerAssistant::xToolsFileCheckerAssistant(QWidget* parent)
// It will clean the message which was showed on the info label when the timer
// is timeout
m_clearMessageTimer.setInterval(SAK_CLEAR_MESSAGE_INTERVAL);
connect(&m_clearMessageTimer, &QTimer::timeout, this, &xToolsFileCheckerAssistant::clearMessage);
connect(&m_clearMessageTimer, &QTimer::timeout, this, &xToolsFileCheckAssistant::clearMessage);
m_upperCheckBox->setChecked(true);
setWindowTitle(tr("File Check Assistant"));
@ -72,7 +72,7 @@ xToolsFileCheckerAssistant::xToolsFileCheckerAssistant(QWidget* parent)
SLOT(onAlgorithmChanged(int)));
}
xToolsFileCheckerAssistant::~xToolsFileCheckerAssistant()
xToolsFileCheckAssistant::~xToolsFileCheckAssistant()
{
delete ui;
if (m_calculator) {
@ -85,23 +85,23 @@ xToolsFileCheckerAssistant::~xToolsFileCheckerAssistant()
}
}
void xToolsFileCheckerAssistant::setUiEnable(bool enable)
void xToolsFileCheckAssistant::setUiEnable(bool enable)
{
m_algorithmComboBox->setEnabled(enable);
m_openPushButton->setEnabled(enable);
}
QString xToolsFileCheckerAssistant::fileName()
QString xToolsFileCheckAssistant::fileName()
{
return m_fileName;
}
QCryptographicHash::Algorithm xToolsFileCheckerAssistant::algorithm()
QCryptographicHash::Algorithm xToolsFileCheckAssistant::algorithm()
{
return m_algorithm;
}
void xToolsFileCheckerAssistant::updateResult(QByteArray result)
void xToolsFileCheckAssistant::updateResult(QByteArray result)
{
QString resultString = QString(result.toHex());
if (m_upperCheckBox->isChecked()) {
@ -111,7 +111,7 @@ void xToolsFileCheckerAssistant::updateResult(QByteArray result)
}
}
void xToolsFileCheckerAssistant::outputMessage(QString msg, bool isErrMsg)
void xToolsFileCheckAssistant::outputMessage(QString msg, bool isErrMsg)
{
if (isErrMsg) {
QApplication::beep();
@ -124,30 +124,30 @@ void xToolsFileCheckerAssistant::outputMessage(QString msg, bool isErrMsg)
m_clearMessageTimer.start();
}
void xToolsFileCheckerAssistant::updateProgressBar(int currentValue)
void xToolsFileCheckAssistant::updateProgressBar(int currentValue)
{
m_calculatorProgressBar->setValue(currentValue);
}
void xToolsFileCheckerAssistant::changeRemainTime(QString remainTime)
void xToolsFileCheckAssistant::changeRemainTime(QString remainTime)
{
QString str = tr("Remaining time");
m_remainTimeLabel->setText(QString("%1 %2").arg(str, remainTime));
}
void xToolsFileCheckerAssistant::finished()
void xToolsFileCheckAssistant::finished()
{
onStartStopPushButtonClicked();
}
void xToolsFileCheckerAssistant::clearMessage()
void xToolsFileCheckAssistant::clearMessage()
{
m_clearMessageTimer.stop();
m_messageLabel->clear();
m_remainTimeLabel->clear();
}
void xToolsFileCheckerAssistant::onOpenPushButtonClicked()
void xToolsFileCheckAssistant::onOpenPushButtonClicked()
{
m_fileName = QFileDialog::getOpenFileName();
m_filePathlineEdit->setText(m_fileName);
@ -160,7 +160,7 @@ void xToolsFileCheckerAssistant::onOpenPushButtonClicked()
m_messageLabel->clear();
}
void xToolsFileCheckerAssistant::onStartStopPushButtonClicked()
void xToolsFileCheckAssistant::onStartStopPushButtonClicked()
{
if (m_calculator) {
m_calculator->blockSignals(true);
@ -173,14 +173,14 @@ void xToolsFileCheckerAssistant::onStartStopPushButtonClicked()
setUiEnable(true);
} else {
m_calculator = new xToolsCryptographicHashCalculator(this);
connect(m_calculator, &QThread::finished, this, &xToolsFileCheckerAssistant::finished);
connect(m_calculator, &QThread::finished, this, &xToolsFileCheckAssistant::finished);
m_calculator->start();
m_startStopPushButton->setText(tr("StopCalculating"));
setUiEnable(false);
}
}
void xToolsFileCheckerAssistant::onUpperCheckBoxClicked()
void xToolsFileCheckAssistant::onUpperCheckBoxClicked()
{
QString temp = m_resultLineEdit->text();
if (m_upperCheckBox->isChecked()) {
@ -190,7 +190,7 @@ void xToolsFileCheckerAssistant::onUpperCheckBoxClicked()
}
}
void xToolsFileCheckerAssistant::onAlgorithmChanged(int index)
void xToolsFileCheckAssistant::onAlgorithmChanged(int index)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
QMetaEnum algorithms = QMetaEnum::fromType<SAKToolFileCheckAssistant::Algorithm>();

10
Source/Assistants/FileCheck/Source/xToolsFileCheckAssistant.h
View File

@ -19,16 +19,16 @@
#include <QWidget>
namespace Ui {
class xToolsFileCheckerAssistant;
class xToolsFileCheckAssistant;
}
class xToolsCryptographicHashCalculator;
class xToolsFileCheckerAssistant : public QWidget
class xToolsFileCheckAssistant : public QWidget
{
Q_OBJECT
public:
Q_INVOKABLE xToolsFileCheckerAssistant(QWidget* parent = Q_NULLPTR);
~xToolsFileCheckerAssistant();
Q_INVOKABLE xToolsFileCheckAssistant(QWidget* parent = Q_NULLPTR);
~xToolsFileCheckAssistant();
void setUiEnable(bool enable);
QString fileName();
@ -69,7 +69,7 @@ private:
QTimer m_clearMessageTimer;
private:
Ui::xToolsFileCheckerAssistant* ui;
Ui::xToolsFileCheckAssistant* ui;
QLineEdit* m_filePathlineEdit;
QComboBox* m_algorithmComboBox;
QLineEdit* m_resultLineEdit;

6
Source/Assistants/FileCheck/Source/xToolsFileCheckAssistant.ui
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>xToolsFileCheckerAssistant</class>
<widget class="QWidget" name="xToolsFileCheckerAssistant">
<class>xToolsFileCheckAssistant</class>
<widget class="QWidget" name="xToolsFileCheckAssistant">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>446</width>
<height>172</height>
<height>178</height>
</rect>
</property>
<property name="windowTitle">

4
Source/Assistants/FileCheck/main.cpp
View File

@ -6,11 +6,11 @@
* QtSwissArmyKnife is licensed according to the terms in the file LICENCE in the root of the source
* code directory.
**************************************************************************************************/
#include "xToolsFileCheckerAssistant.h"
#include "xToolsFileCheckAssistant.h"
#include "xToolsUi.h"
int main(int argc, char* argv[])
{
const QString appName = QObject::tr("File Check Assistant");
return sakExec<xToolsFileCheckerAssistant>(argc, argv, appName);
return sakExec<xToolsFileCheckAssistant>(argc, argv, appName);
}

8
Source/Assistants/xToolsAssistantFactory.cpp
View File

@ -13,10 +13,10 @@
#include <QWidget>
#ifdef X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT
#include "xToolsFileCheckerAssistant.h"
#include "xToolsFileCheckAssistant.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_CRCASSISTANT
#include "xToolsCRCCalculatorAssistant.h"
#include "xToolsCRCAssistant.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_NUMBERASSISTANT
#include "xToolsNumberAssistant.h"
@ -44,10 +44,10 @@ SAKAssistantsFactory::SAKAssistantsFactory(QObject* parent)
: QObject(parent)
{
#ifdef X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT
registerAssistant<xToolsCRCCalculatorAssistant>(AssistantTypesCrc, tr("CRC Assistant"));
registerAssistant<xToolsCRCAssistant>(AssistantTypesCrc, tr("CRC Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_CRCASSISTANT
registerAssistant<xToolsFileCheckerAssistant>(AssistantTypesFileCheck, tr("File Check Assistant"));
registerAssistant<xToolsFileCheckAssistant>(AssistantTypesFileCheck, tr("File Check Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_ASCIIASSISTANT
registerAssistant<xToolsAsciiAssistant>(AssistantTypesAscii, tr("ASCII Assistant"));

2
Source/Common/CommonUI/xToolsMainWindow.cpp
View File

@ -213,7 +213,7 @@ void xToolsMainWindow::initOptionMenuHdpiPolicy()
}
connect(system_action, &QAction::triggered, this, [=]() {
SAKSettings::instance()->setHdpiPolicy(xToolsDataStructure::HdpiPolicySystem);
xToolsSettings::instance()->setHdpiPolicy(xToolsDataStructure::HdpiPolicySystem);
createQtConf();
tryToReboot();
});

6
Source/MainWindow.cpp
View File

@ -136,7 +136,7 @@ void MainWindow::initMenuBar()
void MainWindow::closeEvent(QCloseEvent* event)
{
auto key = mSettingsKey.exitToSystemTray;
bool ignore = SAKSettings::instance()->value(key).toBool();
bool ignore = xToolsSettings::instance()->value(key).toBool();
if (ignore) {
this->hide();
event->ignore();
@ -403,11 +403,11 @@ void MainWindow::initOptionMenuHdpiPolicy(QMenu* optionMenu)
connect(systemAction, &QAction::triggered, this, [=]() {
createQtConf();
SAKSettings::instance()->setHdpiPolicy(sysScale);
xToolsSettings::instance()->setHdpiPolicy(sysScale);
rebootRequestion();
});
if (SAKSettings::instance()->hdpiPolicy() == sysScale) {
if (xToolsSettings::instance()->hdpiPolicy() == sysScale) {
systemAction->setChecked(true);
if (!QFile::exists(fileName)) {
createQtConf();