[Pkg-kde-commits] rev 1069 - branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Sat, 14 May 2005 22:50:41 +0000
Author: chrsmrtn-guest
Date: 2005-05-14 22:50:40 +0000 (Sat, 14 May 2005)
New Revision: 1069
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Change kdm's kcontrol module's antialiasing default (on) to match
the default kdmrc we ship.
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-05-14 20:40:29 UTC (rev 1068)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-05-14 22:50:40 UTC (rev 1069)
@@ -1,6 +1,5 @@
-diff -Nrua kde.orig/kcontrol/fonts/fonts.cpp kde.patched/kcontrol/fonts/fonts.cpp
---- kde.orig/kcontrol/fonts/fonts.cpp 2005-02-23 06:25:06.000000000 -0500
-+++ kde.patched/kcontrol/fonts/fonts.cpp 2005-04-05 17:46:24.000000000 -0400
+--- kde.orig/kcontrol/fonts/fonts.cpp
++++ kde.patched/kcontrol/fonts/fonts.cpp
@@ -524,17 +524,17 @@
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
@@ -28,24 +27,8 @@
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
-diff -Nrua kde.orig/kcontrol/kdm/kdm-font.cpp kde.patched/kcontrol/kdm/kdm-font.cpp
---- kde.orig/kcontrol/kdm/kdm-font.cpp 2004-07-16 09:17:48.000000000 -0400
-+++ kde.patched/kcontrol/kdm/kdm-font.cpp 2005-04-05 17:53:04.000000000 -0400
-@@ -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()
-diff -Nrua kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
---- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml 2005-02-23 05:54:22.000000000 -0500
-+++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml 2005-04-05 14:33:51.000000000 -0400
+--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
++++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -113,12 +113,12 @@
</panel>
<widgets name="Plastik" />
@@ -65,9 +48,30 @@
<StandardFont value="" object="FMSettings" />
</fonts>
</ktheme>
-diff -Nrua kde.orig/kdm/config.def kde.patched/kdm/config.def
---- kde.orig/kdm/config.def 2005-03-24 15:48:02.000000000 -0500
-+++ kde.patched/kdm/config.def 2005-04-05 17:51:11.000000000 -0400
+--- kde.orig/kpersonalizer/keyecandypage.cpp
++++ kde.patched/kpersonalizer/keyecandypage.cpp
+@@ -717,13 +717,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
@@ -2051,7 +2051,7 @@
Default: "charter,24,5,0,50,0"
CDefault: "charter,24,bold"
@@ -95,26 +99,26 @@
Comment: &
Description:
Whether the fonts used in the greeter should be antialiased.
-diff -Nrua kde.orig/kpersonalizer/keyecandypage.cpp kde.patched/kpersonalizer/keyecandypage.cpp
---- kde.orig/kpersonalizer/keyecandypage.cpp 2005-02-23 06:27:14.000000000 -0500
-+++ kde.patched/kpersonalizer/keyecandypage.cpp 2005-04-05 17:52:04.000000000 -0400
-@@ -717,13 +717,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"));
+--- kde.orig/kcontrol/kdm/kdm-font.cpp
++++ kde.patched/kcontrol/kdm/kdm-font.cpp
+@@ -90,9 +90,9 @@
- KGlobal::config()->setGroup("PanelIcons");
- st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
+ 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"