合入1.19.2的全部代码

README.md

@@ -12,9 +12,8 @@
 
 您可以在这个项目提交bug或反馈问题。
 
-最新版本下载地址：https://gitee.com/cxasm/notepad--/releases/tag/v1.18
+最新版本下载地址：https://gitee.com/cxasm/notepad--/releases/tag/v1.19
 
-最新预览版本下载地址：https://gitee.com/cxasm/notepad--/releases/tag/v1.19
 
 做国人自己的免费编辑器，离不开您的支持，请通过微信赞赏我们。
 

src/CmpareMode.cpp

@@ -115,7 +115,8 @@ CODE_ID CmpareMode::getTextFileEncodeType(uchar* fileFpr, int fileLength, QStrin
 
 //20210802：发现如果是CODE_ID::UNICODE_LE，\r\n变成了\r\0\n\0，读取readLine遇到\n就结束了，而且toUnicode也会变成乱码失败
 //所以UNICODE_LE需要单独处理。该函数只处理Unicode_LE编码文件，事先一定要检查文件编码
-CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fileLength, QList<LineFileInfo>& lineInfoVec, QList<LineFileInfo>& blankLineInfoVec,int mode, int &maxLineSize)
+//返回字符数，不是编码类型，注意是字符数，不是bytes
+quint32 CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fileLength, QList<LineFileInfo>& lineInfoVec, QList<LineFileInfo>& blankLineInfoVec,int mode, int &maxLineSize)
 {
 	QCryptographicHash md4(QCryptographicHash::Md4);
 
@@ -166,6 +167,8 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 
 	QByteArray line;
 
+	quint32 charNums = 0;
+
 	auto work = [mode, &md4](LineFileInfo& lineInfo, const int n) {
 		if (mode == 0)
 		{
@@ -199,20 +202,14 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		//如果是头部有标识的格式，则后续不用详细检查每行编码，直接按照头部标识走
 		Encode::tranStrToUNICODE(code, line.data(), line.count(), lineInfo.unicodeStr);
 		lineInfo.code = code;
+
+		charNums += lineInfo.unicodeStr.size();
 	
 		if (lineInfo.unicodeStr.endsWith("\r\r\n"))
 		{
 			//这里是一种错误，但确实可能出现
 			if (length > 3)
 			{
-				/*if (mode == 0)
-				{
-					md4.addData(lineInfo.unicodeStr.trimmed().toUtf8());
-				}
-				else if (mode == 1)
-				{
-					md4.addData(lineInfo.unicodeStr.left(lineInfo.unicodeStr.length() - 3).toUtf8());
-				}*/
 				work(lineInfo, 3);
 				}
 			else
@@ -227,14 +224,6 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		{
 			if (length > 2)
 			{
-				/*if (mode == 0)
-				{
-					md4.addData(lineInfo.unicodeStr.trimmed().toUtf8());
-				}
-				else if(mode == 1)
-				{
-					md4.addData(lineInfo.unicodeStr.left(lineInfo.unicodeStr.length() - 2).toUtf8());
-				}*/
 				work(lineInfo, 2);
 				}
 			else
@@ -250,14 +239,6 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		{
 			if (length > 1)
 			{
-				/*if (mode == 0)
-				{
-					md4.addData(lineInfo.unicodeStr.trimmed().toUtf8());
-				}
-				else if (mode == 1)
-				{
-					md4.addData(lineInfo.unicodeStr.left(lineInfo.unicodeStr.length() - 1).toUtf8());
-				}*/
 				work(lineInfo, 1);
 				}
 			else
@@ -273,14 +254,6 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		{
 			if (length > 1)
 			{
-			/*	if (mode == 0)
-				{
-					md4.addData(lineInfo.unicodeStr.trimmed().toUtf8());
-				}
-				else if (mode == 1)
-				{
-					md4.addData(lineInfo.unicodeStr.left(lineInfo.unicodeStr.length() - 1).toUtf8());
-				}*/
 				work(lineInfo, 1);
 				}
 			else
@@ -295,14 +268,6 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		{
 			if (length > 0)
 			{
-				/*if (mode == 0)
-				{
-					md4.addData(lineInfo.unicodeStr.trimmed().toUtf8());
-				}
-				else if (mode == 1)
-				{
-					md4.addData(lineInfo.unicodeStr.toUtf8());
-				}*/
 				work(lineInfo, 0);
 				}
 			else
@@ -329,7 +294,7 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 		++lineNums;
 	}
 
-	return code;
+	return charNums;
 }
 
 
@@ -342,6 +307,7 @@ CODE_ID CmpareMode::readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fi
 //20210901 发现使用readLine的方式来读取一行不可靠。因为有些文件中一行中间有个\r，这种情况没有识别为多行。readLine是根据\n来识别的。
 //进而导致中间的\r没有识别为多行，但是在编辑器中却多一行，导致对比错误。还是要自己来识别行。不依赖于readLine
 
+
 //CODE_ID fileCode 事先预判定的编码
 CODE_ID CmpareMode::readLineFromFile(uchar* m_fileFpr, const int fileLength, const CODE_ID fileCode, QList<LineFileInfo>&lineInfoVec, QList<LineFileInfo>&blankLineInfoVec, int mode, int &maxLineSize)
 {
@@ -1015,7 +981,7 @@ CODE_ID CmpareMode::scanFileOutPut(CODE_ID code, QString filePath, QList<LineFil
 	//UNICODE_LE格式需要单独处理
 	if (code == UNICODE_LE)
 	{
-		readLineFromFileWithUnicodeLe(m_fileFpr, file->size(), outputLineInfoVec, outputLineInfoVec, 0, maxLineSize);
+		charsNums = readLineFromFileWithUnicodeLe(m_fileFpr, file->size(), outputLineInfoVec, outputLineInfoVec, 0, maxLineSize);
 	}
 	else
 	{

src/CmpareMode.h

@@ -85,7 +85,7 @@ private:
 
 	static bool recognizeTextCode(QByteArray & text, LineFileInfo & lineInfo, QString & outUnicodeText);
 	static CODE_ID getTextFileEncodeType(uchar* fileFpr, int fileLength, QString filePath);
-	CODE_ID static readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fileLength, QList<LineFileInfo>& lineInfoVec, QList<LineFileInfo>& blankLineInfoVec,int mode, int &maxLineSize);
+	quint32 static readLineFromFileWithUnicodeLe(uchar* m_fileFpr, const int fileLength, QList<LineFileInfo>& lineInfoVec, QList<LineFileInfo>& blankLineInfoVec,int mode, int &maxLineSize);
 
 	
 };

src/RealCompare.pro

@@ -5,7 +5,7 @@ TARGET = Notepad--
 
 CONFIG	+= qt warn_on release
 
-QT += core gui widgets concurrent network
+QT += core gui widgets concurrent network xmlpatterns
 
 
 HEADERS	+= *.h \

src/RealCompare.qrc

@@ -27,50 +27,6 @@
         <file>Resources/edit/global/closehover.png</file>
         <file>Resources/edit/global/needsave.png</file>
         <file>Resources/edit/global/noneedsave.png</file>
-        <file>Resources/edit/styleblack/closeall.png</file>
-        <file>Resources/edit/styleblack/closefile.png</file>
-        <file>Resources/edit/styleblack/crlf.png</file>
-        <file>Resources/edit/styleblack/cut.png</file>
-        <file>Resources/edit/styleblack/dircompare.png</file>
-        <file>Resources/edit/styleblack/filecompare.png</file>
-        <file>Resources/edit/styleblack/find.png</file>
-        <file>Resources/edit/styleblack/needsavebar.png</file>
-        <file>Resources/edit/styleblack/newfile.png</file>
-        <file>Resources/edit/styleblack/noneedsaveallbar.png</file>
-        <file>Resources/edit/styleblack/noneedsavebar.png</file>
-        <file>Resources/edit/styleblack/openfile.png</file>
-        <file>Resources/edit/styleblack/paste.png</file>
-        <file>Resources/edit/styleblack/redo.png</file>
-        <file>Resources/edit/styleblack/replace.png</file>
-        <file>Resources/edit/styleblack/transcode.png</file>
-        <file>Resources/edit/styleblack/undo.png</file>
-        <file>Resources/edit/styleblack/white.png</file>
-        <file>Resources/edit/styleblack/zoomin.png</file>
-        <file>Resources/edit/styleblack/zoomout.png</file>
-        <file>Resources/edit/styleblack/copy.png</file>
-        <file>Resources/edit/styleblack/needsaveallbar.png</file>
-        <file>Resources/edit/styledeepblue/closeall.png</file>
-        <file>Resources/edit/styledeepblue/closefile.png</file>
-        <file>Resources/edit/styledeepblue/copy.png</file>
-        <file>Resources/edit/styledeepblue/crlf.png</file>
-        <file>Resources/edit/styledeepblue/cut.png</file>
-        <file>Resources/edit/styledeepblue/dircompare.png</file>
-        <file>Resources/edit/styledeepblue/filecompare.png</file>
-        <file>Resources/edit/styledeepblue/find.png</file>
-        <file>Resources/edit/styledeepblue/needsaveallbar.png</file>
-        <file>Resources/edit/styledeepblue/needsavebar.png</file>
-        <file>Resources/edit/styledeepblue/newfile.png</file>
-        <file>Resources/edit/styledeepblue/noneedsaveallbar.png</file>
-        <file>Resources/edit/styledeepblue/noneedsavebar.png</file>
-        <file>Resources/edit/styledeepblue/openfile.png</file>
-        <file>Resources/edit/styledeepblue/paste.png</file>
-        <file>Resources/edit/styledeepblue/redo.png</file>
-        <file>Resources/edit/styledeepblue/replace.png</file>
-        <file>Resources/edit/styledeepblue/transcode.png</file>
-        <file>Resources/edit/styledeepblue/undo.png</file>
-        <file>Resources/edit/styledeepblue/white.png</file>
-        <file>Resources/edit/styledeepblue/zoomin.png</file>
-        <file>Resources/edit/styledeepblue/zoomout.png</file>
         <file>Resources/edit/global/notebook.png</file>
         <file>Resources/img/next.png</file>
         <file>Resources/img/pre.png</file>
@@ -153,5 +109,89 @@
         <file>Resources/img/register.png</file>
         <file>notepad/rightClose.png</file>
         <file>Resources/img/bookmark.png</file>
+        <file>Resources/img/refresh.png</file>
+        <file>Resources/edit/styledeepblue/autosave.png</file>
+        <file>Resources/edit/styledeepblue/clearsign.png</file>
+        <file>Resources/edit/styledeepblue/closeall.png</file>
+        <file>Resources/edit/styledeepblue/closefile.png</file>
+        <file>Resources/edit/styledeepblue/copy.png</file>
+        <file>Resources/edit/styledeepblue/crlf.png</file>
+        <file>Resources/edit/styledeepblue/cut.png</file>
+        <file>Resources/edit/styledeepblue/dircompare.png</file>
+        <file>Resources/edit/styledeepblue/filecompare.png</file>
+        <file>Resources/edit/styledeepblue/find.png</file>
+        <file>Resources/edit/styledeepblue/indentGuide.png</file>
+        <file>Resources/edit/styledeepblue/mark.png</file>
+        <file>Resources/edit/styledeepblue/needsavebar.png</file>
+        <file>Resources/edit/styledeepblue/newfile.png</file>
+        <file>Resources/edit/styledeepblue/openfile.png</file>
+        <file>Resources/edit/styledeepblue/paste.png</file>
+        <file>Resources/edit/styledeepblue/redo.png</file>
+        <file>Resources/edit/styledeepblue/replace.png</file>
+        <file>Resources/edit/styledeepblue/sign.png</file>
+        <file>Resources/edit/styledeepblue/transcode.png</file>
+        <file>Resources/edit/styledeepblue/undo.png</file>
+        <file>Resources/edit/styledeepblue/white.png</file>
+        <file>Resources/edit/styledeepblue/zoomin.png</file>
+        <file>Resources/edit/styledeepblue/zoomout.png</file>
+        <file>Resources/edit/styledeepblue/needsaveall.png</file>
+        <file>qss/black.qss</file>
+        <file>qss/psblack/add_bottom.png</file>
+        <file>qss/psblack/add_left.png</file>
+        <file>qss/psblack/add_right.png</file>
+        <file>qss/psblack/add_top.png</file>
+        <file>qss/psblack/branch_close.png</file>
+        <file>qss/psblack/branch_open.png</file>
+        <file>qss/psblack/calendar_nextmonth.png</file>
+        <file>qss/psblack/calendar_prevmonth.png</file>
+        <file>qss/psblack/checkbox_checked.png</file>
+        <file>qss/psblack/checkbox_checked_disable.png</file>
+        <file>qss/psblack/checkbox_parcial.png</file>
+        <file>qss/psblack/checkbox_parcial_disable.png</file>
+        <file>qss/psblack/checkbox_unchecked.png</file>
+        <file>qss/psblack/checkbox_unchecked_disable.png</file>
+        <file>qss/psblack/radiobutton_checked.png</file>
+        <file>qss/psblack/radiobutton_checked_disable.png</file>
+        <file>qss/psblack/radiobutton_unchecked.png</file>
+        <file>qss/psblack/radiobutton_unchecked_disable.png</file>
+        <file>Resources/edit/styledark/needsaveall.png</file>
+        <file>Resources/edit/styledark/needsavebar.png</file>
+        <file>Resources/edit/styledark/autosave.png</file>
+        <file>Resources/edit/styledark/bincmp.png</file>
+        <file>Resources/edit/styledark/clearsign.png</file>
+        <file>Resources/edit/styledark/closefile.png</file>
+        <file>Resources/edit/styledark/copy.png</file>
+        <file>Resources/edit/styledark/crlf.png</file>
+        <file>Resources/edit/styledark/cut.png</file>
+        <file>Resources/edit/styledark/dircompare.png</file>
+        <file>Resources/edit/styledark/filecompare.png</file>
+        <file>Resources/edit/styledark/find.png</file>
+        <file>Resources/edit/styledark/goto.png</file>
+        <file>Resources/edit/styledark/indentGuide.png</file>
+        <file>Resources/edit/styledark/mark.png</file>
+        <file>Resources/edit/styledark/newfile.png</file>
+        <file>Resources/edit/styledark/next.png</file>
+        <file>Resources/edit/styledark/openfile.png</file>
+        <file>Resources/edit/styledark/paste.png</file>
+        <file>Resources/edit/styledark/pre.png</file>
+        <file>Resources/edit/styledark/redo.png</file>
+        <file>Resources/edit/styledark/rename.png</file>
+        <file>Resources/edit/styledark/replace.png</file>
+        <file>Resources/edit/styledark/sign.png</file>
+        <file>Resources/edit/styledark/transcode.png</file>
+        <file>Resources/edit/styledark/undo.png</file>
+        <file>Resources/edit/styledark/white.png</file>
+        <file>Resources/edit/styledark/zoomin.png</file>
+        <file>Resources/edit/styledark/zoomout.png</file>
+        <file>Resources/edit/styledark/closeall.png</file>
+        <file>Resources/img/savedark.png</file>
+        <file>Resources/img/opendark.png</file>
+        <file>Resources/img/reloaddark.png</file>
+        <file>Resources/img/vip.png</file>
+        <file>Resources/img/vipdark.png</file>
+        <file>Resources/edit/global/noneedsavedark.png</file>
+        <file>Resources/img/diffall.png</file>
+        <file>Resources/img/expand.png</file>
+        <file>Resources/img/fold.png</file>
     </qresource>
 </RCC>

src/RealCompare.vcxproj

@@ -11,11 +11,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3842E8A0-CF86-31D6-A247-40F65F8611D3}</ProjectGuid>
+    <ProjectGuid>{26BC87D0-189B-3661-B87D-347CF9E0A47F}</ProjectGuid>
     <RootNamespace>Notepad--</RootNamespace>
     <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
+    <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">
@@ -44,11 +44,11 @@
   <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\</OutDir><IntDir>debug\</IntDir><TargetName>Notepad--</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><OutDir>x64\Release\</OutDir><IntDir>release\</IntDir><TargetName>Notepad--</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary><LinkIncremental>false</LinkIncremental></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><QtInstall>msvc2017_64</QtInstall><QtModules>core;network;gui;widgets;concurrent</QtModules></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><QtInstall>msvc2017_64</QtInstall><QtModules>core;network;gui;widgets;concurrent</QtModules></PropertyGroup><ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')"><Import Project="$(QtMsBuild)\qt.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\</OutDir><IntDir>debug\</IntDir><TargetName>Notepad--</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><OutDir>x64\Release\</OutDir><IntDir>release\</IntDir><TargetName>Notepad--</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary><LinkIncremental>false</LinkIncremental></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><QtInstall>5.15.2_msvc2019_64</QtInstall><QtModules>core;network;gui;xmlpatterns;widgets;concurrent</QtModules></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><QtInstall>5.15.2_msvc2019_64</QtInstall><QtModules>core;network;gui;xmlpatterns;widgets;concurrent</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;.;qscint\src;qscint\src\Qsci;qscint\scintilla\include;cceditor;x64\Release;release;/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;qscint\src;qscint\src\Qsci;qscint\scintilla\include;cceditor;x64\Release;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>
@@ -56,9 +56,8 @@
       <DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ExceptionHandling>Sync</ExceptionHandling>
       <ObjectFileName>release\</ObjectFileName>
-      <OpenMPSupport>true</OpenMPSupport>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName></ProgramDataBaseFileName>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -68,12 +67,13 @@
     <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
     <Link>
       <AdditionalDependencies>qmyedit_qt5.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>x64\Release;C:\openssl\lib;C:\Utils\my_sql\mysql-5.6.11-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x64\Release;C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreImportLibrary>true</IgnoreImportLibrary>
       <LinkIncremental>false</LinkIncremental>
+      <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>$(OutDir)\Notepad--.exe</OutputFile>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <SubSystem>Windows</SubSystem>
@@ -85,12 +85,12 @@
       <WarningLevel>0</WarningLevel>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_XMLPATTERNS_LIB;QT_NETWORK_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><QtRcc><InitFuncName>RealCompare</InitFuncName><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><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;.;qscint\src;qscint\src\Qsci;qscint\scintilla\include;cceditor;x64\Release;debug;/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;qscint\src;qscint\src\Qsci;qscint\scintilla\include;cceditor;x64\Release;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>
@@ -108,7 +108,7 @@
     <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
     <Link>
       <AdditionalDependencies>x64\Debug\qmyedit_qt5d.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>x64\Debug;C:\openssl\lib;C:\Utils\my_sql\mysql-5.6.11-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x64\Debug;C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -124,7 +124,7 @@
       <WarningLevel>0</WarningLevel>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QSCINTILLA_DLL;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CONCURRENT_LIB;QT_XMLPATTERNS_LIB;QT_NETWORK_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><QtRcc><InitFuncName>RealCompare</InitFuncName><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
   <ItemGroup>
@@ -532,6 +532,31 @@
       
       
     </QtMoc>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     <ClInclude Include="userlexdef.h" />
   </ItemGroup>
   <ItemGroup>
@@ -596,7 +621,7 @@
     <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 /openmp -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>
+      <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>
@@ -947,15 +972,35 @@
       
     </QtRcc>
     <None Include="qss\lightblue\add_bottom.png" />
+    <None Include="qss\psblack\add_bottom.png" />
+    <None Include="qss\psblack\add_left.png" />
+    <None Include="qss\psblack\add_right.png" />
     <None Include="qss\lightblue\add_top.png" />
+    <None Include="qss\psblack\add_top.png" />
     <None Include="Resources\img\all.png" />
     <None Include="qss\lightblue\arrow_bottom.png" />
+    <None Include="Resources\edit\styledark\autosave.png" />
+    <None Include="Resources\edit\styledeepblue\autosave.png" />
     <None Include="notepad\autosave.png" />
     <None Include="Resources\img\bin.png" />
+    <None Include="Resources\edit\styledark\bincmp.png" />
     <None Include="Resources\edit\styledeepblue\bincmp.png" />
+    <None Include="qss\black.qss" />
     <None Include="Resources\img\bookmark.png" />
+    <None Include="qss\psblack\branch_close.png" />
+    <None Include="qss\psblack\branch_open.png" />
     <None Include="Resources\img\break.png" />
+    <None Include="qss\psblack\calendar_nextmonth.png" />
+    <None Include="qss\psblack\calendar_prevmonth.png" />
+    <None Include="qss\psblack\checkbox_checked.png" />
+    <None Include="qss\psblack\checkbox_checked_disable.png" />
+    <None Include="qss\psblack\checkbox_parcial.png" />
+    <None Include="qss\psblack\checkbox_parcial_disable.png" />
+    <None Include="qss\psblack\checkbox_unchecked.png" />
+    <None Include="qss\psblack\checkbox_unchecked_disable.png" />
     <None Include="Resources\img\clear.png" />
+    <None Include="Resources\edit\styledark\clearsign.png" />
+    <None Include="Resources\edit\styledeepblue\clearsign.png" />
     <None Include="notepad\clearsign.png" />
     <None Include="Resources\edit\global\close.png" />
     <None Include="notepad\close.png" />
@@ -965,9 +1010,9 @@
     <None Include="notepad\closeTabButton_hover.png" />
     <None Include="notepad\closeTabButton_inact.png" />
     <None Include="notepad\closeTabButton_push.png" />
-    <None Include="Resources\edit\styleblack\closeall.png" />
+    <None Include="Resources\edit\styledark\closeall.png" />
     <None Include="Resources\edit\styledeepblue\closeall.png" />
-    <None Include="Resources\edit\styleblack\closefile.png" />
+    <None Include="Resources\edit\styledark\closefile.png" />
     <None Include="Resources\edit\styledeepblue\closefile.png" />
     <None Include="Resources\edit\global\closehover.png" />
     <None Include="notepad\closehover.png" />
@@ -975,30 +1020,36 @@
     <None Include="notepad\cmpdir.png" />
     <None Include="notepad\cmpfile.png" />
     <None Include="notepad\cmpfile1.png" />
-    <None Include="Resources\edit\styleblack\copy.png" />
+    <None Include="Resources\edit\styledark\copy.png" />
     <None Include="Resources\edit\styledeepblue\copy.png" />
     <None Include="notepad\copy.png" />
-    <None Include="Resources\edit\styleblack\crlf.png" />
+    <None Include="Resources\edit\styledark\crlf.png" />
     <None Include="Resources\edit\styledeepblue\crlf.png" />
-    <None Include="Resources\edit\styleblack\cut.png" />
+    <None Include="Resources\edit\styledark\cut.png" />
     <None Include="Resources\edit\styledeepblue\cut.png" />
     <None Include="notepad\cut.png" />
     <None Include="Resources\img\diff.png" />
     <None Include="Resources\img\diff1.png" />
+    <None Include="Resources\img\diffall.png" />
     <None Include="Resources\img\dir.png" />
-    <None Include="Resources\edit\styleblack\dircompare.png" />
+    <None Include="Resources\edit\styledark\dircompare.png" />
     <None Include="Resources\edit\styledeepblue\dircompare.png" />
     <None Include="notepad\ecg.png" />
+    <None Include="Resources\img\expand.png" />
     <None Include="Resources\img\file.png" />
-    <None Include="Resources\edit\styleblack\filecompare.png" />
+    <None Include="Resources\edit\styledark\filecompare.png" />
     <None Include="Resources\edit\styledeepblue\filecompare.png" />
-    <None Include="Resources\edit\styleblack\find.png" />
+    <None Include="Resources\edit\styledark\find.png" />
     <None Include="Resources\edit\styledeepblue\find.png" />
     <None Include="notepad\find.png" />
     <None Include="notepad\findReplace.png" />
+    <None Include="Resources\img\fold.png" />
     <None Include="notepad\go.png" />
+    <None Include="Resources\edit\styledark\goto.png" />
     <None Include="Resources\edit\styledeepblue\goto.png" />
     <None Include="Resources\img\hidechar.png" />
+    <None Include="Resources\edit\styledark\indentGuide.png" />
+    <None Include="Resources\edit\styledeepblue\indentGuide.png" />
     <None Include="notepad\indentGuide.png" />
     <None Include="Resources\img\info.png" />
     <None Include="notepad\invisibleChar.png" />
@@ -1006,57 +1057,66 @@
     <None Include="qss\lightbluestyle.qss" />
     <None Include="mac.icns" />
     <None Include="Resources\img\main.png" />
+    <None Include="Resources\edit\styledark\mark.png" />
+    <None Include="Resources\edit\styledeepblue\mark.png" />
     <None Include="notepad\mark.png" />
     <None Include="qss\mystyle.qss" />
     <None Include="Resources\edit\global\ndd.ico" />
     <None Include="Resources\edit\global\needsave.png" />
     <None Include="Resources\img\needsave.png" />
     <None Include="notepad\needsave.png" />
-    <None Include="Resources\edit\styleblack\needsaveallbar.png" />
-    <None Include="Resources\edit\styledeepblue\needsaveallbar.png" />
-    <None Include="Resources\edit\styleblack\needsavebar.png" />
+    <None Include="Resources\edit\styledark\needsaveall.png" />
+    <None Include="Resources\edit\styledeepblue\needsaveall.png" />
+    <None Include="Resources\edit\styledark\needsavebar.png" />
     <None Include="Resources\edit\styledeepblue\needsavebar.png" />
     <None Include="notepad\newFile.png" />
-    <None Include="Resources\edit\styleblack\newfile.png" />
+    <None Include="Resources\edit\styledark\newfile.png" />
     <None Include="Resources\edit\styledeepblue\newfile.png" />
+    <None Include="Resources\edit\styledark\next.png" />
     <None Include="Resources\edit\styledeepblue\next.png" />
     <None Include="Resources\img\next.png" />
     <None Include="notepad\next.png" />
     <None Include="Resources\img\next2.png" />
     <None Include="Resources\edit\global\noneedsave.png" />
     <None Include="notepad\noneedsave.png" />
-    <None Include="Resources\edit\styleblack\noneedsaveallbar.png" />
-    <None Include="Resources\edit\styledeepblue\noneedsaveallbar.png" />
-    <None Include="Resources\edit\styleblack\noneedsavebar.png" />
-    <None Include="Resources\edit\styledeepblue\noneedsavebar.png" />
+    <None Include="Resources\edit\global\noneedsavedark.png" />
     <None Include="Resources\edit\global\notebook.png" />
     <None Include="Resources\img\onlyfile.png" />
     <None Include="Resources\img\open.png" />
     <None Include="Resources\img\open1.png" />
     <None Include="notepad\openFile.png" />
-    <None Include="Resources\edit\styleblack\openfile.png" />
+    <None Include="Resources\img\opendark.png" />
+    <None Include="Resources\edit\styledark\openfile.png" />
     <None Include="Resources\edit\styledeepblue\openfile.png" />
-    <None Include="Resources\edit\styleblack\paste.png" />
+    <None Include="Resources\edit\styledark\paste.png" />
     <None Include="Resources\edit\styledeepblue\paste.png" />
     <None Include="notepad\paste.png" />
     <None Include="Resources\img\point.png" />
+    <None Include="Resources\edit\styledark\pre.png" />
     <None Include="Resources\edit\styledeepblue\pre.png" />
     <None Include="Resources\img\pre.png" />
     <None Include="notepad\pre.png" />
     <None Include="Resources\img\pre2.png" />
     <None Include="Resources\img\pullopen.png" />
+    <None Include="qss\psblack\radiobutton_checked.png" />
+    <None Include="qss\psblack\radiobutton_checked_disable.png" />
+    <None Include="qss\psblack\radiobutton_unchecked.png" />
+    <None Include="qss\psblack\radiobutton_unchecked_disable.png" />
     <None Include="realcompare_zh.qm" />
-    <None Include="Resources\edit\styleblack\redo.png" />
+    <None Include="Resources\edit\styledark\redo.png" />
     <None Include="Resources\edit\styledeepblue\redo.png" />
     <None Include="Resources\img\redo.png" />
     <None Include="notepad\redo.png" />
+    <None Include="Resources\img\refresh.png" />
     <None Include="Resources\img\register.png" />
     <None Include="Resources\img\reload.png" />
     <None Include="Resources\img\reload2.png" />
+    <None Include="Resources\img\reloaddark.png" />
     <None Include="Resources\edit\styleblack\rename.png" />
+    <None Include="Resources\edit\styledark\rename.png" />
     <None Include="Resources\edit\styledeepblue\rename.png" />
     <None Include="notepad\rename.png" />
-    <None Include="Resources\edit\styleblack\replace.png" />
+    <None Include="Resources\edit\styledark\replace.png" />
     <None Include="Resources\edit\styledeepblue\replace.png" />
     <None Include="Resources\img\right3.png" />
     <None Include="notepad\rightClose.png" />
@@ -1065,31 +1125,36 @@
     <None Include="Resources\img\save.png" />
     <None Include="notepad\saveAll.png" />
     <None Include="notepad\saveFile.png" />
+    <None Include="Resources\img\savedark.png" />
     <None Include="notepad\savetab.png" />
     <None Include="Resources\img\showall.png" />
     <None Include="Resources\img\showchar.png" />
+    <None Include="Resources\edit\styledark\sign.png" />
+    <None Include="Resources\edit\styledeepblue\sign.png" />
     <None Include="notepad\sign.png" />
     <None Include="Resources\img\strict.png" />
     <None Include="Resources\img\swap.png" />
     <None Include="Resources\img\tolerant.png" />
     <None Include="Resources\img\tran.png" />
-    <None Include="Resources\edit\styleblack\transcode.png" />
+    <None Include="Resources\edit\styledark\transcode.png" />
     <None Include="Resources\edit\styledeepblue\transcode.png" />
-    <None Include="Resources\edit\styleblack\undo.png" />
+    <None Include="Resources\edit\styledark\undo.png" />
     <None Include="Resources\edit\styledeepblue\undo.png" />
     <None Include="Resources\img\undo.png" />
     <None Include="notepad\undo.png" />
     <None Include="Resources\img\unequaldir.png" />
     <None Include="Resources\img\unequalfile.png" />
-    <None Include="Resources\edit\styleblack\white.png" />
+    <None Include="Resources\img\vip.png" />
+    <None Include="Resources\img\vipdark.png" />
+    <None Include="Resources\edit\styledark\white.png" />
     <None Include="Resources\edit\styledeepblue\white.png" />
     <None Include="notepad\wrap.png" />
     <None Include="notepad\zoomIn.png" />
     <None Include="notepad\zoomOut.png" />
-    <None Include="Resources\edit\styleblack\zoomin.png" />
+    <None Include="Resources\edit\styledark\zoomin.png" />
     <None Include="Resources\edit\styledeepblue\zoomin.png" />
     <None Include="Resources\img\zoomin.png" />
-    <None Include="Resources\edit\styleblack\zoomout.png" />
+    <None Include="Resources\edit\styledark\zoomout.png" />
     <None Include="Resources\edit\styledeepblue\zoomout.png" />
     <None Include="Resources\img\zoomout.png" />
   </ItemGroup>

src/RealCompare.vcxproj.filters

@@ -347,6 +347,31 @@
     <QtMoc Include="textfind.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     <ClInclude Include="userlexdef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -564,33 +589,93 @@
     <None Include="qss\lightblue\add_bottom.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\psblack\add_bottom.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\add_left.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\add_right.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="qss\lightblue\add_top.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\psblack\add_top.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\all.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="qss\lightblue\arrow_bottom.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\autosave.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledeepblue\autosave.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\autosave.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\img\bin.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\bincmp.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styledeepblue\bincmp.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\black.qss">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\bookmark.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\psblack\branch_close.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\branch_open.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\break.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\psblack\calendar_nextmonth.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\calendar_prevmonth.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_checked.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_checked_disable.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_parcial.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_parcial_disable.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_unchecked.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\checkbox_unchecked_disable.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\clear.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\clearsign.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledeepblue\clearsign.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\clearsign.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -618,13 +703,13 @@
     <None Include="notepad\closeTabButton_push.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\closeall.png">
+    <None Include="Resources\edit\styledark\closeall.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\closeall.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\closefile.png">
+    <None Include="Resources\edit\styledark\closefile.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\closefile.png">
@@ -648,7 +733,7 @@
     <None Include="notepad\cmpfile1.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\copy.png">
+    <None Include="Resources\edit\styledark\copy.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\copy.png">
@@ -657,13 +742,13 @@
     <None Include="notepad\copy.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\crlf.png">
+    <None Include="Resources\edit\styledark\crlf.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\crlf.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\cut.png">
+    <None Include="Resources\edit\styledark\cut.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\cut.png">
@@ -678,10 +763,13 @@
     <None Include="Resources\img\diff1.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\diffall.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\dir.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\dircompare.png">
+    <None Include="Resources\edit\styledark\dircompare.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\dircompare.png">
@@ -690,16 +778,19 @@
     <None Include="notepad\ecg.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\expand.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\file.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\filecompare.png">
+    <None Include="Resources\edit\styledark\filecompare.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\filecompare.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\find.png">
+    <None Include="Resources\edit\styledark\find.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\find.png">
@@ -711,15 +802,27 @@
     <None Include="notepad\findReplace.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\fold.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\go.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\goto.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styledeepblue\goto.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\img\hidechar.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\indentGuide.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledeepblue\indentGuide.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\indentGuide.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -741,6 +844,12 @@
     <None Include="Resources\img\main.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\mark.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledeepblue\mark.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\mark.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -759,13 +868,13 @@
     <None Include="notepad\needsave.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\needsaveallbar.png">
+    <None Include="Resources\edit\styledark\needsaveall.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styledeepblue\needsaveallbar.png">
+    <None Include="Resources\edit\styledeepblue\needsaveall.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\needsavebar.png">
+    <None Include="Resources\edit\styledark\needsavebar.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\needsavebar.png">
@@ -774,12 +883,15 @@
     <None Include="notepad\newFile.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\newfile.png">
+    <None Include="Resources\edit\styledark\newfile.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\newfile.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\next.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styledeepblue\next.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -798,16 +910,7 @@
     <None Include="notepad\noneedsave.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\noneedsaveallbar.png">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Resources\edit\styledeepblue\noneedsaveallbar.png">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Resources\edit\styleblack\noneedsavebar.png">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Resources\edit\styledeepblue\noneedsavebar.png">
+    <None Include="Resources\edit\global\noneedsavedark.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\global\notebook.png">
@@ -825,13 +928,16 @@
     <None Include="notepad\openFile.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\openfile.png">
+    <None Include="Resources\img\opendark.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledark\openfile.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\openfile.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\paste.png">
+    <None Include="Resources\edit\styledark\paste.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\paste.png">
@@ -843,6 +949,9 @@
     <None Include="Resources\img\point.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\pre.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styledeepblue\pre.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -858,10 +967,22 @@
     <None Include="Resources\img\pullopen.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="qss\psblack\radiobutton_checked.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\radiobutton_checked_disable.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\radiobutton_unchecked.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="qss\psblack\radiobutton_unchecked_disable.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="realcompare_zh.qm">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\redo.png">
+    <None Include="Resources\edit\styledark\redo.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\redo.png">
@@ -873,6 +994,9 @@
     <None Include="notepad\redo.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\refresh.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\img\register.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -882,16 +1006,22 @@
     <None Include="Resources\img\reload2.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\reloaddark.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styleblack\rename.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\rename.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="Resources\edit\styledeepblue\rename.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="notepad\rename.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\replace.png">
+    <None Include="Resources\edit\styledark\replace.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\replace.png">
@@ -918,6 +1048,9 @@
     <None Include="notepad\saveFile.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\img\savedark.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\savetab.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -927,6 +1060,12 @@
     <None Include="Resources\img\showchar.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="Resources\edit\styledark\sign.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledeepblue\sign.png">
+      <Filter>Resource Files</Filter>
+    </None>
     <None Include="notepad\sign.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -942,13 +1081,13 @@
     <None Include="Resources\img\tran.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\transcode.png">
+    <None Include="Resources\edit\styledark\transcode.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\transcode.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\undo.png">
+    <None Include="Resources\edit\styledark\undo.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\undo.png">
@@ -966,7 +1105,13 @@
     <None Include="Resources\img\unequalfile.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\white.png">
+    <None Include="Resources\img\vip.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\img\vipdark.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\edit\styledark\white.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\white.png">
@@ -981,7 +1126,7 @@
     <None Include="notepad\zoomOut.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\zoomin.png">
+    <None Include="Resources\edit\styledark\zoomin.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\zoomin.png">
@@ -990,7 +1135,7 @@
     <None Include="Resources\img\zoomin.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Resources\edit\styleblack\zoomout.png">
+    <None Include="Resources\edit\styledark\zoomout.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="Resources\edit\styledeepblue\zoomout.png">

src/RealCompare.vcxproj.user

@@ -2,9 +2,9 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QtLastBackgroundBuild>2022-11-28T01:31:37.4770997Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-11T10:37:19.8112403Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QtLastBackgroundBuild>2022-11-28T01:31:37.7020503Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-11T10:37:20.2889680Z</QtLastBackgroundBuild>
   </PropertyGroup>
 </Project>