Prechádzať zdrojové kódy

统一修改编码为utf8-bom

爬山虎 2 rokov pred
rodič
commit
ab92d95baf
96 zmenil súbory, kde vykonal 415 pridanie a 665 odobranie
  1. 1 1
      src/CmpareMode.cpp
  2. 1 1
      src/CmpareMode.h
  3. 1 1
      src/Sorters.h
  4. 1 1
      src/aboutndd.cpp
  5. 1 1
      src/aboutndd.h
  6. 10 10
      src/batchfindreplace.cpp
  7. 1 1
      src/batchfindreplace.h
  8. 1 1
      src/bigfilemessage.cpp
  9. 1 1
      src/bigfilemessage.h
  10. 1 1
      src/cceditor/ccnotepad.cpp
  11. 1 1
      src/cceditor/ccnotepad.h
  12. 1 1
      src/cceditor/filemanager.cpp
  13. 19 19
      src/cceditor/filemanager.h
  14. 5 5
      src/columnedit.cpp
  15. 1 1
      src/columnedit.h
  16. 1 1
      src/common.cpp
  17. 1 1
      src/common.h
  18. 1 1
      src/ctipwin.cpp
  19. 1 1
      src/ctipwin.h
  20. 1 1
      src/doctypelistview.h
  21. 3 3
      src/draglineedit.cpp
  22. 4 4
      src/draglineedit.h
  23. 8 8
      src/extLexermanager.cpp
  24. 5 5
      src/extlexermanager.h
  25. 1 1
      src/filecmprulewin.cpp
  26. 1 1
      src/filecmprulewin.h
  27. 6 6
      src/filelistview.cpp
  28. 1 1
      src/filelistview.h
  29. 1 1
      src/findcmpwin.cpp
  30. 1 1
      src/findcmpwin.h
  31. 1 1
      src/findresultwin.cpp
  32. 1 1
      src/findresultwin.h
  33. 1 1
      src/findwin.cpp
  34. 1 1
      src/findwin.h
  35. 1 1
      src/gotolinewin.cpp
  36. 1 1
      src/gotolinewin.h
  37. 3 3
      src/hexcmprangewin.cpp
  38. 1 1
      src/hexcmprangewin.h
  39. 2 2
      src/hexfilegoto.cpp
  40. 1 1
      src/hexfilegoto.h
  41. 1 1
      src/hexrulewin.cpp
  42. 1 1
      src/hexrulewin.h
  43. 8 8
      src/include/pluginGl.h
  44. 11 11
      src/langextset.cpp
  45. 1 1
      src/langextset.h
  46. 1 1
      src/langstyledefine.cpp
  47. 1 1
      src/langstyledefine.h
  48. 1 1
      src/mytreeview.cpp
  49. 1 1
      src/mytreeview.h
  50. 35 35
      src/nddsetting.cpp
  51. 19 19
      src/nddsetting.h
  52. 7 7
      src/ndstyleditemdelegate.cpp
  53. 1 1
      src/ndstyleditemdelegate.h
  54. 1 1
      src/plugin.cpp
  55. 1 1
      src/plugin.h
  56. 0 182
      src/plugin/helloworld/helloworld.vcxproj
  57. 0 69
      src/plugin/helloworld/helloworld.vcxproj.filters
  58. 1 1
      src/plugin/helloworld/helloworldexport.cpp
  59. 1 1
      src/plugin/helloworld/qttestclass.cpp
  60. 1 1
      src/plugin/helloworld/qttestclass.h
  61. 1 1
      src/plugin/test/test.cpp
  62. 8 8
      src/pluginGl.h
  63. 1 1
      src/pluginmgr.cpp
  64. 1 1
      src/pluginmgr.h
  65. 1 1
      src/qscint/Python/config-tests/cfgtest_Qsci.cpp
  66. 1 1
      src/qscint/scintilla/include/Scintilla.h
  67. 1 1
      src/qscint/scintilla/lexers/LexAVS.cpp
  68. 1 1
      src/qscint/scintilla/src/Catalogue.cpp
  69. 1 0
      src/qscint/src/Qsci/qsciglobal.h
  70. 1 1
      src/qscint/src/Qsci/qscilexerasm.h
  71. 1 1
      src/qscint/src/Qsci/qscilexerglobal.h
  72. 1 1
      src/qscint/src/Qsci/qscilexerr.h
  73. 1 1
      src/qscint/src/Qsci/qscilexervb.h
  74. 1 1
      src/qscint/src/qscilexerasm.cpp
  75. 1 1
      src/qscint/src/qscilexerglobal.cpp
  76. 1 1
      src/qscint/src/qscilexerr.cpp
  77. 1 1
      src/qscint/src/qscilexervb.cpp
  78. 147 147
      src/qtlangset.cpp
  79. 1 1
      src/qtlangset.h
  80. 1 1
      src/rcglobal.h
  81. 1 1
      src/renamewin.cpp
  82. 1 1
      src/renamewin.h
  83. 1 1
      src/rgba_icons.h
  84. 1 1
      src/scintillaeditview.cpp
  85. 1 1
      src/scintillaeditview.h
  86. 1 1
      src/scintillahexeditview.cpp
  87. 1 1
      src/scintillahexeditview.h
  88. 3 3
      src/shortcutkeyeditwin.cpp
  89. 1 1
      src/shortcutkeyeditwin.h
  90. 14 14
      src/shortcutkeymgr.cpp
  91. 2 2
      src/shortcutkeymgr.h
  92. 14 14
      src/styleset.cpp
  93. 3 3
      src/styleset.h
  94. 1 1
      src/texteditsetwin.h
  95. 8 8
      src/userlexdef.cpp
  96. 1 1
      src/userlexdef.h

+ 1 - 1
src/CmpareMode.cpp

@@ -1,4 +1,4 @@
-#include "CmpareMode.h"
+#include "CmpareMode.h"
 #include "Encode.h"
 #include "rcglobal.h"
 

+ 1 - 1
src/CmpareMode.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <qobject.h>
 #include<QVector>
 #include<QMap>

+ 1 - 1
src/Sorters.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <algorithm>
 #include <utility>
 #include <random>

+ 1 - 1
src/aboutndd.cpp

@@ -1,4 +1,4 @@
-#include "aboutndd.h"
+#include "aboutndd.h"
 
 AboutNdd::AboutNdd(QWidget *parent)
 	: QWidget(parent)

+ 1 - 1
src/aboutndd.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_aboutndd.h"

+ 10 - 10
src/batchfindreplace.cpp

@@ -1,4 +1,4 @@
-#include "batchfindreplace.h"
+锘�#include "batchfindreplace.h"
 #include "scintillaeditview.h"
 #include "ccnotepad.h"
 #include "progresswin.h"
@@ -31,7 +31,7 @@ void BatchFindReplace::setTabWidget(QTabWidget* editTabWidget)
 	m_editTabWidget = editTabWidget;
 }
 
-//自动调整当前窗口的状态,如果发生了变化,则需要认定为是首次查找
+//鑷�姩璋冩暣褰撳墠绐楀彛鐨勭姸鎬侊紝濡傛灉鍙戠敓浜嗗彉鍖栵紝鍒欓渶瑕佽�瀹氫负鏄��娆℃煡鎵�
 QWidget* BatchFindReplace::autoAdjustCurrentEditWin()
 {
 	QWidget* pw = m_editTabWidget->currentWidget();
@@ -53,7 +53,7 @@ void BatchFindReplace::appendToFindTable(QString findKeyword)
 	ui.findReplaceTable->setItem(rNum, 1, new QTableWidgetItem());
 }
 
-//这里不能追加,而是插入,即对应的Item必须已经存在。否则不插入
+//杩欓噷涓嶈兘杩藉姞锛岃€屾槸鎻掑叆锛屽嵆瀵瑰簲鐨処tem蹇呴』宸茬粡瀛樺湪銆傚惁鍒欎笉鎻掑叆
 void BatchFindReplace::insertToReplaceTable(int row, QString replaceKeyword)
 {
 	QTableWidgetItem* item = ui.findReplaceTable->item(row, 1);
@@ -97,11 +97,11 @@ void BatchFindReplace::appendToFindReplaceTable(QStringList& findKeyword)
 
 bool BatchFindReplace::tranInputKeyword(QString& findKeyWord, QStringList& outputKeyWordList)
 {
-	//把空白字符,空格或者\t \r\n 等字符进行替换为空格
+	//鎶婄┖鐧藉瓧绗︼紝绌烘牸鎴栬€匼t \r\n 绛夊瓧绗﹁繘琛屾浛鎹�负绌烘牸
 	QRegExp re("\\s");
 	findKeyWord.replace(re, QString(" "));
 
-	//再进行空格分隔处理
+	//鍐嶈繘琛岀┖鏍煎垎闅斿�鐞�
 	outputKeyWordList = findKeyWord.split(" ");
 
 	if (outputKeyWordList.size() > 20000)
@@ -110,7 +110,7 @@ bool BatchFindReplace::tranInputKeyword(QString& findKeyWord, QStringList& outpu
 		return false;
 	}
 
-	//删除每一个空的元素
+	//鍒犻櫎姣忎竴涓�┖鐨勫厓绱�
 	for (int i = outputKeyWordList.size() - 1; i >= 0; --i)
 	{
 		if (outputKeyWordList[i].trimmed().isEmpty())
@@ -166,7 +166,7 @@ void BatchFindReplace::on_freshBtClick()
 	}
 }
 
-//进行批量查找工作
+//杩涜�鎵归噺鏌ユ壘宸ヤ綔
 void BatchFindReplace::on_findBtClick()
 {
 	if (m_mainNotepad != nullptr && m_mainNotepad)
@@ -213,7 +213,7 @@ void BatchFindReplace::on_findBtClick()
 	}
 }
 
