From 6e2204beebbe3f3eb3a89a0d63260d0610dfad98 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 14 Sep 2014 00:02:54 +0200 Subject: [PATCH] refs #325, using CDockWidgetInfoAreaComponent in components --- src/blackgui/components/atcstationcomponent.cpp | 5 ++++- src/blackgui/components/atcstationcomponent.h | 8 ++++++-- src/blackgui/components/usercomponent.cpp | 6 +++++- src/blackgui/components/usercomponent.h | 7 +++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 9e6feabc9..bb6ece28b 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -25,7 +25,10 @@ namespace BlackGui namespace Components { CAtcStationComponent::CAtcStationComponent(QWidget *parent) : - QTabWidget(parent), CRuntimeBasedComponent(nullptr, false), ui(new Ui::CAtcStationComponent), m_timerComponent(nullptr) + QTabWidget(parent), + CDockWidgetInfoAreaComponent(this), + CRuntimeBasedComponent(nullptr, false), + ui(new Ui::CAtcStationComponent), m_timerComponent(nullptr) { ui->setupUi(this); this->m_timerComponent = new CTimerBasedComponent(SLOT(update()), this); diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index 7dda6610a..f09f13e83 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -14,6 +14,8 @@ #include "blackgui/components/runtimebasedcomponent.h" #include "blackgui/components/timerbasedcomponent.h" +#include "blackgui/components/dockwidgetinfoareacomponent.h" + #include "blackmisc/avatcstation.h" #include @@ -28,7 +30,10 @@ namespace BlackGui /*! * ATC stations component */ - class CAtcStationComponent : public QTabWidget, public CRuntimeBasedComponent + class CAtcStationComponent : + public QTabWidget, + public CDockWidgetInfoAreaComponent, + public CRuntimeBasedComponent { Q_OBJECT @@ -66,7 +71,6 @@ namespace BlackGui void runtimeHasBeenSet() override; private slots: - //! Request new ATIS void ps_requestAtis(); diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index 2cbc72368..2f66da0a9 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -9,13 +9,17 @@ #include "usercomponent.h" #include "ui_usercomponent.h" +#include "blackmisc/nwuserlist.h" namespace BlackGui { namespace Components { CUserComponent::CUserComponent(QWidget *parent) : - QTabWidget(parent), CRuntimeBasedComponent(nullptr, false), ui(new Ui::CUserComponent), m_timerComponent(nullptr) + QTabWidget(parent), + CDockWidgetInfoAreaComponent(this), + CRuntimeBasedComponent(nullptr, false), + ui(new Ui::CUserComponent), m_timerComponent(nullptr) { ui->setupUi(this); this->m_timerComponent = new CTimerBasedComponent(SLOT(update()), this); diff --git a/src/blackgui/components/usercomponent.h b/src/blackgui/components/usercomponent.h index 171359ff0..9d051d4a0 100644 --- a/src/blackgui/components/usercomponent.h +++ b/src/blackgui/components/usercomponent.h @@ -14,7 +14,7 @@ #include "blackgui/components/runtimebasedcomponent.h" #include "blackgui/components/timerbasedcomponent.h" -#include "blackmisc/nwuserlist.h" +#include "blackgui/components/dockwidgetinfoareacomponent.h" #include #include @@ -26,7 +26,10 @@ namespace BlackGui namespace Components { //! User componenet (users, clients) - class CUserComponent : public QTabWidget, public CRuntimeBasedComponent + class CUserComponent : + public QTabWidget, + public CDockWidgetInfoAreaComponent, + public CRuntimeBasedComponent { Q_OBJECT