mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: add mathModel use
This commit is contained in:
@@ -33,7 +33,6 @@ void MainWindow::createObjects()
|
||||
|
||||
ui->changButtonGroup->addWidget(commonButtonGroupWidget);
|
||||
ui->interactiveGroup->addWidget(entryWidget);
|
||||
ui->interactiveGroup->addWidget(versionSelectWidget);
|
||||
|
||||
workerThread = new QThread;
|
||||
animationThread = new QThread;
|
||||
@@ -47,7 +46,6 @@ void MainWindow::createObjects()
|
||||
dataParser = new DataParser;
|
||||
dataParser->moveToThread(workerThread);
|
||||
|
||||
|
||||
sendSystem = new SendSystem;
|
||||
sendSystem->moveToThread(workerThread);
|
||||
|
||||
@@ -298,7 +296,6 @@ void MainWindow::setTitle()
|
||||
void MainWindow::loadStaticData()
|
||||
{
|
||||
ServerSettings *currentSettings = dataParser->getClientSettings();
|
||||
|
||||
entryWidget->fillSettings(currentSettings);
|
||||
ui->languageComboBox->setCurrentText(currentSettings->Language);
|
||||
ui->autostartCheckBox->setChecked(currentSettings->isAutoStart);
|
||||
@@ -315,6 +312,7 @@ void MainWindow::showConnectionEmpty()
|
||||
updateWidget->hide();
|
||||
ui->offlineStartButton->show();
|
||||
ui->offlineStartButton->setGeometry(280,340,250,40);
|
||||
ui->offlineStartButton->raise();
|
||||
ui->settingsButton->show();
|
||||
ui->unsafeChangingButton->hide();
|
||||
versionSelectWidget->hide();
|
||||
@@ -396,7 +394,10 @@ void MainWindow::login()
|
||||
void MainWindow::saveServerSettingsWithConnect()
|
||||
{
|
||||
activateLoadingAnimation(true);
|
||||
entryWidget->settingsWidgetIsActive(false);
|
||||
entryWidget->isActive(false);
|
||||
ServerSettings *settings = entryWidget->getServerSettings();
|
||||
settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName;
|
||||
dataParser->createServerSettings(settings);
|
||||
|
||||
if(client->getIsConnected())
|
||||
{
|
||||
@@ -404,17 +405,19 @@ void MainWindow::saveServerSettingsWithConnect()
|
||||
ui->offlineStartButton->show();
|
||||
activateLoadingAnimation(false);
|
||||
}
|
||||
//TODO: не заполняется 2 поля (автостарт и язык)
|
||||
ServerSettings *settings = entryWidget->getServerSettings();
|
||||
settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName;
|
||||
dataParser->createServerSettings(settings);
|
||||
else
|
||||
{
|
||||
emit sigSetConnect(settings,workerThread);
|
||||
}
|
||||
|
||||
//TODO: не заполняется 2 поля (автостарт и язык)
|
||||
|
||||
emit sigSetConnect(settings,workerThread);
|
||||
}
|
||||
|
||||
void MainWindow::on_settingsButton_clicked()
|
||||
{
|
||||
entryWidget->settingsState();
|
||||
entryWidget->isActive(true);
|
||||
ui->offlineStartButton->hide();
|
||||
}
|
||||
|
||||
@@ -463,16 +466,6 @@ void MainWindow::undoCurrentChanges()
|
||||
activateLoadingAnimation(false);
|
||||
}
|
||||
|
||||
void MainWindow::on_offlineStartButton_clicked()
|
||||
{
|
||||
QString username = "offlineUser";
|
||||
QString password = "000000";
|
||||
|
||||
dataParser->createAuthDataOffline(username,password);
|
||||
startUnityClient();
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_unsafeChangingButton_clicked()
|
||||
{
|
||||
//checkUpdate();
|
||||
@@ -605,8 +598,13 @@ MainWindow::~MainWindow()
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::on_offlineStartButton_clicked()
|
||||
{
|
||||
QString username = "offlineUser";
|
||||
QString password = "000000";
|
||||
|
||||
dataParser->createAuthDataOffline(username,password);
|
||||
startUnityClient();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user