Add Inconsolata as monospace'd font
MODIFY
CMakeLists.txt
CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(${Qt5Core_INCLUDE_DIRS})
qt5_add_resources(ICONS_SRC ${CMAKE_SOURCE_DIR}/resources/icons/icons.qrc)
qt5_add_resources(EXAMPLES_SRC ${CMAKE_SOURCE_DIR}/examples/examples.qrc)
qt5_add_resources(LAYOUTS_SRC ${CMAKE_SOURCE_DIR}/src/processors/layouts.qrc)
-
+qt5_add_resources(FONTS_SRC ${CMAKE_SOURCE_DIR}/resources/fonts/fonts.qrc)
######################################################################
## Library setup
@@ -60,7 +60,7 @@ if(RIPES_BUILD_TESTS)
endif()
set(APP_NAME Ripes)
-add_executable(${APP_NAME} ${SYSTEM_FLAGS} ${ICONS_SRC} ${EXAMPLES_SRC} ${LAYOUTS_SRC} main.cpp)
+add_executable(${APP_NAME} ${SYSTEM_FLAGS} ${ICONS_SRC} ${EXAMPLES_SRC} ${LAYOUTS_SRC} ${FONTS_SRC} main.cpp)
# Link Qt libraries
target_link_libraries(${APP_NAME} Qt5::Core Qt5::Widgets)

MODIFY
main.cpp
main.cpp
@@ -14,6 +14,7 @@ int main(int argc, char** argv) {
Q_INIT_RESOURCE(icons);
Q_INIT_RESOURCE(examples);
Q_INIT_RESOURCE(layouts);
+ Q_INIT_RESOURCE(fonts);
QApplication app(argc, argv);
Ripes::MainWindow m;

ADD
resources/fonts/Inconsolata/Inconsolata-Bold.ttf
resources/fonts/Inconsolata/Inconsolata-Bold.ttf
Binary files /dev/null and b/resources/fonts/Inconsolata/Inconsolata-Bold.ttf differ

ADD
resources/fonts/Inconsolata/Inconsolata-Regular.ttf
resources/fonts/Inconsolata/Inconsolata-Regular.ttf
Binary files /dev/null and b/resources/fonts/Inconsolata/Inconsolata-Regular.ttf differ

ADD
resources/fonts/Inconsolata/OFL.txt
+Copyright 2006 The Inconsolata Project Authors
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

ADD
resources/fonts/fonts.qrc
+<RCC>
+ <qresource prefix="/fonts">
+ <file>Inconsolata/Inconsolata-Regular.ttf</file>
+ <file>Inconsolata/Inconsolata-Bold.ttf</file>
+ </qresource>
+</RCC>

MODIFY
src/codeeditor.cpp
src/codeeditor.cpp
@@ -30,9 +30,7 @@ CodeEditor::CodeEditor(QWidget* parent) : QPlainTextEdit(parent) {
// Set font for the entire widget. calls to fontMetrics() will get the
// dimensions of the currently set font
- m_font = QFont("Monospace");
- m_font.setStyleHint(QFont::TypeWriter);
- m_font.setPointSize(10);
+ m_font = QFont("Inconsolata", 11);
setFont(m_font);
m_fontTimer.setSingleShot(true);

MODIFY
src/mainwindow.cpp
src/mainwindow.cpp
#include <QDesktopServices>
#include <QFileDialog>
+#include <QFontDatabase>
#include <QIcon>
#include <QMessageBox>
#include <QPushButton>
@@ -33,6 +34,10 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), m_ui(new Ui::Main
// Initialize processor handler
ProcessorHandler::get();
+ // Initialize fonts
+ QFontDatabase::addApplicationFont(":/fonts/Inconsolata/Inconsolata-Regular.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/Inconsolata/Inconsolata-Bold.ttf");
+
// Create tabs
m_stackedTabs = new QStackedWidget(this);
m_ui->centrallayout->addWidget(m_stackedTabs);

MODIFY
src/memorymodel.cpp
src/memorymodel.cpp
@@ -65,6 +65,10 @@ QVariant MemoryModel::data(const QModelIndex& index, int role) const {
if (role == Qt::TextAlignmentRole)
return Qt::AlignCenter;
+ if (role == Qt::FontRole) {
+ return QFont("Inconsolata", 11);
+ }
+
const auto bytes = ProcessorHandler::get()->currentISA()->bytes();
const long long alignedAddress = static_cast<long long>(m_centralAddress) +
((((m_rowsVisible * bytes) / 2) / bytes) * bytes) - (index.row() * bytes);
@@ -88,8 +92,6 @@ QVariant MemoryModel::data(const QModelIndex& index, int role) const {
}
} else {
switch (role) {
- case Qt::FontRole:
- return QFont("monospace");
case Qt::ForegroundRole:
return fgColorData(alignedAddress, index.column() == Column::WordValue ? 0 : byteOffset);
case Qt::DisplayRole:

MODIFY
src/registermodel.cpp
src/registermodel.cpp
@@ -105,7 +105,7 @@ QVariant RegisterModel::data(const QModelIndex& index, int role) const {
case Qt::UserRole:
return QVariant::fromValue(m_radix);
case Qt::FontRole:
- return QFont("monospace");
+ return QFont("Inconsolata", 11);
case Qt::ForegroundRole:
return QBrush(Qt::blue);
default:

Add Inconsolata as monospace'd font