refs #485, first version of a Gui/Core application class

Also specialized GUI application class for standard GUI
This commit is contained in:
Klaus Basan
2016-03-14 23:55:33 +00:00
committed by Mathew Sutcliffe
parent d9aac6427b
commit 158efe819a
27 changed files with 1170 additions and 506 deletions

View File

@@ -8,14 +8,14 @@
*/
#include "swiftdata.h"
#include "blackgui/guiapplication.h"
#include "blackcore/application.h"
#include "blackmisc/icons.h"
#include "blackmisc/worker.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/project.h"
#include "blackmisc/loghandler.h"
#include "blackmisc/filelogger.h"
#include "blackgui/guiutility.h"
#include "blackgui/stylesheetutility.h"
#include <QApplication>
@@ -27,9 +27,8 @@ using namespace BlackGui;
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
CGuiUtility::initSwiftGuiApplication(a, "swift mapping tool", CIcons::swiftDatabase24());
CGuiApplication a(argc, argv, "swift mapping tool");
a.setWindowIcon(CIcons::swiftDatabase48());
CSwiftData w;
w.show();
int r = a.exec();

View File

@@ -9,6 +9,7 @@
#include "swiftdata.h"
#include "ui_swiftdata.h"
#include "blackgui/guiapplication.h"
#include "blackgui/components/datamaininfoareacomponent.h"
#include "blackgui/components/datainfoareacomponent.h"
#include "blackgui/components/logcomponent.h"
@@ -78,9 +79,7 @@ void CSwiftData::ps_onStyleSheetsChanged()
void CSwiftData::init()
{
this->setWindowIcon(CIcons::swiftDatabase24());
this->setWindowTitle(QCoreApplication::instance()->applicationName() + " " + CProject::versionStringDevBetaInfo());
this->setObjectName("CSwiftData");
sGui->initMainApplicationWindow(this);
this->initStyleSheet();
this->initLogDisplay();
connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CSwiftData::ps_onStyleSheetsChanged);

View File

@@ -25,6 +25,7 @@
#include <QDesktopServices>
#include <QProcess>
#include <QFontDialog>
#include <QDir>
using namespace BlackGui;
using namespace BlackCore;