Переименовал Диалог Авторизации

InstructorsAndTrainees/CMakeLists.txt

@@ -22,6 +22,10 @@ add_library(InstructorsAndTrainees SHARED
   specialmessagebox.h
   specialmessagebox.ui
 
+  authorization/dialogauthorization.cpp
+  authorization/dialogauthorization.h
+  authorization/dialogauthorization.ui
+
   trainees/editortrainees.cpp
   trainees/editortrainees.h
   trainees/editortrainees.ui
@@ -55,9 +59,6 @@ add_library(InstructorsAndTrainees SHARED
   instructors/dialogeditinstructor.cpp
   instructors/dialogeditinstructor.h
   instructors/dialogeditinstructor.ui
-  instructors/dialogauthorizationinstructor.cpp
-  instructors/dialogauthorizationinstructor.h
-  instructors/dialogauthorizationinstructor.ui
   instructors/instructorsview.cpp
   instructors/instructorsview.h
   instructors/dialogredactorinstructors.cpp
@@ -131,6 +132,7 @@ target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Sql)
 target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Xml)
 target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Network)
 
+target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/authorization)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/instructors)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/trainees)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tasks)

InstructorsAndTrainees/authorization/dialogauthorization.cpp

@@ -1,10 +1,10 @@
 #include <QRegExpValidator>
-#include "dialogauthorizationinstructor.h"
+#include "dialogauthorization.h"
-#include "ui_dialogauthorizationinstructor.h"
+#include "ui_dialogauthorization.h"
 
-DialogAuthorizationInstructor::DialogAuthorizationInstructor(QWidget *parent) :
+DialogAuthorization::DialogAuthorization(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::DialogAuthorizationInstructor)
+    ui(new Ui::DialogAuthorization)
 {
     ui->setupUi(this);
 
@@ -18,42 +18,42 @@ DialogAuthorizationInstructor::DialogAuthorizationInstructor(QWidget *parent) :
     ui->editLogin->setValidator(new QRegExpValidator(QRegExp("[A-Za-z\\d]+"), this));
 }
 
-DialogAuthorizationInstructor::~DialogAuthorizationInstructor()
+DialogAuthorization::~DialogAuthorization()
 {
     delete ui;
 }
 
-QString DialogAuthorizationInstructor::getLogin()
+QString DialogAuthorization::getLogin()
 {
     return ui->editLogin->text();
 }
 
-void DialogAuthorizationInstructor::setLogin(QString login)
+void DialogAuthorization::setLogin(QString login)
 {
     ui->editLogin->setText(login);
 }
 
-QString DialogAuthorizationInstructor::getPassword()
+QString DialogAuthorization::getPassword()
 {
     return ui->editPassword->text();
 }
 
-void DialogAuthorizationInstructor::setPassword(QString password)
+void DialogAuthorization::setPassword(QString password)
 {
     ui->editPassword->setText(password);
 }
 
-void DialogAuthorizationInstructor::on_btnLogIn_clicked()
+void DialogAuthorization::on_btnLogIn_clicked()
 {
     this->accept();
 }
 
-void DialogAuthorizationInstructor::on_btnViewPassword_pressed()
+void DialogAuthorization::on_btnViewPassword_pressed()
 {
     ui->editPassword->setEchoMode(QLineEdit::EchoMode::Normal);
 }
 
-void DialogAuthorizationInstructor::on_btnViewPassword_released()
+void DialogAuthorization::on_btnViewPassword_released()
 {
     ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password);
 }

InstructorsAndTrainees/authorization/dialogauthorization.h

