[Pkg-kde-commits] rev 1443 -
branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Sun Aug 14 01:59:06 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-14 01:59:05 +0000 (Sun, 14 Aug 2005)
New Revision: 1443
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Woops, I nuked most of this patch accidentally some weeks ago. This fixes.
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-08-14 01:58:34 UTC (rev 1442)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-08-14 01:59:05 UTC (rev 1443)
@@ -1,5 +1,140 @@
---- kdebase-3.4.2/kdm/config.def 2005-07-24 03:20:34.669627040 +0000
-+++ config.def 2005-07-24 03:22:34.563400416 +0000
+--- kde.orig/kcontrol/fonts/fonts.cpp
++++ kde.patched/kcontrol/fonts/fonts.cpp
+@@ -401,7 +401,7 @@
+
+ void FontAASettings::defaults()
+ {
+- excludeRange->setChecked(true);
++ excludeRange->setChecked(false);
+ excludeFrom->setValue(8.0);
+ excludeTo->setValue(15.0);
+ useSubPixel->setChecked(false);
+@@ -524,17 +524,17 @@
+
+ // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
+
+- QFont f0("helvetica", 12);
+- QFont f1("courier", 12);
+- 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);
+
+- f0.setPointSize(12);
+- f1.setPointSize(12);
++ f0.setPointSize(10);
++ f1.setPointSize(10);
+ f2.setPointSize(10);
+- f3.setPointSize(12);
+- f4.setPointSize(11);
++ f3.setPointSize(10);
++ f4.setPointSize(10);
+
+ defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
+
+@@ -656,7 +656,7 @@
+ for ( int i = 0; i < (int) fontUseList.count(); i++ )
+ fontUseList.at( i )->setDefault();
+
+- useAA = false;
++ useAA = true;
+ cbAA->setChecked(useAA);
+ aaSettings->defaults();
+ emit changed(true);
+--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
++++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
+@@ -113,12 +113,12 @@
+ </panel>
+ <widgets name="Plastik" />
+ <fonts>
+- <font value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <fixed value="Courier New,10,-1,5,50,0,0,0,0,0" object="General" />
+- <toolBarFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <menuFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <activeFont value="Arial,12,-1,5,75,0,0,0,0,0" object="WM" />
+- <taskbarFont value="Arial,11,-1,5,50,0,0,0,0,0" object="General" />
++ <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <fixed value="Monospace,10,-1,5,50,0,0,0,0,0" object="General" />
++ <toolBarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <activeFont value="Sans Serif,10,-1,5,75,0,0,0,0,0" object="WM" />
++ <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+ <StandardFont value="" object="FMSettings" />
+ </fonts>
+ </ktheme>
+--- kde.orig/kcontrol/kdm/kdm-font.cpp
++++ kde.patched/kcontrol/kdm/kdm-font.cpp
+@@ -90,9 +90,9 @@
+
+ void KDMFontWidget::set_def()
+ {
+- stdFontChooser->setFont(QFont("helvetica", 12));
++ stdFontChooser->setFont(QFont("Sans Serif", 10));
+ failFontChooser->setFont(QFont("helvetica", 12, QFont::Bold));
+- greetingFontChooser->setFont(QFont("charter", 24));
++ greetingFontChooser->setFont(QFont("Sans Serif", 22));
+ }
+
+ void KDMFontWidget::save()
+@@ -128,7 +128,7 @@
+ void KDMFontWidget::defaults()
+ {
+ set_def();
+- aacb->setChecked(false);
++ aacb->setChecked(true);
+ }
+
+ #include "kdm-font.moc"
+--- kde.orig/kpersonalizer/keyecandypage.cpp
++++ kde.patched/kpersonalizer/keyecandypage.cpp
+@@ -594,20 +594,9 @@
+ void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){
+ if (!reset){
+ if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() )
+- && sys->getRenderSupport()
+- && (*userFonts.at(1)).contains("elvetica")) {
++ && sys->getRenderSupport() ) {
+ QSettings().writeEntry("/qt/useXft", enable);
+ QSettings().writeEntry("/qt/enableXft", enable);
+- if (enable) {
+- KGlobal::config()->setGroup("General");
+- KGlobal::config()->writeEntry("fixed", sys->getFixedWidthFont().toString(), true, true);
+- KGlobal::config()->writeEntry("font", sys->getNormalFont().toString(), true, true);
+- KGlobal::config()->writeEntry("menuFont", sys->getNormalFont().toString(), true, true);
+- KGlobal::config()->writeEntry("taskbarFont", sys->getSmallFont().toString(), true, true);
+- KGlobal::config()->writeEntry("toolBarFont", sys->getNormalFont().toString(), true, true);
+- KGlobal::config()->setGroup("WM");
+- KGlobal::config()->writeEntry("activeFont", sys->getBoldFont().toString(), true, true);
+- }
+ }
+ } else {
+ QSettings().writeEntry("/qt/useXft", b_useXft);
+@@ -717,13 +706,13 @@
+ b_useXft=QSettings().readBoolEntry("/qt/useXft");
+ b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
+ KGlobal::config()->setGroup("General");
+- userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
+- userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
+- 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"));
+ 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"));
+
+ KGlobal::config()->setGroup("PanelIcons");
+ st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
@@ -2049,29 +2049,29 @@
# This needs to come _in front_ of the font settings to be effective!
Key: AntiAliasing
More information about the Pkg-kde-commits
mailing list