diff --git a/.vscode/settings.json b/.vscode/settings.json index 12f828a..dd5bd19 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "files.autoSave": "onFocusChange", "editor.fontSize": 17, - "editor.fontFamily": "'Operator Mono Lig', 'Operator Mono Lig', 'Operator Mono Lig'", + "editor.fontFamily": "'Mononoki Nerd Font Mono', 'Mononoki Nerd Font Mono', 'Mononoki Nerd Font Mono'", "cmake.configureOnOpen": true, "cmake.debugConfig": { "console": "integratedTerminal", @@ -10,6 +10,9 @@ "cmake.configureSettings": { "CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" }, + "cmake.environment": { + "PATH": "${env:PATH};C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin" + }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", "C_Cpp.intelliSenseEngine": "disabled", diff --git a/CMakeLists.txt b/CMakeLists.txt index 5172148..147618c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,11 @@ cmake_minimum_required(VERSION 3.5) -project(FTPTrans VERSION 0.1 LANGUAGES CXX) +project(FTPTrans VERSION 1.0.3 LANGUAGES CXX) + +set(CMAKE_PREFIX_PATH + ${CMAKE_PREFIX_PATH} + "C:/Qt/Qt5.14.2/5.14.2/msvc2017_64" +) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) diff --git a/src/FTPTrans.cpp b/src/FTPTrans.cpp index 5bdb817..c719576 100644 --- a/src/FTPTrans.cpp +++ b/src/FTPTrans.cpp @@ -7,7 +7,7 @@ FTPTrans::FTPTrans(QWidget* parent) : QWidget(parent) ini_opr_ = new ConfigOpr(); - setWindowTitle("FTPTrans v1.0.2"); + setWindowTitle("FTPTrans v1.0.3"); init(); diff --git a/src/main.cpp b/src/main.cpp index 84db3dc..c188b2c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,13 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif QApplication a(argc, argv); - a.setStyle("windows xp"); + +#ifdef _WIN32 + QFont font("Microsoft YaHei", 10); + a.setFont(font); + a.setStyle("windows xp"); +#endif + FTPTrans w; w.show(); return a.exec();