P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!52 Build Main App nodepad-- with QT6 

Merge pull request !52 from troxyz/wip/build-with-qt6
This commit is contained in:
爬山虎 2023-02-17 09:34:05 +00:00 committed by Gitee
parent eaedbcd1b2 e5f17ee926
commit e392ef0da9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
20 changed files with 316 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -5,7 +5,8 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport XmlPatterns) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport Xml Core5Compat)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport Xml Core5Compat)
# qscint 关键依赖库 # qscint 关键依赖库
add_subdirectory(${PROJECT_SOURCE_DIR}/src/qscint) add_subdirectory(${PROJECT_SOURCE_DIR}/src/qscint)
@ -54,7 +55,17 @@ ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/lexlib
${PROJECT_SOURCE_DIR}/src/qscint/scintilla/boostregex ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/boostregex
) )
target_link_libraries(${PROJECT_NAME} qscint Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::XmlPatterns) target_link_libraries(${PROJECT_NAME}
qscint
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Concurrent
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::PrintSupport
Qt${QT_VERSION_MAJOR}::Xml
Qt${QT_VERSION_MAJOR}::Core5Compat
)
# set(PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR}/bin") # set(PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR}/bin")
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) # set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

4
src/CmpareMode.cpp
View File

@ -281,7 +281,7 @@ quint32 CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
else if (mode == 2) else if (mode == 2)
{ {
QString temp = lineInfo.unicodeStr; QString temp = lineInfo.unicodeStr;
md4.addData(temp.replace(QRegExp("\\s"), QString("")).toUtf8()); md4.addData(temp.replace(QRegularExpression("\\s"), QString("")).toUtf8());
} }
}; };
@ -529,7 +529,7 @@ CODE_ID CmpareMode::readLineFromFile(uchar* m_fileFpr, const int fileLength, con
else if (mode == 2) else if (mode == 2)
{ {
QString temp = lineInfo.unicodeStr; QString temp = lineInfo.unicodeStr;
md4.addData(temp.replace(QRegExp("\\s"), QString("")).toUtf8()); md4.addData(temp.replace(QRegularExpression("\\s"), QString("")).toUtf8());
} }
}; };

12
src/batchfindreplace.cpp
View File

