Move initializeFonts out of MixxxMainWindow.

kwhat · Jan 9, 2016 · 07024ee · 07024ee
1 parent 6824abd
commit 07024ee
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
@@ -174,7 +174,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
     mixxx::Translations::initializeTranslations(
         pConfig.data(), pApp, args.getLocale());
 
-    initializeFonts(); // takes a long time
+    FontUtils::initializeFonts(resourcePath); // takes a long time
 
     launchProgress(2);
 
@@ -704,30 +704,6 @@ void MixxxMainWindow::initializeWindow() {
     slotUpdateWindowTitle(TrackPointer());
 }
 
-void MixxxMainWindow::initializeFonts() {
-    UserSettingsPointer pConfig = m_pSettingsManager->settings();
-    QDir fontsDir(pConfig->getResourcePath());
-    if (!fontsDir.cd("fonts")) {
-        qWarning("MixxxMainWindow::initializeFonts: cd fonts failed");
-        return;
-    }
-
-    QList<QFileInfo> files = fontsDir.entryInfoList(
-            QDir::NoDotAndDotDot | QDir::Files | QDir::Readable);
-    foreach (const QFileInfo& file, files) {
-        const QString& path = file.filePath();
-
-        // Skip text files (e.g. license files). For all others we let Qt tell
-        // us whether the font format is supported since there is no way to
-        // check other than adding.
-        if (path.endsWith(".txt", Qt::CaseInsensitive)) {
-            continue;
-        }
-
-        FontUtils::addFont(path);
-    }
-}
-
 void MixxxMainWindow::initializeKeyboard() {
     UserSettingsPointer pConfig = m_pSettingsManager->settings();
     QString resourcePath = pConfig->getResourcePath();

diff --git a/src/mixxx.h b/src/mixxx.h
@@ -183,7 +183,6 @@ class MixxxMainWindow : public QMainWindow {
   private:
     void initializeWindow();
     void initializeKeyboard();
-    void initializeFonts();
     void checkDirectRendering();
     bool confirmExit();
     void linkSkinWidget(ControlObjectSlave** pCOS,

diff --git a/src/preferences/settingsmanager.h b/src/preferences/settingsmanager.h
@@ -17,7 +17,7 @@ class SettingsManager : public QObject {
     }
 
     void save() {
-        m_pSettings->Save();
+        m_pSettings->save();
     }
 
     bool shouldRescanLibrary() {

diff --git a/src/util/font.h b/src/util/font.h
@@ -4,11 +4,35 @@
 #include <QFontDatabase>
 #include <QString>
 #include <QtDebug>
+#include <QDir>
 
 #include "util/cmdlineargs.h"
 
 class FontUtils {
   public:
+    static void initializeFonts(const QString& resourcePath) {
+        QDir fontsDir(resourcePath);
+        if (!fontsDir.cd("fonts")) {
+            qWarning("MixxxMainWindow::initializeFonts: cd fonts failed");
+            return;
+        }
+
+        QList<QFileInfo> files = fontsDir.entryInfoList(
+            QDir::NoDotAndDotDot | QDir::Files | QDir::Readable);
+        foreach (const QFileInfo& file, files) {
+            const QString& path = file.filePath();
+
+            // Skip text files (e.g. license files). For all others we let Qt tell
+            // us whether the font format is supported since there is no way to
+            // check other than adding.
+            if (path.endsWith(".txt", Qt::CaseInsensitive)) {
+                continue;
+            }
+
+            addFont(path);
+        }
+    }
+
     static bool addFont(const QString& path) {
         int result = QFontDatabase::addApplicationFont(path);
         if (result == -1) {