Рефакт Администрирование БД 1

InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp

@@ -16,11 +16,6 @@ DialogAuthorizationInstructor::DialogAuthorizationInstructor(QWidget *parent) :
     ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password);
 
     ui->editLogin->setValidator(new QRegExpValidator(QRegExp("[A-Za-z\\d]+"), this));
-
-#ifdef PROJECT_TYPE_DEBUG
-    ui->editLogin->setText("admin");
-    ui->editPassword->setText("admin");
-#endif
 }
 
 DialogAuthorizationInstructor::~DialogAuthorizationInstructor()
@@ -28,6 +23,26 @@ DialogAuthorizationInstructor::~DialogAuthorizationInstructor()
     delete ui;
 }
 
+QString DialogAuthorizationInstructor::getLogin()
+{
+    return ui->editLogin->text();
+}
+
+void DialogAuthorizationInstructor::setLogin(QString login)
+{
+    ui->editLogin->setText(login);
+}
+
+QString DialogAuthorizationInstructor::getPassword()
+{
+    return ui->editPassword->text();
+}
+
+void DialogAuthorizationInstructor::setPassword(QString password)
+{
+    ui->editPassword->setText(password);
+}
+
 void DialogAuthorizationInstructor::on_btnLogIn_clicked()
 {
     this->accept();

InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h

@@ -2,13 +2,14 @@
 #define DIALOGAUTHORIZATIONINSTRUCTOR_H
 
 #include <QDialog>
-#include "ui_dialogauthorizationinstructor.h"
+#include "instructorsAndTrainees_global.h"
+//#include "ui_dialogauthorizationinstructor.h"
 
 namespace Ui {
 class DialogAuthorizationInstructor;
 }
 
-class DialogAuthorizationInstructor : public QDialog
+class INSTRUCTORSANDTRAINEES_EXPORT DialogAuthorizationInstructor : public QDialog
 {
     Q_OBJECT
 
@@ -17,15 +18,11 @@ public:
     ~DialogAuthorizationInstructor();
 
 public:
-    QString getLogin()
-    {
-        return ui->editLogin->text();
-    }
+    QString getLogin();
+    void setLogin(QString login);
 
-    QString getPassword()
-    {
-        return ui->editPassword->text();
-    }
+    QString getPassword();
+    void setPassword(QString password);
 
 private slots:
     void on_btnLogIn_clicked();

InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui

@@ -25,13 +25,13 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout_Main">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_LP">
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QVBoxLayout" name="verticalLayout_Labels">
          <item>
-          <widget class="QLabel" name="label_1">
+          <widget class="QLabel" name="label_Login">
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -43,7 +43,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_2">
+          <widget class="QLabel" name="label_Password">
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -57,7 +57,7 @@
         </layout>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout_Edites">
          <item>
           <widget class="QLineEdit" name="editLogin">
            <property name="font">
@@ -115,7 +115,7 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_Btn">
        <item>
         <widget class="QPushButton" name="btnLogIn">
          <property name="sizePolicy">