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:
Klaus Basan
2014-06-17 17:59:14 +02:00
parent ab77f19544
commit 0547b2847e
13 changed files with 435 additions and 239 deletions

View File

@@ -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")