1
0
爬山虎 3 жил өмнө
parent
commit
ca50dfccd2
100 өөрчлөгдсөн 6 нэмэгдсэн , 10 устгасан
  1. 0 1
      release/qmake/temp/1786A3B9-F326-38FA-90FF-3F80802F9209.RealCompare.designtime.idx
  2. 0 2
      release/qmake/temp/qtvars.pro
  3. 0 0
      src/CmpareMode.cpp
  4. 0 0
      src/CmpareMode.h
  5. 0 0
      src/Encode.cpp
  6. 0 0
      src/Encode.h
  7. 0 0
      src/MediatorDisplay.cpp
  8. 0 0
      src/MediatorDisplay.h
  9. 0 0
      src/MediatorFileTree.cpp
  10. 0 0
      src/MediatorFileTree.h
  11. 0 0
      src/QTreeWidgetSortItem.cpp
  12. 0 0
      src/QTreeWidgetSortItem.h
  13. 0 0
      src/RcTreeWidget.cpp
  14. 0 0
      src/RcTreeWidget.h
  15. 0 0
      src/RealCompare.pri
  16. 6 7
      src/RealCompare.pro
  17. 0 0
      src/RealCompare.qrc
  18. 0 0
      src/RealCompare.rc
  19. 0 0
      src/Resources/1.png
  20. 0 0
      src/Resources/2.png
  21. 0 0
      src/Resources/3.png
  22. 0 0
      src/Resources/4.png
  23. 0 0
      src/Resources/edit/global/book32.ico
  24. 0 0
      src/Resources/edit/global/book64.ico
  25. 0 0
      src/Resources/edit/global/close.png
  26. 0 0
      src/Resources/edit/global/closehover.png
  27. 0 0
      src/Resources/edit/global/export-2022-06-30 061114.svg
  28. 0 0
      src/Resources/edit/global/main128.ico
  29. 0 0
      src/Resources/edit/global/main32.ico
  30. 0 0
      src/Resources/edit/global/main64.ico
  31. 0 0
      src/Resources/edit/global/ndd.ico
  32. 0 0
      src/Resources/edit/global/ndd.png
  33. 0 0
      src/Resources/edit/global/ndd.svg
  34. 0 0
      src/Resources/edit/global/ndd1.ico
  35. 0 0
      src/Resources/edit/global/ndd2.ico
  36. 0 0
      src/Resources/edit/global/ndd4.ico
  37. 0 0
      src/Resources/edit/global/ndd_old.ico
  38. 0 0
      src/Resources/edit/global/ndd_old.png
  39. 0 0
      src/Resources/edit/global/needsave.png
  40. 0 0
      src/Resources/edit/global/noneedsave.png
  41. 0 0
      src/Resources/edit/global/notebook.png
  42. 0 0
      src/Resources/edit/global/notebook128.ico
  43. 0 0
      src/Resources/edit/global/notepad.svg
  44. 0 0
      src/Resources/edit/global/txt.svg
  45. 0 0
      src/Resources/edit/global/txt1.svg
  46. 0 0
      src/Resources/edit/global/wizard_GiletJaune.jpg
  47. 0 0
      src/Resources/edit/global/wizard_GiletJaune1.jpg
  48. 0 0
      src/Resources/edit/styleblack/308上一页、后退、返回.png
  49. 0 0
      src/Resources/edit/styleblack/closeall.png
  50. 0 0
      src/Resources/edit/styleblack/closefile.png
  51. 0 0
      src/Resources/edit/styleblack/closefile2.png
  52. 0 0
      src/Resources/edit/styleblack/copy.png
  53. 0 0
      src/Resources/edit/styleblack/crlf.png
  54. 0 0
      src/Resources/edit/styleblack/cut.png
  55. 0 0
      src/Resources/edit/styleblack/dircompare.png
  56. 0 0
      src/Resources/edit/styleblack/filecompare.png
  57. 0 0
      src/Resources/edit/styleblack/find.png
  58. 0 0
      src/Resources/edit/styleblack/find2.png
  59. 0 0
      src/Resources/edit/styleblack/jhym_goto (1).png
  60. 0 0
      src/Resources/edit/styleblack/needsaveallbar.png
  61. 0 0
      src/Resources/edit/styleblack/needsavebar.png
  62. 0 0
      src/Resources/edit/styleblack/newfile.png
  63. 0 0
      src/Resources/edit/styleblack/noneedsaveallbar.png
  64. 0 0
      src/Resources/edit/styleblack/noneedsavebar.png
  65. 0 0
      src/Resources/edit/styleblack/openfile.png
  66. 0 0
      src/Resources/edit/styleblack/openfile3.png
  67. 0 0
      src/Resources/edit/styleblack/paste.png
  68. 0 0
      src/Resources/edit/styleblack/redo.png
  69. 0 0
      src/Resources/edit/styleblack/redo2.png
  70. 0 0
      src/Resources/edit/styleblack/rename.png
  71. 0 0
      src/Resources/edit/styleblack/rename1.png
  72. 0 0
      src/Resources/edit/styleblack/replace.png
  73. 0 0
      src/Resources/edit/styleblack/replace2.png
  74. 0 0
      src/Resources/edit/styleblack/replace3.png
  75. 0 0
      src/Resources/edit/styleblack/replace4.png
  76. 0 0
      src/Resources/edit/styleblack/save (13).png
  77. 0 0
      src/Resources/edit/styleblack/save (8).png
  78. 0 0
      src/Resources/edit/styleblack/save-all.png
  79. 0 0
      src/Resources/edit/styleblack/save_all.png
  80. 0 0
      src/Resources/edit/styleblack/transcode.png
  81. 0 0
      src/Resources/edit/styleblack/undo.png
  82. 0 0
      src/Resources/edit/styleblack/white.png
  83. 0 0
      src/Resources/edit/styleblack/white2.png
  84. 0 0
      src/Resources/edit/styleblack/zoomin.png
  85. 0 0
      src/Resources/edit/styleblack/zoomout.png
  86. 0 0
      src/Resources/edit/styleblack/下一页 (2).png
  87. 0 0
      src/Resources/edit/styleblack/保存 (7).png
  88. 0 0
      src/Resources/edit/styleblack/保存 (8).png
  89. 0 0
      src/Resources/edit/styleblack/关闭 (4).png
  90. 0 0
      src/Resources/edit/styleblack/关闭 (6).png
  91. 0 0
      src/Resources/edit/styleblack/关闭 (8).png
  92. 0 0
      src/Resources/edit/styleblack/关闭 (9).png
  93. 0 0
      src/Resources/edit/styleblack/关闭所有 (4).png
  94. 0 0
      src/Resources/edit/styleblack/关闭所有_x (1).png
  95. 0 0
      src/Resources/edit/styleblack/右箭头 (1).png
  96. 0 0
      src/Resources/edit/styleblack/对比 (1).png
  97. 0 0
      src/Resources/edit/styleblack/对比度 (1).png
  98. 0 0
      src/Resources/edit/styleblack/对比度 (2).png
  99. 0 0
      src/Resources/edit/styleblack/左箭头 (1).png
  100. 0 0
      src/Resources/edit/styleblack/新建 (5).png

