Package: fontmatrix
Followup-For: Bug #579314
Here's a patch to support .ttc files, seems to work here. Feel free to
include and/or upstream it.
Best regards,
Christian Ohm
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages fontmatrix depends on:
ii libc6 2.13-21
ii libfontconfig1 2.8.0-3
ii libfreetype6 2.4.7-2
ii libgcc1 1:4.6.2-2
ii libicu44 4.4.2-2
ii libm17n-0 1.6.3-1
ii libpython2.7 2.7.2-7
ii libqt4-network 4:4.7.3-8
ii libqt4-opengl 4:4.7.3-8
ii libqt4-sql 4:4.7.3-8
ii libqt4-sql-sqlite 4:4.7.3-8
ii libqt4-svg 4:4.7.3-8
ii libqt4-xml 4:4.7.3-8
ii libqt4-xmlpatterns 4:4.7.3-8
ii libqtcore4 4:4.7.3-8
ii libqtgui4 4:4.7.3-8
ii libqtwebkit4 2.1.0~2011week13-2
ii libstdc++6 4.6.2-2
fontmatrix recommends no packages.
fontmatrix suggests no packages.
-- no debconf information
From: cybersphinx <chr....@gmx.net>
Date: Sat, 29 Oct 2011 20:28:47 +0200
Subject: [PATCH] Add support for .ttc files.
---
src/browserwidget.cpp | 2 +-
src/listdockwidget.cpp | 4 ++--
src/typotek.cpp | 10 +++++++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/browserwidget.cpp b/src/browserwidget.cpp
index 501052a..a623179 100644
--- a/src/browserwidget.cpp
+++ b/src/browserwidget.cpp
@@ -48,7 +48,7 @@ BrowserWidget::BrowserWidget(QWidget *parent) :
folderViewContextMenu = 0;
currentPage = BROWSER_VIEW_SAMPLE;
sample = chart = 0;
- ffilter << "*.otf" << "*.ttf" << "*.pfb";
+ ffilter << "*.otf" << "*.ttf" << "*.ttc" << "*.pfb";
theDirModel = new QDirModel(ffilter, QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot, QDir::DirsFirst | QDir::Name);
theDirModel->setLazyChildCount(true);
ui->browserView->setModel(theDirModel);
diff --git a/src/listdockwidget.cpp b/src/listdockwidget.cpp
index 62a395a..c1f1b01 100644
--- a/src/listdockwidget.cpp
+++ b/src/listdockwidget.cpp
@@ -72,7 +72,7 @@ ListDockWidget::ListDockWidget()
// previewSize->setValue(typotek::getInstance()->getPreviewSize());
// Folders tree
- ffilter << "*.otf" << "*.ttf" << "*.pfb";
+ ffilter << "*.otf" << "*.ttf" << "*.ttc" << "*.pfb";
theDirModel = new QDirModel(ffilter, QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot, QDir::DirsFirst | QDir::Name);
theDirModel->setLazyChildCount(true);
folderView->setModel(theDirModel);
@@ -414,7 +414,7 @@ void FolderViewMenu::slotImportDir()
{
QDir dir(selectedFileOrDir.absoluteFilePath());
QStringList ffilter;
- ffilter << "*.otf" << "*.ttf" << "*.pfb";
+ ffilter << "*.otf" << "*.ttf" << "*.ttc" << "*.pfb";
QStringList fontList = dir.entryList(ffilter);
if (fontList.count() < 1)
return;
diff --git a/src/typotek.cpp b/src/typotek.cpp
index 7f64a1f..e3aafe0 100644
--- a/src/typotek.cpp
+++ b/src/typotek.cpp
@@ -386,7 +386,7 @@ void typotek::open ( QString path, bool recursive, bool announce, bool collect )
yetHereFonts = FMFontDb::DB()->AllFontNames();
QStringList filters;
- filters << "*.otf" << "*.pfb" << "*.ttf" ;
+ filters << "*.otf" << "*.pfb" << "*.ttf" << "*.ttc";
foreach ( QString dr, dirList )
{
QDir d ( dr );
@@ -523,7 +523,7 @@ void typotek::importFiles()
QStringList flist = QFileDialog::getOpenFileNames(this,
tr("Select Files to Import"),
QDir::homePath(),
- QString("%1 (*.otf *.ttf *.pfb)").arg(tr("Font Files")));
+ QString("%1 (*.otf *.ttf *.ttc *.pfb)").arg(tr("Font Files")));
if(!flist.isEmpty())
openList(flist);
}
@@ -1226,7 +1226,7 @@ void typotek::initDir()
QStringList dirList ( fontmatrix::exploreDirs ( theDir,0 ) );
QStringList filters;
- filters << "*.otf" << "*.pfb" << "*.ttf" ;
+ filters << "*.otf" << "*.pfb" << "*.ttf" << "*.ttc";
foreach ( QString dr, dirList )
{
QDir d ( dr );
@@ -1432,6 +1432,10 @@ void typotek::dropEvent ( QDropEvent * event )
{
ret << url.toLocalFile();
}
+ else if ( url.toLocalFile().endsWith ( "ttc",Qt::CaseInsensitive ) )
+ {
+ ret << url.toLocalFile();
+ }
else if ( url.toLocalFile().endsWith ( "otf",Qt::CaseInsensitive ) )
{
ret << url.toLocalFile();
--
1.7.7.1
