feat: make MultyMessageDialog message show in the WarningMessageWidget.
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#include "SlideWidget.h"
|
||||
#include "WarningLabel.h"
|
||||
#include "event/EventCenter.h"
|
||||
#include "dialogs/MultyMessageDialogManager.h"
|
||||
|
||||
|
||||
WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
||||
@@ -99,7 +100,7 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
||||
clearBtn->setObjectName("WarningPanelBtn");
|
||||
hl->addWidget(clearBtn);
|
||||
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::ErrorStateActive,this,&WarningMessageWidget::activeErrorProxySlot);
|
||||
|
||||
@@ -131,15 +132,9 @@ void WarningMessageWidget::addWarning(const QString& aDateTime, const QString& a
|
||||
mWarningCount++;
|
||||
}
|
||||
|
||||
void WarningMessageWidget::addWarningProxySlot(QObject*, QObject* aData)
|
||||
void WarningMessageWidget::addWarningProxySlot(const QString& aMessage)
|
||||
{
|
||||
if (!aData){
|
||||
qDebug()<<"addLabelProxy with null aData";
|
||||
return;
|
||||
}
|
||||
|
||||
QString str = *((QString*)aData);
|
||||
addWarning(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"), str);
|
||||
addWarning(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"), aMessage);
|
||||
}
|
||||
|
||||
void WarningMessageWidget::activeErrorProxySlot(QObject*, QObject* aData)
|
||||
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
protected:
|
||||
void showEvent(QShowEvent* aEvent);
|
||||
protected slots:
|
||||
void addWarningProxySlot(QObject*, QObject* aData);
|
||||
void addWarningProxySlot(const QString& aMessage);
|
||||
void activeErrorProxySlot(QObject*, QObject* aData);
|
||||
void unactiveErrorProxySlot(QObject*, QObject* aData);
|
||||
void reloadLanguage();
|
||||
@@ -44,4 +44,4 @@ private:
|
||||
|
||||
};
|
||||
|
||||
#endif // __WARNINGMESSAGEWIDGET_H__
|
||||
#endif // __WARNINGMESSAGEWIDGET_H__
|
||||
|
||||
Reference in New Issue
Block a user