From e6a29a083ee9988e6b6edcc94a5e837f9f2ae874 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 4 Feb 2014 18:31:53 +0100 Subject: [PATCH] Remove dummy blackd folder blackd contained dummy code for a future daemon running blackcore. It was just a dummy window and every other line of code contained deprecated dependencies. refs #90 --- src/blackd/CMakeLists.txt | 25 ---- src/blackd/blackd.cpp | 174 ---------------------------- src/blackd/blackd.h | 73 ------------ src/blackd/blackd.pro | 29 ----- src/blackd/blackd.qrc | 5 - src/blackd/blackd.ui | 33 ------ src/blackd/images/blackbox.svg | 101 ---------------- src/blackd/images/blackbox_icon.svg | 102 ---------------- src/blackd/main.cpp | 37 ------ src/blackd/qt_displayer.cpp | 78 ------------- src/blackd/qt_displayer.h | 31 ----- 11 files changed, 688 deletions(-) delete mode 100644 src/blackd/CMakeLists.txt delete mode 100644 src/blackd/blackd.cpp delete mode 100644 src/blackd/blackd.h delete mode 100644 src/blackd/blackd.pro delete mode 100644 src/blackd/blackd.qrc delete mode 100644 src/blackd/blackd.ui delete mode 100644 src/blackd/images/blackbox.svg delete mode 100644 src/blackd/images/blackbox_icon.svg delete mode 100644 src/blackd/main.cpp delete mode 100644 src/blackd/qt_displayer.cpp delete mode 100644 src/blackd/qt_displayer.h diff --git a/src/blackd/CMakeLists.txt b/src/blackd/CMakeLists.txt deleted file mode 100644 index 53762e858..000000000 --- a/src/blackd/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -FILE(GLOB blackd_SOURCES *.cpp) -FILE(GLOB blackd_HEADERS *.h) -SET(blackd_HEADERS_QOBJECT - blackd.h) - -SET(blackd_FORMS blackd.ui) -SET(blackd_RESOURCES blackd.qrc) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - -QT4_WRAP_CPP(blackd_HEADERS_MOC ${blackd_HEADERS_QOBJECT}) -QT4_WRAP_UI(blackd_FORMS_HEADERS ${blackd_FORMS}) -QT4_ADD_RESOURCES(blackd_RESOURCES_RCC ${blackd_RESOURCES}) - -SOURCE_GROUP(QtGeneratedMocSrc FILES ${blackd_HEADERS_MOC}) -SOURCE_GROUP (QtResources FILES ${blackd_RESOURCES_RCC}) -SOURCE_GROUP (QtForms FILES ${blackd_FORMS_HEADERS}) - -ADD_EXECUTABLE(blackd WIN32 MACOSX_BUNDLE ${blackd_SOURCES} - ${blackd_HEADERS_MOC} - ${blackd_FORMS_HEADERS} - ${blackd_RESOURCES_RCC}) - -TARGET_LINK_LIBRARIES(blackd blackmisc blackcore ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) -SET_TARGET_PROPERTIES(blackd PROPERTIES PROJECT_LABEL "BlackBox Daemon - blackd") \ No newline at end of file diff --git a/src/blackd/blackd.cpp b/src/blackd/blackd.cpp deleted file mode 100644 index fd18bd94d..000000000 --- a/src/blackd/blackd.cpp +++ /dev/null @@ -1,174 +0,0 @@ -//! Copyright (C) 2013 Roland Winklmeier -//! This Source Code Form is subject to the terms of the Mozilla Public -//! License, v. 2.0. If a copy of the MPL was not distributed with this -//! file, You can obtain one at http://mozilla.org/MPL/2.0/ - -#include -#include -#include - -#include "blackmisc/context.h" -#include "blackmisc/debug.h" -#include "blackmisc/message_factory.h" -#include "blackcore/fsd_client.h" - -#include "qt_displayer.h" - -#include "blackd.h" -#include "ui_blackd.h" - -using namespace FSD; - - -BlackD::BlackD(QWidget *parent) : - QDialog(parent), - ui(new Ui::BlackD) -{ - ui->setupUi(this); - - createActions(); - createTrayIcon(); - - connect(trayIcon, &QSystemTrayIcon::activated, - this, &BlackD::iconActivated); - - setWindowTitle(tr("BlackD")); - - QIcon icon = QIcon(":/images/blackbox_icon.svg"); - trayIcon->setIcon(icon); - trayIcon->show(); - - setWindowIcon(icon); - - createLogging(); - - createComServer(); - - m_fsd_client = new CFSDClient(BlackMisc::IContext::getInstance()); - - bAppDebug << "BlackDaemon running..."; -} - -BlackD::~BlackD() -{ - delete ui; -} - -void BlackD::setVisible(bool visible) -{ - minimizeAction->setEnabled(visible); - maximizeAction->setEnabled(!isMaximized()); - restoreAction->setEnabled(isMaximized() || !visible); - QDialog::setVisible(visible); -} - -void BlackD::closeEvent(QCloseEvent *event) -{ - if (trayIcon->isVisible()) - { - QMessageBox::information(this, tr("BlackD"), - tr("The program will keep running in the " - "system tray. To terminate the program, " - "choose Quit in the context menu " - "of the system tray entry.")); - hide(); - event->ignore(); - } -} - -void BlackD::iconActivated(QSystemTrayIcon::ActivationReason reason) -{ - switch (reason) - { - case QSystemTrayIcon::DoubleClick: - setVisible(!isVisible()); - break; - default: - break; - } -} - -void BlackD::createActions() -{ - minimizeAction = new QAction(tr("Mi&nimize"), this); - connect(minimizeAction, SIGNAL(triggered()), this, SLOT(hide())); - - maximizeAction = new QAction(tr("Ma&ximize"), this); - connect(maximizeAction, SIGNAL(triggered()), this, SLOT(showMaximized())); - - restoreAction = new QAction(tr("&Restore"), this); - connect(restoreAction, SIGNAL(triggered()), this, SLOT(showNormal())); - - quitAction = new QAction(tr("&Quit"), this); - connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); -} - -void BlackD::createTrayIcon() -{ - trayIconMenu = new QMenu(this); - trayIconMenu->addAction(minimizeAction); - trayIconMenu->addAction(maximizeAction); - trayIconMenu->addAction(restoreAction); - trayIconMenu->addSeparator(); - trayIconMenu->addAction(quitAction); - - trayIcon = new QSystemTrayIcon(this); - trayIcon->setContextMenu(trayIconMenu); -} - -void BlackD::createLogging() -{ - BlackMisc::IContext::getInstance().getDebug().create(); - - m_displayer = new CQtDisplayer(ui->logginView); - - BlackMisc::IContext::getInstance().getDebug().getDebugLog()->attachDisplay(m_displayer); - BlackMisc::IContext::getInstance().getDebug().getInfoLog()->attachDisplay(m_displayer); - BlackMisc::IContext::getInstance().getDebug().getWarningLog()->attachDisplay(m_displayer); - BlackMisc::IContext::getInstance().getDebug().getErrorLog()->attachDisplay(m_displayer); -} - -void BlackD::createComServer() -{ - BlackMisc::CMessageFactory::getInstance().registerMessages(); - m_comserver = new BlackMisc::CComServer(BlackMisc::IContext::getInstance(), this); - - registerMessageFunction(this, &BlackD::onMSG_CONNECT_TO_VATSIM); - - QHostAddress local = QHostAddress(QHostAddress::LocalHost); - - m_comserver->Host(local, 42000); - connect(m_comserver, SIGNAL(doMessageReceived(QString &, QByteArray &)), this, SLOT(onData(QString &, QByteArray &))); -} - -void BlackD::onData(QString &messageID, QByteArray &message) -{ - bAppDebug << messageID; - BlackMisc::IMessage *test = BlackMisc::CMessageFactory::getInstance().create(messageID); - QDataStream stream(&message, QIODevice::ReadOnly); - - Q_ASSERT(test); - *test << stream; - - BlackMisc::CMessageDispatcher::getInstance().append(test); - BlackMisc::CMessageDispatcher::getInstance().dispatch(); -} - -void BlackD::onMSG_CONNECT_TO_VATSIM(const BlackMisc::MSG_CONNECT_TO_VATSIM *connect) -{ - bAppDebug << "Connecting to FSD server:"; - bAppDebug << connect->getHost() << ":" << connect->getPort(); - - FSD::TClientInfo clientinfo; - clientinfo.m_callsign = connect->getCallsign(); - clientinfo.m_host = connect->getHost(); - clientinfo.m_password = connect->getPassword(); - clientinfo.m_port = connect->getPort(); - clientinfo.m_realName = connect->getRealName(); - clientinfo.m_simType = FSD::SIM_UNKNOWN; - clientinfo.m_userid = connect->getUserID(); - - m_fsd_client->updateClientInfo(clientinfo); - - m_fsd_client->connectTo(connect->getHost(), connect->getPort()); -} diff --git a/src/blackd/blackd.h b/src/blackd/blackd.h deleted file mode 100644 index 1c09ecdc1..000000000 --- a/src/blackd/blackd.h +++ /dev/null @@ -1,73 +0,0 @@ -//! Copyright (C) 2013 Roland Winklmeier -//! This Source Code Form is subject to the terms of the Mozilla Public -//! License, v. 2.0. If a copy of the MPL was not distributed with this -//! file, You can obtain one at http://mozilla.org/MPL/2.0/ - -#ifndef BLACKD_H -#define BLACKD_H - -#include -#include -#include "blackmisc/com_server.h" -#include "blackmisc/gui_messages.h" - -#include "blackmisc/message_system.h" - -namespace Ui { -class BlackD; -} - -namespace FSD { -class CFSDClient; -} - -class CQtDisplayer; -class CMultiPlayer; - -class BlackD : public QDialog, public BlackMisc::CMessageHandler -{ - Q_OBJECT - -public: - explicit BlackD(QWidget *parent = 0); - ~BlackD(); - - void setVisible(bool visible); - -protected: - void closeEvent(QCloseEvent *event); - -private slots: - void iconActivated(QSystemTrayIcon::ActivationReason reason); - void onData(QString &messageID, QByteArray &message); - -private: - - void createActions(); - void createTrayIcon(); - void createLogging(); - void createComServer(); - - //! Messages - void onMSG_CONNECT_TO_VATSIM(const BlackMisc::MSG_CONNECT_TO_VATSIM *connect); - - Ui::BlackD *ui; - - QAction *minimizeAction; - QAction *maximizeAction; - QAction *restoreAction; - QAction *quitAction; - - QSystemTrayIcon *trayIcon; - QMenu *trayIconMenu; - - CQtDisplayer *m_displayer; - - FSD::CFSDClient *m_fsd_client; - CMultiPlayer *m_multi_player; - - BlackMisc::CComServer *m_comserver; - -}; - -#endif // BLACKD_H diff --git a/src/blackd/blackd.pro b/src/blackd/blackd.pro deleted file mode 100644 index 6eaf7dc04..000000000 --- a/src/blackd/blackd.pro +++ /dev/null @@ -1,29 +0,0 @@ -QT += core gui xml svg network - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - - -TARGET = blackd -TEMPLATE = app -CONFIG += c++11 - -DEPENDPATH += . .. -INCLUDEPATH += .. - -SOURCES += *.cpp -HEADERS += *.h - -FORMS += blackd.ui -RESOURCES += blackd.qrc - -LIBS += -L../../lib -lblackcore -lblackmisc - -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - -DESTDIR = ../../bin - - - diff --git a/src/blackd/blackd.qrc b/src/blackd/blackd.qrc deleted file mode 100644 index b0808533e..000000000 --- a/src/blackd/blackd.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/blackbox_icon.svg - - diff --git a/src/blackd/blackd.ui b/src/blackd/blackd.ui deleted file mode 100644 index d3ae83267..000000000 --- a/src/blackd/blackd.ui +++ /dev/null @@ -1,33 +0,0 @@ - - - BlackD - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - false - - - - 10 - 10 - 381 - 281 - - - - - - - - diff --git a/src/blackd/images/blackbox.svg b/src/blackd/images/blackbox.svg deleted file mode 100644 index f2953b8a6..000000000 --- a/src/blackd/images/blackbox.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - Layer 1 - - B - Box - - lack - - - diff --git a/src/blackd/images/blackbox_icon.svg b/src/blackd/images/blackbox_icon.svg deleted file mode 100644 index 923c9af2e..000000000 --- a/src/blackd/images/blackbox_icon.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - Layer 1 - - B - B - - - - - diff --git a/src/blackd/main.cpp b/src/blackd/main.cpp deleted file mode 100644 index 64163aef8..000000000 --- a/src/blackd/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -//! Copyright (C) 2013 Roland Winklmeier -//! This Source Code Form is subject to the terms of the Mozilla Public -//! License, v. 2.0. If a copy of the MPL was not distributed with this -//! file, You can obtain one at http://mozilla.org/MPL/2.0/ - -#include "blackmisc/context.h" -#include "blackmisc/debug.h" - -#include "blackd.h" -#include -#include -#include - -int main(int argc, char *argv[]) -{ - Q_INIT_RESOURCE(blackd); - - QApplication app(argc, argv); - - BlackMisc::CApplicationContext ctx; - BlackMisc::IContext::setInstance(ctx); - BlackMisc::CDebug debug; - ctx.setObject(debug); - - if (!QSystemTrayIcon::isSystemTrayAvailable()) { - QMessageBox::critical(0, QObject::tr("Systray"), - QObject::tr("I couldn't detect any system tray " - "on this system.")); - return 1; - } - QApplication::setQuitOnLastWindowClosed(false); - - BlackD w; - w.hide(); - - return app.exec(); -} diff --git a/src/blackd/qt_displayer.cpp b/src/blackd/qt_displayer.cpp deleted file mode 100644 index 551461011..000000000 --- a/src/blackd/qt_displayer.cpp +++ /dev/null @@ -1,78 +0,0 @@ -//! Copyright (C) 2013 Roland Winklmeier -//! This Source Code Form is subject to the terms of the Mozilla Public -//! License, v. 2.0. If a copy of the MPL was not distributed with this -//! file, You can obtain one at http://mozilla.org/MPL/2.0/ - -#include "qt_displayer.h" - -using namespace BlackMisc; - -CQtDisplayer::CQtDisplayer(QPlainTextEdit *debugWindow, const char *displayerName) - : ILogDisplay (displayerName), m_needHeader(true) -{ - setParam(debugWindow); -} - -CQtDisplayer::CQtDisplayer() - : ILogDisplay (""), m_needHeader(true) -{ - -} - -CQtDisplayer::~CQtDisplayer() { - -} - -void CQtDisplayer::setParam (QPlainTextEdit *debugWindow) -{ - m_DebugWindow=debugWindow; -} - -void CQtDisplayer::doPrint ( const BlackMisc::CLog::SLogInformation &logInformation, const QString &message) -{ - if (!m_DebugWindow) - return; - - bool needSpace = false; - QString line; - - if(m_DebugWindow==NULL) - return; - - QTextCharFormat format; - - if (logInformation.m_dateTime.isValid()) { - line += dateToString(logInformation.m_dateTime); - needSpace = true; - } - - if (logInformation.m_logType != CLog::eOff) - { - if (needSpace) { line += " "; needSpace = false; } - line += logTypeToString(logInformation.m_logType); - if (logInformation.m_logType == BlackMisc::CLog::eWarning) - format.setForeground(QBrush(QColor("red"))); - else - format.setForeground(QBrush(QColor("black"))); - needSpace = true; - } - - if (logInformation.m_methodName != NULL) - { - if (needSpace) - { - line += " "; needSpace = false; - } - line += logInformation.m_methodName; - needSpace = true; - } - - if (needSpace) - { - line += " : "; needSpace = false; - } - line += message; - - m_DebugWindow->textCursor().insertText(line, format); - m_DebugWindow->centerCursor(); -} diff --git a/src/blackd/qt_displayer.h b/src/blackd/qt_displayer.h deleted file mode 100644 index a3637edfc..000000000 --- a/src/blackd/qt_displayer.h +++ /dev/null @@ -1,31 +0,0 @@ -//! Copyright (C) 2013 Roland Winklmeier -//! This Source Code Form is subject to the terms of the Mozilla Public -//! License, v. 2.0. If a copy of the MPL was not distributed with this -//! file, You can obtain one at http://mozilla.org/MPL/2.0/ - -#ifndef QT_DISPLAYER_H -#define QT_DISPLAYER_H - -#include "blackmisc/display.h" - -// Qt includes -#include - -class CQtDisplayer : virtual public BlackMisc::ILogDisplay -{ -public: - CQtDisplayer(QPlainTextEdit *debugWindow, - const char *displayerName = ""); - CQtDisplayer(); - ~CQtDisplayer (); - void setParam (QPlainTextEdit *debugWindow); - -protected: - virtual void doPrint(const BlackMisc::CLog::SLogInformation &logInformation, const QString &message); - -private: - QPlainTextEdit *m_DebugWindow; - bool m_needHeader; -}; - -#endif // QT_DISPLAYER_H