mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-20 12:35:43 +08:00
refs #751, overlay message for Login Component fixed
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
#include "blackcore/data/globalsetup.h"
|
||||
#include "blackgui/components/dblogincomponent.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/guiutility.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include "blackmisc/network/authenticateduser.h"
|
||||
@@ -29,6 +30,7 @@
|
||||
|
||||
using namespace BlackCore;
|
||||
using namespace BlackCore::Db;
|
||||
using namespace BlackGui;
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Network;
|
||||
|
||||
@@ -59,7 +61,7 @@ namespace BlackGui
|
||||
void CDbLoginComponent::displayOverlayMessages(const CStatusMessageList &msgs)
|
||||
{
|
||||
if (msgs.isEmpty()) { return; }
|
||||
COverlayMessagesFrame *mf = qobject_cast<COverlayMessagesFrame *>(parentWidget());
|
||||
COverlayMessagesFrame *mf = CGuiUtility::nextOverlayMessageFrame(this);
|
||||
BLACK_VERIFY_X(mf, Q_FUNC_INFO, "No overlay widget");
|
||||
if (!mf) { return; }
|
||||
mf->showOverlayMessages(msgs);
|
||||
@@ -112,6 +114,5 @@ namespace BlackGui
|
||||
this->ui->fr_Login->setVisible(modeLogin);
|
||||
this->ui->fr_Logoff->setVisible(!modeLogin);
|
||||
}
|
||||
|
||||
} // ns
|
||||
} // ns
|
||||
|
||||
@@ -31,7 +31,6 @@ class QWidget;
|
||||
namespace BlackGui
|
||||
{
|
||||
class CEnableForFramelessWindow;
|
||||
|
||||
class COverlayMessagesFrame;
|
||||
|
||||
//! GUI utilities
|
||||
|
||||
@@ -33,11 +33,10 @@ class QWidget;
|
||||
|
||||
namespace BlackMisc { namespace Network { class CTextMessage; } }
|
||||
namespace Ui { class COverlayMessages; }
|
||||
|
||||
namespace BlackGui
|
||||
{
|
||||
/*!
|
||||
* Display status messages (nested in another widget)
|
||||
* Display status messages (nested in the parent widget)
|
||||
*/
|
||||
class BLACKGUI_EXPORT COverlayMessages : public QFrame
|
||||
{
|
||||
|
||||
@@ -30,13 +30,13 @@ class QPaintEvent;
|
||||
class QWidget;
|
||||
|
||||
namespace BlackMisc { namespace Network { class CTextMessage; } }
|
||||
|
||||
namespace BlackGui
|
||||
{
|
||||
class COverlayMessages;
|
||||
|
||||
/*!
|
||||
* Display status messages (nested in another widget)
|
||||
* Display status messages (nested in this widget).
|
||||
* Using this class provides a QFrame with the overlay functionality already integrated.
|
||||
*/
|
||||
class BLACKGUI_EXPORT COverlayMessagesFrame : public QFrame
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user