mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 23:05:36 +08:00
Ref T534, enable overlay messages for view/tree view
This commit is contained in:
committed by
Mat Sutcliffe
parent
474207eeab
commit
6fafaabbab
@@ -38,6 +38,12 @@ namespace BlackGui
|
||||
COverlayMessagesDockWidget::COverlayMessagesDockWidget(QWidget *parent) : COverlayMessagesBase(parent)
|
||||
{ }
|
||||
|
||||
COverlayMessagesTableView::COverlayMessagesTableView(QWidget *parent) : COverlayMessagesBase(parent)
|
||||
{ }
|
||||
|
||||
COverlayMessagesTreeView::COverlayMessagesTreeView(QWidget *parent) : COverlayMessagesBase<QTreeView>(parent)
|
||||
{ }
|
||||
|
||||
} // ns
|
||||
|
||||
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
#include <QTabWidget>
|
||||
#include <QWizardPage>
|
||||
#include <QDockWidget>
|
||||
#include <QTableView>
|
||||
#include <QTreeView>
|
||||
#include <QMessageBox>
|
||||
#include <QObject>
|
||||
#include <QSize>
|
||||
@@ -409,6 +411,30 @@ namespace BlackGui
|
||||
explicit COverlayMessagesDockWidget(QWidget *parent = nullptr);
|
||||
};
|
||||
|
||||
/*!
|
||||
* Using this class provides a QTableView with the overlay functionality already integrated.
|
||||
*/
|
||||
class BLACKGUI_EXPORT COverlayMessagesTableView : public COverlayMessagesBase<QTableView>
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
//! Constructor
|
||||
explicit COverlayMessagesTableView(QWidget *parent = nullptr);
|
||||
};
|
||||
|
||||
/*!
|
||||
* Using this class provides a QTableView with the overlay functionality already integrated.
|
||||
*/
|
||||
class BLACKGUI_EXPORT COverlayMessagesTreeView : public COverlayMessagesBase<QTreeView>
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
//! Constructor
|
||||
explicit COverlayMessagesTreeView(QWidget *parent = nullptr);
|
||||
};
|
||||
|
||||
} // ns
|
||||
|
||||
#endif // guard
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace BlackGui
|
||||
{
|
||||
namespace Views
|
||||
{
|
||||
CAtcStationTreeView::CAtcStationTreeView(QWidget *parent) : QTreeView(parent)
|
||||
CAtcStationTreeView::CAtcStationTreeView(QWidget *parent) : COverlayMessagesTreeView(parent)
|
||||
{
|
||||
this->setModel(new CAtcStationTreeModel(this));
|
||||
this->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#ifndef BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
|
||||
#define BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
|
||||
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackgui/blackguiexport.h"
|
||||
#include "blackmisc/aviation/atcstationlist.h"
|
||||
#include "blackmisc/aviation/comsystem.h"
|
||||
@@ -36,7 +37,7 @@ namespace BlackGui
|
||||
namespace Views
|
||||
{
|
||||
//! ATC stations view
|
||||
class BLACKGUI_EXPORT CAtcStationTreeView : public QTreeView
|
||||
class BLACKGUI_EXPORT CAtcStationTreeView : public COverlayMessagesTreeView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "blackgui/models/selectionmodel.h"
|
||||
#include "blackgui/settings/guisettings.h"
|
||||
#include "blackgui/menus/menuaction.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackgui/blackguiexport.h"
|
||||
#include "blackmisc/namevariantpairlist.h"
|
||||
#include "blackmisc/directories.h"
|
||||
@@ -83,7 +84,7 @@ namespace BlackGui
|
||||
{
|
||||
//! Non templated base class, allows Q_OBJECT and signals / slots to be used
|
||||
class BLACKGUI_EXPORT CViewBaseNonTemplate :
|
||||
public QTableView,
|
||||
public COverlayMessagesTableView,
|
||||
public Components::CEnableForDockWidgetInfoArea
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace BlackGui
|
||||
{
|
||||
namespace Views
|
||||
{
|
||||
CViewBaseNonTemplate::CViewBaseNonTemplate(QWidget *parent) : QTableView(parent)
|
||||
CViewBaseNonTemplate::CViewBaseNonTemplate(QWidget *parent) : COverlayMessagesTableView(parent)
|
||||
{
|
||||
this->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(this, &QWidget::customContextMenuRequested, this, &CViewBaseNonTemplate::customMenuRequested);
|
||||
|
||||
Reference in New Issue
Block a user