[Pkg-kde-commits] rev 980 - in branches/kde-3.4.0/packages: kdebase/debian/patches kdelibs/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 07 Apr 2005 21:27:22 +0000
Author: chrsmrtn-guest
Date: 2005-04-07 21:27:21 +0000 (Thu, 07 Apr 2005)
New Revision: 980
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff
Log:
Use capital letters, or else, oddly enough, the font names show up
in lowercase in kcontrol (but only in some places...).
Just a cosmetic change.
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-04-07 14:46:39 UTC (rev 979)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-04-07 21:27:21 UTC (rev 980)
@@ -10,11 +10,11 @@
- QFont f2("helvetica", 10);
- QFont f3("helvetica", 12, QFont::Bold);
- QFont f4("helvetica", 11);
-+ QFont f0("sans serif", 10);
-+ QFont f1("monospace", 10);
-+ QFont f2("sans serif", 10);
-+ QFont f3("sans serif", 10, QFont::Bold);
-+ QFont f4("sans serif", 10);
++ QFont f0("Sans Serif", 10);
++ QFont f1("Monospace", 10);
++ QFont f2("Sans Serif", 10);
++ QFont f3("Sans Serif", 10, QFont::Bold);
++ QFont f4("Sans Serif", 10);
- f0.setPointSize(12);
- f1.setPointSize(12);
@@ -36,10 +36,10 @@
void KDMFontWidget::set_def()
{
- stdFontChooser->setFont(QFont("helvetica", 12));
-+ stdFontChooser->setFont(QFont("sans serif", 10));
++ stdFontChooser->setFont(QFont("Sans Serif", 10));
failFontChooser->setFont(QFont("helvetica", 12, QFont::Bold));
- greetingFontChooser->setFont(QFont("charter", 24));
-+ greetingFontChooser->setFont(QFont("sans serif", 22));
++ greetingFontChooser->setFont(QFont("Sans Serif", 22));
}
void KDMFontWidget::save()
@@ -107,14 +107,14 @@
- userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
- userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
- userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("fixed", "monospace,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("font", "sans serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("menuFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("taskbarFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("toolBarFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("font", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
KGlobal::config()->setGroup("WM");
- userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
-+ userFonts.append(KGlobal::config()->readEntry("activeFont", "sans serif,10,-1,5,75,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans Serif,10,-1,5,75,0,0,0,0,0"));
KGlobal::config()->setGroup("PanelIcons");
st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff 2005-04-07 14:46:39 UTC (rev 979)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff 2005-04-07 21:27:21 UTC (rev 980)
@@ -7,7 +7,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _generalFont = new QFont("helvetica", 12);
- _generalFont->setPointSize(12);
-+ _generalFont = new QFont("sans serif", 10);
++ _generalFont = new QFont("Sans Serif", 10);
+ _generalFont->setPointSize(10);
_generalFont->setStyleHint(QFont::SansSerif);
@@ -18,7 +18,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _fixedFont = new QFont("courier", 12);
- _fixedFont->setPointSize(12);
-+ _fixedFont = new QFont("monospace", 10);
++ _fixedFont = new QFont("Monospace", 10);
+ _fixedFont->setPointSize(10);
_fixedFont->setStyleHint(QFont::TypeWriter);
@@ -28,7 +28,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _toolBarFont = new QFont("helvetica", 10);
-+ _toolBarFont = new QFont("sans serif", 10);
++ _toolBarFont = new QFont("Sans Serif", 10);
_toolBarFont->setPointSize(10);
_toolBarFont->setStyleHint(QFont::SansSerif);
@@ -38,7 +38,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _menuFont = new QFont("helvetica", 12);
- _menuFont->setPointSize(12);
-+ _menuFont = new QFont("sans serif", 10);
++ _menuFont = new QFont("Sans Serif", 10);
+ _menuFont->setPointSize(10);
_menuFont->setStyleHint(QFont::SansSerif);
@@ -49,7 +49,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _windowTitleFont = new QFont("helvetica", 12, QFont::Bold);
- _windowTitleFont->setPointSize(12);
-+ _windowTitleFont = new QFont("sans serif", 10, QFont::Bold);
++ _windowTitleFont = new QFont("Sans Serif", 10, QFont::Bold);
+ _windowTitleFont->setPointSize(10);
_windowTitleFont->setStyleHint(QFont::SansSerif);
@@ -60,7 +60,7 @@
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _taskbarFont = new QFont("helvetica", 11);
- _taskbarFont->setPointSize(11);
-+ _taskbarFont = new QFont("sans serif", 10);
++ _taskbarFont = new QFont("Sans Serif", 10);
+ _taskbarFont->setPointSize(10);
_taskbarFont->setStyleHint(QFont::SansSerif);