mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
bugfix: ui behaviour
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
<?xml version='1.0' encoding='UTF-8'?>
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
<ServerSettingsContainer>
|
<ServerSettingsContainer>
|
||||||
<ServerSettings UseMathModel="1" Address="192.168.100.83" DestPortMath="18003" LocalPortMath="18004" Language="RUS" AutoStart="0" Port="6000"/>
|
<ServerSettings Language="RUS" AutoStart="0" LocalPortMath="18004" UseMathModel="1" DestPortMath="18003" Address="192.168.100.83" Port="6000"/>
|
||||||
<VersionData isChangable="1" Version="base7" Created="Ср ноя 19 16:34:14 2025"/>
|
<VersionData Created="Пн ноя 17 15:03:26 2025" Version="base" isChangable="0"/>
|
||||||
</ServerSettingsContainer>
|
</ServerSettingsContainer>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ClientNotify Code="DISABLE"/>
|
<ClientNotify Code="CHECKVERSIONLIST"/>
|
||||||
|
|||||||
@@ -66,6 +66,8 @@ void CommonButtonGroupWidget::showProgressBar(bool flag)
|
|||||||
|
|
||||||
void CommonButtonGroupWidget::needUpdateState(bool flag)
|
void CommonButtonGroupWidget::needUpdateState(bool flag)
|
||||||
{
|
{
|
||||||
|
show();
|
||||||
|
ui->loadingProgressBar->hide();
|
||||||
ui->startButton->hide();
|
ui->startButton->hide();
|
||||||
ui->updateButton->setEnabled(flag);
|
ui->updateButton->setEnabled(flag);
|
||||||
ui->updateButton->show();
|
ui->updateButton->show();
|
||||||
|
|||||||
@@ -117,6 +117,11 @@ void UpdateNotifyWidget::on_startWithCurrentChangesButton_clicked()
|
|||||||
emit sigStartUnityClient();
|
emit sigStartUnityClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UpdateNotifyWidget::closeWindow()
|
||||||
|
{
|
||||||
|
on_closeButton_clicked();
|
||||||
|
}
|
||||||
|
|
||||||
void UpdateNotifyWidget::setUpdateState()
|
void UpdateNotifyWidget::setUpdateState()
|
||||||
{
|
{
|
||||||
ui->undoChangesButton->show();
|
ui->undoChangesButton->show();
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public:
|
|||||||
void showWithFill();
|
void showWithFill();
|
||||||
void showTryChangeBase();
|
void showTryChangeBase();
|
||||||
void setVersionContainer(VersionContainer *versionContainer);
|
void setVersionContainer(VersionContainer *versionContainer);
|
||||||
|
void closeWindow();
|
||||||
signals:
|
signals:
|
||||||
void sigLoadToServerBehaviour();
|
void sigLoadToServerBehaviour();
|
||||||
void sigUndoCurrentChanges();
|
void sigUndoCurrentChanges();
|
||||||
|
|||||||
@@ -336,8 +336,6 @@ void CoreManager::undoCurrentChanges()
|
|||||||
emit sigSendPacketType(PacketType::TYPE_UPDATE);
|
emit sigSendPacketType(PacketType::TYPE_UPDATE);
|
||||||
//тут был таймер
|
//тут был таймер
|
||||||
isRecovery = false;
|
isRecovery = false;
|
||||||
|
|
||||||
widgetManager->activateLoadingAnimation(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreManager::startOffline()
|
void CoreManager::startOffline()
|
||||||
|
|||||||
@@ -106,6 +106,7 @@ void WidgetManager::setNeedUpdateState(quint64 size, quint64 fileCount,quint64 d
|
|||||||
result = tr("Файлов к удалению: ") + QString::number(deleteCount);
|
result = tr("Файлов к удалению: ") + QString::number(deleteCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateWidget->closeWindow();
|
||||||
mainWindow->setNeedUpdateState(result);
|
mainWindow->setNeedUpdateState(result);
|
||||||
commonButtonGroupWidget->needUpdateState(true);
|
commonButtonGroupWidget->needUpdateState(true);
|
||||||
waitAnimationWidget->hideWithStop();
|
waitAnimationWidget->hideWithStop();
|
||||||
@@ -157,10 +158,11 @@ void WidgetManager::setServerDisconnectState()
|
|||||||
|
|
||||||
void WidgetManager::setUndoCurrentChangesState()
|
void WidgetManager::setUndoCurrentChangesState()
|
||||||
{
|
{
|
||||||
|
waitAnimationWidget->showWithPlay();
|
||||||
mainWindow->undoCurrentChanges();
|
mainWindow->undoCurrentChanges();
|
||||||
updateWidget->hide();
|
updateWidget->hide();
|
||||||
commonButtonGroupWidget->showProgressBar(false);
|
commonButtonGroupWidget->showProgressBar(false);
|
||||||
waitAnimationWidget->showWithPlay();
|
//waitAnimationWidget->hideWithStop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WidgetManager::showMainFrame(bool flag)
|
void WidgetManager::showMainFrame(bool flag)
|
||||||
|
|||||||
Reference in New Issue
Block a user