mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-14 00:25:35 +08:00
refs #275, own info window component
* added to CVariant for value object * signal in text message to indicate overlay messages * info window component (currently not runtme aware, maybe changed in future) * removed old window, adjusted GUI
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
#pragma push_macro("interface")
|
||||
#undef interface
|
||||
|
||||
#include "infowindow.h"
|
||||
#include "guimodeenums.h"
|
||||
#include "blackinput/keyboard.h"
|
||||
#include "blackcore/context_audio.h"
|
||||
@@ -27,6 +26,7 @@
|
||||
#include "blackgui/userlistmodel.h"
|
||||
#include "blackgui/statusmessagelistmodel.h"
|
||||
#include "blackgui/keyboardkeylistmodel.h"
|
||||
#include "blackgui/infowindowcomponent.h"
|
||||
#include "blackmisc/nwtextmessage.h"
|
||||
#include "blacksound/soundgenerator.h"
|
||||
#include <QMainWindow>
|
||||
@@ -93,7 +93,7 @@ protected:
|
||||
|
||||
private:
|
||||
QScopedPointer<Ui::MainWindow> ui;
|
||||
CInfoWindow *m_infoWindow;
|
||||
BlackGui::CInfoWindowComponent *m_compInfoWindow;
|
||||
bool m_init;
|
||||
GuiModes::WindowMode m_windowMode;
|
||||
AudioTest m_audioTestRunning;
|
||||
@@ -314,14 +314,6 @@ private slots:
|
||||
//! Toogle Windows stay on top
|
||||
void toogleWindowStayOnTop();
|
||||
|
||||
//! Display the overlay window
|
||||
//! Empty string hides window
|
||||
void displayOverlayInfo(const QString &message = "");
|
||||
|
||||
//! Overlay info displaying status message
|
||||
void displayOverlayInfo(const BlackMisc::CStatusMessage &message);
|
||||
|
||||
|
||||
};
|
||||
|
||||
#pragma pop_macro("interface")
|
||||
|
||||
Reference in New Issue
Block a user