From dcfa0ce655bc6ef218c3c4f9695488f08e4af751 Mon Sep 17 00:00:00 2001
From: mlong <markdlong128@gmail.com>
Date: Wed, 3 Feb 2021 13:11:56 -0600
Subject: [PATCH] Fixed layout error message and font aliases for Apple Fonts.

---
 src/main.cpp                                  |  9 +++----
 src/resource/resources.qrc                    |  4 +--
 src/ui/catalogwidget.cxx                      |  5 ++--
 src/ui/diskexplorer/DiskExplorerMapWidget.cpp | 27 +++++++++----------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e1cd87d..c898a97 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,12 +18,11 @@ int main(int argc, char** argv)
     QCoreApplication::setOrganizationDomain("lydianscale.com");
     QCoreApplication::setApplicationName("AppleSAWS");
 
-    qDebug("Adding fonts");
-    auto x = QFontDatabase::addApplicationFont(":/fonts/A2_40Col.ttf");
-    auto y = QFontDatabase::addApplicationFont(":/fonts/A2_80Col.ttf");
+    auto x = QFontDatabase::addApplicationFont(":/fonts/Print_Char_21.ttf");
+    auto y = QFontDatabase::addApplicationFont(":/fonts/PR_Number_3.ttf");
 
-    if (x < 0) { qWarning("Could not load A2_40Col.ttf font."); }
-    if (y < 0) { qWarning("Could not load A2_80Col.ttf font."); }
+    if (x < 0) { qWarning("Could not load Print_Char_21.ttf font."); }
+    if (y < 0) { qWarning("Could not load PR_Number_3.ttf font."); }
 
     StartupDialog w;
     w.show();
diff --git a/src/resource/resources.qrc b/src/resource/resources.qrc
index 4122e2a..9044e34 100644
--- a/src/resource/resources.qrc
+++ b/src/resource/resources.qrc
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/fonts">
         <file>FreeLicense.txt</file>
-        <file alias="A2_40Col.ttf">PrintChar21.ttf</file>
-        <file alias="A2_80Col.ttf">PRNumber3.ttf</file>
+        <file alias="Print_Char_21.ttf">PrintChar21.ttf</file>
+        <file alias="PR_Number_3.ttf">PRNumber3.ttf</file>
     </qresource>
     <qresource prefix="/notes">
         <file>notes.txt</file>
diff --git a/src/ui/catalogwidget.cxx b/src/ui/catalogwidget.cxx
index cae6661..859a4af 100644
--- a/src/ui/catalogwidget.cxx
+++ b/src/ui/catalogwidget.cxx
@@ -16,8 +16,9 @@ CatalogWidget::CatalogWidget(QWidget *parent) :
     ui(new Ui::CatalogWidget)
 {
     ui->setupUi(this);
-    QFont catalogFont;
-    catalogFont.setStyleHint(QFont::Monospace);
+    QFont catalogFont("PR Number 3",12);
+    //catalogFont.setStyleHint(QFont::Monospace);
+
     ui->catalog_list->setFont(catalogFont);
     ui->noteButton->setText(QChar(0x270d));
     ui->noteButton->setFont(QFont("sans",16,QFont::Bold));
diff --git a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
index 63b2562..6c2cc3d 100644
--- a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
+++ b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
@@ -15,38 +15,37 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid
 {
     m_numtracks = numtracks;
     m_numsectors = numsectors;
-    m_diskLabel = Q_NULLPTR;
-    m_statusWidget = Q_NULLPTR;
+
+    m_diskLabel = nullptr;
+    m_statusWidget = nullptr;
+    m_currentChecked = nullptr;
 
     m_deferredSetup = false;
 
     setWindowTitle("Disk Explorer");
 
-    m_currentChecked = Q_NULLPTR;
+    QGridLayout *gridlayout = new QGridLayout(this);
+    gridlayout->setSizeConstraint(QLayout::SetFixedSize);
+    gridlayout->setHorizontalSpacing(2);
+    gridlayout->setVerticalSpacing(1);
 
     initColors();
 
-    QGridLayout *layout = new QGridLayout();
-    layout->setSizeConstraint(QLayout::SetFixedSize);
-    layout->setHorizontalSpacing(2);
-    layout->setVerticalSpacing(1);
-
     m_bgroup = new QButtonGroup(this);
 
-    setLayout(layout);
     QLabel *tracklabel = new QLabel("Track",this);
-    layout->addWidget(tracklabel,0,0,1,m_numtracks+1,Qt::AlignHCenter);
+    gridlayout->addWidget(tracklabel,0,0,1,m_numtracks+1,Qt::AlignHCenter);
     for (int track= 0; track < numtracks; track++)
     {
         QLabel *label = new QLabel(QString("%1").arg(track));
         label->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-        layout->addWidget(label,1,track+1);
+        gridlayout->addWidget(label,1,track+1);
     }
     for (int sec = 0; sec < numsectors; sec++)
     {
         QLabel *label = new QLabel(QString("Sec %1").arg(sec));
         label->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-        layout->addWidget(label,sec+2,0);
+        gridlayout->addWidget(label,sec+2,0);
     }
     for (int track = 0; track < 35; track++)
     {
@@ -62,7 +61,7 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid
 
             tb->setAutoFillBackground(true);
 
-            layout->addWidget(tb,sec+2,track+1);
+            gridlayout->addWidget(tb,sec+2,track+1);
         }
     }
 
@@ -72,7 +71,7 @@ DiskExplorerMapWidget::DiskExplorerMapWidget(int numtracks, int numsectors, QWid
 void DiskExplorerMapWidget::makeStatusWidget()
 {
     QWidget *statusWidget = new QWidget(this);
-    QHBoxLayout *hbl = new QHBoxLayout(this);
+    QHBoxLayout *hbl = new QHBoxLayout();
     statusWidget->setLayout(hbl);
 
     m_trackSectorLabel = new QLabel(this);