refs #471, removed old info window and migrated to overlay widget

* added small message display (more suitable for swift GUI)
* fixed nullptr bug with ESC key
* adjusted swift GUI
This commit is contained in:
Klaus Basan
2015-11-02 19:31:32 +01:00
committed by Mathew Sutcliffe
parent 012543ef02
commit 8e57914e67
15 changed files with 365 additions and 494 deletions

View File

@@ -113,6 +113,9 @@
</item>
<item>
<widget class="QStackedWidget" name="sw_StatusMessagesComponent">
<property name="currentIndex">
<number>2</number>
</property>
<widget class="QWidget" name="pg_StatusMessages">
<layout class="QVBoxLayout" name="vl_PgStatusMessages">
<property name="spacing">
@@ -174,6 +177,35 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_StatusMessageSmall">
<layout class="QVBoxLayout" name="vl_StatusMessageSmall">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="BlackGui::CStatusMessageFormSmall" name="form_StatusMessageSmall">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_TextMessage">
<layout class="QVBoxLayout" name="vl_TextMessage">
<property name="spacing">
@@ -257,6 +289,12 @@
<header>blackgui/statusmessageform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CStatusMessageFormSmall</class>
<extends>QFrame</extends>
<header>blackgui/statusmessageformsmall.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../blackmisc/blackmisc.qrc"/>