diff --git a/ConsoleWindow.cpp b/ConsoleWindow.cpp
index 8a73026..d2ba154 100644
--- a/ConsoleWindow.cpp
+++ b/ConsoleWindow.cpp
@@ -32,11 +32,11 @@ ConsoleWindow::ConsoleWindow(QWidget *parent) : QMainWindow(parent)
// Make read-only but allow copy of text
_console->setReadOnly(true);
// Create and customize font
-#if QT_VERSION >= 0x050400
- QFont font(QFont(":/base-font", 10, QFont::Medium));
- font.setStyleHint(QFont::Monospace, QFont::PreferAntialias);
+ int id = QFontDatabase::addApplicationFont(":/console-font");
+ QString family = QFontDatabase::applicationFontFamilies(id).at(0);
+ QFont font(QFont(family, 10, QFont::Normal));
_console->setFont(font);
-#endif
+
// Set color scheme
QPalette scheme = palette();
scheme.setColor(QPalette::Base, Qt::black);
@@ -83,33 +83,40 @@ void ConsoleWindow::messageLog(QtMsgType type, const QMessageLogContext &context
// Message
QByteArray message = msg.toLocal8Bit();
// Context
- QString contexts(QStringLiteral("%1:%2").arg(context.file).arg(context.line));
- // Date and time
- QString time(QDateTime::currentDateTime().toString(tr("MMM dd yy HH:mm")));
+ QString contexts(QStringLiteral("%1:%2").arg(context.file).arg(context.line)),
+ // Date and time
+ time(QDateTime::currentDateTime().toString(tr("MMM dd yy HH:mm"))),
+ // Colorized time
+ timeHtml = "" + time + "",
+ debug = "Debug:",
+ info = "Info:",
+ warning = "Warning:",
+ critical = "Critical:",
+ fatal = "Fatal!";
// Output
QString output;
switch (type) {
case QtDebugMsg:
- output = time + " | Debug: " + QString(message.constData()) + " - " + contexts;
+ output = time + " | " + debug + " " + QString(message.constData()) + " - " + contexts + "";
break;
#if QT_VERSION >= 0x050400
case QtInfoMsg:
- output = time + " | Info: " + QString(message.constData()) + " - " + contexts;
+ output = time + " | " + info + " " + QString(message.constData()) + " - " + contexts + "";
break;
#endif
case QtWarningMsg:
- output = time + " | Warning: " + QString(message.constData()) + " - " + contexts;
+ output = time + " | " + warning + " " + QString(message.constData()) + " - " + contexts + "";
break;
case QtCriticalMsg:
- output = time + " | Critical: " + QString(message.constData()) + " - " + contexts;
+ output = time + " | " + critical + " " + QString(message.constData()) + " - " + contexts + "";
break;
case QtFatalMsg:
- output = time + " | Fatal: " + QString(message.constData()) + " - " + contexts;
+ output = time + " | " + fatal + " " + QString(message.constData()) + " - " + contexts + "";
abort();
}
// Print in console
- _console->appendPlainText(output);
+ _console->appendHtml(output);
}
void ConsoleWindow::closeEvent(QCloseEvent *event)
diff --git a/MainWindow.cpp b/MainWindow.cpp
index e1888e8..74a3bcf 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -29,7 +29,7 @@ MainWindow::MainWindow()
{
// Create model.
#if QT_VERSION >= 0x050400
- QMessageLogger(__FILE__, __LINE__, 0).info() << "Video support: " << (Media::hasVideoSupport() ? "yes" : "no") << endl;
+ QMessageLogger(__FILE__, __LINE__, 0).info() << "Video support: " << (Media::hasVideoSupport() ? "yes" : "no");
#endif
mappingManager = new MappingManager;
diff --git a/main.cpp b/main.cpp
index 09a8a43..8358510 100644
--- a/main.cpp
+++ b/main.cpp
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
splash.showMessage(" " + QObject::tr("Initiating program..."),
Qt::AlignLeft | Qt::AlignTop, MM::WHITE);
- bool FORCE_FRENCH_LANG = false;
+ //bool FORCE_FRENCH_LANG = false;
// set_language_to_french(app);
// Let splash for at least one second.
@@ -124,10 +124,10 @@ int main(int argc, char *argv[])
// Create window.
MainWindow* win = MainWindow::instance();
-
- QFontDatabase db;
- Q_ASSERT( QFontDatabase::addApplicationFont(":/base-font") != -1);
- app.setFont(QFont(":/base-font", 10, QFont::Bold));
+ // Add custom font
+ int id = QFontDatabase::addApplicationFont(":/base-font");
+ QString family = QFontDatabase::applicationFontFamilies(id).at(0);
+ app.setFont(QFont(family, 11, QFont::Normal));
// Load stylesheet.
QFile stylesheet(":/stylesheet");
diff --git a/mapmap.qrc b/mapmap.qrc
index 699af80..80914a8 100644
--- a/mapmap.qrc
+++ b/mapmap.qrc
@@ -23,13 +23,14 @@
resources/images/logo/logomapmap.png
resources/images/logo/logo_m_big_mapmap.png
resources/images/logo/splash.png
- resources/fonts/HelveticaNeueLTPro-Bd.otf
- resources/fonts/HelveticaNeueLTPro-Bd.otf
+ resources/fonts/DroidSans.otf
+ resources/fonts/DroidSans.otf
resources/images/test-signal/test-signal.svg
resources/qss/mapmap.qss
resources/images/icons/zoom_reset_w.png
resources/images/icons/zoom_in_w.png
resources/images/icons/zoom_out_w.png
resources/images/icons/zoom_fit_w.png
+ resources/fonts/Hack-Regular.otf
diff --git a/resources/fonts/DroidSans.otf b/resources/fonts/DroidSans.otf
new file mode 100644
index 0000000..ad1efca
Binary files /dev/null and b/resources/fonts/DroidSans.otf differ
diff --git a/resources/fonts/Hack-Regular.otf b/resources/fonts/Hack-Regular.otf
new file mode 100644
index 0000000..5f08325
Binary files /dev/null and b/resources/fonts/Hack-Regular.otf differ
diff --git a/resources/fonts/HelveticaNeueLTPro-Bd.otf b/resources/fonts/HelveticaNeueLTPro-Bd.otf
deleted file mode 100644
index 0712e4d..0000000
Binary files a/resources/fonts/HelveticaNeueLTPro-Bd.otf and /dev/null differ