[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst/kio
From:       Craig Drummond <craig () kde ! org>
Date:       2004-03-24 19:49:34
Message-ID: 20040324194934.99ECE997F () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Display AFM's "fontname" and not filename - e.g. "Helvetica, Metrics"


  M +11 -5     KioFonts.cpp   1.24


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.23:1.24
@@ -76,4 +76,6 @@
 #define KDE_DBUG kdDebug(7124)
 
+#include <iostream>
+
 extern "C"
 {
@@ -145,5 +147,5 @@ static bool createUDSEntry(KIO::UDSEntry
     if(-1!=KDE_lstat(cPath, &buff ))
     {
-        if(CFontEngine::isAFont(cPath))
+        if(CFontEngine::isAFont(cPath) || CFontEngine::isAAfm(cPath))
         {
             if(CGlobal::fe().openFont(path))
@@ -526,4 +528,5 @@ void CKioFonts::stat(const KURL &url)
 {
     KDE_DBUG << "stat " << url.path() << endl;
+std::cerr << "stat " << url.path().latin1() << std::endl;
     CHECK_URL_ROOT_OK(url)
 
@@ -685,4 +688,5 @@ void CKioFonts::put(const KURL &u, int m
 {
     KDE_DBUG << "put " << u.path() << endl;
+std::cerr << "put " << u.path().latin1() << std::endl;
 
     QString  destOrig(convertUrl(u, false));
@@ -918,4 +922,6 @@ void CKioFonts::copy(const KURL &src, co
 
     KDE_DBUG << "REAL:" << realSrc << " TO REAL:" << realDest << endl;
+
+std::cerr << "REAL:" << realSrc.data() << " TO REAL:" << realDest.data() << std::endl;
     if(S_ISDIR(buffSrc.st_mode))
     {
@@ -1071,5 +1077,5 @@ void CKioFonts::copy(const KURL &src, co
 void CKioFonts::rename(const KURL &src, const KURL &dest, bool overwrite)
 {
-    KDE_DBUG << "rename " << src.path() << " to " << dest.path() << endl;
+    KDE_DBUG << "rename[1] " << src.path() << " to " << dest.path() << endl;
 
     CHECK_URL(src)
@@ -1108,5 +1114,5 @@ void CKioFonts::rename(const KURL &src, 
     QCString destPath(QFile::encodeName(CMisc::getDir(srcPath)+CMisc::getFile(dest.path())));
 
-    KDE_DBUG << "rename " << srcPath << " to " << destPath << endl;
+    KDE_DBUG << "rename[2] " << srcPath << " to " << destPath << endl;
 
     ExistsType destExists=checkIfExists(CGlobal::cfg().getRealTopDirs(dest.path()), dSub);
@@ -1164,5 +1170,5 @@ void CKioFonts::rename(const KURL &src, 
             if(dir ? CMisc::dExists(*it+sSub) : CMisc::fExists(*it+sSub) || CMisc::isLink(*it+sSub))
             {
-                KDE_DBUG << "rename " << *it+sSub << " to " << *it+dSub << endl;
+                KDE_DBUG << "rename[3] " << *it+sSub << " to " << *it+dSub << endl;
 
                 if(::rename(QFile::encodeName(*it+sSub).data(), QFile::encodeName(*it+dSub).data()))


[prev in list] [next in list] [prev in thread] [next in thread]