signal_hasError

This commit is contained in:
2025-12-01 14:50:15 +03:00
parent c97c86ac55
commit 0b7f772b21
4 changed files with 14 additions and 5 deletions

View File

@@ -393,7 +393,7 @@ void ServerLMSWidget::startInitialization_step0()
Logger::instance().setLoggingType(LoggingType::WIDGET); Logger::instance().setLoggingType(LoggingType::WIDGET);
Logger::instance().setLogToFile(true); Logger::instance().setLogToFile(true);
connect(this,&ServerLMSWidget::sigUpdateControllerInitialize,updateController,&UpdateController::initialize,Qt::DirectConnection); connect(this,&ServerLMSWidget::sigUpdateControllerInitialize,updateController,&UpdateController::initialize/*,Qt::DirectConnection*/);
connect(updateController,&UpdateController::sigInitializeFinished, this,&ServerLMSWidget::slot_startInitialization_step1/*,Qt::DirectConnection*/); connect(updateController,&UpdateController::sigInitializeFinished, this,&ServerLMSWidget::slot_startInitialization_step1/*,Qt::DirectConnection*/);
connect(this,&ServerLMSWidget::sigCalculateFullHash,updateController,&UpdateController::calculateFullHash,Qt::AutoConnection); connect(this,&ServerLMSWidget::sigCalculateFullHash,updateController,&UpdateController::calculateFullHash,Qt::AutoConnection);
connect(updateController,&UpdateController::sigErrorRequired,this,&ServerLMSWidget::setError); connect(updateController,&UpdateController::sigErrorRequired,this,&ServerLMSWidget::setError);

View File

@@ -85,6 +85,7 @@ signals:
QTcpSocket* sigGetSocket(); QTcpSocket* sigGetSocket();
void signal_DocsChanged(); void signal_DocsChanged();
void signal_hasError(int code);
public slots: public slots:
void slot_LanguageChanged(QString language); void slot_LanguageChanged(QString language);
@@ -117,6 +118,7 @@ public:
SpecMsgBox::CriticalClose(this, textError); SpecMsgBox::CriticalClose(this, textError);
} }
errorCode = code; errorCode = code;
emit signal_hasError(code);
} }
int hasError() const int hasError() const

View File

@@ -23,6 +23,8 @@ MainWindow::MainWindow(QWidget *parent) :
serverLMSWidget = new ServerLMSWidget(this); serverLMSWidget = new ServerLMSWidget(this);
ui->verticalLayout_Main->addWidget(serverLMSWidget); ui->verticalLayout_Main->addWidget(serverLMSWidget);
connect(serverLMSWidget, &ServerLMSWidget::signal_hasError, this, &MainWindow::slot_hasError);
connect(serverLMSWidget, &ServerLMSWidget::signal_LanguageChanged, this, &MainWindow::slot_LanguageChanged); connect(serverLMSWidget, &ServerLMSWidget::signal_LanguageChanged, this, &MainWindow::slot_LanguageChanged);
connect(serverLMSWidget, &ServerLMSWidget::signal_Tray_ShowMessage, this, &MainWindow::slot_Tray_ShowMessage); connect(serverLMSWidget, &ServerLMSWidget::signal_Tray_ShowMessage, this, &MainWindow::slot_Tray_ShowMessage);
connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_ShowWindow, this, &MainWindow::slot_TrayMenu_ShowWindow); connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_ShowWindow, this, &MainWindow::slot_TrayMenu_ShowWindow);
@@ -174,8 +176,6 @@ void MainWindow::slot_LazyInitialization()
{ {
serverLMSWidget->start(); serverLMSWidget->start();
errorCheck();
/* Также подключаем сигнал нажатия на иконку к обработчику /* Также подключаем сигнал нажатия на иконку к обработчику
* данного нажатия * данного нажатия
* */ * */
@@ -186,6 +186,11 @@ void MainWindow::slot_LazyInitialization()
connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &MainWindow::slot_TrayMessageClicked); connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &MainWindow::slot_TrayMessageClicked);
} }
void MainWindow::slot_hasError(int code)
{
errorCheck();
}
void MainWindow::slot_LanguageChanged(QString language) void MainWindow::slot_LanguageChanged(QString language)
{ {
qtLanguageTranslator.load(QString(QStringLiteral("translations/TrayServerLMS_")) + language, QStringLiteral(".")); qtLanguageTranslator.load(QString(QStringLiteral("translations/TrayServerLMS_")) + language, QStringLiteral("."));

View File

@@ -55,6 +55,8 @@ public slots:
//Слот отложенной инициализации //Слот отложенной инициализации
void slot_LazyInitialization(); void slot_LazyInitialization();
void slot_hasError(int code);
private: private:
void exit(); void exit();
void errorCheck(); void errorCheck();