@@ -0,0 +1,36 @@
+#ifndef DIALOGAUTHORIZATION_H
+#define DIALOGAUTHORIZATION_H
+
+#include <QDialog>
+#include "instructorsAndTrainees_global.h"
+//#include "ui_dialogauthorization.h"
+
+namespace Ui {
+class DialogAuthorization;
+}
+
+class INSTRUCTORSANDTRAINEES_EXPORT DialogAuthorization : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogAuthorization(QWidget *parent = nullptr);
+    ~DialogAuthorization();
+
+public:
+    QString getLogin();
+    void setLogin(QString login);
+
+    QString getPassword();
+    void setPassword(QString password);
+
+private slots:
+    void on_btnLogIn_clicked();
+    void on_btnViewPassword_pressed();
+    void on_btnViewPassword_released();
+
+private:
+    Ui::DialogAuthorization *ui;
+};
+
+#endif // DIALOGAUTHORIZATION_H

InstructorsAndTrainees/authorization/dialogauthorization.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DialogAuthorizationInstructor</class>
+ <class>DialogAuthorization</class>
- <widget class="QDialog" name="DialogAuthorizationInstructor">
+ <widget class="QDialog" name="DialogAuthorization">
   <property name="geometry">
    <rect>
     <x>0</x>

InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h

@@ -1,36 +0,0 @@
-#ifndef DIALOGAUTHORIZATIONINSTRUCTOR_H
-#define DIALOGAUTHORIZATIONINSTRUCTOR_H
-
-#include <QDialog>
-#include "instructorsAndTrainees_global.h"
-//#include "ui_dialogauthorizationinstructor.h"
-
-namespace Ui {
-class DialogAuthorizationInstructor;
-}
-
-class INSTRUCTORSANDTRAINEES_EXPORT DialogAuthorizationInstructor : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DialogAuthorizationInstructor(QWidget *parent = nullptr);
-    ~DialogAuthorizationInstructor();
-
-public:
-    QString getLogin();
-    void setLogin(QString login);
-
-    QString getPassword();
-    void setPassword(QString password);
-
-private slots:
-    void on_btnLogIn_clicked();
-    void on_btnViewPassword_pressed();
-    void on_btnViewPassword_released();
-
-private:
-    Ui::DialogAuthorizationInstructor *ui;
-};
-
-#endif // DIALOGAUTHORIZATIONINSTRUCTOR_H

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -2,7 +2,7 @@
 #include <QThread>
 #include "instructorsandtraineeswidget.h"
 #include "ui_instructorsandtraineeswidget.h"
-#include "dialogauthorizationinstructor.h"
+#include "dialogauthorization.h"
 #include "dialogsettings.h"
 #include "specialmessagebox.h"
 #include "hashtools.h"
@@ -299,7 +299,7 @@ void InstructorsAndTraineesWidget::slot_instructorSelected(int id_instructor)
 
 bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent)
 {
-    DialogAuthorizationInstructor dlg(parent);
+    DialogAuthorization dlg(parent);
     dlg.setWindowTitle(tr("Instructor authorization"));
     dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
     dlg.setStyleSheet(this->styleSheet());

ServerLMS/CMakeLists.txt

@@ -72,7 +72,7 @@ endif()
 target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll)
 
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees)
-target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/instructors)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/authorization)
 if(PROJECT_TYPE_DEBUG)
     target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees)
 else()

ServerLMS/dialogsettingstray.cpp

@@ -4,7 +4,7 @@
 #include "Systems/tools.h"
 #include "ui_dialogsettingstray.h"
 #include "dialogcheckdb.h"
-#include "dialogauthorizationinstructor.h"
+#include "dialogauthorization.h"
 
 DialogSettingsTray::DialogSettingsTray(ProviderDBLMS* providerDBLMS, QWidget *parent) :
     QDialog(parent),
@@ -277,7 +277,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
     QString UserNamePostgres;
     QString PasswordPostgres;
 
-    DialogAuthorizationInstructor dlg(this);
+    DialogAuthorization dlg(this);
     dlg.setWindowTitle(tr("Superuser PostgreSQL authorization"));
     dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
     dlg.setStyleSheet(this->styleSheet());

TrayServerLMS/main.cpp

@@ -6,6 +6,6 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     MainWindow w;
-    //w.show(); //По-умолчанию свернуто в трее
+    w.show(); //По-умолчанию свернуто в трее
     return a.exec();
 }