flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, smaller style changes

Browse Source
This commit is contained in:
Klaus Basan
2019-08-12 00:41:19 +02:00
committed by Mat Sutcliffe
parent 26afc5160d
commit 0b728053f0
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -461,9 +461,9 @@ namespace BlackSimPlugin
Q_ASSERT(isConnected()); Q_ASSERT(isConnected());
QColor color; QColor color;
if (message.isServerMessage()) { color = "orchid"; } if (message.isServerMessage()) { color = "orchid"; }
else if (message.isSupervisorMessage()) { color = "yellow"; } else if (message.isSupervisorMessage()) { color = "yellow"; }
else if (message.isPrivateMessage()) { color = "magenta"; } else if (message.isPrivateMessage()) { color = "magenta"; }
else { color = "lime"; } else { color = "lime"; }
m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage(), color.redF(), color.greenF(), color.blueF()); m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage(), color.redF(), color.greenF(), color.blueF());

2
src/xswiftbus/messages.cpp
View File

@@ -17,7 +17,6 @@
namespace XSwiftBus namespace XSwiftBus
{ {
void CMessageBox::draw() void CMessageBox::draw()
{ {
const int messageCount = static_cast<int>(m_messages.size()); const int messageCount = static_cast<int>(m_messages.size());
@@ -139,7 +138,6 @@ namespace XSwiftBus
m_messageBox.setMessages(end - lines, end); m_messageBox.setMessages(end - lines, end);
m_messageBox.enableArrows(m_position > lines, m_position < m_messages.size()); m_messageBox.enableArrows(m_position > lines, m_position < m_messages.size());
} }
} }
//! \endcond //! \endcond

21
src/xswiftbus/messages.h
View File

@@ -21,7 +21,6 @@
namespace XSwiftBus namespace XSwiftBus
{ {
/*! /*!
* Class representing a single line of text to be drawn in a message box. * Class representing a single line of text to be drawn in a message box.
*/ */
@@ -44,9 +43,9 @@ namespace XSwiftBus
{ {
public: public:
//! Constructor. //! Constructor.
//! \param left Number of "virtual pixels" between screen left edge and box left edge. //! \param left Number of "virtual pixels" between screen left edge and box left edge.
//! \param right Number of "virtual pixels" between screen right edge and box right edge. //! \param right Number of "virtual pixels" between screen right edge and box right edge.
//! \param top Number of "virtual pixels" between screen top edge and box top edge. //! \param top Number of "virtual pixels" between screen top edge and box top edge.
CMessageBox(int left, int right, int top) : CDrawable(xplm_Phase_Window, true), CMessageBox(int left, int right, int top) : CDrawable(xplm_Phase_Window, true),
m_boxLeft(left), m_boxRight(right), m_boxTop(top) {} m_boxLeft(left), m_boxRight(right), m_boxTop(top) {}
@@ -73,14 +72,17 @@ namespace XSwiftBus
private: private:
std::vector<CMessage> m_messages; std::vector<CMessage> m_messages;
bool m_upArrow = false; bool m_upArrow = false;
bool m_downArrow = false; bool m_downArrow = false;
int m_boxLeft = 0; int m_boxLeft = 0;
int m_boxRight = 0; int m_boxRight = 0;
int m_boxTop = 0; int m_boxTop = 0;
int m_boxBottom = 0;
int m_lines = 10;
int m_durationMs = 2500;
// Screen // Screen
DataRef<xplane::data::sim::graphics::view::window_width> m_screenWidth; DataRef<xplane::data::sim::graphics::view::window_width> m_screenWidth;
DataRef<xplane::data::sim::graphics::view::window_height> m_screenHeight; DataRef<xplane::data::sim::graphics::view::window_height> m_screenHeight;
}; };
@@ -131,7 +133,6 @@ namespace XSwiftBus
CCommand m_scrollToBottomCommand; CCommand m_scrollToBottomCommand;
CCommand m_debugCommand; CCommand m_debugCommand;
}; };
} //ns
}
#endif #endif