From ad146069ef8329d93a925bd2e8bf79c753fc388f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 14 Oct 2015 02:51:52 +0200 Subject: [PATCH] refs #478, refs #470 updated swift / mapping GUI * allow to display project, env. vars etc. in console * use setup data cache * adjust to relocated CNetworkUtils * remove console for data GUI (noticed during installer tests) --- .../components/datamaininfoareacomponent.cpp | 12 ++++ .../components/datamaininfoareacomponent.h | 6 ++ src/blackgui/components/internalscomponent.ui | 2 +- .../components/maininfoareacomponent.cpp | 10 +++ .../components/maininfoareacomponent.h | 6 ++ src/swiftdata/swiftdata.cpp | 22 +++++- src/swiftdata/swiftdata.h | 5 ++ src/swiftdata/swiftdata.pro | 1 - src/swiftdata/swiftdata.ui | 69 +++++++++++++++---- src/swiftdata/swiftdata_menus.cpp | 49 ++++++++++--- src/swiftgui_standard/introwindow.cpp | 19 +++-- src/swiftgui_standard/swiftguistd.cpp | 11 +++ src/swiftgui_standard/swiftguistd.h | 19 +++-- src/swiftgui_standard/swiftguistd.ui | 57 ++++++++++++--- src/swiftgui_standard/swiftguistd_init.cpp | 11 ++- src/swiftgui_standard/swiftguistd_menus.cpp | 44 +++++++++--- 16 files changed, 281 insertions(+), 62 deletions(-) diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/blackgui/components/datamaininfoareacomponent.cpp index 015aca15b..68887475f 100644 --- a/src/blackgui/components/datamaininfoareacomponent.cpp +++ b/src/blackgui/components/datamaininfoareacomponent.cpp @@ -66,6 +66,18 @@ namespace BlackGui this->ui->comp_Stash->setProvider(provider); } + void CDataMainInfoAreaComponent::displayLog() + { + this->selectArea(InfoAreaLog); + this->getLogComponent()->displayLog(); + } + + void CDataMainInfoAreaComponent::displayConsole() + { + this->selectArea(InfoAreaLog); + this->getLogComponent()->displayConsole(); + } + QSize CDataMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const { InfoArea area = static_cast(areaIndex); diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/blackgui/components/datamaininfoareacomponent.h index 3913b98b3..9c59d2800 100644 --- a/src/blackgui/components/datamaininfoareacomponent.h +++ b/src/blackgui/components/datamaininfoareacomponent.h @@ -72,6 +72,12 @@ namespace BlackGui //! Set data reader virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override; + //! Display the log + void displayLog(); + + //! Display console + void displayConsole(); + protected: //! \copydoc CInfoArea::getPreferredSizeWhenFloating virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; diff --git a/src/blackgui/components/internalscomponent.ui b/src/blackgui/components/internalscomponent.ui index 7fcaffc69..0d9209946 100644 --- a/src/blackgui/components/internalscomponent.ui +++ b/src/blackgui/components/internalscomponent.ui @@ -32,7 +32,7 @@ - 2 + 0 diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp index ee3405164..8eb113a51 100644 --- a/src/blackgui/components/maininfoareacomponent.cpp +++ b/src/blackgui/components/maininfoareacomponent.cpp @@ -83,6 +83,16 @@ namespace BlackGui return this->ui->comp_TextMessages; } + void CMainInfoAreaComponent::displayLog() + { + this->ui->comp_Log->displayLog(); + } + + void CMainInfoAreaComponent::displayConsole() + { + this->ui->comp_Log->displayConsole(); + } + QSize CMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const { InfoArea area = static_cast(areaIndex); diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h index 749e931ab..bb2c4b04e 100644 --- a/src/blackgui/components/maininfoareacomponent.h +++ b/src/blackgui/components/maininfoareacomponent.h @@ -96,6 +96,12 @@ namespace BlackGui //! Text messages CTextMessageComponent *getTextMessageComponent(); + //! Display the log + void displayLog(); + + //! Display console + void displayConsole(); + public slots: //! Toggle floating of given area void toggleFloating(InfoArea infoArea) { CInfoArea::toggleFloatingByIndex(static_cast(infoArea)); } diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index 8ff407149..24c9b342b 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -98,7 +98,6 @@ void CSwiftData::initLogDisplay() logHandler->subscribe(this, &CSwiftData::ps_appendLogMessage); } - void CSwiftData::initReaders() { Q_ASSERT_X(this->m_webDataReader, Q_FUNC_INFO, "Missing reader"); @@ -112,7 +111,6 @@ void CSwiftData::initMenu() // menu this->initDynamicMenus(); this->ui->menu_WindowMinimize->setIcon(this->style()->standardIcon(QStyle::SP_TitleBarMinButton)); - connect(this->ui->menu_TestInternals, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_FileExit, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_FileSettingsDirectory, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); @@ -120,9 +118,17 @@ void CSwiftData::initMenu() connect(this->ui->menu_WindowFont, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_WindowMinimize, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_WindowToggleOnTop, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); - connect(this->ui->menu_DebugMetaTypes, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_MappingMaxData, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); connect(this->ui->menu_MappingMaxMapping, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + + connect(this->ui->menu_InternalsCompileInfo, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_InternalsEnvVars, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_InternalsMetatypes, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_InternalsSetup, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_InternalsDeleteCachedFiles, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + connect(this->ui->menu_InternalsDisplayCachedFiles, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); + + connect(this->ui->menu_InternalsJsonBootstrapTemplate, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked); } void CSwiftData::performGracefulShutdown() @@ -133,3 +139,13 @@ void CSwiftData::performGracefulShutdown() m_webDataReader = nullptr; } } + +void CSwiftData::displayConsole() +{ + this->ui->comp_MainInfoArea->displayConsole(); +} + +void CSwiftData::displayLog() +{ + this->ui->comp_MainInfoArea->displayLog(); +} diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 6c3cd0fef..dbdc37691 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -13,6 +13,7 @@ #define SWIFTDATA_H #include "blackcore/context_runtime.h" +#include "blackcore/data/globalsetup.h" #include "blackgui/systemtraywindow.h" #include "blackgui/managedstatusbar.h" #include "blackmisc/statusmessage.h" @@ -61,9 +62,13 @@ private: void initDynamicMenus(); void performGracefulShutdown(); + void displayConsole(); + void displayLog(); + QScopedPointer ui; BlackGui::CManagedStatusBar m_statusBar; BlackCore::CWebDataServices *m_webDataReader = nullptr; + BlackCore::CData m_setup {this}; //!< setup cache }; #endif // guard diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro index 6d757d648..faf91cce6 100644 --- a/src/swiftdata/swiftdata.pro +++ b/src/swiftdata/swiftdata.pro @@ -1,7 +1,6 @@ load(common_pre) QT += core dbus network xml multimedia gui svg -CONFIG += console greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/src/swiftdata/swiftdata.ui b/src/swiftdata/swiftdata.ui index 8e3fb1358..8cbccfeac 100644 --- a/src/swiftdata/swiftdata.ui +++ b/src/swiftdata/swiftdata.ui @@ -2,6 +2,14 @@ CSwiftData + + + 0 + 0 + 900 + 700 + + 900 @@ -63,7 +71,7 @@ 0 0 - 1024 + 900 21 @@ -96,19 +104,24 @@ - + Test - + - Debug + Internals - + + + + + + + - + - @@ -120,7 +133,7 @@ - + @@ -153,11 +166,6 @@ Minimize - - - Internals - - Max. mapping area @@ -189,6 +197,41 @@ Debug metatypes (to console) + + + JSON bootstrap template + + + + + Env.variables + + + + + Metatypes + + + + + Setup + + + + + Compile info + + + + + All cache files + + + + + Delete cached fies + + diff --git a/src/swiftdata/swiftdata_menus.cpp b/src/swiftdata/swiftdata_menus.cpp index 91ec4fd53..c25d1612e 100644 --- a/src/swiftdata/swiftdata_menus.cpp +++ b/src/swiftdata/swiftdata_menus.cpp @@ -60,13 +60,6 @@ void CSwiftData::ps_onMenuClicked() { // !\todo reset settings } - else if (sender == this->ui->menu_DebugMetaTypes) - { - QString metadata; - QTextStream stream(&metadata); - BlackMisc::displayAllUserMetatypesTypes(stream); - this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(metadata); - } else if (sender == this->ui->menu_MappingMaxData) { CDbMappingComponent *mappingComponent = this->ui->comp_MainInfoArea->getMappingComponent(); @@ -77,6 +70,46 @@ void CSwiftData::ps_onMenuClicked() CDbMappingComponent *mappingComponent = this->ui->comp_MainInfoArea->getMappingComponent(); mappingComponent->resizeForMapping(); } + else if (sender == this->ui->menu_InternalsJsonBootstrapTemplate) + { + QString json(m_setup.get().toJsonString()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(json); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsMetatypes) + { + QString metadata(getAllUserMetatypesTypes()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(metadata); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsSetup) + { + QString setup(this->m_setup.get().convertToQString("\n", true)); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(setup); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsCompileInfo) + { + QString project(CProject::convertToQString("\n")); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsEnvVars) + { + QString project(CProject::getEnvironmentVariables()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsDisplayCachedFiles) + { + //! \todo + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsDeleteCachedFiles) + { + //! \todo + this->displayConsole(); + } else { QAction *a = qobject_cast(sender); @@ -110,7 +143,7 @@ void CSwiftData::initDynamicMenus() if (CProject::isRunningInDeveloperEnvironment() && !CRoles::roles().isAdmin()) { - QAction *a = this->ui->menu_Internals->addAction(CIcons::user16(), "Set administrator"); + QAction *a = this->ui->menu_Test->addAction(CIcons::user16(), "Set administrator"); a->setData("admin"); } } diff --git a/src/swiftgui_standard/introwindow.cpp b/src/swiftgui_standard/introwindow.cpp index 212f910b2..88fac3d14 100644 --- a/src/swiftgui_standard/introwindow.cpp +++ b/src/swiftgui_standard/introwindow.cpp @@ -10,7 +10,7 @@ #include "introwindow.h" #include "ui_introwindow.h" #include "blackcore/dbus_server.h" -#include "blackmisc/networkutils.h" +#include "blackmisc/network/networkutils.h" #include "blackmisc/settingutilities.h" #include "blackmisc/project.h" #include @@ -19,6 +19,11 @@ #include #include +using namespace BlackMisc; +using namespace BlackMisc::Network; +using namespace BlackCore; +using namespace BlackGui; + /* * Constructor */ @@ -28,11 +33,11 @@ CIntroWindow::CIntroWindow(QWidget *parent) : ui(new Ui::CIntroWindow) { ui->setupUi(this); - this->setWindowTitle(BlackMisc::CProject::swiftVersionStringDevInfo()); + this->setWindowTitle(CProject::swiftVersionStringDevInfo()); this->layout()->setSizeConstraint(QLayout::SetFixedSize); - this->ui->cb_DBusServer->addItem(BlackCore::CDBusServer::sessionDBusServer()); - this->ui->cb_DBusServer->addItem(BlackCore::CDBusServer::systemDBusServer()); - this->ui->cb_DBusServer->addItems(BlackMisc::CNetworkUtils::getKnownIpAddresses()); + this->ui->cb_DBusServer->addItem(CDBusServer::sessionDBusServer()); + this->ui->cb_DBusServer->addItem(CDBusServer::systemDBusServer()); + this->ui->cb_DBusServer->addItems(CNetworkUtils::getKnownIpAddresses()); this->ui->cb_DBusServer->setCurrentIndex(0); } @@ -47,9 +52,9 @@ CIntroWindow::~CIntroWindow() { } BlackGui::CEnableForFramelessWindow::WindowMode CIntroWindow::getWindowMode() const { if (this->ui->rb_WindowFrameless->isChecked()) - return BlackGui::CEnableForFramelessWindow::WindowFrameless; + return CEnableForFramelessWindow::WindowFrameless; else - return BlackGui::CEnableForFramelessWindow::WindowTool; + return CEnableForFramelessWindow::WindowTool; } /* diff --git a/src/swiftgui_standard/swiftguistd.cpp b/src/swiftgui_standard/swiftguistd.cpp index 89c3ccc0c..78dcb40b3 100644 --- a/src/swiftgui_standard/swiftguistd.cpp +++ b/src/swiftgui_standard/swiftguistd.cpp @@ -419,3 +419,14 @@ void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notific if (!this->ui->comp_MainInfoArea->getSettingsComponent()->playNotificationSounds()) { return; } this->getIContextAudio()->playNotification(notification, true); } + +void SwiftGuiStd::displayConsole() +{ + this->ui->comp_MainInfoArea->displayConsole(); +} + +void SwiftGuiStd::displayLog() +{ + this->ui->comp_MainInfoArea->displayLog(); +} + diff --git a/src/swiftgui_standard/swiftguistd.h b/src/swiftgui_standard/swiftguistd.h index b92cdc175..7378e0af6 100644 --- a/src/swiftgui_standard/swiftguistd.h +++ b/src/swiftgui_standard/swiftguistd.h @@ -19,6 +19,7 @@ #include "guimodeenums.h" #include "blackcore/context_all_interfaces.h" #include "blackcore/actionbind.h" +#include "blackcore/data/globalsetup.h" #include "blackgui/components/enableforruntime.h" #include "blackgui/components/infowindowcomponent.h" #include "blackgui/components/maininfoareacomponent.h" @@ -109,16 +110,17 @@ protected: private: QScopedPointer ui; - bool m_init = false; - BlackGui::Components::CInfoWindowComponent *m_compInfoWindow = nullptr; //!< the info window (popup - BlackGui::CManagedStatusBar m_statusBar; - BlackMisc::CLogSubscriber m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui }; + bool m_init = false; + BlackGui::Components::CInfoWindowComponent *m_compInfoWindow = nullptr; //!< the info window (popup + BlackGui::CManagedStatusBar m_statusBar; + BlackMisc::CLogSubscriber m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui }; + BlackCore::CData m_setup {this}; //!< setup cache // contexts bool m_coreAvailable = false; bool m_contextNetworkAvailable = false; bool m_contextAudioAvailable = false; - QTimer *m_timerContextWatchdog = nullptr; //!< core available? + QTimer *m_timerContextWatchdog = nullptr; //!< core available? BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft; //!< own aircraft's state QSize m_windowMinSizeWithMainPageShown; QSize m_windowMinSizeWithMainPageHidden; @@ -187,8 +189,13 @@ private: //! Play notifcation sound void playNotifcationSound(BlackSound::CNotificationSounds::Notification notification) const; -private slots: + //! Display console + void displayConsole(); + //! Display log + void displayLog(); + +private slots: // // Data received related slots // diff --git a/src/swiftgui_standard/swiftguistd.ui b/src/swiftgui_standard/swiftguistd.ui index 1e12a2071..df1e66fa4 100644 --- a/src/swiftgui_standard/swiftguistd.ui +++ b/src/swiftgui_standard/swiftguistd.ui @@ -124,7 +124,7 @@ QFrame::NoFrame - 0 + 2 @@ -287,17 +287,22 @@ - + - Debug + Internals - + + + + + + + - + - @@ -453,11 +458,6 @@ Position LOWW (Vienna, AUT) - - - Internals - - Minimize @@ -487,6 +487,41 @@ Horizontal navigator + + + Metatypes + + + + + Env.variables + + + + + Setup + + + + + Compile info + + + + + Internal page + + + + + Delete cached files + + + + + Display cached files + + diff --git a/src/swiftgui_standard/swiftguistd_init.cpp b/src/swiftgui_standard/swiftguistd_init.cpp index 605bc32d2..a542e1822 100644 --- a/src/swiftgui_standard/swiftguistd_init.cpp +++ b/src/swiftgui_standard/swiftguistd_init.cpp @@ -120,7 +120,7 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig) // info this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::swiftVersionString()); - this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::compiledInfo()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::compiledWithInfo()); // update timers this->startUpdateTimersWhenConnected(); @@ -166,7 +166,6 @@ void SwiftGuiStd::initGuiSignals() connect(this->ui->menu_TestLocationsEDDM, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_TestLocationsEDNX, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_TestLocationsEDRY, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); - connect(this->ui->menu_TestInternals, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileExit, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileSettingsDirectory, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); @@ -175,7 +174,13 @@ void SwiftGuiStd::initGuiSignals() connect(this->ui->menu_WindowMinimize, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_WindowToggleOnTop, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_WindowToggleNavigator, &QAction::triggered, this->ui->comp_InvisibleInfoArea, &CInvisibleInfoAreaComponent::toggleNavigator); - connect(this->ui->menu_DebugMetaTypes, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + + connect(this->ui->menu_InternalsCompileInfo, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(this->ui->menu_InternalsEnvVars, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(this->ui->menu_InternalsMetatypes, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(this->ui->menu_InternalsSetup, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(this->ui->menu_InternalsDeleteCachedFiles, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(this->ui->menu_InternalsDisplayCachedFiles, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); // command line / text messages connect(this->ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::displayInInfoWindow, this->m_compInfoWindow, &CInfoWindowComponent::display); diff --git a/src/swiftgui_standard/swiftguistd_menus.cpp b/src/swiftgui_standard/swiftguistd_menus.cpp index 8a59b03d3..54118caea 100644 --- a/src/swiftgui_standard/swiftguistd_menus.cpp +++ b/src/swiftgui_standard/swiftguistd_menus.cpp @@ -57,10 +57,6 @@ void SwiftGuiStd::ps_onMenuClicked() this->ui->comp_MainInfoArea->getSettingsComponent()->reloadSettings(); CLogMessage(this).info("Settings reloaded"); } - else if (sender == this->ui->menu_TestInternals) - { - this->ui->sw_MainMiddle->setCurrentIndex(MainPageInternals); - } else if (sender == this->ui->menu_FileReloadStyleSheets) { CStyleSheetUtility::instance().read(); @@ -93,12 +89,43 @@ void SwiftGuiStd::ps_onMenuClicked() Q_ASSERT(this->getIContextSettings()); this->getIContextSettings()->reset(true); } - else if (sender == this->ui->menu_DebugMetaTypes) + else if (sender == this->ui->menu_Internals) { - QString metadata; - QTextStream stream(&metadata); - BlackMisc::displayAllUserMetatypesTypes(stream); + this->ui->sw_MainMiddle->setCurrentIndex(MainPageInternals); + } + else if (sender == this->ui->menu_InternalsMetatypes) + { + QString metadata(getAllUserMetatypesTypes()); this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(metadata); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsSetup) + { + QString setup(this->m_setup.get().convertToQString("\n", true)); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(setup); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsCompileInfo) + { + QString project(CProject::convertToQString("\n")); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsEnvVars) + { + QString project(CProject::getEnvironmentVariables()); + this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project); + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsDisplayCachedFiles) + { + //! \todo + this->displayConsole(); + } + else if (sender == this->ui->menu_InternalsDeleteCachedFiles) + { + //! \todo + this->displayConsole(); } } @@ -113,4 +140,3 @@ void SwiftGuiStd::initMenuIcons() { this->ui->menu_WindowMinimize->setIcon(this->style()->standardIcon(QStyle::SP_TitleBarMinButton)); } -