Changeset 163 for smplayer/vendor/current/src/mycombobox.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/mycombobox.cpp (modified) (3 diffs)

smplayer/vendor/current/src/mycombobox.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 #include "mycombobox.h"
+#include <QDir>
+#include <QStringListModel>
+#include <QDebug>
 
 MyComboBox::MyComboBox( QWidget * parent ) : QComboBox(parent)
@@ -60 +63 @@
                 setItemText(currentIndex(), text);
 }
+
+void MyFontComboBox::setFontsFromDir(const QString & fontdir) {
+        QString current_text = currentText();
+
+        if (fontdir.isEmpty()) {
+                QFontDatabase::removeAllApplicationFonts();
+                clear();
+                setWritingSystem(QFontDatabase::Any);
+        } else {
+                QFontDatabase fdb;
+                QStringList fontnames;
+                QStringList fontfiles = QDir(fontdir).entryList(QStringList() << "*.ttf" << "*.otf", QDir::Files);
+                for (int n=0; n < fontfiles.count(); n++) {
+                        qDebug() << "MyFontComboBox::setFontsFromDir: adding font:" << fontfiles[n];
+                        int id = fdb.addApplicationFont(fontdir +"/"+ fontfiles[n]);
+                        fontnames << fdb.applicationFontFamilies(id);
+                }
+                //fdb.removeAllApplicationFonts();
+                fontnames.removeDuplicates();
+                qDebug() << "MyFontComboBox::setFontsFromDir: fontnames:" << fontnames;
+                clear();
+                QStringListModel *m = qobject_cast<QStringListModel *>(model());
+                if (m) m->setStringList(fontnames);
+        }
+
+        setCurrentText(current_text);
+}
+