flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #335, adjusted member init in main window

Browse Source
This commit is contained in:
Klaus Basan
2014-10-09 23:40:07 +02:00
committed by Roland Winklmeier
parent cd7e2f6f72
commit 678cc2e0cc
2 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/swiftgui_standard/mainwindow.cpp
View File

@@ -39,20 +39,7 @@ using namespace BlackMisc::Hardware;
MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) : (Qt::Tool | Qt::WindowStaysOnTopHint)),
ui(new Ui::MainWindow),
m_compInfoWindow(nullptr),
m_init(false), m_windowMode(windowMode), m_keyboard(nullptr),
// contexts and runtime
m_coreAvailable(false), m_contextNetworkAvailable(false), m_contextAudioAvailable(false),
// timers
m_timerContextWatchdog(nullptr),
m_timerStatusBar(nullptr), m_timerSimulator(nullptr),
// context menus
m_contextMenuStatusMessageList(nullptr),
// cockpit
m_inputFocusedWidget(nullptr),
// status bar
m_statusBarIcon(nullptr), m_statusBarLabel(nullptr)
m_windowMode(windowMode)
{
if (windowMode == GuiModes::WindowFrameless)
{

30
src/swiftgui_standard/mainwindow.h
View File

@@ -84,35 +84,35 @@ protected:
private:
QScopedPointer<Ui::MainWindow> ui;
BlackGui::Components::CInfoWindowComponent *m_compInfoWindow;
bool m_init;
BlackGui::Components::CInfoWindowComponent *m_compInfoWindow = nullptr; //!< the info window (popup
bool m_init = false;
GuiModes::WindowMode m_windowMode;
BlackInput::IKeyboard *m_keyboard; //!< hotkeys
BlackInput::IKeyboard *m_keyboard = nullptr; //!< hotkeys
BlackMisc::CLogSubscriber m_logSubscriber { this, &MainWindow::ps_displayStatusMessageInGui };
// contexts
bool m_coreAvailable;
bool m_contextNetworkAvailable;
bool m_contextAudioAvailable;
BlackMisc::Aviation::CAircraft m_ownAircraft; /*!< own aircraft's state */
QTimer *m_timerContextWatchdog; /*!< core available? */
QTimer *m_timerStatusBar; /*!< cleaning up status bar */
QTimer *m_timerSimulator; /*!< update simulator data */
bool m_coreAvailable = false;
bool m_contextNetworkAvailable = false;
bool m_contextAudioAvailable = false;
BlackMisc::Aviation::CAircraft m_ownAircraft; //!< own aircraft's state
QTimer *m_timerContextWatchdog = nullptr; //!< core available?
QTimer *m_timerStatusBar = nullptr; //!< cleaning up status bar
QTimer *m_timerSimulator = nullptr; //!< update simulator data
// frameless window
QPoint m_dragPosition; /*!< position, if moving is handled with frameless window */
// context menus
QMenu *m_contextMenuStatusMessageList; /*!< context menu for status message list */
QMenu *m_contextMenuStatusMessageList = nullptr; /*!< context menu for status message list */
// cockpit
QString m_transponderResetValue; /*!< Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas */
QWidget *m_inputFocusedWidget; /*!< currently used widget for input, mainly used with cockpit */
QString m_transponderResetValue; //!< Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas
QWidget *m_inputFocusedWidget = nullptr; //!< currently used widget for input, mainly used with cockpit
// status bar
QLabel *m_statusBarIcon; /*!< status bar icon */
QLabel *m_statusBarLabel; /*!< status bar label */
QLabel *m_statusBarIcon = nullptr; //!< status bar icon
QLabel *m_statusBarLabel = nullptr; //!< status bar label
//! GUI status update
void updateGuiStatusInformation();