mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: change new file instructor position
This commit is contained in:
@@ -23,7 +23,7 @@ void MainWindow::initialize()
|
||||
{
|
||||
createObjects();
|
||||
|
||||
updateTextWidget->initialize();
|
||||
updateWidget->initialize(this);
|
||||
entryWidget->initialize(this);
|
||||
versionSelectWidget->initialize(sendSystem);
|
||||
hashComparer->initialize(this);
|
||||
@@ -32,7 +32,7 @@ void MainWindow::initialize()
|
||||
commonButtonGroupWidget->initialize(externalExecuter,sendSystem,client);
|
||||
commonButtonGroupWidget->show();
|
||||
|
||||
instructorButtonGroupWidget->initialize(this);
|
||||
//instructorButtonGroupWidget->initialize(this);
|
||||
|
||||
ui->notificationLabel->hide();
|
||||
|
||||
@@ -65,16 +65,14 @@ void MainWindow::createObjects()
|
||||
{
|
||||
updateWidget = new UpdateNotifyWidget;
|
||||
commonButtonGroupWidget = new CommonButtonGroupWidget;
|
||||
instructorButtonGroupWidget = new InstructorButtonGroupWidget;
|
||||
updateTextWidget = new UpdateWidget;
|
||||
//instructorButtonGroupWidget = new InstructorButtonGroupWidget;
|
||||
entryWidget = new EntryWidget;
|
||||
versionSelectWidget = new VersionSelectWidget;
|
||||
|
||||
ui->changButtonGroup->addWidget(commonButtonGroupWidget);
|
||||
ui->changButtonGroup->addWidget(instructorButtonGroupWidget);
|
||||
//updateWidget->setButtonWidget(instructorButtonGroupWidget);
|
||||
|
||||
ui->interactiveGroup->addWidget(entryWidget);
|
||||
ui->interactiveGroup->addWidget(updateTextWidget);
|
||||
ui->interactiveGroup->addWidget(versionSelectWidget);
|
||||
|
||||
workerThread = new QThread;
|
||||
@@ -280,11 +278,11 @@ void MainWindow::showConnectionEmpty()
|
||||
palette.setColor(ui->notificationLabel->foregroundRole(),Qt::red);
|
||||
ui->notificationLabel->setText(tr("Соединение отсутсвует"));
|
||||
entryWidget->connectionEmptyState();
|
||||
updateTextWidget->hide();
|
||||
updateWidget->hide();
|
||||
ui->offlineStartButton->show();
|
||||
ui->offlineStartButton->setGeometry(280,340,250,40);
|
||||
ui->settingsButton->show();
|
||||
instructorButtonGroupWidget->hide();
|
||||
//instructorButtonGroupWidget->hide();
|
||||
}
|
||||
|
||||
void MainWindow::slotConnectionState(bool flag)
|
||||
@@ -391,9 +389,9 @@ void MainWindow::loadToServer()
|
||||
{
|
||||
ui->inlineTextDebug->setText(tr("Отправка файлов..."));
|
||||
commonButtonGroupWidget->showProgressBar(true);
|
||||
instructorButtonGroupWidget->hide();
|
||||
//instructorButtonGroupWidget->hide();
|
||||
ui->offlineStartButton->setEnabled(false);
|
||||
updateTextWidget->hide();
|
||||
updateWidget->hide();
|
||||
emit sigUpdateFilesOnServer(hashComparer->getFilesForUpdate());
|
||||
}
|
||||
|
||||
@@ -404,8 +402,8 @@ void MainWindow::undoCurrentChanges()
|
||||
|
||||
commonButtonGroupWidget->showProgressBar(true);
|
||||
ui->offlineStartButton->setEnabled(false);
|
||||
instructorButtonGroupWidget->hide();
|
||||
updateTextWidget->hide();
|
||||
//instructorButtonGroupWidget->hide();
|
||||
updateWidget->hide();
|
||||
|
||||
startLoadingAnim();
|
||||
|
||||
@@ -452,10 +450,10 @@ void MainWindow::checkUpdate()
|
||||
void MainWindow::showUpdateInfo()
|
||||
{
|
||||
stopLoadingMovie();
|
||||
updateTextWidget->showWithFill();
|
||||
updateWidget->showWithFill();
|
||||
entryWidget->hide();
|
||||
commonButtonGroupWidget->hide();
|
||||
instructorButtonGroupWidget->show();
|
||||
//instructorButtonGroupWidget->show();
|
||||
ui->offlineStartButton->setGeometry(540,549,250,40);
|
||||
fileCountForUpdate = hashComparer->getFilesForUpdate()->length();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user