[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit dd6f2480dfbd59c613a0781a574dc3ff64b3f2dc
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 5 18:33:39 2001 +0000

    Added fonts sizes to defaults
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@406 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index a9dd1dc..f7ccccb 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -23,71 +23,59 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 #include <kwqdebug.h>
-
-
 #include <khtml_settings.h>
 
 KHTMLSettings::KHTMLSettings()
-{
-    m_fontSizes.clear();
-    m_fontSizes << 6;
-    m_fontSizes << 8;
-    m_fontSizes << 10;
-    m_fontSizes << 12;
-    m_fontSizes << 14;
-    m_fontSizes << 16;
-    m_fontSizes << 18;
-    m_fontSizes << 20;
-    
+{    
     // set available font families...ask the system
-    
     NSFontManager *sharedFontManager;
-    NSArray *array;
-    
+    NSArray *array, *fontSizeArray;
+    int i;
+        
     sharedFontManager = [NSFontManager sharedFontManager];
     array = [sharedFontManager availableFontFamilies];
     m_fontFamilies = NSSTRING_TO_QSTRING([array componentsJoinedByString:@","]);
+    
+    m_fontSizes.clear();
+    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"fontSizes"];
+    for(i=0; i<[fontSizeArray count]; i++){
+        m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
+    }
 }
 
 QString KHTMLSettings::stdFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"stdFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"stdFontName"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fixedFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fixedFontName"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"serifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"serifFontName"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"sansSerifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"sansSerifFontName"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"cursiveFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"cursiveFontName"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fantasyFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fantasyFontName"]);
 }
 
 
@@ -117,7 +105,7 @@ const QString &KHTMLSettings::encoding() const
 
 int KHTMLSettings::minFontSize() const
 {
-    return 6;
+    return [[NSUserDefaults standardUserDefaults] integerForKey:@"minFontSize"];
 }
 
 
@@ -141,6 +129,7 @@ void KHTMLSettings::setScript( QFont::CharSet c )
 
 const QValueList<int> &KHTMLSettings::fontSizes() const
 {
+    //may want to re-fetch font sizes from defaults here
     return m_fontSizes;
 }
 
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index a9dd1dc..f7ccccb 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -23,71 +23,59 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 #include <kwqdebug.h>
-
-
 #include <khtml_settings.h>
 
 KHTMLSettings::KHTMLSettings()
-{
-    m_fontSizes.clear();
-    m_fontSizes << 6;
-    m_fontSizes << 8;
-    m_fontSizes << 10;
-    m_fontSizes << 12;
-    m_fontSizes << 14;
-    m_fontSizes << 16;
-    m_fontSizes << 18;
-    m_fontSizes << 20;
-    
+{    
     // set available font families...ask the system
-    
     NSFontManager *sharedFontManager;
-    NSArray *array;
-    
+    NSArray *array, *fontSizeArray;
+    int i;
+        
     sharedFontManager = [NSFontManager sharedFontManager];
     array = [sharedFontManager availableFontFamilies];
     m_fontFamilies = NSSTRING_TO_QSTRING([array componentsJoinedByString:@","]);
+    
+    m_fontSizes.clear();
+    fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"fontSizes"];
+    for(i=0; i<[fontSizeArray count]; i++){
+        m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
+    }
 }
 
 QString KHTMLSettings::stdFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"stdFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"stdFontName"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fixedFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fixedFontName"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"serifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"serifFontName"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"sansSerifFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"sansSerifFontName"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"cursiveFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"cursiveFontName"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fantasyFontName"]);
+    return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"fantasyFontName"]);
 }
 
 
@@ -117,7 +105,7 @@ const QString &KHTMLSettings::encoding() const
 
 int KHTMLSettings::minFontSize() const
 {
-    return 6;
+    return [[NSUserDefaults standardUserDefaults] integerForKey:@"minFontSize"];
 }
 
 
@@ -141,6 +129,7 @@ void KHTMLSettings::setScript( QFont::CharSet c )
 
 const QValueList<int> &KHTMLSettings::fontSizes() const
 {
+    //may want to re-fetch font sizes from defaults here
     return m_fontSizes;
 }
 
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index 7d378c6..348066c 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -9,13 +9,18 @@
 
     NSAutoreleasePool *localPool;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"16", @"18", @"20", nil];
+    
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         @"Arial", 		@"stdFontName",
         @"Courier",  		@"fixedFontName",
         @"Times-Roman", 	@"serifFontName",
         @"Arial", 		@"sansSerifFontName", 
         @"Times-Roman", 	@"cursiveFontName",
-        @"Times-Roman", 	@"fantasyFontName", nil];
+        @"Times-Roman", 	@"fantasyFontName",
+        @"6", 			@"minFontSize",
+        fontSizeArray,		@"fontSizes",
+        nil];
 
     [defaults registerDefaults:dict];
 

-- 
WebKit Debian packaging