refs #335, adjusted main window

* removed keypad, now component
* removed simulator logic, now in component
* shifted audio logic to cockpit component
This commit is contained in:
Klaus Basan
2014-10-25 00:28:57 +02:00
committed by Roland Winklmeier
parent 3c223b2416
commit 5edc55222d
6 changed files with 41 additions and 655 deletions

View File

@@ -44,7 +44,9 @@
namespace Ui { class MainWindow; }
//! swift GUI
class MainWindow : public QMainWindow, public BlackGui::Components::CEnableForRuntime
class MainWindow :
public QMainWindow,
public BlackGui::Components::CEnableForRuntime
{
Q_OBJECT
@@ -98,7 +100,6 @@ private:
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 */
@@ -168,9 +169,6 @@ private:
//! Play notifcation sound
void playNotifcationSound(BlackSound::CNotificationSounds::Notification notification) const;
//! Update simulator page with latest user aircraft data
void updateSimulatorData();
//! Originator for aircraft context
static const QString &swiftGuiStandardOriginator()
{
@@ -201,23 +199,14 @@ private slots:
*/
void ps_onConnectionStatusChanged(uint from, uint to, const QString &message);
//! Simulator available
void ps_onSimulatorConnectionChanged(bool isAvailable);
//
// GUI related slots
//
/*!
* \brief Set the main page
* \param start Startup phase
*/
void ps_setMainPage(bool start = false);
//! Set \sa MainPageInfoArea
void ps_setMainPage() { this->ps_setMainPage(MainPageInfoArea); }
/*!
* \brief setMainPage
* \param mainPage
*/
//! Set one of the main pages
void ps_setMainPage(MainPageIndex mainPage);
//! Connect to network
@@ -232,9 +221,6 @@ private slots:
//! Update timer
void ps_handleTimerBasedUpdates();
//! Audio volume handling and mute
void ps_setAudioVolumes();
/*!
* \brief changeOpacity
* \param opacity 0-100