From da7363dfb58f76bb2a489b81038f78cbb4f1c002 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 6 Nov 2025 17:19:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=94=D0=B8=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=20=D0=90=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/CMakeLists.txt | 8 +++-- .../dialogauthorization.cpp} | 24 ++++++------- .../authorization/dialogauthorization.h | 36 +++++++++++++++++++ .../dialogauthorization.ui} | 4 +-- .../dialogauthorizationinstructor.h | 36 ------------------- .../instructorsandtraineeswidget.cpp | 4 +-- ServerLMS/CMakeLists.txt | 2 +- ServerLMS/dialogsettingstray.cpp | 4 +-- TrayServerLMS/main.cpp | 2 +- 9 files changed, 61 insertions(+), 59 deletions(-) rename InstructorsAndTrainees/{instructors/dialogauthorizationinstructor.cpp => authorization/dialogauthorization.cpp} (52%) create mode 100644 InstructorsAndTrainees/authorization/dialogauthorization.h rename InstructorsAndTrainees/{instructors/dialogauthorizationinstructor.ui => authorization/dialogauthorization.ui} (97%) delete mode 100644 InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 6c951b7..161ff10 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/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) diff --git a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp b/InstructorsAndTrainees/authorization/dialogauthorization.cpp similarity index 52% rename from InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp rename to InstructorsAndTrainees/authorization/dialogauthorization.cpp index 8aa33ee..746c1d3 100644 --- a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp +++ b/InstructorsAndTrainees/authorization/dialogauthorization.cpp @@ -1,10 +1,10 @@ #include -#include "dialogauthorizationinstructor.h" -#include "ui_dialogauthorizationinstructor.h" +#include "dialogauthorization.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); } diff --git a/InstructorsAndTrainees/authorization/dialogauthorization.h b/InstructorsAndTrainees/authorization/dialogauthorization.h new file mode 100644 index 0000000..a45b3ae --- /dev/null +++ b/InstructorsAndTrainees/authorization/dialogauthorization.h @@ -0,0 +1,36 @@ +#ifndef DIALOGAUTHORIZATION_H +#define DIALOGAUTHORIZATION_H + +#include +#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 diff --git a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui b/InstructorsAndTrainees/authorization/dialogauthorization.ui similarity index 97% rename from InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui rename to InstructorsAndTrainees/authorization/dialogauthorization.ui index 44063b0..5cd887b 100644 --- a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui +++ b/InstructorsAndTrainees/authorization/dialogauthorization.ui @@ -1,7 +1,7 @@ - DialogAuthorizationInstructor - + DialogAuthorization + 0 diff --git a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h deleted file mode 100644 index 271d926..0000000 --- a/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef DIALOGAUTHORIZATIONINSTRUCTOR_H -#define DIALOGAUTHORIZATIONINSTRUCTOR_H - -#include -#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 diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 3eb210d..a4cd3d7 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -2,7 +2,7 @@ #include #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()); diff --git a/ServerLMS/CMakeLists.txt b/ServerLMS/CMakeLists.txt index 64fe27a..fd2b7c0 100644 --- a/ServerLMS/CMakeLists.txt +++ b/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() diff --git a/ServerLMS/dialogsettingstray.cpp b/ServerLMS/dialogsettingstray.cpp index c492ab9..a4097d0 100644 --- a/ServerLMS/dialogsettingstray.cpp +++ b/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()); diff --git a/TrayServerLMS/main.cpp b/TrayServerLMS/main.cpp index f373c53..00c3910 100644 --- a/TrayServerLMS/main.cpp +++ b/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(); }