flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T592, frame around entry line in floating text message window

Browse Source
This commit is contained in:
Klaus Basan
2019-04-05 16:32:00 +02:00
committed by Mat Sutcliffe
parent eb5670abef
commit ba33ebb1f5
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -64,12 +64,12 @@ namespace BlackGui
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tw_TextMessages->setCurrentIndex(0); ui->tw_TextMessages->setCurrentIndex(0);
ui->lep_textMessages->setVisible(false); ui->fr_TextMessage->setVisible(false);
ui->tvp_TextMessagesAll->setResizeMode(CTextMessageView::ResizingAuto); ui->tvp_TextMessagesAll->setResizeMode(CTextMessageView::ResizingAuto);
ui->comp_AtcStations->setWithIcons(false); ui->comp_AtcStations->setWithIcons(false);
// lep_textMessages is the own line edit // lep_textMessages is the own line edit
bool c = connect(ui->lep_textMessages, &CLineEditHistory::returnPressedUnemptyLine, this, &CTextMessageComponent::textMessageEntered, Qt::QueuedConnection); bool c = connect(ui->lep_TextMessages, &CLineEditHistory::returnPressedUnemptyLine, this, &CTextMessageComponent::textMessageEntered, Qt::QueuedConnection);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
c = connect(ui->gb_Settings, &QGroupBox::toggled, this, &CTextMessageComponent::onSettingsChecked, Qt::QueuedConnection); c = connect(ui->gb_Settings, &QGroupBox::toggled, this, &CTextMessageComponent::onSettingsChecked, Qt::QueuedConnection);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
@@ -542,15 +542,15 @@ namespace BlackGui
{ {
// own input field if floating window // own input field if floating window
Q_UNUSED(widget); Q_UNUSED(widget);
ui->lep_textMessages->setVisible(topLevel); ui->fr_TextMessage->setVisible(topLevel);
} }
void CTextMessageComponent::textMessageEntered() void CTextMessageComponent::textMessageEntered()
{ {
if (!ui->lep_textMessages->isVisible()) { return; } if (!ui->fr_TextMessage->isVisible() || !ui->lep_TextMessages->isVisible()) { return; }
if (!this->isVisible()) { return; } if (!this->isVisible()) { return; }
const QString cl(ui->lep_textMessages->getLastEnteredLineFormatted()); const QString cl(ui->lep_TextMessages->getLastEnteredLineFormatted());
if (!cl.isEmpty()) if (!cl.isEmpty())
{ {
this->handleEnteredTextMessage(cl); this->handleEnteredTextMessage(cl);
@@ -754,13 +754,13 @@ namespace BlackGui
void CTextMessageComponent::showTextMessageEntry(bool show) void CTextMessageComponent::showTextMessageEntry(bool show)
{ {
ui->lep_textMessages->setVisible(show); ui->fr_TextMessage->setVisible(show);
} }
void CTextMessageComponent::focusTextEntry() void CTextMessageComponent::focusTextEntry()
{ {
if (!ui->lep_textMessages->isVisible()) { return; } if (!ui->lep_TextMessages->isVisible()) { return; }
ui->lep_textMessages->setFocus(); ui->lep_TextMessages->setFocus();
} }
void CTextMessageComponent::removeAllMessagesTab() void CTextMessageComponent::removeAllMessagesTab()

35
src/blackgui/components/textmessagecomponent.ui
View File

@@ -2,14 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>CTextMessageComponent</class> <class>CTextMessageComponent</class>
<widget class="QFrame" name="CTextMessageComponent"> <widget class="QFrame" name="CTextMessageComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>260</width>
<height>297</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Text messages</string> <string>Text messages</string>
</property> </property>
@@ -297,13 +289,25 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="BlackGui::CLineEditHistory" name="lep_textMessages"> <widget class="QFrame" name="fr_TextMessage">
<property name="toolTip"> <property name="frameShape">
<string>command line (e.g. &quot;.com1&quot;, &quot;.x&quot;, &quot;.msg com1&quot;)</string> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="placeholderText"> <property name="frameShadow">
<string>text message text goes here</string> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="hl_TextMessage">
<item>
<widget class="BlackGui::CLineEditHistory" name="lep_TextMessages">
<property name="toolTip">
<string>command line (e.g. &quot;.com1&quot;, &quot;.x&quot;, &quot;.msg com1&quot;)</string>
</property>
<property name="placeholderText">
<string>text message text goes here</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -346,11 +350,12 @@
<tabstops> <tabstops>
<tabstop>tw_TextMessages</tabstop> <tabstop>tw_TextMessages</tabstop>
<tabstop>tvp_TextMessagesAll</tabstop> <tabstop>tvp_TextMessagesAll</tabstop>
<tabstop>gb_MessageTo</tabstop>
<tabstop>gb_Settings</tabstop> <tabstop>gb_Settings</tabstop>
<tabstop>lep_textMessages</tabstop> <tabstop>lep_TextMessages</tabstop>
<tabstop>tep_TextMessagesUnicom</tabstop>
<tabstop>tep_TextMessagesCOM1</tabstop> <tabstop>tep_TextMessagesCOM1</tabstop>
<tabstop>tep_TextMessagesCOM2</tabstop> <tabstop>tep_TextMessagesCOM2</tabstop>
<tabstop>tep_TextMessagesUnicom</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>