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

NewVersionWidget -> Dialog

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-25 17:51:12 +03:00
parent c627bc73d9
commit 173c369cc5
6 changed files with 243 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -47,7 +47,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
setLanguageInterfase(); setLanguageInterfase();
connectorToServer = new ConnectorToServer(/*this*/nullptr); connectorToServer = new ConnectorToServer(this);
connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult); connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult);
connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult); connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult);
connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged); connect(connectorToServer,&ConnectorToServer::signal_AnswerDocsChanged,this, &InstructorsAndTraineesWidget::slot_AnswerDocsChanged);

27
InstructorsAndTrainees/widgets/newversionwidget.cpp
View File

@@ -2,12 +2,21 @@
#include "ui_newversionwidget.h" #include "ui_newversionwidget.h"
NewVersionWidget::NewVersionWidget(QWidget *parent) : NewVersionWidget::NewVersionWidget(QWidget *parent) :
QWidget(parent), QDialog(parent),
ui(new Ui::NewVersionWidget) ui(new Ui::NewVersionWidget),
versionSelectWidget(nullptr),
validator(nullptr)
{ {
ui->setupUi(this); 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) void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName)
@@ -18,24 +27,18 @@ void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QStr
ui->lineEdit->setValidator(validator); ui->lineEdit->setValidator(validator);
} }
void NewVersionWidget::on_createButton_clicked() void NewVersionWidget::on_createButton_clicked()
{ {
if(ui->lineEdit->text() != "") if(ui->lineEdit->text() != "")
{ {
versionSelectWidget->sendCopyEmit(ui->lineEdit->text()); versionSelectWidget->sendCopyEmit(ui->lineEdit->text());
hide(); close();
} }
} }
void NewVersionWidget::on_cancelButton_clicked() void NewVersionWidget::on_cancelButton_clicked()
{ {
hide(); close();
}
NewVersionWidget::~NewVersionWidget()
{
delete ui;
} }
void NewVersionWidget::on_lineEdit_inputRejected() void NewVersionWidget::on_lineEdit_inputRejected()

9
InstructorsAndTrainees/widgets/newversionwidget.h
View File

@@ -11,15 +11,18 @@ class NewVersionWidget;
} }
class VersionSelectWidget; class VersionSelectWidget;
class NewVersionWidget : public QWidget
class NewVersionWidget : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit NewVersionWidget(QWidget *parent = nullptr); explicit NewVersionWidget(QWidget *parent = nullptr);
void initialize(VersionSelectWidget *versionSelectWidget,QString prevName);
~NewVersionWidget(); ~NewVersionWidget();
public:
void initialize(VersionSelectWidget *versionSelectWidget, QString prevName);
private slots: private slots:
void on_createButton_clicked(); void on_createButton_clicked();
void on_cancelButton_clicked(); void on_cancelButton_clicked();
@@ -31,6 +34,6 @@ private:
QRegExpValidator *validator; QRegExpValidator *validator;
}; };
#endif // NEWVERSIONWIDGET_Hvoid on_lineEdit_inputRejected(); #endif // NEWVERSIONWIDGET_H

436
InstructorsAndTrainees/widgets/newversionwidget.ui
View File

