From 8a0695108ca2172fcc124846402eb65e86c1e546 Mon Sep 17 00:00:00 2001 From: semenov Date: Tue, 10 Dec 2024 11:09:06 +0300 Subject: [PATCH] notice --- RRJClient.pro.user | 502 ++++++++++++++++----------------- RRJClient.pro.user.02bbda2 | 562 +++++++++++++++++++++++++++++++++++++ mainwindow.cpp | 2 +- 3 files changed, 814 insertions(+), 252 deletions(-) create mode 100644 RRJClient.pro.user.02bbda2 diff --git a/RRJClient.pro.user b/RRJClient.pro.user index cd67998..035a4c4 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {02bbda2a-ba75-44de-8881-59c42e3619cd} + {15ef2478-2444-4b00-88b8-fead51c6fef5} ProjectExplorer.Project.ActiveTarget @@ -63,249 +63,6 @@ ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - E:/Projects/QT/BUILDS/RRJClientBuild - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Сборка - Сборка - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Очистка - Очистка - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Отладка - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - E:/Projects/QT/BUILDS/RRJClientBuild - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Сборка - Сборка - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Очистка - Очистка - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Выпуск - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - E:/Projects/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Сборка - Сборка - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Очистка - Очистка - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Профилирование - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Развёртывание - Развёртывание - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro - E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro - - false - - false - true - true - false - false - true - - E:/Projects/QT/BUILDS/RRJClientBuild - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Qt 5.14.2 MinGW 32-bit Desktop Qt 5.14.2 MinGW 32-bit @@ -314,7 +71,7 @@ 0 0 - E:/Projects/QT/BUILDS/RRJClientBuild + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +119,7 @@ 2 - E:/Projects/QT/GUIProj/RRJClient/RRJClient + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +167,7 @@ 0 - E:/Projects/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,8 +287,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro - E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + D:/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro false @@ -542,7 +299,250 @@ false true - E:/Projects/QT/BUILDS/RRJClientBuild + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Профилирование + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + 1 diff --git a/RRJClient.pro.user.02bbda2 b/RRJClient.pro.user.02bbda2 new file mode 100644 index 0000000..41da27e --- /dev/null +++ b/RRJClient.pro.user.02bbda2 @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {02bbda2a-ba75-44de-8881-59c42e3619cd} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + E:/Projects/QT/BUILDS/RRJClientBuild + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + E:/Projects/QT/BUILDS/RRJClientBuild + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + E:/Projects/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Профилирование + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + + false + + false + true + true + false + false + true + + E:/Projects/QT/BUILDS/RRJClientBuild + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + E:/Projects/QT/BUILDS/RRJClientBuild + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + E:/Projects/QT/GUIProj/RRJClient/RRJClient + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + E:/Projects/QT/GUIProj/RRJClient/build-RRJClient-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Профилирование + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + E:/Projects/QT/GUIProj/RRJClient/RRJClient/RRJClient.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 94b3e24..5c6288b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -100,7 +100,7 @@ void MainWindow::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigLoadComplete,this,&MainWindow::loadComplete); connect(recognizeSystem,&RecognizeSystem::sigNeedUpdate,this,&MainWindow::setNeedUpdate); connect(recognizeSystem,&RecognizeSystem::sigSocketDisabled,this,&MainWindow::lostConnection); - connect(recognizeSystem,&RecognizeSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult); + connect(recognizeSystem,&RecognizeSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult); //TODO: прибратся! 2 бинда на 1 сигнал connect(recognizeSystem,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::DirectConnection); connect(recognizeSystem,&RecognizeSystem::sigServerBlocked,this,&MainWindow::serverBlocked);