-//进行批量替换工作
+//杩涜�鎵归噺鏇挎崲宸ヤ綔
 void BatchFindReplace::on_replaceBtClick()
 {
 	if (m_mainNotepad != nullptr && m_mainNotepad)
@@ -306,9 +306,9 @@ void BatchFindReplace::on_import()
 	QFileDialog fd(this, QString(), CCNotePad::s_lastOpenDirPath);
 	fd.setFileMode(QFileDialog::ExistingFile);
 
-	if (fd.exec() == QDialog::Accepted)   //如果成功的执行
+	if (fd.exec() == QDialog::Accepted)   //濡傛灉鎴愬姛鐨勬墽琛�
 	{
-		QStringList fileNameList = fd.selectedFiles();      //返回文件列表的名称
+		QStringList fileNameList = fd.selectedFiles();      //杩斿洖鏂囦欢鍒楄〃鐨勫悕绉�
 		QFileInfo fi(fileNameList[0]);
 
 		QSettings setting(fi.filePath(), QSettings::IniFormat);

+ 1 - 1
src/batchfindreplace.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include <QTabWidget>

+ 1 - 1
src/bigfilemessage.cpp

@@ -1,4 +1,4 @@
-#include "bigfilemessage.h"
+#include "bigfilemessage.h"
 
 BigFileMessage::BigFileMessage(QWidget *parent)
 	: QDialog(parent), m_result(-1)

+ 1 - 1
src/bigfilemessage.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "ccnotepad.h"
 
 #include <QWidget>

+ 1 - 1
src/cceditor/ccnotepad.cpp

@@ -1,4 +1,4 @@
-#include <memory>
+#include <memory>
 #include "ccnotepad.h"
 #include "filemanager.h"
 #include "Encode.h"

+ 1 - 1
src/cceditor/ccnotepad.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include <QLabel>

+ 1 - 1
src/cceditor/filemanager.cpp

@@ -1,4 +1,4 @@
-#include "filemanager.h"
+#include "filemanager.h"
 #include "scintillaeditview.h"
 #include "scintillahexeditview.h"
 #include "CmpareMode.h"

+ 19 - 19
src/cceditor/filemanager.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 
 #include "common.h"
 #include "rcglobal.h"
@@ -11,7 +11,7 @@
 class ScintillaEditView;
 class ScintillaHexEditView;
 
-//小于100k的文件一次性全部读取完毕
+//灏忎簬100k鐨勬枃浠朵竴娆℃€у叏閮ㄨ�鍙栧畬姣�
 const int LITTLE_FILE_MAX = 1024000;
 
 enum ERROR_TYPE {
@@ -29,16 +29,16 @@ struct NewFileIdMgr {
 	}
 };
 
-//管理二进制文件的信息
+//绠$悊浜岃繘鍒舵枃浠剁殑淇℃伅
 struct HexFileMgr {
 	QString filePath;
 	QFile* file;
 	qint64 fileOffset;
 	qint64 fileSize;
-	qint16 lineSize;//每次读取多少行,默认为64行,没行16个字符
+	qint16 lineSize;//姣忔�璇诲彇澶氬皯琛岋紝榛樿�涓�64琛岋紝娌¤�16涓�瓧绗�
 	char* contentBuf;
 	int contentRealSize;
-	bool onetimeRead; //是否一次性全部读取到内存。小于等于LITTLE_FILE_MAX的才会全部读取
+	bool onetimeRead; //鏄�惁涓€娆℃€у叏閮ㄨ�鍙栧埌鍐呭瓨銆傚皬浜庣瓑浜嶭ITTLE_FILE_MAX鐨勬墠浼氬叏閮ㄨ�鍙�
 	HexFileMgr() :file(nullptr), fileOffset(0), lineSize(64), fileSize(0), contentBuf(nullptr), contentRealSize(0),onetimeRead(false)
 	{
 
@@ -62,17 +62,17 @@ private:
 	HexFileMgr(const HexFileMgr&) = delete;
 };
 
-//管理大文本文件的信息
+//绠$悊澶ф枃鏈�枃浠剁殑淇℃伅
 struct TextFileMgr {
 	QString filePath;
 	QFile* file;
 	qint64 fileOffset;
 	qint64 fileSize;
-	qint16 lineSize;//每次读取多少行,默认每次读取1024行。但是最大不超过1M的内容。
+	qint16 lineSize;//姣忔�璇诲彇澶氬皯琛岋紝榛樿�姣忔�璇诲彇1024琛屻€備絾鏄�渶澶т笉瓒呰繃1M鐨勫唴瀹广€�
 	char* contentBuf;
 	int contentRealSize;
 	int loadWithCode;
-	int lineEndType;//行尾类型,win linux mac
+	int lineEndType;//琛屽熬绫诲瀷锛寃in linux mac
 	
 	TextFileMgr() :file(nullptr), fileOffset(0), lineSize(64), fileSize(0), contentBuf(nullptr), contentRealSize(0), loadWithCode(CODE_ID::UNKOWN),lineEndType(RC_LINE_FORM::UNKNOWN_LINE)
 	{
@@ -98,23 +98,23 @@ private:
 };
 
 struct BlockIndex {
-	qint64 fileOffset;//块的开始地址
-	quint32 fileSize;//块的大小
-	quint32 lineNumStart;//块中行号的开始值
-	quint32 lineNum;//块中的行数量
+	qint64 fileOffset;//鍧楃殑寮€濮嬪湴鍧€
+	quint32 fileSize;//鍧楃殑澶у皬
+	quint32 lineNumStart;//鍧椾腑琛屽彿鐨勫紑濮嬪€�
+	quint32 lineNum;//鍧椾腑鐨勮�鏁伴噺
 };
 
-//管理大文本文件,可以编辑的信息
+//绠$悊澶ф枃鏈�枃浠�,鍙�互缂栬緫鐨勪俊鎭�
 struct BigTextEditFileMgr {
 	QString filePath;
 	QFile* file;
-	uchar* filePtr;//使用的是文件映射的方式打开
-	quint32 m_curBlockIndex; //当前展示中的块索引序号
-	int loadWithCode; //以何种编码来加载解析文件。默认UTF8
-	int lineEndType;//行尾类型,win linux mac
-	static const qint16 BLOCK_SIZE = 1;//块大小,单位M。开始是4M,发现块越大,行越多,那么在一块中定位行的位置越慢
+	uchar* filePtr;//浣跨敤鐨勬槸鏂囦欢鏄犲皠鐨勬柟寮忔墦寮€
+	quint32 m_curBlockIndex; //褰撳墠灞曠ず涓�殑鍧楃储寮曞簭鍙�
+	int loadWithCode; //浠ヤ綍绉嶇紪鐮佹潵鍔犺浇瑙f瀽鏂囦欢銆傞粯璁�TF8
+	int lineEndType;//琛屽熬绫诲瀷锛寃in linux mac
+	static const qint16 BLOCK_SIZE = 1;//鍧楀ぇ灏忥紝鍗曚綅M銆傚紑濮嬫槸4M锛屽彂鐜板潡瓒婂ぇ锛岃�瓒婂�锛岄偅涔堝湪涓€鍧椾腑瀹氫綅琛岀殑浣嶇疆瓒婃參
 
-	QVector<BlockIndex> blocks;//每一块的索引。打开文件的时候,需要建立该索引
+	QVector<BlockIndex> blocks;//姣忎竴鍧楃殑绱㈠紩銆傛墦寮€鏂囦欢鐨勬椂鍊欙紝闇€瑕佸缓绔嬭�绱㈠紩
 	
 	BigTextEditFileMgr():filePtr(nullptr), file(nullptr), m_curBlockIndex(0), loadWithCode(CODE_ID::UNKOWN), lineEndType(RC_LINE_FORM::UNKNOWN_LINE)
 	{

+ 5 - 5
src/columnedit.cpp

@@ -1,4 +1,4 @@
-#include "columnedit.h"
+锘�#include "columnedit.h"
 #include "scintillaeditview.h"
 
 ColumnEdit::ColumnEdit(QWidget *parent)
@@ -54,7 +54,7 @@ void ColumnEdit::slot_bigChar(bool isCheck)
 	ui.capital->setEnabled(isCheck);
 }
 
-//自动调整当前窗口的状态
+//鑷�姩璋冩暣褰撳墠绐楀彛鐨勭姸鎬�
 QWidget* ColumnEdit::autoAdjustCurrentEditWin()
 {
 	QWidget* pw = m_editTabWidget->currentWidget();
@@ -93,7 +93,7 @@ void ColumnEdit::slot_ok()
 	QString prefix = ui.prefix->text();
 	bool isCapital = ui.capital->isChecked();
 
-	//是插入文本模式
+	//鏄�彃鍏ユ枃鏈�ā寮�
 	if (ui.textGroupBox->isChecked())
 	{
 
@@ -138,7 +138,7 @@ void ColumnEdit::slot_ok()
 		}
 		else
 		{
-			//这里要加个提示
+			//杩欓噷瑕佸姞涓�彁绀�
 			QApplication::beep();
 			return;
 		}
@@ -209,7 +209,7 @@ void ColumnEdit::slot_ok()
 		lineText.chrg.cpMin = static_cast<Sci_Position>(lineBegin);
 		lineText.chrg.cpMax = static_cast<Sci_Position>(lineEnd);
 		lineText.lpstrText = lineData.data();
-		//获取原始行的内容
+		//鑾峰彇鍘熷�琛岀殑鍐呭�
 		pEdit->SendScintilla(SCI_GETTEXTRANGE, 0, &lineText);
 
 		if (lineEndCol < cursorCol)

+ 1 - 1
src/columnedit.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include <QTabWidget>

+ 1 - 1
src/common.cpp

@@ -1,4 +1,4 @@
-#include "common.h"
+#include "common.h"
 
 
 int nbDigitsFromNbLines(size_t nbLines)

+ 1 - 1
src/common.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <QAction>
 #include <qscilexer.h>
 

+ 1 - 1
src/ctipwin.cpp

@@ -1,4 +1,4 @@
-#include "ctipwin.h"
+#include "ctipwin.h"
 
 #include <QTimer>
 

+ 1 - 1
src/ctipwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_ctipwin.h"

+ 1 - 1
src/doctypelistview.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include <QMap>

+ 3 - 3
src/draglineedit.cpp

@@ -1,4 +1,4 @@
-#include "draglineedit.h"
+锘�#include "draglineedit.h"
 
 DragLineEdit::DragLineEdit(QWidget *parent)
 	: QLineEdit(parent)
@@ -12,9 +12,9 @@ DragLineEdit::~DragLineEdit()
 
 void DragLineEdit::dragEnterEvent(QDragEnterEvent* event)
 {
-	if (event->mimeData()->hasFormat("text/uri-list")) //只能打开文本文件
+	if (event->mimeData()->hasFormat("text/uri-list")) //鍙�兘鎵撳紑鏂囨湰鏂囦欢
 	{
-		event->accept(); //可以在这个窗口部件上拖放对象
+		event->accept(); //鍙�互鍦ㄨ繖涓�獥鍙i儴浠朵笂鎷栨斁瀵硅薄
 	}
 	else
 	{

+ 4 - 4
src/draglineedit.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 
 #include <QLineEdit>
 #include <QLineEdit>
@@ -16,10 +16,10 @@ public:
 
 
 protected:
-	///< 拖动文件到窗口 触发
+	///< 鎷栧姩鏂囦欢鍒扮獥鍙� 瑙﹀彂
 	void dragEnterEvent(QDragEnterEvent* event) override;
-	///< 拖动文件到窗口移动文件 触发
+	///< 鎷栧姩鏂囦欢鍒扮獥鍙gЩ鍔ㄦ枃浠� 瑙﹀彂
 	void dragMoveEvent(QDragMoveEvent* event) override;
-	///< 拖动文件到窗口释放文件触发
+	///< 鎷栧姩鏂囦欢鍒扮獥鍙i噴鏀炬枃浠惰Е鍙�
 	void dropEvent(QDropEvent* event) override;
 };

+ 8 - 8
src/extLexermanager.cpp

@@ -1,7 +1,7 @@
-#include "extlexermanager.h"
+锘�#include "extlexermanager.h"
 
-//专门用来管理用户自定义的Ext 和 词法Lexer关联的类。
-//给出一个文件的ext后缀,快速告知该使用什么lexer进行语法高亮
+//涓撻棬鐢ㄦ潵绠$悊鐢ㄦ埛鑷�畾涔夌殑Ext 鍜� 璇嶆硶Lexer鍏宠仈鐨勭被銆�
+//缁欏嚭涓€涓�枃浠剁殑ext鍚庣紑锛屽揩閫熷憡鐭ヨ�浣跨敤浠€涔坙exer杩涜�璇�硶楂樹寒
 
 ExtLexerManager* ExtLexerManager::s_instance = nullptr;
 
@@ -42,9 +42,9 @@ void ExtLexerManager::remove(QString ext)
 }
 
 
-//ext:文件的后缀名 langTagName:语言的tag名称 
-//lexerId 语法的id,如果是用户自定义,则必然是L_USER_TXT,L_USER_CPP,L_USER_HTML,L_USER_JS,L_USER_XML, L_USER_INI 中的一个。
-//langTagName:只有在用户定义语言下,才需要tagName。因为非用户定义的lexer,其tagname是固定的。
+//ext:鏂囦欢鐨勫悗缂€鍚� langTagName:璇�█鐨則ag鍚嶇О 
+//lexerId 璇�硶鐨刬d锛屽�鏋滄槸鐢ㄦ埛鑷�畾涔夛紝鍒欏繀鐒舵槸L_USER_TXT,L_USER_CPP,L_USER_HTML,L_USER_JS,L_USER_XML, L_USER_INI 涓�殑涓€涓�€�
+//langTagName:鍙�湁鍦ㄧ敤鎴峰畾涔夎�瑷€涓嬶紝鎵嶉渶瑕乼agName銆傚洜涓洪潪鐢ㄦ埛瀹氫箟鐨刲exer锛屽叾tagname鏄�浐瀹氱殑銆�
 void ExtLexerManager::addNewExtType(QString ext, LangType lexerId, QString langTagName)
 {
 	LexerInfo value(lexerId, langTagName);
@@ -61,7 +61,7 @@ bool ExtLexerManager::getLexerTypeByExt(QString ext, LexerInfo& lexer)
 	return false;
 }
 
-//列出tag语言下面的所有关联的文件后缀列表
+//鍒楀嚭tag璇�█涓嬮潰鐨勬墍鏈夊叧鑱旂殑鏂囦欢鍚庣紑鍒楄〃
 void ExtLexerManager::getExtlistByLangTag(QString tag, QStringList& extList)
 {
 	for (QMap<QString, LexerInfo>::iterator it = m_extToLexerIdMap.begin(); it != m_extToLexerIdMap.end(); ++it)
@@ -75,7 +75,7 @@ void ExtLexerManager::getExtlistByLangTag(QString tag, QStringList& extList)
 	}
 }
 
-//列出tag语言下面的所有关联的文件后缀列表
+//鍒楀嚭tag璇�█涓嬮潰鐨勬墍鏈夊叧鑱旂殑鏂囦欢鍚庣紑鍒楄〃
 void ExtLexerManager::getExtlistByLangTag(QMap<QString,QStringList>& extLangMap)
 {
 	for (QMap<QString, LexerInfo>::iterator it = m_extToLexerIdMap.begin(); it != m_extToLexerIdMap.end(); ++it)

+ 5 - 5
src/extlexermanager.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <QMap>
 #include <qscilexer.h>
 
@@ -26,8 +26,8 @@ enum LangType {
 #endif
 
 struct LexerInfo{
-	LangType lexerId; //如果是L_USER_DEFINE,则表示母版的类型
-	QString tagName; //语言tag名称。
+	LangType lexerId; //濡傛灉鏄疞_USER_DEFINE锛屽垯琛ㄧず姣嶇増鐨勭被鍨�
+	QString tagName; //璇�█tag鍚嶇О銆�
 	bool isUserDefineLangs()
 	{
 		return (lexerId > L_USER_DEFINE);
@@ -55,10 +55,10 @@ public:
 
 	bool getLexerTypeByExt(QString ext, LexerInfo& lexer);
 
-	//列出tag语言下面的所有关联的文件后缀列表
+	//鍒楀嚭tag璇�█涓嬮潰鐨勬墍鏈夊叧鑱旂殑鏂囦欢鍚庣紑鍒楄〃
 	void getExtlistByLangTag(QString tag, QStringList& extList);
 
-	//列出所有语言下面的所有关联的文件后缀列表
+	//鍒楀嚭鎵€鏈夎�瑷€涓嬮潰鐨勬墍鏈夊叧鑱旂殑鏂囦欢鍚庣紑鍒楄〃
 	void getExtlistByLangTag(QMap<QString, QStringList>& extLangMap);
 
 

+ 1 - 1
src/filecmprulewin.cpp

@@ -1,4 +1,4 @@
-#include "filecmprulewin.h"
+#include "filecmprulewin.h"
 
 FileCmpRuleWin::FileCmpRuleWin(int mode, bool blankMath, int equalRato,QWidget *parent)
 	: QWidget(parent)

+ 1 - 1
src/filecmprulewin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_filecmprulewin.h"

+ 6 - 6
src/filelistview.cpp

@@ -1,11 +1,11 @@
-#include "filelistview.h"
+锘�#include "filelistview.h"
 #include "rcglobal.h"
 #include "ccnotepad.h"
 #include <QListWidgetItem>
 #include <QMenu>
 
 
-//当显示文件多了以后,把所有文件列在该列表中
+//褰撴樉绀烘枃浠跺�浜嗕互鍚庯紝鎶婃墍鏈夋枃浠跺垪鍦ㄨ�鍒楄〃涓�
 
 FileListView::FileListView(QWidget *parent)
 	: QWidget(parent), m_pNotepad(nullptr)
@@ -14,7 +14,7 @@ FileListView::FileListView(QWidget *parent)
 
 	connect(ui.filelistWidget, &QListWidget::itemDoubleClicked, this, &FileListView::itemDoubleClicked);
 
-	setContextMenuPolicy(Qt::CustomContextMenu);  //设置枚举值
+	setContextMenuPolicy(Qt::CustomContextMenu);  //璁剧疆鏋氫妇鍊�
 
 	connect(this, &QListWidget::customContextMenuRequested, this, &FileListView::slot_ShowPopMenu);
 }
@@ -29,7 +29,7 @@ void FileListView::setNotepadWin(QWidget* pNotepad)
 	m_pNotepad = pNotepad;
 }
 
-//右键菜单
+//鍙抽敭鑿滃崟
 void FileListView::slot_ShowPopMenu(const QPoint& pos)
 {
 	QListWidgetItem* curItem = ui.filelistWidget->itemAt(pos);
@@ -53,11 +53,11 @@ void FileListView::slot_ShowPopMenu(const QPoint& pos)
 				{
 					pNotePad->closeFileByEditWidget(m_fileEditMap.value(curItem->text()).pEditWidget);
 				}
-				//注意这里不需要在删除m_fileEditMap元素,因为closeFileByEditWidget里面会调用。
+				//娉ㄦ剰杩欓噷涓嶉渶瑕佸湪鍒犻櫎m_fileEditMap鍏冪礌锛屽洜涓篶loseFileByEditWidget閲岄潰浼氳皟鐢ㄣ€�
 			}
 		});
 
-		//没有名称表示是对齐的item,不存在对应的文件,只是占位
+		//娌℃湁鍚嶇О琛ㄧず鏄��榻愮殑item锛屼笉瀛樺湪瀵瑰簲鐨勬枃浠讹紝鍙�槸鍗犱綅
 		if (curItem->text().isEmpty())
 		{
 			actionAdd->setEnabled(false);

+ 1 - 1
src/filelistview.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include <QListWidgetItem>

+ 1 - 1
src/findcmpwin.cpp

@@ -1,4 +1,4 @@
-#include "findcmpwin.h"
+#include "findcmpwin.h"
 #include "qscidisplaywindow.h"
 #include <QRadioButton>
 #include <QMessageBox>

+ 1 - 1
src/findcmpwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include <QTabWidget>

+ 1 - 1
src/findresultwin.cpp

@@ -1,4 +1,4 @@
-#include "findresultwin.h"
+#include "findresultwin.h"
 #include "findwin.h"
 #include "common.h"
 #include "styleset.h"

+ 1 - 1
src/findresultwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include <QContextMenuEvent>

+ 1 - 1
src/findwin.cpp

@@ -1,4 +1,4 @@
-#include "findwin.h"
+#include "findwin.h"
 #include "scintillaeditview.h"
 #include "ccnotepad.h"
 #include "progresswin.h"

+ 1 - 1
src/findwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include <QTabWidget>

+ 1 - 1
src/gotolinewin.cpp

@@ -1,4 +1,4 @@
-#include "gotolinewin.h"
+#include "gotolinewin.h"
 
 GoToLineWin::GoToLineWin(QWidget *parent)
 	: QWidget(parent)

+ 1 - 1
src/gotolinewin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_gotolinewin.h"

+ 3 - 3
src/hexcmprangewin.cpp

@@ -1,4 +1,4 @@
-#include "hexcmprangewin.h"
+锘�#include "hexcmprangewin.h"
 
 #include <QLineEdit>
 #include <QMessageBox>
@@ -23,7 +23,7 @@ void HexCmpRangeWin::slot_ok()
 	close();
 }
 
-//通过左边的值同步右边。右边不同步左边,加速用户输入
+//閫氳繃宸﹁竟鐨勫€煎悓姝ュ彸杈广€傚彸杈逛笉鍚屾�宸﹁竟锛屽姞閫熺敤鎴疯緭鍏�
 void HexCmpRangeWin::slot_asyncStartPos(const QString& text)
 {
 	ui.rightStartPos->setText(text);
@@ -35,7 +35,7 @@ void HexCmpRangeWin::slot_asyncLenPos(const QString& text)
 }
 
 
-//如果取消,则不返回任何有效范围值;错误值也是
+//濡傛灉鍙栨秷锛屽垯涓嶈繑鍥炰换浣曟湁鏁堣寖鍥村€�;閿欒�鍊间篃鏄�
 const int MAX_CMP_LENS = 1024 * 1024 * 10;
 
 void HexCmpRangeWin::getRange(bool & isCancel, qint64 & leftStartPos, int & leftCmpLen, qint64 & rightStartPos, int & rightCmpLen)

+ 1 - 1
src/hexcmprangewin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 #include "ui_hexcmprangewin.h"

+ 2 - 2
src/hexfilegoto.cpp

@@ -1,4 +1,4 @@
-#include "hexfilegoto.h"
+#include "hexfilegoto.h"
 
 HexFileGoto::HexFileGoto(QWidget *parent)
 	: QWidget(parent)
@@ -13,7 +13,7 @@ HexFileGoto::~HexFileGoto()
 {
 }
 
-//ÏÔʾΪ
+//显示为
 void HexFileGoto::slot_showDecInfo(const QString &text)
 {
 	bool ok;

+ 1 - 1
src/hexfilegoto.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_hexfilegoto.h"

+ 1 - 1
src/hexrulewin.cpp

@@ -1,4 +1,4 @@
-#include "hexrulewin.h"
+#include "hexrulewin.h"
 
 HexRuleWin::HexRuleWin(int mode, int highlight, QWidget *parent): QWidget(parent), m_mode(mode), m_isHighlightBackgroud(highlight)
 {

+ 1 - 1
src/hexrulewin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_hexrulewin.h"

+ 8 - 8
src/include/pluginGl.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <QString>
 #include <QMenu>
 
@@ -16,13 +16,13 @@
 
 struct ndd_proc_data
 {
-	QString m_strPlugName; //插件名称 必选
-	QString m_strFilePath; //lib 插件的全局路径。必选。插件内部不用管,主程序传递下来
-	QString m_strComment; //插件说明
-	QString m_version; //版本号码。可选
-	QString m_auther;//作者名称。可选
-	int m_menuType;//菜单类型。0:不使用二级菜单 1:创建二级菜单
-	QMenu* m_rootMenu;//如果m_menuType = 1,给出二级根菜单的地址。其他值nullptr
+	QString m_strPlugName; //鎻掍欢鍚嶇О 蹇呴€�
+	QString m_strFilePath; //lib 鎻掍欢鐨勫叏灞€璺�緞銆傚繀閫夈€傛彃浠跺唴閮ㄤ笉鐢ㄧ�,涓荤▼搴忎紶閫掍笅鏉�
+	QString m_strComment; //鎻掍欢璇存槑
+	QString m_version; //鐗堟湰鍙风爜銆傚彲閫�
+	QString m_auther;//浣滆€呭悕绉般€傚彲閫�
+	int m_menuType;//鑿滃崟绫诲瀷銆�0锛氫笉浣跨敤浜岀骇鑿滃崟 1锛氬垱寤轰簩绾ц彍鍗�
+	QMenu* m_rootMenu;//濡傛灉m_menuType = 1锛岀粰鍑轰簩绾ф牴鑿滃崟鐨勫湴鍧€銆傚叾浠栧€糿ullptr
 
 	ndd_proc_data(): m_rootMenu(nullptr), m_menuType(0)
 	{

+ 11 - 11
src/langextset.cpp

@@ -1,4 +1,4 @@
-#include "langextset.h"
+锘�#include "langextset.h"
 #include "scintillaeditview.h"
 #include "extlexermanager.h"
 #include "ccnotepad.h"
@@ -9,8 +9,8 @@
 #include <QMessageBox>
 
 int ITEM_CHANGED = Qt::UserRole; 
-int ITEM_LEX_ID = Qt::UserRole + 1; //对应的语法lexer的 ID
-int ITEM_LEX_EXT_OLD_VALUE = Qt::UserRole + 2; //对应的语法关联EXT文件的旧值
+int ITEM_LEX_ID = Qt::UserRole + 1; //瀵瑰簲鐨勮�娉昹exer鐨� ID
+int ITEM_LEX_EXT_OLD_VALUE = Qt::UserRole + 2; //瀵瑰簲鐨勮�娉曞叧鑱擡XT鏂囦欢鐨勬棫鍊�
 
 LangExtSet::LangExtSet(QWidget *parent)
 	: QMainWindow(parent), m_isChanged(false)
@@ -62,7 +62,7 @@ void LangExtSet::initLangName()
 			QTableWidgetItem* item1 = new QTableWidgetItem(extList.join(','));
 			item1->setData(ITEM_CHANGED, QVariant(false)); 
 
-			//把旧值记起来,后面修改后对比实时修改内存中的改动
+			//鎶婃棫鍊艰�璧锋潵锛屽悗闈�慨鏀瑰悗瀵规瘮瀹炴椂淇�敼鍐呭瓨涓�殑鏀瑰姩
 			item1->setData(ITEM_LEX_EXT_OLD_VALUE, QVariant(extList));
 			
 			ui.langTableWidget->setItem(langId, 1, item1);
@@ -141,12 +141,12 @@ void LangExtSet::slot_save()
 				QString langLexerTag = QString("%1_lexId").arg(langTag);
 				qs.setValue(langLexerTag, lexId);
 
-				//上面是更新文件,下面是更新内存,让实时生效
+				//涓婇潰鏄�洿鏂版枃浠讹紝涓嬮潰鏄�洿鏂板唴瀛橈紝璁╁疄鏃剁敓鏁�
 				QStringList oldExtList = item->data(ITEM_LEX_EXT_OLD_VALUE).toStringList();
 
 				updataExtLexerManager(langTag, lexId, oldExtList, extList);
 
-				//更新新值。因为可能不关闭时再次修改
+				//鏇存柊鏂板€笺€傚洜涓哄彲鑳戒笉鍏抽棴鏃跺啀娆′慨鏀�
 				item->setData(ITEM_LEX_EXT_OLD_VALUE, QVariant(extList));
 			}
 		}
@@ -156,15 +156,15 @@ void LangExtSet::slot_save()
 	ui.statusBar->showMessage(tr("Save Finished !"), 10000);
 }
 
-//更新ExtLexerManager中tag关联的值
+//鏇存柊ExtLexerManager涓璽ag鍏宠仈鐨勫€�
 void LangExtSet::updataExtLexerManager(QString tag, int lexId, QStringList & oldExtList, QStringList & newExtList)
 {
-	//把旧的直接删除
+	//鎶婃棫鐨勭洿鎺ュ垹闄�
 	for (int i = 0; i < oldExtList.size(); ++i)
 	{
 		ExtLexerManager::getInstance()->remove(oldExtList.at(i));
 	}
-	//把新的重新加入一遍
+	//鎶婃柊鐨勯噸鏂板姞鍏ヤ竴閬�
 	for (int i = 0; i < newExtList.size(); ++i)
 	{
 		FileExtLexer v;
@@ -175,10 +175,10 @@ void LangExtSet::updataExtLexerManager(QString tag, int lexId, QStringList & old
 	}
 }
 
-//加载文件的关联后缀到语法中
+//鍔犺浇鏂囦欢鐨勫叧鑱斿悗缂€鍒拌�娉曚腑
 void LangExtSet::loadExtRelevanceToMagr()
 {
-	QString userLangFile = QString("notepad/tag_ext");//自定义语言中不能有.字符,否则可能有错,后续要检查
+	QString userLangFile = QString("notepad/tag_ext");//鑷�畾涔夎�瑷€涓�笉鑳芥湁.瀛楃�锛屽惁鍒欏彲鑳芥湁閿欙紝鍚庣画瑕佹�鏌�
 	QSettings qs(QSettings::IniFormat, QSettings::UserScope, userLangFile);
 	qs.setIniCodec("UTF-8");
 

+ 1 - 1
src/langextset.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include "ui_langextset.h"

+ 1 - 1
src/langstyledefine.cpp

@@ -1,4 +1,4 @@
-#include "langstyledefine.h"
+#include "langstyledefine.h"
 #include "userlexdef.h"
 #include "extlexermanager.h"
 

+ 1 - 1
src/langstyledefine.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include "ui_langstyledefine.h"

+ 1 - 1
src/mytreeview.cpp

@@ -1,4 +1,4 @@
-#include "mytreeview.h"
+#include "mytreeview.h"
 
 MyTreeView::MyTreeView(QWidget *parent)
 	: QTreeView(parent)

+ 1 - 1
src/mytreeview.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QTreeView>
 #include <QModelIndexList>

+ 35 - 35
src/nddsetting.cpp

@@ -1,4 +1,4 @@
-#include "nddsetting.h"
+锘�#include "nddsetting.h"
 #include <QObject>
 #include <QtDebug>
 #include <QCoreApplication>
@@ -7,8 +7,8 @@
 #include <QStorageInfo>
 #include <QSettings>
 
-static short version_num = 29; //1.22.0 29
-//配置文件是否存在。如果初始化失败,则不存在
+static short version_num = 29; //1.22.0 鏄�29
+//閰嶇疆鏂囦欢鏄�惁瀛樺湪銆傚�鏋滃垵濮嬪寲澶辫触锛屽垯涓嶅瓨鍦�
 bool NddSetting::s_isExistDb = false;
 int NddSetting::s_reference = 0;
 bool NddSetting::s_isContentChanged = false;
@@ -17,10 +17,10 @@ QSettings* NddSetting::s_nddSet = nullptr;
 
 QSettings* NddSetting::s_winPosSet = nullptr;
 
-//如果key不存在,则新增key-value。存在:返回true
+//濡傛灉key涓嶅瓨鍦�紝鍒欐柊澧瀔ey-value銆傚瓨鍦�細杩斿洖true
 bool NddSetting::checkNoExistAdd(QString key, QVariant& value)
 {
-	//每次新加字段后,这里要检查一下,不存在则新增
+	//姣忔�鏂板姞瀛楁�鍚庯紝杩欓噷瑕佹�鏌ヤ竴涓嬶紝涓嶅瓨鍦ㄥ垯鏂板�
 	if (!s_nddSet->contains(key))
 	{
 		s_nddSet->setValue(key, value);
@@ -34,13 +34,13 @@ bool NddSetting::checkNoExistAdd(QString key, QVariant& value)
 	return true;
 }
 
-//20220402这里隐含了一个前置条件:数据库句柄是在主线程创建的,最好不要在子线程中调用。
-//避免因为跨线程访问和多线程冲突访问引发的闪退问题。所以最好配置文件的读写都在主线程中进行
+//20220402杩欓噷闅愬惈浜嗕竴涓�墠缃�潯浠讹細鏁版嵁搴撳彞鏌勬槸鍦ㄤ富绾跨▼鍒涘缓鐨勶紝鏈€濂戒笉瑕佸湪瀛愮嚎绋嬩腑璋冪敤銆�
+//閬垮厤鍥犱负璺ㄧ嚎绋嬭�闂�拰澶氱嚎绋嬪啿绐佽�闂�紩鍙戠殑闂�€€闂��銆傛墍浠ユ渶濂介厤缃�枃浠剁殑璇诲啓閮藉湪涓荤嚎绋嬩腑杩涜�
 void NddSetting::init()
 {
 	++s_reference;
 
-	//如果已经初始化过了,则直接返回
+	//濡傛灉宸茬粡鍒濆�鍖栬繃浜嗭紝鍒欑洿鎺ヨ繑鍥�
 	if (s_isExistDb)
 	{
 		return;
@@ -56,42 +56,42 @@ void NddSetting::init()
 	auto initNddSet = []() {
 		QString key = "signdate";
 		//QString date = QDate::currentDate().toString(QString("yyyy/M/d"));
-		//不写今天的时间,否则第一次运行,无条件不会发送心跳。
-		//直接写一个过去的时间,让第一次运行,总是要签到
+		//涓嶅啓浠婂ぉ鐨勬椂闂达紝鍚﹀垯绗�竴娆¤繍琛岋紝鏃犳潯浠朵笉浼氬彂閫佸績璺炽€�
+		//鐩存帴鍐欎竴涓�繃鍘荤殑鏃堕棿锛岃�绗�竴娆¤繍琛岋紝鎬绘槸瑕佺�鍒�
 		addKeyValueToSets(key, "2022/2/20");
 
 		QString str;
 
-		//tab的长度,默认为4
+		//tab鐨勯暱搴︼紝榛樿�涓�4
 		addKeyValueToNumSets("tablens", 4);
-		//space replace tab空格替换tab,默认0, 1为true,0为false
+		//space replace tab绌烘牸鏇挎崲tab锛岄粯璁�0, 1涓簍rue,0涓篺alse
 		addKeyValueToNumSets("tabnouse", 0);
 
 		addKeyValueToSets("mac", "0");
 		addKeyValueToNumSets("padtimes", 0);
 		addKeyValueToNumSets("serverip", 0);
 
-		//是否高亮不同处背景
+		//鏄�惁楂樹寒涓嶅悓澶勮儗鏅�
 		addKeyValueToNumSets("hexhigh", 1);
 
 		addKeyValueToNumSets(VERSION, version_num);
 
-		//皮肤id
+		//鐨�偆id
         addKeyValueToNumSets(SKIN_KEY, 0);
 
-		//语言index 0:自动选择 1:中文 2 英文
+		//璇�█index 0:鑷�姩閫夋嫨 1:涓�枃 2 鑻辨枃
 		addKeyValueToNumSets(LANGS_KEY, 0);
 
-		//开启自动换行
+		//寮€鍚�嚜鍔ㄦ崲琛�
 		addKeyValueToNumSets(AUTOWARP_KEY, 0);
 
-		//开启自动缩进
+		//寮€鍚�嚜鍔ㄧ缉杩�
 		addKeyValueToNumSets(INDENT_KEY, 0);
 
-		//显示空白
+		//鏄剧ず绌虹櫧
 		addKeyValueToNumSets(SHOWSPACE_KEY, 0);
 
-		//最大文本文件的门限。默认100M.(50-300)
+		//鏈€澶ф枃鏈�枃浠剁殑闂ㄩ檺銆傞粯璁�100M.(50-300)
 		addKeyValueToNumSets(MAX_BIG_TEXT, 100);
 
 		addKeyValueToSets(SOFT_KEY, "0");
@@ -107,22 +107,22 @@ void NddSetting::init()
 
 		addKeyValueToNumSets(FILELISTPOS, Qt::LeftDockWidgetArea);
 
-		//默认0不显示
+		//榛樿�0涓嶆樉绀�
 		addKeyValueToNumSets(FILELISTSHOW, 0);
 
-		//默认显示工具栏
+		//榛樿�鏄剧ず宸ュ叿鏍�
 		addKeyValueToNumSets(TOOLBARSHOW, 1);
 
-		//打开网页,默认不勾选,资源耗费多
+		//鎵撳紑缃戦〉锛岄粯璁や笉鍕鹃€夛紝璧勬簮鑰楄垂澶�
 		addKeyValueToNumSets(SHOWWEBADDR, 0);
 
-		//查找结果框的默认字体大小
+		//鏌ユ壘缁撴灉妗嗙殑榛樿�瀛椾綋澶у皬
 		addKeyValueToNumSets(FIND_RESULT_FONT_SIZE, 14);
 	};
 
 	if (!s_nddSet->contains(VERSION))
 	{
-		//不存在走初始化流程
+		//涓嶅瓨鍦ㄨ蛋鍒濆�鍖栨祦绋�
 		initNddSet();
 		s_isContentChanged = true;
 	}
@@ -133,7 +133,7 @@ void NddSetting::init()
 				QVariant v(VERSION);
 				if (checkNoExistAdd(VERSION, v))
 				{
-					//如果存在,而且版本是最新,不需要走后面自动检查流程了
+					//濡傛灉瀛樺湪锛岃€屼笖鐗堟湰鏄�渶鏂�,涓嶉渶瑕佽蛋鍚庨潰鑷�姩妫€鏌ユ祦绋嬩簡
 					int curVersion = s_nddSet->value(VERSION).toInt();
 					if (curVersion == version_num)
 					{
@@ -141,12 +141,12 @@ void NddSetting::init()
 					}
 					else if (curVersion < version_num)
 					{
-						//更新版本到最新
+						//鏇存柊鐗堟湰鍒版渶鏂�
 						updataKeyValueFromNumSets(VERSION, version_num);
 					}
 				}
 			}
-			//每次新加字段后,这里要检查一下,不存在则新增
+			//姣忔�鏂板姞瀛楁�鍚庯紝杩欓噷瑕佹�鏌ヤ竴涓嬶紝涓嶅瓨鍦ㄥ垯鏂板�
 			{
 				QVariant v(1);
 				checkNoExistAdd(SKIN_KEY, v);
@@ -237,7 +237,7 @@ void NddSetting::init()
 
 
 
-//写一个总的获取配置的接口,避免以后每个字段都需要写一个读写接口
+//鍐欎竴涓�€荤殑鑾峰彇閰嶇疆鐨勬帴鍙o紝閬垮厤浠ュ悗姣忎釜瀛楁�閮介渶瑕佸啓涓€涓��鍐欐帴鍙�
 QString NddSetting::getKeyValueFromSets(QString key)
 {
 	return s_nddSet->value(key,"").toString();
@@ -250,7 +250,7 @@ bool NddSetting::updataKeyValueFromSets(QString key, QString value)
 	return true;
 }
 
-//写一个总的获取配置的接口,避免以后每个字段都需要写一个读写接口
+//鍐欎竴涓�€荤殑鑾峰彇閰嶇疆鐨勬帴鍙o紝閬垮厤浠ュ悗姣忎釜瀛楁�閮介渶瑕佸啓涓€涓��鍐欐帴鍙�
 QByteArray NddSetting::getKeyByteArrayValue(QString key)
 {
 	return s_nddSet->value(key, "").toByteArray();
@@ -262,14 +262,14 @@ void NddSetting::updataKeyByteArrayValue(QString key, QByteArray& value)
 	s_isContentChanged = true;
 }
 
-//第一次加一条记录,用于初始化
+//绗�竴娆″姞涓€鏉¤�褰曪紝鐢ㄤ簬鍒濆�鍖�
 void NddSetting::addKeyValueToSets(QString key, QString value)
 {
 	s_nddSet->setValue(key, QVariant(value));
 }
 
 
-//写一个总的获取配置的接口,避免以后每个字段都需要写一个读写接口.0做默认值,外部最好不用0做初始化值
+//鍐欎竴涓�€荤殑鑾峰彇閰嶇疆鐨勬帴鍙o紝閬垮厤浠ュ悗姣忎釜瀛楁�閮介渶瑕佸啓涓€涓��鍐欐帴鍙�.0鍋氶粯璁ゅ€硷紝澶栭儴鏈€濂戒笉鐢�0鍋氬垵濮嬪寲鍊�
 int NddSetting::getKeyValueFromNumSets(const QString key)
 {
 	QVariant v = s_nddSet->value(key, QVariant(0));
@@ -283,7 +283,7 @@ bool NddSetting::updataKeyValueFromNumSets(const QString key, int value)
 }
 
 
-//第一次加一条记录,用于初始化
+//绗�竴娆″姞涓€鏉¤�褰曪紝鐢ㄤ簬鍒濆�鍖�
 void NddSetting::addKeyValueToNumSets(QString key, int value)
 {
 	s_nddSet->setValue(key, QVariant(value));
@@ -300,7 +300,7 @@ void NddSetting::close()
 		{
 			s_isExistDb = false;
 
-			//做一次真正的保存
+			//鍋氫竴娆$湡姝g殑淇濆瓨
 			if (s_isContentChanged)
 			{
 				s_nddSet->sync();
@@ -309,7 +309,7 @@ void NddSetting::close()
 				s_isContentChanged = false;	
 			}
 
-			//在这里保存一下子窗口的位置。不排除有可能子窗口还在,主窗口已经退出的情况,不过问题不大。
+			//鍦ㄨ繖閲屼繚瀛樹竴涓嬪瓙绐楀彛鐨勪綅缃�€備笉鎺掗櫎鏈夊彲鑳藉瓙绐楀彛杩樺湪锛屼富绐楀彛宸茬粡閫€鍑虹殑鎯呭喌锛屼笉杩囬棶棰樹笉澶с€�
 			if (s_winPosSet != nullptr)
 			{
 				s_winPosSet->sync();
@@ -319,7 +319,7 @@ void NddSetting::close()
 }
 }
 
-//子窗口的位置,单独放在一个winpos.ini文件中,而且启动程序时,不需要读取,可避免启动时拖慢速度
+//瀛愮獥鍙g殑浣嶇疆锛屽崟鐙�斁鍦ㄤ竴涓獁inpos.ini鏂囦欢涓�紝鑰屼笖鍚�姩绋嬪簭鏃讹紝涓嶉渶瑕佽�鍙栵紝鍙�伩鍏嶅惎鍔ㄦ椂鎷栨參閫熷害
 QByteArray NddSetting::getWinPos(QString key)
 {
 	winPosInit();

+ 19 - 19
src/nddsetting.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <QSettings>
 #include <QVariant>
 
@@ -10,24 +10,24 @@ static QString SHOWSPACE_KEY = "blank";
 static QString MAX_BIG_TEXT = "maxtsize";
 static QString SOFT_STATUS = "rstatus";
 static QString SOFT_KEY = "rkey";
-static QString RESTORE_CLOSE_FILE = "restore"; //恢复关闭时打开的文件
-static QString PRO_DIR = "prodir";//放置配置文件的路径
-//static QString RESTORE_SIZE = "rsize";//保存关闭时的大小
-static QString WIN_POS = "pos";//保存关闭是的大小
-static QString ICON_SIZE = "iconsize";//图标大小
-static QString ZOOMVALUE = "zoom"; //放大倍数
-static QString VERSION = "version";//当前版本
-static QString FINDRESULTPOS = "findpos";//查找窗口悬浮的位置
-static QString FILELISTPOS = "filepos";//文件列表悬浮框的位置
-static QString FILELISTSHOW = "showfilelist"; //文件列表框是否显示
-static QString TOOLBARSHOW = "showbar"; //是否显示工具栏
-static QString FINDWINSIZE = "findwinsize";//保存查找框的大小。150%放大时界面永久。保留避免每次手动调整
-static QString SHOWWEBADDR = "showweb";//高亮web地址,双击网页打开
-static QString FIND_RESULT_FONT_SIZE = "frfs";//查找结果的默认字体大小,默认为14
-
-
-//下面这个是winpos.ini中的key,避免单个文件太大,拖慢启动速度
-static QString BATCH_FIND_REPLACE_POS = "bfpos";//批量查找替换窗口的大小
+static QString RESTORE_CLOSE_FILE = "restore"; //鎭㈠�鍏抽棴鏃舵墦寮€鐨勬枃浠�
+static QString PRO_DIR = "prodir";//鏀剧疆閰嶇疆鏂囦欢鐨勮矾寰�
+//static QString RESTORE_SIZE = "rsize";//淇濆瓨鍏抽棴鏃剁殑澶у皬
+static QString WIN_POS = "pos";//淇濆瓨鍏抽棴鏄�殑澶у皬
+static QString ICON_SIZE = "iconsize";//鍥炬爣澶у皬
+static QString ZOOMVALUE = "zoom"; //鏀惧ぇ鍊嶆暟
+static QString VERSION = "version";//褰撳墠鐗堟湰
+static QString FINDRESULTPOS = "findpos";//鏌ユ壘绐楀彛鎮�诞鐨勪綅缃�
+static QString FILELISTPOS = "filepos";//鏂囦欢鍒楄〃鎮�诞妗嗙殑浣嶇疆
+static QString FILELISTSHOW = "showfilelist"; //鏂囦欢鍒楄〃妗嗘槸鍚︽樉绀�
+static QString TOOLBARSHOW = "showbar"; //鏄�惁鏄剧ず宸ュ叿鏍�
+static QString FINDWINSIZE = "findwinsize";//淇濆瓨鏌ユ壘妗嗙殑澶у皬銆�150%鏀惧ぇ鏃剁晫闈㈡案涔呫€備繚鐣欓伩鍏嶆瘡娆℃墜鍔ㄨ皟鏁�
+static QString SHOWWEBADDR = "showweb";//楂樹寒web鍦板潃锛屽弻鍑荤綉椤垫墦寮€
+static QString FIND_RESULT_FONT_SIZE = "frfs";//鏌ユ壘缁撴灉鐨勯粯璁ゅ瓧浣撳ぇ灏忥紝榛樿�涓�14
+
+
+//涓嬮潰杩欎釜鏄痺inpos.ini涓�殑key锛岄伩鍏嶅崟涓�枃浠跺お澶э紝鎷栨參鍚�姩閫熷害
+static QString BATCH_FIND_REPLACE_POS = "bfpos";//鎵归噺鏌ユ壘鏇挎崲绐楀彛鐨勫ぇ灏�
 
 class NddSetting
 {

+ 7 - 7
src/ndstyleditemdelegate.cpp

@@ -1,4 +1,4 @@
-#include "ndstyleditemdelegate.h"
+锘�#include "ndstyleditemdelegate.h"
 #include <QTextDocument>
 #include <QApplication>
 #include <QAbstractTextDocumentLayout>
@@ -21,7 +21,7 @@ void NdStyledItemDelegate::setFontSize(int size)
 	
 }
 
-//重载使可以支持富文本格式的文字
+//閲嶈浇浣垮彲浠ユ敮鎸佸瘜鏂囨湰鏍煎紡鐨勬枃瀛�
 void NdStyledItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
 	QStyleOptionViewItem viewOption(option);
@@ -29,13 +29,13 @@ void NdStyledItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
 	if (option.state.testFlag(QStyle::State_HasFocus))
 		viewOption.state = viewOption.state ^ QStyle::State_HasFocus;
 
-	// ... 省略
-	// 设置显示文本为空,使用默认样式
+	// ... 鐪佺暐
+	// 璁剧疆鏄剧ず鏂囨湰涓虹┖锛屼娇鐢ㄩ粯璁ゆ牱寮�
 	QStyle *pStyle = viewOption.widget ? viewOption.widget->style() : QApplication::style();
 
 	QTextDocument doc;
 
-	//外部修改了字体大小后,内部进行富文本的修改绘制。
+	//澶栭儴淇�敼浜嗗瓧浣撳ぇ灏忓悗锛屽唴閮ㄨ繘琛屽瘜鏂囨湰鐨勪慨鏀圭粯鍒躲€�
 	if (m_defaultFontSize != 14)
 	{
 		viewOption.text.replace("font-size:14px",QString("font-size:%1px").arg(m_defaultFontSize));
@@ -51,9 +51,9 @@ void NdStyledItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
 
 	QRect textRect = pStyle->subElementRect(QStyle::SE_ItemViewItemText, &viewOption);
 	painter->save();
-	// 坐标变换,将左上角设置为原点
+	// 鍧愭爣鍙樻崲锛屽皢宸︿笂瑙掕�缃�负鍘熺偣
 	painter->translate(textRect.topLeft());
-	// 设置HTML绘制区域
+	// 璁剧疆HTML缁樺埗鍖哄煙
 	painter->setClipRect(textRect.translated(-textRect.topLeft()));
 
 	doc.documentLayout()->draw(painter, paintContext);

+ 1 - 1
src/ndstyleditemdelegate.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QStyledItemDelegate>
 

+ 1 - 1
src/plugin.cpp

@@ -1,4 +1,4 @@
-#include "plugin.h"
+#include "plugin.h"
 #include <QLibrary>
 #include <QDir>
 #include <QMenu>

+ 1 - 1
src/plugin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "pluginGl.h"
 #include <functional>
 class QMenu;

+ 0 - 182
src/plugin/helloworld/helloworld.vcxproj

@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{06EED29A-D357-39F4-B1B8-25129EBC2852}</ProjectGuid>
-    <RootNamespace>helloworld</RootNamespace>
-    <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
-  <QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild></PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <PlatformToolset>v141</PlatformToolset>
-    <OutputDirectory>..\..\x64\Debug\plugin\</OutputDirectory>
-    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
-    <CharacterSet>NotSet</CharacterSet>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <IntermediateDirectory>release\</IntermediateDirectory>
-    <PrimaryOutput>helloworld</PrimaryOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <PlatformToolset>v141</PlatformToolset>
-    <OutputDirectory>..\..\x64\Debug\plugin\</OutputDirectory>
-    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
-    <CharacterSet>NotSet</CharacterSet>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <IntermediateDirectory>debug\</IntermediateDirectory>
-    <PrimaryOutput>helloworld</PrimaryOutput>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /><Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')"><Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." /></Target>
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" /><ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')"><Import Project="$(QtMsBuild)\qt_defaults.props" /></ImportGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><OutDir>..\..\x64\Debug\plugin\</OutDir><IntDir>debug\</IntDir><TargetName>helloworld</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><OutDir>..\..\x64\Debug\plugin\</OutDir><IntDir>release\</IntDir><TargetName>helloworld</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary><LinkIncremental>false</LinkIncremental></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><QtInstall>5.12.10_msvc2017_64</QtInstall><QtModules>core;gui;widgets</QtModules></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><QtInstall>5.12.10_msvc2017_64</QtInstall><QtModules>core;gui;widgets</QtModules></PropertyGroup><ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')"><Import Project="$(QtMsBuild)\qt.props" /></ImportGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;..\..\include;..\..\qscint\src;..\..\qscint\src\Qsci;release;/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
-      <AssemblerListingLocation>release\</AssemblerListingLocation>
-      <BrowseInformation>false</BrowseInformation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ObjectFileName>release\</ObjectFileName>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <ProgramDataBaseFileName></ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <WarningLevel>Level3</WarningLevel>
-    <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
-    <Link>
-      <AdditionalDependencies>qmyedit_qt5d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <IgnoreImportLibrary>true</IgnoreImportLibrary>
-      <LinkDLL>true</LinkDLL>
-      <LinkIncremental>false</LinkIncremental>
-      <OutputFile>$(OutDir)\helloworld.dll</OutputFile>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <SubSystem>Windows</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Link>
-    <Midl>
-      <DefaultCharType>Unsigned</DefaultCharType>
-      <EnableErrorChecks>None</EnableErrorChecks>
-      <WarningLevel>0</WarningLevel>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  <QtMoc><CompilerFlavor>msvc</CompilerFlavor><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;..\..\include;..\..\qscint\src;..\..\qscint\src\Qsci;debug;/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
-      <AssemblerListingLocation>debug\</AssemblerListingLocation>
-      <BrowseInformation>false</BrowseInformation>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ObjectFileName>debug\</ObjectFileName>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <WarningLevel>Level3</WarningLevel>
-    <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
-    <Link>
-      <AdditionalDependencies>qmyedit_qt5d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <IgnoreImportLibrary>true</IgnoreImportLibrary>
-      <LinkDLL>true</LinkDLL>
-      <OutputFile>$(OutDir)\helloworld.dll</OutputFile>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <SubSystem>Windows</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Link>
-    <Midl>
-      <DefaultCharType>Unsigned</DefaultCharType>
-      <EnableErrorChecks>None</EnableErrorChecks>
-      <WarningLevel>0</WarningLevel>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  <QtMoc><CompilerFlavor>msvc</CompilerFlavor><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="helloworldexport.cpp" />
-    <ClCompile Include="qttestclass.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtMoc Include="qttestclass.h">
-      
-      
-      
-      
-      
-      
-      
-      
-    </QtMoc>
-    
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="debug\moc_predefs.h.cbt">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2&gt;NUL &gt;debug\moc_predefs.h</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate moc_predefs.h</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">debug\moc_predefs.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="release\moc_predefs.h.cbt">
-      <FileType>Document</FileType>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2&gt;NUL &gt;release\moc_predefs.h</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate moc_predefs.h</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">release\moc_predefs.h;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </CustomBuild>
-    
-    
-    
-  </ItemGroup>
-  <ItemGroup>
-    <QtUic Include="qttestclass.ui">
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    </QtUic>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /><ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')"><Import Project="$(QtMsBuild)\qt.targets" /></ImportGroup>
-  <ImportGroup Label="ExtensionTargets" />
-</Project>

+ 0 - 69
src/plugin/helloworld/helloworld.vcxproj.filters

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Form Files">
-      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
-      <Extensions>ui</Extensions>
-      <ParseFiles>false</ParseFiles>
-    </Filter>
-    <Filter Include="Form Files">
-      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
-      <Extensions>ui</Extensions>
-      <ParseFiles>false</ParseFiles>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;moc;h;def;odl;idl;res;</Extensions>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;moc;h;def;odl;idl;res;</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="helloworldexport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="qttestclass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <QtMoc Include="qttestclass.h">
-      <Filter>Header Files</Filter>
-    </QtMoc>
-    
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="debug\moc_predefs.h.cbt">
-      <Filter>Generated Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="release\moc_predefs.h.cbt">
-      <Filter>Generated Files</Filter>
-    </CustomBuild>
-    
-    
-    
-  </ItemGroup>
-  <ItemGroup>
-    <QtUic Include="qttestclass.ui">
-      <Filter>Form Files</Filter>
-    </QtUic>
-  </ItemGroup>
-</Project>

+ 1 - 1
src/plugin/helloworld/helloworldexport.cpp

@@ -1,4 +1,4 @@
-#include <qobject.h>
+#include <qobject.h>
 #include <qstring.h>
 #include <pluginGl.h>
 #include <functional>

+ 1 - 1
src/plugin/helloworld/qttestclass.cpp

@@ -1,4 +1,4 @@
-#include "qttestclass.h"
+#include "qttestclass.h"
 #include <qsciscintilla.h>
 
 QtTestClass::QtTestClass(QWidget *parent, QsciScintilla* pEdit)

+ 1 - 1
src/plugin/helloworld/qttestclass.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_qttestclass.h"

+ 1 - 1
src/plugin/test/test.cpp

@@ -1,4 +1,4 @@
-#include <qobject.h>
+#include <qobject.h>
 #include <qstring.h>
 #include <pluginGl.h>
 #include <functional>

+ 8 - 8
src/pluginGl.h

@@ -1,16 +1,16 @@
-#pragma once
+锘�#pragma once
 #include <QString>
 #include <QMenu>
 
 struct ndd_proc_data
 {
-	QString m_strPlugName; //插件名称 必选。插件里面需填写
-	QString m_strFilePath; //lib 插件的全局路径。必选。插件内部不用填写,主程序传递下来
-	QString m_strComment; //插件说明;插件里面需填写
-	QString m_version; //版本号码。可选;插件里面需填写
-	QString m_auther;//作者名称。可选;插件里面需填写
-	int m_menuType;//菜单类型。0:不使用二级菜单 1:创建二级菜单;插件里面需填写
-	QMenu* m_rootMenu;//如果m_menuType = 1,给出二级根菜单的地址。其他值nullptr 插件内部不用填写,主程序传递下来
+	QString m_strPlugName; //鎻掍欢鍚嶇О 蹇呴€夈€傛彃浠堕噷闈㈤渶濉�啓
+	QString m_strFilePath; //lib 鎻掍欢鐨勫叏灞€璺�緞銆傚繀閫夈€傛彃浠跺唴閮ㄤ笉鐢ㄥ~鍐�,涓荤▼搴忎紶閫掍笅鏉�
+	QString m_strComment; //鎻掍欢璇存槑锛涙彃浠堕噷闈㈤渶濉�啓
+	QString m_version; //鐗堟湰鍙风爜銆傚彲閫夛紱鎻掍欢閲岄潰闇€濉�啓
+	QString m_auther;//浣滆€呭悕绉般€傚彲閫夛紱鎻掍欢閲岄潰闇€濉�啓
+	int m_menuType;//鑿滃崟绫诲瀷銆�0锛氫笉浣跨敤浜岀骇鑿滃崟 1锛氬垱寤轰簩绾ц彍鍗曪紱鎻掍欢閲岄潰闇€濉�啓
+	QMenu* m_rootMenu;//濡傛灉m_menuType = 1锛岀粰鍑轰簩绾ф牴鑿滃崟鐨勫湴鍧€銆傚叾浠栧€糿ullptr 鎻掍欢鍐呴儴涓嶇敤濉�啓锛屼富绋嬪簭浼犻€掍笅鏉�
 
 	ndd_proc_data(): m_rootMenu(nullptr), m_menuType(0)
 	{

+ 1 - 1
src/pluginmgr.cpp

@@ -1,4 +1,4 @@
-#include "pluginmgr.h"
+#include "pluginmgr.h"
 #include "rcglobal.h"
 
 

+ 1 - 1
src/pluginmgr.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include "ui_pluginmgr.h"

+ 1 - 1
src/qscint/Python/config-tests/cfgtest_Qsci.cpp

@@ -1,4 +1,4 @@
-#include <QCoreApplication>
+#include <QCoreApplication>
 #include <QFile>
 #include <QTextStream>
 

+ 1 - 1
src/qscint/scintilla/include/Scintilla.h

@@ -1,4 +1,4 @@
-/* Scintilla source code edit control */
+/* Scintilla source code edit control */
 /** @file Scintilla.h
  ** Interface to the edit control.
  **/

+ 1 - 1
src/qscint/scintilla/lexers/LexAVS.cpp

@@ -1,4 +1,4 @@
-// Scintilla source code edit control
+// Scintilla source code edit control
 /** @file LexAVS.cxx
  ** Lexer for AviSynth.
  **/

+ 1 - 1
src/qscint/scintilla/src/Catalogue.cpp

@@ -1,4 +1,4 @@
-// Scintilla source code edit control
+// Scintilla source code edit control
 /** @file Catalogue.cxx
  ** Lexer infrastructure.
  ** Contains a list of LexerModules which can be searched to find a module appropriate for a

+ 1 - 0
src/qscint/src/Qsci/qsciglobal.h

@@ -37,6 +37,7 @@
 // Define QSCINTILLA_MAKE_DLL to create a QScintilla shared library, or
 // define QSCINTILLA_DLL to link against a QScintilla shared library, or define
 // neither to either build or link against a static QScintilla library.
+#define QSCINTILLA_DLL
 
 #if defined(QSCINTILLA_DLL)
 #define QSCINTILLA_EXPORT       Q_DECL_IMPORT

+ 1 - 1
src/qscint/src/Qsci/qscilexerasm.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 // This defines the interface to the QsciLexerAsm class.
 //
 // Copyright (c) 2021 Riverbank Computing Limited <[email protected]>

+ 1 - 1
src/qscint/src/Qsci/qscilexerglobal.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <QObject>
 #include <Qsci/qsciglobal.h>
 #include <Qsci/qscilexer.h>

+ 1 - 1
src/qscint/src/Qsci/qscilexerr.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #pragma once
 // This defines the interface to the QsciLexerR class.
 //

+ 1 - 1
src/qscint/src/Qsci/qscilexervb.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #pragma once
 #include <QObject>

+ 1 - 1
src/qscint/src/qscilexerasm.cpp

@@ -1,4 +1,4 @@
-// This module implements the QsciLexerAsm class.
+// This module implements the QsciLexerAsm class.
 //
 // Copyright (c) 2021 Riverbank Computing Limited <[email protected]>
 // 

+ 1 - 1
src/qscint/src/qscilexerglobal.cpp

@@ -1,4 +1,4 @@
-#include "Qsci/qscilexerglobal.h"
+#include "Qsci/qscilexerglobal.h"
 #include "Qsci/qsciscintilla.h"
 #include "Scintilla.h"
 #include "SciLexer.h"

+ 1 - 1
src/qscint/src/qscilexerr.cpp

@@ -1,4 +1,4 @@
-
+
 #include "Qsci/qsciLexerr.h"
 
 #include <qcolor.h>

+ 1 - 1
src/qscint/src/qscilexervb.cpp

@@ -1,4 +1,4 @@
-#include "Qsci/qscilexervb.h"
+#include "Qsci/qscilexervb.h"
 
 QsciLexerVB::QsciLexerVB(QObject *parent)
 	: QsciLexer(parent)

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 147 - 147
src/qtlangset.cpp


+ 1 - 1
src/qtlangset.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include <QListWidgetItem>

+ 1 - 1
src/rcglobal.h

@@ -15,7 +15,7 @@ static const char* VersionStr = "v1.22.2";
 #endif // TEST_PRE
 
 
-//#define NO_PLUGIN 1
+#define NO_PLUGIN 1
 
 #define CMP_CODE_NOEQUAL
 

+ 1 - 1
src/renamewin.cpp

@@ -1,4 +1,4 @@
-#include "renamewin.h"
+#include "renamewin.h"
 #include "progresswin.h"
 
 #include <QFileDialog>

+ 1 - 1
src/renamewin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_renamewin.h"

+ 1 - 1
src/rgba_icons.h

@@ -1,4 +1,4 @@
-// This file is part of Notepad-- project
+// This file is part of Notepad-- project
 // Copyright (C)2023 zuowei.yin <[email protected]>
 
 // This program is free software: you can redistribute it and/or modify

+ 1 - 1
src/scintillaeditview.cpp

@@ -1,4 +1,4 @@
-#include "scintillaeditview.h"
+#include "scintillaeditview.h"
 
 #include "common.h"
 #include "rgba_icons.h"

+ 1 - 1
src/scintillaeditview.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <qsciscintilla.h>
 #include <Scintilla.h>
 #include <SciLexer.h>

+ 1 - 1
src/scintillahexeditview.cpp

@@ -1,4 +1,4 @@
-#include "scintillahexeditview.h"
+#include "scintillahexeditview.h"
 #include "styleset.h"
 
 #include "ccnotepad.h"

+ 1 - 1
src/scintillahexeditview.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <qsciscintilla.h>
 #include <Scintilla.h>

+ 3 - 3
src/shortcutkeyeditwin.cpp

@@ -1,4 +1,4 @@
-#include "shortcutkeyeditwin.h"
+锘�#include "shortcutkeyeditwin.h"
 
 #include <QMessageBox> 
 
@@ -27,7 +27,7 @@ QKeySequence ShortcutKeyEditWin::getNewKeySeq()
 	return m_newKeys;
 }
 
-//确认修改,先检查一下。最多四个键
+//纭��淇�敼锛屽厛妫€鏌ヤ竴涓嬨€傛渶澶氬洓涓�敭
 void  ShortcutKeyEditWin::slot_ok()
 {
 	QKeySequence keys = ui.keySequenceEdit->keySequence();
@@ -41,7 +41,7 @@ void  ShortcutKeyEditWin::slot_ok()
 	done(1);
 }
 
-//删除为空
+//鍒犻櫎涓虹┖
 void  ShortcutKeyEditWin::on_delete()
 {
 	done(2);

+ 1 - 1
src/shortcutkeyeditwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 #include "ui_shortcutkeyeditwin.h"

+ 14 - 14
src/shortcutkeymgr.cpp

@@ -1,4 +1,4 @@
-#include "shortcutkeymgr.h"
+锘�#include "shortcutkeymgr.h"
 #include "shortcutkeyeditwin.h"
 #include "ccnotepad.h"
 
@@ -13,12 +13,12 @@ QMap<QString, int>* ShortcutKeyMgr::s_shortcutKeysMap = nullptr;
 //QMap<QString, int> * qScintShortcutKeyValueMap = nullptr;
 
 struct ShortcutKeySt {
-	QString iniTag;//保存在Ini文件中的名称
-	QString name;//显示在表格中的名称
-	//QString keyDesc;//qkeysequence的描述
+	QString iniTag;//淇濆瓨鍦↖ni鏂囦欢涓�殑鍚嶇О
+	QString name;//鏄剧ず鍦ㄨ〃鏍间腑鐨勫悕绉�
+	//QString keyDesc;//qkeysequence鐨勬弿杩�
 	QKeySequence key;
 
-	bool canModify;//能否修改
+	bool canModify;//鑳藉惁淇�敼
 
 	ShortcutKeySt() = default;
 	ShortcutKeySt(QString name_, QString iniTag_, bool canMofidy=true) :name(name_), iniTag(iniTag_), canModify(canMofidy)
@@ -119,12 +119,12 @@ void ShortcutKeyMgr::initShortcutKeysMap()
 			s_shortcutKeysMap->insert(shortCutTable.at(i).iniTag, i);
 		}
 
-		//从文件中读取用户修改过的配置表。
+		//浠庢枃浠朵腑璇诲彇鐢ㄦ埛淇�敼杩囩殑閰嶇疆琛ㄣ€�
 		loadUserDefSet();
 	}
 }
 
-//务必先调用initShortcutKeysMap()
+//鍔″繀鍏堣皟鐢╥nitShortcutKeysMap()
 QKeySequence ShortcutKeyMgr::getUserDefShortcutKey(QString iniTag)
 {
 	if (s_shortcutKeysMap->contains(iniTag))
@@ -134,7 +134,7 @@ QKeySequence ShortcutKeyMgr::getUserDefShortcutKey(QString iniTag)
 	return QKeySequence();
 }
 
-//从用户ini配置中加载快捷键配置
+//浠庣敤鎴穒ni閰嶇疆涓�姞杞藉揩鎹烽敭閰嶇疆
 void ShortcutKeyMgr::loadUserDefSet()
 {
 	QString userDefFile = QString("notepad/shortcuttab");
@@ -159,7 +159,7 @@ void ShortcutKeyMgr::loadUserDefSet()
 	}
 }
 
-//修改配置文件中的快捷键定义。inittag ini的key, keySeqStr ini的value。内存也修改了
+//淇�敼閰嶇疆鏂囦欢涓�殑蹇�嵎閿�畾涔夈€俰nittag ini鐨刱ey, keySeqStr ini鐨剉alue銆傚唴瀛樹篃淇�敼浜�
 bool ShortcutKeyMgr::ModifyShortCutKey(QString initTag, QString keySeqStr)
 {
 	QString userDefFile = QString("notepad/shortcuttab");
@@ -210,7 +210,7 @@ void ShortcutKeyMgr::initNddShortcutTable()
 	}
 }
 
-//初始化qscint内部的快捷键。目前这部分不能修改。
+//鍒濆�鍖杚scint鍐呴儴鐨勫揩鎹烽敭銆傜洰鍓嶈繖閮ㄥ垎涓嶈兘淇�敼銆�
 void ShortcutKeyMgr::initQscintShortcutTable()
 {
 	QsciScintilla* pNote = new QsciScintilla(nullptr);
@@ -273,7 +273,7 @@ int ShortcutKeyMgr::isKeySeqExist(int row, QString keySeq, int &type)
 	}
 	return -1;
 }
-//双击修改槽函数
+//鍙屽嚮淇�敼妲藉嚱鏁�
 void ShortcutKeyMgr::slot_edit(QTableWidgetItem* item)
 {
 	int row = item->row();
@@ -289,14 +289,14 @@ void ShortcutKeyMgr::slot_edit(QTableWidgetItem* item)
 	pWin->setCurKeyDesc(shortCutTable.at(row).key.toString());
 
 	int ret = pWin->exec();
-	if (1 == ret) //确定
+	if (1 == ret) //纭�畾
 	{
 		QKeySequence newKeySeq = pWin->getNewKeySeq();
 
 		QTableWidgetItem* item = ui.tableWidget->item(row, 1);
 		if (item != nullptr)
 		{
-			//检查是否冲突,如果冲突,则不设置。先预留
+			//妫€鏌ユ槸鍚﹀啿绐侊紝濡傛灉鍐茬獊锛屽垯涓嶈�缃�€傚厛棰勭暀
 			int conflictType = 0;
 			int existId = isKeySeqExist(row, newKeySeq.toString(), conflictType);
 			if (-1 == existId)
@@ -329,7 +329,7 @@ void ShortcutKeyMgr::slot_edit(QTableWidgetItem* item)
 			}
 		}
 	}
-	else if (2 == ret)//删除
+	else if (2 == ret)//鍒犻櫎
 	{
 		QKeySequence newKeySeq(QKeySequence::UnknownKey);
 

+ 2 - 2
src/shortcutkeymgr.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QMainWindow>
 #include "ui_shortcutkeymgr.h"
@@ -38,7 +38,7 @@ enum Shortcut_Key_ID {
 	Format_Json_ID,
 
 
-	Shortcut_End_ID,//×ÜÊÇÔÚ×îµ×ÏÂ
+	Shortcut_End_ID,//总是在最底下
 };
 
 static const char* New_File = "newfile";

+ 14 - 14
src/styleset.cpp

@@ -1,4 +1,4 @@
-#include "styleset.h"
+锘�#include "styleset.h"
 #include "ccnotepad.h"
 #include <QFile>
 #include <QPalette>
@@ -70,7 +70,7 @@ void StyleSet::setCommonStyle(QColor foldfgColor_, QColor foldbgColor_, QColor m
 	foldbgColor = foldbgColor_;
 	marginsBackgroundColor = marginsBackgroundColor_;
 
-	QFile file(":/qss/lightbluestyle.qss"); //qss文件路径:/lightblue.qss
+	QFile file(":/qss/lightbluestyle.qss"); //qss鏂囦欢璺�緞:/lightblue.qss
 	QString styleSheet;
 	if (file.open(QIODevice::Text | QIODevice::ReadOnly))
 	{
@@ -128,7 +128,7 @@ void StyleSet::setSkin(int id)
 	}
 }
 
-//重新加载Global全局风格
+//閲嶆柊鍔犺浇Global鍏ㄥ眬椋庢牸
 void StyleSet::reloadGolbalStyleFromSetFile()
 {
 	loadGolbalStyle();
@@ -140,7 +140,7 @@ void StyleSet::loadGolbalStyle()
 	QsciLexerGlobal* pGlobalLexer = dynamic_cast<QsciLexerGlobal*>(pLexer);
 	if (pGlobalLexer != nullptr)
 	{
-		//获取其属性颜色,然后填入。后续在ScintillaEditView中直接设置这些One_Stype_Info的属性值
+		//鑾峰彇鍏跺睘鎬ч�鑹诧紝鐒跺悗濉�叆銆傚悗缁�湪ScintillaEditView涓�洿鎺ヨ�缃�繖浜汷ne_Stype_Info鐨勫睘鎬у€�
 		One_Stype_Info* pAddr = &s_global_style->global_style;
 
 		for (int i = 0; i <= URL_HOVERRED; ++i)
@@ -158,7 +158,7 @@ QString StyleSet::getCurrentStyle()
 	return getStyleName(m_curStyleId);
 }
 
-//是否深色风格系列
+//鏄�惁娣辫壊椋庢牸绯诲垪
 bool StyleSet::isCurrentDeepStyle()
 {
 	switch (m_curStyleId)
@@ -217,7 +217,7 @@ void StyleSet::setDefaultStyle()
 	marginsBackgroundColor = QColor(0xf0f0f0);
 	bookmarkBkColor = QColor(0xececec);
 
-	QFile file(":/qss/mystyle.qss"); //qss文件路径:/lightblue.qss
+	QFile file(":/qss/mystyle.qss"); //qss鏂囦欢璺�緞:/lightblue.qss
 	QString styleSheet;
 	if (file.open(QIODevice::Text | QIODevice::ReadOnly))
 	{
@@ -246,7 +246,7 @@ void StyleSet::setThinBlueStyle()
 	setCommonStyle(QColor(0xd7, 0xe3, 0xf4, 100), QColor(0xd7e3f4), QColor(0xd5e1f1), "#D7E3F4");
 }
 
-//纸黄
+//绾搁粍
 void StyleSet::setThinYellowStyle()
 {
 	//m_curStyleId = THIN_YELLOW_SE;
@@ -254,7 +254,7 @@ void StyleSet::setThinYellowStyle()
 	setCommonStyle(QColor(0xf9, 0xf0, 0xe1, 100), QColor(0xf9f0e1), QColor(0xf7f0e0), "#F9F0E1");
 }
 
-//宣纸黄
+//瀹g焊榛�
 void StyleSet::setRiceYellowStyle()
 {
 	//m_curStyleId = RICE_YELLOW_SE;
@@ -262,7 +262,7 @@ void StyleSet::setRiceYellowStyle()
 	setCommonStyle(QColor(0xf6, 0xf3, 0xea, 100), QColor(0xf6f3ea), QColor(0xf4f1e9), "#F6F3EA");
 }
 
-//银色
+//閾惰壊
 void StyleSet::setSilverStyle()
 {
 	//m_curStyleId = SILVER_SE;
@@ -270,7 +270,7 @@ void StyleSet::setSilverStyle()
 	setCommonStyle(QColor(0xe9, 0xe8, 0xe4, 100), QColor(0xe9e8e4), QColor(0xe7e6e2), "#E9E8E4");
 }
 
-//谈紫色#FFF0F5
+//璋堢传鑹�#FFF0F5
 void StyleSet::setLavenderBlushStyle()
 {
 	//m_curStyleId = LAVENDER_SE;
@@ -293,14 +293,14 @@ void StyleSet::setBlackStyle()
 	foldfgColor = QColor(0,0, 0);
 	foldbgColor = QColor(32, 32, 40);
 	
-	//注意暗黑模式是单独的窗口背景颜色。上面的foldbgColor决定了编辑器的背景颜色。
-	//暗黑模式窗体背景不完全是黑色,而是686868
+	//娉ㄦ剰鏆楅粦妯″紡鏄�崟鐙�殑绐楀彛鑳屾櫙棰滆壊銆備笂闈㈢殑foldbgColor鍐冲畾浜嗙紪杈戝櫒鐨勮儗鏅��鑹层€�
+	//鏆楅粦妯″紡绐椾綋鑳屾櫙涓嶅畬鍏ㄦ槸榛戣壊锛岃€屾槸686868
 	QColor blackPaletteColor(68,68,68);
 
 	marginsBackgroundColor = QColor(57, 58, 60);
 	bookmarkBkColor = QColor(53,54,56);
 
-	QFile file(":/qss/black.qss"); //qss文件路径:/lightblue.qss
+	QFile file(":/qss/black.qss"); //qss鏂囦欢璺�緞:/lightblue.qss
 	QString styleSheet;
 	if (file.open(QIODevice::Text | QIODevice::ReadOnly))
 	{
@@ -325,7 +325,7 @@ void StyleSet::setBlackStyle()
 	marginsBackgroundColor = QColor(57, 58, 60);
 	bookmarkBkColor = QColor(53, 54, 56);
 
-	QFile file(":/qss/myblack.qss"); //qss文件路径:/lightblue.qss
+	QFile file(":/qss/myblack.qss"); //qss鏂囦欢璺�緞:/lightblue.qss
 	QString styleSheet;
 	if (file.open(QIODevice::Text | QIODevice::ReadOnly))
 	{

+ 3 - 3
src/styleset.h

@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
 #include <QColor>
 #include <QFont>
 
@@ -30,7 +30,7 @@ struct One_Stype_Info {
 	int styleId;
 	QColor fgColor;
 	QColor bgColor;
-	QFont font; //这个font代表两个含有,1是字体,而是字体大小。有些属性,比如括号大小,他们没有字体,但是有大小,则使用字体大小来表示
+	QFont font; //杩欎釜font浠h〃涓や釜鍚�湁锛�1鏄�瓧浣擄紝鑰屾槸瀛椾綋澶у皬銆傛湁浜涘睘鎬э紝姣斿�鎷�彿澶у皬锛屼粬浠�病鏈夊瓧浣擄紝浣嗘槸鏈夊ぇ灏忥紝鍒欎娇鐢ㄥ瓧浣撳ぇ灏忔潵琛ㄧず
 	One_Stype_Info() :styleId(-1)
 	{
 	}
@@ -40,7 +40,7 @@ struct One_Stype_Info {
 };
 
 
-//当前的全局风格属性,所有的样式修改,都是先修改这个结构体,然后其余地方再根据这个修改后的结构体,来进行同步更新
+//褰撳墠鐨勫叏灞€椋庢牸灞炴€э紝鎵€鏈夌殑鏍峰紡淇�敼锛岄兘鏄�厛淇�敼杩欎釜缁撴瀯浣擄紝鐒跺悗鍏朵綑鍦版柟鍐嶆牴鎹�繖涓�慨鏀瑰悗鐨勭粨鏋勪綋锛屾潵杩涜�鍚屾�鏇存柊
 struct GLOBAL_STYLE_OPS {
 	One_Stype_Info global_style;
 	One_Stype_Info default_style;

+ 1 - 1
src/texteditsetwin.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QWidget>
 #include "ui_texteditsetwin.h"

+ 8 - 8
src/userlexdef.cpp

@@ -1,4 +1,4 @@
-#include "userlexdef.h"
+#include "userlexdef.h"
 #include "rcglobal.h"
 #include <QSettings>
 
@@ -12,14 +12,14 @@ UserLexDef::~UserLexDef()
 }
 
 
-//×Ô¼º¶¨ÒåÒ»Ì×¶ÁÈ¡ºÍ±£´æÅäÖõĽӿÚ
+//自己定义一套读�和�存�置的接�
 
 bool UserLexDef::readUserSettings(QString langTagName)
 {
-	//×Ô¶¨ÒåÓïÑÔ¸ñʽ¡£
+	//自定义语言格�。
 	//mz:ndd
 	//name:xxx
-	//mother:xxx none/cpp/html ¾ÍÈýÖÖ
+	//mother:xxx none/cpp/html 就三�
 	//keword:xxx
 
 	QString userLangFile = QString("notepad/userlang/%1").arg(langTagName);
@@ -28,7 +28,7 @@ bool UserLexDef::readUserSettings(QString langTagName)
 
 	if (!qs.contains(QString("mz")))
 	{
-		//±ØÐë°üº¬MzΪNddµÄ¼ü£¬·ñÔò´íÎó
+		//必须包�Mz为Ndd的键,�则错误
 		return false;
 	}
 	if (qs.value("mz").toString() != QString("ndd"))
@@ -84,11 +84,11 @@ void UserLexDef::setMotherLang(UserLangMother words)
 
 bool UserLexDef::writeUserSettings(QString langTagName)
 {
-	//×Ô¶¨ÒåÓïÑÔ¸ñʽ¡£
+	//自定义语言格�。
 	//mz:ndd
 	//name:xxx
-	//mother:xxx none/cpp/html ¾ÍÈýÖÖ
-	//ext:xx xx xx Îļþ¹ØÁªºó׺Ãû
+	//mother:xxx none/cpp/html 就三�
+	//ext:xx xx xx 文件关��缀�
 	//keyword:xxx
 
 	QString userLangFile = QString("notepad/userlang/%1").arg(langTagName);

+ 1 - 1
src/userlexdef.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QObject>
 #include "rcglobal.h"

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov