refs #608, simplified direct main window access.

Just set the corresponding components and you are done.
This commit is contained in:
Klaus Basan
2016-03-13 18:20:52 +00:00
committed by Mathew Sutcliffe
parent 5a03d235cd
commit 8f33896e1c
4 changed files with 74 additions and 4 deletions

View File

@@ -0,0 +1,47 @@
/* Copyright (C) 2016
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "mainwindowaccess.h"
#include "managedstatusbar.h"
#include "overlaymessagesframe.h"
#include "components/logcomponent.h"
namespace BlackGui
{
IMainWindowAccess::~IMainWindowAccess()
{
// void
}
bool IMainWindowAccess::displayTextInConsole(const QString &message)
{
if (message.isEmpty()) { return false; }
if (!this->m_mwaLogComponent) { return false; }
this->m_mwaLogComponent->appendPlainTextToConsole(message);
this->m_mwaLogComponent->displayConsole(true);
return true;
}
bool IMainWindowAccess::displayInStatusBar(const BlackMisc::CStatusMessage &message)
{
if (message.isEmpty()) { return false; }
if (!this->m_mwaStatusBar) { return false; }
this->m_mwaStatusBar->displayStatusMessage(message);
return true;
}
bool IMainWindowAccess::displayInOverlayWindow(const BlackMisc::CStatusMessage &message)
{
if (message.isEmpty()) { return false; }
if (!this->m_mwaOverlayFrame) { return false; }
this->m_mwaOverlayFrame->showOverlayMessage(message);
return true;
}
} // ns

View File

@@ -10,21 +10,38 @@
#ifndef BLACKGUI_MAINWINDOWACCESS_H #ifndef BLACKGUI_MAINWINDOWACCESS_H
#define BLACKGUI_MAINWINDOWACCESS_H #define BLACKGUI_MAINWINDOWACCESS_H
#include "blackgui/blackguiexport.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include <QStatusBar>
namespace BlackGui namespace BlackGui
{ {
class CManagedStatusBar;
class COverlayMessagesFrame;
namespace Components { class CLogComponent; }
/*! /*!
* Direct acccess to main window`s status bar, info bar and such * Direct acccess to main window`s status bar, info bar and such
*/ */
class IMainWindowAccess class BLACKGUI_EXPORT IMainWindowAccess
{ {
public: public:
//! Destructor
virtual ~IMainWindowAccess();
//! Display in console
virtual bool displayTextInConsole(const QString &message);
//! Display in status bar //! Display in status bar
virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message) = 0; virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message);
//! Display in overlay window //! Display in overlay window
virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message) = 0; virtual bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message);
protected:
Components::CLogComponent *m_mwaLogComponent = nullptr; //!< the log component if any
CManagedStatusBar *m_mwaStatusBar = nullptr; //!< status bar if any
COverlayMessagesFrame *m_mwaOverlayFrame = nullptr; //!< overlay messages if any
}; };
} // ns } // ns

View File

@@ -36,6 +36,10 @@ CSwiftCore::CSwiftCore(QWidget *parent) :
setSystemTrayMode(MinimizeToTray | QuitOnClose); setSystemTrayMode(MinimizeToTray | QuitOnClose);
setSystemTrayToolTip(name); setSystemTrayToolTip(name);
this->m_mwaLogComponent = this->ui->comp_InfoArea->getLogComponent();
this->m_mwaOverlayFrame = nullptr;
this->m_mwaStatusBar = nullptr;
initLogDisplay(); initLogDisplay();
initSlots(); initSlots();
initStyleSheet(); initStyleSheet();

View File

@@ -12,8 +12,9 @@
#ifndef SWIFTCORE_H #ifndef SWIFTCORE_H
#define SWIFTCORE_H #define SWIFTCORE_H
#include "blackcore/corefacade.h"
#include "blackgui/systemtraywindow.h" #include "blackgui/systemtraywindow.h"
#include "blackgui/mainwindowaccess.h"
#include "blackcore/corefacade.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/identifiable.h" #include "blackmisc/identifiable.h"
@@ -24,6 +25,7 @@ namespace Ui { class CSwiftCore; }
//! swift core control //! swift core control
class CSwiftCore : class CSwiftCore :
public BlackGui::CSystemTrayWindow, public BlackGui::CSystemTrayWindow,
public BlackGui::IMainWindowAccess,
public BlackMisc::CIdentifiable public BlackMisc::CIdentifiable
{ {
Q_OBJECT Q_OBJECT