Adding the Appearance prefs panel to the list of panels, fixing the prefs panel base class to use UTF-8 for prefs, and adding a changeFont handler on the window's controller that can forward changeFont() messages back to the current prefs pane (used by the Appearance pane).

camino/PreferencePanes/MVPreferencePaneDefaults.plist

@@ -1,6 +0,0 @@
-( Chimera.SitesPrefPane,
-  org.mozilla.chimera.preference.navigation,
-  org.mozilla.chimera.preference.privacy,
-  Chimera.HelpersPrefPane,
-  Chimera.SecurityPrefPane,
-)

camino/PreferencePanes/MVPreferencePaneGroups.plist

@@ -1,13 +0,0 @@
-(
-	{
-		identifier = chimera; 
-		panes = (
-            org.mozilla.chimera.preference.navigation,
-            org.mozilla.chimera.preference.privacy,
-            Chimera.SitesPrefPane,
-            Chimera.HelpersPrefPane,
-            Chimera.SecurityPrefPane,
-            Chimera.AdvancedPrefPane,
-		); 
-	} 
-)

camino/PreferencePanes/MVPreferencesController.m

@@ -1,342 +0,0 @@
-#import <PreferencePanes/PreferencePanes.h>
-#import "MVPreferencesController.h"
-#import "MVPreferencesMultipleIconView.h"
-#import "MVPreferencesGroupedIconView.h"
-#import "CHToolbarAdditions.h"
-
-// #import "Defines.h"
-
-static MVPreferencesController *sharedInstance = nil;
-
-static NSString *MVToolbarShowAllItemIdentifier = @"MVToolbarShowAllItem";
-static NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification";
-
-@interface NSToolbar (NSToolbarPrivate)
-- (NSView *) _toolbarView;
-@end
-
-@interface MVPreferencesController (MVPreferencesControllerPrivate)
-- (void) _doUnselect:(NSNotification *) notification;
-- (IBAction) _selectPreferencePane:(id) sender;
-- (void) _resizeWindowForContentView:(NSView *) view;
-- (NSImage *) _imageForPaneBundle:(NSBundle *) bundle;
-- (NSString *) _paletteLabelForPaneBundle:(NSBundle *) bundle;
-- (NSString *) _labelForPaneBundle:(NSBundle *) bundle;
-@end
-
-@implementation MVPreferencesController
-
-+ (MVPreferencesController *) sharedInstance
-{
-  return ( sharedInstance ? sharedInstance : [[[self alloc] init] autorelease] );
-}
-
-- (id) init
-{
-  if ( ( self = [super init] ) ) {
-    unsigned i = 0;
-    NSBundle *bundle = nil;
-    NSString *bundlePath = [NSString stringWithFormat:@"%@/Contents/PreferencePanes",
-        [[NSBundle mainBundle] bundlePath]];
-    panes = [[[NSFileManager defaultManager] directoryContentsAtPath:bundlePath] mutableCopy];
-    for ( i = 0; i < [panes count]; i++ ) {
-      bundle = [NSBundle bundleWithPath:[NSString stringWithFormat:@"%@/%@", bundlePath, [panes objectAtIndex:i]]];
-      [bundle load];
-      if( bundle ) [panes replaceObjectAtIndex:i withObject:bundle];
-      else {
-        [panes removeObjectAtIndex:i];
-        i--;
-      }
-    }
-    loadedPanes = [[NSMutableDictionary dictionary] retain];
-    paneInfo = [[NSMutableDictionary dictionary] retain];
-    [NSBundle loadNibNamed:@"MVPreferences" owner:self];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _doUnselect: ) name:NSPreferencePaneDoUnselectNotification object:nil];
-  }
-  return self;
-}
-
-- (void) dealloc
-{
-  [loadedPanes autorelease];
-  [panes autorelease];
-  [paneInfo autorelease];
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  loadedPanes = nil;
-  panes = nil;
-  paneInfo = nil;
-  [super dealloc];
-}
-
-- (void) awakeFromNib
-{
-  NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar"] autorelease];
-  NSArray *groups = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"MVPreferencePaneGroups" ofType:@"plist"]];
-
-  if( groups ) {
-    [groupView setPreferencePanes:panes];
-    [groupView setPreferencePaneGroups:groups];
-    mainView = groupView;
-  } else {
-    [multiView setPreferencePanes:panes];
-    mainView = multiView;
-  }
-  [self showAll:nil];
-
-  [window setDelegate:self];
-
-  [toolbar setAllowsUserCustomization:YES];
-  [toolbar setAutosavesConfiguration:YES];
-  [toolbar setDelegate:self];
-  [toolbar setAlwaysCustomizableByDrag:YES];
-  [toolbar setShowsContextMenu:NO];
-  [window setToolbar:toolbar];
-  [toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
-  [toolbar setIndexOfFirstMovableItem:2];
-}
-
-- (NSWindow *) window
-{
-  return [[window retain] autorelease];
-}
-
-- (IBAction) showPreferences:(id) sender
-{
-  [self showAll:nil];
-  [window makeKeyAndOrderFront:nil];
-}
-
-- (IBAction) showAll:(id) sender
-{
-  if ( [[window contentView] isEqual:mainView] ) return;
-  if ( currentPaneIdentifier && [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow ) {
-    /* more to handle later */
-#if DEBUG
-    NSLog( @"can't unselect current" );
-#endif
-    return;
-  }
-  [window setContentView:[[[NSView alloc] initWithFrame:[mainView frame]] autorelease]];
-
-  [window setTitle:[NSString stringWithFormat:NSLocalizedString( @"%@ Preferences", nil ), [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]]];
-  [self _resizeWindowForContentView:mainView];
-
-  [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-  [window setContentView:mainView];
-  [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-
-  [currentPaneIdentifier autorelease];
-  currentPaneIdentifier = nil;
-
-  [window setInitialFirstResponder:mainView];
-  [window makeFirstResponder:mainView];
-}
-
-- (void) selectPreferencePaneByIdentifier:(NSString *) identifier
-{
-  NSBundle *bundle = [NSBundle bundleWithIdentifier:identifier];
-  
-  if ( bundle && ! [currentPaneIdentifier isEqualToString:identifier] ) {
-    NSPreferencePane *pane = nil;
-    NSView *prefView = nil;
-    if ( currentPaneIdentifier &&
-        [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow ) {
-      /* more to handle later */
-#if DEBUG
-      NSLog( @"can't unselect current" );
-#endif
-      closeWhenPaneIsReady = NO;
-      [pendingPane autorelease];
-      pendingPane = [identifier retain];
-      return;
-    }
-    
-    [pendingPane autorelease];
-    pendingPane = nil;
-    [loadingImageView setImage:[self _imageForPaneBundle:bundle]];
-    [loadingTextFeld setStringValue:[NSString stringWithFormat:NSLocalizedString( @"Loading %@...", nil ),
-        [self _labelForPaneBundle:bundle]]];
-    
-    [window setTitle:[self _labelForPaneBundle:bundle]];
-    [window setContentView:loadingView];
-    [window display];
-    
-    if ( ! ( pane = [loadedPanes objectForKey:identifier] ) ) {
-      pane = [[[[bundle principalClass] alloc] initWithBundle:bundle] autorelease];
-      if( pane ) [loadedPanes setObject:pane forKey:identifier];
-    }
-    
-    if ( [pane loadMainView] ) {
-      [pane willSelect];
-      prefView = [pane mainView];
-
-      [self _resizeWindowForContentView:prefView];
-
-      [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-      [window setContentView:prefView];
-      [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-      [pane didSelect];
-      [[NSNotificationCenter defaultCenter]
-        postNotificationName: MVPreferencesWindowNotification
-        object: self
-        userInfo: [NSDictionary dictionaryWithObjectsAndKeys:window, @"window", nil]];
-      [currentPaneIdentifier autorelease];
-      currentPaneIdentifier = [identifier copy];
-
-      [window setInitialFirstResponder:[pane initialKeyView]];
-      [window makeFirstResponder:[pane initialKeyView]];
-    }
-    else {
-      NSRunCriticalAlertPanel( NSLocalizedString( @"Preferences Error", nil ),
-        [NSString stringWithFormat:NSLocalizedString( @"Could not load %@", nil ),
-        [self _labelForPaneBundle:bundle]], nil, nil, nil );
-    }
-  }
-}
-
-- (BOOL) windowShouldClose:(id) sender
-{
-  if ( currentPaneIdentifier && [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow )   	{
-#if DEBUG
-    NSLog( @"can't unselect current" );
-#endif
-    closeWhenPaneIsReady = YES;
-    return NO;
-  }
-  return YES;
-}
-
-- (void) windowWillClose:(NSNotification *) notification
-{
-  [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-  [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-  [currentPaneIdentifier autorelease];
-  currentPaneIdentifier = nil;
-  //[loadedPanes removeAllObjects];
-}
-
-- (NSToolbarItem *) toolbar:(NSToolbar *) toolbar
-    itemForItemIdentifier:(NSString *) itemIdentifier
-    willBeInsertedIntoToolbar:(BOOL) flag
-{
-  NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
-  if ( [itemIdentifier isEqualToString:MVToolbarShowAllItemIdentifier] ) {
-    [toolbarItem setLabel:NSLocalizedString( @"Show All", nil )];
-    [toolbarItem setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
-    [toolbarItem setTarget:self];
-    [toolbarItem setAction:@selector( showAll: )];
-  } else {
-    NSBundle *bundle = [NSBundle bundleWithIdentifier:itemIdentifier];
-    if( bundle ) {
-      [toolbarItem setLabel:[self _labelForPaneBundle:bundle]];
-      [toolbarItem setPaletteLabel:[self _paletteLabelForPaneBundle:bundle]];
-      [toolbarItem setImage:[self _imageForPaneBundle:bundle]];
-      [toolbarItem setTarget:self];
-      [toolbarItem setAction:@selector( _selectPreferencePane: )];
-    } else toolbarItem = nil;
-  }
-  return toolbarItem;
-}
-
-- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
-{
-  NSMutableArray *fixed = [NSMutableArray arrayWithObjects:MVToolbarShowAllItemIdentifier, NSToolbarSeparatorItemIdentifier, nil];
-  NSArray *defaults = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"MVPreferencePaneDefaults" ofType:@"plist"]];
-  [fixed addObjectsFromArray:defaults];
-  return fixed;
-}
-
-- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
-{
-  NSMutableArray *items = [NSMutableArray array];
-  NSEnumerator *enumerator = [panes objectEnumerator];
-  id item = nil;
-  while ( ( item = [enumerator nextObject] ) )
-    [items addObject:[item bundleIdentifier]];
-  //[items addObject:MVToolbarShowAllItemIdentifier];
-  [items addObject:NSToolbarSeparatorItemIdentifier];
-  return items;
-}
-@end
-
-@implementation MVPreferencesController (MVPreferencesControllerPrivate)
-
-- (IBAction) _selectPreferencePane:(id) sender
-{
-  [self selectPreferencePaneByIdentifier:[sender itemIdentifier]];
-}
-
-- (void) _doUnselect:(NSNotification *) notification
-{
-  if( closeWhenPaneIsReady ) [window close];
-  [self selectPreferencePaneByIdentifier:pendingPane];
-}
-
-- (void) _resizeWindowForContentView:(NSView *) view
-{
-  NSRect windowFrame, newWindowFrame;
-  unsigned int newWindowHeight;
-
-  windowFrame = [NSWindow contentRectForFrameRect:[window frame] styleMask:[window styleMask]];
-  newWindowHeight = NSHeight( [view frame] );
-  if ( [[window toolbar] isVisible] )
-    newWindowHeight += NSHeight( [[[window toolbar] _toolbarView] frame] );
-  newWindowFrame = [NSWindow frameRectForContentRect:NSMakeRect( NSMinX( windowFrame ), NSMaxY( windowFrame ) - newWindowHeight, NSWidth( windowFrame ), newWindowHeight ) styleMask:[window styleMask]];
-
-  [window setFrame:newWindowFrame display:YES animate:[window isVisible]];
-}
-
-- (NSImage *) _imageForPaneBundle:(NSBundle *) bundle
-{
-  NSImage *image = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  image = [[[cache objectForKey:@"MVPreferencePaneImage"] retain] autorelease];
-  if ( ! image ) {
-    NSDictionary *info = [bundle infoDictionary];
-    image = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:[info objectForKey:@"NSPrefPaneIconFile"]]] autorelease];
-    if ( ! image ) image = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:[info objectForKey:@"CFBundleIconFile"]]] autorelease];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( image ) [cache setObject:image forKey:@"MVPreferencePaneImage"];
-  }
-  return image;
-}
-
-- (NSString *) _paletteLabelForPaneBundle:(NSBundle *) bundle
-{
-  NSString *label = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  label = [[[cache objectForKey:@"MVPreferencePanePaletteLabel"] retain] autorelease];
-  if ( ! label ) {
-    NSDictionary *info = [bundle infoDictionary];
-    label = NSLocalizedStringFromTableInBundle( @"NSPrefPaneIconLabel", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"NSPrefPaneIconLabel"] ) label = [info objectForKey:@"NSPrefPaneIconLabel"];
-    if ( ! label ) label = NSLocalizedStringFromTableInBundle( @"CFBundleName", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"CFBundleName"] ) label = [info objectForKey:@"CFBundleName"];
-    if ( ! label ) label = [bundle bundleIdentifier];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( label ) [cache setObject:label forKey:@"MVPreferencePanePaletteLabel"];
-  }
-  return label;
-}
-
-- (NSString *) _labelForPaneBundle:(NSBundle *) bundle
-{
-  NSString *label = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  label = [[[cache objectForKey:@"MVPreferencePaneLabel"] retain] autorelease];
-  if ( ! label ) {
-    NSDictionary *info = [bundle infoDictionary];
-    label = NSLocalizedStringFromTableInBundle( @"CFBundleName", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"CFBundleName"] ) label = [info objectForKey:@"CFBundleName"];
-    if ( ! label ) label = [bundle bundleIdentifier];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( label ) [cache setObject:label forKey:@"MVPreferencePaneLabel"];
-  }
-  return label;
-}
-@end
-

