remove obsolete zooming functions

[pykit.git] / main.cc

diff --git a/main.cc b/main.cc
index 84a675f..d83af4a 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -15,7 +15,9 @@
 #include <QApplication>
 #include <QSplashScreen>
 #include <QSettings>
-#include <boost/python.hpp>
+#include <QDir>
+#include <QFileInfo>
+#include <QFontDatabase>
 #include <boost/scoped_ptr.hpp>
 #include "MainWindow.hh"
 #include "PythonPublisher.hh"
@@ -49,9 +51,25 @@ int main(int argc, char *argv[])
         QString iconPath (settings.value("icon").toString());
 
         settings.endGroup();
+
+        settings.beginGroup("Fonts");
+        QString loadFontDir (settings.value("loaddir").toString());
+        if (!loadFontDir.isEmpty()) {
+            QDir dir (loadFontDir);
+            if (dir.exists()) {
+                QFileInfoList files (dir.entryInfoList(QDir::Files));
+                for (QFileInfoList::iterator i (files.begin()), i_end (files.end());
+                     i != i_end; ++i)
+                    QFontDatabase::addApplicationFont(i->absoluteFilePath());
+            }
+            else
+                std::cerr << "WARNING: Font directory not found" << std::endl;
+        }
+        settings.endGroup();
+
         settings.beginGroup("Viewer");
 
-        pykit::PythonPublisher publisher (settings.value("init").toString().toStdString());
+        pykit::PythonPublisher publisher;
 
         QString url (settings.value("home").toString());
         if (arguments.size()>1)
@@ -68,10 +86,6 @@ int main(int argc, char *argv[])
 
         return app.exec();
     }
-    catch (boost::python::error_already_set & ex) {
-        PyErr_Print();
-        throw;
-    }
     catch (std::exception & ex) {
         std::cerr << "Exception:\n" << ex.what() << "\n";
         throw;