feat: make MultyMessageDialog message show in the WarningMessageWidget.
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
#include "SlideWidget.h"
|
#include "SlideWidget.h"
|
||||||
#include "WarningLabel.h"
|
#include "WarningLabel.h"
|
||||||
#include "event/EventCenter.h"
|
#include "event/EventCenter.h"
|
||||||
|
#include "dialogs/MultyMessageDialogManager.h"
|
||||||
|
|
||||||
|
|
||||||
WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
||||||
@@ -99,7 +100,7 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
|||||||
clearBtn->setObjectName("WarningPanelBtn");
|
clearBtn->setObjectName("WarningPanelBtn");
|
||||||
hl->addWidget(clearBtn);
|
hl->addWidget(clearBtn);
|
||||||
connect(clearBtn, &QToolButton::clicked, this, &WarningMessageWidget::clearWarning);
|
connect(clearBtn, &QToolButton::clicked, this, &WarningMessageWidget::clearWarning);
|
||||||
connect(EventCenter::Default(),&EventCenter::WarningMessageRaise,this,&WarningMessageWidget::addWarningProxySlot);
|
connect(MultyMessageDialogManager::getInstance(),&MultyMessageDialogManager::warningMessageAdded,this,&WarningMessageWidget::addWarningProxySlot);
|
||||||
connect(EventCenter::Default(),&EventCenter::ErrorStateUnactive,this,&WarningMessageWidget::unactiveErrorProxySlot);
|
connect(EventCenter::Default(),&EventCenter::ErrorStateUnactive,this,&WarningMessageWidget::unactiveErrorProxySlot);
|
||||||
connect(EventCenter::Default(),&EventCenter::ErrorStateActive,this,&WarningMessageWidget::activeErrorProxySlot);
|
connect(EventCenter::Default(),&EventCenter::ErrorStateActive,this,&WarningMessageWidget::activeErrorProxySlot);
|
||||||
|
|
||||||
@@ -131,15 +132,9 @@ void WarningMessageWidget::addWarning(const QString& aDateTime, const QString& a
|
|||||||
mWarningCount++;
|
mWarningCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WarningMessageWidget::addWarningProxySlot(QObject*, QObject* aData)
|
void WarningMessageWidget::addWarningProxySlot(const QString& aMessage)
|
||||||
{
|
{
|
||||||
if (!aData){
|
addWarning(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"), aMessage);
|
||||||
qDebug()<<"addLabelProxy with null aData";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString str = *((QString*)aData);
|
|
||||||
addWarning(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"), str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WarningMessageWidget::activeErrorProxySlot(QObject*, QObject* aData)
|
void WarningMessageWidget::activeErrorProxySlot(QObject*, QObject* aData)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
void showEvent(QShowEvent* aEvent);
|
void showEvent(QShowEvent* aEvent);
|
||||||
protected slots:
|
protected slots:
|
||||||
void addWarningProxySlot(QObject*, QObject* aData);
|
void addWarningProxySlot(const QString& aMessage);
|
||||||
void activeErrorProxySlot(QObject*, QObject* aData);
|
void activeErrorProxySlot(QObject*, QObject* aData);
|
||||||
void unactiveErrorProxySlot(QObject*, QObject* aData);
|
void unactiveErrorProxySlot(QObject*, QObject* aData);
|
||||||
void reloadLanguage();
|
void reloadLanguage();
|
||||||
|
|||||||
@@ -931,7 +931,7 @@ bool DeviceManager::startCEScan()
|
|||||||
QString msg = tr("Initialize Failed.");
|
QString msg = tr("Initialize Failed.");
|
||||||
THROW_ERROR(msg);
|
THROW_ERROR(msg);
|
||||||
msg = tr("Start CE Scan Failed.");
|
msg = tr("Start CE Scan Failed.");
|
||||||
EventCenter::Default()->triggerEvent(WarningMessageRaise, nullptr, (QObject*)&msg);
|
emitInfoCallback(msg, MessageLevel::Error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@@ -1431,8 +1431,7 @@ void DeviceManager::prepareCheckReconConnection()
|
|||||||
|
|
||||||
void DeviceManager::processReconMessage(const QString &aMessage)
|
void DeviceManager::processReconMessage(const QString &aMessage)
|
||||||
{
|
{
|
||||||
QString msg=aMessage;
|
emitInfoCallback(aMessage, MessageLevel::Warning);
|
||||||
EventCenter::Default()->triggerEvent(WarningMessageRaise, nullptr, (QObject*)&aMessage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeviceManager::processEmergencyButtonReset(const QString& aResponse)
|
void DeviceManager::processEmergencyButtonReset(const QString& aResponse)
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ void MultyMessageDialogManager::raiseDialog(const QString& aMessage,MessageLevel
|
|||||||
dialog->move(GEOMETY_X,yDistance);
|
dialog->move(GEOMETY_X,yDistance);
|
||||||
dialog->show();
|
dialog->show();
|
||||||
connect(dialog,&MultyMessageDialog::dialogDestroyed,this,&MultyMessageDialogManager::removeDestoryedDialog);
|
connect(dialog,&MultyMessageDialog::dialogDestroyed,this,&MultyMessageDialogManager::removeDestoryedDialog);
|
||||||
|
emit warningMessageAdded(aMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MultyMessageDialogManager::removeDestoryedDialog()
|
void MultyMessageDialogManager::removeDestoryedDialog()
|
||||||
|
|||||||
@@ -18,6 +18,9 @@ public:
|
|||||||
private slots:
|
private slots:
|
||||||
void removeDestoryedDialog();
|
void removeDestoryedDialog();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void warningMessageAdded(const QString& aWarningMessage);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MultyMessageDialogManager();
|
MultyMessageDialogManager();
|
||||||
~MultyMessageDialogManager();
|
~MultyMessageDialogManager();
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ ADD_EVENT_VALUE(RequestScreenSaver)\
|
|||||||
ADD_EVENT_VALUE(ReconConnectionUpdated)\
|
ADD_EVENT_VALUE(ReconConnectionUpdated)\
|
||||||
ADD_EVENT_VALUE(InputWorkListSearchValue)\
|
ADD_EVENT_VALUE(InputWorkListSearchValue)\
|
||||||
ADD_EVENT_VALUE(WorklistSearchFinished)\
|
ADD_EVENT_VALUE(WorklistSearchFinished)\
|
||||||
ADD_EVENT_VALUE(WarningMessageRaise)\
|
|
||||||
ADD_EVENT_VALUE(ErrorStateActive)\
|
ADD_EVENT_VALUE(ErrorStateActive)\
|
||||||
ADD_EVENT_VALUE(ErrorStateUnactive)\
|
ADD_EVENT_VALUE(ErrorStateUnactive)\
|
||||||
ADD_EVENT_VALUE(StartScanProcess)\
|
ADD_EVENT_VALUE(StartScanProcess)\
|
||||||
|
|||||||
Reference in New Issue
Block a user