diff --git a/lambda.ico b/lambda.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1ac05189084c8b82bd904226b756bf0894847be5
Binary files /dev/null and b/lambda.ico differ
diff --git a/main.cpp b/main.cpp
index 6dd2a5fa0c623ec0ca99a950d4123e95d44d6e2a..7830c068b5e30001811541733326fc44314c2961 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setWindowIcon(QIcon(":/new/prefix1/lambda.ico"));
Tester w;
w.show();
return a.exec();
diff --git a/res.qrc b/res.qrc
new file mode 100644
index 0000000000000000000000000000000000000000..5bbbb72201989c5e330d5ce830edf2dbfc2d69c5
--- /dev/null
+++ b/res.qrc
@@ -0,0 +1,5 @@
+
+
+ lambda.ico
+
+
diff --git a/tester.cpp b/tester.cpp
index 37e6163cc062220b0c7d4e48fab54ec7961d1c7e..1287092dc0dd74a99c851c47d4c1247740625238 100644
--- a/tester.cpp
+++ b/tester.cpp
@@ -7,6 +7,16 @@ Tester::Tester(QWidget *parent)
, ui(new Ui::Tester)
{
ui->setupUi(this);
+ ui->textBrowser->setFontPointSize(14);
+
+ QPalette qpalette;
+ qpalette.setColor(this->backgroundRole(), QColor("#FFCCFF"));
+ this->setAutoFillBackground(true);
+ this->setPalette(qpalette);
+
+ QFont font = ui->label->font();
+ font.setPointSize(10);
+ ui->label->setFont(font);
loginWidget = new LoginWidget();
testSelectionWidget = new TestSelection();
@@ -15,7 +25,7 @@ Tester::Tester(QWidget *parent)
connect(loginWidget, &LoginWidget::onClosed, testSelectionWidget, &TestSelection::_sh);
connect(testSelectionWidget, &TestSelection::onClosed, this, &Tester::receiveTestEntity);
connect(this->ui->pushButton, &QPushButton::clicked, this, &Tester::startExecution);
-
+ connect(testSelectionWidget, &TestSelection::onClosed, this, &Tester::startExecution);
this->show();
loginWidget->show();
@@ -44,6 +54,7 @@ void Tester::receiveTestEntity()
void Tester::startExecution()
{
connect(ui->pushButton, &QPushButton::clicked, this, &Tester::getAnswerFromLineEdit);
+ connect(ui->pushButton, &QPushButton::clicked, this->ui->lineEdit, &QLineEdit::clear);
if (counter < questCount) {
QVector questVector = currentTest->getQuestions();
QuestionEntity currentQuestion = questVector[counter];
@@ -54,6 +65,8 @@ void Tester::startExecution()
this->currentTest->checkQuestions(this->currentAnswers);
int percentage = currentTest->getPercentage();
+ ui->lineEdit->hide();
+ ui->label->hide();
ui->textBrowser->setText("Тест закончен, спасибо за участие! \nВаш результат: " + QString::number(percentage));
QString date = QString::number(QDate::currentDate().year()) + "-"
@@ -69,6 +82,10 @@ void Tester::startExecution()
qDebug() << "INSERT INTO test_results VALUES ('" + currentName + "',"
+ QString::number(percentage)
+ "," + "'" + date + "'," + QString::number(currentTest->getId()) + ");";
+
+ ui->pushButton->setText("Закончить");
+ disconnect(this->ui->pushButton, &QPushButton::clicked, this, &Tester::startExecution);
+ connect(ui->pushButton, &QPushButton::clicked, this, &Tester::close);
}
}