整理代码代码

2022-11-02 21:03:36 +08:00 · 2022-11-02 21:03:36 +08:00 · ca50dfccd2
parent 4442bcb34e
commit ca50dfccd2
1660 changed files with 9407 additions and 26 deletions
--- a/release/qmake/temp/1786A3B9-F326-38FA-90FF-3F80802F9209.RealCompare.designtime.idx
+++ b/release/qmake/temp/1786A3B9-F326-38FA-90FF-3F80802F9209.RealCompare.designtime.idx
@ -1 +0,0 @@
-C:\Users\Administrator\AppData\Local\Temp\dasxiu2l.na0.designtime.props
--- a/release/qmake/temp/qtvars.pro
+++ b/release/qmake/temp/qtvars.pro
@ -1,2 +0,0 @@
-CONFIG += no_fixpath
-QT += core network gui widgets concurrent
--- a/src/CmpareMode.cpp
+++ b/src/CmpareMode.cpp
--- a/src/CmpareMode.h
+++ b/src/CmpareMode.h
--- a/src/Encode.cpp
+++ b/src/Encode.cpp
--- a/src/Encode.h
+++ b/src/Encode.h
--- a/src/MediatorDisplay.cpp
+++ b/src/MediatorDisplay.cpp
--- a/src/MediatorDisplay.h
+++ b/src/MediatorDisplay.h
--- a/src/MediatorFileTree.cpp
+++ b/src/MediatorFileTree.cpp
--- a/src/MediatorFileTree.h
+++ b/src/MediatorFileTree.h
--- a/src/QTreeWidgetSortItem.cpp
+++ b/src/QTreeWidgetSortItem.cpp
--- a/src/QTreeWidgetSortItem.h
+++ b/src/QTreeWidgetSortItem.h
--- a/src/RcTreeWidget.cpp
+++ b/src/RcTreeWidget.cpp
--- a/src/RcTreeWidget.h
+++ b/src/RcTreeWidget.h
--- a/src/RealCompare.pri
+++ b/src/RealCompare.pri
--- a/src/RealCompare.pro
+++ b/src/RealCompare.pro
@ -33,19 +33,18 @@ DEFINES +=  QSCINTILLA_DLL

 TRANSLATIONS += realcompare_zh.ts

