mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-02 23:27:09 +08:00
GUI fixes
* added missing support for weather component in main info area * closing the navigator needs to display main window (otherwise no windows is visible)
This commit is contained in:
@@ -383,6 +383,11 @@ void SwiftGuiStd::ps_showNormal()
|
||||
this->showNormalModeChecked();
|
||||
}
|
||||
|
||||
void SwiftGuiStd::ps_navigatorClosed()
|
||||
{
|
||||
this->showNormal();
|
||||
}
|
||||
|
||||
void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notification) const
|
||||
{
|
||||
if (!this->m_contextAudioAvailable) { return; }
|
||||
|
||||
@@ -76,13 +76,13 @@ public:
|
||||
static QString getLogCategory() { return "swift.gui.stdgui"; }
|
||||
|
||||
signals:
|
||||
//! Main info area has changed
|
||||
//! \remarks using widget pointer allows the component itself to identify if it is current
|
||||
void currentMainInfoAreaChanged(const QWidget *currentWidget);
|
||||
|
||||
protected:
|
||||
|
||||
//! \name QMainWindow events
|
||||
//! @[
|
||||
//! @{
|
||||
virtual void mouseMoveEvent(QMouseEvent *event) override;
|
||||
virtual void mousePressEvent(QMouseEvent *event) override;
|
||||
virtual void closeEvent(QCloseEvent *event) override;
|
||||
@@ -252,6 +252,9 @@ private slots:
|
||||
|
||||
//! Show window normal
|
||||
void ps_showNormal();
|
||||
|
||||
//! Navigator dialog has been closed
|
||||
void ps_navigatorClosed();
|
||||
};
|
||||
|
||||
#pragma pop_macro("interface")
|
||||
|
||||
@@ -193,6 +193,7 @@ void SwiftGuiStd::initGuiSignals()
|
||||
connect(ui->menu_WindowMinimize, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
|
||||
connect(ui->menu_WindowToggleOnTop, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
|
||||
connect(ui->menu_WindowToggleNavigator, &QAction::triggered, this->m_navigator.data(), &CNavigatorDialog::toggleNavigator);
|
||||
connect(this->m_navigator.data(), &CNavigatorDialog::navigatorClosed, this, &SwiftGuiStd::ps_navigatorClosed);
|
||||
connect(ui->menu_InternalsPage, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
|
||||
|
||||
// command line / text messages
|
||||
|
||||
Reference in New Issue
Block a user