@@ -20,7 +20,7 @@
<string>Create copy...</string> <string>Create copy...</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../resources.qrc"> <iconset resource="../InstructorsAndTrainees.qrc">
<normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset> <normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
@@ -31,229 +31,225 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QFrame" name="NewVerBackground"> <layout class="QVBoxLayout" name="verticalLayout_Main">
<property name="enabled"> <item>
<bool>true</bool> <layout class="QHBoxLayout" name="baseVerLayout">
</property> <property name="leftMargin">
<property name="sizePolicy"> <number>5</number>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="topMargin">
<verstretch>0</verstretch> <number>5</number>
</sizepolicy> </property>
</property> <property name="rightMargin">
<property name="frameShape"> <number>5</number>
<enum>QFrame::StyledPanel</enum> </property>
</property> <property name="bottomMargin">
<property name="frameShadow"> <number>5</number>
<enum>QFrame::Raised</enum> </property>
</property> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QLabel" name="prevVerTitle">
<item> <property name="sizePolicy">
<layout class="QHBoxLayout" name="baseVerLayout"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="leftMargin"> <horstretch>0</horstretch>
<number>5</number> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="topMargin"> </property>
<number>5</number> <property name="text">
</property> <string>Basic version:</string>
<property name="rightMargin"> </property>
<number>5</number> </widget>
</property> </item>
<property name="bottomMargin"> <item>
<number>5</number> <widget class="QLabel" name="prevVerValue">
</property> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<widget class="QLabel" name="prevVerTitle"> <horstretch>150</horstretch>
<property name="sizePolicy"> <verstretch>30</verstretch>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>TextLabel</string>
</property> </property>
<property name="text"> </widget>
<string>Basic version:</string> </item>
</property> </layout>
</widget> </item>
</item> <item>
<item> <layout class="QHBoxLayout" name="newNameLayout">
<widget class="QLabel" name="prevVerValue"> <property name="spacing">
<property name="sizePolicy"> <number>6</number>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>150</horstretch> <property name="leftMargin">
<verstretch>30</verstretch> <number>5</number>
</sizepolicy> </property>
</property> <property name="topMargin">
<property name="text"> <number>5</number>
<string>TextLabel</string> </property>
</property> <property name="rightMargin">
</widget> <number>5</number>
</item> </property>
</layout> <property name="bottomMargin">
</item> <number>5</number>
<item> </property>
<layout class="QHBoxLayout" name="newNameLayout"> <item>
<property name="spacing"> <widget class="QLabel" name="newNameVersionTitle">
<number>6</number> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="leftMargin"> <horstretch>99</horstretch>
<number>5</number> <verstretch>40</verstretch>
</property> </sizepolicy>
<property name="topMargin"> </property>
<number>5</number> <property name="minimumSize">
</property> <size>
<property name="rightMargin"> <width>0</width>
<number>5</number> <height>0</height>
</property> </size>
<property name="bottomMargin"> </property>
<number>5</number> <property name="text">
</property> <string>New name version:</string>
<item> </property>
<widget class="QLabel" name="newNameVersionTitle"> </widget>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <item>
<horstretch>99</horstretch> <widget class="QLineEdit" name="lineEdit">
<verstretch>40</verstretch> <property name="sizePolicy">
</sizepolicy> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</property> <horstretch>150</horstretch>
<property name="minimumSize"> <verstretch>30</verstretch>
<size> </sizepolicy>
<width>0</width> </property>
<height>0</height> <property name="minimumSize">
</size> <size>
</property> <width>150</width>
<property name="text"> <height>30</height>
<string>New name version:</string> </size>
</property> </property>
</widget> <property name="maximumSize">
</item> <size>
<item> <width>60</width>
<widget class="QLineEdit" name="lineEdit"> <height>30</height>
<property name="sizePolicy"> </size>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>150</horstretch> <property name="toolTipDuration">
<verstretch>30</verstretch> <number>1000</number>
</sizepolicy> </property>
</property> </widget>
<property name="minimumSize"> </item>
<size> <item>
<width>150</width> <spacer name="horizontalSpacer_4">
<height>30</height> <property name="orientation">
</size> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="maximumSize"> <property name="sizeHint" stdset="0">
<size> <size>
<width>60</width> <width>40</width>
<height>30</height> <height>20</height>
</size> </size>
</property> </property>
<property name="toolTipDuration"> </spacer>
<number>1000</number> </item>
</property> </layout>
</widget> </item>
</item> <item>
<item> <spacer name="verticalSpacer">
<spacer name="horizontalSpacer_4"> <property name="orientation">
<property name="orientation"> <enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" stdset="0"> <size>
<size> <width>20</width>
<width>40</width> <height>40</height>
<height>20</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> <item>
</layout> <layout class="QHBoxLayout" name="horizontalLayout">
</item> <property name="bottomMargin">
<item> <number>6</number>
<layout class="QHBoxLayout" name="horizontalLayout"> </property>
<property name="bottomMargin"> <item>
<number>6</number> <spacer name="horizontalSpacer">
</property> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="sizeType">
<enum>Qt::Horizontal</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeType"> <property name="sizeHint" stdset="0">
<enum>QSizePolicy::Minimum</enum> <size>
</property> <width>40</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>40</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> <item>
</spacer> <widget class="QPushButton" name="createButton">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<widget class="QPushButton" name="createButton"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>Create</string>
</property> </property>
<property name="text"> </widget>
<string>Create</string> </item>
</property> <item>
</widget> <spacer name="horizontalSpacer_3">
</item> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer_3"> </property>
<property name="orientation"> <property name="sizeType">
<enum>Qt::Horizontal</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeType"> <property name="sizeHint" stdset="0">
<enum>QSizePolicy::Minimum</enum> <size>
</property> <width>40</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>40</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> <item>
</spacer> <widget class="QPushButton" name="cancelButton">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<widget class="QPushButton" name="cancelButton"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>Cancel</string>
</property> </property>
<property name="text"> </widget>
<string>Cancel</string> </item>
</property> <item>
</widget> <spacer name="horizontalSpacer_2">
</item> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer_2"> </property>
<property name="orientation"> <property name="sizeType">
<enum>Qt::Horizontal</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeType"> <property name="sizeHint" stdset="0">
<enum>QSizePolicy::Minimum</enum> <size>
</property> <width>40</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>40</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> </layout>
</spacer> </item>
</item> </layout>
</layout>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../resources.qrc"/> <include location="../InstructorsAndTrainees.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

15
InstructorsAndTrainees/widgets/versionselectwidget.cpp
View File

@@ -83,21 +83,10 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
return; return;
} }
NewVersionWidget *newVersionWidget = new NewVersionWidget(); NewVersionWidget *newVersionWidget = new NewVersionWidget(this);
newVersionWidget->initialize(this,selectedVersion->getViewName()); 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; delete newVersionWidget;
*/
newVersionWidget->show();
} }
void VersionSelectWidget::sendCopyEmit(QString newName) void VersionSelectWidget::sendCopyEmit(QString newName)

4
InstructorsAndTrainees/widgets/versionselectwidget.ui
View File

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