diff --git a/.gitignore b/.gitignore index 0970347..231f5c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .idea/ cmake-build-debug/ -cmake-build-release/ \ No newline at end of file +cmake-build-release/ +OfficeAssistant_msvc/Debug/ +OfficeAssistant_msvc/Release/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 023ee7e..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -cmake_minimum_required(VERSION 3.25) -project(officeassistant) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) -add_compile_definitions(UNICODE) -set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.6.3_msvc/5.6.3/msvc2015") -set(CMAKE_EXE_LINKER_FLAGS "/SAFESEH:NO" ) -find_package(Qt5 COMPONENTS - Core - Gui - Widgets - Network - REQUIRED) - -add_executable(officeassistant WIN32 main.cpp mainwindow.cpp mainwindow.h mainwindow.ui mainwindowlayout.cpp mainwindowlayout.h mainwindowlayout.ui navbar.cpp navbar.h navbar.ui MyButton.cpp MyButton.h buttonstruct.h globalvariables.h mainscreen.cpp mainscreen.h mainscreen.ui netio.cpp netio.h config.h) -target_link_libraries(officeassistant - Qt5::Core - Qt5::Gui - Qt5::Widgets - Qt5::Network - ) -if (WIN32 AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(DEBUG_SUFFIX) - if (MSVC AND CMAKE_BUILD_TYPE MATCHES "Debug") - set(DEBUG_SUFFIX "d") - endif () - set(QT_INSTALL_PATH "${CMAKE_PREFIX_PATH}") - if (NOT EXISTS "${QT_INSTALL_PATH}/bin") - set(QT_INSTALL_PATH "${QT_INSTALL_PATH}/..") - if (NOT EXISTS "${QT_INSTALL_PATH}/bin") - set(QT_INSTALL_PATH "${QT_INSTALL_PATH}/..") - endif () - endif () - if (EXISTS "${QT_INSTALL_PATH}/plugins/platforms/qwindows${DEBUG_SUFFIX}.dll") - add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory - "$/plugins/platforms/") - add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${QT_INSTALL_PATH}/plugins/platforms/qwindows${DEBUG_SUFFIX}.dll" - "$/plugins/platforms/") - endif () - foreach (QT_LIB Core Gui Widgets) - add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${QT_INSTALL_PATH}/bin/Qt5${QT_LIB}${DEBUG_SUFFIX}.dll" - "$") - endforeach (QT_LIB) -endif () diff --git a/OfficeAssistant_msvc.VC.db b/OfficeAssistant_msvc.VC.db new file mode 100644 index 0000000..c6be9f2 Binary files /dev/null and b/OfficeAssistant_msvc.VC.db differ diff --git a/OfficeAssistant_msvc.sln b/OfficeAssistant_msvc.sln new file mode 100644 index 0000000..fe9391b --- /dev/null +++ b/OfficeAssistant_msvc.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeAssistant_msvc", "OfficeAssistant_msvc\OfficeAssistant_msvc.vcxproj", "{A49230DF-A869-4AA1-8ACA-3C7322530E46}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A49230DF-A869-4AA1-8ACA-3C7322530E46}.Debug|x86.ActiveCfg = Debug|Win32 + {A49230DF-A869-4AA1-8ACA-3C7322530E46}.Debug|x86.Build.0 = Debug|Win32 + {A49230DF-A869-4AA1-8ACA-3C7322530E46}.Release|x86.ActiveCfg = Release|Win32 + {A49230DF-A869-4AA1-8ACA-3C7322530E46}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/MyButton.cpp b/OfficeAssistant_msvc/MyButton.cpp similarity index 100% rename from MyButton.cpp rename to OfficeAssistant_msvc/MyButton.cpp diff --git a/MyButton.h b/OfficeAssistant_msvc/MyButton.h similarity index 100% rename from MyButton.h rename to OfficeAssistant_msvc/MyButton.h diff --git a/OfficeAssistant_msvc/OfficeAssistant_msvc.qrc b/OfficeAssistant_msvc/OfficeAssistant_msvc.qrc new file mode 100644 index 0000000..c6fd62d --- /dev/null +++ b/OfficeAssistant_msvc/OfficeAssistant_msvc.qrc @@ -0,0 +1,4 @@ + + + + diff --git a/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj new file mode 100644 index 0000000..7dcbc87 --- /dev/null +++ b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj @@ -0,0 +1,121 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A49230DF-A869-4AA1-8ACA-3C7322530E46} + QtVS_v304 + $(MSBuildProjectDirectory)\QtMsBuild + 8.1 + + + + Application + v140_xp + + + Application + v140 + + + + + + + 5.6.3_msvc2015 + core;gui;widgets;network + debug + + + 5.6.3_msvc2015 + core;gui;widgets + release + + + + + + + + + + + + + + + + + + + + + + true + true + ProgramDatabase + Disabled + MultiThreadedDebugDLL + + + Windows + true + + + + + true + true + None + MaxSpeed + MultiThreadedDLL + + + Windows + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.filters b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.filters new file mode 100644 index 0000000..4b14a04 --- /dev/null +++ b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.filters @@ -0,0 +1,98 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {99349809-55BA-4b9d-BF79-8FDBB0286EB3} + ui + + + {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C} + ts + + + + + Resource Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Form Files + + + Form Files + + + Form Files + + + Form Files + + + \ No newline at end of file diff --git a/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.user b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.user new file mode 100644 index 0000000..2b109ad --- /dev/null +++ b/OfficeAssistant_msvc/OfficeAssistant_msvc.vcxproj.user @@ -0,0 +1,10 @@ + + + + + 2023-07-28T22:55:30.5913647Z + + + 2023-07-28T22:55:31.6946123Z + + \ No newline at end of file diff --git a/buttonstruct.h b/OfficeAssistant_msvc/buttonstruct.h similarity index 100% rename from buttonstruct.h rename to OfficeAssistant_msvc/buttonstruct.h diff --git a/config.h b/OfficeAssistant_msvc/config.h similarity index 100% rename from config.h rename to OfficeAssistant_msvc/config.h diff --git a/globalvariables.h b/OfficeAssistant_msvc/globalvariables.h similarity index 100% rename from globalvariables.h rename to OfficeAssistant_msvc/globalvariables.h diff --git a/main.cpp b/OfficeAssistant_msvc/main.cpp similarity index 100% rename from main.cpp rename to OfficeAssistant_msvc/main.cpp diff --git a/mainscreen.cpp b/OfficeAssistant_msvc/mainscreen.cpp similarity index 100% rename from mainscreen.cpp rename to OfficeAssistant_msvc/mainscreen.cpp diff --git a/mainscreen.h b/OfficeAssistant_msvc/mainscreen.h similarity index 100% rename from mainscreen.h rename to OfficeAssistant_msvc/mainscreen.h diff --git a/mainscreen.ui b/OfficeAssistant_msvc/mainscreen.ui similarity index 100% rename from mainscreen.ui rename to OfficeAssistant_msvc/mainscreen.ui diff --git a/mainwindow.cpp b/OfficeAssistant_msvc/mainwindow.cpp similarity index 100% rename from mainwindow.cpp rename to OfficeAssistant_msvc/mainwindow.cpp diff --git a/mainwindow.h b/OfficeAssistant_msvc/mainwindow.h similarity index 100% rename from mainwindow.h rename to OfficeAssistant_msvc/mainwindow.h diff --git a/mainwindow.ui b/OfficeAssistant_msvc/mainwindow.ui similarity index 100% rename from mainwindow.ui rename to OfficeAssistant_msvc/mainwindow.ui diff --git a/mainwindowlayout.cpp b/OfficeAssistant_msvc/mainwindowlayout.cpp similarity index 100% rename from mainwindowlayout.cpp rename to OfficeAssistant_msvc/mainwindowlayout.cpp diff --git a/mainwindowlayout.h b/OfficeAssistant_msvc/mainwindowlayout.h similarity index 100% rename from mainwindowlayout.h rename to OfficeAssistant_msvc/mainwindowlayout.h diff --git a/mainwindowlayout.ui b/OfficeAssistant_msvc/mainwindowlayout.ui similarity index 100% rename from mainwindowlayout.ui rename to OfficeAssistant_msvc/mainwindowlayout.ui diff --git a/mb.h b/OfficeAssistant_msvc/mb.h similarity index 100% rename from mb.h rename to OfficeAssistant_msvc/mb.h diff --git a/miniblink_4949_x32.dll b/OfficeAssistant_msvc/miniblink_4949_x32.dll similarity index 100% rename from miniblink_4949_x32.dll rename to OfficeAssistant_msvc/miniblink_4949_x32.dll diff --git a/navbar.cpp b/OfficeAssistant_msvc/navbar.cpp similarity index 100% rename from navbar.cpp rename to OfficeAssistant_msvc/navbar.cpp diff --git a/navbar.h b/OfficeAssistant_msvc/navbar.h similarity index 100% rename from navbar.h rename to OfficeAssistant_msvc/navbar.h diff --git a/navbar.ui b/OfficeAssistant_msvc/navbar.ui similarity index 100% rename from navbar.ui rename to OfficeAssistant_msvc/navbar.ui diff --git a/netio.cpp b/OfficeAssistant_msvc/netio.cpp similarity index 98% rename from netio.cpp rename to OfficeAssistant_msvc/netio.cpp index 80a0b32..2179364 100644 --- a/netio.cpp +++ b/OfficeAssistant_msvc/netio.cpp @@ -9,10 +9,10 @@ #include "config.h" #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -22,8 +22,11 @@ #include #include #include +#include #include #pragma comment(lib, "wbemuuid.lib") +#pragma comment(lib, "Qt5Networkd.lib") +#pragma comment(lib,"comsuppw.lib") //读取注册表获取MachineUUID inline QString getMachineGUID(){ HKEY hKey; diff --git a/netio.h b/OfficeAssistant_msvc/netio.h similarity index 100% rename from netio.h rename to OfficeAssistant_msvc/netio.h diff --git a/images/address.png b/images/address.png deleted file mode 100644 index 875b34a..0000000 Binary files a/images/address.png and /dev/null differ diff --git a/images/close-small.png b/images/close-small.png deleted file mode 100644 index c8c864d..0000000 Binary files a/images/close-small.png and /dev/null differ diff --git a/images/close.png b/images/close.png deleted file mode 100644 index dcc9b40..0000000 Binary files a/images/close.png and /dev/null differ diff --git a/images/home.png b/images/home.png deleted file mode 100644 index 4b774e2..0000000 Binary files a/images/home.png and /dev/null differ diff --git a/images/maxsize.png b/images/maxsize.png deleted file mode 100644 index d2539ed..0000000 Binary files a/images/maxsize.png and /dev/null differ diff --git a/images/minsize.png b/images/minsize.png deleted file mode 100644 index f08070f..0000000 Binary files a/images/minsize.png and /dev/null differ diff --git a/images/money.png b/images/money.png deleted file mode 100644 index 93c1567..0000000 Binary files a/images/money.png and /dev/null differ diff --git a/images/personalcenter.png b/images/personalcenter.png deleted file mode 100644 index e37d1c7..0000000 Binary files a/images/personalcenter.png and /dev/null differ