Update fonts for macOS

netw0rkf10w · Feb 20, 2024 · 2107a5f · 2107a5f
1 parent 00f04ef
commit 2107a5f
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ build*/
 symbols-ng/gesymb-ng
 symbols-ng/gesymb-ng.o
 CMakeLists.txt.user
+.DS_Store
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -312,8 +312,9 @@ endif()
 
 # poppler
 
-find_package(PkgConfig)
-pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler-cpp poppler-qt${QT_VERSION_MAJOR})
+find_package(PkgConfig REQUIRED)
+# pkg_check_modules(POPPLER QUIET IMPORTED_TARGET poppler-cpp poppler-qt${QT_VERSION_MAJOR})
+pkg_check_modules(POPPLER IMPORTED_TARGET poppler-cpp poppler-qt${QT_VERSION_MAJOR})
 if(POPPLER_FOUND)
     message(STATUS "Build internal pdf previewer.")
 else()

diff --git a/images-ng/colibre/lbook0.svg b/images-ng/colibre/lbook0.svg
diff --git a/images-ng/colibre/lbook0_dm.svg b/images-ng/colibre/lbook0_dm.svg
diff --git a/images-ng/colibre/lbook7.svg b/images-ng/colibre/lbook7.svg
diff --git a/images-ng/colibre/lbook7_dm.svg b/images-ng/colibre/lbook7_dm.svg
diff --git a/images-ng/colibre/lbook8.svg b/images-ng/colibre/lbook8.svg
diff --git a/images-ng/colibre/lbook8_dm.svg b/images-ng/colibre/lbook8_dm.svg
diff --git a/images-ng/colibre/lbook9.svg b/images-ng/colibre/lbook9.svg
diff --git a/images-ng/colibre/lbook9_dm.svg b/images-ng/colibre/lbook9_dm.svg
diff --git a/images-ng/colibre/view-doc-ps.svg b/images-ng/colibre/view-doc-ps.svg
diff --git a/images-ng/colibre/view-doc-ps_dm.svg b/images-ng/colibre/view-doc-ps_dm.svg
diff --git a/src/pdfviewer/pdfviewer.pri b/src/pdfviewer/pdfviewer.pri
@@ -36,11 +36,15 @@ isEmpty(NO_POPPLER_PREVIEW) {
     macx { # PATH to pkgconfig needs to be present in build PATH
         QT_CONFIG -= no-pkg-config
     }
-    poppler_qt_pkg = poppler-qt$${QT_MAJOR_VERSION} poppler-cpp
+    # poppler_qt_pkg = poppler-qt$${QT_MAJOR_VERSION} poppler-cpp
 
-    CONFIG += link_pkgconfig
+    INCLUDEPATH += ~/.local/include/poppler/qt6
+    LIBS += -L~/.local/lib -lpoppler-qt6
 
-    PKGCONFIG += $${poppler_qt_pkg}
+    CONFIG += link_pkgconfig
+    # PKGCONFIG += $${poppler_qt_pkg}
+    # PKGCONFIG += poppler-qt6
+    # PKGCONFIG += ~/.local/lib/pkgconfig/poppler-qt6.pc
 
     !isEmpty(MXE){
             message("Using MXE")

diff --git a/src/qcodeedit/lib/document/qdocument.cpp b/src/qcodeedit/lib/document/qdocument.cpp
@@ -433,7 +433,7 @@ QDocument::QDocument(QObject *p)
 	if ( !QDocumentPrivate::m_font )
 	{
 		// must not happen if config dialog plugged in...
-		setBaseFont(QFont("Monospace", 10));
+		setBaseFont(QFont("Menlo", 10));
 	}
 
 

diff --git a/src/qcodeedit/lib/widgets/qeditconfig.cpp b/src/qcodeedit/lib/widgets/qeditconfig.cpp
@@ -285,7 +285,7 @@ void QEditConfig::restore()
 
 	m_direct = false;
 
-	QFont font("Monospace", 10);
+	QFont font("Menlo", 10);
 	font.setStyleHint(QFont::Courier);
 
 	cbFont->setFont(font);