camino/PreferencePanes/Personal/English.lproj/Personal.nib/info.nib

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>413 91 356 240 0 0 1152 848 </string>
-	<key>IBFramework Version</key>
-	<string>248.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>3</key>
-		<array>
-			<string>153</string>
-			<string>155</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>4</string>
-	<key>IBSystem Version</key>
-	<string>5Q125</string>
-</dict>
-</plist>

camino/PreferencePanes/Personal/Personal.nib/info.nib

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>413 91 356 240 0 0 1152 848 </string>
-	<key>IBFramework Version</key>
-	<string>248.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>3</key>
-		<array>
-			<string>153</string>
-			<string>155</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>4</string>
-	<key>IBSystem Version</key>
-	<string>5Q125</string>
-</dict>
-</plist>

camino/PreferencePanes/Shared/PreferencePaneBase.mm

@@ -41,7 +41,8 @@
   char *buf = nsnull;
   nsresult rv = mPrefService->GetCharPref(prefName, &buf);
   if (NS_SUCCEEDED(rv) && buf) {
-    prefValue = [NSString stringWithCString:buf];
+    // prefs are UTF-8
+    prefValue = [NSString stringWithUTF8String:buf];
     free(buf);
     if (outSuccess) *outSuccess = YES;
   } else {
@@ -93,8 +94,9 @@
 
 - (void)setPref: (const char*)prefName toString:(NSString*)value
 {
+  // prefs are UTF-8
   if (mPrefService) {
-    mPrefService->SetCharPref(prefName, [value cString]);
+    mPrefService->SetCharPref(prefName, [value UTF8String]);
   }
 }
 

camino/src/preferences/MVPreferencePaneDefaults.plist

@@ -1,5 +1,6 @@
 ( Chimera.SitesPrefPane,
   org.mozilla.chimera.preference.navigation,
+  org.mozilla.chimera.preference.appearance,
   org.mozilla.chimera.preference.privacy,
   Chimera.HelpersPrefPane,
   Chimera.SecurityPrefPane,

camino/src/preferences/MVPreferencePaneGroups.plist

@@ -3,6 +3,7 @@
 		identifier = chimera; 
 		panes = (
             org.mozilla.chimera.preference.navigation,
+            org.mozilla.chimera.preference.appearance,
             org.mozilla.chimera.preference.privacy,
             Chimera.SitesPrefPane,
             Chimera.HelpersPrefPane,

chimera/PreferencePanes/MVPreferencePaneDefaults.plist

@@ -1,6 +0,0 @@
-( Chimera.SitesPrefPane,
-  org.mozilla.chimera.preference.navigation,
-  org.mozilla.chimera.preference.privacy,
-  Chimera.HelpersPrefPane,
-  Chimera.SecurityPrefPane,
-)

chimera/PreferencePanes/MVPreferencePaneGroups.plist

@@ -1,13 +0,0 @@
-(
-	{
-		identifier = chimera; 
-		panes = (
-            org.mozilla.chimera.preference.navigation,
-            org.mozilla.chimera.preference.privacy,
-            Chimera.SitesPrefPane,
-            Chimera.HelpersPrefPane,
-            Chimera.SecurityPrefPane,
-            Chimera.AdvancedPrefPane,
-		); 
-	} 
-)

chimera/PreferencePanes/MVPreferencesController.m

@@ -1,342 +0,0 @@
-#import <PreferencePanes/PreferencePanes.h>
-#import "MVPreferencesController.h"
-#import "MVPreferencesMultipleIconView.h"
-#import "MVPreferencesGroupedIconView.h"
-#import "CHToolbarAdditions.h"
-
-// #import "Defines.h"
-
-static MVPreferencesController *sharedInstance = nil;
-
-static NSString *MVToolbarShowAllItemIdentifier = @"MVToolbarShowAllItem";
-static NSString *MVPreferencesWindowNotification = @"MVPreferencesWindowNotification";
-
-@interface NSToolbar (NSToolbarPrivate)
-- (NSView *) _toolbarView;
-@end
-
-@interface MVPreferencesController (MVPreferencesControllerPrivate)
-- (void) _doUnselect:(NSNotification *) notification;
-- (IBAction) _selectPreferencePane:(id) sender;
-- (void) _resizeWindowForContentView:(NSView *) view;
-- (NSImage *) _imageForPaneBundle:(NSBundle *) bundle;
-- (NSString *) _paletteLabelForPaneBundle:(NSBundle *) bundle;
-- (NSString *) _labelForPaneBundle:(NSBundle *) bundle;
-@end
-
-@implementation MVPreferencesController
-
-+ (MVPreferencesController *) sharedInstance
-{
-  return ( sharedInstance ? sharedInstance : [[[self alloc] init] autorelease] );
-}
-
-- (id) init
-{
-  if ( ( self = [super init] ) ) {
-    unsigned i = 0;
-    NSBundle *bundle = nil;
-    NSString *bundlePath = [NSString stringWithFormat:@"%@/Contents/PreferencePanes",
-        [[NSBundle mainBundle] bundlePath]];
-    panes = [[[NSFileManager defaultManager] directoryContentsAtPath:bundlePath] mutableCopy];
-    for ( i = 0; i < [panes count]; i++ ) {
-      bundle = [NSBundle bundleWithPath:[NSString stringWithFormat:@"%@/%@", bundlePath, [panes objectAtIndex:i]]];
-      [bundle load];
-      if( bundle ) [panes replaceObjectAtIndex:i withObject:bundle];
-      else {
-        [panes removeObjectAtIndex:i];
-        i--;
-      }
-    }
-    loadedPanes = [[NSMutableDictionary dictionary] retain];
-    paneInfo = [[NSMutableDictionary dictionary] retain];
-    [NSBundle loadNibNamed:@"MVPreferences" owner:self];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _doUnselect: ) name:NSPreferencePaneDoUnselectNotification object:nil];
-  }
-  return self;
-}
-
-- (void) dealloc
-{
-  [loadedPanes autorelease];
-  [panes autorelease];
-  [paneInfo autorelease];
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  loadedPanes = nil;
-  panes = nil;
-  paneInfo = nil;
-  [super dealloc];
-}
-
-- (void) awakeFromNib
-{
-  NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar"] autorelease];
-  NSArray *groups = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"MVPreferencePaneGroups" ofType:@"plist"]];
-
-  if( groups ) {
-    [groupView setPreferencePanes:panes];
-    [groupView setPreferencePaneGroups:groups];
-    mainView = groupView;
-  } else {
-    [multiView setPreferencePanes:panes];
-    mainView = multiView;
-  }
-  [self showAll:nil];
-
-  [window setDelegate:self];
-
-  [toolbar setAllowsUserCustomization:YES];
-  [toolbar setAutosavesConfiguration:YES];
-  [toolbar setDelegate:self];
-  [toolbar setAlwaysCustomizableByDrag:YES];
-  [toolbar setShowsContextMenu:NO];
-  [window setToolbar:toolbar];
-  [toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
-  [toolbar setIndexOfFirstMovableItem:2];
-}
-
-- (NSWindow *) window
-{
-  return [[window retain] autorelease];
-}
-
-- (IBAction) showPreferences:(id) sender
-{
-  [self showAll:nil];
-  [window makeKeyAndOrderFront:nil];
-}
-
-- (IBAction) showAll:(id) sender
-{
-  if ( [[window contentView] isEqual:mainView] ) return;
-  if ( currentPaneIdentifier && [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow ) {
-    /* more to handle later */
-#if DEBUG
-    NSLog( @"can't unselect current" );
-#endif
-    return;
-  }
-  [window setContentView:[[[NSView alloc] initWithFrame:[mainView frame]] autorelease]];
-
-  [window setTitle:[NSString stringWithFormat:NSLocalizedString( @"%@ Preferences", nil ), [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]]];
-  [self _resizeWindowForContentView:mainView];
-
-  [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-  [window setContentView:mainView];
-  [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-
-  [currentPaneIdentifier autorelease];
-  currentPaneIdentifier = nil;
-
-  [window setInitialFirstResponder:mainView];
-  [window makeFirstResponder:mainView];
-}
-
-- (void) selectPreferencePaneByIdentifier:(NSString *) identifier
-{
-  NSBundle *bundle = [NSBundle bundleWithIdentifier:identifier];
-  
-  if ( bundle && ! [currentPaneIdentifier isEqualToString:identifier] ) {
-    NSPreferencePane *pane = nil;
-    NSView *prefView = nil;
-    if ( currentPaneIdentifier &&
-        [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow ) {
-      /* more to handle later */
-#if DEBUG
-      NSLog( @"can't unselect current" );
-#endif
-      closeWhenPaneIsReady = NO;
-      [pendingPane autorelease];
-      pendingPane = [identifier retain];
-      return;
-    }
-    
-    [pendingPane autorelease];
-    pendingPane = nil;
-    [loadingImageView setImage:[self _imageForPaneBundle:bundle]];
-    [loadingTextFeld setStringValue:[NSString stringWithFormat:NSLocalizedString( @"Loading %@...", nil ),
-        [self _labelForPaneBundle:bundle]]];
-    
-    [window setTitle:[self _labelForPaneBundle:bundle]];
-    [window setContentView:loadingView];
-    [window display];
-    
-    if ( ! ( pane = [loadedPanes objectForKey:identifier] ) ) {
-      pane = [[[[bundle principalClass] alloc] initWithBundle:bundle] autorelease];
-      if( pane ) [loadedPanes setObject:pane forKey:identifier];
-    }
-    
-    if ( [pane loadMainView] ) {
-      [pane willSelect];
-      prefView = [pane mainView];
-
-      [self _resizeWindowForContentView:prefView];
-
-      [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-      [window setContentView:prefView];
-      [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-      [pane didSelect];
-      [[NSNotificationCenter defaultCenter]
-        postNotificationName: MVPreferencesWindowNotification
-        object: self
-        userInfo: [NSDictionary dictionaryWithObjectsAndKeys:window, @"window", nil]];
-      [currentPaneIdentifier autorelease];
-      currentPaneIdentifier = [identifier copy];
-
-      [window setInitialFirstResponder:[pane initialKeyView]];
-      [window makeFirstResponder:[pane initialKeyView]];
-    }
-    else {
-      NSRunCriticalAlertPanel( NSLocalizedString( @"Preferences Error", nil ),
-        [NSString stringWithFormat:NSLocalizedString( @"Could not load %@", nil ),
-        [self _labelForPaneBundle:bundle]], nil, nil, nil );
-    }
-  }
-}
-
-- (BOOL) windowShouldClose:(id) sender
-{
-  if ( currentPaneIdentifier && [[loadedPanes objectForKey:currentPaneIdentifier] shouldUnselect] != NSUnselectNow )   	{
-#if DEBUG
-    NSLog( @"can't unselect current" );
-#endif
-    closeWhenPaneIsReady = YES;
-    return NO;
-  }
-  return YES;
-}
-
-- (void) windowWillClose:(NSNotification *) notification
-{
-  [[loadedPanes objectForKey:currentPaneIdentifier] willUnselect];
-  [[loadedPanes objectForKey:currentPaneIdentifier] didUnselect];
-  [currentPaneIdentifier autorelease];
-  currentPaneIdentifier = nil;
-  //[loadedPanes removeAllObjects];
-}
-
-- (NSToolbarItem *) toolbar:(NSToolbar *) toolbar
-    itemForItemIdentifier:(NSString *) itemIdentifier
-    willBeInsertedIntoToolbar:(BOOL) flag
-{
-  NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
-  if ( [itemIdentifier isEqualToString:MVToolbarShowAllItemIdentifier] ) {
-    [toolbarItem setLabel:NSLocalizedString( @"Show All", nil )];
-    [toolbarItem setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
-    [toolbarItem setTarget:self];
-    [toolbarItem setAction:@selector( showAll: )];
-  } else {
-    NSBundle *bundle = [NSBundle bundleWithIdentifier:itemIdentifier];
-    if( bundle ) {
-      [toolbarItem setLabel:[self _labelForPaneBundle:bundle]];
-      [toolbarItem setPaletteLabel:[self _paletteLabelForPaneBundle:bundle]];
-      [toolbarItem setImage:[self _imageForPaneBundle:bundle]];
-      [toolbarItem setTarget:self];
-      [toolbarItem setAction:@selector( _selectPreferencePane: )];
-    } else toolbarItem = nil;
-  }
-  return toolbarItem;
-}
-
-- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
-{
-  NSMutableArray *fixed = [NSMutableArray arrayWithObjects:MVToolbarShowAllItemIdentifier, NSToolbarSeparatorItemIdentifier, nil];
-  NSArray *defaults = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"MVPreferencePaneDefaults" ofType:@"plist"]];
-  [fixed addObjectsFromArray:defaults];
-  return fixed;
-}
-
-- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
-{
-  NSMutableArray *items = [NSMutableArray array];
-  NSEnumerator *enumerator = [panes objectEnumerator];
-  id item = nil;
-  while ( ( item = [enumerator nextObject] ) )
-    [items addObject:[item bundleIdentifier]];
-  //[items addObject:MVToolbarShowAllItemIdentifier];
-  [items addObject:NSToolbarSeparatorItemIdentifier];
-  return items;
-}
-@end
-
-@implementation MVPreferencesController (MVPreferencesControllerPrivate)
-
-- (IBAction) _selectPreferencePane:(id) sender
-{
-  [self selectPreferencePaneByIdentifier:[sender itemIdentifier]];
-}
-
-- (void) _doUnselect:(NSNotification *) notification
-{
-  if( closeWhenPaneIsReady ) [window close];
-  [self selectPreferencePaneByIdentifier:pendingPane];
-}
-
-- (void) _resizeWindowForContentView:(NSView *) view
-{
-  NSRect windowFrame, newWindowFrame;
-  unsigned int newWindowHeight;
-
-  windowFrame = [NSWindow contentRectForFrameRect:[window frame] styleMask:[window styleMask]];
-  newWindowHeight = NSHeight( [view frame] );
-  if ( [[window toolbar] isVisible] )
-    newWindowHeight += NSHeight( [[[window toolbar] _toolbarView] frame] );
-  newWindowFrame = [NSWindow frameRectForContentRect:NSMakeRect( NSMinX( windowFrame ), NSMaxY( windowFrame ) - newWindowHeight, NSWidth( windowFrame ), newWindowHeight ) styleMask:[window styleMask]];
-
-  [window setFrame:newWindowFrame display:YES animate:[window isVisible]];
-}
-
-- (NSImage *) _imageForPaneBundle:(NSBundle *) bundle
-{
-  NSImage *image = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  image = [[[cache objectForKey:@"MVPreferencePaneImage"] retain] autorelease];
-  if ( ! image ) {
-    NSDictionary *info = [bundle infoDictionary];
-    image = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:[info objectForKey:@"NSPrefPaneIconFile"]]] autorelease];
-    if ( ! image ) image = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:[info objectForKey:@"CFBundleIconFile"]]] autorelease];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( image ) [cache setObject:image forKey:@"MVPreferencePaneImage"];
-  }
-  return image;
-}
-
-- (NSString *) _paletteLabelForPaneBundle:(NSBundle *) bundle
-{
-  NSString *label = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  label = [[[cache objectForKey:@"MVPreferencePanePaletteLabel"] retain] autorelease];
-  if ( ! label ) {
-    NSDictionary *info = [bundle infoDictionary];
-    label = NSLocalizedStringFromTableInBundle( @"NSPrefPaneIconLabel", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"NSPrefPaneIconLabel"] ) label = [info objectForKey:@"NSPrefPaneIconLabel"];
-    if ( ! label ) label = NSLocalizedStringFromTableInBundle( @"CFBundleName", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"CFBundleName"] ) label = [info objectForKey:@"CFBundleName"];
-    if ( ! label ) label = [bundle bundleIdentifier];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( label ) [cache setObject:label forKey:@"MVPreferencePanePaletteLabel"];
-  }
-  return label;
-}
-
-- (NSString *) _labelForPaneBundle:(NSBundle *) bundle
-{
-  NSString *label = nil;
-  NSMutableDictionary *cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-  label = [[[cache objectForKey:@"MVPreferencePaneLabel"] retain] autorelease];
-  if ( ! label ) {
-    NSDictionary *info = [bundle infoDictionary];
-    label = NSLocalizedStringFromTableInBundle( @"CFBundleName", @"InfoPlist", bundle, nil );
-    if ( [label isEqualToString:@"CFBundleName"] ) label = [info objectForKey:@"CFBundleName"];
-    if ( ! label ) label = [bundle bundleIdentifier];
-    if ( ! cache ) [paneInfo setObject:[NSMutableDictionary dictionary] forKey:[bundle bundleIdentifier]];
-    cache = [paneInfo objectForKey:[bundle bundleIdentifier]];
-    if ( label ) [cache setObject:label forKey:@"MVPreferencePaneLabel"];
-  }
-  return label;
-}
-@end
-

