fix: version name after download

This commit is contained in:
semenov
2025-12-12 12:58:31 +03:00
parent c23f3d519b
commit 9e202f8e5d
9 changed files with 9287 additions and 9239 deletions

37
ClientMPS_resource.rc Normal file
View File

@@ -0,0 +1,37 @@
#include <windows.h>
IDI_ICON1 ICON DISCARDABLE "D:\\QT\\Projects\\RRJClient\\resource\\Icons\\planeCustomIco.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0
PRODUCTVERSION 0,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "\0"
VALUE "FileVersion", "0.0.0.0\0"
VALUE "LegalCopyright", "\0"
VALUE "OriginalFilename", "ClientMPS.exe\0"
VALUE "ProductName", "ClientMPS\0"
VALUE "ProductVersion", "0.0.0.0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1200
END
END
/* End of Version info */

View File

@@ -95,6 +95,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
TARGET = ClientMPS
RESOURCES += \
resources.qrc

View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<AuthData Login="I1" Password="b59c67bf196a4758191e42f76670ceba" InstructorName="Колобков А.К." ClientName="Колобков А.К." AccessType="instructor"/>

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<ServerSettingsContainer>
<ServerSettings Address="192.168.100.134" Port="6000" Language="RUS" AutoStart="0"/>
<VersionData Version="ver1" isChangable="1"/>
<VersionData Version="ver1" Created="Чт дек 11 17:55:24 2025" isChangable="1"/>
</ServerSettingsContainer>

File diff suppressed because it is too large Load Diff

View File

@@ -83,6 +83,14 @@ bool EntryWidget::getLoginWidgetIsHidden()
return ui->loginWidget->isHidden();
}
QString EntryWidget::getAddress(){
return ui->serverInputField->text();
}
QString EntryWidget::getPort(){
return ui->portInputField->text();
}
EntryWidget::~EntryWidget()
{

View File

@@ -25,6 +25,8 @@ public:
bool getLoginWidgetIsHidden();
ClientAutorization* getAuthData();
QString getAddress();
QString getPort();
signals:
void sigTryLogin();
void sigSaveServerSettings();

View File

@@ -331,7 +331,7 @@ void CoreManager::loadComplete()
dataParserOutput->changeVersion(versionContainer->getServerVersionData());
setLocalVersion();
checkAutoStart();
widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
widgetManager->getMainWindow()->setClientVersionName(versionContainer->getServerVersionData()->getViewName());
}
void CoreManager::loadToServer()
@@ -372,6 +372,8 @@ void CoreManager::saveServerSettingsWithConnect()
entryWidget->isActive(false);
settings->LocalVersionName = dataParser->getSettings()->LocalVersionName;
settings->Address = entryWidget->getAddress();
settings->Port = entryWidget->getPort();
dataParserOutput->updateServerSettings(settings);
if(tcpClient->getIsConnected())