-win32 {
-    CONFIG(debug, debug|release) {
+ if(contains(QMAKE_HOST.arch, x86_64)){
+    CONFIG(Debug, Debug|Release){
        DESTDIR = x64/Debug
-                LIBS	+= -L$$PWDx64/Debug
+		LIBS	+= -Lx64/Debug
 		LIBS += -lqmyedit_qt5d
    }else{
        DESTDIR = x64/Release
-                LIBS += -L$$PWD/x64/Release
-                LIBS += -lqmyedit_qt5
+		LIBS	+= -Lx64/Release
+		LIBS += -lqmyedit_qt5
                QMAKE_CXXFLAGS += /openmp
    }
-
-}
+   }
 unix{
 if(CONFIG(debug, debug|release)){
          LIBS += -L/home/yzw/build/CCNotePad/lib -lprotobuf
--- a/src/RealCompare.qrc
+++ b/src/RealCompare.qrc
--- a/src/RealCompare.rc
+++ b/src/RealCompare.rc
--- a/src/Resources/1.png
+++ b/src/Resources/1.png
--- a/src/Resources/2.png
+++ b/src/Resources/2.png
--- a/src/Resources/3.png
+++ b/src/Resources/3.png
--- a/src/Resources/4.png
+++ b/src/Resources/4.png
--- a/src/Resources/edit/global/book32.ico
+++ b/src/Resources/edit/global/book32.ico
--- a/src/Resources/edit/global/book64.ico
+++ b/src/Resources/edit/global/book64.ico
--- a/src/Resources/edit/global/close.png
+++ b/src/Resources/edit/global/close.png
--- a/src/Resources/edit/global/closehover.png
+++ b/src/Resources/edit/global/closehover.png
--- a/src/Resources/edit/global/export-2022-06-30
+++ b/src/Resources/edit/global/export-2022-06-30
--- a/src/Resources/edit/global/main128.ico
+++ b/src/Resources/edit/global/main128.ico
--- a/src/Resources/edit/global/main32.ico
+++ b/src/Resources/edit/global/main32.ico
--- a/src/Resources/edit/global/main64.ico
+++ b/src/Resources/edit/global/main64.ico
--- a/src/Resources/edit/global/ndd.ico
+++ b/src/Resources/edit/global/ndd.ico
--- a/src/Resources/edit/global/ndd.png
+++ b/src/Resources/edit/global/ndd.png
--- a/src/Resources/edit/global/ndd.svg
+++ b/src/Resources/edit/global/ndd.svg
--- a/src/Resources/edit/global/ndd1.ico
+++ b/src/Resources/edit/global/ndd1.ico
--- a/src/Resources/edit/global/ndd2.ico
+++ b/src/Resources/edit/global/ndd2.ico
--- a/src/Resources/edit/global/ndd4.ico
+++ b/src/Resources/edit/global/ndd4.ico
--- a/src/Resources/edit/global/ndd_old.ico
+++ b/src/Resources/edit/global/ndd_old.ico
--- a/src/Resources/edit/global/ndd_old.png
+++ b/src/Resources/edit/global/ndd_old.png
--- a/src/Resources/edit/global/needsave.png
+++ b/src/Resources/edit/global/needsave.png
--- a/src/Resources/edit/global/noneedsave.png
+++ b/src/Resources/edit/global/noneedsave.png
--- a/src/Resources/edit/global/notebook.png
+++ b/src/Resources/edit/global/notebook.png
--- a/src/Resources/edit/global/notebook128.ico
+++ b/src/Resources/edit/global/notebook128.ico
--- a/src/Resources/edit/global/notepad.svg
+++ b/src/Resources/edit/global/notepad.svg
--- a/src/Resources/edit/global/txt.svg
+++ b/src/Resources/edit/global/txt.svg
--- a/src/Resources/edit/global/txt1.svg
+++ b/src/Resources/edit/global/txt1.svg
--- a/src/Resources/edit/global/wizard_GiletJaune.jpg
+++ b/src/Resources/edit/global/wizard_GiletJaune.jpg
--- a/src/Resources/edit/global/wizard_GiletJaune1.jpg
+++ b/src/Resources/edit/global/wizard_GiletJaune1.jpg
--- a/src/Resources/edit/styleblack/308上一页、后退、返回.png
+++ b/src/Resources/edit/styleblack/308上一页、后退、返回.png
--- a/src/Resources/edit/styleblack/closeall.png
+++ b/src/Resources/edit/styleblack/closeall.png
--- a/src/Resources/edit/styleblack/closefile.png
+++ b/src/Resources/edit/styleblack/closefile.png
--- a/src/Resources/edit/styleblack/closefile2.png
+++ b/src/Resources/edit/styleblack/closefile2.png
--- a/src/Resources/edit/styleblack/copy.png
+++ b/src/Resources/edit/styleblack/copy.png
--- a/src/Resources/edit/styleblack/crlf.png
+++ b/src/Resources/edit/styleblack/crlf.png
--- a/src/Resources/edit/styleblack/cut.png
+++ b/src/Resources/edit/styleblack/cut.png
--- a/src/Resources/edit/styleblack/dircompare.png
+++ b/src/Resources/edit/styleblack/dircompare.png
--- a/src/Resources/edit/styleblack/filecompare.png
+++ b/src/Resources/edit/styleblack/filecompare.png
--- a/src/Resources/edit/styleblack/find.png
+++ b/src/Resources/edit/styleblack/find.png
--- a/src/Resources/edit/styleblack/find2.png
+++ b/src/Resources/edit/styleblack/find2.png
--- a/src/Resources/edit/styleblack/jhym_goto
+++ b/src/Resources/edit/styleblack/jhym_goto
--- a/src/Resources/edit/styleblack/needsaveallbar.png
+++ b/src/Resources/edit/styleblack/needsaveallbar.png
--- a/src/Resources/edit/styleblack/needsavebar.png
+++ b/src/Resources/edit/styleblack/needsavebar.png
--- a/src/Resources/edit/styleblack/newfile.png
+++ b/src/Resources/edit/styleblack/newfile.png
--- a/src/Resources/edit/styleblack/noneedsaveallbar.png
+++ b/src/Resources/edit/styleblack/noneedsaveallbar.png
--- a/src/Resources/edit/styleblack/noneedsavebar.png
+++ b/src/Resources/edit/styleblack/noneedsavebar.png
--- a/src/Resources/edit/styleblack/openfile.png
+++ b/src/Resources/edit/styleblack/openfile.png
--- a/src/Resources/edit/styleblack/openfile3.png
+++ b/src/Resources/edit/styleblack/openfile3.png
--- a/src/Resources/edit/styleblack/paste.png
+++ b/src/Resources/edit/styleblack/paste.png
--- a/src/Resources/edit/styleblack/redo.png
+++ b/src/Resources/edit/styleblack/redo.png
--- a/src/Resources/edit/styleblack/redo2.png
+++ b/src/Resources/edit/styleblack/redo2.png
--- a/src/Resources/edit/styleblack/rename.png
+++ b/src/Resources/edit/styleblack/rename.png
--- a/src/Resources/edit/styleblack/rename1.png
+++ b/src/Resources/edit/styleblack/rename1.png
--- a/src/Resources/edit/styleblack/replace.png
+++ b/src/Resources/edit/styleblack/replace.png
--- a/src/Resources/edit/styleblack/replace2.png
+++ b/src/Resources/edit/styleblack/replace2.png
--- a/src/Resources/edit/styleblack/replace3.png
+++ b/src/Resources/edit/styleblack/replace3.png
--- a/src/Resources/edit/styleblack/replace4.png
+++ b/src/Resources/edit/styleblack/replace4.png
--- a/src/Resources/edit/styleblack/save
+++ b/src/Resources/edit/styleblack/save
--- a/src/Resources/edit/styleblack/save
+++ b/src/Resources/edit/styleblack/save
--- a/src/Resources/edit/styleblack/save-all.png
+++ b/src/Resources/edit/styleblack/save-all.png
--- a/src/Resources/edit/styleblack/save_all.png
+++ b/src/Resources/edit/styleblack/save_all.png
--- a/src/Resources/edit/styleblack/transcode.png
+++ b/src/Resources/edit/styleblack/transcode.png
--- a/src/Resources/edit/styleblack/undo.png
+++ b/src/Resources/edit/styleblack/undo.png
--- a/src/Resources/edit/styleblack/white.png
+++ b/src/Resources/edit/styleblack/white.png
--- a/src/Resources/edit/styleblack/white2.png
+++ b/src/Resources/edit/styleblack/white2.png
--- a/src/Resources/edit/styleblack/zoomin.png
+++ b/src/Resources/edit/styleblack/zoomin.png
--- a/src/Resources/edit/styleblack/zoomout.png
+++ b/src/Resources/edit/styleblack/zoomout.png
--- a/src/Resources/edit/styleblack/下一页
+++ b/src/Resources/edit/styleblack/下一页
--- a/src/Resources/edit/styleblack/保存
+++ b/src/Resources/edit/styleblack/保存
--- a/src/Resources/edit/styleblack/保存
+++ b/src/Resources/edit/styleblack/保存
--- a/src/Resources/edit/styleblack/关闭
+++ b/src/Resources/edit/styleblack/关闭
--- a/src/Resources/edit/styleblack/关闭
+++ b/src/Resources/edit/styleblack/关闭
--- a/src/Resources/edit/styleblack/关闭
+++ b/src/Resources/edit/styleblack/关闭
--- a/src/Resources/edit/styleblack/关闭
+++ b/src/Resources/edit/styleblack/关闭
--- a/src/Resources/edit/styleblack/关闭所有
+++ b/src/Resources/edit/styleblack/关闭所有
--- a/src/Resources/edit/styleblack/关闭所有_x
+++ b/src/Resources/edit/styleblack/关闭所有_x
--- a/src/Resources/edit/styleblack/右箭头
+++ b/src/Resources/edit/styleblack/右箭头
--- a/src/Resources/edit/styleblack/对比
+++ b/src/Resources/edit/styleblack/对比
--- a/src/Resources/edit/styleblack/对比度
+++ b/src/Resources/edit/styleblack/对比度
--- a/src/Resources/edit/styleblack/对比度
+++ b/src/Resources/edit/styleblack/对比度
--- a/src/Resources/edit/styleblack/左箭头
+++ b/src/Resources/edit/styleblack/左箭头
--- a/src/Resources/edit/styleblack/新建
+++ b/src/Resources/edit/styleblack/新建
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`C:\Users\Administrator\AppData\Local\Temp\dasxiu2l.na0.designtime.props`