refs #304, adjusted main window to previous changes

* new namespaces
* centralized icons
* dockable widgets
This commit is contained in:
Klaus Basan
2014-07-27 15:12:50 +02:00
parent 17a8425883
commit f9eca1f3a5
12 changed files with 665 additions and 992 deletions

View File

@@ -1,16 +1,20 @@
#include "introwindow.h"
#include "mainwindow.h"
#include "guimodeenums.h"
#include "blackgui/stylesheetutility.h"
#include "blackcore/blackcorefreefunctions.h"
#include "blackcore/context_runtime_config.h"
#include "blacksim/blacksimfreefunctions.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/iconsstandard.h"
#include <QtGlobal>
#include <QApplication>
#include <QMessageBox>
#include <QPushButton>
using namespace BlackGui;
/*!
* \brief Main
* \param argc
@@ -20,13 +24,13 @@
int main(int argc, char *argv[])
{
// register
Q_INIT_RESOURCE(blackgui);
BlackMisc::initResources();
BlackMisc::registerMetadata();
BlackSim::registerMetadata();
BlackCore::registerMetadata();
// BlackMisc::displayAllUserMetatypesTypes();
// Translations
QFile file(":blackmisc/translations/blackmisc_i18n_de.qm");
qDebug() << (file.exists() ? "Found translations in resources" : "No translations in resources");
QTranslator translator;
@@ -35,9 +39,18 @@ int main(int argc, char *argv[])
qDebug() << "Translator loaded";
}
// app
// application
QApplication a(argc, argv);
QIcon icon(BlackMisc::CIconsStandard::swift24());
QApplication::setWindowIcon(icon);
const QString s = CStyleSheetUtility::instance().styles(
{
CStyleSheetUtility::fileNameFonts(),
CStyleSheetUtility::fileNameMainWindow()
}
);
a.installTranslator(&translator);
a.setStyleSheet(s);
// modes
GuiModes::WindowMode windowMode;
@@ -45,6 +58,7 @@ int main(int argc, char *argv[])
// Dialog to decide external or internal core
CIntroWindow intro;
intro.setWindowIcon(icon);
BlackCore::CRuntimeConfig runtimeConfig;
if (intro.exec() == QDialog::Rejected)
{