diff --git a/Core/dataparser.cpp b/Core/dataparser.cpp index 0724fe5..8878422 100644 --- a/Core/dataparser.cpp +++ b/Core/dataparser.cpp @@ -120,6 +120,26 @@ void DataParser::createAuthData(ServerAuthorization *serverAuth) } +void DataParser::createAuthDataOffline(QString username, QString pass) +{ + QFile file(authTempName); + file.open(QIODevice::WriteOnly); + + QXmlStreamWriter xmlWriter(&file); + + xmlWriter.setAutoFormatting(true); + xmlWriter.writeStartDocument(); + xmlWriter.writeStartElement("AuthData"); + xmlWriter.writeAttribute("Login",username); + xmlWriter.writeAttribute("Password",pass); + xmlWriter.writeAttribute("InstructorName","empty"); + xmlWriter.writeAttribute("ClientName","Offline"); + xmlWriter.writeAttribute("AccessType","Offline"); + + xmlWriter.writeEndElement(); + file.close(); +} + QByteArray DataParser::xmlAnswer_notify(QString code) { diff --git a/Core/dataparser.h b/Core/dataparser.h index 7cf7f83..a26c51a 100644 --- a/Core/dataparser.h +++ b/Core/dataparser.h @@ -22,6 +22,7 @@ public: void createFileDataList(QList fileDataList,QString filename); void createAuthMessage(ClientAutorization *auth); void createAuthData(ServerAuthorization *serverAuth); + void createAuthDataOffline(QString username,QString pass); void addRunData(QList displays); QByteArray xmlAnswer_notify(QString code); QByteArray xmlAnswer(QList listTag, QString elemUp1 = "", QString elemUp2 = ""); diff --git a/StaticData/authData.xml b/StaticData/authData.xml index 581514f..ea8ab45 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 c3733ad..a04c867 100644 --- a/StaticData/clientHash.xml +++ b/StaticData/clientHash.xml @@ -28,6 +28,7 @@ + diff --git a/StaticData/displayData.xml b/StaticData/displayData.xml index 8c39788..683c0da 100644 --- a/StaticData/displayData.xml +++ b/StaticData/displayData.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/StaticData/streamingHash.xml b/StaticData/streamingHash.xml index 808f6e3..6bb9b90 100644 --- a/StaticData/streamingHash.xml +++ b/StaticData/streamingHash.xml @@ -5,13 +5,4 @@ - - - - - - - - - diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 58d6fb4..d9497e7 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/dataparser.o b/debug/dataparser.o index 3f0abcf..fe13546 100644 Binary files a/debug/dataparser.o and b/debug/dataparser.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 64c2bac..d06f22f 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_dataparser.o b/debug/moc_dataparser.o index 6b28ae3..a293ffd 100644 Binary files a/debug/moc_dataparser.o and b/debug/moc_dataparser.o differ diff --git a/debug/moc_mainwindow.cpp b/debug/moc_mainwindow.cpp index 9dbe71e..3802c70 100644 --- a/debug/moc_mainwindow.cpp +++ b/debug/moc_mainwindow.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[40]; - char stringdata0[726]; + QByteArrayData data[41]; + char stringdata0[756]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -72,7 +72,8 @@ QT_MOC_LITERAL(35, 599, 4), // "link" QT_MOC_LITERAL(36, 604, 29), // "on_loadToServerButton_clicked" QT_MOC_LITERAL(37, 634, 28), // "on_undoChangesButton_clicked" QT_MOC_LITERAL(38, 663, 40), // "on_startWithCurrentChangesBut..." -QT_MOC_LITERAL(39, 704, 21) // "on_exitButton_clicked" +QT_MOC_LITERAL(39, 704, 21), // "on_exitButton_clicked" +QT_MOC_LITERAL(40, 726, 29) // "on_offlineStartButton_clicked" }, "MainWindow\0sigInitializeClient\0\0" @@ -95,7 +96,8 @@ QT_MOC_LITERAL(39, 704, 21) // "on_exitButton_clicked" "link\0on_loadToServerButton_clicked\0" "on_undoChangesButton_clicked\0" "on_startWithCurrentChangesButton_clicked\0" - "on_exitButton_clicked" + "on_exitButton_clicked\0" + "on_offlineStartButton_clicked" }; #undef QT_MOC_LITERAL @@ -105,7 +107,7 @@ static const uint qt_meta_data_MainWindow[] = { 8, // revision 0, // classname 0, 0, // classinfo - 22, 14, // methods + 23, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -113,30 +115,31 @@ static const uint qt_meta_data_MainWindow[] = { 7, // signalCount // signals: name, argc, parameters, tag, flags - 1, 4, 124, 2, 0x06 /* Public */, - 11, 1, 133, 2, 0x06 /* Public */, - 14, 2, 136, 2, 0x06 /* Public */, - 17, 0, 141, 2, 0x06 /* Public */, - 18, 1, 142, 2, 0x06 /* Public */, - 20, 0, 145, 2, 0x06 /* Public */, - 21, 0, 146, 2, 0x06 /* Public */, + 1, 4, 129, 2, 0x06 /* Public */, + 11, 1, 138, 2, 0x06 /* Public */, + 14, 2, 141, 2, 0x06 /* Public */, + 17, 0, 146, 2, 0x06 /* Public */, + 18, 1, 147, 2, 0x06 /* Public */, + 20, 0, 150, 2, 0x06 /* Public */, + 21, 0, 151, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 22, 0, 147, 2, 0x08 /* Private */, - 23, 0, 148, 2, 0x08 /* Private */, - 24, 0, 149, 2, 0x08 /* Private */, - 25, 0, 150, 2, 0x08 /* Private */, - 26, 0, 151, 2, 0x08 /* Private */, - 27, 0, 152, 2, 0x08 /* Private */, - 28, 1, 153, 2, 0x08 /* Private */, - 30, 0, 156, 2, 0x08 /* Private */, - 31, 1, 157, 2, 0x08 /* Private */, - 33, 0, 160, 2, 0x08 /* Private */, - 34, 1, 161, 2, 0x08 /* Private */, - 36, 0, 164, 2, 0x08 /* Private */, - 37, 0, 165, 2, 0x08 /* Private */, - 38, 0, 166, 2, 0x08 /* Private */, - 39, 0, 167, 2, 0x08 /* Private */, + 22, 0, 152, 2, 0x08 /* Private */, + 23, 0, 153, 2, 0x08 /* Private */, + 24, 0, 154, 2, 0x08 /* Private */, + 25, 0, 155, 2, 0x08 /* Private */, + 26, 0, 156, 2, 0x08 /* Private */, + 27, 0, 157, 2, 0x08 /* Private */, + 28, 1, 158, 2, 0x08 /* Private */, + 30, 0, 161, 2, 0x08 /* Private */, + 31, 1, 162, 2, 0x08 /* Private */, + 33, 0, 165, 2, 0x08 /* Private */, + 34, 1, 166, 2, 0x08 /* Private */, + 36, 0, 169, 2, 0x08 /* Private */, + 37, 0, 170, 2, 0x08 /* Private */, + 38, 0, 171, 2, 0x08 /* Private */, + 39, 0, 172, 2, 0x08 /* Private */, + 40, 0, 173, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 0x80000000 | 9, 4, 6, 8, 10, @@ -162,6 +165,7 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -196,6 +200,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 19: _t->on_undoChangesButton_clicked(); break; case 20: _t->on_startWithCurrentChangesButton_clicked(); break; case 21: _t->on_exitButton_clicked(); break; + case 22: _t->on_offlineStartButton_clicked(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -305,13 +310,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 22) + if (_id < 23) qt_static_metacall(this, _c, _id, _a); - _id -= 22; + _id -= 23; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 22) + if (_id < 23) qt_static_metacall(this, _c, _id, _a); - _id -= 22; + _id -= 23; } return _id; } diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index b6c2b86..e2f000c 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/qrc_resources.cpp b/debug/qrc_resources.cpp index b12b3c5..f3efdbc 100644 --- a/debug/qrc_resources.cpp +++ b/debug/qrc_resources.cpp @@ -8,49 +8,50 @@ static const unsigned char qt_resource_data[] = { // E:/Projects/QT/GUIProj/RRJClient/RRJClient/style.css - 0x0,0x0,0x2,0x87, + 0x0,0x0,0x2,0x99, 0x0, - 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, + 0x0,0xb,0x56,0x78,0x9c,0xd5,0x56,0x5b,0x6f,0xda,0x30,0x18,0x7d,0x47,0xe2,0x3f, + 0x58,0xe5,0x85,0x4a,0xa1,0x24,0x1,0x5a,0x94,0xbe,0xd1,0x4e,0xbb,0xa8,0x4c,0x43, + 0x45,0xeb,0xb3,0x13,0x9b,0xe4,0x13,0xc6,0x46,0xb6,0x23,0x40,0xd3,0xfe,0xfb,0x4c, + 0x12,0x32,0x72,0x81,0x86,0x8e,0x97,0x11,0x89,0x44,0x89,0x7d,0xce,0xf9,0xee,0x6e, + 0xb7,0x66,0x53,0xc,0xfc,0xd,0x38,0x11,0x9b,0x76,0xeb,0x57,0xbb,0x85,0xcc,0xcf, + 0xc7,0xc1,0x32,0x94,0x22,0xe6,0xa4,0x7,0x2b,0x1c,0x52,0xf,0xc5,0x92,0x75,0xbd, + 0xbe,0xa4,0x4a,0xc4,0x32,0xa0,0xfd,0xd7,0xd7,0x6f,0x3d,0xc7,0xb6,0x9f,0xb1,0x5c, + 0xde,0xad,0x79,0x78,0xfb,0x58,0xd9,0xb7,0x16,0xa,0x34,0x8,0xee,0xa1,0x80,0x72, + 0x4d,0xa5,0x59,0xf1,0xbb,0xdd,0x6a,0xb7,0x66,0x4f,0x62,0xe5,0x8b,0x89,0xd8,0xd6, + 0x91,0x5,0x82,0x9,0xe9,0x21,0x19,0xfa,0x5d,0xd7,0x1e,0x58,0xae,0x3b,0xb6,0xdc, + 0xd1,0x28,0x47,0x17,0x92,0x50,0xd9,0x53,0x7a,0xc7,0x8c,0x22,0x11,0x6b,0x45,0x75, + 0xf1,0x93,0xc4,0x4,0x62,0xe5,0xa1,0xc1,0x7a,0x9b,0x7d,0x58,0x8,0xae,0x7b,0xb, + 0xbc,0x2,0xb6,0xf3,0xd0,0xcd,0x13,0x66,0xe0,0x4b,0xb8,0x39,0xfa,0xe8,0x21,0xe7, + 0x3e,0x5f,0x7d,0xc4,0x3f,0x1c,0x59,0xe3,0xa1,0xe5,0xc,0xec,0xdb,0x5c,0xf9,0x8f, + 0x58,0x45,0x93,0x58,0x6b,0xc1,0xff,0x67,0xed,0x1e,0x1,0x85,0x7d,0x46,0xc9,0x19, + 0x23,0x18,0x84,0x91,0xfe,0x2c,0xf1,0xae,0x88,0x1d,0x9a,0x37,0x7,0xc0,0x29,0x55, + 0xca,0x64,0xc6,0xf9,0x40,0x6e,0x22,0xd0,0xf4,0xb1,0xba,0x5,0xcd,0x5e,0xb0,0x4f, + 0x59,0xbe,0xb3,0x81,0xa5,0xae,0x5d,0xb6,0xd4,0x67,0x86,0xaf,0x16,0xbc,0x2e,0x50, + 0x45,0x27,0xbb,0x39,0xd8,0x1a,0x13,0x2,0x3c,0xf4,0x90,0x7d,0xe7,0xd2,0x55,0xfe, + 0x3f,0x38,0x3c,0x67,0xcb,0x56,0xc0,0x7b,0x1b,0x20,0x3a,0xf2,0xd0,0x43,0xaa,0x24, + 0xa5,0x7d,0x1,0x4e,0x3f,0x11,0xd0,0x65,0xa2,0xc6,0x81,0xce,0xc2,0x23,0x45,0x68, + 0x8a,0x4b,0x4d,0xb0,0x2c,0x21,0x25,0x5a,0x91,0x12,0xc,0x48,0x35,0xb6,0x35,0xa8, + 0xa3,0x53,0x6e,0x6a,0x9a,0x51,0x6,0xc0,0x60,0x32,0x92,0xbd,0xd5,0x74,0xab,0x7b, + 0x66,0x61,0x58,0xa9,0xe4,0xa2,0x6c,0xcf,0xb,0xa2,0x98,0x2f,0x4f,0x39,0xfc,0xaf, + 0xac,0x46,0x25,0x93,0xb5,0x8a,0x88,0x6,0xcb,0xe3,0xc,0x3b,0xd6,0x7f,0x42,0xfe, + 0xb8,0x6c,0x7f,0x31,0x7,0xdf,0x80,0x84,0x54,0x77,0x20,0x10,0x3c,0x7d,0x2c,0xb, + 0xae,0xef,0x77,0x5f,0xcd,0x7a,0xd5,0x5f,0x33,0xcc,0x69,0xd2,0xef,0x90,0x9d,0x5d, + 0x4a,0x4b,0xaa,0x83,0xe8,0x70,0x3f,0x24,0xd5,0xa9,0xe6,0x77,0x85,0xb4,0x2f,0xda, + 0x93,0x0,0x76,0x80,0x33,0x93,0x87,0x73,0x13,0xaa,0x67,0xea,0xc7,0xe1,0x25,0x4, + 0x99,0xc3,0xa,0xde,0x89,0x28,0x36,0xae,0x28,0xfb,0xa7,0x1c,0xb7,0x2b,0x75,0xba, + 0x2,0x73,0xbc,0x26,0x58,0xd3,0xf7,0x98,0xf7,0x19,0x83,0x8f,0xb9,0x3f,0xc6,0xef, + 0xd8,0x15,0x1,0xe8,0xe3,0xa,0xec,0x72,0x45,0x5e,0x43,0xc1,0x55,0x1a,0x65,0xfd, + 0x48,0x98,0xee,0xcc,0xd0,0xff,0x92,0x44,0x3a,0xb,0xf8,0xc5,0x54,0xd5,0x62,0x3b, + 0x31,0x7d,0xd2,0x2c,0x35,0xd5,0x13,0xc6,0xa6,0xba,0xe6,0xa0,0x19,0x6d,0xc6,0x73, + 0x26,0xe7,0xbf,0xb,0xd,0xb,0x8,0xf0,0xbe,0xce,0x2e,0x50,0x5e,0x3b,0x3c,0x52, + 0x44,0x7e,0x16,0x31,0xf7,0x6c,0xba,0x65,0x2e,0x4,0x4b,0x67,0x4c,0xc7,0xc,0x54, + 0xd3,0x19,0x76,0x3f,0x81,0x6e,0x2a,0xcd,0x7b,0xf8,0x4f,0xcd,0xbb,0x7e,0xcf,0x3b, + 0x63,0xb6,0x5e,0x99,0x69,0xcf,0xa6,0x99,0x9e,0x9d,0xfa,0x7b,0x36,0x67,0xe4,0x58, + 0xce,0xc3,0xbd,0x49,0x67,0x27,0xf,0xdf,0x69,0xcc,0x6,0x47,0x89,0x1a,0xd0,0x33, + 0xf6,0x25,0x8c,0x47,0xf3,0xbb,0x93,0xa9,0x4e,0xc2,0xd1,0xe4,0xec,0x85,0xbb,0xb6, + 0x95,0x5c,0x75,0x47,0x9f,0x8e,0xe9,0x92,0xcb,0x8b,0x51,0x1a,0xa6,0x94,0xcf,0xe2, + 0x3c,0x6,0x7f,0x0,0xd4,0x31,0x46,0xce, // E:/Projects/QT/GUIProj/RRJClient/RRJClient/resource/SSJ-100.png 0x0,0xc,0x7c,0xaa, 0x89, @@ -131983,7 +131984,7 @@ 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,0x52,0xc9,0xf,0xc1, +0x0,0x0,0x1,0x92,0x56,0x7e,0x8f,0xe2, // :/resource 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -131994,43 +131995,43 @@ static const unsigned char qt_resource_struct[] = { 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,0x39, + 0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xc,0x7f,0x4b, 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,0x8b, + 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x9d, 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,0xb8, + 0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xc3,0xca, 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,0x2,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x20,0x21,0x37, 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,0xb1, + 0x0,0x0,0x1,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x77,0xc3, 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,0xca, + 0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xee,0xdc, 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,0x17, + 0x0,0x0,0x1,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xf3,0x29, 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,0x3c, + 0x0,0x0,0x1,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x61,0x4e, 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,0xe9, + 0x0,0x0,0x1,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xbd,0xfb, 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,0xc6, + 0x0,0x0,0x1,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x3a,0xd8, 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,0x96, + 0x0,0x0,0x0,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x16,0xf1,0xa8, 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,0xca, + 0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0xe2,0xdc, 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,0xa, + 0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0x5b,0x1c, 0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc, }; diff --git a/debug/qrc_resources.o b/debug/qrc_resources.o index ee6cae0..4f9abcb 100644 Binary files a/debug/qrc_resources.o and b/debug/qrc_resources.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index e73fa0b..e01f11f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -476,6 +476,14 @@ void MainWindow::on_updateListGuideLabel_linkActivated(const QString &link) updateWidget->show(); } +void MainWindow::on_offlineStartButton_clicked() +{ + QString username = "offlineUser"; + QString password = "000000"; + + dataParser->createAuthDataOffline(username,password); + on_startButton_clicked(); +} void MainWindow::on_exitButton_clicked() { @@ -607,3 +615,4 @@ MainWindow::~MainWindow() + diff --git a/mainwindow.h b/mainwindow.h index adaf2df..6e485a6 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -70,6 +70,8 @@ private slots: void on_exitButton_clicked(); + void on_offlineStartButton_clicked(); + private: Ui::MainWindow *ui; MyWinHeader *header; diff --git a/mainwindow.ui b/mainwindow.ui index d2613b6..4602595 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -48,7 +48,7 @@ 0 - 540 + 541 550 50 @@ -804,13 +804,13 @@ - 8 + 6 1 - 1 + 6 1 @@ -823,6 +823,18 @@ true + + + 0 + 0 + + + + + 0 + 20 + + Автозапуск diff --git a/style.css b/style.css index 2f87d6e..73e340a 100644 --- a/style.css +++ b/style.css @@ -76,7 +76,7 @@ QProgressBar::chunk QCheckBox { font-family:"Calibri"; - font: 16px; + font: 18px; color: white; } @@ -93,6 +93,12 @@ QLabel color: white; } +QLabel#inlineTextDebug +{ + font-family: "Calibri"; + font: 18px; +} + QWidget#headerWidget { background-color:rgb(203,228,255); @@ -175,6 +181,5 @@ QPushButton#linkButton background-color: rgba(0,0,0,0); font-family: "Calibri"; color:blue; - } diff --git a/ui_mainwindow.h b/ui_mainwindow.h index f0562fb..58cbc93 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -107,7 +107,7 @@ public: centralwidget->setMaximumSize(QSize(800, 600)); downLayout = new QWidget(centralwidget); downLayout->setObjectName(QString::fromUtf8("downLayout")); - downLayout->setGeometry(QRect(0, 540, 550, 50)); + downLayout->setGeometry(QRect(0, 541, 550, 50)); sizePolicy.setHeightForWidth(downLayout->sizePolicy().hasHeightForWidth()); downLayout->setSizePolicy(sizePolicy); downLayout->setMinimumSize(QSize(0, 40)); @@ -414,12 +414,15 @@ public: debugWidget->setObjectName(QString::fromUtf8("debugWidget")); debugWidget->setGeometry(QRect(10, 500, 561, 51)); verticalLayout_5 = new QVBoxLayout(debugWidget); - verticalLayout_5->setSpacing(8); + verticalLayout_5->setSpacing(6); verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5")); - verticalLayout_5->setContentsMargins(1, 1, 1, 1); + verticalLayout_5->setContentsMargins(1, 6, 1, 1); autostartCheckBox = new QCheckBox(debugWidget); autostartCheckBox->setObjectName(QString::fromUtf8("autostartCheckBox")); autostartCheckBox->setEnabled(true); + sizePolicy3.setHeightForWidth(autostartCheckBox->sizePolicy().hasHeightForWidth()); + autostartCheckBox->setSizePolicy(sizePolicy3); + autostartCheckBox->setMinimumSize(QSize(0, 20)); autostartCheckBox->setChecked(false); verticalLayout_5->addWidget(autostartCheckBox);