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

List:       kde-commits
Subject:    branches/KDE/3.4/kdebase/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-07-20 20:50:59
Message-ID: 1121892659.714377.28861.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 437064 by ossi:

backport: make AntiAliasing work again.


 M  +10 -9     config.def  
 M  +0 -9      kfrontend/kdm_greet.c  
 M  +3 -0      kfrontend/kdmconfig.cpp  


--- branches/KDE/3.4/kdebase/kdm/config.def #437063:437064
@@ -2046,6 +2046,16 @@
  </varlistentry>
  </variablelist>
 
+# This needs to come _in front_ of the font settings to be effective!
+Key: AntiAliasing
+Type: bool
+Default: false
+User: greeter
+Instance: #*/!
+Comment: &
+Description:
+ Whether the fonts used in the greeter should be antialiased.
+
 Key: GreetFont
 Type: string
 Default: "charter,24,5,0,50,0"
@@ -2076,15 +2086,6 @@
 Description:
  The font used for the <quote>Login Failed</quote> message.
 
-Key: AntiAliasing
-Type: bool
-Default: false
-User: greeter-c
-Instance: #*/!
-Comment: &
-Description:
- Whether the fonts used in the greeter should be antialiased.
-
 Key: NumLock
 Type: enum
  Off: turn off
--- branches/KDE/3.4/kdebase/kdm/kfrontend/kdm_greet.c #437063:437064
@@ -738,7 +738,6 @@
 main( int argc ATTR_UNUSED, char **argv )
 {
 	char *ci;
-	FILE *f;
 	int i;
 	char qtrc[40];
 
@@ -779,14 +778,6 @@
 	if (!(savhome = strdup( qtrc )))
 		LogPanic( "Cannot save $HOME\n" );
 	atexit( cleanup );
-	strcat( qtrc, "/.qt" );
-	mkdir( qtrc, 0700 );
-	strcat( qtrc, "/qtrc" );
-	if (!(f = fopen( qtrc, "w" )))
-		LogPanic( "Cannot create qt config\n" );
-	fprintf( f, "[General]\nuseXft=%s\n",
-	         _antiAliasing ? "true" : "false" );
-	fclose( f );
 
 	setenv( "LC_ALL", _language, 1 );
 
--- branches/KDE/3.4/kdebase/kdm/kfrontend/kdmconfig.cpp #437063:437064
@@ -92,6 +92,9 @@
 		aRetFont.setFixedPitch( nFontBits & 0x08 != 0 );
 		aRetFont.setRawMode( nFontBits & 0x20 != 0 );
 	}
+	aRetFont.setStyleStrategy( (QFont::StyleStrategy)
+	   (QFont::PreferMatch |
+	    (_antiAliasing ? QFont::PreferAntialias : QFont::NoAntialias)) );
 
 	return aRetFont;
 }
[prev in list] [next in list] [prev in thread] [next in thread]