mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
bugfix: update hash compare
This commit is contained in:
@@ -274,6 +274,11 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
mainWindow->checkUpdate();
|
||||
}
|
||||
|
||||
if(packetType == PacketType::HASH_CALCULATE_START)
|
||||
{
|
||||
mainWindow->setInlineDebug(tr("Пересчет хэша на сервере..."));
|
||||
}
|
||||
|
||||
if(packetType == PacketType::BUSY)
|
||||
{
|
||||
emit sigAnimationActivated(true);
|
||||
|
||||
@@ -49,7 +49,8 @@ enum PacketType{
|
||||
COPY_VERSION = 152,
|
||||
DELETE_DATA_VERSION = 153,
|
||||
BUSY = 154,
|
||||
FREE = 155
|
||||
FREE = 155,
|
||||
HASH_CALCULATE_START = 156
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ struct FileData
|
||||
|
||||
bool operator==(const FileData& other)const
|
||||
{
|
||||
if(this->path==(other.path)) return true;
|
||||
if(this->path== other.path && this->hash == other.hash) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -6701,7 +6701,21 @@ debug/waitanimationwidget.o: Widgets/waitanimationwidget.cpp Widgets/waitanimati
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvector2d.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \
|
||||
ui_waitanimationwidget.h
|
||||
ui_waitanimationwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHBoxLayout \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\waitanimationwidget.o Widgets\waitanimationwidget.cpp
|
||||
|
||||
debug/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/commonbuttongroupwidget.h \
|
||||
@@ -6942,7 +6956,13 @@ debug/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/com
|
||||
Core/externalexecuter.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QProcess \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocess.h \
|
||||
ui_commonbuttongroupwidget.h
|
||||
ui_commonbuttongroupwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\commonbuttongroupwidget.o Widgets\commonbuttongroupwidget.cpp
|
||||
|
||||
debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \
|
||||
@@ -7183,7 +7203,17 @@ debug/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_entrywidget.h
|
||||
ui_entrywidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\entrywidget.o Widgets\entrywidget.cpp
|
||||
|
||||
debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Widgets/instructorbuttongroupwidget.h \
|
||||
@@ -7424,7 +7454,11 @@ debug/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Wid
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_instructorbuttongroupwidget.h
|
||||
ui_instructorbuttongroupwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\instructorbuttongroupwidget.o Widgets\instructorbuttongroupwidget.cpp
|
||||
|
||||
debug/main.o: main.cpp mainwindow.h \
|
||||
@@ -7911,6 +7945,17 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_mainwindow.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QFontDatabase \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QPaintEvent \
|
||||
@@ -8270,7 +8315,18 @@ debug/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidget.
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_newversionwidget.h
|
||||
ui_newversionwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\newversionwidget.o Widgets\newversionwidget.cpp
|
||||
|
||||
debug/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotifywidget.h \
|
||||
@@ -8511,7 +8567,13 @@ debug/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotifyw
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QDialog \
|
||||
ui_updatenotifywidget.h
|
||||
ui_updatenotifywidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\updatenotifywidget.o Widgets\updatenotifywidget.cpp
|
||||
|
||||
debug/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionselectwidget.h \
|
||||
@@ -8752,7 +8814,13 @@ debug/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionsele
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
Widgets/newversionwidget.h \
|
||||
ui_versionselectwidget.h
|
||||
ui_versionselectwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\versionselectwidget.o Widgets\versionselectwidget.cpp
|
||||
|
||||
debug/qrc_resources.o: debug/qrc_resources.cpp
|
||||
|
||||
@@ -6701,7 +6701,21 @@ release/waitanimationwidget.o: Widgets/waitanimationwidget.cpp Widgets/waitanima
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvector2d.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \
|
||||
ui_waitanimationwidget.h
|
||||
ui_waitanimationwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHBoxLayout \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\waitanimationwidget.o Widgets\waitanimationwidget.cpp
|
||||
|
||||
release/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/commonbuttongroupwidget.h \
|
||||
@@ -6942,7 +6956,13 @@ release/commonbuttongroupwidget.o: Widgets/commonbuttongroupwidget.cpp Widgets/c
|
||||
Core/externalexecuter.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QProcess \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocess.h \
|
||||
ui_commonbuttongroupwidget.h
|
||||
ui_commonbuttongroupwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\commonbuttongroupwidget.o Widgets\commonbuttongroupwidget.cpp
|
||||
|
||||
release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \
|
||||
@@ -7183,7 +7203,17 @@ release/entrywidget.o: Widgets/entrywidget.cpp Widgets/entrywidget.h \
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_entrywidget.h
|
||||
ui_entrywidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\entrywidget.o Widgets\entrywidget.cpp
|
||||
|
||||
release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp Widgets/instructorbuttongroupwidget.h \
|
||||
@@ -7424,7 +7454,11 @@ release/instructorbuttongroupwidget.o: Widgets/instructorbuttongroupwidget.cpp W
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_instructorbuttongroupwidget.h
|
||||
ui_instructorbuttongroupwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\instructorbuttongroupwidget.o Widgets\instructorbuttongroupwidget.cpp
|
||||
|
||||
release/main.o: main.cpp mainwindow.h \
|
||||
@@ -7911,6 +7945,17 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_mainwindow.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QFontDatabase \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QPaintEvent \
|
||||
@@ -8270,7 +8315,18 @@ release/newversionwidget.o: Widgets/newversionwidget.cpp Widgets/newversionwidge
|
||||
mywinheader.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
ui_newversionwidget.h
|
||||
ui_newversionwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\newversionwidget.o Widgets\newversionwidget.cpp
|
||||
|
||||
release/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotifywidget.h \
|
||||
@@ -8511,7 +8567,13 @@ release/updatenotifywidget.o: Widgets/updatenotifywidget.cpp Widgets/updatenotif
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QDialog \
|
||||
ui_updatenotifywidget.h
|
||||
ui_updatenotifywidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFrame \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\updatenotifywidget.o Widgets\updatenotifywidget.cpp
|
||||
|
||||
release/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionselectwidget.h \
|
||||
@@ -8752,7 +8814,13 @@ release/versionselectwidget.o: Widgets/versionselectwidget.cpp Widgets/versionse
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QEvent \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QMouseEvent \
|
||||
Widgets/newversionwidget.h \
|
||||
ui_versionselectwidget.h
|
||||
ui_versionselectwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpacerItem \
|
||||
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\versionselectwidget.o Widgets\versionselectwidget.cpp
|
||||
|
||||
release/qrc_resources.o: release/qrc_resources.cpp
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.1, 2025-07-09T17:43:46. -->
|
||||
<!-- Written by QtCreator 4.11.1, 2025-07-22T18:07:27. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<AuthData Login="O3" Password="3333" InstructorName="" ClientName="Зайцев З.З." AccessType="trainee"/>
|
||||
<AuthData Login="I1" Password="1111" InstructorName="Горинин Г.Г." ClientName="Горинин Г.Г." AccessType="instructor"/>
|
||||
File diff suppressed because it is too large
Load Diff
8865
StaticData/serverHash.xml
Normal file
8865
StaticData/serverHash.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<ServerSettingsContainer>
|
||||
<ServerSettings Address="192.168.100.83" Port="6000" Language="RUS" AutoStart="0" DestPortMath="18003" LocalPortMath="18004" UseMathModel="1"/>
|
||||
<VersionData Version="" isChangable="0"/>
|
||||
<ServerSettings UseMathModel="1" Port="6000" AutoStart="0" Address="192.168.100.83" Language="RUS" DestPortMath="18003" LocalPortMath="18004"/>
|
||||
<VersionData isChangable="1" Created="Ср июл 23 10:43:39 2025" Version="CUSTOM"/>
|
||||
</ServerSettingsContainer>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ClientAutorization Login="O3" Password="3333"/>
|
||||
<ClientNotify Code="CHECKVERSIONLIST"/>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
debug/tools.o
BIN
debug/tools.o
Binary file not shown.
Binary file not shown.
@@ -91,7 +91,7 @@ void MainWindow::initialize()
|
||||
|
||||
setUpUi();
|
||||
|
||||
|
||||
setInlineDebug(tr("Инициализация..."));
|
||||
emit sigCalculateHash();
|
||||
emit sigInitializeClient(this,recognizeSystem,externalExecuter,sendSystem,workerThread);
|
||||
|
||||
@@ -332,6 +332,7 @@ void MainWindow::slotConnectionState(bool flag)
|
||||
ui->versionLayoutWidget->hide();
|
||||
|
||||
activateLoadingAnimation(false);
|
||||
setInlineDebug("");
|
||||
|
||||
if(flag)
|
||||
{
|
||||
@@ -511,12 +512,12 @@ void MainWindow::showCompleteDialogBox()
|
||||
ui->inlineTextDebug->setText(tr("Загрузка завершена"));
|
||||
activateLoadingAnimation(true);
|
||||
|
||||
QTime dieTime= QTime::currentTime().addSecs(10); //DELAY ДЛЯ ПЕРЕСЧЕТА ХЭША НА СЕРВЕРЕ
|
||||
while (QTime::currentTime() < dieTime)
|
||||
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
||||
// QTime dieTime= QTime::currentTime().addSecs(10); //DELAY ДЛЯ ПЕРЕСЧЕТА ХЭША НА СЕРВЕРЕ
|
||||
// while (QTime::currentTime() < dieTime)
|
||||
// QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
||||
|
||||
activateLoadingAnimation(false);
|
||||
checkUpdate();
|
||||
// activateLoadingAnimation(false);
|
||||
// checkUpdate();
|
||||
}
|
||||
|
||||
void MainWindow::startUnityClient()
|
||||
|
||||
Reference in New Issue
Block a user