adium 2210:6cd256e6ee6e: Remove the "Show [User Icon/Status Mess...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/6cd256e6ee6e
revision:	2210:6cd256e6ee6e
author:		Zachary West <zacw at adium.im>
date:		Sat May 16 20:48:09 2009 -0400

Remove the "Show [User Icon/Status Messages]" menu items from the View menu.

diffstat:

 Source/AIAppearancePreferencesPlugin.h |   3 -
 Source/AIAppearancePreferencesPlugin.m |  68 ----------------------------------
 2 files changed, 0 insertions(+), 71 deletions(-)

diffs (120 lines):

diff -r 8376f14337ff -r 6cd256e6ee6e Source/AIAppearancePreferencesPlugin.h
--- a/Source/AIAppearancePreferencesPlugin.h	Sat May 16 20:37:07 2009 -0400
+++ b/Source/AIAppearancePreferencesPlugin.h	Sat May 16 20:48:09 2009 -0400
@@ -26,9 +26,6 @@
 
 @interface AIAppearancePreferencesPlugin : AIPlugin {
 	AIAppearancePreferences		*preferences;
-	
-	NSMenuItem					*menuItem_userIcons;
-	NSMenuItem					*menuItem_userStatusMessages;
 }
 
 //Themes and Layouts
diff -r 8376f14337ff -r 6cd256e6ee6e Source/AIAppearancePreferencesPlugin.m
--- a/Source/AIAppearancePreferencesPlugin.m	Sat May 16 20:37:07 2009 -0400
+++ b/Source/AIAppearancePreferencesPlugin.m	Sat May 16 20:48:09 2009 -0400
@@ -29,9 +29,6 @@
 
 #define APPEARANCE_DEFAULT_PREFS 	@"AppearanceDefaults"
 
-#define SHOW_USER_ICONS_TITLE		AILocalizedString(@"Show User Icons", nil)
-#define SHOW_STATUS_MESSAGES_TITLE	AILocalizedString(@"Show Status Messages", nil)
-
 @implementation AIAppearancePreferencesPlugin
 
 - (void)installPlugin
@@ -53,23 +50,7 @@
 									   name:AIStatusIconSetInvalidSetNotification
 									 object:nil];
 	
-	//Add the menu item for configuring the sort
-	menuItem_userIcons = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:SHOW_USER_ICONS_TITLE
-																			  target:self
-																			  action:@selector(toggleAppearancePreference:)
-																	   keyEquivalent:@"i"];
-	[menuItem_userIcons setKeyEquivalentModifierMask:(NSControlKeyMask | NSCommandKeyMask)];
-	[adium.menuController addMenuItem:menuItem_userIcons toLocation:LOC_View_Appearance_Toggles];
-	
-	menuItem_userStatusMessages = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:SHOW_STATUS_MESSAGES_TITLE
-																					   target:self
-																					   action:@selector(toggleAppearancePreference:)
-																				keyEquivalent:@"s"];
-	[menuItem_userStatusMessages setKeyEquivalentModifierMask:(NSControlKeyMask | NSCommandKeyMask)];
-	[adium.menuController addMenuItem:menuItem_userStatusMessages toLocation:LOC_View_Appearance_Toggles];
-	
 	[preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_APPEARANCE];
-	[preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_LIST_LAYOUT];	
 }	
 
 - (void)uninstallPlugin
@@ -77,14 +58,6 @@
 	[adium.preferenceController unregisterPreferenceObserver:self];
 }
 
-- (void)dealloc
-{
-	[menuItem_userIcons release];
-	[menuItem_userStatusMessages release];
-
-	[super dealloc];
-}
-
 /*!
  * @brief Apply changed preferences
  */
@@ -162,16 +135,6 @@
 				 toPreferenceGroup:PREF_GROUP_LIST_LAYOUT];
 		}		
 	}
-
-	//Layout
-	if ([group isEqualToString:PREF_GROUP_LIST_LAYOUT]) {
-		if (firstTime || !key ||
-			[key isEqualToString:KEY_LIST_LAYOUT_SHOW_ICON] ||
-			[key isEqualToString:KEY_LIST_LAYOUT_SHOW_EXT_STATUS]) {
-			[menuItem_userIcons setState:[[prefDict objectForKey:KEY_LIST_LAYOUT_SHOW_ICON] boolValue]];
-			[menuItem_userStatusMessages setState:[[prefDict objectForKey:KEY_LIST_LAYOUT_SHOW_EXT_STATUS] boolValue]];
-		}
-	}
 }
 
 /*!
@@ -189,37 +152,6 @@
 	[preferences xtrasChanged:nil];
 }
 
-- (void)toggleAppearancePreference:(NSMenuItem *)sender
-{
-	NSString *key;
-
-	if (sender == menuItem_userIcons) {
-		key = KEY_LIST_LAYOUT_SHOW_ICON;
-		
-	} else if (sender == menuItem_userStatusMessages) {
-		key = KEY_LIST_LAYOUT_SHOW_EXT_STATUS;
-
-	} else {
-		key = nil;
-	}
-	
-	if (key) {
-		BOOL	 oldValue = [[adium.preferenceController preferenceForKey:key
-																   group:PREF_GROUP_LIST_LAYOUT] boolValue];
-
-		[adium.preferenceController setPreference:[NSNumber numberWithBool:!oldValue]
-											 forKey:key
-											  group:PREF_GROUP_LIST_LAYOUT];
-
-		//Save the updated layout
-		[self createSetFromPreferenceGroup:PREF_GROUP_LIST_LAYOUT
-								  withName:[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_NAME
-																					group:PREF_GROUP_APPEARANCE]
-								 extension:LIST_LAYOUT_EXTENSION
-								  inFolder:LIST_LAYOUT_FOLDER];
-	}
-}
-
 #pragma mark ListLayout and ListTheme preference management
 //Apply a set of preferences
 - (void)applySetWithName:(NSString *)setName extension:(NSString *)extension inFolder:(NSString *)folder toPreferenceGroup:(NSString *)preferenceGroup