Fix GitHub Issue #138: Make it possible to change the font

Author: juzzlin

CHANGELOG

@@ -4,6 +4,7 @@ x.y.z
 New features:
 
 * Fix GitHub Issue #36: Double-click to zoom into a node
+* Fix GitHub Issue #138: Make it possible to change the font
 * Fix GitHub Issue #180: Make edge text disappear if it doesn't fit between nodes
 
 Bug fixes:

src/alz_serializer.cpp

@@ -46,6 +46,20 @@ const auto EDGE_COLOR = "edge-color";
 
 const auto EDGE_THICKNESS = "edge-width";
 
+const auto FONT_FAMILY = "font-family";
+
+const auto FONT_BOLD = "bold";
+
+const auto FONT_OVERLINE = "overline";
+
+const auto FONT_STRIKE_OUT = "strike-out";
+
+const auto FONT_UNDERLINE = "underline";
+
+const auto FONT_WEIGHT = "weight";
+
+const auto FONT_ITALIC = "italic";
+
 const auto GRAPH = "graph";
 
 const auto GRID_COLOR = "grid-color";
@@ -430,6 +444,17 @@ std::unique_ptr<MindMapData> fromXml(QDomDocument document)
                          { QString(DataKeywords::MindMap::EDGE_COLOR), [&data](const QDomElement & e) {
                               data->setEdgeColor(readColorElement(e));
                           } },
+                         { QString(DataKeywords::MindMap::FONT_FAMILY), [&data](const QDomElement & e) {
+                              QFont font;
+                              font.setFamily(readFirstTextNodeContent(e));
+                              font.setBold(e.attribute(DataKeywords::MindMap::FONT_BOLD).toInt());
+                              font.setItalic(e.attribute(DataKeywords::MindMap::FONT_ITALIC).toUInt());
+                              font.setOverline(e.attribute(DataKeywords::MindMap::FONT_OVERLINE).toInt());
+                              font.setUnderline(e.attribute(DataKeywords::MindMap::FONT_UNDERLINE).toInt());
+                              font.setStrikeOut(e.attribute(DataKeywords::MindMap::FONT_STRIKE_OUT).toInt());
+                              font.setWeight(e.attribute(DataKeywords::MindMap::FONT_WEIGHT).toInt());
+                              data->setFont(font);
+                          } },
                          { QString(DataKeywords::MindMap::GRID_COLOR), [&data](const QDomElement & e) {
                               data->setGridColor(readColorElement(e));
                           } },
@@ -476,6 +501,16 @@ QDomDocument toXml(MindMapData & mindMapData)
     edgeWidthElement.appendChild(doc.createTextNode(QString::number(static_cast<int>(mindMapData.edgeWidth() * SCALE))));
     root.appendChild(edgeWidthElement);
 
+    auto fontFamilyElement = doc.createElement(DataKeywords::MindMap::FONT_FAMILY);
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_BOLD, mindMapData.font().bold());
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_ITALIC, mindMapData.font().italic());
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_OVERLINE, mindMapData.font().overline());
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_STRIKE_OUT, mindMapData.font().strikeOut());
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_UNDERLINE, mindMapData.font().underline());
+    fontFamilyElement.setAttribute(DataKeywords::MindMap::FONT_WEIGHT, mindMapData.font().weight());
+    fontFamilyElement.appendChild(doc.createTextNode(mindMapData.font().family()));
+    root.appendChild(fontFamilyElement);
+
     auto textSizeElement = doc.createElement(DataKeywords::MindMap::TEXT_SIZE);
     textSizeElement.appendChild(doc.createTextNode(QString::number(static_cast<int>(mindMapData.textSize() * SCALE))));
     root.appendChild(textSizeElement);

src/application.cpp

@@ -173,6 +173,7 @@ Application::Application(int & argc, char ** argv)
 
     connect(m_mainWindow.get(), &MainWindow::cornerRadiusChanged, m_mediator.get(), &Mediator::setCornerRadius);
     connect(m_mainWindow.get(), &MainWindow::edgeWidthChanged, m_mediator.get(), &Mediator::setEdgeWidth);