+ 0 - 1
release/qmake/temp/1786A3B9-F326-38FA-90FF-3F80802F9209.RealCompare.designtime.idx

@@ -1 +0,0 @@
-C:\Users\Administrator\AppData\Local\Temp\dasxiu2l.na0.designtime.props

+ 0 - 2
release/qmake/temp/qtvars.pro

@@ -1,2 +0,0 @@
-CONFIG += no_fixpath
-QT += core network gui widgets concurrent

+ 0 - 0
CmpareMode.cpp → src/CmpareMode.cpp


+ 0 - 0
CmpareMode.h → src/CmpareMode.h


+ 0 - 0
Encode.cpp → src/Encode.cpp


+ 0 - 0
Encode.h → src/Encode.h


+ 0 - 0
MediatorDisplay.cpp → src/MediatorDisplay.cpp


+ 0 - 0
MediatorDisplay.h → src/MediatorDisplay.h


+ 0 - 0
MediatorFileTree.cpp → src/MediatorFileTree.cpp


+ 0 - 0
MediatorFileTree.h → src/MediatorFileTree.h


+ 0 - 0
QTreeWidgetSortItem.cpp → src/QTreeWidgetSortItem.cpp


+ 0 - 0
QTreeWidgetSortItem.h → src/QTreeWidgetSortItem.h


+ 0 - 0
RcTreeWidget.cpp → src/RcTreeWidget.cpp


+ 0 - 0
RcTreeWidget.h → src/RcTreeWidget.h


+ 0 - 0
RealCompare.pri → src/RealCompare.pri


+ 6 - 7
RealCompare.pro → 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

+ 0 - 0
RealCompare.qrc → src/RealCompare.qrc


+ 0 - 0
RealCompare.rc → src/RealCompare.rc


+ 0 - 0
Resources/1.png → src/Resources/1.png


+ 0 - 0
Resources/2.png → src/Resources/2.png


+ 0 - 0
Resources/3.png → src/Resources/3.png


+ 0 - 0
Resources/4.png → src/Resources/4.png


+ 0 - 0
Resources/edit/global/book32.ico → src/Resources/edit/global/book32.ico


