更新修复一些读取问题
This commit is contained in:
parent
858f98f41d
commit
905abc44a2
85
.vscode/settings.json
vendored
85
.vscode/settings.json
vendored
@ -1,5 +1,88 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"new": "cpp"
|
||||
"new": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"string": "cpp",
|
||||
"*.tcc": "cpp",
|
||||
"fstream": "cpp",
|
||||
"ostream": "cpp",
|
||||
"qmessagebox": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"bit": "cpp",
|
||||
"cctype": "cpp",
|
||||
"charconv": "cpp",
|
||||
"chrono": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cmath": "cpp",
|
||||
"codecvt": "cpp",
|
||||
"compare": "cpp",
|
||||
"concepts": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"cstdarg": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"cwctype": "cpp",
|
||||
"deque": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"list": "cpp",
|
||||
"map": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"vector": "cpp",
|
||||
"exception": "cpp",
|
||||
"algorithm": "cpp",
|
||||
"functional": "cpp",
|
||||
"iterator": "cpp",
|
||||
"memory": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"numeric": "cpp",
|
||||
"optional": "cpp",
|
||||
"random": "cpp",
|
||||
"ratio": "cpp",
|
||||
"source_location": "cpp",
|
||||
"string_view": "cpp",
|
||||
"system_error": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"utility": "cpp",
|
||||
"format": "cpp",
|
||||
"future": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"iostream": "cpp",
|
||||
"istream": "cpp",
|
||||
"limits": "cpp",
|
||||
"mutex": "cpp",
|
||||
"numbers": "cpp",
|
||||
"semaphore": "cpp",
|
||||
"shared_mutex": "cpp",
|
||||
"span": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"stdfloat": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"text_encoding": "cpp",
|
||||
"thread": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"valarray": "cpp",
|
||||
"variant": "cpp"
|
||||
},
|
||||
"editor.gotoLocation.alternativeDeclarationCommand": "editor.action.revealDefinition",
|
||||
"editor.gotoLocation.alternativeDefinitionCommand": "editor.action.revealDefinition",
|
||||
"editor.gotoLocation.alternativeTypeDefinitionCommand": "editor.action.revealDefinition",
|
||||
"editor.selectionHighlight": false,
|
||||
"files.autoSave": "onFocusChange",
|
||||
"editor.suggest.snippetsPreventQuickSuggestions": false,
|
||||
"editor.quickSuggestions": {
|
||||
"other": "on",
|
||||
"comments": "off",
|
||||
"strings": "on"
|
||||
}
|
||||
}
|
||||
@ -65,25 +65,6 @@ MESSAGE(STATUS "QT_DIR_PATH=${QT_DIR}")
|
||||
MESSAGE(STATUS "JSON_DIR_PATH=${JSON}")
|
||||
MESSAGE(STATUS "----------基础路径输出 END---------------")
|
||||
|
||||
|
||||
#LIBGIT2库
|
||||
find_package(PkgConfig REQUIRED QUIET)
|
||||
pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
|
||||
if(LIBGIT2_FOUND)
|
||||
include_directories(${LIBGIT2_INCLUDE_DIRS})
|
||||
message(STATUS "------------LIBGIT2 INFO----------------------")
|
||||
message(STATUS "LIBGIT2_FOUND=Yes")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_LIBRARIES:${LIBGIT2_LIBRARIES}")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_Version:${LIBGIT2_VERSION}")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_INCLUDE_DIR_PATH=${LIBGIT2_INCLUDE_DIRS}")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_LIBRARY_DIRS:${LIBGIT2_LIBRARY_DIRS}")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_LINK_LIBRARIES:${LIBGIT2_LINK_LIBRARIES}")
|
||||
message(STATUS "LIBGIT2 Found:->LIBGIT2_STATIC_LIBRARIES:${LIBGIT2_STATIC_LIBRARIES}")
|
||||
else()
|
||||
message(STATUS "LIBGIT2_FOUND=NOT")
|
||||
endif()
|
||||
|
||||
|
||||
#JSON库
|
||||
include_directories(${JSON}/include)
|
||||
|
||||
@ -150,7 +131,7 @@ configure_file (version.h.in version.h @ONLY)
|
||||
SET(CMAKE_EXE_LINKER_FLAGS -static)
|
||||
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets PkgConfig::LIBGIT2
|
||||
${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -1580,21 +1580,6 @@
|
||||
"isExternal" : true,
|
||||
"path" : "D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessAliasTargets.cmake"
|
||||
},
|
||||
{
|
||||
"isCMake" : true,
|
||||
"isExternal" : true,
|
||||
"path" : "D:/Dev/msys64/mingw64/share/cmake/Modules/FindPkgConfig.cmake"
|
||||
},
|
||||
{
|
||||
"isCMake" : true,
|
||||
"isExternal" : true,
|
||||
"path" : "D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageHandleStandardArgs.cmake"
|
||||
},
|
||||
{
|
||||
"isCMake" : true,
|
||||
"isExternal" : true,
|
||||
"path" : "D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageMessage.cmake"
|
||||
},
|
||||
{
|
||||
"path" : "res.qrc"
|
||||
},
|
||||
@ -43,7 +43,7 @@
|
||||
{
|
||||
"directoryIndex" : 0,
|
||||
"id" : "sui::@6890427a1f51a3e7e1df",
|
||||
"jsonFile" : "target-sui-Release-a1226282385226cb82e3.json",
|
||||
"jsonFile" : "target-sui-Release-d5f737c074ea0c81d8d5.json",
|
||||
"name" : "sui",
|
||||
"projectIndex" : 0
|
||||
},
|
||||
@ -26,7 +26,7 @@
|
||||
"objects" :
|
||||
[
|
||||
{
|
||||
"jsonFile" : "codemodel-v2-1b6dcea551425856051f.json",
|
||||
"jsonFile" : "codemodel-v2-c3270ee4c813e373e791.json",
|
||||
"kind" : "codemodel",
|
||||
"version" :
|
||||
{
|
||||
@ -44,7 +44,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"jsonFile" : "cmakeFiles-v1-6edbb9bd510acbd7962b.json",
|
||||
"jsonFile" : "cmakeFiles-v1-f904f4c0eac456e214c1.json",
|
||||
"kind" : "cmakeFiles",
|
||||
"version" :
|
||||
{
|
||||
@ -99,7 +99,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"jsonFile" : "codemodel-v2-1b6dcea551425856051f.json",
|
||||
"jsonFile" : "codemodel-v2-c3270ee4c813e373e791.json",
|
||||
"kind" : "codemodel",
|
||||
"version" :
|
||||
{
|
||||
@ -117,7 +117,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"jsonFile" : "cmakeFiles-v1-6edbb9bd510acbd7962b.json",
|
||||
"jsonFile" : "cmakeFiles-v1-f904f4c0eac456e214c1.json",
|
||||
"kind" : "cmakeFiles",
|
||||
"version" :
|
||||
{
|
||||
@ -31,10 +31,6 @@
|
||||
"_qt_internal_find_qt_dependencies",
|
||||
"qt_find_package_system_or_bundled",
|
||||
"_qt_internal_find_third_party_dependencies",
|
||||
"set_property",
|
||||
"_pkg_create_imp_target",
|
||||
"_pkg_recalculate",
|
||||
"pkg_check_modules",
|
||||
"ADD_DEFINITIONS",
|
||||
"include_directories"
|
||||
],
|
||||
@ -74,8 +70,7 @@
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6Core/Qt6CoreTargets.cmake",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6/FindWrapPCRE2.cmake",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6EntryPointPrivate/Qt6EntryPointPrivateTargets.cmake",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6EntryPointPrivate/Qt6EntryPointPrivateConfig.cmake",
|
||||
"D:/Dev/msys64/mingw64/share/cmake/Modules/FindPkgConfig.cmake"
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6EntryPointPrivate/Qt6EntryPointPrivateConfig.cmake"
|
||||
],
|
||||
"nodes" :
|
||||
[
|
||||
@ -85,7 +80,7 @@
|
||||
{
|
||||
"command" : 1,
|
||||
"file" : 1,
|
||||
"line" : 101,
|
||||
"line" : 82,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
@ -97,13 +92,13 @@
|
||||
{
|
||||
"command" : 2,
|
||||
"file" : 1,
|
||||
"line" : 137,
|
||||
"line" : 118,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
"command" : 3,
|
||||
"file" : 1,
|
||||
"line" : 152,
|
||||
"line" : 133,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
@ -1094,46 +1089,16 @@
|
||||
"line" : 61,
|
||||
"parent" : 177
|
||||
},
|
||||
{
|
||||
"command" : 21,
|
||||
"file" : 1,
|
||||
"line" : 71,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
"command" : 20,
|
||||
"file" : 35,
|
||||
"line" : 881,
|
||||
"parent" : 179
|
||||
},
|
||||
{
|
||||
"command" : 19,
|
||||
"file" : 35,
|
||||
"line" : 365,
|
||||
"parent" : 180
|
||||
},
|
||||
{
|
||||
"command" : 18,
|
||||
"file" : 35,
|
||||
"line" : 346,
|
||||
"parent" : 181
|
||||
},
|
||||
{
|
||||
"command" : 22,
|
||||
"file" : 1,
|
||||
"line" : 24,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
"command" : 23,
|
||||
"command" : 19,
|
||||
"file" : 1,
|
||||
"line" : 88,
|
||||
"parent" : 0
|
||||
},
|
||||
{
|
||||
"command" : 23,
|
||||
"file" : 1,
|
||||
"line" : 73,
|
||||
"line" : 69,
|
||||
"parent" : 0
|
||||
}
|
||||
]
|
||||
@ -1153,10 +1118,6 @@
|
||||
{
|
||||
"backtrace" : 4,
|
||||
"fragment" : "-fdata-sections"
|
||||
},
|
||||
{
|
||||
"backtrace" : 4,
|
||||
"fragment" : "-DPCRE_STATIC"
|
||||
}
|
||||
],
|
||||
"defines" :
|
||||
@ -1174,7 +1135,7 @@
|
||||
"define" : "QT_GUI_LIB"
|
||||
},
|
||||
{
|
||||
"backtrace" : 183,
|
||||
"backtrace" : 179,
|
||||
"define" : "QT_MESSAGELOGCONTEXT"
|
||||
},
|
||||
{
|
||||
@ -1227,14 +1188,9 @@
|
||||
"path" : "F:/SourceCode/sui/build/sui_autogen/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 184,
|
||||
"backtrace" : 180,
|
||||
"path" : "F:/SourceCode/sui/3rdparty/json/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 185,
|
||||
"isSystem" : true,
|
||||
"path" : "F:/SourceCode/vcpkg/installed/x64-mingw-static/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 4,
|
||||
"isSystem" : true,
|
||||
@ -1284,13 +1240,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"compileCommandFragments" :
|
||||
[
|
||||
{
|
||||
"backtrace" : 4,
|
||||
"fragment" : "-DPCRE_STATIC"
|
||||
}
|
||||
],
|
||||
"defines" :
|
||||
[
|
||||
{
|
||||
@ -1306,7 +1255,7 @@
|
||||
"define" : "QT_GUI_LIB"
|
||||
},
|
||||
{
|
||||
"backtrace" : 183,
|
||||
"backtrace" : 179,
|
||||
"define" : "QT_MESSAGELOGCONTEXT"
|
||||
},
|
||||
{
|
||||
@ -1359,14 +1308,9 @@
|
||||
"path" : "F:/SourceCode/sui/build/sui_autogen/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 184,
|
||||
"backtrace" : 180,
|
||||
"path" : "F:/SourceCode/sui/3rdparty/json/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 185,
|
||||
"isSystem" : true,
|
||||
"path" : "F:/SourceCode/vcpkg/installed/x64-mingw-static/include"
|
||||
},
|
||||
{
|
||||
"backtrace" : 4,
|
||||
"isSystem" : true,
|
||||
@ -1402,12 +1346,12 @@
|
||||
],
|
||||
"dependencies" :
|
||||
[
|
||||
{
|
||||
"id" : "sui_autogen_timestamp_deps::@6890427a1f51a3e7e1df"
|
||||
},
|
||||
{
|
||||
"backtrace" : 0,
|
||||
"id" : "sui_autogen::@6890427a1f51a3e7e1df"
|
||||
},
|
||||
{
|
||||
"id" : "sui_autogen_timestamp_deps::@6890427a1f51a3e7e1df"
|
||||
}
|
||||
],
|
||||
"id" : "sui::@6890427a1f51a3e7e1df",
|
||||
@ -1918,56 +1862,6 @@
|
||||
"fragment" : "-lshell32",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "F:\\SourceCode\\vcpkg\\installed\\x64-mingw-static\\lib\\libgit2.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\libwinhttp.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\librpcrt4.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\libcrypt32.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\libole32.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "F:\\SourceCode\\vcpkg\\installed\\x64-mingw-static\\lib\\libhttp_parser.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\libws2_32.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "D:\\Dev\\msys64\\mingw64\\lib\\libsecur32.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "F:\\SourceCode\\vcpkg\\installed\\x64-mingw-static\\lib\\libpcre.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"backtrace" : 182,
|
||||
"fragment" : "F:\\SourceCode\\vcpkg\\installed\\x64-mingw-static\\lib\\libzlib.a",
|
||||
"role" : "libraries"
|
||||
},
|
||||
{
|
||||
"fragment" : "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32",
|
||||
"role" : "libraries"
|
||||
Binary file not shown.
@ -1,17 +1,55 @@
|
||||
# ninja log v6
|
||||
3031 12411 7546602453476330 CMakeFiles/sui.dir/src/sui.cpp.obj 786d94b63cdebdf
|
||||
11089 19886 7549250927021397 F:/SourceCode/sui/release/sui.exe 440b9da345052e5a
|
||||
2997 3562 7549229009941041 CMakeFiles/sui.dir/sui.rc.obj bef74cf9daa42262
|
||||
15 273 7549250816283095 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
274 11088 7549250818876573 CMakeFiles/sui.dir/src/sui_base_ex.cpp.obj b4e110b3b20cc30d
|
||||
2983 6705 7549229009795937 CMakeFiles/sui.dir/qrc_res.cpp.obj 3c45cd3ce68f4be6
|
||||
2946 13239 7549241579256578 CMakeFiles/sui.dir/src/test.cpp.obj 96729d9a809fe421
|
||||
2879 13304 7549241578597765 CMakeFiles/sui.dir/sui_autogen/mocs_compilation.cpp.obj 5b50829cc1b578ee
|
||||
2893 13271 7549241578728038 CMakeFiles/sui.dir/src/main.cpp.obj 8e6eea0284be0d17
|
||||
15 273 7549250816283095 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
15 273 7549250816283095 sui_autogen/timestamp 941d172e51f73a65
|
||||
16 233 7546606934414380 F:/SourceCode/sui/build/qrc_res.cpp 34acac006d95063b
|
||||
17 268 7546612540811095 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
12179 20901 7546612662434741 F:/SourceCode/sui/release/sui.exe 1c43d55b00735ce
|
||||
268 12179 7546612543328736 CMakeFiles/sui.dir/src/sui_base_ex.cpp.obj 9d999880d4224229
|
||||
278 8393 7546612543433882 CMakeFiles/sui.dir/src/sui_title.cpp.obj c3f8f01796097720
|
||||
17 268 7546612540811095 sui_autogen/timestamp 941d172e51f73a65
|
||||
17 268 7546612540811095 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
17 268 7546612540811095 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
3022 12302 7546602453391320 CMakeFiles/sui.dir/src/main.cpp.obj 9342baf43a6fcfd9
|
||||
3013 12365 7546602453296081 CMakeFiles/sui.dir/sui_autogen/mocs_compilation.cpp.obj 79a68cb202c02b97
|
||||
3101 3359 7546602454176824 CMakeFiles/sui.dir/sui.rc.obj 68e141830b45f5d4
|
||||
3048 6176 7546602453652494 CMakeFiles/sui.dir/src/sui_sys_style.cpp.obj 748a0ad75f6dc7fb
|
||||
15 273 7549250816283095 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
2904 13393 7549241578846189 CMakeFiles/sui.dir/src/sui.cpp.obj 50a3f05a94908c1a
|
||||
2931 13855 7549241579116419 CMakeFiles/sui.dir/src/sui_title.cpp.obj f5a1ca5c1b8d76b7
|
||||
2949 6449 7549229009452781 CMakeFiles/sui.dir/src/sui_sys_style.cpp.obj 175e93da52ad7edf
|
||||
16 233 7546606934414380 qrc_res.cpp 34acac006d95063b
|
||||
3070 12173 7546602453871993 CMakeFiles/sui.dir/src/test.cpp.obj 91d858f75e4f04ed
|
||||
234 2613 7546606934489405 CMakeFiles/sui.dir/qrc_res.cpp.obj 2d9c0e37d70351d0
|
||||
13 2688 7549260506489695 sui_autogen/timestamp 941d172e51f73a65
|
||||
13 2688 7549260506489695 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
13 2688 7549260506489695 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
13 2688 7549260506489695 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
2790 3281 7549260508500069 CMakeFiles/sui.dir/sui.rc.obj 78d44f891acebae0
|
||||
2728 6058 7549260507883009 CMakeFiles/sui.dir/src/sui_sys_style.cpp.obj cc16a38435af38d8
|
||||
2773 6153 7549260508329918 CMakeFiles/sui.dir/qrc_res.cpp.obj ad22ef3d3130834a
|
||||
2755 12381 7549260508153786 CMakeFiles/sui.dir/src/test.cpp.obj 43cbc1b938b595a2
|
||||
2700 12462 7549260507604969 CMakeFiles/sui.dir/src/main.cpp.obj bf003c7c4f22622f
|
||||
2710 12503 7549260507704259 CMakeFiles/sui.dir/src/sui.cpp.obj d4b3a726ccc18944
|
||||
2689 12538 7549260507485064 CMakeFiles/sui.dir/sui_autogen/mocs_compilation.cpp.obj 2b9ea38291170796
|
||||
2737 12867 7549260507977952 CMakeFiles/sui.dir/src/sui_title.cpp.obj 210fd35b56939256
|
||||
2718 15745 7549260507787942 CMakeFiles/sui.dir/src/sui_base_ex.cpp.obj b12ce2d196eb9250
|
||||
15745 24093 7549260638056784 F:/SourceCode/sui/release/sui.exe 5341ba6fce967f43
|
||||
22 249 7549261886681220 sui_autogen/timestamp 941d172e51f73a65
|
||||
22 249 7549261886681220 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
22 249 7549261886681220 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
22 249 7549261886681220 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
249 7350 7549261888952411 CMakeFiles/sui.dir/src/main.cpp.obj bf003c7c4f22622f
|
||||
7350 15184 7549261959961013 F:/SourceCode/sui/release/sui.exe 5341ba6fce967f43
|
||||
15 269 7549262291977549 sui_autogen/timestamp 941d172e51f73a65
|
||||
15 269 7549262291977549 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
15 269 7549262291977549 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
15 269 7549262291977549 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
270 7021 7549262294519802 CMakeFiles/sui.dir/src/main.cpp.obj bf003c7c4f22622f
|
||||
279 10246 7549262294609995 CMakeFiles/sui.dir/src/sui_base_ex.cpp.obj b12ce2d196eb9250
|
||||
10246 19287 7549262394282216 F:/SourceCode/sui/release/sui.exe 5341ba6fce967f43
|
||||
18 2640 7549265414402790 sui_autogen/timestamp 941d172e51f73a65
|
||||
18 2640 7549265414402790 sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
18 2640 7549265414402790 F:/SourceCode/sui/build/sui_autogen/timestamp 941d172e51f73a65
|
||||
18 2640 7549265414402790 F:/SourceCode/sui/build/sui_autogen/mocs_compilation.cpp 941d172e51f73a65
|
||||
2654 11343 7549265415802960 CMakeFiles/sui.dir/src/main.cpp.obj bf003c7c4f22622f
|
||||
2699 11419 7549265416253201 CMakeFiles/sui.dir/src/test.cpp.obj 43cbc1b938b595a2
|
||||
2640 11533 7549265415670782 CMakeFiles/sui.dir/sui_autogen/mocs_compilation.cpp.obj 2b9ea38291170796
|
||||
2667 11551 7549265415932274 CMakeFiles/sui.dir/src/sui.cpp.obj d4b3a726ccc18944
|
||||
2685 11999 7549265416118175 CMakeFiles/sui.dir/src/sui_title.cpp.obj 210fd35b56939256
|
||||
2677 14875 7549265416033171 CMakeFiles/sui.dir/src/sui_base_ex.cpp.obj b12ce2d196eb9250
|
||||
14876 23375 7549265538021349 F:/SourceCode/sui/release/sui.exe 5341ba6fce967f43
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -380,9 +380,6 @@
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6Widgets/Qt6QModernWindowsStylePluginTargets-release.cmake",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6Widgets/Qt6QModernWindowsStylePluginAdditionalTargetInfo.cmake",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessAliasTargets.cmake",
|
||||
"D:/Dev/msys64/mingw64/share/cmake/Modules/FindPkgConfig.cmake",
|
||||
"D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageHandleStandardArgs.cmake",
|
||||
"D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageMessage.cmake",
|
||||
"F:/SourceCode/sui/res.qrc",
|
||||
"F:/SourceCode/sui/version.h.in"
|
||||
],
|
||||
@ -462,7 +459,6 @@
|
||||
"F:/SourceCode/sui/build",
|
||||
"F:/SourceCode/sui",
|
||||
"F:/SourceCode/sui/3rdparty/json/include",
|
||||
"F:/SourceCode/vcpkg/installed/x64-mingw-static/include",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/include/QtCore",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/include",
|
||||
"D:/Dev/Qt/6.8.0/mingw1310_static_x64/mkspecs/win32-g++",
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
moc:6d9a32f8158ce4ca9a7260f3d32110b287efc834d653611c20af18f95661f8f4
|
||||
moc:955f8fcfc9ddfb7137f3a4dfdf4ffe2497597a02c7b4ee6e69e3dcaaa83b255c
|
||||
uic:112cbdb5924982d8a55bab754383a3ad4ae11fd691919828dbe5441faa671856
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
# Generated by CMake. Changes will be overwritten.
|
||||
F:/SourceCode/sui/src/main.cpp
|
||||
F:/SourceCode/sui/src/sui_base_ex.cpp
|
||||
F:/SourceCode/sui/src/sui_base_config.h
|
||||
F:/SourceCode/sui/src/sui_base_ex.h
|
||||
F:/SourceCode/sui/src/sui_title.h
|
||||
mmc:Q_OBJECT
|
||||
mdp:D:/Dev/Qt/6.8.0/mingw1310_static_x64/include/QtConcurrent/QtConcurrent
|
||||
@ -750,6 +746,8 @@ F:/SourceCode/sui/src/sui_title.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/vadefs.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wchar.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wctype.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zconf.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zlib.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h
|
||||
@ -863,8 +861,6 @@ F:/SourceCode/sui/src/sui_title.h
|
||||
mdp:F:/SourceCode/sui/src/sui_base_ex.h
|
||||
mdp:F:/SourceCode/sui/src/sui_sys_style.h
|
||||
mdp:F:/SourceCode/sui/src/sui_title.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui_sys_style.cpp
|
||||
F:/SourceCode/sui/src/sui_title.cpp
|
||||
F:/SourceCode/sui/src/test.cpp
|
||||
@ -1971,6 +1967,8 @@ F:/SourceCode/sui/src/test.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/vadefs.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wchar.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wctype.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zconf.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zlib.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h
|
||||
@ -2086,8 +2084,6 @@ F:/SourceCode/sui/src/test.h
|
||||
mdp:F:/SourceCode/sui/src/sui_sys_style.h
|
||||
mdp:F:/SourceCode/sui/src/sui_title.h
|
||||
mdp:F:/SourceCode/sui/src/test.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui.cpp
|
||||
F:/SourceCode/sui/src/sui.h
|
||||
mmc:Q_OBJECT
|
||||
@ -2836,6 +2832,8 @@ F:/SourceCode/sui/src/sui.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/vadefs.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wchar.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/wctype.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zconf.h
|
||||
mdp:D:/Dev/msys64/mingw64/include/zlib.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h
|
||||
mdp:D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h
|
||||
@ -2950,6 +2948,8 @@ F:/SourceCode/sui/src/sui.h
|
||||
mdp:F:/SourceCode/sui/src/sui_base_ex.h
|
||||
mdp:F:/SourceCode/sui/src/sui_sys_style.h
|
||||
mdp:F:/SourceCode/sui/src/sui_title.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h
|
||||
mdp:F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui_base.h
|
||||
F:/SourceCode/sui/src/sui_base_config.h
|
||||
F:/SourceCode/sui/src/main.cpp
|
||||
F:/SourceCode/sui/src/sui_base_ex.cpp
|
||||
F:/SourceCode/sui/src/sui_base_ex.h
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -745,6 +745,8 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_sui.cpp: F:/SourceCode/sui/sr
|
||||
D:/Dev/msys64/mingw64/include/vadefs.h \
|
||||
D:/Dev/msys64/mingw64/include/wchar.h \
|
||||
D:/Dev/msys64/mingw64/include/wctype.h \
|
||||
D:/Dev/msys64/mingw64/include/zconf.h \
|
||||
D:/Dev/msys64/mingw64/include/zlib.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h \
|
||||
@ -856,6 +858,4 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_sui.cpp: F:/SourceCode/sui/sr
|
||||
F:/SourceCode/sui/src/sui_base.h \
|
||||
F:/SourceCode/sui/src/sui_base_ex.h \
|
||||
F:/SourceCode/sui/src/sui_sys_style.h \
|
||||
F:/SourceCode/sui/src/sui_title.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui_title.h
|
||||
|
||||
@ -43,8 +43,9 @@ constexpr auto qt_meta_stringdata_CLASSsui_titleENDCLASS = QtMocHelpers::stringD
|
||||
"slots_on_clicked",
|
||||
"slots_change_font",
|
||||
"slots_change_style",
|
||||
"slots_change_style_sys",
|
||||
"slots_change_font_bold",
|
||||
"slots_style_system"
|
||||
"slots_track_style_off_on_sys"
|
||||
);
|
||||
#else // !QT_MOC_HAS_STRINGDATA
|
||||
#error "qtmochelpers.h not found or too old."
|
||||
@ -57,7 +58,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSsui_titleENDCLASS[] = {
|
||||
12, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
6, 14, // methods
|
||||
7, 14, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
@ -65,14 +66,15 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSsui_titleENDCLASS[] = {
|
||||
1, // signalCount
|
||||
|
||||
// signals: name, argc, parameters, tag, flags, initial metatype offsets
|
||||
1, 0, 50, 2, 0x06, 1 /* Public */,
|
||||
1, 0, 56, 2, 0x06, 1 /* Public */,
|
||||
|
||||
// slots: name, argc, parameters, tag, flags, initial metatype offsets
|
||||
3, 0, 51, 2, 0x0a, 2 /* Public */,
|
||||
4, 0, 52, 2, 0x0a, 3 /* Public */,
|
||||
5, 0, 53, 2, 0x0a, 4 /* Public */,
|
||||
6, 1, 54, 2, 0x0a, 5 /* Public */,
|
||||
7, 1, 57, 2, 0x0a, 7 /* Public */,
|
||||
3, 0, 57, 2, 0x0a, 2 /* Public */,
|
||||
4, 0, 58, 2, 0x0a, 3 /* Public */,
|
||||
5, 0, 59, 2, 0x0a, 4 /* Public */,
|
||||
6, 1, 60, 2, 0x0a, 5 /* Public */,
|
||||
7, 1, 63, 2, 0x0a, 7 /* Public */,
|
||||
8, 0, 66, 2, 0x0a, 9 /* Public */,
|
||||
|
||||
// signals: parameters
|
||||
QMetaType::Void,
|
||||
@ -83,6 +85,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSsui_titleENDCLASS[] = {
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 2,
|
||||
QMetaType::Void, QMetaType::Bool, 2,
|
||||
QMetaType::Void,
|
||||
|
||||
0 // eod
|
||||
};
|
||||
@ -104,12 +107,14 @@ Q_CONSTINIT const QMetaObject sui_title::staticMetaObject = { {
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>,
|
||||
// method 'slots_change_style'
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>,
|
||||
// method 'slots_change_style_sys'
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>,
|
||||
QtPrivate::TypeAndForceComplete<bool, std::false_type>,
|
||||
// method 'slots_change_font_bold'
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>,
|
||||
QtPrivate::TypeAndForceComplete<bool, std::false_type>,
|
||||
// method 'slots_style_system'
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>,
|
||||
QtPrivate::TypeAndForceComplete<bool, std::false_type>
|
||||
// method 'slots_track_style_off_on_sys'
|
||||
QtPrivate::TypeAndForceComplete<void, std::false_type>
|
||||
>,
|
||||
nullptr
|
||||
} };
|
||||
@ -124,8 +129,9 @@ void sui_title::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v
|
||||
case 1: _t->slots_on_clicked(); break;
|
||||
case 2: _t->slots_change_font(); break;
|
||||
case 3: _t->slots_change_style(); break;
|
||||
case 4: _t->slots_change_font_bold((*reinterpret_cast< std::add_pointer_t<bool>>(_a[1]))); break;
|
||||
case 5: _t->slots_style_system((*reinterpret_cast< std::add_pointer_t<bool>>(_a[1]))); break;
|
||||
case 4: _t->slots_change_style_sys((*reinterpret_cast< std::add_pointer_t<bool>>(_a[1]))); break;
|
||||
case 5: _t->slots_change_font_bold((*reinterpret_cast< std::add_pointer_t<bool>>(_a[1]))); break;
|
||||
case 6: _t->slots_track_style_off_on_sys(); break;
|
||||
default: ;
|
||||
}
|
||||
} else if (_c == QMetaObject::IndexOfMethod) {
|
||||
@ -159,13 +165,13 @@ int sui_title::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
||||
if (_id < 0)
|
||||
return _id;
|
||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||
if (_id < 6)
|
||||
if (_id < 7)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 6;
|
||||
_id -= 7;
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
if (_id < 6)
|
||||
if (_id < 7)
|
||||
*reinterpret_cast<QMetaType *>(_a[0]) = QMetaType();
|
||||
_id -= 6;
|
||||
_id -= 7;
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
|
||||
@ -745,6 +745,8 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_sui_title.cpp: F:/SourceCode/
|
||||
D:/Dev/msys64/mingw64/include/vadefs.h \
|
||||
D:/Dev/msys64/mingw64/include/wchar.h \
|
||||
D:/Dev/msys64/mingw64/include/wctype.h \
|
||||
D:/Dev/msys64/mingw64/include/zconf.h \
|
||||
D:/Dev/msys64/mingw64/include/zlib.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h \
|
||||
@ -855,6 +857,4 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_sui_title.cpp: F:/SourceCode/
|
||||
F:/SourceCode/sui/src/common.h \
|
||||
F:/SourceCode/sui/src/sui_base.h \
|
||||
F:/SourceCode/sui/src/sui_base_ex.h \
|
||||
F:/SourceCode/sui/src/sui_sys_style.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui_sys_style.h
|
||||
|
||||
@ -745,6 +745,8 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_test.cpp: F:/SourceCode/sui/s
|
||||
D:/Dev/msys64/mingw64/include/vadefs.h \
|
||||
D:/Dev/msys64/mingw64/include/wchar.h \
|
||||
D:/Dev/msys64/mingw64/include/wctype.h \
|
||||
D:/Dev/msys64/mingw64/include/zconf.h \
|
||||
D:/Dev/msys64/mingw64/include/zlib.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h \
|
||||
@ -857,6 +859,4 @@ F:/SourceCode/sui/build/sui_autogen/UVLADIE3JM/moc_test.cpp: F:/SourceCode/sui/s
|
||||
F:/SourceCode/sui/src/sui_base.h \
|
||||
F:/SourceCode/sui/src/sui_base_ex.h \
|
||||
F:/SourceCode/sui/src/sui_sys_style.h \
|
||||
F:/SourceCode/sui/src/sui_title.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h
|
||||
F:/SourceCode/sui/src/sui_title.h
|
||||
|
||||
@ -1015,6 +1015,8 @@ sui_autogen/timestamp: \
|
||||
D:/Dev/msys64/mingw64/include/vadefs.h \
|
||||
D:/Dev/msys64/mingw64/include/wchar.h \
|
||||
D:/Dev/msys64/mingw64/include/wctype.h \
|
||||
D:/Dev/msys64/mingw64/include/zconf.h \
|
||||
D:/Dev/msys64/mingw64/include/zlib.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/adxintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxbf16intrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/amxcomplexintrin.h \
|
||||
@ -1121,95 +1123,32 @@ sui_autogen/timestamp: \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/xsaveoptintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/xsavesintrin.h \
|
||||
D:/Dev/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/xtestintrin.h \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCXXCompiler.cmake.in \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCXXCompilerABI.cpp \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCXXInformation.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCommonLanguageInclude.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeCompilerIdDetection.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDependentOption.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineCXXCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineCompilerABI.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineCompilerId.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineCompilerSupport.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineRCCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeDetermineSystem.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeFindBinUtils.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeFindDependencyMacro.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeGenericSystem.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeInitializeConfigs.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeLanguageInformation.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeParseLibraryArchitecture.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakePushCheckState.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeRCCompiler.cmake.in \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeRCInformation.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeSystem.cmake.in \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeSystemSpecificInformation.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeTestCXXCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeTestCompilerCommon.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CMakeTestRCCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CheckCXXCompilerFlag.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CheckCXXSourceCompiles.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CheckIncludeFileCXX.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/CheckLibraryExists.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/ARMCC-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Cray-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/CrayClang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Fujitsu-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/GHS-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/GNU-CXX.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/GNU-FindBinUtils.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/GNU.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/HP-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/IAR-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Intel-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/NVHPC-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/NVIDIA-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/OrangeC-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/PGI-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/PathScale-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/TI-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/TIClang-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Tasking-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/Watcom-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/XL-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageHandleStandardArgs.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/FindPackageMessage.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/FindPkgConfig.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/FindThreads.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/GNUInstallDirs.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Internal/CheckCompilerFlag.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Internal/CheckFlagCommonConfig.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Internal/CheckSourceCompiles.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Internal/FeatureTesting.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Platform/Windows-Determine-CXX.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Platform/Windows-GNU-CXX-ABI.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Platform/Windows-GNU-CXX.cmake \
|
||||
D:/Dev/msys64/mingw64/share/cmake/Modules/Platform/Windows-GNU.cmake \
|
||||
@ -1239,7 +1178,5 @@ sui_autogen/timestamp: \
|
||||
F:/SourceCode/sui/src/test.cpp \
|
||||
F:/SourceCode/sui/src/test.h \
|
||||
F:/SourceCode/sui/version.h.in \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zconf.h \
|
||||
F:/SourceCode/vcpkg/installed/x64-mingw-static/include/zlib.h \
|
||||
F:/SourceCode/vcpkg/scripts/buildsystems/vcpkg.cmake \
|
||||
D:/Dev/msys64/mingw64/bin/cmake.exe
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
{
|
||||
"s_config": {
|
||||
"font": 0,
|
||||
"font_bold": 0,
|
||||
"style": 1,
|
||||
"style_system": 0
|
||||
}
|
||||
}
|
||||
8
release/save/sui.json
Normal file
8
release/save/sui.json
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"sui": {
|
||||
"font": 7,
|
||||
"font_bold": 1,
|
||||
"style": 1,
|
||||
"style_system": 0
|
||||
}
|
||||
}
|
||||
BIN
release/sui.exe
BIN
release/sui.exe
Binary file not shown.
14
src/CMakeLists.txt
Normal file
14
src/CMakeLists.txt
Normal file
@ -0,0 +1,14 @@
|
||||
|
||||
cmake_minimum_required(VERSION 3.19)
|
||||
|
||||
project(sui)
|
||||
# 设置库的版本号
|
||||
set_target_properties(sui PROPERTIES VERSION 1.0 SOVERSION 1)
|
||||
|
||||
#include dir
|
||||
include_directories(${PROJECT_SOURCE_DIR}/include)
|
||||
|
||||
file(GLOB SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
|
||||
|
||||
add_library(sui STATIC ${SRC_LIST})
|
||||
|
||||
@ -17,7 +17,7 @@ int main(int argc, char *argv[]){
|
||||
a.installTranslator(&qtBaseTranslator);
|
||||
|
||||
//读取窗体配置文件
|
||||
read_json_data_config();
|
||||
sui_init_config();
|
||||
test x;
|
||||
x.init_layout();
|
||||
//仅限于windows平台
|
||||
|
||||
@ -21,7 +21,10 @@ extern SUI_CONFIG sui_config;
|
||||
extern QStringList font_table;
|
||||
//样式表变量
|
||||
extern QStringList style_table;
|
||||
//
|
||||
extern QString curDir;
|
||||
|
||||
//sui文件目录
|
||||
extern QString sui_cur_dir;
|
||||
//sui文件路径
|
||||
extern QString sui_con_file;
|
||||
//sui文件名
|
||||
extern QString sui_con_name;
|
||||
#endif
|
||||
@ -3,4 +3,6 @@
|
||||
QStringList font_table;
|
||||
QStringList style_table;
|
||||
SUI_CONFIG sui_config;
|
||||
QString curDir;
|
||||
QString sui_cur_dir;
|
||||
QString sui_con_file;
|
||||
QString sui_con_name="/save/sui.json";
|
||||
@ -1,14 +1,9 @@
|
||||
#include "sui_base_ex.h"
|
||||
|
||||
void unserialize_config_data()
|
||||
void sui_json_to_data()
|
||||
{
|
||||
QString save_file = curDir + "data.json";
|
||||
std::string j_str;
|
||||
if (!QDir(curDir).exists())
|
||||
{
|
||||
QDir().mkdir(curDir);
|
||||
}
|
||||
|
||||
std::string json_str;
|
||||
// 默认配置函数
|
||||
auto default_config = [=]()
|
||||
{
|
||||
// 默认配置
|
||||
@ -17,73 +12,103 @@ void unserialize_config_data()
|
||||
sui_config.style = 1;
|
||||
sui_config.style_system = 0;
|
||||
};
|
||||
auto read_json = [=](QString _file, std::string json_str)
|
||||
// 读取json文件函数
|
||||
auto read_json = [=](QString _file, std::string &_str)
|
||||
{
|
||||
if (!QFile(_file).exists())
|
||||
QFile json_file(_file);
|
||||
if (!json_file.open(QIODevice::ReadOnly | QIODevice::Text))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
QFile _save_file(_file);
|
||||
_save_file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
json_str = _save_file.readAll().toStdString();
|
||||
_save_file.close();
|
||||
else
|
||||
{
|
||||
_str = json_file.readAll().toStdString();
|
||||
}
|
||||
json_file.close();
|
||||
return true;
|
||||
};
|
||||
|
||||
if (read_json(save_file, j_str))
|
||||
auto args_json = [=](json _data, SUI_CONFIG &_config)
|
||||
{
|
||||
try
|
||||
{
|
||||
json j3 = json::parse(j_str);
|
||||
if (j3 == nullptr)
|
||||
_config.style = _data.at("sui").at("style");
|
||||
_config.style_system = _data.at("sui").at("style_system");
|
||||
_config.font = _data.at("sui").at("font");
|
||||
_config.font_bold = _data.at("sui").at("font_bold");
|
||||
};
|
||||
// 检测文件是否存在
|
||||
if (!QFile(sui_con_file).exists())
|
||||
{
|
||||
default_config();
|
||||
return;
|
||||
}
|
||||
sui_config.style = j3.at("s_config").at("style");
|
||||
sui_config.style_system = j3.at("s_config").at("style_system");
|
||||
sui_config.font = j3.at("s_config").at("font");
|
||||
sui_config.font_bold = j3.at("s_config").at("font_bold");
|
||||
// 读取json文件内容
|
||||
if (!read_json(sui_con_file, json_str))
|
||||
{
|
||||
default_config();
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
json data = json::parse(json_str);
|
||||
if (data == nullptr)
|
||||
{
|
||||
default_config();
|
||||
return;
|
||||
}else{
|
||||
args_json(data, sui_config);
|
||||
}
|
||||
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
// std::count << e.what() << '\n';
|
||||
default_config();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
default_config();
|
||||
}
|
||||
}
|
||||
json serialize_config_data(json jsonData)
|
||||
json sui_data_to_json(json jsonData)
|
||||
{
|
||||
jsonData[toStr(s_config)][toStr(style)] = sui_config.style;
|
||||
jsonData[toStr(s_config)][toStr(font)] = sui_config.font;
|
||||
jsonData[toStr(s_config)][toStr(style_system)] = sui_config.style_system;
|
||||
jsonData[toStr(s_config)][toStr(font_bold)] = sui_config.font_bold;
|
||||
jsonData[toStr(sui)][toStr(style)] = sui_config.style;
|
||||
jsonData[toStr(sui)][toStr(font)] = sui_config.font;
|
||||
jsonData[toStr(sui)][toStr(style_system)] = sui_config.style_system;
|
||||
jsonData[toStr(sui)][toStr(font_bold)] = sui_config.font_bold;
|
||||
return jsonData;
|
||||
}
|
||||
void read_json_data_config()
|
||||
void sui_save_json()
|
||||
{
|
||||
curDir = QDir::currentPath() + QStringLiteral("/");
|
||||
// 读取本地计算字体到font_table变量中
|
||||
// 读取软件自带style样式到style_table变量中
|
||||
QFontDatabase database;
|
||||
foreach (const QString &family, database.families(QFontDatabase::SimplifiedChinese))
|
||||
{
|
||||
font_table.append(family);
|
||||
}
|
||||
QDir *styleDir = new QDir(":/res/qss/");
|
||||
style_table = styleDir->entryList(QDir::Files);
|
||||
unserialize_config_data();
|
||||
}
|
||||
void save_json_data_config()
|
||||
{
|
||||
QString save_file = curDir + "data.json";
|
||||
json jsonData = {};
|
||||
jsonData = serialize_config_data(jsonData);
|
||||
std::ofstream out(save_file.toStdString(), std::ios::binary);
|
||||
std::cout << jsonData << std::endl;
|
||||
jsonData = sui_data_to_json(jsonData);
|
||||
fs::path json_path = sui_con_file.toStdString();
|
||||
if (!fs::exists(json_path.parent_path()))
|
||||
{
|
||||
fs::create_directories(json_path.parent_path());
|
||||
}
|
||||
std::ofstream out(sui_con_file.toStdString(), std::ios::binary);
|
||||
out << std::setw(4) << jsonData;
|
||||
out.close();
|
||||
}
|
||||
void sui_init_font_table()
|
||||
{
|
||||
sui_cur_dir = QDir::currentPath();
|
||||
sui_con_file = sui_cur_dir + sui_con_name;
|
||||
QFontDatabase database;
|
||||
QString temp_family_name;
|
||||
foreach (const QString &family, database.families(QFontDatabase::SimplifiedChinese))
|
||||
{
|
||||
if (temp_family_name != family)
|
||||
{
|
||||
font_table.append(family);
|
||||
temp_family_name = family;
|
||||
}
|
||||
}
|
||||
}
|
||||
void sui_init_style_table()
|
||||
{
|
||||
// 读取软件自带style样式到style_table变量中
|
||||
QDir *styleDir = new QDir(":/res/qss/");
|
||||
style_table = styleDir->entryList(QDir::Files);
|
||||
}
|
||||
void sui_init_config()
|
||||
{
|
||||
sui_init_font_table();
|
||||
sui_init_style_table();
|
||||
sui_json_to_data();
|
||||
}
|
||||
@ -6,16 +6,14 @@
|
||||
#include "common.h"
|
||||
#include "sui_base.h"
|
||||
#include <iostream>
|
||||
#include <filesystem>
|
||||
#include "3rdparty/json/json.hpp"
|
||||
using json = nlohmann::json;
|
||||
|
||||
//读取data.json中的配置字段
|
||||
extern void read_json_data_config();
|
||||
//保存data.json中的配置字段
|
||||
extern void save_json_data_config();
|
||||
//序列化sui_config to json str
|
||||
extern json serialize_config_data(json);
|
||||
//反系列化json str to sui_config
|
||||
extern void unserialize_config_data();
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
extern void sui_init_config();
|
||||
extern void sui_init_font_table();
|
||||
extern void sui_init_style_table();
|
||||
extern void sui_json_to_data();
|
||||
extern json sui_data_to_json(json);
|
||||
extern void sui_save_json();
|
||||
#endif
|
||||
@ -95,7 +95,7 @@ void sui_title::btn_ico_menu()
|
||||
{
|
||||
t_action->setChecked(true);
|
||||
}
|
||||
connect(t_action, SIGNAL(triggered(bool)), this, SLOT(slots_style_system(bool)));
|
||||
connect(t_action, SIGNAL(triggered(bool)), this, SLOT(slots_track_style_off_on_sys()));
|
||||
s_menu->addAction(t_action);
|
||||
}
|
||||
// 字体
|
||||
@ -139,7 +139,7 @@ void sui_title::btn_ico_menu()
|
||||
s_menu = nullptr;
|
||||
f_menu = nullptr;
|
||||
}
|
||||
void sui_title::slots_style_system(bool state)
|
||||
void sui_title::slots_track_style_off_on_sys()
|
||||
{
|
||||
if (sui_config.style_system==1)
|
||||
{
|
||||
@ -180,6 +180,13 @@ void sui_title::slots_change_style()
|
||||
}
|
||||
init_font_style();
|
||||
}
|
||||
void sui_title::slots_change_style_sys(bool state){
|
||||
sui_config.style=0;
|
||||
if(state){
|
||||
sui_config.style=1;
|
||||
}
|
||||
init_font_style();
|
||||
}
|
||||
void sui_title::init_font_style()
|
||||
{
|
||||
QString style;
|
||||
@ -201,6 +208,9 @@ void sui_title::init_font_style()
|
||||
qss.close();
|
||||
QApplication *main_app = static_cast<QApplication *>(QCoreApplication::instance());
|
||||
main_app->setStyleSheet(style);
|
||||
qDebug()<<"font-family:"<<font_table[sui_config.font];
|
||||
qDebug()<<"font-bold:"<<sui_config.font_bold;
|
||||
qDebug()<<"style:"<<font_table[sui_config.font];
|
||||
}
|
||||
|
||||
// 双击标题栏进行界面的最大化/还原
|
||||
@ -234,7 +244,7 @@ void sui_title::slots_on_clicked()
|
||||
else if (m_type == QD_TYPE::QD_EXIT)
|
||||
{
|
||||
//保存窗体设置
|
||||
save_json_data_config();
|
||||
sui_save_json();
|
||||
QApplication::quit();
|
||||
}
|
||||
}
|
||||
@ -274,7 +284,7 @@ void sui_title::set_type(QD_TYPE _type)
|
||||
m_thread = new QThread();
|
||||
m_style->moveToThread(m_thread);
|
||||
m_style->state = sui_config.style_system;
|
||||
connect(m_style, SIGNAL(signals_sys_style_change(int)), this, SLOT(change_style(int)));
|
||||
connect(m_style, SIGNAL(signals_sys_style_change(bool)), this, SLOT(slots_change_style_sys(bool)));
|
||||
connect(m_thread, SIGNAL(started()), m_style, SLOT(slots_sys_style_thread()));
|
||||
m_thread->start();
|
||||
}
|
||||
|
||||
@ -63,8 +63,9 @@ public slots:
|
||||
void slots_on_clicked();
|
||||
void slots_change_font();
|
||||
void slots_change_style();
|
||||
void slots_change_style_sys(bool);
|
||||
void slots_change_font_bold(bool);
|
||||
void slots_style_system(bool);
|
||||
void slots_track_style_off_on_sys();
|
||||
signals:
|
||||
void signals_close();
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user