Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact0

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-26 17:47:56 +03:00
parent 1c151d4aff
commit 23d432170d
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InstructorsAndTrainees/settings/dialogsettings.cpp
View File

@@ -198,12 +198,6 @@ void DialogSettings::on_btnSave_clicked()
void DialogSettings::on_btnSetVersion_clicked() void DialogSettings::on_btnSetVersion_clicked()
{ {
/*
if(connectorToServer)
if(connectorToServer->getIsConnected())
connectorToServer->sendShowVersionSelect();
*/
if(connectorToServer) if(connectorToServer)
if(connectorToServer->getIsConnected()) if(connectorToServer->getIsConnected())
{ {

14
InstructorsAndTrainees/widgets/dialognewversion.cpp
View File

@@ -4,7 +4,6 @@
DialogNewVersion::DialogNewVersion(QWidget *parent) : DialogNewVersion::DialogNewVersion(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::DialogNewVersion), ui(new Ui::DialogNewVersion),
versionSelectWidget(nullptr),
validator(nullptr) validator(nullptr)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -22,18 +21,21 @@ DialogNewVersion::~DialogNewVersion()
delete ui; delete ui;
} }
void DialogNewVersion::initialize(VersionSelectWidget *versionSelectWidget, QString prevName) void DialogNewVersion::initialize(QString prevName)
{ {
this->versionSelectWidget = versionSelectWidget; ui->prevVerValue->setText(prevName);
ui->prevVerValue->setText(prevName); }
QString DialogNewVersion::getNewName()
{
return ui->lineEdit->text();
} }
void DialogNewVersion::on_createButton_clicked() void DialogNewVersion::on_createButton_clicked()
{ {
if(ui->lineEdit->text() != "") if(ui->lineEdit->text() != "")
{ {
versionSelectWidget->sendCopyEmit(ui->lineEdit->text()); accept();
close();
} }
} }

10
InstructorsAndTrainees/widgets/dialognewversion.h
View File

@@ -5,15 +5,12 @@
#include <QWidget> #include <QWidget>
#include <QLineEdit> #include <QLineEdit>
#include <QToolTip> #include <QToolTip>
#include <QRegExpValidator>
#include "versionselectwidget.h"
namespace Ui { namespace Ui {
class DialogNewVersion; class DialogNewVersion;
} }
class VersionSelectWidget;
class DialogNewVersion : public QDialog class DialogNewVersion : public QDialog
{ {
Q_OBJECT Q_OBJECT
@@ -23,16 +20,17 @@ public:
~DialogNewVersion(); ~DialogNewVersion();
public: public:
void initialize(VersionSelectWidget *versionSelectWidget, QString prevName); void initialize(QString prevName);
QString getNewName();
private slots: private slots:
void on_createButton_clicked(); void on_createButton_clicked();
void on_cancelButton_clicked(); void on_cancelButton_clicked();
void on_lineEdit_inputRejected(); void on_lineEdit_inputRejected();
private: private:
Ui::DialogNewVersion *ui; Ui::DialogNewVersion *ui;
VersionSelectWidget *versionSelectWidget;
QRegExpValidator *validator; QRegExpValidator *validator;
}; };

18
InstructorsAndTrainees/widgets/versionselectwidget.cpp
View File

@@ -120,8 +120,22 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
} }
DialogNewVersion *dlgNewVersion = new DialogNewVersion(this); DialogNewVersion *dlgNewVersion = new DialogNewVersion(this);
dlgNewVersion->initialize(this, selectedVersion->getViewName()); dlgNewVersion->initialize(selectedVersion->getViewName());
dlgNewVersion->exec();
switch(dlgNewVersion->exec())
{
case QDialog::Accepted:
{
QString newName = dlgNewVersion->getNewName();
sendCopyEmit(newName);
break;
}
case QDialog::Rejected:
break;
default:
break;
}
delete dlgNewVersion; delete dlgNewVersion;
} }