diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index 5cc152a..285a61b 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -47,7 +47,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
setLanguageInterfase();
- connectorToServer = new ConnectorToServer(/*this*/nullptr);
+ connectorToServer = new ConnectorToServer(this);
connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult);
connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult);
connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged);
diff --git a/InstructorsAndTrainees/widgets/newversionwidget.cpp b/InstructorsAndTrainees/widgets/newversionwidget.cpp
index 1431ed4..dd5e132 100644
--- a/InstructorsAndTrainees/widgets/newversionwidget.cpp
+++ b/InstructorsAndTrainees/widgets/newversionwidget.cpp
@@ -2,12 +2,21 @@
#include "ui_newversionwidget.h"
NewVersionWidget::NewVersionWidget(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::NewVersionWidget)
+ QDialog(parent),
+ ui(new Ui::NewVersionWidget),
+ versionSelectWidget(nullptr),
+ validator(nullptr)
{
ui->setupUi(this);
- setWindowFlags(Qt::SubWindow);
- setAttribute(Qt::WA_ShowModal,true);
+
+ setMinimumSize(200, 100);
+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+ setWindowTitle(tr("New version"));
+}
+
+NewVersionWidget::~NewVersionWidget()
+{
+ delete ui;
}
void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName)
@@ -18,24 +27,18 @@ void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QStr
ui->lineEdit->setValidator(validator);
}
-
void NewVersionWidget::on_createButton_clicked()
{
if(ui->lineEdit->text() != "")
{
versionSelectWidget->sendCopyEmit(ui->lineEdit->text());
- hide();
+ close();
}
}
void NewVersionWidget::on_cancelButton_clicked()
{
- hide();
-}
-
-NewVersionWidget::~NewVersionWidget()
-{
- delete ui;
+ close();
}
void NewVersionWidget::on_lineEdit_inputRejected()
diff --git a/InstructorsAndTrainees/widgets/newversionwidget.h b/InstructorsAndTrainees/widgets/newversionwidget.h
index e1696fb..ef78f47 100644
--- a/InstructorsAndTrainees/widgets/newversionwidget.h
+++ b/InstructorsAndTrainees/widgets/newversionwidget.h
@@ -11,15 +11,18 @@ class NewVersionWidget;
}
class VersionSelectWidget;
-class NewVersionWidget : public QWidget
+
+class NewVersionWidget : public QDialog
{
Q_OBJECT
public:
- explicit NewVersionWidget(QWidget *parent = nullptr);
- void initialize(VersionSelectWidget *versionSelectWidget,QString prevName);
+ explicit NewVersionWidget(QWidget *parent = nullptr);
~NewVersionWidget();
+public:
+ void initialize(VersionSelectWidget *versionSelectWidget, QString prevName);
+
private slots:
void on_createButton_clicked();
void on_cancelButton_clicked();
@@ -31,6 +34,6 @@ private:
QRegExpValidator *validator;
};
-#endif // NEWVERSIONWIDGET_Hvoid on_lineEdit_inputRejected();
+#endif // NEWVERSIONWIDGET_H
diff --git a/InstructorsAndTrainees/widgets/newversionwidget.ui b/InstructorsAndTrainees/widgets/newversionwidget.ui
index 3957da2..8d5b17f 100644
--- a/InstructorsAndTrainees/widgets/newversionwidget.ui
+++ b/InstructorsAndTrainees/widgets/newversionwidget.ui
@@ -20,7 +20,7 @@
Create copy...
-
+
:/resources/icons/lms.png:/resources/icons/lms.png
@@ -31,229 +31,225 @@
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 0
- 0
-
-
-
- Basic version:
-
-
-
- -
-
-
-
- 150
- 30
-
-
-
- TextLabel
-
-
-
-
-
- -
-
-
- 6
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 99
- 40
-
-
-
-
- 0
- 0
-
-
-
- New name version:
-
-
-
- -
-
-
-
- 150
- 30
-
-
-
-
- 150
- 30
-
-
-
-
- 60
- 30
-
-
-
- 1000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- 6
-
-
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Minimum
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Create
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Minimum
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Cancel
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Minimum
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
+
+ -
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Basic version:
+
+
+
+ -
+
+
+
+ 150
+ 30
+
+
+
+ TextLabel
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
-
+
+
+
+ 99
+ 40
+
+
+
+
+ 0
+ 0
+
+
+
+ New name version:
+
+
+
+ -
+
+
+
+ 150
+ 30
+
+
+
+
+ 150
+ 30
+
+
+
+
+ 60
+ 30
+
+
+
+ 1000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ 6
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Create
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Cancel
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
-
+
diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp
index c36974d..cf33a5a 100644
--- a/InstructorsAndTrainees/widgets/versionselectwidget.cpp
+++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp
@@ -83,21 +83,10 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
return;
}
- NewVersionWidget *newVersionWidget = new NewVersionWidget();
+ NewVersionWidget *newVersionWidget = new NewVersionWidget(this);
newVersionWidget->initialize(this,selectedVersion->getViewName());
-
- /*
- QDialog* dialog = new QDialog(this);
- QHBoxLayout *layout = new QHBoxLayout(dialog);
- layout->addWidget(newVersionWidget);
- dialog->setWindowTitle(tr("Editor of instructors"));
- dialog->setMinimumSize(200, 100);
- dialog->setStyleSheet(this->styleSheet());
- dialog->exec();
+ newVersionWidget->exec();
delete newVersionWidget;
- */
-
- newVersionWidget->show();
}
void VersionSelectWidget::sendCopyEmit(QString newName)
diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.ui b/InstructorsAndTrainees/widgets/versionselectwidget.ui
index b657e75..93ab51c 100644
--- a/InstructorsAndTrainees/widgets/versionselectwidget.ui
+++ b/InstructorsAndTrainees/widgets/versionselectwidget.ui
@@ -20,7 +20,7 @@
Form
-
+
:/resources/icons/lms.png:/resources/icons/lms.png
@@ -204,7 +204,7 @@
-
+