+ 0 - 0
Resources/edit/global/book64.ico → src/Resources/edit/global/book64.ico


+ 0 - 0
Resources/edit/global/close.png → src/Resources/edit/global/close.png


+ 0 - 0
Resources/edit/global/closehover.png → src/Resources/edit/global/closehover.png


+ 0 - 0
Resources/edit/global/export-2022-06-30 061114.svg → src/Resources/edit/global/export-2022-06-30 061114.svg


+ 0 - 0
Resources/edit/global/main128.ico → src/Resources/edit/global/main128.ico


+ 0 - 0
Resources/edit/global/main32.ico → src/Resources/edit/global/main32.ico


+ 0 - 0
Resources/edit/global/main64.ico → src/Resources/edit/global/main64.ico


+ 0 - 0
Resources/edit/global/ndd.ico → src/Resources/edit/global/ndd.ico


+ 0 - 0
Resources/edit/global/ndd.png → src/Resources/edit/global/ndd.png


+ 0 - 0
Resources/edit/global/ndd.svg → src/Resources/edit/global/ndd.svg


+ 0 - 0
Resources/edit/global/ndd1.ico → src/Resources/edit/global/ndd1.ico


+ 0 - 0
Resources/edit/global/ndd2.ico → src/Resources/edit/global/ndd2.ico


+ 0 - 0
Resources/edit/global/ndd4.ico → src/Resources/edit/global/ndd4.ico


+ 0 - 0
Resources/edit/global/ndd_old.ico → src/Resources/edit/global/ndd_old.ico


+ 0 - 0
Resources/edit/global/ndd_old.png → src/Resources/edit/global/ndd_old.png


+ 0 - 0
Resources/edit/global/needsave.png → src/Resources/edit/global/needsave.png


+ 0 - 0
Resources/edit/global/noneedsave.png → src/Resources/edit/global/noneedsave.png


+ 0 - 0
Resources/edit/global/notebook.png → src/Resources/edit/global/notebook.png


+ 0 - 0
Resources/edit/global/notebook128.ico → src/Resources/edit/global/notebook128.ico


+ 0 - 0
Resources/edit/global/notepad.svg → src/Resources/edit/global/notepad.svg


+ 0 - 0
Resources/edit/global/txt.svg → src/Resources/edit/global/txt.svg


+ 0 - 0
Resources/edit/global/txt1.svg → src/Resources/edit/global/txt1.svg


+ 0 - 0
Resources/edit/global/wizard_GiletJaune.jpg → src/Resources/edit/global/wizard_GiletJaune.jpg


+ 0 - 0
Resources/edit/global/wizard_GiletJaune1.jpg → src/Resources/edit/global/wizard_GiletJaune1.jpg


+ 0 - 0
Resources/edit/styleblack/308上一页、后退、返回.png → src/Resources/edit/styleblack/308上一页、后退、返回.png


+ 0 - 0
Resources/edit/styleblack/closeall.png → src/Resources/edit/styleblack/closeall.png


+ 0 - 0
Resources/edit/styleblack/closefile.png → src/Resources/edit/styleblack/closefile.png


+ 0 - 0
Resources/edit/styleblack/closefile2.png → src/Resources/edit/styleblack/closefile2.png


+ 0 - 0
Resources/edit/styleblack/copy.png → src/Resources/edit/styleblack/copy.png


+ 0 - 0
Resources/edit/styleblack/crlf.png → src/Resources/edit/styleblack/crlf.png


+ 0 - 0
Resources/edit/styleblack/cut.png → src/Resources/edit/styleblack/cut.png


+ 0 - 0
Resources/edit/styleblack/dircompare.png → src/Resources/edit/styleblack/dircompare.png


+ 0 - 0
Resources/edit/styleblack/filecompare.png → src/Resources/edit/styleblack/filecompare.png


+ 0 - 0
Resources/edit/styleblack/find.png → src/Resources/edit/styleblack/find.png


+ 0 - 0
Resources/edit/styleblack/find2.png → src/Resources/edit/styleblack/find2.png


+ 0 - 0
Resources/edit/styleblack/jhym_goto (1).png → src/Resources/edit/styleblack/jhym_goto (1).png


+ 0 - 0
Resources/edit/styleblack/needsaveallbar.png → src/Resources/edit/styleblack/needsaveallbar.png


+ 0 - 0
Resources/edit/styleblack/needsavebar.png → src/Resources/edit/styleblack/needsavebar.png


+ 0 - 0
Resources/edit/styleblack/newfile.png → src/Resources/edit/styleblack/newfile.png


+ 0 - 0
Resources/edit/styleblack/noneedsaveallbar.png → src/Resources/edit/styleblack/noneedsaveallbar.png


