mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: stable version new update
This commit is contained in:
@@ -98,7 +98,7 @@ void MainWindow::initialize()
|
||||
|
||||
screenChecker->check();
|
||||
|
||||
emit sigSetConnect(dataParser->getServerSettings(),workerThread);
|
||||
emit sigSetConnect(dataParser->getClientSettings(),workerThread);
|
||||
checkAppAvailable();
|
||||
|
||||
//post
|
||||
@@ -122,6 +122,7 @@ void MainWindow::bindConnection()
|
||||
connect(this,&MainWindow::sigSendCheckUpdate,updateController,&UpdateController::checkCanUpdate,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigGetConnected,client,&TCPClient::getIsConnected);
|
||||
connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateCommonHash);
|
||||
connect(versionContainer,&VersionContainer::sigSetServerVersion,this,&MainWindow::setServerVersion);
|
||||
}
|
||||
|
||||
void MainWindow::updateProgress()
|
||||
@@ -141,7 +142,7 @@ void MainWindow::loadComplete()
|
||||
ui->autostartCheckBox->hide();
|
||||
ui->offlineStartButton->show();
|
||||
|
||||
dataParser->changeVersion(versionContainer->getServerVersionData()->getViewName());
|
||||
dataParser->changeVersion(versionContainer->getServerVersionData());
|
||||
setTitle();
|
||||
}
|
||||
|
||||
@@ -183,7 +184,7 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount,quint64
|
||||
commonButtonGroupWidget->lastVerInstalledState();
|
||||
ui->unsafeChangingButton->hide();
|
||||
ui->offlineStartButton->setEnabled(true);
|
||||
dataParser->changeVersion(versionContainer->getServerVersion());
|
||||
dataParser->changeVersion(versionContainer->getServerVersionData());
|
||||
activateLoadingAnimation(false);
|
||||
setTitle();
|
||||
}
|
||||
@@ -284,19 +285,19 @@ void MainWindow::autoStart()
|
||||
void MainWindow::setTitle()
|
||||
{
|
||||
ui->versionLayoutWidget->show();
|
||||
ServerSettings *currentSettings = dataParser->getServerSettings();
|
||||
ServerSettings *currentSettings = dataParser->getClientSettings();
|
||||
StreamingVersionData *versionData = new StreamingVersionData;
|
||||
versionData->setName(currentSettings->LocalVersionName);
|
||||
versionData->setIsChangeable(currentSettings->versionData.getIsChangeable());
|
||||
versionContainer->setLocalVersionData(versionData);
|
||||
|
||||
ui->valueClientVersion->setText(versionContainer->getLocalVersion());
|
||||
ui->valueServerVersion->setText(versionContainer->getServerVersionData()->getViewName());
|
||||
//title.append(" (" + currentSettings->LocalVersionName + ")");
|
||||
}
|
||||
|
||||
void MainWindow::loadStaticData()
|
||||
{
|
||||
ServerSettings *currentSettings = dataParser->getServerSettings();
|
||||
ServerSettings *currentSettings = dataParser->getClientSettings();
|
||||
|
||||
entryWidget->fillSettings(currentSettings);
|
||||
ui->languageComboBox->setCurrentText(currentSettings->Language);
|
||||
@@ -329,6 +330,7 @@ void MainWindow::slotConnectionState(bool flag)
|
||||
{
|
||||
ui->notificationLabel->show();
|
||||
QPalette palette = ui->notificationLabel->palette();
|
||||
ui->versionLayoutWidget->hide();
|
||||
|
||||
activateLoadingAnimation(false);
|
||||
|
||||
@@ -405,7 +407,7 @@ void MainWindow::saveServerSettingsWithConnect()
|
||||
}
|
||||
//TODO: не заполняется 2 поля (автостарт и язык)
|
||||
ServerSettings *settings = entryWidget->getServerSettings();
|
||||
settings->LocalVersionName = dataParser->getServerSettings()->LocalVersionName;
|
||||
settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName;
|
||||
dataParser->createServerSettings(settings);
|
||||
|
||||
emit sigSetConnect(settings,workerThread);
|
||||
@@ -474,7 +476,7 @@ void MainWindow::on_offlineStartButton_clicked()
|
||||
|
||||
void MainWindow::on_unsafeChangingButton_clicked()
|
||||
{
|
||||
checkUpdate();
|
||||
//checkUpdate();
|
||||
showUpdateInfo();
|
||||
updateWidget->show();
|
||||
}
|
||||
@@ -583,7 +585,15 @@ void MainWindow::activateLoadingAnimation(bool flag)
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::setInlineDebug(QString value)
|
||||
{
|
||||
ui->inlineTextDebug->setText(value);
|
||||
}
|
||||
|
||||
void MainWindow::setServerVersion(StreamingVersionData *version)
|
||||
{
|
||||
ui->valueServerVersion->setText(version->getViewName());
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user