+    connect(m_mainWindow.get(), &MainWindow::fontChanged, m_mediator.get(), &Mediator::setFont);
     connect(m_mainWindow.get(), &MainWindow::textSizeChanged, m_mediator.get(), &Mediator::setTextSize);
     connect(m_mainWindow.get(), &MainWindow::gridSizeChanged, m_editorView, &EditorView::setGridSize);
     connect(m_mainWindow.get(), &MainWindow::gridVisibleChanged, [this](int state) {

src/constants.hpp

@@ -192,7 +192,7 @@ namespace Text {
 
 static const int MIN_SIZE = 6;
 
-static const int MAX_SIZE = 24;
+static const int MAX_SIZE = 72;
 
 } // namespace Text
 

src/edge.cpp

@@ -27,6 +27,7 @@
 #include "simple_logger.hpp"
 
 #include <QBrush>
+#include <QFont>
 #include <QGraphicsEllipseItem>
 #include <QPen>
 #include <QPropertyAnimation>
@@ -192,6 +193,16 @@ void Edge::setText(const QString & text)
     }
 }
 
+void Edge::setFont(const QFont & font)
+{
+    if (m_label) {
+        // Handle size and family separately to maintain backwards compatibility
+        QFont newFont(font);
+        newFont.setPointSize(m_label->font().pointSize());
+        m_label->setFont(newFont);
+    }
+}
+
 void Edge::setTextSize(int textSize)
 {
     if (m_label) {

src/edge.hpp

@@ -27,6 +27,7 @@
 
 class EdgeDot;
 class Node;
+class QFont;
 class QGraphicsEllipseItem;
 class QPropertyAnimation;
 
@@ -73,6 +74,8 @@ public slots:
 
     void setColor(const QColor & color);
 
+    void setFont(const QFont & font);
+
     void setWidth(double width);
 
     void setText(const QString & text);

src/main_window.cpp

@@ -31,12 +31,14 @@
 #include <QApplication>
 #include <QCheckBox>
 #include <QDoubleSpinBox>
+#include <QFontDialog>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QScreen>
 #include <QSpinBox>
 #include <QToolBar>
@@ -63,6 +65,7 @@ MainWindow::MainWindow()
   , m_redoAction(new QAction(tr("Redo"), this))
   , m_edgeWidthSpinBox(new QDoubleSpinBox(this))
   , m_cornerRadiusSpinBox(new QSpinBox(this))
+  , m_fontButton(new QPushButton(this))
   , m_gridSizeSpinBox(new QSpinBox(this))
   , m_textSizeSpinBox(new QSpinBox(this))
   , m_copyOnDragCheckBox(new QCheckBox(tr("Copy on drag"), this))
@@ -234,6 +237,27 @@ QWidgetAction * MainWindow::createTextSizeAction()
     return WidgetFactory::buildToolBarWidgetActionWithLabel(tr("Text size:"), *m_textSizeSpinBox, *this).second;
 }
 
+QWidgetAction * MainWindow::createFontAction()
+{
+    m_fontButton->setText(tr("Font") + threeDots);
+    connect(m_fontButton, &QPushButton::clicked, [=] {
+        bool ok;
+        QFont defaultFont = m_fontButton->font();
+        defaultFont.setPointSize(m_textSizeSpinBox->value());
+        const auto font = QFontDialog::getFont(&ok, defaultFont, this);
+        if (ok) {
+            // Note: Support for multiple families implemented in Qt 5.13 =>
+            juzzlin::L().debug() << "Font family selected: '" << font.family().toStdString() << "'";
+            juzzlin::L().debug() << "Font weight selected: " << font.weight();
+            updateFontButtonFont(font);
+            m_textSizeSpinBox->setValue(font.pointSize());
+            emit textSizeChanged(font.pointSize());
+            emit fontChanged(font);
+        }
+    });
+    return WidgetFactory::buildToolBarWidgetAction(*m_fontButton, *this).second;
+}
+
 QWidgetAction * MainWindow::createGridSizeAction()
 {
     m_gridSizeSpinBox->setMinimum(Constants::Grid::MIN_SIZE);
@@ -412,6 +436,8 @@ void MainWindow::createToolBar()
     toolBar->addSeparator();
     toolBar->addAction(createTextSizeAction());
     toolBar->addSeparator();
+    toolBar->addAction(createFontAction());
+    toolBar->addSeparator();
     toolBar->addAction(createCornerRadiusAction());
     toolBar->addSeparator();
     toolBar->addAction(createGridSizeAction());
@@ -552,6 +578,13 @@ void MainWindow::populateMenuBar()
     createHelpMenu();
 }
 
+void MainWindow::updateFontButtonFont(const QFont & font)
+{
+    QFont newFont(font);
+    newFont.setPointSize(m_fontButton->font().pointSize());
+    m_fontButton->setFont(newFont);
+}
+
 void MainWindow::appear()
 {
     if (Settings::loadFullScreen()) {
@@ -604,6 +637,11 @@ void MainWindow::setEdgeWidth(double value)
     }
 }
 
+void MainWindow::setFont(const QFont & font)
+{
+    updateFontButtonFont(font);
+}
+
 void MainWindow::setTextSize(int textSize)
 {
     if (m_textSizeSpinBox->value() != textSize) {

src/main_window.hpp

@@ -35,6 +35,7 @@ class QAction;
 class QCheckBox;
 class QDoubleSpinBox;
 class QLineEdit;
+class QPushButton;
 class QSlider;
 class QSpinBox;
 class QTextEdit;
@@ -92,6 +93,8 @@ public slots:
 
     void setEdgeWidth(double value);
 
+    void setFont(const QFont & font);
+
     void setTextSize(int textSize);
 
     void showErrorDialog(QString message);
@@ -107,6 +110,8 @@ public slots:
 
     void edgeWidthChanged(double width);
 
+    void fontChanged(QFont font);
+
     void gridSizeChanged(int size);
 
     void gridVisibleChanged(int state);
@@ -134,6 +139,8 @@ public slots:
 
     QWidgetAction * createEdgeWidthAction();
 
+    QWidgetAction * createFontAction();
+
     QWidgetAction * createGridSizeAction();
 
     QWidgetAction * createSearchAction();
@@ -156,6 +163,8 @@ public slots:
 
     void populateMenuBar();
 
+    void updateFontButtonFont(const QFont & font);
+
     AboutDlg * m_aboutDlg;
 
     SettingsDialog * m_settingsDlg;
@@ -180,6 +189,8 @@ public slots:
 
     QSpinBox * m_cornerRadiusSpinBox = nullptr;
 
+    QPushButton * m_fontButton = nullptr;
+
     QSpinBox * m_gridSizeSpinBox = nullptr;
 
     QSpinBox * m_textSizeSpinBox = nullptr;

src/mediator.cpp

@@ -57,6 +57,7 @@ void Mediator::addExistingGraphToScene()
             addItem(*node);
             node->setCornerRadius(m_editorData->mindMapData()->cornerRadius());
             node->setTextSize(m_editorData->mindMapData()->textSize());
+            node->setFont(m_editorData->mindMapData()->font());
             L().debug() << "Added existing node " << node->index() << " to scene";
         }
     }
@@ -69,6 +70,7 @@ void Mediator::addExistingGraphToScene()
             edge->setColor(m_editorData->mindMapData()->edgeColor());
             edge->setWidth(m_editorData->mindMapData()->edgeWidth());
             edge->setTextSize(m_editorData->mindMapData()->textSize());
+            edge->setFont(m_editorData->mindMapData()->font());
             node0->addGraphicsEdge(*edge);
             node1->addGraphicsEdge(*edge);
             edge->updateLine();
@@ -82,6 +84,7 @@ void Mediator::addExistingGraphToScene()
     m_mainWindow.setCornerRadius(m_editorData->mindMapData()->cornerRadius());
     m_mainWindow.setEdgeWidth(m_editorData->mindMapData()->edgeWidth());
     m_mainWindow.setTextSize(m_editorData->mindMapData()->textSize());
+    m_mainWindow.setFont(m_editorData->mindMapData()->font());
 
     m_editorView->setCornerRadius(m_editorData->mindMapData()->cornerRadius());
     m_editorView->setEdgeColor(m_editorData->mindMapData()->edgeColor());
@@ -695,6 +698,12 @@ void Mediator::setSearchText(QString text)
     updateNodeConnectionActions();
 }
 
+void Mediator::setFont(QFont font)
+{
+    saveUndoPoint();
+    m_editorData->mindMapData()->setFont(font);
+}
+
 void Mediator::setTextSize(int textSize)
 {
     // Break loop with the spinbox

src/mediator.hpp

@@ -16,6 +16,7 @@
 #ifndef MEDIATOR_HPP
 #define MEDIATOR_HPP
 
+#include <QFont>
 #include <QObject>
 #include <QPointF>
 #include <QString>
@@ -147,6 +148,8 @@ class Mediator : public QObject
 
     void setEditorView(EditorView & editorView);
 
+    void setFont(QFont font);
+
     //! \returns number of nodes in the current rectangle.
     size_t setRectagleSelection(QRectF rect);