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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2004-12-01 16:36:17
Message-ID: 20041201163617.46A3F1B93D () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Remove support for Speedo and SNF fonts - as FontConfig and FreeType seem not to \
support these formats.


  M +11 -10    kcmfontinst/KCmFontInst.cpp   1.38
  M +3 -3      kfile-plugin/KFileFont.cpp   1.15


--- kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp  #1.37:1.38
@@ -81,6 +81,5 @@ CKCmFontInst::CKCmFontInst(QWidget *pare
          "(c) Craig Drummond, 2000 - 2004"));
     about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), \
                "craig@kde.org");
-    setAboutData( about );
-
+    setAboutData(about);
 
     const char *appName=KCmdLineArgs::appName();
@@ -149,8 +148,8 @@ CKCmFontInst::CKCmFontInst(QWidget *pare
               << "application/x-font-ttc"
               << "application/x-font-type1"
-              << "application/x-font-bdf"
               << "application/x-font-pcf"
-              << "application/x-font-snf"
-              << "application/x-font-speedo";
+              << "application/x-font-bdf";
+              //<< "application/x-font-snf"
+              //<< "application/x-font-speedo";
 
     itsDirOp->setMimeFilter(mimeTypes);
@@ -303,5 +302,6 @@ QString CKCmFontInst::quickHelp() const
     return Misc::root()
                ? i18n("<h1>Font Installer</h1><p> This module allows you to"
-                      " install TrueType, Type1, Speedo, and Bitmap"
+                      //" install TrueType, Type1, Speedo, and Bitmap"
+                      " install TrueType, Type1, and Bitmap"
                       " fonts.</p><p>You may also install fonts using Konqueror:"
                       " type fonts:/ into Konqueror's location bar"
@@ -309,5 +309,6 @@ QString CKCmFontInst::quickHelp() const
                       " font, simply copy one into the folder.</p>")
                : i18n("<h1>Font Installer</h1><p> This module allows you to"
-                      " install TrueType, Type1, Speedo, and Bitmap"
+                      //" install TrueType, Type1, Speedo, and Bitmap"
+                      " install TrueType, Type1, and Bitmap"
                       " fonts.</p><p>You may also install fonts using Konqueror:"
                       " type fonts:/ into Konqueror's location bar"
@@ -397,6 +398,6 @@ void CKCmFontInst::addFonts()
     KURL::List list=KFileDialog::getOpenURLs(QString::null, "application/x-font-ttf \
                application/x-font-otf "
                                                             "application/x-font-ttc \
                application/x-font-type1 "
-                                                            "application/x-font-bdf \
                application/x-font-pcf "
-                                                            "application/x-font-snf \
application/x-font-speedo", +                                                         \
"application/x-font-pcf application/x-font-bdf", +                                    \
//"application/x-font-snf application/x-font-speedo",  this, i18n("Add Fonts"));
 

--- kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp  #1.14:1.15
@@ -273,8 +273,8 @@ KFileFontPlugin::KFileFontPlugin(QObject
     addMimeType("application/x-font-ttf"),
     addMimeType("application/x-font-type1");
-    addMimeType("application/x-font-speedo");
+    //addMimeType("application/x-font-speedo");
     addMimeType("application/x-font-bdf");
     addMimeType("application/x-font-pcf");
-    addMimeType("application/x-font-snf");
+    //addMimeType("application/x-font-snf");
     addMimeType("application/x-font-otf");
     addMimeType("application/x-font-ttc");


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