From 5c610f97575b31d8cc84d9b1621262660e615015 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 22 May 2015 11:23:34 -0700
Subject: [PATCH] Added medium and large default font sizes

---
 src/QmlControls/ScreenTools.cc | 14 +++++++++++++-
 src/QmlControls/ScreenTools.h  | 14 +++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/QmlControls/ScreenTools.cc b/src/QmlControls/ScreenTools.cc
index 6cb965b54..77c0ccb19 100644
--- a/src/QmlControls/ScreenTools.cc
+++ b/src/QmlControls/ScreenTools.cc
@@ -31,6 +31,8 @@
 #include <QFontMetrics>
 
 const double ScreenTools::_defaultFontPointSize = 13;
+const double ScreenTools::_mediumFontPointSize = 16;
+const double ScreenTools::_largeFontPointSize = 20;
 
 ScreenTools::ScreenTools()
 {
@@ -92,7 +94,7 @@ void ScreenTools::_updatePixelSize()
 void ScreenTools::_updateFontSize()
 {
     emit fontPointFactorChanged();
-    emit defaultFontPointSizeChanged();
+    emit fontSizesChanged();
 }
 
 double ScreenTools::fontPointFactor()
@@ -109,3 +111,13 @@ double ScreenTools::defaultFontPointSize(void)
 {
     return _defaultFontPointSize * MainWindow::fontPointFactor();
 }
+
+double ScreenTools::mediumFontPointSize(void)
+{
+    return _mediumFontPointSize * MainWindow::fontPointFactor();
+}
+
+double ScreenTools::largeFontPointSize(void)
+{
+    return _largeFontPointSize * MainWindow::fontPointFactor();
+}
diff --git a/src/QmlControls/ScreenTools.h b/src/QmlControls/ScreenTools.h
index d9948d528..98d8da206 100644
--- a/src/QmlControls/ScreenTools.h
+++ b/src/QmlControls/ScreenTools.h
@@ -85,8 +85,13 @@ public:
     Q_PROPERTY(double   fontPointFactor      READ fontPointFactor      NOTIFY fontPointFactorChanged)
     //! Returns the pixel size factor
     Q_PROPERTY(double   pixelSizeFactor      READ pixelSizeFactor      NOTIFY pixelSizeFactorChanged)
+    
     //! Returns the system wide default font point size (properly scaled)
-    Q_PROPERTY(double   defaultFontPointSize READ defaultFontPointSize NOTIFY defaultFontPointSizeChanged)
+    Q_PROPERTY(double   defaultFontPointSize READ defaultFontPointSize NOTIFY fontSizesChanged)
+    //! Returns the system wide default font point size (properly scaled)
+    Q_PROPERTY(double   mediumFontPointSize READ mediumFontPointSize NOTIFY fontSizesChanged)
+    //! Returns the system wide default font point size (properly scaled)
+    Q_PROPERTY(double   largeFontPointSize READ largeFontPointSize NOTIFY fontSizesChanged)
 
     //! Utility for adjusting font point size. Not dynamic (no signals)
     Q_INVOKABLE qreal   adjustFontPointSize(qreal pointSize);
@@ -113,6 +118,8 @@ public:
     double  fontPointFactor     ();
     double  pixelSizeFactor     ();
     double  defaultFontPointSize(void);
+    double  mediumFontPointSize(void);
+    double  largeFontPointSize(void);
 
 #if defined (__android__)
     bool    isAndroid           () { return true;  }
@@ -128,7 +135,7 @@ signals:
     void repaintRequestedChanged();
     void pixelSizeFactorChanged();
     void fontPointFactorChanged();
-    void defaultFontPointSizeChanged();
+    void fontSizesChanged();
 
 private slots:
     void _updateCanvas();
@@ -137,7 +144,8 @@ private slots:
 
 private:
     static const double _defaultFontPointSize;
-
+    static const double _mediumFontPointSize;
+    static const double _largeFontPointSize;
 };
 
 #endif
-- 
2.22.0