NewVersionWidget -> Dialog

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);

InstructorsAndTrainees/widgets/newversionwidget.cpp

@@ -2,12 +2,21 @@
 #include "ui_newversionwidget.h"
 
 NewVersionWidget::NewVersionWidget(QWidget *parent) :
-    QWidget(parent),
+    QDialog(parent),
-    ui(new Ui::NewVersionWidget)
+    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();
+    close();
-}
-
-NewVersionWidget::~NewVersionWidget()
-{
-    delete ui;
 }
 
 void NewVersionWidget::on_lineEdit_inputRejected()

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);
     ~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
 
 

InstructorsAndTrainees/widgets/newversionwidget.ui

@@ -20,7 +20,7 @@
    <string>Create copy...</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources.qrc">
+   <iconset resource="../InstructorsAndTrainees.qrc">
     <normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
   </property>
   <property name="autoFillBackground">
@@ -31,23 +31,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QFrame" name="NewVerBackground">
+    <layout class="QVBoxLayout" name="verticalLayout_Main">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="baseVerLayout">
        <property name="leftMargin">
@@ -166,6 +150,19 @@
        </item>
       </layout>
      </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <property name="bottomMargin">
@@ -248,12 +245,11 @@
       </layout>
      </item>
     </layout>
-    </widget>
    </item>
   </layout>
  </widget>
  <resources>
-  <include location="../resources.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>

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());
-
+    newVersionWidget->exec();
-    /*
-    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();
     delete newVersionWidget;
-    */
-
-    newVersionWidget->show();
 }
 
 void VersionSelectWidget::sendCopyEmit(QString newName)

InstructorsAndTrainees/widgets/versionselectwidget.ui

@@ -20,7 +20,7 @@
    <string>Form</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources.qrc">
+   <iconset resource="../InstructorsAndTrainees.qrc">
     <normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
   </property>
   <property name="autoFillBackground">
@@ -204,7 +204,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../resources.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>