adium/adium

Fix some issues with the merge of 7a4864a334d0 and friends.
PreferencesRedux
2012-02-10, Frank Dowsett
2f55e93e338f
Parents 5455497f6061
Children c500a9cb5d5f
Fix some issues with the merge of 7a4864a334d0 and friends.
1 files changed, 31 insertions(+), 30 deletions(-)
  • +31 -30
    Source/ESContactListAdvancedPreferences.m
    • --- a/Source/ESContactListAdvancedPreferences.m Wed Feb 08 13:36:45 2012 +0200
    +++ b/Source/ESContactListAdvancedPreferences.m Fri Feb 10 01:03:12 2012 -0500
    @@ -316,11 +316,12 @@
    {
    NSString *theme = [adium.preferenceController preferenceForKey:KEY_LIST_THEME_NAME group:PREF_GROUP_APPEARANCE];
    - [ESPresetNameSheetController showPresetNameSheetWithDefaultName:[[theme stringByAppendingString:@" "] stringByAppendingString:AILocalizedString(@"(Copy)", nil)]
    - explanatoryText:AILocalizedString(@"Enter a unique name for this new theme.",nil)
    - onWindow:[[self view] window]
    - notifyingTarget:self
    - userInfo:@"theme"];
    + ESPresetNameSheetController *presetNameSheetController = [[ESPresetNameSheetController alloc] initWithDefaultName:[[theme stringByAppendingString:@" "] stringByAppendingString:AILocalizedString(@"(Copy)", nil)]
    + explanatoryText:AILocalizedString(@"Enter a unique name for this new theme.",nil)
    + notifyingTarget:self
    + userInfo:@"theme"];
    +
    + [presetNameSheetController showOnWindow:[[self view] window]];
    }
    /*!
    @@ -330,9 +331,9 @@
    {
    NSString *theme = [adium.preferenceController preferenceForKey:KEY_LIST_THEME_NAME group:PREF_GROUP_APPEARANCE];
    - [AIListThemeWindowController editListThemeWithName:theme
    - onWindow:[[self view] window]
    - notifyingTarget:self];
    + AIListThemeWindowController *listThemeWindowController = [[AIListThemeWindowController alloc] initWithName:theme
    + notifyingTarget:self];
    + [listThemeWindowController showOnWindow:[[self view] window]];
    }
    /*!
    @@ -373,10 +374,10 @@
    - (void)manageListThemes:(id)sender
    {
    _listThemes = [self availableThemeSets];
    - [ESPresetManagementController managePresets:_listThemes
    - namedByKey:@"name"
    - onWindow:[[self view] window]
    - withDelegate:self];
    + ESPresetManagementController *presetManagementController = [[ESPresetManagementController alloc] initWithPresets:_listThemes
    + namedByKey:@"name"
    + withDelegate:self];
    + [presetManagementController showOnWindow:[[self view] window]];
    [popUp_colorTheme selectItemWithRepresentedObject:[adium.preferenceController preferenceForKey:KEY_LIST_THEME_NAME
    group:PREF_GROUP_APPEARANCE]];
    @@ -389,11 +390,11 @@
    {
    NSString *layout = [adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME group:PREF_GROUP_APPEARANCE];
    - [ESPresetNameSheetController showPresetNameSheetWithDefaultName:[[layout stringByAppendingString:@" "] stringByAppendingString:AILocalizedString(@"(Copy)",nil)]
    - explanatoryText:AILocalizedString(@"Enter a unique name for this new layout.",nil)
    - onWindow:[[self view] window]
    - notifyingTarget:self
    - userInfo:@"layout"];
    + ESPresetNameSheetController *presetNameSheetController = [[ESPresetNameSheetController alloc] initWithDefaultName:[[layout stringByAppendingString:@" "] stringByAppendingString:AILocalizedString(@"(Copy)",nil)]
    + explanatoryText:AILocalizedString(@"Enter a unique name for this new layout.",nil)
    + notifyingTarget:self
    + userInfo:@"layout"];
    + [presetNameSheetController showOnWindow:[[self view] window]];
    }
    /*!
    @@ -403,9 +404,9 @@
    {
    NSString *theme = [adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME group:PREF_GROUP_APPEARANCE];
    - [AIListLayoutWindowController editListLayoutWithName:theme
    - onWindow:[[self view] window]
    - notifyingTarget:self];
    + AIListLayoutWindowController *listLayoutWindowController = [[AIListLayoutWindowController alloc] initWithName:theme
    + notifyingTarget:self];
    + [listLayoutWindowController showOnWindow:[[self view] window]];
    }
    /*!
    @@ -446,10 +447,10 @@
    - (void)manageListLayouts:(id)sender
    {
    _listLayouts = [self availableLayoutSets];
    - [ESPresetManagementController managePresets:_listLayouts
    - namedByKey:@"name"
    - onWindow:[[self view] window]
    - withDelegate:self];
    + ESPresetManagementController *presetManagementController = [[ESPresetManagementController alloc] initWithPresets:_listLayouts
    + namedByKey:@"name"
    + withDelegate:self];
    + [presetManagementController showOnWindow:[[self view] window]];
    [popUp_listLayout selectItemWithRepresentedObject:[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME
    group:PREF_GROUP_APPEARANCE]];
    @@ -508,14 +509,14 @@
    }
    }
    - (void)_editListThemeWithName:(NSString *)name{
    - [AIListThemeWindowController editListThemeWithName:name
    - onWindow:[[self view] window]
    - notifyingTarget:self];
    + AIListThemeWindowController *listThemeWindowController = [[AIListThemeWindowController alloc] initWithName:name
    + notifyingTarget:self];
    + [listThemeWindowController showOnWindow:[[self view] window]];
    }
    - (void)_editListLayoutWithName:(NSString *)name{
    - [AIListLayoutWindowController editListLayoutWithName:name
    - onWindow:[[self view] window]
    - notifyingTarget:self];
    + AIListLayoutWindowController *listLayoutWindowController = [[AIListLayoutWindowController alloc] initWithName:name
    + notifyingTarget:self];
    + [listLayoutWindowController showOnWindow:[[self view] window]];
    }
    /*!