From c9ef304ec9a0c0c6993d8e6126538b52d40e1800 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 6 Oct 2024 19:15:03 +0200 Subject: [PATCH] refactor: Remove build-in console The console feature was not documented very well and was only used for a few messages. --- src/blackcore/context/contextapplication.h | 4 -- .../context/contextapplicationproxy.cpp | 2 - src/blackcore/context/contextsimulator.h | 3 -- .../context/contextsimulatorimpl.cpp | 10 ---- src/blackcore/context/contextsimulatorimpl.h | 1 - .../context/contextsimulatorproxy.cpp | 3 -- src/blackcore/simulator.cpp | 1 - src/blackcore/simulator.h | 3 -- .../components/datamaininfoareacomponent.cpp | 8 ---- .../components/datamaininfoareacomponent.h | 3 -- src/blackgui/components/logcomponent.cpp | 30 ------------ src/blackgui/components/logcomponent.h | 12 ----- src/blackgui/components/logcomponent.ui | 47 ------------------- .../components/maininfoareacomponent.cpp | 6 --- .../components/maininfoareacomponent.h | 3 -- src/blackgui/guiapplication.cpp | 36 +++++--------- src/blackgui/guiapplication.h | 1 - src/blackgui/mainwindowaccess.cpp | 9 ---- src/blackgui/mainwindowaccess.h | 3 -- src/swiftdata/swiftdata.cpp | 5 -- src/swiftdata/swiftdata.h | 1 - src/swiftguistandard/swiftguistd.cpp | 14 ------ src/swiftguistandard/swiftguistd.h | 6 --- src/swiftguistandard/swiftguistdinit.cpp | 4 -- 24 files changed, 12 insertions(+), 203 deletions(-) diff --git a/src/blackcore/context/contextapplication.h b/src/blackcore/context/contextapplication.h index 89d4343c72..6aa76cfaf2 100644 --- a/src/blackcore/context/contextapplication.h +++ b/src/blackcore/context/contextapplication.h @@ -97,10 +97,6 @@ namespace BlackCore //! \note Used for hotkey action, do not use directly void remoteHotkeyAction(const QString &action, bool argument, const BlackMisc::CIdentifier &origin); - //! Request a message to be displayed on console, whatever the console is - //! \note no guarantee it is really written to console - void requestDisplayOnConsole(const QString &message); - public slots: //! Ratify some settings changed by another process //! \note Not pure because it can be called from the base class constructor. diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/blackcore/context/contextapplicationproxy.cpp index 294e5e8bbe..cf0e734b27 100644 --- a/src/blackcore/context/contextapplicationproxy.cpp +++ b/src/blackcore/context/contextapplicationproxy.cpp @@ -45,8 +45,6 @@ namespace BlackCore::Context s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), "remoteHotkeyAction", this, SIGNAL(remoteHotkeyAction(QString, bool, BlackMisc::CIdentifier))); Q_ASSERT(s); - s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), - "requestDisplayOnConsole", this, SIGNAL(requestDisplayOnConsole(QString))); Q_UNUSED(s); this->relayBaseClassSignals(serviceName, connection, IContextApplication::ObjectPath(), IContextApplication::InterfaceName()); } diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index a2ef2f397a..e8e9f24efe 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/blackcore/context/contextsimulator.h @@ -149,9 +149,6 @@ namespace BlackCore::Context //! Relevant simulator messages to be explicitly displayed void driverMessages(const BlackMisc::CStatusMessageList &messages); - //! Request a console message (whatever the console maybe) - void requestUiConsoleMessage(const QString &driverMessage, bool clear); - //! Validated model set void validatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator, const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid, diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 49ede4041f..144dd409fa 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -515,8 +515,6 @@ namespace BlackCore::Context Q_ASSERT(c); c = connect(simulator, &ISimulator::driverMessages, this, &IContextSimulator::driverMessages); Q_ASSERT(c); - c = connect(simulator, &ISimulator::requestUiConsoleMessage, this, &IContextSimulator::requestUiConsoleMessage); - Q_ASSERT(c); c = connect(simulator, &ISimulator::autoPublishDataWritten, this, &IContextSimulator::autoPublishDataWritten); Q_ASSERT(c); @@ -1074,14 +1072,6 @@ namespace BlackCore::Context { CInterpolationAndRenderingSetupGlobal rs = this->getInterpolationAndRenderingSetupGlobal(); const QString p1 = parser.part(1); - if (p1 == "show") - { - if (this->getIContextApplication()) - { - emit this->getIContextApplication()->requestDisplayOnConsole(rs.toQString(true)); - } - return true; - } if (!parser.hasPart(2)) { return false; } const bool on = stringToBool(parser.part(2)); if (p1 == "debug") { rs.setSimulatorDebuggingMessages(on); } diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index 3e9c6b348a..e8ed93870d 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/blackcore/context/contextsimulatorimpl.h @@ -270,7 +270,6 @@ namespace BlackCore { if (BlackMisc::CSimpleCommandParser::registered("BlackCore::CContextSimulator")) { return; } BlackMisc::CSimpleCommandParser::registerCommand({ ".ris", "rendering/interpolation setup (global setup)" }); - BlackMisc::CSimpleCommandParser::registerCommand({ ".ris show", "display rendering/interpolation setup on console (global setup)" }); BlackMisc::CSimpleCommandParser::registerCommand({ ".ris debug on|off", "rendering/interpolation debug messages (global setup)" }); BlackMisc::CSimpleCommandParser::registerCommand({ ".ris parts on|off", "aircraft parts (global setup)" }); } diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/blackcore/context/contextsimulatorproxy.cpp index e8ab0e1e46..9de3c3c816 100644 --- a/src/blackcore/context/contextsimulatorproxy.cpp +++ b/src/blackcore/context/contextsimulatorproxy.cpp @@ -91,9 +91,6 @@ namespace BlackCore::Context "driverMessages", this, SIGNAL(driverMessages(BlackMisc::CStatusMessageList))); Q_ASSERT(s); - s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), - "requestUiConsoleMessage", this, SIGNAL(requestUiConsoleMessage(QString, bool))); - Q_ASSERT(s); s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), "validatedModelSet", this, SIGNAL(validatedModelSet(BlackMisc::Simulation::CSimulatorInfo, BlackMisc::Simulation::CAircraftModelList, BlackMisc::Simulation::CAircraftModelList, bool, BlackMisc::CStatusMessageList))); Q_ASSERT(s); diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index ff2f884448..1b9c956167 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -1285,7 +1285,6 @@ namespace BlackCore if (!dm.isEmpty()) { this->displayStatusMessage(CStatusMessage(this).info(dm)); - emit this->requestUiConsoleMessage(dm, true); } const int t = CMathUtils::randomInteger(4500, 5500); // makes sure not always using the same time difference diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index a63cd35b2a..865f9d96c5 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -379,9 +379,6 @@ namespace BlackCore //! Relevant simulator messages to be explicitly displayed void driverMessages(const BlackMisc::CStatusMessageList &messages); - //! Request a console message (whatever the console maybe) - void requestUiConsoleMessage(const QString &driverMessage, bool clear); - //! Requested elevation, call pending void requestedElevation(const BlackMisc::Aviation::CCallsign &callsign); diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/blackgui/components/datamaininfoareacomponent.cpp index 0b046742b4..2d1b96dc49 100644 --- a/src/blackgui/components/datamaininfoareacomponent.cpp +++ b/src/blackgui/components/datamaininfoareacomponent.cpp @@ -67,14 +67,6 @@ namespace BlackGui::Components this->getLogComponent()->displayLog(); } - void CDataMainInfoAreaComponent::displayConsole() - { - this->selectArea(InfoAreaLog); - BLACK_VERIFY_X(this->getLogComponent(), Q_FUNC_INFO, "No log component"); - if (!this->getLogComponent()) { return; } - this->getLogComponent()->displayConsole(); - } - void CDataMainInfoAreaComponent::selectLog() { this->selectArea(InfoAreaLog); diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/blackgui/components/datamaininfoareacomponent.h index ad9cc50c6e..5b0400489c 100644 --- a/src/blackgui/components/datamaininfoareacomponent.h +++ b/src/blackgui/components/datamaininfoareacomponent.h @@ -68,9 +68,6 @@ namespace BlackGui::Components //! Display the log void displayLog(); - //! Display console - void displayConsole(); - public slots: //! Select log area void selectLog(); diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index 9269ba98bd..e87aeb1125 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -45,7 +45,6 @@ namespace BlackGui::Components CLogComponent::CLogComponent(QWidget *parent) : QFrame(parent), ui(new Ui::CLogComponent), m_history(this) { ui->setupUi(this); - connect(ui->comp_StatusMessages, &CStatusMessagesDetail::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged); connect(&m_history, &CLogHistoryReplica::elementAdded, this, [this](const CStatusMessage &message) { ui->comp_StatusMessages->appendStatusMessageToList(message); @@ -66,13 +65,6 @@ namespace BlackGui::Components void CLogComponent::displayLog(bool attention) { - ui->tw_StatusPage->setCurrentIndex(0); - if (attention) { emit this->requestAttention(); } - } - - void CLogComponent::displayConsole(bool attention) - { - ui->tw_StatusPage->setCurrentIndex(1); if (attention) { emit this->requestAttention(); } } @@ -118,33 +110,11 @@ namespace BlackGui::Components void CLogComponent::clear() { - ui->tep_StatusPageConsole->clear(); ui->comp_StatusMessages->clear(); } - void CLogComponent::clearConsole() - { - ui->tep_StatusPageConsole->clear(); - } - void CLogComponent::clearMessages() { ui->comp_StatusMessages->clear(); } - - void CLogComponent::appendPlainTextToConsole(const QString &text) - { - ui->tep_StatusPageConsole->appendPlainText(text); - } - - void CLogComponent::onStatusMessageDataChanged(int count, bool withFilter) - { - Q_UNUSED(count); - Q_UNUSED(withFilter); - const int i = ui->tw_StatusPage->indexOf(ui->pg_LogPage); - QString o = ui->tw_StatusPage->tabText(i); - const QString f = withFilter ? "F" : ""; - o = CGuiUtility::replaceTabCountValue(o, ui->comp_StatusMessages->rowCount()) + f; - ui->tw_StatusPage->setTabText(i, o); - } } // namespace diff --git a/src/blackgui/components/logcomponent.h b/src/blackgui/components/logcomponent.h index d00d71f671..b0b906db23 100644 --- a/src/blackgui/components/logcomponent.h +++ b/src/blackgui/components/logcomponent.h @@ -55,9 +55,6 @@ namespace BlackGui::Components //! Display log void displayLog(bool attention = false); - //! Display console - void displayConsole(bool attention = false); - //! \copydoc BlackGui::Components::CStatusMessagesDetail::filterUseRadioButtonDescriptiveIcons void filterUseRadioButtonDescriptiveIcons(bool oneLetterText); @@ -85,15 +82,9 @@ namespace BlackGui::Components //! Clear void clear(); - //! Clear - void clearConsole(); - //! Clear void clearMessages(); - //! Append plain text to console - void appendPlainTextToConsole(const QString &text); - signals: //! Make me visible void requestAttention(); @@ -101,9 +92,6 @@ namespace BlackGui::Components private: QScopedPointer ui; BlackMisc::CLogHistoryReplica m_history; - - //! Status messages changed - void onStatusMessageDataChanged(int count, bool withFilter); }; } // ns #endif // guard diff --git a/src/blackgui/components/logcomponent.ui b/src/blackgui/components/logcomponent.ui index b3f99d010f..31c84035b6 100644 --- a/src/blackgui/components/logcomponent.ui +++ b/src/blackgui/components/logcomponent.ui @@ -22,10 +22,6 @@ 0 - - - 0 - Log @@ -51,49 +47,6 @@ - - - Console - - - - 4 - - - 2 - - - 3 - - - 2 - - - 2 - - - - - - 75 - false - true - - - - Console output - - - QPlainTextEdit::NoWrap - - - true - - - - - - diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp index fd3afd334f..f82770d9be 100644 --- a/src/blackgui/components/maininfoareacomponent.cpp +++ b/src/blackgui/components/maininfoareacomponent.cpp @@ -99,12 +99,6 @@ namespace BlackGui::Components this->selectArea(InfoAreaLog); } - void CMainInfoAreaComponent::displayConsole() - { - ui->comp_Log->displayConsole(); - this->selectArea(InfoAreaLog); - } - void CMainInfoAreaComponent::selectArea(CMainInfoAreaComponent::InfoArea infoArea) { CInfoArea::selectArea(static_cast(infoArea)); diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h index 0cc15d93bb..626e5f1c39 100644 --- a/src/blackgui/components/maininfoareacomponent.h +++ b/src/blackgui/components/maininfoareacomponent.h @@ -110,9 +110,6 @@ namespace BlackGui::Components //! Display the log void displayLog(); - //! Display console - void displayConsole(); - //! Toggle floating of given area void toggleFloating(InfoArea infoArea) { CInfoArea::toggleFloatingByIndex(static_cast(infoArea)); } diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 279cbccfe6..f3d3b048e9 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -570,14 +570,6 @@ namespace BlackGui return m->displayInOverlayWindow(html, timeOutMs); } - bool CGuiApplication::displayTextInConsole(const QString &text) - { - IMainWindowAccess *m = mainWindowAccess(); - BLACK_VERIFY_X(m, Q_FUNC_INFO, "No access interface"); - if (!m) { return false; } - return m->displayTextInConsole(text); - } - void CGuiApplication::addMenuForSettingsAndCache(QMenu &menu) { QMenu *sm = menu.addMenu(CIcons::appSettings16(), "Settings"); @@ -597,7 +589,7 @@ namespace BlackGui c = connect(a, &QAction::triggered, this, [=] { if (!sGui || sGui->isShuttingDown()) { return; } CSettingsCache::instance()->clearAllValues(); - this->displayTextInConsole("Cleared all settings!"); + CLogMessage(this).info(u"Cleared all settings!"); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -605,7 +597,7 @@ namespace BlackGui c = connect(a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const QStringList files(CSettingsCache::instance()->enumerateStore()); - this->displayTextInConsole(files.join("\n")); + CLogMessage(this).info(files.join("\n")); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -625,7 +617,7 @@ namespace BlackGui c = connect(a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const QStringList files = CApplication::clearCaches(); - this->displayTextInConsole(u"Cleared caches! " % QString::number(files.size()) + " files"); + CLogMessage(this).info(u"Cleared caches! " % QString::number(files.size()) + " files"); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -633,7 +625,7 @@ namespace BlackGui c = connect(a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const QStringList files(CDataCache::instance()->enumerateStore()); - this->displayTextInConsole(files.join("\n")); + CLogMessage(this).info(files.join("\n")); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -659,7 +651,7 @@ namespace BlackGui c = connect(a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const QString r = CNetworkUtils::createNetworkAccessManagerReport(this->getNetworkAccessManager()); - this->displayTextInConsole(r); + CLogMessage(this).info(r); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_UNUSED(c) @@ -725,7 +717,7 @@ namespace BlackGui a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const CGlobalSetup s = this->getGlobalSetup(); - this->displayTextInConsole(s.toJsonString()); + CLogMessage(this).info(s.toJsonString()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -735,7 +727,7 @@ namespace BlackGui a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } const CUpdateInfo info = this->getUpdateInfo(); - this->displayTextInConsole(info.toJsonString()); + CLogMessage(this).info(info.toJsonString()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -746,8 +738,7 @@ namespace BlackGui c = connect( a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } - this->displayTextInConsole(this->getWebDataServices()->getReadersLog()); - CLogMessage(this).info(u"Displayed services log."); + CLogMessage(this).info(this->getWebDataServices()->getReadersLog()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -758,7 +749,7 @@ namespace BlackGui if (!sGui || sGui->isShuttingDown()) { return; } if (!this->getWebDataServices()->getDbInfoDataReader()) { return; } const CDbInfoList info = this->getWebDataServices()->getDbInfoDataReader()->getInfoObjects(); - this->displayTextInConsole(u"DB info:\n" % info.toJsonString()); + CLogMessage(this).info(u"DB info:\n" % info.toJsonString()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -769,7 +760,7 @@ namespace BlackGui if (!sGui || sGui->isShuttingDown()) { return; } if (!this->getWebDataServices()->getDbInfoDataReader()) { return; } const CDbInfoList info = this->getWebDataServices()->getSharedInfoDataReader()->getInfoObjects(); - this->displayTextInConsole(u"Shared info:\n" % info.toJsonString()); + CLogMessage(this).info(u"Shared info:\n" % info.toJsonString()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -779,7 +770,7 @@ namespace BlackGui c = connect( a, &QAction::triggered, this, [=]() { if (!sGui || sGui->isShuttingDown()) { return; } - this->displayTextInConsole(getAllUserMetatypesTypes()); + CLogMessage(this).info(getAllUserMetatypesTypes()); }, Qt::QueuedConnection); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); @@ -1030,10 +1021,7 @@ namespace BlackGui void CGuiApplication::onCoreFacadeStarted() { - if (this->supportsContexts()) - { - connect(this->getIContextApplication(), &IContextApplication::requestDisplayOnConsole, this, &CGuiApplication::displayTextInConsole); - } + // Nothing to do here } void CGuiApplication::checkNewVersion(bool onlyIfNew) diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 850145e9db..b6e265b814 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -124,7 +124,6 @@ namespace BlackGui //! @{ //! direct access to main application window bool displayInStatusBar(const BlackMisc::CStatusMessage &message) override; - bool displayTextInConsole(const QString &text) override; bool displayInOverlayWindow(const BlackMisc::CStatusMessage &message, int timeOutMs = -1) override; bool displayInOverlayWindow(const BlackMisc::CStatusMessageList &messages, int timeOutMs = -1) override; bool displayInOverlayWindow(const QString &html, int timeOutMs = -1) override; diff --git a/src/blackgui/mainwindowaccess.cpp b/src/blackgui/mainwindowaccess.cpp index 7aa9232aed..33438b60e5 100644 --- a/src/blackgui/mainwindowaccess.cpp +++ b/src/blackgui/mainwindowaccess.cpp @@ -15,15 +15,6 @@ namespace BlackGui // void } - bool IMainWindowAccess::displayTextInConsole(const QString &message) - { - if (message.isEmpty()) { return false; } - if (!m_mwaLogComponent) { return false; } - m_mwaLogComponent->appendPlainTextToConsole(message); - m_mwaLogComponent->displayConsole(true); - return true; - } - bool IMainWindowAccess::displayInStatusBar(const CStatusMessage &message) { if (message.isEmpty()) { return false; } diff --git a/src/blackgui/mainwindowaccess.h b/src/blackgui/mainwindowaccess.h index 15e1f436f4..2739e2b9e6 100644 --- a/src/blackgui/mainwindowaccess.h +++ b/src/blackgui/mainwindowaccess.h @@ -37,9 +37,6 @@ namespace BlackGui //! Copy assignment operator IMainWindowAccess &operator=(const IMainWindowAccess &) = delete; - //! Display in console - virtual bool displayTextInConsole(const QString &message); - //! Display in status bar virtual bool displayInStatusBar(const BlackMisc::CStatusMessage &message); diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index a7e86dc652..36ad95572e 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -171,11 +171,6 @@ void CSwiftData::consolidationSettingChanged() } } -void CSwiftData::displayConsole() -{ - ui->comp_MainInfoArea->displayConsole(); -} - void CSwiftData::displayLog() { ui->comp_MainInfoArea->displayLog(); diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 984b4e3ff3..922761ee3f 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -81,7 +81,6 @@ class CSwiftData : void performGracefulShutdown(); void consolidationSettingChanged(); - void displayConsole(); void displayLog(); void checkMinimumVersion(); diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index ed9497ef18..2d87508942 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -409,15 +409,6 @@ void SwiftGuiStd::onChangedMainInfoAreaFloating(bool floating) Q_UNUSED(floating) } -void SwiftGuiStd::onRequestedConsoleMessage(const QString &logMsg, bool clear) -{ - if (logMsg.isEmpty()) { return; } - CLogComponent *log = ui->comp_MainInfoArea->getLogComponent(); - Q_ASSERT_X(log, Q_FUNC_INFO, "Missing log component"); - if (clear) { log->clearConsole(); } - log->appendPlainTextToConsole(logMsg); -} - void SwiftGuiStd::onAudioClientFailure(const CStatusMessage &msg) { if (msg.isEmpty()) { return; } @@ -545,11 +536,6 @@ void SwiftGuiStd::playNotifcationSound(CNotificationSounds::NotificationFlag not sGui->getCContextAudioBase()->playNotification(notification, true); } -void SwiftGuiStd::displayConsole() -{ - ui->comp_MainInfoArea->displayConsole(); -} - void SwiftGuiStd::displayLog() { ui->comp_MainInfoArea->displayLog(); diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 467022d2d7..d2e8403a61 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -191,9 +191,6 @@ class SwiftGuiStd : //! Play notifcation sound void playNotifcationSound(BlackMisc::Audio::CNotificationSounds::NotificationFlag notification) const; - //! Display console - void displayConsole(); - //! Display log void displayLog(); @@ -281,9 +278,6 @@ class SwiftGuiStd : //! Whole main info area floating void onChangedMainInfoAreaFloating(bool floating); - //! UI Console message has been recevied - void onRequestedConsoleMessage(const QString &logMsg, bool clear); - //! Reported issue with the client void onAudioClientFailure(const BlackMisc::CStatusMessage &msg); diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index 764579944f..dd95b46768 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -145,8 +145,6 @@ void SwiftGuiStd::init() Q_ASSERT(s); s = connect(sGui->getIContextNetwork(), &IContextNetwork::kicked, this, &SwiftGuiStd::onKickedFromNetwork, Qt::QueuedConnection); Q_ASSERT(s); - s = connect(sGui->getIContextSimulator(), &IContextSimulator::requestUiConsoleMessage, this, &SwiftGuiStd::onRequestedConsoleMessage, Qt::QueuedConnection); - Q_ASSERT(s); s = connect(sGui->getIContextSimulator(), &IContextSimulator::validatedModelSet, this, &SwiftGuiStd::onValidatedModelSet, Qt::QueuedConnection); Q_ASSERT(s); s = connect(&m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::handleTimerBasedUpdates); @@ -177,8 +175,6 @@ void SwiftGuiStd::init() this->initMenus(); // info - ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(sGui->swiftVersionString()); - ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CBuildConfig::compiledWithInfo()); connect(ui->comp_InfoBarStatus, &CInfoBarStatusComponent::transponderModeChanged, ui->dw_InfoBarStatus, &CDockWidgetInfoBar::reloadStyleSheet, Qt::QueuedConnection); // Show kill button