@ -1,4 +1,4 @@
#include "batchfindreplace.h" #include "batchfindreplace.h"
#include "scintillaeditview.h" #include "scintillaeditview.h"
#include "ccnotepad.h" #include "ccnotepad.h"
#include "progresswin.h" #include "progresswin.h"
@ -98,7 +98,7 @@ void BatchFindReplace::appendToFindReplaceTable(QStringList& findKeyword)
bool BatchFindReplace::tranInputKeyword(QString& findKeyWord, QStringList& outputKeyWordList) bool BatchFindReplace::tranInputKeyword(QString& findKeyWord, QStringList& outputKeyWordList)
{ {
//把空白字符，空格或者\t \r\n 等字符进行替换为空格 //把空白字符，空格或者\t \r\n 等字符进行替换为空格
QRegExp re("\\s"); QRegularExpression re("\\s");
findKeyWord.replace(re, QString(" ")); findKeyWord.replace(re, QString(" "));
//再进行空格分隔处理 //再进行空格分隔处理
@ -266,7 +266,9 @@ void BatchFindReplace::on_export()
if (!fileName.isEmpty()) if (!fileName.isEmpty())
{ {
QSettings setting(fileName, QSettings::IniFormat); QSettings setting(fileName, QSettings::IniFormat);
setting.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
setting->setIniCodec("UTF-8");
#endif
int rowNums = ui.findReplaceTable->rowCount(); int rowNums = ui.findReplaceTable->rowCount();
@ -312,7 +314,9 @@ void BatchFindReplace::on_import()
QFileInfo fi(fileNameList[0]); QFileInfo fi(fileNameList[0]);
QSettings setting(fi.filePath(), QSettings::IniFormat); QSettings setting(fi.filePath(), QSettings::IniFormat);
setting.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
setting->setIniCodec("UTF-8");
#endif
ui.findKeywordEdit->setPlainText(setting.value("find").toStringList().join(" ")); ui.findKeywordEdit->setPlainText(setting.value("find").toStringList().join(" "));
ui.replaceKeywordEdit->setPlainText(setting.value("replace").toStringList().join(" ")); ui.replaceKeywordEdit->setPlainText(setting.value("replace").toStringList().join(" "));

38
src/cceditor/ccnotepad.cpp
View File

@ -53,9 +53,11 @@
#include <QDateTime> #include <QDateTime>
#include <QShortcut> #include <QShortcut>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include <QXmlQuery> #include <QXmlQuery>
#include <QXmlFormatter> #include <QXmlFormatter>
#endif #endif
#endif
#include <QBuffer> #include <QBuffer>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QJsonObject> #include <QJsonObject>
@ -535,7 +537,9 @@ void initFileTypeLangMap()
//把新语言tagName,和关联ext单独存放起来ext_tag.ini。只读取一个文件就能获取所有，避免遍历慢 //把新语言tagName,和关联ext单独存放起来ext_tag.ini。只读取一个文件就能获取所有，避免遍历慢
QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件 QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件
QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QStringList keys = qs.allKeys(); QStringList keys = qs.allKeys();
//LangType lexId = L_USER_TXT; //LangType lexId = L_USER_TXT;
@ -4730,7 +4734,7 @@ void CCNotePad::initFileListDockWin()
} }
}); });
m_dockFileListWin->setAttribute(Qt::WA_DeleteOnClose); m_dockFileListWin->setAttribute(Qt::WA_DeleteOnClose);
m_dockFileListWin->layout()->setMargin(0); //m_dockFileListWin->layout()->setMargin(0);
m_dockFileListWin->layout()->setSpacing(0); m_dockFileListWin->layout()->setSpacing(0);
//暂时不提供关闭，因为关闭后需要同步菜单的check状态 //暂时不提供关闭，因为关闭后需要同步菜单的check状态
@ -5149,8 +5153,8 @@ void CCNotePad::saveTabEdit(int tabIndex)
if (pEdit != nullptr) if (pEdit != nullptr)
{ {
//如果是新建的文件，则弹出保存对话框，进行保存 //如果是新建的文件，则弹出保存对话框，进行保存
if (pEdit->property(Edit_File_New) >= 0) if (pEdit->property(Edit_File_New).toInt() >= 0)
{ {
QString filter("Text files (*.txt);;XML files (*.xml);;h files (*.h);;cpp file(*.cpp);;All types(*.*)"); QString filter("Text files (*.txt);;XML files (*.xml);;h files (*.h);;cpp file(*.cpp);;All types(*.*)");
QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), QString(), filter); QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), QString(), filter);
@ -5317,7 +5321,7 @@ void CCNotePad::slot_actionSaveAsFile_toggle(bool /*checked*/)
if (pEdit != nullptr) if (pEdit != nullptr)
{ {
//如果是新建的文件，则弹出保存对话框，进行保存 //如果是新建的文件，则弹出保存对话框，进行保存
if (pEdit->property(Edit_File_New) >= 0) if (pEdit->property(Edit_File_New).toInt() >= 0)
{ {
QString filter("Text files (*.txt);;XML files (*.xml);;h files (*.h);;cpp file(*.cpp);;All types(*.*)"); QString filter("Text files (*.txt);;XML files (*.xml);;h files (*.h);;cpp file(*.cpp);;All types(*.*)");
QString fileName = QFileDialog::getSaveFileName(this, tr("Save File As ..."),QString(), filter); QString fileName = QFileDialog::getSaveFileName(this, tr("Save File As ..."),QString(), filter);
@ -5619,7 +5623,7 @@ void CCNotePad::saveTempFile(ScintillaEditView* pEdit,int index, QSettings& qs)
//把文件记录到qs中去 //把文件记录到qs中去
//index一定不能重复。n表示新建 //index一定不能重复。n表示新建
//如果是新建的文件 //如果是新建的文件
if (pEdit->property(Edit_File_New) >= 0) if (pEdit->property(Edit_File_New).toInt() >= 0)
{ {
//不再保存新建的非脏文件。因为一定是空的，意义不大 //不再保存新建的非脏文件。因为一定是空的，意义不大
//qs.setValue(QString("%1").arg(index), QString("%1|1").arg(fileName)); //qs.setValue(QString("%1").arg(index), QString("%1|1").arg(fileName));
@ -5639,7 +5643,7 @@ void CCNotePad::saveTempFile(ScintillaEditView* pEdit,int index, QSettings& qs)
} }
//如果是新建的文件 //如果是新建的文件
if (pEdit->property(Edit_File_New) >= 0) if (pEdit->property(Edit_File_New).toInt() >= 0)
{ {
QString qsSavePath = qs.fileName(); QString qsSavePath = qs.fileName();
@ -5771,7 +5775,9 @@ void CCNotePad::closeAllFileStatic()
{ {
QString tempFileList = QString("notepad/temp/list"); QString tempFileList = QString("notepad/temp/list");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, tempFileList); QSettings qs(QSettings::IniFormat, QSettings::UserScope, tempFileList);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QString qsSavePath = qs.fileName(); QString qsSavePath = qs.fileName();
QFileInfo fi(qsSavePath); QFileInfo fi(qsSavePath);
QDir saveDir = fi.dir(); QDir saveDir = fi.dir();
@ -6312,7 +6318,9 @@ int CCNotePad::initFindWindow(FindTabIndex type)
//从历史查找记录文件中加载 //从历史查找记录文件中加载
QString searchHistory = QString("notepad/searchHistory");//历史查找记录 QString searchHistory = QString("notepad/searchHistory");//历史查找记录
QSettings qs(QSettings::IniFormat, QSettings::UserScope, searchHistory); QSettings qs(QSettings::IniFormat, QSettings::UserScope, searchHistory);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (qs.contains("keys")) if (qs.contains("keys"))
{ {
@ -6412,7 +6420,9 @@ void CCNotePad::slot_saveSearchHistory()
//从历史查找记录文件中加载 //从历史查找记录文件中加载
QString searchHistory = QString("notepad/searchHistory");//历史查找记录 QString searchHistory = QString("notepad/searchHistory");//历史查找记录
QSettings qs(QSettings::IniFormat, QSettings::UserScope, searchHistory); QSettings qs(QSettings::IniFormat, QSettings::UserScope, searchHistory);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (s_findHistroy.count() > 15) if (s_findHistroy.count() > 15)
{ {
@ -6639,7 +6649,7 @@ void CCNotePad::initFindResultDockWin()
m_dockSelectTreeWin = new QDockWidget(tr("Find result"), this); m_dockSelectTreeWin = new QDockWidget(tr("Find result"), this);
connect(m_dockSelectTreeWin, &QDockWidget::dockLocationChanged, this, &CCNotePad::slot_findResultPosChangeed); connect(m_dockSelectTreeWin, &QDockWidget::dockLocationChanged, this, &CCNotePad::slot_findResultPosChangeed);
m_dockSelectTreeWin->layout()->setMargin(0); //m_dockSelectTreeWin->layout()->setMargin(0);
m_dockSelectTreeWin->layout()->setSpacing(0); m_dockSelectTreeWin->layout()->setSpacing(0);
//暂时不提供关闭，因为关闭后需要同步菜单的check状态 //暂时不提供关闭，因为关闭后需要同步菜单的check状态
@ -7561,7 +7571,7 @@ bool CCNotePad::nativeOpenfile(QString openFilePath)
this->activateWindow(); this->activateWindow();
return true; return true;
} }
bool CCNotePad::nativeEvent(const QByteArray & eventType, void * message, long * result) bool CCNotePad::nativeEvent(const QByteArray & eventType, void * message, qintptr * result)
{ {
MSG *param = static_cast<MSG *>(message); MSG *param = static_cast<MSG *>(message);
@ -8111,7 +8121,9 @@ int CCNotePad::restoreLastFiles()
QString tempFileList = QString("notepad/temp/list"); QString tempFileList = QString("notepad/temp/list");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, tempFileList); QSettings qs(QSettings::IniFormat, QSettings::UserScope, tempFileList);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QStringList fileList = qs.allKeys(); QStringList fileList = qs.allKeys();
//从小到大排序一下。这里是按照ASCII排序，不得行。 //从小到大排序一下。这里是按照ASCII排序，不得行。

2
src/cceditor/ccnotepad.h
View File

@ -196,7 +196,7 @@ protected:
void dropEvent(QDropEvent* e) override; void dropEvent(QDropEvent* e) override;
bool eventFilter(QObject *watched, QEvent *event)override; bool eventFilter(QObject *watched, QEvent *event)override;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
bool nativeOpenfile(QString openFilePath); bool nativeOpenfile(QString openFilePath);
#endif #endif
#ifdef uos #ifdef uos

37
src/draglineedit.cpp
View File

@ -1,9 +1,10 @@
#include "draglineedit.h" #include "draglineedit.h"
#include <QFile>
DragLineEdit::DragLineEdit(QWidget *parent) DragLineEdit::DragLineEdit(QWidget *parent)
: QLineEdit(parent) : QLineEdit(parent)
{ {
setAcceptDrops(true); setAcceptDrops(true);
} }
DragLineEdit::~DragLineEdit() DragLineEdit::~DragLineEdit()
@ -28,25 +29,25 @@ void DragLineEdit::dragMoveEvent(QDragMoveEvent* )
void DragLineEdit::dropEvent(QDropEvent* e) void DragLineEdit::dropEvent(QDropEvent* e)
{ {
QList<QUrl> urls = e->mimeData()->urls(); QList<QUrl> urls = e->mimeData()->urls();
if (urls.isEmpty()) if (urls.isEmpty())
return; return;
QString fileName = urls.first().toLocalFile(); QString fileName = urls.first().toLocalFile();
if (fileName.isEmpty()) if (fileName.isEmpty())
{ {
return; return;
} }
if (!QFile::exists(fileName)) if (!QFile::exists(fileName))
{ {
return; return;
} }
this->setText(fileName); this->setText(fileName);
e->accept(); e->accept();
emit this->returnPressed(); emit this->returnPressed();
} }

1
src/encodeconvert.cpp
View File

@ -11,6 +11,7 @@
#include <QtConcurrent> #include <QtConcurrent>
#include <QInputDialog> #include <QInputDialog>
#include <QDragEnterEvent> #include <QDragEnterEvent>
#include <QTextCodec>
const int ITEM_CODE = Qt::UserRole + 1; const int ITEM_CODE = Qt::UserRole + 1;

16
src/findresultwin.cpp
View File

@ -208,12 +208,12 @@ void FindResultWin::slot_selectAll()
//遍历下面的子节点 //遍历下面的子节点
int i = 0; int i = 0;
QModelIndex childMi; QModelIndex childMi;
childMi = sectionItem.child(i, 0); childMi = sectionItem.model()->index(i, 0);
while (childMi.isValid()) while (childMi.isValid())
{ {
++i; ++i;
ui.resultTreeView->selectionModel()->select(childMi, QItemSelectionModel::Select); ui.resultTreeView->selectionModel()->select(childMi, QItemSelectionModel::Select);
childMi = sectionItem.child(i, 0); childMi = sectionItem.model()->index(i, 0);
} }
return i+1; return i+1;
}; };
@ -226,12 +226,12 @@ void FindResultWin::slot_selectAll()
//遍历根节点下面每一个section //遍历根节点下面每一个section
{ {
int i = 0; int i = 0;
QModelIndex section = rootItem.child(i, 0); QModelIndex section = rootItem.model()->index(i, 0);
while (section.isValid() && !section.data(ResultItemEditor).isNull()) while (section.isValid() && !section.data(ResultItemEditor).isNull())
{ {
++i; ++i;
selectCount += selectSection(section); selectCount += selectSection(section);
section = firstRootItem.child(i, 0); section = firstRootItem.model()->index(i, 0);
} }
} }
@ -255,12 +255,12 @@ void FindResultWin::slot_selectSection()
//遍历下面的子节点 //遍历下面的子节点
int i = 0; int i = 0;
QModelIndex childMi; QModelIndex childMi;
childMi = sectionItem.child(i, 0); childMi = sectionItem.model()->index(i, 0);
while (childMi.isValid()) while (childMi.isValid())
{ {
++i; ++i;
ui.resultTreeView->selectionModel()->select(childMi, QItemSelectionModel::Select); ui.resultTreeView->selectionModel()->select(childMi, QItemSelectionModel::Select);
childMi = sectionItem.child(i, 0); childMi = sectionItem.model()->index(i, 0);
} }
return i+1; return i+1;
}; };
@ -453,7 +453,7 @@ QString FindResultWin::highlightFindText(FindRecord& record)
head = QString("<font style='font-size:14px;'>%1</font>").arg(head); head = QString("<font style='font-size:14px;'>%1</font>").arg(head);
src = QString("<font style='font-size:14px;background-color:#ffffbf'>%1</font>").arg(QString(utf8bytes.mid(targetStart, targetLens)).toHtmlEscaped()); src = QString("<font style='font-size:14px;background-color:#ffffbf'>%1</font>").arg(QString(utf8bytes.mid(targetStart, targetLens)).toHtmlEscaped());
tail = QString(utf8bytes.mid(tailStart)); tail = QString(utf8bytes.mid(tailStart));
if (tail > MAX_TAIL_LENGTH) if (tail.size() > MAX_TAIL_LENGTH)
{ {
tail = (tail.mid(0, MAX_TAIL_LENGTH) + "...").toHtmlEscaped(); tail = (tail.mid(0, MAX_TAIL_LENGTH) + "...").toHtmlEscaped();
} }
@ -488,7 +488,7 @@ QString FindResultWin::highlightFindText(FindRecord& record)
src = QString("<font style='font-size:14px;font-weight:bold;color:#ffaa00'>%1</font>").arg(QString(utf8bytes.mid(targetStart, targetLens)).toHtmlEscaped()); src = QString("<font style='font-size:14px;font-weight:bold;color:#ffaa00'>%1</font>").arg(QString(utf8bytes.mid(targetStart, targetLens)).toHtmlEscaped());
QString tailContens = QString(utf8bytes.mid(tailStart)); QString tailContens = QString(utf8bytes.mid(tailStart));
if (tailContens > MAX_TAIL_LENGTH) if (tailContens.size() > MAX_TAIL_LENGTH)
{ {
tailContens = (tailContens.mid(0, MAX_TAIL_LENGTH) + "...").toHtmlEscaped(); tailContens = (tailContens.mid(0, MAX_TAIL_LENGTH) + "...").toHtmlEscaped();
} }

6
src/findwin.cpp
View File

@ -620,9 +620,9 @@ bool readBase(const QChar * str, int * value, int base, int size)
{ {
current = str[i]; current = str[i];
if (current >= 'A') if (current >= 'A')
{ {
current = current.digitValue() & 0xdf; current = QChar(current.digitValue() & 0xdf);
current = current.digitValue() - ('A' - '0' - 10); current = QChar(current.digitValue() - ('A' - '0' - 10));
} }
else if (current > '9') else if (current > '9')
return false; return false;

11
src/langextset.cpp
View File

@ -7,6 +7,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QSettings> #include <QSettings>
#include <QMessageBox> #include <QMessageBox>
#include <QFile>
int ITEM_CHANGED = Qt::UserRole; int ITEM_CHANGED = Qt::UserRole;
int ITEM_LEX_ID = Qt::UserRole + 1; //对应的语法lexer的 ID int ITEM_LEX_ID = Qt::UserRole + 1; //对应的语法lexer的 ID
@ -112,8 +113,10 @@ void LangExtSet::slot_save()
int rowNums = ui.langTableWidget->rowCount(); int rowNums = ui.langTableWidget->rowCount();
QString userLangFile = QString("notepad/tag_ext"); QString userLangFile = QString("notepad/tag_ext");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
for (int i = 0; i < rowNums; ++i) for (int i = 0; i < rowNums; ++i)
{ {
@ -180,7 +183,9 @@ void LangExtSet::loadExtRelevanceToMagr()
{ {
QString userLangFile = QString("notepad/tag_ext");//自定义语言中不能有.字符，否则可能有错，后续要检查 QString userLangFile = QString("notepad/tag_ext");//自定义语言中不能有.字符，否则可能有错，后续要检查
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (!QFile::exists(qs.fileName())) if (!QFile::exists(qs.fileName()))
{ {

18
src/langstyledefine.cpp
View File

@ -30,8 +30,10 @@ bool LangStyleDefine::readLangSetFile(QString langName, bool isLoadToUI)
{ {
QString userLangFile = QString("notepad/userlang/%1").arg(langName);//自定义语言中不能有.字符，否则可能有错，后续要检查 QString userLangFile = QString("notepad/userlang/%1").arg(langName);//自定义语言中不能有.字符，否则可能有错，后续要检查
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qDebug() << qs.fileName(); qs->setIniCodec("UTF-8");
#endif
//qDebug() << qs.fileName();
if (!qs.contains("mz")) if (!qs.contains("mz"))
{ {
@ -160,7 +162,9 @@ void LangStyleDefine::slot_save()
//把新语言tagName,和关联ext单独存放起来。后面只读取一个文件就能获取所有，避免遍历慢 //把新语言tagName,和关联ext单独存放起来。后面只读取一个文件就能获取所有，避免遍历慢
QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件 QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件
QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QStringList extList = ui.extNameLe->text().trimmed().split(" "); QStringList extList = ui.extNameLe->text().trimmed().split(" ");
extList.append(QString::number(motherLangs)); //最后一个是mother lexer extList.append(QString::number(motherLangs)); //最后一个是mother lexer
@ -201,7 +205,9 @@ void LangStyleDefine::slot_delete()
{ {
QString userLangFile = QString("notepad/userlang/%1").arg(name);//自定义语言中不能有.字符，否则可能有错，后续要检查 QString userLangFile = QString("notepad/userlang/%1").arg(name);//自定义语言中不能有.字符，否则可能有错，后续要检查
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
//删除userlang下面的tag.ini //删除userlang下面的tag.ini
QFile::remove(qs.fileName()); QFile::remove(qs.fileName());
@ -211,7 +217,9 @@ void LangStyleDefine::slot_delete()
//把新语言在ext_tag中的关联文件记录也删除 //把新语言在ext_tag中的关联文件记录也删除
QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件 QString extsFile = QString("notepad/userlang/ext_tag");//ext_tag是存在所有tag ext的文件
QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, extsFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QStringList extList = qs.value(name).toStringList(); QStringList extList = qs.value(name).toStringList();
//更新当前ExtLexerManager::getInstance()。如果不更新，就要重启软件才能生效 //更新当前ExtLexerManager::getInstance()。如果不更新，就要重启软件才能生效

11
src/main.cpp
View File

@ -1,4 +1,4 @@
#include "ccnotepad.h" #include "ccnotepad.h"
#include "nddsetting.h" #include "nddsetting.h"
#include "styleset.h" #include "styleset.h"
@ -23,11 +23,20 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#pragma comment(lib, "user32.lib") #pragma comment(lib, "user32.lib")
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#if _DEBUG #if _DEBUG
#pragma comment(lib, "qmyedit_qt5d.lib") #pragma comment(lib, "qmyedit_qt5d.lib")
#else #else
#pragma comment(lib, "qmyedit_qt5.lib") #pragma comment(lib, "qmyedit_qt5.lib")
#endif #endif
#else
#if _DEBUG
#pragma comment(lib, "qmyedit_qt6d.lib")
#else
#pragma comment(lib, "qmyedit_qt6.lib")
#endif
#endif
#include <qt_windows.h> #include <qt_windows.h>
const ULONG_PTR CUSTOM_TYPE = 10000; const ULONG_PTR CUSTOM_TYPE = 10000;
const ULONG_PTR OPEN_NOTEPAD_TYPE = 10001; const ULONG_PTR OPEN_NOTEPAD_TYPE = 10001;

250
src/nddsetting.cpp
View File

@ -25,20 +25,20 @@ bool NddSetting::checkNoExistAdd(QString key, QVariant& value)
{ {
s_nddSet->setValue(key, value); s_nddSet->setValue(key, value);
if (!s_isContentChanged) if (!s_isContentChanged)
{ {
s_isContentChanged = true; s_isContentChanged = true;
} }
return false; return false;
} }
return true; return true;
} }
//20220402这里隐含了一个前置条件：数据库句柄是在主线程创建的，最好不要在子线程中调用。 //20220402这里隐含了一个前置条件：数据库句柄是在主线程创建的，最好不要在子线程中调用。
//避免因为跨线程访问和多线程冲突访问引发的闪退问题。所以最好配置文件的读写都在主线程中进行 //避免因为跨线程访问和多线程冲突访问引发的闪退问题。所以最好配置文件的读写都在主线程中进行
void NddSetting::init() void NddSetting::init()
{ {
++s_reference; ++s_reference;
//如果已经初始化过了，则直接返回 //如果已经初始化过了，则直接返回
if (s_isExistDb) if (s_isExistDb)
@ -49,9 +49,11 @@ void NddSetting::init()
QSettings qs(QSettings::IniFormat, QSettings::UserScope, settingDir); QSettings qs(QSettings::IniFormat, QSettings::UserScope, settingDir);
QString qsSetPath = qs.fileName(); QString qsSetPath = qs.fileName();
s_nddSet = new QSettings(QSettings::IniFormat, QSettings::UserScope, settingDir); s_nddSet = new QSettings(QSettings::IniFormat, QSettings::UserScope, settingDir);
s_nddSet->setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
bool initOk = true; s_nddSet->setIniCodec("UTF-8");
#endif
bool initOk = true;
auto initNddSet = []() { auto initNddSet = []() {
QString key = "signdate"; QString key = "signdate";
@ -60,21 +62,21 @@ void NddSetting::init()
//直接写一个过去的时间，让第一次运行，总是要签到 //直接写一个过去的时间，让第一次运行，总是要签到
addKeyValueToSets(key, "2022/2/20"); addKeyValueToSets(key, "2022/2/20");
QString str; QString str;
//tab的长度，默认为4 //tab的长度，默认为4
addKeyValueToNumSets("tablens", 4); addKeyValueToNumSets("tablens", 4);
//space replace tab空格替换tab，默认0, 1为true,0为false //space replace tab空格替换tab，默认0, 1为true,0为false
addKeyValueToNumSets("tabnouse", 0); addKeyValueToNumSets("tabnouse", 0);
addKeyValueToSets("mac", "0"); addKeyValueToSets("mac", "0");
addKeyValueToNumSets("padtimes", 0); addKeyValueToNumSets("padtimes", 0);
addKeyValueToNumSets("serverip", 0); addKeyValueToNumSets("serverip", 0);
//是否高亮不同处背景 //是否高亮不同处背景
addKeyValueToNumSets("hexhigh", 1); addKeyValueToNumSets("hexhigh", 1);
addKeyValueToNumSets(VERSION, version_num); addKeyValueToNumSets(VERSION, version_num);
//皮肤id //皮肤id
addKeyValueToNumSets(SKIN_KEY, 0); addKeyValueToNumSets(SKIN_KEY, 0);
@ -94,18 +96,18 @@ void NddSetting::init()
//最大文本文件的门限。默认100M.(50-300) //最大文本文件的门限。默认100M.(50-300)
addKeyValueToNumSets(MAX_BIG_TEXT, 100); addKeyValueToNumSets(MAX_BIG_TEXT, 100);
addKeyValueToSets(SOFT_KEY, "0"); addKeyValueToSets(SOFT_KEY, "0");
addKeyValueToSets(RESTORE_CLOSE_FILE, "1"); addKeyValueToSets(RESTORE_CLOSE_FILE, "1");
//0 24 1 36 2 48 //0 24 1 36 2 48
addKeyValueToNumSets(ICON_SIZE, 1); addKeyValueToNumSets(ICON_SIZE, 1);
addKeyValueToNumSets(ZOOMVALUE, 100); addKeyValueToNumSets(ZOOMVALUE, 100);
addKeyValueToNumSets(FINDRESULTPOS, Qt::BottomDockWidgetArea);
addKeyValueToNumSets(FILELISTPOS, Qt::LeftDockWidgetArea); addKeyValueToNumSets(FINDRESULTPOS, Qt::BottomDockWidgetArea);
addKeyValueToNumSets(FILELISTPOS, Qt::LeftDockWidgetArea);
//默认0不显示 //默认0不显示
addKeyValueToNumSets(FILELISTSHOW, 0); addKeyValueToNumSets(FILELISTSHOW, 0);
@ -152,86 +154,86 @@ void NddSetting::init()
checkNoExistAdd(SKIN_KEY, v); checkNoExistAdd(SKIN_KEY, v);
} }
{ {
QVariant langs(0); QVariant langs(0);
checkNoExistAdd(LANGS_KEY, langs); checkNoExistAdd(LANGS_KEY, langs);
} }
{ {
QVariant v(0); QVariant v(0);
checkNoExistAdd(AUTOWARP_KEY, v); checkNoExistAdd(AUTOWARP_KEY, v);
} }
{ {
QVariant v(0); QVariant v(0);
checkNoExistAdd(INDENT_KEY, v); checkNoExistAdd(INDENT_KEY, v);
} }
{ {
QVariant v(0); QVariant v(0);
checkNoExistAdd(SHOWSPACE_KEY, v); checkNoExistAdd(SHOWSPACE_KEY, v);
} }
{
QVariant v(100);
checkNoExistAdd(MAX_BIG_TEXT, v);
}
{ {
QVariant v(0); QVariant v(100);
checkNoExistAdd(SOFT_STATUS, v); checkNoExistAdd(MAX_BIG_TEXT, v);
} }
{ {
QVariant v("0"); QVariant v(0);
checkNoExistAdd(SOFT_KEY, v); checkNoExistAdd(SOFT_STATUS, v);
} }
{ {
QVariant v(1); QVariant v("0");
checkNoExistAdd(RESTORE_CLOSE_FILE, v); checkNoExistAdd(SOFT_KEY, v);
} }
{ {
QVariant v(1); QVariant v(1);
checkNoExistAdd(ICON_SIZE, v); checkNoExistAdd(RESTORE_CLOSE_FILE, v);
} }
{ {
QVariant v(100); QVariant v(1);
checkNoExistAdd(ZOOMVALUE, v); checkNoExistAdd(ICON_SIZE, v);
} }
{
QVariant v(Qt::BottomDockWidgetArea);
checkNoExistAdd(FINDRESULTPOS, v);
}
{ {
QVariant v(Qt::LeftDockWidgetArea); QVariant v(100);
checkNoExistAdd(FILELISTPOS, v); checkNoExistAdd(ZOOMVALUE, v);
} }
{ {
QVariant v(0); QVariant v(Qt::BottomDockWidgetArea);
checkNoExistAdd(FILELISTSHOW, v); checkNoExistAdd(FINDRESULTPOS, v);
} }
{
QVariant v(1);
checkNoExistAdd(TOOLBARSHOW, v);
}
{
QVariant v(0);
checkNoExistAdd(SHOWWEBADDR, v);
}
{
QVariant v(14);
checkNoExistAdd(FIND_RESULT_FONT_SIZE, v);
}
} while (false);
} {
QVariant v(Qt::LeftDockWidgetArea);
checkNoExistAdd(FILELISTPOS, v);
}
{
QVariant v(0);
checkNoExistAdd(FILELISTSHOW, v);
}
{
QVariant v(1);
checkNoExistAdd(TOOLBARSHOW, v);
}
{
QVariant v(0);
checkNoExistAdd(SHOWWEBADDR, v);
}
{
QVariant v(14);
checkNoExistAdd(FIND_RESULT_FONT_SIZE, v);
}
} while (false);
s_isExistDb = initOk; }
s_isExistDb = initOk;
} }
@ -240,65 +242,65 @@ void NddSetting::init()
//写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口 //写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口
QString NddSetting::getKeyValueFromSets(QString key) QString NddSetting::getKeyValueFromSets(QString key)
{ {
return s_nddSet->value(key,"").toString(); return s_nddSet->value(key,"").toString();
} }
bool NddSetting::updataKeyValueFromSets(QString key, QString value) bool NddSetting::updataKeyValueFromSets(QString key, QString value)
{ {
s_nddSet->setValue(key,value); s_nddSet->setValue(key,value);
s_isContentChanged = true; s_isContentChanged = true;
return true; return true;
} }
//写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口 //写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口
QByteArray NddSetting::getKeyByteArrayValue(QString key) QByteArray NddSetting::getKeyByteArrayValue(QString key)
{ {
return s_nddSet->value(key, "").toByteArray(); return s_nddSet->value(key, "").toByteArray();
} }
void NddSetting::updataKeyByteArrayValue(QString key, QByteArray& value) void NddSetting::updataKeyByteArrayValue(QString key, QByteArray& value)
{ {
s_nddSet->setValue(key, QVariant(value)); s_nddSet->setValue(key, QVariant(value));
s_isContentChanged = true; s_isContentChanged = true;
} }
//第一次加一条记录，用于初始化 //第一次加一条记录，用于初始化
void NddSetting::addKeyValueToSets(QString key, QString value) void NddSetting::addKeyValueToSets(QString key, QString value)
{ {
s_nddSet->setValue(key, QVariant(value)); s_nddSet->setValue(key, QVariant(value));
} }
//写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口.0做默认值，外部最好不用0做初始化值 //写一个总的获取配置的接口，避免以后每个字段都需要写一个读写接口.0做默认值，外部最好不用0做初始化值
int NddSetting::getKeyValueFromNumSets(const QString key) int NddSetting::getKeyValueFromNumSets(const QString key)
{ {
QVariant v = s_nddSet->value(key, QVariant(0)); QVariant v = s_nddSet->value(key, QVariant(0));
return v.toInt(); return v.toInt();
} }
bool NddSetting::updataKeyValueFromNumSets(const QString key, int value) bool NddSetting::updataKeyValueFromNumSets(const QString key, int value)
{ {
s_nddSet->setValue(key, QVariant(value)); s_nddSet->setValue(key, QVariant(value));
return true; return true;
} }
//第一次加一条记录，用于初始化 //第一次加一条记录，用于初始化
void NddSetting::addKeyValueToNumSets(QString key, int value) void NddSetting::addKeyValueToNumSets(QString key, int value)
{ {
s_nddSet->setValue(key, QVariant(value)); s_nddSet->setValue(key, QVariant(value));
} }
void NddSetting::close() void NddSetting::close()
{ {
if (s_reference > 0) if (s_reference > 0)
{ {
--s_reference; --s_reference;
if (s_reference == 0) if (s_reference == 0)
{ {
s_isExistDb = false; s_isExistDb = false;
//做一次真正的保存 //做一次真正的保存
if (s_isContentChanged) if (s_isContentChanged)
@ -322,25 +324,27 @@ void NddSetting::close()
//子窗口的位置，单独放在一个winpos.ini文件中，而且启动程序时，不需要读取，可避免启动时拖慢速度 //子窗口的位置，单独放在一个winpos.ini文件中，而且启动程序时，不需要读取，可避免启动时拖慢速度
QByteArray NddSetting::getWinPos(QString key) QByteArray NddSetting::getWinPos(QString key)
{ {
winPosInit(); winPosInit();
return s_winPosSet->value(key, "").toByteArray(); return s_winPosSet->value(key, "").toByteArray();
} }
void NddSetting::updataWinPos(QString key, QByteArray& value) void NddSetting::updataWinPos(QString key, QByteArray& value)
{ {
winPosInit(); winPosInit();
s_winPosSet->setValue(key, QVariant(value)); s_winPosSet->setValue(key, QVariant(value));
} }
void NddSetting::winPosInit() void NddSetting::winPosInit()
{ {
if (s_winPosSet == nullptr) if (s_winPosSet == nullptr)
{ {
QString settingDir = QString("notepad/delayset"); QString settingDir = QString("notepad/delayset");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, settingDir); QSettings qs(QSettings::IniFormat, QSettings::UserScope, settingDir);
QString qsSetPath = qs.fileName(); QString qsSetPath = qs.fileName();
s_winPosSet = new QSettings(QSettings::IniFormat, QSettings::UserScope, settingDir); s_winPosSet = new QSettings(QSettings::IniFormat, QSettings::UserScope, settingDir);
s_winPosSet->setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
} s_winPosSet->setIniCodec("UTF-8");
#endif
}
} }

13
src/plugin/helloworld/CMakeLists.txt
View File

@ -5,7 +5,8 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport XmlPatterns) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport Xml)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Concurrent Network PrintSupport Xml)
add_definitions(-D_UNICODE -DUNICODE) add_definitions(-D_UNICODE -DUNICODE)
@ -31,7 +32,15 @@ ${PROJECT_SOURCE_DIR}/../../qscint/scintilla/lexlib
${PROJECT_SOURCE_DIR}/../../qscint/scintilla/boostregex ${PROJECT_SOURCE_DIR}/../../qscint/scintilla/boostregex
) )
target_link_libraries(${PROJECT_NAME} qscint Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::XmlPatterns) target_link_libraries(${PROJECT_NAME}
qscint
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Concurrent
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::PrintSupport
Qt${QT_VERSION_MAJOR}::Xml)
# if(NOT DEFINED ${notepad--_BINARY_DIR}) # if(NOT DEFINED ${notepad--_BINARY_DIR})
# set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${notepad--_BINARY_DIR}/bin/plugin) # set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${notepad--_BINARY_DIR}/bin/plugin)

13
src/qscint/CMakeLists.txt
View File

@ -5,7 +5,8 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) find_package(Qt$ NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
aux_source_directory(${PROJECT_SOURCE_DIR}/src SRC) aux_source_directory(${PROJECT_SOURCE_DIR}/src SRC)
aux_source_directory(${PROJECT_SOURCE_DIR}/scintilla/lexers SRC) aux_source_directory(${PROJECT_SOURCE_DIR}/scintilla/lexers SRC)
@ -35,12 +36,18 @@ ${PROJECT_SOURCE_DIR}/src/Qsci
${PROJECT_SOURCE_DIR}/scintilla/src ${PROJECT_SOURCE_DIR}/scintilla/src
${PROJECT_SOURCE_DIR}/scintilla/include) ${PROJECT_SOURCE_DIR}/scintilla/include)
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport) target_link_libraries(${PROJECT_NAME}
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Concurrent
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::PrintSupport)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5") set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5")
else() else()
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5d") set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt${QT_VERSION_MAJOR}d")
endif() endif()

6
src/qscint/src/qscilexer.cpp
View File

@ -1,4 +1,4 @@
// This module implements the QsciLexer class. // This module implements the QsciLexer class.
// //
// Copyright (c) 2021 Riverbank Computing Limited <info@riverbankcomputing.com> // Copyright (c) 2021 Riverbank Computing Limited <info@riverbankcomputing.com>
// //
@ -907,7 +907,9 @@ const char* QsciLexer::getUserDefineKeywords()
QString userLangFile = QString("notepad/userlang/%1").arg(m_tagName);//自定义语言中不能有.字符，否则可能有错，后续要检查 QString userLangFile = QString("notepad/userlang/%1").arg(m_tagName);//自定义语言中不能有.字符，否则可能有错，后续要检查
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (!qs.contains("mz")) if (!qs.contains("mz"))
{ {

76
src/qtlangset.cpp
View File

@ -382,7 +382,7 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
QsciLexer *pLexer = ScintillaEditView::createLexer(index); QsciLexer *pLexer = ScintillaEditView::createLexer(index);
if (nullptr != pLexer) if (nullptr != pLexer)
{ {
switch (flag) switch (flag)
{ {
case GLOBAL_FONT: case GLOBAL_FONT:
@ -390,9 +390,9 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
//非全局修改所有的语法对应样式 //非全局修改所有的语法对应样式
if (index != L_GLOBAL) if (index != L_GLOBAL)
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
oldfont = pLexer->font(i); oldfont = pLexer->font(i);
oldfont.setFamily(m_curStyleData.font.family()); oldfont.setFamily(m_curStyleData.font.family());
@ -423,9 +423,9 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
//非全局修改所有的语法对应样式 //非全局修改所有的语法对应样式
if (index != L_GLOBAL) if (index != L_GLOBAL)
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
oldfont = pLexer->font(i); oldfont = pLexer->font(i);
oldfont.setPointSize(m_curStyleData.font.pointSize()); oldfont.setPointSize(m_curStyleData.font.pointSize());
@ -453,9 +453,9 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
break; break;
case GLOBAL_FONT_BOLD: case GLOBAL_FONT_BOLD:
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
oldfont = pLexer->font(i); oldfont = pLexer->font(i);
oldfont.setBold(m_curStyleData.font.bold()); oldfont.setBold(m_curStyleData.font.bold());
@ -466,9 +466,9 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
break; break;
case GLOBAL_FONT_UNDERLINE: case GLOBAL_FONT_UNDERLINE:
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
oldfont = pLexer->font(i); oldfont = pLexer->font(i);
oldfont.setUnderline(m_curStyleData.font.underline()); oldfont.setUnderline(m_curStyleData.font.underline());
@ -479,9 +479,9 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
break; break;
case GLOBAL_FONT_ITALIC: case GLOBAL_FONT_ITALIC:
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
oldfont = pLexer->font(i); oldfont = pLexer->font(i);
oldfont.setItalic(m_curStyleData.font.italic()); oldfont.setItalic(m_curStyleData.font.italic());
@ -504,10 +504,10 @@ void QtLangSet::updateAllLangeStyleWithGlobal(GLOBAL_STYLE_SET flag)
break; break;
default: default:
break; break;
} }
saveLangeSet(pLexer); saveLangeSet(pLexer);
} }
delete pLexer; delete pLexer;
} }
@ -558,7 +558,7 @@ void QtLangSet::restoreOriginLangAllStyle()
{ {
QFile::remove(qs.fileName()); QFile::remove(qs.fileName());
} }
delete pLexer; delete pLexer;
pLexer = nullptr; pLexer = nullptr;
@ -605,12 +605,12 @@ void QtLangSet::restoreOriginLangOneStyle(GLOBAL_STYLE_SET flag)
QsciLexer *pLexer = ScintillaEditView::createLexer(index); QsciLexer *pLexer = ScintillaEditView::createLexer(index);
QsciLexer *pOriginLexer = ScintillaEditView::createLexer(index,"",true); QsciLexer *pOriginLexer = ScintillaEditView::createLexer(index,"",true);
if (nullptr != pLexer) if (nullptr != pLexer)
{ {
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
if (!pLexer->description(i).isEmpty()) if (!pLexer->description(i).isEmpty())
{ {
switch (flag) switch (flag)
{ {
case GLOBAL_FONT: case GLOBAL_FONT:
@ -666,11 +666,11 @@ void QtLangSet::restoreOriginLangOneStyle(GLOBAL_STYLE_SET flag)
break; break;
default: default:
break; break;
} }
} }
} }
saveLangeSet(pLexer); saveLangeSet(pLexer);
} }
delete pLexer; delete pLexer;
delete pOriginLexer; delete pOriginLexer;
} }
@ -826,7 +826,9 @@ bool QtLangSet::readLangSetFile(QString langName,QString &keyword, QString &moth
{ {
QString userLangFile = QString("notepad/userlang/%1").arg(langName);//自定义语言中不能有.字符，否则可能有错，后续要检查 QString userLangFile = QString("notepad/userlang/%1").arg(langName);//自定义语言中不能有.字符，否则可能有错，后续要检查
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs.setIniCodec("UTF-8");
#endif
//qDebug() << qs.fileName(); //qDebug() << qs.fileName();
if (!qs.contains("mz")) if (!qs.contains("mz"))
@ -954,15 +956,15 @@ void QtLangSet::slot_itemSelect(QListWidgetItem *item)
ExtLexerManager::getInstance()->getExtlistByLangTag(langName, extList); ExtLexerManager::getInstance()->getExtlistByLangTag(langName, extList);
ui.extFileType->setText(extList.join(',')); ui.extFileType->setText(extList.join(','));
for (int i = 0; i <= 255; ++i) for (int i = 0; i <= 255; ++i)
{ {
QString desc = pLexer->description(i); QString desc = pLexer->description(i);
if (!desc.isEmpty()) if (!desc.isEmpty())
{ {
QListWidgetItem *itemtemp = new QListWidgetItem(desc); QListWidgetItem *itemtemp = new QListWidgetItem(desc);
itemtemp->setData(Qt::UserRole, i); itemtemp->setData(Qt::UserRole, i);
ui.styleListWidget->addItem(itemtemp); ui.styleListWidget->addItem(itemtemp);
} }
} }
} }

4
src/scintillaeditview.cpp
View File

@ -3307,8 +3307,8 @@ bool isUrlQueryDelimiter(QChar const c)
void scanToUrlEnd(QString & text, int textLen, int start, int* distance) void scanToUrlEnd(QString & text, int textLen, int start, int* distance)
{ {
int p = start; int p = start;
QChar q = 0; QChar q{0};
enum { sHostAndPath, sQuery, sQueryAfterDelimiter, sQueryQuotes, sQueryAfterQuotes, sFragment } s = sHostAndPath; enum { sHostAndPath, sQuery, sQueryAfterDelimiter, sQueryQuotes, sQueryAfterQuotes, sFragment } s = sHostAndPath;
while (p < textLen) while (p < textLen)
{ {

8
src/shortcutkeymgr.cpp
View File

@ -139,7 +139,9 @@ void ShortcutKeyMgr::loadUserDefSet()
{ {
QString userDefFile = QString("notepad/shortcuttab"); QString userDefFile = QString("notepad/shortcuttab");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userDefFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userDefFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
QStringList keys = qs.allKeys(); QStringList keys = qs.allKeys();
@ -164,7 +166,9 @@ bool ShortcutKeyMgr::ModifyShortCutKey(QString initTag, QString keySeqStr)
{ {
QString userDefFile = QString("notepad/shortcuttab"); QString userDefFile = QString("notepad/shortcuttab");
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userDefFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userDefFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (s_shortcutKeysMap->contains(initTag)) if (s_shortcutKeysMap->contains(initTag))
{ {

8
src/userlexdef.cpp
View File

@ -24,7 +24,9 @@ bool UserLexDef::readUserSettings(QString langTagName)
QString userLangFile = QString("notepad/userlang/%1").arg(langTagName); QString userLangFile = QString("notepad/userlang/%1").arg(langTagName);
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
if (!qs.contains(QString("mz"))) if (!qs.contains(QString("mz")))
{ {
@ -93,7 +95,9 @@ bool UserLexDef::writeUserSettings(QString langTagName)
QString userLangFile = QString("notepad/userlang/%1").arg(langTagName); QString userLangFile = QString("notepad/userlang/%1").arg(langTagName);
QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile); QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
qs.setIniCodec("UTF-8"); #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
qs->setIniCodec("UTF-8");
#endif
qs.clear(); qs.clear();
qs.setValue("mz", langTagName); qs.setValue("mz", langTagName);