flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-04 17:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hide info window with no data, correcte field to le_SmCategories

Browse Source
This commit is contained in:
Klaus Basan
2015-01-18 23:30:54 +01:00
parent df2ba8aa22
commit 2f704d2601
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/components/infowindowcomponent.cpp
View File

@@ -96,7 +96,7 @@ namespace BlackGui
} }
this->ui->le_SmSeverity->setText(statusMessage.getSeverityAsString()); this->ui->le_SmSeverity->setText(statusMessage.getSeverityAsString());
this->ui->le_SmType->setText(statusMessage.getCategories().toQString()); // TODO should be called ui->le_SmCategories this->ui->le_SmCategories->setText(statusMessage.getCategories().toQString());
this->ui->te_SmStatusMessage->setText(statusMessage.getMessage()); this->ui->te_SmStatusMessage->setText(statusMessage.getMessage());
this->ui->lbl_SmSeverityIcon->setPixmap(statusMessage.toPixmap()); this->ui->lbl_SmSeverityIcon->setPixmap(statusMessage.toPixmap());
@@ -109,13 +109,23 @@ namespace BlackGui
*/ */
void CInfoWindowComponent::display(const BlackMisc::CVariant &variant, int displayTimeMs) void CInfoWindowComponent::display(const BlackMisc::CVariant &variant, int displayTimeMs)
{ {
if (variant.isNull()) return; if (variant.isNull())
{
this->hide();
return;
}
if (variant.canConvert<CTextMessage>()) if (variant.canConvert<CTextMessage>())
{
this->displayTextMessage(variant.value<CTextMessage>(), displayTimeMs); this->displayTextMessage(variant.value<CTextMessage>(), displayTimeMs);
}
else if (variant.canConvert<CStatusMessage>()) else if (variant.canConvert<CStatusMessage>())
{
this->displayStatusMessage(variant.value<CStatusMessage>(), displayTimeMs); this->displayStatusMessage(variant.value<CStatusMessage>(), displayTimeMs);
}
else else
{
this->displayStringMessage(variant.toQString(), displayTimeMs); this->displayStringMessage(variant.toQString(), displayTimeMs);
}
} }
/* /*

9
src/blackgui/components/infowindowcomponent.ui
View File

@@ -152,9 +152,12 @@
<item> <item>
<layout class="QGridLayout" name="gl_StatusMessage"> <layout class="QGridLayout" name="gl_StatusMessage">
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_SmType"> <widget class="QLabel" name="lbl_SmCategories">
<property name="toolTip">
<string>Categories</string>
</property>
<property name="text"> <property name="text">
<string>Type</string> <string>Cat.</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -169,7 +172,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="le_SmType"> <widget class="QLineEdit" name="le_SmCategories">
<property name="text"> <property name="text">
<string>type</string> <string>type</string>
</property> </property>