From 0b728053f0b3dfb41b298328e0d77870fa72a316 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 12 Aug 2019 00:41:19 +0200 Subject: [PATCH] Ref T709, smaller style changes --- .../simulator/xplane/simulatorxplane.cpp | 4 ++-- src/xswiftbus/messages.cpp | 2 -- src/xswiftbus/messages.h | 21 ++++++++++--------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 71c02917c..fa511e16f 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -461,9 +461,9 @@ namespace BlackSimPlugin Q_ASSERT(isConnected()); QColor color; - if (message.isServerMessage()) { color = "orchid"; } + if (message.isServerMessage()) { color = "orchid"; } else if (message.isSupervisorMessage()) { color = "yellow"; } - else if (message.isPrivateMessage()) { color = "magenta"; } + else if (message.isPrivateMessage()) { color = "magenta"; } else { color = "lime"; } m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage(), color.redF(), color.greenF(), color.blueF()); diff --git a/src/xswiftbus/messages.cpp b/src/xswiftbus/messages.cpp index ceb1d10ff..fa34cc22b 100644 --- a/src/xswiftbus/messages.cpp +++ b/src/xswiftbus/messages.cpp @@ -17,7 +17,6 @@ namespace XSwiftBus { - void CMessageBox::draw() { const int messageCount = static_cast(m_messages.size()); @@ -139,7 +138,6 @@ namespace XSwiftBus m_messageBox.setMessages(end - lines, end); m_messageBox.enableArrows(m_position > lines, m_position < m_messages.size()); } - } //! \endcond diff --git a/src/xswiftbus/messages.h b/src/xswiftbus/messages.h index afab31758..195454ae6 100644 --- a/src/xswiftbus/messages.h +++ b/src/xswiftbus/messages.h @@ -21,7 +21,6 @@ namespace XSwiftBus { - /*! * Class representing a single line of text to be drawn in a message box. */ @@ -44,9 +43,9 @@ namespace XSwiftBus { public: //! 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 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), m_boxLeft(left), m_boxRight(right), m_boxTop(top) {} @@ -73,14 +72,17 @@ namespace XSwiftBus private: std::vector m_messages; - bool m_upArrow = false; + bool m_upArrow = false; bool m_downArrow = false; - int m_boxLeft = 0; - int m_boxRight = 0; - int m_boxTop = 0; + int m_boxLeft = 0; + int m_boxRight = 0; + int m_boxTop = 0; + int m_boxBottom = 0; + int m_lines = 10; + int m_durationMs = 2500; // Screen - DataRef m_screenWidth; + DataRef m_screenWidth; DataRef m_screenHeight; }; @@ -131,7 +133,6 @@ namespace XSwiftBus CCommand m_scrollToBottomCommand; CCommand m_debugCommand; }; - -} +} //ns #endif