diff --git a/Core/screenchecker.cpp b/Core/screenchecker.cpp index 001ad5e..c9258b8 100644 --- a/Core/screenchecker.cpp +++ b/Core/screenchecker.cpp @@ -1,11 +1,15 @@ #include "screenchecker.h" #include +#include +#include +#include -ScreenChecker::ScreenChecker(DataParser *dataParser, QHBoxLayout *layout, QObject *parent) : +ScreenChecker::ScreenChecker(QWidget *mainWidget,DataParser *dataParser, QHBoxLayout *layout, QObject *parent) : QObject(parent) { screenCount = 0; + this->mainWidget = mainWidget; this->layout = layout; this->dataParser = dataParser; } @@ -14,6 +18,20 @@ void ScreenChecker::check() { screens = QGuiApplication::screens(); + QPixmap checkedPixmap(":resource/Icons/checked.png"); + checkedPixmap = checkedPixmap.scaled(20,20); + + QPainter painter; + QColor color(51,153,0,255); + + painter.begin(&checkedPixmap); + painter.setCompositionMode(QPainter::CompositionMode_SourceIn); + painter.fillRect(checkedPixmap.rect(),color); + painter.end(); + + QIcon checkedIcon; + checkedIcon.addPixmap(checkedPixmap,QIcon::Disabled,QIcon::On); + qint8 sizeVertical = 90; quint16 sizeHorizontal = 150; @@ -31,7 +49,10 @@ void ScreenChecker::check() QString sizeText = QString::number(display->size().width()) + "x" + QString::number(display->size().height()); sizeText.append("\n"); sizeText.append(QString::number(display->refreshRate()) + "Hz"); - QPushButton *button = new QPushButton(sizeText); + + QToolButton *button = new QToolButton(); + button->setText(sizeText); + button->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); button->setObjectName("displayView"); buttons.append(button); @@ -41,9 +62,19 @@ void ScreenChecker::check() float ratio = width / height; QSize *sizeResult; - if(height > width){ + QPushButton *checkedLabel = new QPushButton; + + checkedLabel->setParent(button); + checkedLabel->setIcon(checkedIcon); + checkedLabel->setObjectName("checkedLabelButton"); + checkedLabel->setGeometry(3,3,30,30); + + if(height > width) + { sizeResult = new QSize(sizeVertical,sizeVertical / ratio); - }else{ + } + else + { sizeResult = new QSize(sizeHorizontal,sizeHorizontal/ ratio); } @@ -51,18 +82,16 @@ void ScreenChecker::check() button->setMaximumSize(*sizeResult); button->setCheckable(true); - connect(button,&QPushButton::clicked,this,&ScreenChecker::updateDisplayData); - if(i == 0){ + if(i == 0) + { button->setChecked(true); - button->setFlat(true); - QPalette palette= button->palette(); button->setEnabled(false); - palette.setColor(QPalette::Background,QColor(Qt::blue)); - palette.setColor(QPalette::ButtonText,QColor(Qt::black)); - button->setPalette(palette); } + labels.append(checkedLabel); + connect(button,&QToolButton::clicked,this,&ScreenChecker::updateDisplayData); + } updateDisplayData(); @@ -74,8 +103,15 @@ void ScreenChecker::updateDisplayData() for (int i = 0; i isChecked()){ + QToolButton *button = buttons[i]; + if(button->isChecked()) + { displays->append(i); + labels[i]->show(); + } + else + { + labels[i]->hide(); } } diff --git a/Core/screenchecker.h b/Core/screenchecker.h index 1481b3b..6f0d02c 100644 --- a/Core/screenchecker.h +++ b/Core/screenchecker.h @@ -9,25 +9,29 @@ #include #include #include +#include +#include class ScreenChecker : public QObject { Q_OBJECT public: - explicit ScreenChecker(DataParser *dataParser, QHBoxLayout *layout,QObject *parent = nullptr); + explicit ScreenChecker(QWidget *widget,DataParser *dataParser, QHBoxLayout *layout,QObject *parent = nullptr); ~ScreenChecker(); void check(); QString getScreenCount() const; private: + QWidget *mainWidget; DataParser *dataParser; QWidget *widget; QHBoxLayout *layout; qint64 screenCount; QList screens; - QList buttons; + QList buttons; + QList labels; void updateDisplayData(); }; diff --git a/Makefile.Debug b/Makefile.Debug index 98b6e32..791d7ca 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -182,7 +182,8 @@ debug/qrc_resources.cpp: resources.qrc \ resource/Icons/monitor-display.png \ resource/Icons/setting.png \ resource/Icons/plane.png \ - resource/Icons/crossInCircle.png + resource/Icons/crossInCircle.png \ + resource/Icons/checked.png D:\QT\5.14.2\mingw73_64\bin\rcc.exe -name resources resources.qrc -o debug\qrc_resources.cpp compiler_moc_predefs_make_all: debug/moc_predefs.h @@ -427,6 +428,11 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -448,9 +454,6 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -787,6 +790,11 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -794,9 +802,6 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ debug/moc_predefs.h \ @@ -937,6 +942,11 @@ debug/moc_screenchecker.cpp: Core/screenchecker.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ debug/moc_predefs.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\screenchecker.h -o debug\moc_screenchecker.cpp @@ -1115,6 +1125,11 @@ debug/moc_tcpclient.cpp: Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -1122,9 +1137,6 @@ debug/moc_tcpclient.cpp: Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ debug/moc_predefs.h \ @@ -1306,12 +1318,14 @@ debug/moc_hashcomparer.cpp: Core/hashcomparer.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - Core/hashcomparer.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + Core/hashcomparer.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ @@ -1477,6 +1491,11 @@ debug/moc_mainwindow.cpp: mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1498,9 +1517,6 @@ debug/moc_mainwindow.cpp: mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -1800,6 +1816,11 @@ debug/moc_updatenotifywidget.cpp: updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -1807,9 +1828,6 @@ debug/moc_updatenotifywidget.cpp: updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ debug/moc_predefs.h \ @@ -2197,6 +2215,11 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ Core/tools.h \ @@ -2207,9 +2230,6 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -2572,6 +2592,11 @@ debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -2579,9 +2604,6 @@ debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\recognizesystem.o Core\recognizesystem.cpp @@ -2720,9 +2742,17 @@ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpainter.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\screenchecker.o Core\screenchecker.cpp debug/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ @@ -2880,6 +2910,11 @@ debug/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2901,9 +2936,6 @@ debug/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -3162,11 +3194,13 @@ debug/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ @@ -3347,6 +3381,11 @@ debug/main.o: main.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -3354,9 +3393,6 @@ debug/main.o: main.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ @@ -3539,6 +3575,11 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -3546,41 +3587,9 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QFrame \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ D:/QT/5.14.2/mingw73_64/include/QtGui/QFontDatabase \ D:/QT/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ @@ -3597,6 +3606,8 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/QPaintEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ D:/QT/5.14.2/mingw73_64/include/QtGui/qpainter.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h @@ -3889,40 +3900,20 @@ debug/updatenotifywidget.o: updatenotifywidget.cpp updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - Core/hashcomparer.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + Core/hashcomparer.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ ui_updatenotifywidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmessagebox.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\updatenotifywidget.o updatenotifywidget.cpp diff --git a/Makefile.Release b/Makefile.Release index 6e48e6e..bf33ccb 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -182,7 +182,8 @@ release/qrc_resources.cpp: resources.qrc \ resource/Icons/monitor-display.png \ resource/Icons/setting.png \ resource/Icons/plane.png \ - resource/Icons/crossInCircle.png + resource/Icons/crossInCircle.png \ + resource/Icons/checked.png D:\QT\5.14.2\mingw73_64\bin\rcc.exe -name resources resources.qrc -o release\qrc_resources.cpp compiler_moc_predefs_make_all: release/moc_predefs.h @@ -427,6 +428,11 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -448,9 +454,6 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -787,6 +790,11 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -794,9 +802,6 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ release/moc_predefs.h \ @@ -937,6 +942,11 @@ release/moc_screenchecker.cpp: Core/screenchecker.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ release/moc_predefs.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\screenchecker.h -o release\moc_screenchecker.cpp @@ -1115,6 +1125,11 @@ release/moc_tcpclient.cpp: Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -1122,9 +1137,6 @@ release/moc_tcpclient.cpp: Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ release/moc_predefs.h \ @@ -1306,12 +1318,14 @@ release/moc_hashcomparer.cpp: Core/hashcomparer.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - Core/hashcomparer.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + Core/hashcomparer.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ @@ -1477,6 +1491,11 @@ release/moc_mainwindow.cpp: mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -1498,9 +1517,6 @@ release/moc_mainwindow.cpp: mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -1800,6 +1816,11 @@ release/moc_updatenotifywidget.cpp: updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -1807,9 +1828,6 @@ release/moc_updatenotifywidget.cpp: updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ release/moc_predefs.h \ @@ -2197,6 +2215,11 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ Core/tools.h \ @@ -2207,9 +2230,6 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -2572,6 +2592,11 @@ release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -2579,9 +2604,6 @@ release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\recognizesystem.o Core\recognizesystem.cpp @@ -2720,9 +2742,17 @@ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/QBitmap \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qbitmap.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpainter.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\screenchecker.o Core\screenchecker.cpp release/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ @@ -2880,6 +2910,11 @@ release/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/UpdateController.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ @@ -2901,9 +2936,6 @@ release/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ Core/externalexecuter.h \ @@ -3162,11 +3194,13 @@ release/hashcomparer.o: Core/hashcomparer.cpp Core/hashcomparer.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ @@ -3347,6 +3381,11 @@ release/main.o: main.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -3354,9 +3393,6 @@ release/main.o: main.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ @@ -3539,6 +3575,11 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ Core/sendsystem.h \ Core/hashcomparer.h \ updatenotifywidget.h \ @@ -3546,41 +3587,9 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ mywinheader.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QFrame \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ D:/QT/5.14.2/mingw73_64/include/QtGui/QFontDatabase \ D:/QT/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ @@ -3597,6 +3606,8 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/QPaintEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QPainter \ D:/QT/5.14.2/mingw73_64/include/QtGui/qpainter.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qbasictimer.h @@ -3889,40 +3900,20 @@ release/updatenotifywidget.o: updatenotifywidget.cpp updatenotifywidget.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - Core/sendsystem.h \ - Core/hashcomparer.h \ - mywinheader.h \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/QToolButton \ + D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtoolbutton.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + Core/sendsystem.h \ + Core/hashcomparer.h \ + mywinheader.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QEvent \ D:/QT/5.14.2/mingw73_64/include/QtGui/QMouseEvent \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QDialog \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget \ ui_updatenotifywidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QVBoxLayout \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMessageBox \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmessagebox.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\updatenotifywidget.o updatenotifywidget.cpp diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 11c273b..712ee4d 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/StaticData/authData.xml b/StaticData/authData.xml index d128b5a..581514f 100644 --- a/StaticData/authData.xml +++ b/StaticData/authData.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/StaticData/clientHash.xml b/StaticData/clientHash.xml index 0102b71..c3733ad 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -24,11 +24,176 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 1ff7c58..808f6e3 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -1,309 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/StaticData/temp.xml b/StaticData/temp.xml index d67ab92..5fc5790 100644 --- a/StaticData/temp.xml +++ b/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 372669b..58d6fb4 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/main.o b/debug/main.o index 2643ad3..a0fe4fd 100644 Binary files a/debug/main.o and b/debug/main.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 1b25499..64c2bac 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index 0ddfcba..b6c2b86 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/moc_screenchecker.o b/debug/moc_screenchecker.o index 12da224..6036000 100644 Binary files a/debug/moc_screenchecker.o and b/debug/moc_screenchecker.o differ diff --git a/debug/qrc_resources.cpp b/debug/qrc_resources.cpp index 5463ac3..b12b3c5 100644 --- a/debug/qrc_resources.cpp +++ b/debug/qrc_resources.cpp @@ -8,48 +8,49 @@ static const unsigned char qt_resource_data[] = { // E:/Projects/QT/GUIProj/RRJClient/RRJClient/style.css - 0x0,0x0,0x2,0x7e, + 0x0,0x0,0x2,0x87, 0x0, - 0x0,0xa,0xa7,0x78,0x9c,0xd5,0x56,0x5b,0x6f,0xda,0x30,0x18,0x7d,0x47,0xe2,0x3f, - 0x58,0xe5,0x5,0x24,0x52,0x92,0x0,0x2d,0x32,0x6f,0x74,0xd3,0x2e,0x2a,0xd3,0x50, - 0xa7,0xf5,0xd9,0x89,0x4d,0xf2,0x9,0x63,0x23,0xdb,0x11,0xa0,0x69,0xff,0x7d,0x6, - 0x42,0x9a,0x84,0x40,0x43,0xc5,0xcb,0x88,0x44,0xa2,0xc4,0x3e,0xe7,0xf8,0xbb,0x1c, - 0xbb,0xd9,0x98,0x4d,0x9,0x88,0x57,0x10,0x54,0xae,0x9b,0x8d,0x3f,0xcd,0x6,0xb2, - 0xbf,0x80,0x84,0x8b,0x48,0xc9,0x44,0x50,0x7,0x96,0x24,0x62,0x18,0x25,0x8a,0xb7, - 0x71,0x4f,0x31,0x2d,0x13,0x15,0xb2,0xde,0xcb,0xcb,0x77,0xc7,0x73,0xdd,0x4f,0x44, - 0x2d,0xee,0x57,0x22,0xea,0x8c,0x4f,0xe6,0xad,0xa4,0x6,0x3,0x52,0x60,0x14,0x32, - 0x61,0x98,0xb2,0x23,0xfe,0x36,0x1b,0xcd,0xc6,0xec,0x49,0x2e,0x3,0x39,0x91,0x9b, - 0x2a,0xb2,0x50,0x72,0xa9,0x30,0x52,0x51,0xd0,0xf6,0xdd,0x7e,0xd7,0xf7,0x47,0x5d, - 0x7f,0x38,0xcc,0xd0,0xa5,0xa2,0x4c,0x39,0xda,0x6c,0xb9,0x55,0x24,0x13,0xa3,0x99, - 0x29,0x7e,0x52,0x84,0x42,0xa2,0x31,0xea,0xaf,0x36,0xe9,0x87,0xb9,0x14,0xc6,0x99, - 0x93,0x25,0xf0,0x2d,0x46,0x77,0x4f,0x84,0x43,0xa0,0xe0,0x2e,0xf7,0x11,0x23,0xef, - 0x21,0x1b,0x9d,0xe3,0x1f,0xc,0xbb,0xa3,0x41,0xd7,0xeb,0xbb,0x9d,0xa3,0xf2,0xbd, - 0xfa,0x9f,0x89,0x8e,0x27,0x89,0x31,0x52,0xfc,0x77,0xfa,0x73,0xda,0x31,0x5,0x4d, - 0x2,0xce,0xe8,0x85,0x45,0x70,0x88,0x62,0xf3,0x45,0x91,0x6d,0x11,0x3b,0xb2,0x6f, - 0x8e,0x80,0x53,0xa6,0xb5,0xad,0x8e,0xcb,0xc9,0x5c,0xc7,0x60,0xd8,0xf8,0x74,0xa, - 0x9a,0x3d,0x93,0x80,0xf1,0x6c,0x66,0x8d,0x95,0xfa,0x6e,0x79,0xa5,0x1,0xb7,0x7c, - 0x95,0xe0,0x55,0x89,0x2a,0x6,0xd9,0xcf,0xc0,0x56,0x84,0x52,0x10,0x11,0x46,0xee, - 0xbd,0xcf,0x96,0xd9,0x7f,0xff,0xf8,0x9c,0xe,0x5b,0x82,0x70,0xd6,0x40,0x4d,0x8c, - 0xd1,0xe3,0x41,0xc9,0x81,0xf6,0x19,0x4,0xfb,0x4c,0xc1,0x94,0x89,0x6a,0x27,0x3a, - 0x4d,0x8f,0x92,0x91,0x6d,0x30,0x3d,0x21,0xaa,0x84,0xb4,0xd7,0x8a,0xb4,0xe4,0x40, - 0x4f,0x73,0x5b,0x81,0xea,0xf9,0xe7,0xe2,0x54,0xb7,0xa4,0x86,0x96,0x2f,0x90,0x9c, - 0xa6,0x6f,0xd,0xdb,0x18,0xc7,0xe,0x8c,0x4e,0xda,0xb9,0xa8,0x1b,0xe3,0x30,0x4e, - 0xc4,0xe2,0x5c,0xc4,0xbd,0xb7,0xfc,0xd5,0x6a,0x9a,0xd4,0x30,0x62,0x16,0x2e,0xf2, - 0x35,0x96,0x5f,0x40,0xdd,0x96,0x28,0x56,0xe1,0x2b,0xd0,0x88,0x99,0x16,0x84,0x52, - 0x1c,0x1e,0xcb,0x8a,0xab,0x5d,0xef,0x9b,0x1d,0xaf,0x7b,0x2b,0x4e,0x4,0xdb,0xbb, - 0x1e,0x72,0xd3,0x4b,0x1b,0xc5,0x4c,0x18,0x1f,0xef,0xc7,0xb2,0x3a,0x67,0x81,0x37, - 0x28,0xfc,0xca,0xf5,0xc4,0x8c,0x58,0xf1,0xe5,0x15,0x95,0x23,0x7d,0x23,0x77,0x2a, - 0x30,0x27,0x2b,0x4a,0xc,0x7b,0x8f,0x79,0x97,0x63,0x92,0xe7,0xfe,0x18,0xbf,0xe7, - 0x9e,0x8,0x40,0x1f,0x57,0xe0,0x96,0xbb,0xe8,0x16,0xa,0x6e,0x62,0x6e,0xd5,0x36, - 0x3e,0xdd,0xda,0xcd,0xfa,0xeb,0x3e,0xd3,0x69,0xc2,0xaf,0xa6,0xf2,0x46,0x35,0x77, - 0x8c,0x3d,0x72,0xcb,0xd6,0x7b,0x94,0xd8,0x7e,0xf8,0x5,0x86,0xb3,0x7a,0x3c,0x95, - 0x55,0x7a,0x40,0xfb,0x21,0xd,0xcc,0x21,0x24,0xbb,0xce,0xb8,0x42,0x79,0xa5,0xe1, - 0x1f,0x10,0xc5,0x45,0xc4,0x2c,0xb2,0xe5,0x4d,0xb0,0x65,0x37,0x41,0xdb,0xcb,0xdb, - 0xdf,0xc0,0xd6,0x27,0x86,0x3b,0xb8,0xca,0x70,0x87,0x17,0x7c,0xad,0x18,0x83,0x6a, - 0x7a,0x6b,0x9b,0xd6,0xe3,0x2e,0x6e,0xc7,0x3b,0x19,0xde,0xd0,0xeb,0x7a,0x8f,0xf, - 0xb6,0x66,0xbd,0xdc,0xa9,0xe4,0x1c,0x66,0x8d,0x3d,0xbe,0x2,0xf4,0x2d,0xd6,0xef, - 0x9e,0x22,0x5a,0x1c,0xc4,0xa2,0xce,0x61,0x88,0xb4,0xdd,0xee,0xfe,0xea,0x8c,0x6b, - 0x67,0x3a,0xe0,0xc9,0x2e,0x6a,0x29,0xeb,0x3f,0xe9,0xd0,0x12,0xb6, + 0x0,0xb,0xa,0x78,0x9c,0xd5,0x56,0x4d,0x6f,0xe2,0x30,0x10,0xbd,0x23,0xf1,0x1f, + 0xac,0x72,0xa1,0x12,0x94,0x24,0x40,0x8b,0xd2,0x1b,0xdd,0xd5,0x7e,0xa8,0xac,0x16, + 0xb5,0xda,0x9e,0x9d,0xd8,0x24,0x23,0x8c,0x1d,0xd9,0x8e,0x28,0x5a,0xed,0x7f,0xaf, + 0x49,0x42,0x36,0x4,0x43,0x43,0x97,0xcb,0x12,0x9,0x22,0x62,0xbf,0xf7,0xc6,0x33, + 0xf3,0x26,0xed,0xd6,0x7c,0x86,0x81,0xbf,0x0,0x27,0x62,0xdd,0x6e,0xfd,0x6e,0xb7, + 0x90,0xf9,0x4,0x38,0x5c,0x46,0x52,0xa4,0x9c,0xf4,0x61,0x85,0x23,0xea,0xa3,0x54, + 0xb2,0xae,0x3f,0x90,0x54,0x89,0x54,0x86,0x74,0xf0,0xf4,0xf4,0xbd,0xef,0x3a,0xce, + 0x27,0x2c,0x97,0x37,0x9,0x8f,0xae,0xef,0xf,0xf6,0x25,0x42,0x81,0x6,0xc1,0x7d, + 0x14,0x52,0xae,0xa9,0x34,0x2b,0xfe,0xb4,0x5b,0xed,0xd6,0xfc,0x41,0xac,0x2,0x31, + 0x15,0xaf,0x36,0xb2,0x50,0x30,0x21,0x7d,0x24,0xa3,0xa0,0xeb,0x39,0xc3,0x9e,0xe7, + 0x4d,0x7a,0xde,0x78,0x5c,0xa2,0xb,0x49,0xa8,0xec,0x2b,0xbd,0x61,0x46,0x91,0x48, + 0xb5,0xa2,0x7a,0xff,0x91,0xc4,0x4,0x52,0xe5,0xa3,0x61,0xf2,0x5a,0x3c,0x58,0x8, + 0xae,0xfb,0xb,0xbc,0x2,0xb6,0xf1,0xd1,0xd5,0x3,0x66,0x10,0x48,0xb8,0xaa,0x3c, + 0xf4,0x91,0x7b,0x5b,0xae,0xae,0xf0,0x8f,0xc6,0xbd,0xc9,0xa8,0xe7,0xe,0x9d,0xeb, + 0x52,0xf9,0xcf,0x54,0xc5,0xd3,0x54,0x6b,0xc1,0xff,0x67,0xed,0x3e,0x1,0x85,0x3, + 0x46,0xc9,0x89,0x20,0x18,0x44,0xb1,0xfe,0x22,0xf1,0x66,0x1f,0x3b,0x32,0xff,0xec, + 0x0,0x67,0x54,0x29,0x53,0x19,0xa7,0x13,0xb9,0x8e,0x41,0xd3,0xfb,0xc3,0x2d,0x68, + 0xfe,0x88,0x3,0xca,0xca,0x9d,0xd,0x22,0xf5,0x9c,0x7a,0xa4,0x1,0x33,0x7c,0x56, + 0x70,0x5b,0xa2,0xf6,0xf,0xd9,0x2b,0xc1,0x12,0x4c,0x8,0xf0,0xc8,0x47,0xce,0x8d, + 0x47,0x57,0xe5,0xf7,0x70,0x77,0x5f,0x2c,0x5b,0x1,0xef,0xaf,0x81,0xe8,0xd8,0x47, + 0x77,0xb9,0x92,0x9c,0xf6,0x11,0x38,0xfd,0x4c,0x40,0xd7,0x89,0x1a,0x27,0xba,0x48, + 0x8f,0x14,0x91,0x69,0x2e,0x35,0xc5,0xb2,0x86,0x94,0x69,0x45,0x4a,0x30,0x20,0x87, + 0xb9,0xb5,0xa0,0x8e,0x8f,0x1d,0x53,0xd3,0x8a,0x32,0x0,0x6,0x93,0x91,0xe2,0x5f, + 0x4d,0x5f,0x75,0xdf,0x2c,0x8c,0xe,0x3a,0x79,0x5f,0xb6,0xef,0x87,0x71,0xca,0x97, + 0xc7,0xe,0xfc,0xaf,0xac,0x46,0x2d,0x53,0x58,0x45,0x4c,0xc3,0x65,0xb5,0xc2,0xaa, + 0xfa,0x9b,0x36,0xc4,0x7e,0xd,0xbe,0x0,0x89,0xa8,0xee,0x40,0x28,0x78,0x7e,0x5b, + 0x17,0x6c,0xf7,0xbb,0x6f,0x66,0xbd,0x1a,0x24,0xc,0x73,0x9a,0xf9,0x1d,0x72,0x8a, + 0x4b,0x69,0x49,0x75,0x18,0xef,0x7e,0x77,0x45,0x75,0xcc,0xfc,0x2e,0x50,0xf6,0xd6, + 0x78,0x62,0x8a,0x8d,0xf8,0x7a,0x44,0xf5,0x93,0xbe,0x90,0x37,0xed,0x31,0xa7,0x9, + 0xc1,0x9a,0xbe,0xc7,0xbc,0xcd,0x31,0xae,0x72,0x7f,0x8c,0xdf,0x75,0xe,0x4,0xa0, + 0x8f,0x2b,0x70,0xea,0x3d,0x74,0x9,0x5,0x17,0xb1,0x36,0xbb,0x89,0xcf,0x36,0x66, + 0x4c,0x7f,0xcd,0x32,0x5d,0x24,0xfc,0x6c,0x2a,0x77,0xd2,0x70,0x5e,0x64,0xc8,0x1d, + 0x53,0xef,0x51,0x6a,0xfa,0xe1,0x19,0x34,0xa3,0xcd,0x78,0xac,0x55,0x9a,0xa3,0xfd, + 0x10,0x1a,0x16,0x10,0xe2,0x6d,0x67,0x9c,0xa1,0xdc,0x6a,0xf7,0x39,0x22,0x3f,0x89, + 0x58,0x9e,0x6c,0xbe,0xe5,0x59,0x8,0x96,0x4f,0x85,0x8e,0x19,0x81,0xa6,0x97,0x37, + 0xbf,0x80,0xae,0xf,0xec,0x76,0xf4,0x4f,0x76,0x6b,0xdf,0xf3,0xce,0x60,0xb4,0x2b, + 0x33,0x86,0x6a,0xec,0xef,0xe4,0x9c,0xde,0xb2,0xb9,0x63,0xb7,0xe7,0xde,0xdd,0x9a, + 0x72,0x76,0xcb,0xf4,0x1d,0xc7,0x6c,0x30,0xfc,0x2d,0xa0,0x27,0xe2,0xcb,0x18,0x2b, + 0x13,0xb7,0x53,0xa8,0xce,0xd2,0xd1,0xe4,0x6d,0x9,0x77,0x9d,0x5e,0x76,0xd9,0x5e, + 0x56,0x3a,0xc,0xf8,0xf2,0x6c,0x94,0x86,0x25,0x15,0xb0,0x94,0xee,0x22,0x68,0xb7, + 0xde,0x0,0xbc,0xd,0x30,0x70, // E:/Projects/QT/GUIProj/RRJClient/RRJClient/resource/SSJ-100.png 0x0,0xc,0x7c,0xaa, 0x89, @@ -131650,6 +131651,235 @@ static const unsigned char qt_resource_data[] = { 0xff,0x4d,0x3a,0x2d,0xb,0xfb,0xab,0xee,0x96,0xfb,0x6e,0xf9,0x45,0x9f,0x36,0x42, 0xed,0xfe,0xf7,0xff,0xf,0x5e,0xff,0x72,0x68,0x2e,0x5e,0xec,0x76,0x0,0x0,0x0, 0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, + // E:/Projects/QT/GUIProj/RRJClient/RRJClient/resource/Icons/checked.png + 0x0,0x0,0xe,0x13, + 0x89, + 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, + 0x0,0x0,0x80,0x0,0x0,0x0,0x80,0x8,0x6,0x0,0x0,0x0,0xc3,0x3e,0x61,0xcb, + 0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0x3,0xb0,0x0,0x0,0x3,0xb0, + 0x1,0x27,0xc4,0xf,0xad,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x53,0x6f,0x66, + 0x74,0x77,0x61,0x72,0x65,0x0,0x77,0x77,0x77,0x2e,0x69,0x6e,0x6b,0x73,0x63,0x61, + 0x70,0x65,0x2e,0x6f,0x72,0x67,0x9b,0xee,0x3c,0x1a,0x0,0x0,0xd,0xa0,0x49,0x44, + 0x41,0x54,0x78,0x9c,0xed,0x9d,0x7b,0x70,0x54,0xf7,0x75,0xc7,0x3f,0xe7,0xee,0x22, + 0x29,0x2a,0x2,0xdb,0x4,0x87,0x12,0x17,0x43,0x43,0x62,0xc7,0x38,0x71,0xa5,0x15, + 0xc6,0x35,0xae,0x3,0x86,0x18,0xe3,0x64,0x82,0x71,0x1b,0xe2,0xbc,0x1c,0xc7,0x46, + 0x48,0x84,0x8e,0x9b,0xc7,0xb8,0xc9,0xd4,0x99,0x46,0x78,0xda,0xc6,0x33,0x76,0x32, + 0x53,0x1a,0x7,0x56,0x80,0x3b,0x71,0xda,0xc4,0xe0,0x8c,0x1f,0x35,0x5,0x8c,0x8d, + 0xcd,0x38,0xf1,0x18,0x21,0x2d,0x6a,0x20,0xc4,0x6d,0xfd,0x0,0xea,0xd6,0x8,0x9b, + 0x87,0x90,0x5f,0x12,0x92,0xee,0xe9,0x1f,0xbb,0x12,0xab,0xd5,0xae,0x76,0xef,0xee, + 0xef,0x3e,0xa4,0xbd,0x9f,0x19,0xd,0xc3,0x7d,0xfc,0xce,0x81,0xf3,0xd5,0xf9,0xfd, + 0xee,0xbd,0xbf,0xdf,0xef,0x8,0xe3,0xd,0x45,0xe6,0xae,0x67,0xd6,0x40,0x94,0xcb, + 0xc4,0x66,0x16,0x16,0x33,0x81,0x19,0xaa,0x4c,0x15,0x98,0x42,0xf2,0xa7,0xa,0xa8, + 0x0,0xfe,0x20,0x75,0xd7,0xbb,0xc0,0x59,0xa0,0x7,0x38,0xa9,0x70,0x52,0xe0,0x4d, + 0x84,0xd7,0xb1,0x39,0x82,0xf0,0x9a,0x35,0xc0,0x4b,0x6d,0xab,0x39,0x8c,0xa0,0x7e, + 0xfc,0xb3,0xdc,0x42,0xfc,0x76,0xa0,0x54,0xae,0x58,0xcf,0x87,0x23,0x11,0xe6,0x8b, + 0xcd,0xd5,0x22,0x5c,0xa9,0x70,0x39,0x50,0xe3,0x92,0xb9,0xb7,0x15,0xe,0x8a,0xd2, + 0x86,0xf0,0x82,0x1d,0xe5,0x85,0x8e,0x3b,0x78,0xc3,0x25,0x5b,0x9e,0x30,0xe6,0x4, + 0x30,0x7b,0x1d,0x95,0x93,0xaa,0x58,0x20,0x36,0x4b,0x11,0x96,0x2,0x1f,0xf3,0xd9, + 0xa5,0xff,0x12,0xd8,0x61,0xb,0x3b,0xbb,0x7b,0xd8,0xf3,0xca,0x9d,0xf4,0xfa,0xec, + 0x8f,0x23,0xc6,0x84,0x0,0x62,0x71,0x26,0x0,0xd7,0x23,0xac,0x40,0x59,0x6,0x4c, + 0xf6,0xdb,0xa7,0x1c,0x9c,0x41,0x78,0x42,0x6c,0xb6,0xa8,0xf0,0x74,0xa2,0x91,0x3e, + 0xbf,0x1d,0xca,0x47,0xa0,0x5,0x50,0xb7,0x89,0xd9,0xd6,0x0,0x5f,0x51,0xb8,0x1d, + 0xf8,0x23,0xbf,0xfd,0x71,0x48,0x27,0xc2,0xcf,0xd4,0x62,0xd3,0xfe,0x95,0xbc,0xe2, + 0xb7,0x33,0xb9,0x8,0xa4,0x0,0x62,0x71,0xae,0x41,0xf9,0x2e,0xc2,0x67,0x8,0xa8, + 0x8f,0xe,0x50,0x85,0xdd,0x28,0xeb,0xf6,0x37,0xb2,0x2d,0x68,0x83,0xc8,0xe0,0xfc, + 0xe7,0x2a,0x52,0x1f,0xe7,0x73,0x2a,0xfc,0x0,0xa8,0xf5,0xdb,0x1d,0x97,0x48,0x88, + 0x70,0x4f,0x7b,0x3,0x4f,0x6,0x45,0x8,0x81,0x10,0x40,0x5d,0xb,0x4b,0x2c,0xe5, + 0xef,0x14,0xea,0xfd,0xf6,0xc5,0xb,0x14,0xda,0x4,0xbe,0x9f,0x68,0x64,0x97,0xdf, + 0xbe,0xf8,0x2a,0x80,0x2b,0x5b,0xf8,0xd8,0x80,0xcd,0x8f,0x10,0x3e,0xeb,0xa7,0x1f, + 0x7e,0xa1,0xf0,0x4c,0x44,0xf8,0x66,0xdb,0x2a,0xe,0xf9,0xe5,0x83,0x2f,0x2,0x88, + 0xc5,0xa9,0x46,0x59,0x8b,0xf0,0x57,0xc0,0x4,0x3f,0x7c,0x8,0x10,0x7d,0x8,0x3f, + 0xae,0x78,0x87,0xb5,0x2f,0x7e,0x9b,0xf7,0xbd,0x36,0xee,0xb9,0x0,0x6a,0x37,0xb0, + 0xc8,0x12,0xe2,0xc0,0x47,0xbc,0xb6,0x1d,0x70,0x5e,0x1,0x56,0x25,0x1a,0x79,0xce, + 0x4b,0xa3,0x9e,0x9,0x60,0xc1,0x3f,0x53,0xf5,0x76,0x1f,0xcd,0x28,0x77,0x1,0x96, + 0x57,0x76,0xc7,0x18,0x2a,0xb0,0x51,0xe1,0x5b,0x89,0x46,0xde,0xf3,0xc2,0xa0,0x27, + 0x2,0xa8,0x5f,0xcf,0xe5,0x6a,0xf1,0x4b,0x92,0xaf,0x69,0x43,0xf2,0x73,0xc0,0x56, + 0xbe,0xd8,0xd1,0xc4,0xef,0xdd,0x36,0xe4,0xfa,0x6f,0x62,0x7d,0xb,0xb7,0xa8,0xc5, + 0x5e,0xc2,0xe0,0x3b,0xe1,0x93,0x96,0xd0,0x5a,0xb7,0x81,0x2f,0xb8,0x6d,0xc8,0xbd, + 0xc,0xd0,0x8c,0x15,0x9b,0xce,0x7d,0x28,0xdf,0x76,0xcd,0x46,0x39,0xa0,0xdc,0x9f, + 0xe8,0xe4,0xbb,0x34,0x63,0xbb,0xd1,0xbc,0x2b,0x2,0x98,0xb3,0x95,0x8a,0xf,0x9c, + 0xe6,0x21,0xc5,0x7d,0x5,0x97,0x5,0xca,0x63,0x35,0x95,0x7c,0x69,0xcf,0xd7,0xe9, + 0x31,0xdd,0xb4,0x71,0x1,0xcc,0x79,0x80,0x89,0x55,0x11,0x7e,0x85,0xb0,0xc4,0x74, + 0xdb,0x65,0xce,0x73,0xd1,0x5e,0x6e,0x6a,0xbd,0x93,0x6e,0x93,0x8d,0x1a,0x15,0xc0, + 0x95,0x3f,0x61,0xca,0x40,0x94,0x6d,0x8,0x57,0x99,0x6c,0x37,0x64,0x88,0x44,0x9f, + 0xcd,0x8d,0x7,0x56,0xf3,0xa6,0xa9,0x6,0x8d,0x9,0xa0,0x76,0x13,0x17,0x5b,0x3, + 0x3c,0xd,0x7c,0xd4,0x54,0x9b,0x21,0x59,0x79,0xd9,0x8e,0xf0,0xe9,0x8e,0x95,0x1c, + 0x35,0xd1,0x98,0x11,0x1,0xd4,0x3e,0xc8,0x54,0xab,0x8f,0x5f,0x3,0x97,0x98,0x68, + 0x2f,0x24,0x2f,0xaf,0x46,0x2d,0xe6,0xb7,0x36,0x70,0xbc,0xd4,0x86,0x4a,0x7e,0xc, + 0x9c,0xbf,0x99,0x1a,0xab,0x8f,0x1d,0x84,0xc1,0xf7,0x92,0x8f,0xf4,0xdb,0xec,0x8a, + 0xc5,0x4b,0x9f,0x18,0x53,0x92,0x0,0xe6,0x6c,0xa5,0xa2,0xa7,0x9f,0x5f,0x1,0xb1, + 0x52,0x1d,0x9,0x71,0xcc,0x27,0x81,0xc7,0x66,0xaf,0xa3,0xb2,0x94,0x46,0x8a,0x17, + 0x40,0x33,0x56,0xd5,0x29,0x7e,0xe,0x5c,0x5f,0x8a,0x3,0x21,0x25,0xb1,0x70,0x72, + 0x25,0xf,0x7f,0x7e,0x2b,0x91,0x62,0x1b,0x28,0x5a,0x0,0xb1,0xe9,0xdc,0x87,0xb0, + 0xa2,0xd8,0xfb,0x43,0x8c,0x71,0xd3,0x6b,0x5d,0xfc,0x7d,0xb1,0x37,0x17,0x35,0x8, + 0xac,0xdf,0xc0,0x17,0x55,0xf8,0x45,0xb1,0x46,0x43,0x8c,0xa3,0xa2,0x2c,0x6f,0x6f, + 0xe2,0x9,0xa7,0x37,0x3a,0x16,0x40,0xea,0xc3,0xce,0x5e,0xce,0x2d,0xaa,0x8,0x9, + 0x6,0x27,0xad,0x7e,0x6a,0xdb,0xd6,0xf0,0xba,0x93,0x9b,0x1c,0x75,0x1,0xb3,0xd7, + 0x51,0xa9,0x16,0xff,0x4a,0x18,0xfc,0x20,0x32,0xc5,0x8e,0xf2,0x48,0x6a,0xa,0x7d, + 0xc1,0x38,0x12,0xc0,0xe4,0x2a,0xee,0x23,0x39,0xfa,0xc,0x9,0x26,0xf3,0x80,0x7b, + 0x9c,0xdc,0x50,0x70,0x17,0x90,0x9a,0xc9,0xf3,0xb4,0x93,0x7b,0x42,0x7c,0x41,0x6d, + 0x65,0x41,0x47,0x13,0xcf,0x17,0x72,0x71,0x41,0xc1,0x8c,0xc5,0xa9,0x6,0x7e,0xb, + 0xcc,0x2e,0xc5,0xb3,0x10,0xcf,0x38,0x4,0xd4,0x16,0xb2,0x32,0xa9,0xb0,0x2e,0x40, + 0x59,0x4b,0x18,0xfc,0xb1,0xc4,0x9c,0xd4,0x84,0xdb,0xbc,0xe4,0xcd,0x0,0xb1,0x38, + 0x97,0x2,0x7,0x8,0x67,0xef,0x8e,0x35,0xde,0xb3,0x23,0x5c,0x96,0xef,0xa3,0x51, + 0xde,0xc,0xa0,0xf0,0x63,0xc2,0xe0,0x9b,0xc6,0x6,0x5e,0x5,0x12,0xc0,0x11,0x70, + 0x65,0x95,0x50,0xb5,0x65,0x73,0x7f,0xbe,0x8b,0x46,0xcd,0x0,0x75,0x2d,0x2c,0x11, + 0x65,0xa7,0x39,0x9f,0xca,0x9e,0xe3,0x8,0x3f,0xb4,0xa3,0xfc,0xa2,0xe3,0x76,0xde, + 0x1a,0x3c,0x58,0xbb,0x99,0xe9,0xd2,0xcf,0x6d,0x2,0x77,0x1,0xe7,0x99,0x34,0xa8, + 0x16,0x8b,0xf6,0x37,0xf0,0x6c,0xae,0xf3,0xb9,0x5,0xa0,0x48,0x7d,0xb,0xfb,0xca, + 0x65,0xb9,0x96,0xeb,0x8,0x7b,0x22,0x67,0xf9,0x8b,0x7d,0x7f,0xc9,0xc9,0x5c,0x97, + 0xc4,0xe2,0xcc,0x0,0x1e,0xc7,0xe0,0xda,0x48,0x81,0xe7,0xdb,0x1b,0xf9,0xd4,0x28, + 0xe7,0xb3,0x53,0xbf,0x81,0x65,0x2a,0x3c,0x6e,0xca,0x91,0x72,0x46,0x61,0x47,0x77, + 0x2f,0xcb,0xb,0xd9,0x3c,0x22,0x16,0xe7,0x83,0x40,0x2b,0xf0,0xc7,0xc6,0xec,0x5b, + 0x5c,0xbb,0xbf,0x81,0x5f,0x67,0x3b,0x97,0x73,0xc,0xa0,0xc2,0xdf,0x9a,0x72,0xa0, + 0x9c,0x71,0x12,0x7c,0x80,0x44,0x23,0x27,0x44,0x69,0x32,0xe9,0x83,0xc,0x70,0x77, + 0xce,0x73,0xd9,0xe,0xd6,0x6d,0xe4,0x3a,0xb1,0xd9,0x6d,0xd2,0x89,0x72,0xc4,0x69, + 0xf0,0xd3,0x89,0xc5,0x69,0xc7,0xe0,0x3c,0xb,0x5b,0x99,0xdb,0xd1,0x44,0x7b,0xe6, + 0xf1,0xac,0x19,0x40,0x94,0xef,0x98,0x32,0x5c,0xae,0x94,0x12,0xfc,0x14,0xdb,0x4d, + 0xfa,0x63,0x49,0xf6,0x2c,0x30,0x42,0x0,0x75,0x9b,0x98,0x8d,0xb2,0xd4,0xa4,0xf1, + 0x72,0xc3,0x40,0xf0,0x21,0xf9,0x98,0x68,0x92,0x65,0xb1,0xf8,0xc8,0x5,0xb9,0x23, + 0x4,0x20,0x36,0x2b,0x9,0xdf,0xf7,0x17,0x8f,0xf2,0xd4,0xa4,0xa,0x6e,0x2e,0x75, + 0xb7,0x30,0x91,0xe2,0x67,0xf9,0xe4,0x6e,0x92,0xdb,0x33,0xf,0xe,0x13,0x40,0x2c, + 0xce,0x4,0x94,0xdb,0xc,0x1b,0x2e,0x1b,0x14,0x76,0x9c,0x39,0xcb,0x32,0x13,0x2b, + 0x78,0x6c,0x35,0xf7,0x14,0x30,0x88,0xc2,0xd7,0x17,0x34,0x13,0x4d,0x3f,0x96,0x99, + 0x1,0xae,0x7,0x3e,0x64,0xda,0x70,0x39,0x60,0x28,0xed,0xf,0x21,0x70,0xa3,0x89, + 0x76,0x32,0xf8,0xc3,0xee,0x69,0x2c,0x4e,0x3f,0x30,0x5c,0x0,0xe1,0x1c,0xbf,0xa2, + 0x30,0x1d,0xfc,0xba,0x16,0x96,0xe0,0xd2,0x46,0x59,0x56,0x46,0x8c,0x87,0xfa,0xfa, + 0xd9,0xeb,0xa8,0x9c,0x5c,0xc9,0x71,0x82,0xbb,0x9,0x63,0x20,0x31,0x1d,0xfc,0xd4, + 0x8b,0xa0,0x4,0x30,0xc3,0x44,0x7b,0x59,0x38,0xdd,0x73,0x3e,0xd3,0xe,0xad,0xe0, + 0x2c,0xa4,0x65,0x80,0x49,0x15,0x2c,0x24,0xc,0xbe,0x23,0x5c,0xa,0xfe,0x33,0xb8, + 0x17,0x7c,0x80,0xf3,0x3f,0x70,0xea,0xdc,0xab,0xe1,0x21,0x1,0x88,0x84,0x8f,0x7e, + 0x8e,0x30,0x34,0xda,0x1f,0xa4,0xf6,0x41,0xa6,0x2,0xbb,0x81,0x2b,0x4c,0xb4,0x37, + 0x1a,0x9a,0xb6,0x72,0x3b,0x7d,0xc,0x70,0x83,0xdb,0x86,0xc7,0xd,0xca,0x53,0x35, + 0x95,0xdc,0x64,0x6a,0xbd,0x7e,0x6a,0x6d,0xe5,0x33,0x78,0x37,0xdf,0x72,0xe8,0x97, + 0x5d,0x20,0xb9,0xe5,0x7a,0xd4,0xe2,0x7f,0x3d,0x32,0x3e,0xb6,0x19,0xfb,0xc1,0x1f, + 0x64,0x7a,0xa2,0x91,0x63,0x16,0x40,0x44,0xb8,0xc6,0x63,0xe3,0x63,0x93,0xf1,0x13, + 0x7c,0x44,0xb8,0x1a,0x52,0x5d,0xc0,0xe0,0x5f,0x42,0x46,0x61,0x1c,0x5,0x1f,0xc0, + 0x56,0xe6,0x3,0xc9,0xb7,0x42,0x2,0x73,0x3,0xb1,0x73,0x71,0x40,0x51,0xd8,0xd1, + 0x7d,0x96,0xe5,0x89,0x26,0x83,0xa3,0x7d,0x1f,0x83,0xf,0xc9,0x98,0x3,0x58,0x28, + 0xa2,0xe1,0x16,0x6e,0xb9,0x71,0x6f,0xb4,0xef,0xf7,0x2,0x9b,0x4f,0xa0,0x88,0xd4, + 0x6d,0x62,0xb6,0xc,0xf0,0xb2,0xcf,0xce,0x4,0x93,0x71,0x96,0xf6,0x33,0xb1,0x23, + 0xcc,0x8c,0x62,0x73,0xa9,0xdf,0x8e,0x4,0x12,0x61,0xfb,0x99,0x5e,0x6e,0x1e,0x4f, + 0x69,0x3f,0x93,0x88,0xcd,0x65,0x96,0xb8,0xf0,0xd5,0x69,0xcc,0xa3,0x3c,0x55,0x33, + 0x81,0x3f,0x1f,0x87,0x69,0x7f,0x18,0xaa,0xcc,0xb4,0x10,0x2e,0xf6,0xdb,0x91,0x20, + 0x21,0xb0,0x73,0x3c,0xa7,0xfd,0x74,0x4,0x66,0x45,0x71,0xf7,0xbd,0xf3,0xd8,0x42, + 0xd8,0xde,0xd5,0xc3,0xcd,0xed,0x8d,0xe3,0x37,0xed,0xa7,0xa3,0xca,0xc5,0x96,0x28, + 0x17,0xfa,0xed,0x48,0x10,0x10,0xd8,0x59,0xe,0x69,0x7f,0x18,0xc2,0x54,0x4b,0x93, + 0xa5,0x54,0xcb,0x1a,0x81,0x9d,0x13,0x2b,0x58,0x5e,0xe,0x69,0x3f,0x83,0x29,0x51, + 0xe0,0x2,0xbf,0xbd,0xf0,0x95,0x32,0x4b,0xfb,0x19,0x4c,0xb1,0x80,0x6a,0xbf,0xbd, + 0xf0,0x8b,0xb2,0x4c,0xfb,0xc3,0xa9,0xb6,0x48,0x56,0xd1,0x2e,0x3b,0xca,0x38,0xed, + 0xa7,0x53,0x59,0x96,0x2,0x8,0x83,0x3f,0x44,0x65,0x34,0xff,0x35,0xc6,0x39,0xa6, + 0xb0,0x43,0xe0,0x8,0x8a,0xa6,0xde,0x43,0xdc,0x0,0x5c,0xe4,0x89,0xf5,0xf2,0xee, + 0xf3,0x47,0x10,0x5,0x7a,0xf1,0x66,0x1c,0x70,0x4a,0x84,0xbb,0x66,0x9d,0xc7,0xcf, + 0x1e,0x59,0xc1,0xc0,0xb0,0x33,0xcd,0x58,0xf5,0xd3,0xf8,0x8a,0xa,0xf7,0x3,0x53, + 0x5d,0xf3,0x40,0xd8,0x7e,0xa6,0xc7,0xdc,0x87,0x9d,0xd4,0x1c,0xbe,0xb1,0xd4,0xe7, + 0x67,0xd2,0x2b,0xb1,0x38,0xa7,0x31,0xbc,0x29,0x41,0x16,0x8e,0x6a,0x84,0xc5,0xf9, + 0xaa,0x68,0xa7,0x6a,0xe,0xec,0x0,0x3e,0x6e,0xdc,0x83,0x30,0xf8,0xd9,0x38,0x6d, + 0x81,0xeb,0xf5,0xe9,0x7a,0x6d,0x65,0x59,0x21,0x25,0xd4,0x3b,0x56,0x72,0x34,0x6a, + 0xb1,0x10,0x78,0xc9,0xa8,0x7,0x61,0xf0,0x73,0xf1,0xae,0x5,0x9c,0x72,0xd9,0x48, + 0xbc,0xa3,0x89,0xdf,0x16,0x7a,0x71,0x6b,0x3,0xc7,0x8d,0x8a,0x20,0xc,0xfe,0x68, + 0x9c,0xb2,0x10,0x4e,0xb8,0x69,0x41,0x6c,0x36,0x3a,0xbd,0xa7,0xb5,0x81,0xe3,0x7d, + 0x36,0xb,0x80,0xdf,0x95,0x64,0x3b,0x7c,0xce,0x1f,0x15,0x81,0xb7,0x2c,0x70,0x55, + 0x0,0x5d,0xed,0xab,0x8b,0xb,0xe2,0x81,0xd5,0xbc,0x69,0xf5,0xf3,0x69,0x8a,0xcd, + 0x4,0xc2,0xf6,0xae,0x5e,0x73,0x5f,0xf5,0x62,0x71,0x3e,0x38,0x46,0x1f,0xf5,0x72, + 0xa2,0xca,0x49,0xb,0xf8,0x1f,0x17,0x6d,0x94,0x54,0xdd,0xaa,0x6d,0xd,0x9d,0x56, + 0x3f,0xd7,0xe1,0x54,0x4,0x61,0xda,0x2f,0x8,0x11,0x8e,0x5a,0xd8,0x1c,0x71,0xd1, + 0x46,0xc9,0x4b,0xcd,0xda,0xd6,0xd0,0x99,0xea,0xe,0xe,0x15,0x72,0x7d,0x98,0xf6, + 0xb,0x47,0xe1,0xb0,0xa5,0x16,0x87,0x5d,0xb4,0x71,0xe1,0x15,0xeb,0xf9,0x70,0xa9, + 0x8d,0xa4,0xba,0x83,0xc5,0xe4,0xcb,0x4,0x61,0xda,0x77,0x84,0x2a,0x87,0xad,0x48, + 0xbf,0xab,0x15,0xaa,0x25,0x6a,0x71,0x8b,0x89,0x86,0xf2,0x76,0x7,0x61,0xda,0x77, + 0x8c,0x8,0xbf,0x17,0x14,0x89,0xb5,0x70,0x6,0xa8,0x71,0xc9,0xce,0x5b,0x15,0x11, + 0x2e,0x7d,0x71,0xa5,0x99,0xc7,0xcd,0xb9,0xf,0x30,0xcd,0x8e,0xf2,0x2c,0xe9,0x2f, + 0x8b,0xc2,0xe0,0x17,0x43,0x57,0x62,0x15,0x17,0x58,0x8,0xaa,0x70,0xd0,0x45,0x43, + 0x53,0xfb,0x6,0xd8,0x3a,0x67,0xab,0x99,0x8f,0x4e,0x23,0x32,0x41,0x18,0xfc,0x62, + 0xf9,0x1d,0x82,0x26,0x97,0x86,0x29,0x6d,0x6e,0x5a,0x52,0x58,0x54,0x79,0x9a,0x47, + 0x4c,0x8b,0x40,0xe1,0x27,0x61,0xf0,0x8b,0x44,0xd8,0x97,0xfc,0x3,0x88,0xc5,0xf9, + 0x3c,0xb0,0xd5,0x6d,0x9b,0xa6,0x37,0x54,0x30,0xc9,0x18,0xfe,0xa4,0x5b,0x14,0x2a, + 0xdc,0xbc,0x7f,0x15,0x8f,0x59,0x0,0x76,0x94,0x17,0xbc,0x30,0x2a,0xb0,0x74,0x52, + 0x65,0xe9,0xd5,0x2e,0x4d,0x53,0x6e,0xc1,0x7,0x88,0xf4,0xf1,0x22,0xa4,0x56,0x7, + 0x77,0xdc,0xc1,0x1b,0xc0,0x7f,0x7b,0x61,0x38,0x68,0x22,0x28,0xc7,0xe0,0x3,0x87, + 0xda,0xd6,0xd0,0x9,0xe9,0x3b,0x84,0x28,0x3b,0xbc,0xb2,0x1e,0x14,0x11,0x94,0x69, + 0xf0,0x87,0xc5,0x7a,0x48,0x0,0x6a,0x79,0x27,0x0,0xf0,0x5f,0x4,0x65,0x1b,0x7c, + 0xc0,0xe6,0x5c,0x11,0x90,0x21,0x1,0x74,0xf7,0xb0,0x7,0x38,0xe3,0xa5,0x23,0x7e, + 0x89,0xa0,0x9c,0x83,0xf,0x74,0x9d,0xbd,0xe0,0x5c,0xed,0x80,0x21,0x1,0xbc,0x72, + 0x27,0xbd,0x88,0xf3,0xda,0xb3,0xa5,0xe2,0xb5,0x8,0xca,0x3c,0xf8,0x28,0x3c,0x3a, + 0xb8,0x47,0x20,0x64,0xec,0x14,0x2a,0x36,0x5b,0xbc,0x77,0xc9,0x3b,0x11,0x94,0x7b, + 0xf0,0x1,0x84,0xe1,0x31,0x1e,0x26,0x80,0x89,0x9d,0xec,0x2,0xde,0xf0,0xd4,0xa3, + 0x14,0x6e,0x8b,0x20,0xc,0x3e,0x0,0x9d,0xc0,0x73,0xe9,0x7,0x86,0x9,0x60,0x4f, + 0x33,0xfd,0xc0,0x43,0x5e,0x7a,0x94,0x8e,0x5b,0x22,0x8,0x83,0x9f,0x44,0x61,0x73, + 0x66,0x35,0xd1,0x11,0xf5,0x2,0x34,0xc2,0x66,0xdc,0xa9,0x63,0x57,0x10,0x2,0x4b, + 0x27,0x57,0xb1,0xc5,0xd4,0x6b,0xe3,0xf1,0xfe,0x49,0xd7,0x1,0x1a,0x19,0xe0,0xc1, + 0xcc,0x83,0x23,0x4,0x90,0x9a,0xbd,0x6b,0xb4,0x5c,0x89,0x63,0x94,0x65,0x55,0x5d, + 0xa5,0x67,0x82,0xf1,0x3c,0x99,0xc3,0x29,0x2,0xdb,0xda,0xbe,0xc1,0x6b,0x99,0xc7, + 0x73,0x55,0xd,0xfb,0x91,0xcb,0xfe,0xe4,0x47,0xb9,0x71,0x72,0x15,0x8f,0x16,0x2b, + 0x82,0x30,0xed,0xf,0xc7,0xb6,0xb8,0x2f,0xdb,0xf1,0x9c,0xa5,0x61,0x4c,0x57,0xad, + 0x2a,0x1a,0xe1,0x89,0x9e,0xf3,0x58,0x91,0xfe,0xe8,0x92,0x8f,0xb2,0xfa,0xaa,0x57, + 0x18,0xad,0x89,0x46,0xae,0xca,0x76,0x22,0x67,0xdd,0x40,0x11,0xee,0x71,0xcf,0x1f, + 0x7,0x38,0xec,0xe,0xc2,0xb4,0x3f,0x12,0xd1,0xdc,0xb1,0x1c,0xb5,0x38,0x54,0x2c, + 0xce,0x5e,0x60,0x9e,0x71,0x8f,0x8a,0xa1,0x80,0x89,0x1f,0x61,0xda,0x1f,0x89,0x42, + 0xdb,0xfe,0x55,0xcc,0x43,0xb2,0xf,0xec,0xf3,0x55,0xf,0xf,0x4e,0xf5,0xd0,0xe4, + 0x98,0x20,0xe7,0xd3,0x41,0x38,0xda,0xcf,0x81,0xc5,0xf7,0x72,0x5,0x3f,0x79,0x7a, + 0x14,0x12,0x8d,0xec,0x2,0xfe,0xdd,0xb8,0x53,0xc5,0x92,0xa3,0x3b,0x8,0xd3,0x7e, + 0x76,0x4,0xb6,0x8c,0x56,0x39,0x1c,0xf2,0x67,0x0,0x34,0xc2,0x37,0x21,0x40,0x33, + 0x78,0x32,0x9e,0xe,0xc2,0xb4,0x9f,0x93,0xb7,0xfb,0xec,0xfc,0x15,0x60,0xf3,0x16, + 0x27,0x3c,0xf6,0x6f,0x9c,0x9a,0xfe,0x39,0x26,0x42,0xa0,0x6a,0xa,0x7c,0xb4,0x6a, + 0x2,0x9f,0x98,0x76,0x13,0xcf,0x5b,0xfd,0xec,0x22,0xc,0xfe,0x48,0x94,0xbf,0xe9, + 0x58,0xcd,0xae,0x7c,0x97,0xe5,0xcd,0x0,0x0,0x15,0xef,0xb0,0x16,0xf2,0x2f,0xef, + 0xf6,0x14,0x65,0x99,0xd5,0xcf,0xcb,0x84,0xc1,0xcf,0xc6,0xc1,0x9a,0x4e,0xd6,0x15, + 0x72,0x61,0xc1,0x25,0x62,0x63,0x71,0x16,0x92,0xec,0x67,0xc3,0xb2,0xb2,0xc1,0xc6, + 0x56,0x8b,0x5,0xfb,0x1b,0xce,0x7d,0xf3,0x1f,0x8d,0x82,0x32,0x0,0x40,0xa2,0x91, + 0xe7,0x4,0xfe,0xb1,0x78,0xbf,0x42,0xbc,0x40,0xe0,0xde,0x42,0x83,0xf,0xe,0x4, + 0x0,0xd0,0xd5,0xcb,0xf7,0xa0,0xf0,0xcd,0x1e,0x42,0x3c,0x46,0xd9,0xab,0xd0,0xec, + 0xe4,0x16,0xc7,0xe9,0x7c,0x6e,0xb,0x73,0x6c,0x65,0x2f,0x30,0xd1,0xe9,0xbd,0x21, + 0xae,0x72,0x22,0x6a,0x51,0xdb,0xda,0xe0,0xac,0xfa,0x9b,0xa3,0xc,0x0,0xd0,0xb6, + 0x8a,0x43,0x2a,0xdc,0x8a,0x8f,0x9f,0x8c,0x43,0x46,0xa0,0x22,0xdc,0xe1,0x34,0xf8, + 0x50,0xc0,0x63,0x60,0x36,0x8e,0x3d,0xc9,0x7f,0x4e,0xff,0x2c,0x13,0x9,0xab,0x8d, + 0x5,0x3,0xe5,0xde,0x44,0x23,0x3f,0x2d,0xe6,0x56,0xc7,0x19,0x60,0x90,0x44,0x23, + 0x7f,0x8d,0xf8,0x37,0x7b,0x28,0x24,0x89,0xc2,0xc3,0x89,0x4e,0xbe,0x5f,0xec,0xfd, + 0x45,0xb,0x0,0x41,0x51,0x56,0xa2,0x3c,0x55,0x74,0x1b,0x21,0xa5,0xa1,0x3c,0xdb, + 0xdd,0xcb,0x6d,0x34,0x63,0x17,0xdb,0x44,0xc9,0xcf,0xf4,0xb1,0x38,0xd5,0x2,0xcf, + 0x28,0xfc,0x69,0xa9,0x6d,0x85,0x14,0x8e,0x40,0xfb,0xfb,0xfd,0x2c,0x3c,0xb4,0x86, + 0x77,0x4a,0x6c,0xa7,0x74,0x52,0x13,0x30,0x7e,0x3,0x5c,0x62,0xa2,0xbd,0x90,0xbc, + 0xbc,0x1a,0xb5,0x98,0xdf,0xda,0xc0,0xf1,0x52,0x1b,0x2a,0xbe,0xb,0x48,0x23,0xd1, + 0xc8,0x9,0x3b,0xc2,0x12,0x8,0xeb,0xf,0x7a,0xc0,0xcb,0x76,0x84,0x45,0x26,0x82, + 0xf,0x86,0x4,0x0,0xc9,0x6d,0x5e,0x2b,0x22,0x5c,0x45,0xf2,0x1d,0x41,0x88,0xb, + 0x8,0xb4,0xf7,0xd9,0x5c,0xd3,0xb1,0x92,0xa3,0xa6,0xda,0x34,0x26,0x0,0x80,0x17, + 0x57,0x72,0xaa,0xaf,0x9a,0xc5,0x92,0xb6,0xf8,0x30,0xc4,0x10,0xca,0xb3,0x91,0x5e, + 0x16,0x1d,0x58,0x5d,0xda,0xde,0x8b,0x99,0x18,0x15,0x0,0xc0,0x81,0x5b,0x79,0xf7, + 0xfd,0xf3,0x59,0xa6,0xf0,0xb0,0xe9,0xb6,0xcb,0x15,0x81,0x47,0x6b,0x2a,0xf9,0x4c, + 0xeb,0x9d,0x74,0x9b,0x6e,0xbb,0xa8,0x17,0x41,0xf9,0x78,0xeb,0x11,0x6,0x8e,0xd5, + 0xf3,0xd8,0xf4,0x49,0x54,0x1,0xf3,0x9,0xbf,0x20,0x16,0x8b,0xa2,0xdc,0x9b,0xe8, + 0x64,0xf5,0x91,0x6f,0xd,0x5f,0xd1,0x63,0xa,0xd7,0x3,0x33,0xb7,0x85,0xc5,0xb6, + 0xf2,0x2f,0xc0,0x87,0xdc,0xb6,0x35,0xce,0x38,0x21,0xca,0xd7,0xda,0x9b,0xdc,0x5d, + 0xa4,0xe3,0xc9,0x6f,0xe6,0xbc,0x8d,0x5c,0xd4,0x6f,0xf3,0x4b,0x82,0x35,0xab,0x28, + 0xb8,0x8,0xfb,0x6,0x6,0xf8,0xc2,0x7f,0xac,0x76,0x75,0x1b,0x5f,0xc0,0xa5,0x2e, + 0x20,0x93,0xff,0x7b,0x92,0xee,0x4b,0xea,0xf9,0x79,0x5f,0xd,0xa,0x5c,0x4b,0xd8, + 0x25,0xe4,0x42,0x81,0x7f,0x2,0x6e,0xe9,0x68,0x72,0xbd,0x8e,0x3,0xe0,0x43,0x20, + 0x6a,0x37,0x70,0xad,0x25,0xfc,0x14,0x98,0xe3,0xb5,0xed,0x80,0x73,0x50,0x2d,0xd6, + 0x38,0x99,0xcc,0x61,0x2,0x4f,0x32,0x40,0x3a,0x9d,0xdb,0x38,0x7a,0x49,0x3d,0x2d, + 0x67,0x27,0x71,0x8a,0xe4,0x0,0x31,0x10,0xbb,0x85,0xf9,0xc8,0x7b,0x2,0xff,0xd0, + 0x73,0x3e,0x5f,0x3d,0x70,0xab,0xab,0x1b,0x77,0x67,0xc5,0xd7,0x54,0x5c,0xbb,0x99, + 0xe9,0xd2,0xcf,0xbd,0x2,0x5f,0xf5,0xd3,0xf,0xdf,0x50,0xb6,0x21,0xac,0x49,0x34, + 0xba,0x5a,0xb3,0x61,0x54,0x2,0xd1,0x17,0xd7,0x6d,0xe4,0x3a,0xcb,0xe6,0x7,0x9a, + 0x1c,0x1f,0x8c,0x7f,0x94,0xbd,0x1a,0xe1,0xee,0x7c,0x8b,0x36,0xbc,0x20,0x10,0x2, + 0x18,0xa4,0x6e,0x23,0x7f,0x26,0x3,0xdc,0x8d,0xb0,0xc4,0x6f,0x5f,0x5c,0x41,0xd8, + 0x27,0x36,0x6b,0xdd,0x7e,0xb4,0x73,0x42,0xa0,0x4,0x30,0x48,0xed,0x6,0xae,0x10, + 0xe1,0x3b,0x2,0x5f,0xc2,0x87,0x71,0x8a,0x61,0x54,0x61,0x37,0xca,0xba,0xfd,0x4d, + 0x3c,0xe9,0xb7,0x33,0x99,0x4,0x52,0x0,0x83,0xcc,0xdb,0xc8,0x45,0xfd,0x3,0x7c, + 0x19,0xe1,0x1b,0xc0,0xc,0xbf,0xfd,0x71,0xc8,0x31,0x84,0x87,0x50,0x36,0x26,0x1a, + 0x79,0xd5,0x6f,0x67,0x72,0x11,0x68,0x1,0xc,0xb2,0xa0,0x99,0x68,0xf7,0x34,0x16, + 0x5b,0xc2,0xa,0x85,0xe5,0xb8,0x5f,0xe9,0xb4,0x58,0x4e,0xb,0x3c,0x6e,0xb,0x5b, + 0x26,0xbd,0xc1,0xee,0xd4,0xa6,0x5b,0x81,0x66,0x4c,0x8,0x20,0x9d,0x39,0x5b,0xa9, + 0xa8,0xee,0xe2,0x5a,0x5b,0xb9,0x1,0x58,0xa,0x5c,0xe6,0xb3,0x4b,0x87,0x80,0x9d, + 0x96,0xb0,0xf3,0xbd,0xf3,0x78,0xde,0xc9,0x4e,0x26,0x41,0x60,0xcc,0x9,0x20,0x93, + 0xb9,0xf,0x30,0x6d,0x20,0xc2,0xd5,0x8,0xd7,0x88,0x70,0x25,0xca,0xe5,0x18,0xa8, + 0x56,0x96,0x83,0x33,0xc0,0x41,0x85,0x36,0x94,0xdf,0x4c,0x88,0xf0,0x82,0xa9,0x89, + 0x19,0x7e,0x31,0xe6,0x5,0x90,0x8d,0x3f,0x59,0xcf,0xcc,0x68,0x84,0x8f,0x2b,0xcc, + 0x12,0x65,0x26,0x30,0x43,0xe1,0x42,0x60,0x4a,0xea,0xa7,0x9a,0x64,0xe5,0xf4,0xc1, + 0x3a,0x49,0x6f,0x3,0xfd,0x24,0xeb,0x28,0x9f,0x4,0x4e,0x2a,0x1c,0xb7,0xe0,0x75, + 0x85,0xc3,0xaa,0x1c,0xd6,0x28,0x2f,0x99,0x9c,0x88,0x11,0x14,0xfe,0x1f,0x1d,0xab, + 0xcb,0xc5,0xe5,0x0,0x4f,0x2e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, + 0x60,0x82, }; @@ -131739,6 +131969,11 @@ static const unsigned char qt_resource_name[] = { 0x0,0x63, 0x0,0x72,0x0,0x6f,0x0,0x73,0x0,0x73,0x0,0x49,0x0,0x6e,0x0,0x43,0x0,0x69,0x0,0x72,0x0,0x63,0x0,0x6c,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, + // checked.png + 0x0,0xb, + 0x1,0x64,0x80,0x7, + 0x0,0x63, + 0x0,0x68,0x0,0x65,0x0,0x63,0x0,0x6b,0x0,0x65,0x0,0x64,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, }; @@ -131748,51 +131983,54 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/style.css 0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x92,0x51,0x4d,0x53,0xeb, +0x0,0x0,0x1,0x92,0x52,0xc9,0xf,0xc1, // :/resource 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/resource/Fonts - 0x0,0x0,0x0,0x7e,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0xe, + 0x0,0x0,0x0,0x7e,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0xf, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/resource/Icons - 0x0,0x0,0x0,0x6e,0x0,0x2,0x0,0x0,0x0,0x7,0x0,0x0,0x0,0x7, + 0x0,0x0,0x0,0x6e,0x0,0x2,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x7, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/resource/SSJ-100Dark.png - 0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xc,0x7f,0x30, + 0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xc,0x7f,0x39, 0x0,0x0,0x1,0x92,0x4d,0x8e,0xd2,0xb0, // :/resource/SSJ-100.png - 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x82, + 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x8b, 0x0,0x0,0x1,0x92,0x4d,0x0,0xce,0xbb, // :/resource/Icons/setting.png - 0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xc3,0xaf, + 0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xc3,0xb8, 0x0,0x0,0x1,0x92,0x47,0x9,0xdd,0xaa, + // :/resource/Icons/checked.png + 0x0,0x0,0x2,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x20,0x21,0x25, +0x0,0x0,0x1,0x92,0x51,0xaa,0xfa,0x67, // :/resource/Icons/settingWhite.png - 0x0,0x0,0x1,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x77,0xa8, + 0x0,0x0,0x1,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x77,0xb1, 0x0,0x0,0x1,0x92,0x47,0xc,0xaf,0x4c, // :/resource/Icons/plane.png - 0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xee,0xc1, + 0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xee,0xca, 0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f, // :/resource/Icons/crossInCircle.png - 0x0,0x0,0x1,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xf3,0xe, + 0x0,0x0,0x1,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xf3,0x17, 0x0,0x0,0x1,0x92,0x4c,0x9f,0x4d,0xc4, // :/resource/Icons/whiteCross.png - 0x0,0x0,0x1,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x61,0x33, + 0x0,0x0,0x1,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x61,0x3c, 0x0,0x0,0x1,0x92,0x4c,0x9e,0xfa,0x44, // :/resource/Icons/monitor-display.png - 0x0,0x0,0x1,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xbd,0xe0, + 0x0,0x0,0x1,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xbd,0xe9, 0x0,0x0,0x1,0x92,0x42,0xfe,0x89,0x26, // :/resource/Icons/762.gif - 0x0,0x0,0x1,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x3a,0xbd, + 0x0,0x0,0x1,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x3a,0xc6, 0x0,0x0,0x1,0x92,0x4d,0xb,0xea,0x71, // :/resource/Fonts/HelveticaNeue-Medium.ttf - 0x0,0x0,0x0,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x16,0xf1,0x8d, + 0x0,0x0,0x0,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x16,0xf1,0x96, 0x0,0x0,0x1,0x92,0x42,0xb4,0xbd,0xcd, // :/resource/Fonts/LiberationSans-Regular.ttf - 0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0xe2,0xc1, + 0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0xe2,0xca, 0x0,0x0,0x1,0x92,0x42,0x25,0xa7,0xdc, // :/resource/Fonts/Kanit Cyrillic.ttf - 0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0x5b,0x1, + 0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0x5b,0xa, 0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc, }; diff --git a/debug/qrc_resources.o b/debug/qrc_resources.o index 7b5af23..ee6cae0 100644 Binary files a/debug/qrc_resources.o and b/debug/qrc_resources.o differ diff --git a/debug/screenchecker.o b/debug/screenchecker.o index bd5861c..654d113 100644 Binary files a/debug/screenchecker.o and b/debug/screenchecker.o differ diff --git a/debug/updatenotifywidget.o b/debug/updatenotifywidget.o index ad278b6..3a118b7 100644 Binary files a/debug/updatenotifywidget.o and b/debug/updatenotifywidget.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index a7355a5..e73fa0b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -15,6 +15,7 @@ MainWindow::MainWindow(QWidget *parent) , ui(new Ui::MainWindow) { ui->setupUi(this); + isRecovery = false; setWindowFlag(Qt::FramelessWindowHint); painting(); initialize(); @@ -80,7 +81,7 @@ void MainWindow::createObjects() recognizeSystem = new RecognizeSystem; recognizeSystem->moveToThread(connectionThread); - screenChecker = new ScreenChecker(dataParser,ui->displayLayout); + screenChecker = new ScreenChecker(this,dataParser,ui->displayLayout); externalExecuter = new ExternalExecuter; hashComparer = new HashComparer(dataParser); @@ -154,12 +155,19 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount) fileCountForUpdate = fileCount; QString availableSizeText; - if (flag){ + if (flag && isRecovery) + { + ui->inlineTextDebug->setText("Восстановление версии..."); + + } + else if(flag) + { QString result = tr("Доступно обновление: ") + Tools::convertFileSize(size); result += tr("Количество файлов: ") + QString::number(fileCount); ui->inlineTextDebug->setText(result); ui->updateButton->show(); ui->autostartCheckBox->show(); + stopLoadingMovie(); } else { @@ -167,10 +175,10 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount) autoStart(); ui->loadingProgressBar->hide(); ui->startButton->show(); + ui->offlineStartButton->setEnabled(true); + stopLoadingMovie(); } - - stopLoadingMovie(); ui->updateButton->setEnabled(flag); ui->startButton->setEnabled(!flag); } @@ -367,6 +375,7 @@ void MainWindow::on_loginButton_clicked() void MainWindow::on_updateButton_clicked() { emit sigSendCommand("update"); + ui->updateButton->hide(); ui->loadingProgressBar->setValue(0); ui->loadingProgressBar->show(); @@ -433,11 +442,28 @@ void MainWindow::on_loadToServerButton_clicked() void MainWindow::on_undoChangesButton_clicked() { + isRecovery = true; + emit sigSendCommand("check"); + ui->loadingProgressBar->show(); - ui->offlineStartButton->hide(); + ui->offlineStartButton->setEnabled(false); + ui->updateButtonGroup_2->hide(); ui->updateWidget->hide(); + + startLoadingAnim(); + + //delay + + QTime dieTime= QTime::currentTime().addSecs(10); + while (QTime::currentTime() < dieTime) + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + + startLoadingAnim(); + ui->updateButton->hide(); on_updateButton_clicked(); + isRecovery = false; + stopLoadingMovie(); } void MainWindow::on_startWithCurrentChangesButton_clicked() @@ -488,9 +514,11 @@ void MainWindow::showCompleteDialogBox(bool flag) { ui->inlineTextDebug->setText(tr("Загрузка завершена")); startLoadingAnim(); + QTime dieTime= QTime::currentTime().addSecs(10); while (QTime::currentTime() < dieTime) QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + stopLoadingMovie(); checkUpdate(); } @@ -551,7 +579,6 @@ void MainWindow::painting() movieLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); movieLabel->setMovie(movie); startLoadingAnim(); - } void MainWindow::startLoadingAnim() diff --git a/mainwindow.h b/mainwindow.h index 8568565..adaf2df 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -92,6 +92,7 @@ private: int fileCountForUpdate; int filesLoaded; + bool isRecovery; void painting(); void initialize(); diff --git a/mainwindow.ui b/mainwindow.ui index 3387253..d2613b6 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -44,112 +44,126 @@ 600 - + - 10 - 550 - 551 - 39 + 0 + 540 + 550 + 50 + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 60 + + + + 1 + - - - 0 + + + + 0 + 0 + - - - - - 0 - 0 - - - - - 0 - 30 - - - - - 16777215 - 40 - - - - 10 - - - - - - - true - - - - 0 - 0 - - - - - 100 - 30 - - - - - 1000 - 35 - - - - - Calibri - 8 - - - - Обновить - - - false - - - - - - - true - - - - 0 - 0 - - - - - 100 - 30 - - - - - 1000 - 35 - - - - Запуск - - - - + + + 0 + 35 + + + + + 16777215 + 35 + + + + 10 + + + + + + + true + + + + 0 + 0 + + + + + 100 + 35 + + + + + 2000 + 40 + + + + + Calibri + 8 + + + + Обновить + + + false + + + + + + + true + + + + 0 + 0 + + + + + 100 + 35 + + + + + 2000 + 40 + + + + Запуск + + @@ -162,7 +176,7 @@ 10 44 781 - 201 + 211 @@ -225,7 +239,7 @@ 16777215 - 30 + 20 @@ -278,6 +292,9 @@ + + true + 730 @@ -581,6 +598,9 @@ + + true + 0 @@ -784,7 +804,7 @@ - 10 + 8 1 @@ -879,7 +899,7 @@ - TextLabel + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -1038,7 +1058,7 @@ - 600 + 570 552 190 35 @@ -1073,7 +1093,7 @@ mainFrame - layoutWidget + downLayout horizontalWidget notificationLabel debugWidget diff --git a/resource/Icons/checked.png b/resource/Icons/checked.png new file mode 100644 index 0000000..928587c Binary files /dev/null and b/resource/Icons/checked.png differ diff --git a/resources.qrc b/resources.qrc index 0445a00..23edd6a 100644 --- a/resources.qrc +++ b/resources.qrc @@ -14,5 +14,6 @@ resource/SSJ-100.png resource/Icons/762.gif resource/SSJ-100Dark.png + resource/Icons/checked.png diff --git a/style.css b/style.css index 1bf9a25..2f87d6e 100644 --- a/style.css +++ b/style.css @@ -15,8 +15,6 @@ QComboBox color: rgb(45,84,130); } - - QPushButton { background-color: rgb(203,228,255); @@ -61,7 +59,7 @@ QLineEdit QProgressBar { border: 2px solid rgb(45,84,130); - border-radius: 12px; + border-radius: 5px; color: black; font-family: "Calibri"; font: 15px bold; @@ -71,7 +69,7 @@ QProgressBar QProgressBar::chunk { - border-radius: 10px; + border-radius: 5px; background-color: rgb(203,228,255); } @@ -147,23 +145,29 @@ QLabel#notificationLabel font: 20px; } -QPushButton#displayView +QToolButton#displayView { border: 4px solid rgb(45,84,130); border-radius: 5px; + color:rgb(45,84,130); background-color: white; } -QPushButton#displayView:checked +QToolButton#displayView:checked { background-color: rgb(151,176,201); } -QPushButton#displayView:disabled +QToolButton#displayView:disabled { background-color: rgb(151,176,201); color:rgb(45,84,130); + +} +QPushButton#checkedLabelButton +{ + background-color: rgba(0,0,0,0); } QPushButton#linkButton diff --git a/ui_mainwindow.h b/ui_mainwindow.h index 543c83d..f0562fb 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -30,9 +30,8 @@ class Ui_MainWindow { public: QWidget *centralwidget; - QWidget *layoutWidget; + QWidget *downLayout; QHBoxLayout *downlayout; - QHBoxLayout *horizontalLayout_5; QProgressBar *loadingProgressBar; QPushButton *updateButton; QPushButton *startButton; @@ -106,68 +105,66 @@ public: centralwidget->setObjectName(QString::fromUtf8("centralwidget")); centralwidget->setMinimumSize(QSize(800, 600)); centralwidget->setMaximumSize(QSize(800, 600)); - layoutWidget = new QWidget(centralwidget); - layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); - layoutWidget->setGeometry(QRect(10, 550, 551, 39)); - downlayout = new QHBoxLayout(layoutWidget); + downLayout = new QWidget(centralwidget); + downLayout->setObjectName(QString::fromUtf8("downLayout")); + downLayout->setGeometry(QRect(0, 540, 550, 50)); + sizePolicy.setHeightForWidth(downLayout->sizePolicy().hasHeightForWidth()); + downLayout->setSizePolicy(sizePolicy); + downLayout->setMinimumSize(QSize(0, 40)); + downLayout->setMaximumSize(QSize(16777215, 60)); + downlayout = new QHBoxLayout(downLayout); + downlayout->setSpacing(1); downlayout->setObjectName(QString::fromUtf8("downlayout")); - downlayout->setContentsMargins(0, 0, 0, 0); - horizontalLayout_5 = new QHBoxLayout(); - horizontalLayout_5->setSpacing(0); - horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); - loadingProgressBar = new QProgressBar(layoutWidget); + loadingProgressBar = new QProgressBar(downLayout); loadingProgressBar->setObjectName(QString::fromUtf8("loadingProgressBar")); - QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed); + QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Minimum); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); sizePolicy1.setHeightForWidth(loadingProgressBar->sizePolicy().hasHeightForWidth()); loadingProgressBar->setSizePolicy(sizePolicy1); - loadingProgressBar->setMinimumSize(QSize(0, 30)); - loadingProgressBar->setMaximumSize(QSize(16777215, 40)); + loadingProgressBar->setMinimumSize(QSize(0, 35)); + loadingProgressBar->setMaximumSize(QSize(16777215, 35)); loadingProgressBar->setValue(10); - horizontalLayout_5->addWidget(loadingProgressBar); + downlayout->addWidget(loadingProgressBar); - updateButton = new QPushButton(layoutWidget); + updateButton = new QPushButton(downLayout); updateButton->setObjectName(QString::fromUtf8("updateButton")); updateButton->setEnabled(true); - QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); - sizePolicy2.setHeightForWidth(updateButton->sizePolicy().hasHeightForWidth()); - updateButton->setSizePolicy(sizePolicy2); - updateButton->setMinimumSize(QSize(100, 30)); - updateButton->setMaximumSize(QSize(1000, 35)); + sizePolicy1.setHeightForWidth(updateButton->sizePolicy().hasHeightForWidth()); + updateButton->setSizePolicy(sizePolicy1); + updateButton->setMinimumSize(QSize(100, 35)); + updateButton->setMaximumSize(QSize(2000, 40)); QFont font; font.setFamily(QString::fromUtf8("Calibri")); font.setPointSize(8); updateButton->setFont(font); updateButton->setFlat(false); - horizontalLayout_5->addWidget(updateButton); + downlayout->addWidget(updateButton); - startButton = new QPushButton(layoutWidget); + startButton = new QPushButton(downLayout); startButton->setObjectName(QString::fromUtf8("startButton")); startButton->setEnabled(true); sizePolicy1.setHeightForWidth(startButton->sizePolicy().hasHeightForWidth()); startButton->setSizePolicy(sizePolicy1); - startButton->setMinimumSize(QSize(100, 30)); - startButton->setMaximumSize(QSize(1000, 35)); + startButton->setMinimumSize(QSize(100, 35)); + startButton->setMaximumSize(QSize(2000, 40)); - horizontalLayout_5->addWidget(startButton); - - - downlayout->addLayout(horizontalLayout_5); + downlayout->addWidget(startButton); mainFrame = new QFrame(centralwidget); mainFrame->setObjectName(QString::fromUtf8("mainFrame")); mainFrame->setEnabled(true); - mainFrame->setGeometry(QRect(10, 44, 781, 201)); + mainFrame->setGeometry(QRect(10, 44, 781, 211)); mainFrame->setFrameShape(QFrame::StyledPanel); mainFrame->setFrameShadow(QFrame::Raised); displayGroupWidget = new QWidget(mainFrame); displayGroupWidget->setObjectName(QString::fromUtf8("displayGroupWidget")); displayGroupWidget->setGeometry(QRect(0, 10, 781, 200)); + QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); sizePolicy2.setHeightForWidth(displayGroupWidget->sizePolicy().hasHeightForWidth()); displayGroupWidget->setSizePolicy(sizePolicy2); displayGroupWidget->setMinimumSize(QSize(300, 200)); @@ -183,7 +180,7 @@ public: sizePolicy3.setVerticalStretch(0); sizePolicy3.setHeightForWidth(displayChoiceTitle->sizePolicy().hasHeightForWidth()); displayChoiceTitle->setSizePolicy(sizePolicy3); - displayChoiceTitle->setMaximumSize(QSize(16777215, 30)); + displayChoiceTitle->setMaximumSize(QSize(16777215, 20)); QFont font1; font1.setPointSize(10); displayChoiceTitle->setFont(font1); @@ -211,6 +208,7 @@ public: settingsButton = new QPushButton(mainFrame); settingsButton->setObjectName(QString::fromUtf8("settingsButton")); + settingsButton->setEnabled(true); settingsButton->setGeometry(QRect(730, 0, 51, 40)); settingsButton->setMinimumSize(QSize(0, 40)); settingsButton->setIconSize(QSize(30, 30)); @@ -332,6 +330,7 @@ public: verticalLayout_3->setContentsMargins(0, 0, 0, -1); offlineNotifyLabel = new QLabel(offlineWidget); offlineNotifyLabel->setObjectName(QString::fromUtf8("offlineNotifyLabel")); + offlineNotifyLabel->setEnabled(true); sizePolicy2.setHeightForWidth(offlineNotifyLabel->sizePolicy().hasHeightForWidth()); offlineNotifyLabel->setSizePolicy(sizePolicy2); offlineNotifyLabel->setMinimumSize(QSize(0, 50)); @@ -415,7 +414,7 @@ public: debugWidget->setObjectName(QString::fromUtf8("debugWidget")); debugWidget->setGeometry(QRect(10, 500, 561, 51)); verticalLayout_5 = new QVBoxLayout(debugWidget); - verticalLayout_5->setSpacing(10); + verticalLayout_5->setSpacing(8); verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5")); verticalLayout_5->setContentsMargins(1, 1, 1, 1); autostartCheckBox = new QCheckBox(debugWidget); @@ -514,7 +513,7 @@ public: offlineStartButton = new QPushButton(centralwidget); offlineStartButton->setObjectName(QString::fromUtf8("offlineStartButton")); offlineStartButton->setEnabled(true); - offlineStartButton->setGeometry(QRect(600, 552, 190, 35)); + offlineStartButton->setGeometry(QRect(570, 552, 190, 35)); sizePolicy5.setHeightForWidth(offlineStartButton->sizePolicy().hasHeightForWidth()); offlineStartButton->setSizePolicy(sizePolicy5); offlineStartButton->setMinimumSize(QSize(150, 35)); @@ -523,7 +522,7 @@ public: offlineStartButton->setChecked(false); MainWindow->setCentralWidget(centralwidget); mainFrame->raise(); - layoutWidget->raise(); + downLayout->raise(); horizontalWidget->raise(); notificationLabel->raise(); debugWidget->raise(); @@ -563,7 +562,7 @@ public: autostartCheckBox->setText(QCoreApplication::translate("MainWindow", "\320\220\320\262\321\202\320\276\320\267\320\260\320\277\321\203\321\201\320\272", nullptr)); inlineTextDebug->setText(QString()); updateListGuideLabel->setText(QCoreApplication::translate("MainWindow", "\320\225\321\201\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217 \320\262 \320\273\320\276\320\272\320\260\320\273\321\214\320\275\321\213\321\205 \321\204\320\260\320\271\320\273\320\260\321\205", nullptr)); - updateActionListLabel->setText(QCoreApplication::translate("MainWindow", "TextLabel", nullptr)); + updateActionListLabel->setText(QString()); loadToServerButton->setText(QCoreApplication::translate("MainWindow", "\320\222\321\213\320\263\321\200\321\203\320\267\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr)); undoChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\236\321\202\320\274\320\265\320\275\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr)); startWithCurrentChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\321\202\320\270\321\202\321\214 \320\261\320\265\320\267 \320\276\321\202\320\277\321\200\320\260\320\262\320\272\320\270", nullptr));