+ 0 - 0
Resources/edit/styleblack/noneedsavebar.png → src/Resources/edit/styleblack/noneedsavebar.png


+ 0 - 0
Resources/edit/styleblack/openfile.png → src/Resources/edit/styleblack/openfile.png


+ 0 - 0
Resources/edit/styleblack/openfile3.png → src/Resources/edit/styleblack/openfile3.png


+ 0 - 0
Resources/edit/styleblack/paste.png → src/Resources/edit/styleblack/paste.png


+ 0 - 0
Resources/edit/styleblack/redo.png → src/Resources/edit/styleblack/redo.png


+ 0 - 0
Resources/edit/styleblack/redo2.png → src/Resources/edit/styleblack/redo2.png


+ 0 - 0
Resources/edit/styleblack/rename.png → src/Resources/edit/styleblack/rename.png


+ 0 - 0
Resources/edit/styleblack/rename1.png → src/Resources/edit/styleblack/rename1.png


+ 0 - 0
Resources/edit/styleblack/replace.png → src/Resources/edit/styleblack/replace.png


+ 0 - 0
Resources/edit/styleblack/replace2.png → src/Resources/edit/styleblack/replace2.png


+ 0 - 0
Resources/edit/styleblack/replace3.png → src/Resources/edit/styleblack/replace3.png


+ 0 - 0
Resources/edit/styleblack/replace4.png → src/Resources/edit/styleblack/replace4.png


+ 0 - 0
Resources/edit/styleblack/save (13).png → src/Resources/edit/styleblack/save (13).png


+ 0 - 0
Resources/edit/styleblack/save (8).png → src/Resources/edit/styleblack/save (8).png


+ 0 - 0
Resources/edit/styleblack/save-all.png → src/Resources/edit/styleblack/save-all.png


+ 0 - 0
Resources/edit/styleblack/save_all.png → src/Resources/edit/styleblack/save_all.png


+ 0 - 0
Resources/edit/styleblack/transcode.png → src/Resources/edit/styleblack/transcode.png


+ 0 - 0
Resources/edit/styleblack/undo.png → src/Resources/edit/styleblack/undo.png


+ 0 - 0
Resources/edit/styleblack/white.png → src/Resources/edit/styleblack/white.png


+ 0 - 0
Resources/edit/styleblack/white2.png → src/Resources/edit/styleblack/white2.png


+ 0 - 0
Resources/edit/styleblack/zoomin.png → src/Resources/edit/styleblack/zoomin.png


+ 0 - 0
Resources/edit/styleblack/zoomout.png → src/Resources/edit/styleblack/zoomout.png


+ 0 - 0
Resources/edit/styleblack/下一页 (2).png → src/Resources/edit/styleblack/下一页 (2).png


+ 0 - 0
Resources/edit/styleblack/保存 (7).png → src/Resources/edit/styleblack/保存 (7).png


+ 0 - 0
Resources/edit/styleblack/保存 (8).png → src/Resources/edit/styleblack/保存 (8).png


+ 0 - 0
Resources/edit/styleblack/关闭 (4).png → src/Resources/edit/styleblack/关闭 (4).png


+ 0 - 0
Resources/edit/styleblack/关闭 (6).png → src/Resources/edit/styleblack/关闭 (6).png


+ 0 - 0
Resources/edit/styleblack/关闭 (8).png → src/Resources/edit/styleblack/关闭 (8).png


+ 0 - 0
Resources/edit/styleblack/关闭 (9).png → src/Resources/edit/styleblack/关闭 (9).png


+ 0 - 0
Resources/edit/styleblack/关闭所有 (4).png → src/Resources/edit/styleblack/关闭所有 (4).png


+ 0 - 0
Resources/edit/styleblack/关闭所有_x (1).png → src/Resources/edit/styleblack/关闭所有_x (1).png


+ 0 - 0
Resources/edit/styleblack/右箭头 (1).png → src/Resources/edit/styleblack/右箭头 (1).png


+ 0 - 0
Resources/edit/styleblack/对比 (1).png → src/Resources/edit/styleblack/对比 (1).png


+ 0 - 0
Resources/edit/styleblack/对比度 (1).png → src/Resources/edit/styleblack/对比度 (1).png


+ 0 - 0
Resources/edit/styleblack/对比度 (2).png → src/Resources/edit/styleblack/对比度 (2).png


+ 0 - 0
Resources/edit/styleblack/左箭头 (1).png → src/Resources/edit/styleblack/左箭头 (1).png


+ 0 - 0
Resources/edit/styleblack/新建 (5).png → src/Resources/edit/styleblack/新建 (5).png


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно