mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-27 11:05:44 +08:00
refs #335, renaming
This commit is contained in:
committed by
Roland Winklmeier
parent
e6a5e2960f
commit
3c4fc76094
@@ -23,7 +23,7 @@ namespace BlackGui
|
|||||||
ui(new Ui::CCockpitInfoAreaComponent)
|
ui(new Ui::CCockpitInfoAreaComponent)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
initInfoArea();
|
this->initInfoArea();
|
||||||
this->ps_setTabBarPosition(QTabWidget::North);
|
this->ps_setTabBarPosition(QTabWidget::North);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,8 @@
|
|||||||
* contained in the LICENSE file.
|
* contained in the LICENSE file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
//! \file
|
||||||
|
|
||||||
#ifndef BLACKGUI_VOICEROOMSCOMPONENT_H
|
#ifndef BLACKGUI_VOICEROOMSCOMPONENT_H
|
||||||
#define BLACKGUI_VOICEROOMSCOMPONENT_H
|
#define BLACKGUI_VOICEROOMSCOMPONENT_H
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace BlackGui
|
|||||||
{
|
{
|
||||||
CDockWidget::CDockWidget(QWidget *parent) : QDockWidget(parent)
|
CDockWidget::CDockWidget(QWidget *parent) : QDockWidget(parent)
|
||||||
{
|
{
|
||||||
this->onStyleSheetsChanged();
|
this->ps_onStyleSheetsChanged();
|
||||||
this->initTitleBarWidgets();
|
this->initTitleBarWidgets();
|
||||||
|
|
||||||
// connect
|
// connect
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
namespace BlackGui
|
namespace BlackGui
|
||||||
{
|
{
|
||||||
|
|
||||||
//! \brief Our base class for dockable widgets containing some specialized functionality on top of QWidget.
|
//! \brief Our base class for dockable widgets containing some specialized functionality on top of QDockWidget.
|
||||||
//! \details We currently use dockable widgets either as "info area" or "info bar" dockable widget.
|
//! \details We currently use dockable widgets either as "info area" or "info bar" dockable widget.
|
||||||
//! Info area widgets reside in an info are and represent a larger piece of information (e.g. all ATC stations, all aircrafts in range).
|
//! Info area widgets reside in an info are and represent a larger piece of information (e.g. all ATC stations, all aircrafts in range).
|
||||||
//! An info bar is meant to be a small info window displaying information about status, menu state etc.
|
//! An info bar is meant to be a small info window displaying information about status, menu state etc.
|
||||||
@@ -31,7 +31,6 @@ namespace BlackGui
|
|||||||
//! \sa CDockWidgetInfoBar
|
//! \sa CDockWidgetInfoBar
|
||||||
class CDockWidget : public QDockWidget
|
class CDockWidget : public QDockWidget
|
||||||
{
|
{
|
||||||
// KB TODO: Make this an interface, IDockWidget?
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@@ -117,7 +116,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
//! Style sheet has changed
|
//! Style sheet has changed
|
||||||
virtual void onStyleSheetsChanged();
|
virtual void ps_onStyleSheetsChanged();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
//! Top level has been chaged
|
//! Top level has been chaged
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ namespace BlackGui
|
|||||||
{
|
{
|
||||||
const CInfoArea *ia = getParentInfoArea();
|
const CInfoArea *ia = getParentInfoArea();
|
||||||
if (!ia) return false;
|
if (!ia) return false;
|
||||||
return ia->isSelectedInfoArea(this);
|
return ia->isSelectedDockWidgetInfoArea(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CDockWidgetInfoArea::isVisibleWidget() const
|
bool CDockWidgetInfoArea::isVisibleWidget() const
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CInfoArea::initInfoArea()
|
void CInfoArea::initInfoArea()
|
||||||
{
|
{
|
||||||
// after(!) GUI is established
|
// after(!) GUI is setup
|
||||||
if (this->m_dockableWidgets.isEmpty())
|
if (this->m_dockWidgetInfoAreas.isEmpty())
|
||||||
{
|
{
|
||||||
this->m_dockableWidgets = this->getOwnDockWidgetAreas();
|
this->m_dockableWidgets = this->getOwnDockWidgetAreas();
|
||||||
Q_ASSERT(!this->m_dockableWidgets.isEmpty());
|
Q_ASSERT(!this->m_dockableWidgets.isEmpty());
|
||||||
|
|||||||
@@ -71,13 +71,13 @@ namespace BlackGui
|
|||||||
//! Constructor
|
//! Constructor
|
||||||
explicit CInfoArea(QWidget *parent = nullptr);
|
explicit CInfoArea(QWidget *parent = nullptr);
|
||||||
|
|
||||||
//! Override close event
|
//! \copydoc QWidget::closeEvent
|
||||||
virtual void closeEvent(QCloseEvent *event) override;
|
virtual void closeEvent(QCloseEvent *event) override;
|
||||||
|
|
||||||
//! \copydoc QWidget::paintEvent
|
//! \copydoc QWidget::paintEvent
|
||||||
virtual void paintEvent(QPaintEvent *event) override;
|
virtual void paintEvent(QPaintEvent *event) override;
|
||||||
|
|
||||||
//! Preferred size when floating
|
//! Preferred size when floating (size hint)
|
||||||
virtual QSize getPreferredSizeWhenFloating(int areaIndex) const = 0;
|
virtual QSize getPreferredSizeWhenFloating(int areaIndex) const = 0;
|
||||||
|
|
||||||
//! Info area (index) to icon
|
//! Info area (index) to icon
|
||||||
|
|||||||
Reference in New Issue
Block a user