flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 02:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #751, overlay message for Login Component fixed

Browse Source
This commit is contained in:
Klaus Basan
2016-08-30 19:49:08 +02:00
parent 520f593d51
commit 2cc88d9c6a
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/dblogincomponent.cpp
View File

@@ -10,6 +10,7 @@
#include "blackcore/data/globalsetup.h" #include "blackcore/data/globalsetup.h"
#include "blackgui/components/dblogincomponent.h" #include "blackgui/components/dblogincomponent.h"
#include "blackgui/guiapplication.h" #include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
#include "blackgui/overlaymessagesframe.h" #include "blackgui/overlaymessagesframe.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/network/authenticateduser.h" #include "blackmisc/network/authenticateduser.h"
@@ -29,6 +30,7 @@
using namespace BlackCore; using namespace BlackCore;
using namespace BlackCore::Db; using namespace BlackCore::Db;
using namespace BlackGui;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
@@ -59,7 +61,7 @@ namespace BlackGui
void CDbLoginComponent::displayOverlayMessages(const CStatusMessageList &msgs) void CDbLoginComponent::displayOverlayMessages(const CStatusMessageList &msgs)
{ {
if (msgs.isEmpty()) { return; } 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"); BLACK_VERIFY_X(mf, Q_FUNC_INFO, "No overlay widget");
if (!mf) { return; } if (!mf) { return; }
mf->showOverlayMessages(msgs); mf->showOverlayMessages(msgs);
@@ -112,6 +114,5 @@ namespace BlackGui
this->ui->fr_Login->setVisible(modeLogin); this->ui->fr_Login->setVisible(modeLogin);
this->ui->fr_Logoff->setVisible(!modeLogin); this->ui->fr_Logoff->setVisible(!modeLogin);
} }
} // ns } // ns
} // ns } // ns

1
src/blackgui/guiutility.h
View File

@@ -31,7 +31,6 @@ class QWidget;
namespace BlackGui namespace BlackGui
{ {
class CEnableForFramelessWindow; class CEnableForFramelessWindow;
class COverlayMessagesFrame; class COverlayMessagesFrame;
//! GUI utilities //! GUI utilities

3
src/blackgui/overlaymessages.h
View File

@@ -33,11 +33,10 @@ class QWidget;
namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackMisc { namespace Network { class CTextMessage; } }
namespace Ui { class COverlayMessages; } namespace Ui { class COverlayMessages; }
namespace BlackGui namespace BlackGui
{ {
/*! /*!
* Display status messages (nested in another widget) * Display status messages (nested in the parent widget)
*/ */
class BLACKGUI_EXPORT COverlayMessages : public QFrame class BLACKGUI_EXPORT COverlayMessages : public QFrame
{ {

4
src/blackgui/overlaymessagesframe.h
View File

@@ -30,13 +30,13 @@ class QPaintEvent;
class QWidget; class QWidget;
namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackMisc { namespace Network { class CTextMessage; } }
namespace BlackGui namespace BlackGui
{ {
class COverlayMessages; 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 class BLACKGUI_EXPORT COverlayMessagesFrame : public QFrame
{ {