chimera/PreferencePanes/Personal/English.lproj/Personal.nib/info.nib

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>413 91 356 240 0 0 1152 848 </string>
-	<key>IBFramework Version</key>
-	<string>248.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>3</key>
-		<array>
-			<string>153</string>
-			<string>155</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>4</string>
-	<key>IBSystem Version</key>
-	<string>5Q125</string>
-</dict>
-</plist>

chimera/PreferencePanes/Personal/Personal.nib/info.nib

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>413 91 356 240 0 0 1152 848 </string>
-	<key>IBFramework Version</key>
-	<string>248.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>3</key>
-		<array>
-			<string>153</string>
-			<string>155</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>4</string>
-	<key>IBSystem Version</key>
-	<string>5Q125</string>
-</dict>
-</plist>

chimera/PreferencePanes/Shared/PreferencePaneBase.mm

@@ -41,7 +41,8 @@
   char *buf = nsnull;
   nsresult rv = mPrefService->GetCharPref(prefName, &buf);
   if (NS_SUCCEEDED(rv) && buf) {
-    prefValue = [NSString stringWithCString:buf];
+    // prefs are UTF-8
+    prefValue = [NSString stringWithUTF8String:buf];
     free(buf);
     if (outSuccess) *outSuccess = YES;
   } else {
@@ -93,8 +94,9 @@
 
 - (void)setPref: (const char*)prefName toString:(NSString*)value
 {
+  // prefs are UTF-8
   if (mPrefService) {
-    mPrefService->SetCharPref(prefName, [value cString]);
+    mPrefService->SetCharPref(prefName, [value UTF8String]);
   }
 }
 

chimera/src/preferences/MVPreferencePaneDefaults.plist

@@ -1,5 +1,6 @@
 ( Chimera.SitesPrefPane,
   org.mozilla.chimera.preference.navigation,
+  org.mozilla.chimera.preference.appearance,
   org.mozilla.chimera.preference.privacy,
   Chimera.HelpersPrefPane,
   Chimera.SecurityPrefPane,

chimera/src/preferences/MVPreferencePaneGroups.plist

@@ -3,6 +3,7 @@
 		identifier = chimera; 
 		panes = (
             org.mozilla.chimera.preference.navigation,
+            org.mozilla.chimera.preference.appearance,
             org.mozilla.chimera.preference.privacy,
             Chimera.SitesPrefPane,
             Chimera.HelpersPrefPane,