mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
ref: clean unuse widget
This commit is contained in:
@@ -41,7 +41,6 @@ SOURCES += \
|
|||||||
main.cpp \
|
main.cpp \
|
||||||
mainwindow.cpp \
|
mainwindow.cpp \
|
||||||
mywinheader.cpp \
|
mywinheader.cpp \
|
||||||
Widgets\newversionwidget.cpp \
|
|
||||||
Widgets\updatenotifywidget.cpp \
|
Widgets\updatenotifywidget.cpp \
|
||||||
widgetmanager.cpp
|
widgetmanager.cpp
|
||||||
|
|
||||||
@@ -72,7 +71,6 @@ HEADERS += \
|
|||||||
coremanager.h \
|
coremanager.h \
|
||||||
mainwindow.h \
|
mainwindow.h \
|
||||||
mywinheader.h \
|
mywinheader.h \
|
||||||
Widgets\newversionwidget.h \
|
|
||||||
Widgets\updatenotifywidget.h \
|
Widgets\updatenotifywidget.h \
|
||||||
widgetmanager.h
|
widgetmanager.h
|
||||||
|
|
||||||
@@ -82,7 +80,6 @@ FORMS += \
|
|||||||
Widgets\entrywidget.ui \
|
Widgets\entrywidget.ui \
|
||||||
Widgets\instructorbuttongroupwidget.ui \
|
Widgets\instructorbuttongroupwidget.ui \
|
||||||
mainwindow.ui \
|
mainwindow.ui \
|
||||||
Widgets\newversionwidget.ui \
|
|
||||||
Widgets\updatenotifywidget.ui \
|
Widgets\updatenotifywidget.ui \
|
||||||
|
|
||||||
TRANSLATIONS = QtLanguage_ru.ts\
|
TRANSLATIONS = QtLanguage_ru.ts\
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<AuthData Login="I1" Password="1111" InstructorName="Горинин Г.Г." ClientName="Горинин Г.Г." AccessType="instructor"/>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
<DisplayInfo DisplaysID="0;"/>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<ServerSettingsContainer>
|
|
||||||
<ServerSettings Port="6000" UseMathModel="1" DestPortMath="18003" LocalPortMath="18004" AutoStart="0" Address="192.168.100.83" Language="RUS"/>
|
|
||||||
<VersionData isChangable="1" Version="BS2" Created="Пт авг 15 09:59:42 2025"/>
|
|
||||||
</ServerSettingsContainer>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ClientNotify Code="CANCHANGE"/>
|
|
||||||
@@ -14,6 +14,7 @@ class CommonButtonGroupWidget : public QWidget
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CommonButtonGroupWidget(QWidget *parent = nullptr);
|
explicit CommonButtonGroupWidget(QWidget *parent = nullptr);
|
||||||
|
~CommonButtonGroupWidget();
|
||||||
void initialize();
|
void initialize();
|
||||||
void loadCompleteState();
|
void loadCompleteState();
|
||||||
void lastVerInstalledState();
|
void lastVerInstalledState();
|
||||||
@@ -22,11 +23,9 @@ public:
|
|||||||
void showProgressBar(bool flag);
|
void showProgressBar(bool flag);
|
||||||
void needUpdateState(bool flag);
|
void needUpdateState(bool flag);
|
||||||
void startButtonActive(bool flag);
|
void startButtonActive(bool flag);
|
||||||
~CommonButtonGroupWidget();
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void sigSendPacket(PacketType packet);
|
void sigSendPacket(PacketType packet);
|
||||||
void sigSendXMLAnswer(QString answer);
|
|
||||||
void sigUpdateCommonWidget();
|
void sigUpdateCommonWidget();
|
||||||
void sigStartUnityClient();
|
void sigStartUnityClient();
|
||||||
|
|
||||||
|
|||||||
@@ -28,11 +28,6 @@ void EntryWidget::settingsState()
|
|||||||
ui->offlineWidget->hide();
|
ui->offlineWidget->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EntryWidget::isLoginFieldsFill()
|
|
||||||
{
|
|
||||||
return ui->loginInputField->text().length() <= 0 || ui->passwordInputField->text() <= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ClientAutorization* EntryWidget::getAuthData()
|
ClientAutorization* EntryWidget::getAuthData()
|
||||||
{
|
{
|
||||||
ClientAutorization *data = new ClientAutorization;
|
ClientAutorization *data = new ClientAutorization;
|
||||||
|
|||||||
@@ -14,20 +14,19 @@ class EntryWidget : public QWidget
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit EntryWidget(QWidget *parent = nullptr);
|
explicit EntryWidget(QWidget *parent = nullptr);
|
||||||
void initialize();
|
|
||||||
void AconnectionEmptyState();
|
|
||||||
void settingsState();
|
|
||||||
bool isLoginFieldsFill();
|
|
||||||
ClientAutorization* getAuthData();
|
|
||||||
void showLoginWidget(bool flag);
|
|
||||||
~EntryWidget();
|
~EntryWidget();
|
||||||
|
void initialize();
|
||||||
|
void settingsState();
|
||||||
|
void showLoginWidget(bool flag);
|
||||||
|
|
||||||
void disconnectState();
|
void disconnectState();
|
||||||
void fillSettings(ServerSettings *settings);
|
void fillSettings(ServerSettings *settings);
|
||||||
ServerSettings *getServerSettings();
|
|
||||||
void isActive(bool flag);
|
void isActive(bool flag);
|
||||||
bool getLoginWidgetIsHidden();
|
bool getLoginWidgetIsHidden();
|
||||||
|
|
||||||
|
ServerSettings *getServerSettings();
|
||||||
|
ClientAutorization* getAuthData();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void sigTryLogin();
|
void sigTryLogin();
|
||||||
void sigSaveServerSettings();
|
void sigSaveServerSettings();
|
||||||
|
|||||||
@@ -10,11 +10,6 @@ InstructorButtonGroupWidget::InstructorButtonGroupWidget(QWidget *parent) :
|
|||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstructorButtonGroupWidget::initialize()
|
|
||||||
{
|
|
||||||
hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
void InstructorButtonGroupWidget::on_loadToServerButton_clicked()
|
void InstructorButtonGroupWidget::on_loadToServerButton_clicked()
|
||||||
{
|
{
|
||||||
emit sigLoadToServer();
|
emit sigLoadToServer();
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ class InstructorButtonGroupWidget : public QWidget
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit InstructorButtonGroupWidget(QWidget *parent = nullptr);
|
explicit InstructorButtonGroupWidget(QWidget *parent = nullptr);
|
||||||
void initialize();
|
|
||||||
|
|
||||||
~InstructorButtonGroupWidget();
|
~InstructorButtonGroupWidget();
|
||||||
signals:
|
signals:
|
||||||
void sigLoadToServer();
|
void sigLoadToServer();
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
#include "newversionwidget.h"
|
|
||||||
#include "ui_newversionwidget.h"
|
|
||||||
|
|
||||||
NewVersionWidget::NewVersionWidget(QWidget *parent) :
|
|
||||||
QWidget(parent),
|
|
||||||
ui(new Ui::NewVersionWidget)
|
|
||||||
{
|
|
||||||
ui->setupUi(this);
|
|
||||||
setWindowFlags(Qt::SubWindow);
|
|
||||||
setAttribute(Qt::WA_ShowModal,true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NewVersionWidget::initialize(QString prevName)
|
|
||||||
{
|
|
||||||
ui->prevVerValue->setText(prevName);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void NewVersionWidget::on_createButton_clicked()
|
|
||||||
{
|
|
||||||
if(ui->lineEdit->text() != "")
|
|
||||||
{
|
|
||||||
emit sigSendCopy(ui->lineEdit->text());
|
|
||||||
hide();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void NewVersionWidget::on_cancelButton_clicked()
|
|
||||||
{
|
|
||||||
hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
NewVersionWidget::~NewVersionWidget()
|
|
||||||
{
|
|
||||||
delete ui;
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
#ifndef NEWVERSIONWIDGET_H
|
|
||||||
#define NEWVERSIONWIDGET_H
|
|
||||||
|
|
||||||
#include <QWidget>
|
|
||||||
|
|
||||||
namespace Ui {
|
|
||||||
class NewVersionWidget;
|
|
||||||
}
|
|
||||||
|
|
||||||
class NewVersionWidget : public QWidget
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit NewVersionWidget(QWidget *parent = nullptr);
|
|
||||||
void initialize(QString prevName);
|
|
||||||
~NewVersionWidget();
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void sigSendCopy(QString copyName);
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void on_createButton_clicked();
|
|
||||||
|
|
||||||
void on_cancelButton_clicked();
|
|
||||||
|
|
||||||
private:
|
|
||||||
Ui::NewVersionWidget *ui;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // NEWVERSIONWIDGET_H
|
|
||||||
@@ -1,219 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>NewVersionWidget</class>
|
|
||||||
<widget class="QWidget" name="NewVersionWidget">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>325</width>
|
|
||||||
<height>200</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Создать копию...</string>
|
|
||||||
</property>
|
|
||||||
<property name="autoFillBackground">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true"/>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
||||||
<item>
|
|
||||||
<widget class="QFrame" name="NewVerBackground">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="frameShape">
|
|
||||||
<enum>QFrame::StyledPanel</enum>
|
|
||||||
</property>
|
|
||||||
<property name="frameShadow">
|
|
||||||
<enum>QFrame::Raised</enum>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="baseVerLayout">
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="prevVerTitle">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Базовая версия:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="prevVerValue">
|
|
||||||
<property name="text">
|
|
||||||
<string>TextLabel</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="newNameLayout">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>20</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="newNameVersionTitle">
|
|
||||||
<property name="text">
|
|
||||||
<string>Новое название:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="lineEdit">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>150</width>
|
|
||||||
<height>30</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>60</width>
|
|
||||||
<height>30</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Minimum</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="createButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Создать</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_3">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Minimum</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cancelButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Отмена</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Minimum</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@@ -19,12 +19,10 @@ class UpdateNotifyWidget : public QWidget
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit UpdateNotifyWidget(QWidget *parent = nullptr);
|
explicit UpdateNotifyWidget(QWidget *parent = nullptr);
|
||||||
|
~UpdateNotifyWidget();
|
||||||
void initialize(QPoint startPos);
|
void initialize(QPoint startPos);
|
||||||
void addToList(FileData fileData);
|
void addToList(FileData fileData);
|
||||||
void showWithFill();
|
void showWithFill();
|
||||||
|
|
||||||
~UpdateNotifyWidget();
|
|
||||||
|
|
||||||
void showTryChangeBase();
|
void showTryChangeBase();
|
||||||
void setVersionContainer(VersionContainer *versionContainer);
|
void setVersionContainer(VersionContainer *versionContainer);
|
||||||
signals:
|
signals:
|
||||||
|
|||||||
@@ -140,7 +140,6 @@ void CoreManager::initializeWidgets()
|
|||||||
connect(widgetManager->getInstructorButtonGroupWiget(),&InstructorButtonGroupWidget::sigStartUnityClient,this,&CoreManager::startUnityClient, Qt::AutoConnection);
|
connect(widgetManager->getInstructorButtonGroupWiget(),&InstructorButtonGroupWidget::sigStartUnityClient,this,&CoreManager::startUnityClient, Qt::AutoConnection);
|
||||||
|
|
||||||
connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigSendPacket,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
|
connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigSendPacket,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
|
||||||
connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
|
|
||||||
connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigStartUnityClient,this,&CoreManager::startUnityClient,Qt::AutoConnection);
|
connect(widgetManager->getCommonButtonGroupWidget(),&CommonButtonGroupWidget::sigStartUnityClient,this,&CoreManager::startUnityClient,Qt::AutoConnection);
|
||||||
|
|
||||||
connect(widgetManager->getMainWindow(),&MainWindow::sigChangeLanguage,this,&CoreManager::setLanguage,Qt::AutoConnection);
|
connect(widgetManager->getMainWindow(),&MainWindow::sigChangeLanguage,this,&CoreManager::setLanguage,Qt::AutoConnection);
|
||||||
|
|||||||
Reference in New Issue
Block a user