Changed back authentication for smc binary to checkSum method (codesign check was causing issues on some mac)

Reset-Feature to reset fans back to factory defaults, delete settings and favorites

.gitignore

@@ -0,0 +1,4 @@
+/build/
+/smcFanControl.xcodeproj/project.xcworkspace/xcshareddata/
+/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/
+/smcFanControl.xcodeproj/xcuserdata/

Classes/FanControl.h

@@ -2,7 +2,8 @@
  *	FanControl
  *
  *	Copyright (c) 2006-2012 Hendrik Holtmann
-*
+ *  Portions Copyright (c) 2013 Michael Wilber
+ *
  *	FanControl.h - MacBook(Pro) FanControl application
  *
  *	This program is free software; you can redistribute it and/or modify
@@ -38,7 +39,7 @@
 #define kMenuBarHeight				22
 
 
-@interface FanControl : NSObject
+@interface FanControl : NSObject <NSMenuDelegate>
 
 {
     IBOutlet id currentSpeed;
@@ -98,17 +99,16 @@
 	IBOutlet id DefaultsController;
 	
 	MachineDefaults *mdefaults;
-	NSDictionary *s_sed;
 
 	NSDictionary *undo_dic;
 	 
 	NSImage *menu_image;
 	NSImage *menu_image_alt;
-
-
-
 }
 
+@property (nonatomic, strong ) 	NSMutableDictionary *machineDefaultsDict;
+
+
 -(void)terminate:(id)sender;
 
 - (IBAction)paypal:(id)sender;
@@ -117,6 +117,7 @@
 - (IBAction)closePreferences:(id)sender;
 - (IBAction)savePreferences:(id)sender;
 - (IBAction)updateCheck:(id)sender;
+- (IBAction)resetSettings:(id)sender;
 
 - (void)init_statusitem;
 
@@ -133,12 +134,13 @@
 - (void) syncBinder:(Boolean)bind;
 - (IBAction) changeMenu:(id)sender;
 - (IBAction)menuSelect:(id)sender;
+- (void)menuNeedsUpdate:(NSMenu*)menu;
 @end
 
 
 @interface NSNumber (NumberAdditions)
-- (NSString *) tohex;
+@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSString *tohex;
-- (NSNumber*) celsius_fahrenheit;
+@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSNumber *celsius_fahrenheit;
 
 @end
 

Classes/FanControl.m

@@ -2,7 +2,8 @@
  *	FanControl
  *
  *	Copyright (c) 2006-2012 Hendrik Holtmann
-*
+ *  Portions Copyright (c) 2013 Michael Wilber
+ *
  *	FanControl.m - MacBook(Pro) FanControl application
  *
  *	This program is free software; you can redistribute it and/or modify
@@ -30,25 +31,18 @@
 #import "SystemVersion.h"
 
 @interface FanControl ()
-+(void)copyMachinesIfNecessary;
++ (void)copyMachinesIfNecessary;
-- (BOOL)isInAutoStart;
+@property (NS_NONATOMIC_IOSONLY, getter=isInAutoStart, readonly) BOOL inAutoStart;
-- (void) setStartAtLogin:(BOOL)enabled;
+- (void)setStartAtLogin:(BOOL)enabled;
++ (void)checkRightStatus:(OSStatus)status;
 @end
 
 @implementation FanControl
 
-io_connect_t conn;
+// Number of fans reported by the hardware.
-kern_return_t result;
+int g_numFans = 0;
-SMCVal_t      val;
+
 NSUserDefaults *defaults;
-Boolean supported=false;
-extern char   *optarg;
-SMCVal_t val;
-OSStatus status;
-NSDictionary* machine_defaults;
-NSString *authpw;
-
-
 
 #pragma mark **Init-Methods**
 
@@ -86,98 +80,91 @@ NSString *authpw;
 	for (i=0;i<[rfavorites count];i++)
 	{
 		BOOL selected = NO;
-		NSArray *fans = [[rfavorites objectAtIndex:i] objectForKey:@"FanData"];
+		NSArray *fans = rfavorites[i][@"FanData"];
 		for (j=0;j<[fans count];j++) {
-			if ([[[fans objectAtIndex:j] objectForKey:@"menu"] boolValue] == YES ) {
+			if ([fans[j][@"menu"] boolValue] == YES ) {
 				selected = YES;
 			}
 		}
 		if (selected==NO) {
-			[[[[rfavorites objectAtIndex:i] objectForKey:@"FanData"] objectAtIndex:0] setObject:[NSNumber numberWithBool:YES] forKey:@"menu"];
+			rfavorites[i][@"FanData"][0][@"menu"] = @YES;
 		}
 	}
 	
 }
 
 -(void) awakeFromNib {
-		
+    
-	s_sed = nil;
 	pw=[[Power alloc] init];
 	[pw setDelegate:self];
 	[pw registerForSleepWakeNotification];
 	[pw registerForPowerChange];
 	
-	//load defaults
+
-	
+    //load defaults
-	[DefaultsController setAppliesImmediately:NO];
+    
+    [DefaultsController setAppliesImmediately:NO];
 
 	mdefaults=[[MachineDefaults alloc] init:nil];
 
-	s_sed=[mdefaults get_machine_defaults];
+    self.machineDefaultsDict=[[NSMutableDictionary alloc] initWithDictionary:[mdefaults get_machine_defaults]];
 
-	
+    NSMutableArray *favorites = [[NSMutableArray alloc] init];
-	NSMutableArray *favorites=[NSMutableArray arrayWithObjects:
+    
-							[NSMutableDictionary dictionaryWithObjectsAndKeys:
+    NSMutableDictionary *defaultFav = [[NSMutableDictionary alloc] initWithObjectsAndKeys:@"Default", @"Title",
-							@"Default", @"Title",
+                                  [NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:[[mdefaults get_machine_defaults] objectForKey:@"Fans"]]], @"FanData",nil];
-							[s_sed objectForKey:@"Fans"], @"FanData",nil],nil];
+
+    [favorites addObject:defaultFav];
+    
+    
 	NSRange range=[[MachineDefaults computerModel] rangeOfString:@"MacBook"];
 	if (range.length>0) {
 		//for macbooks add a second default
-		MachineDefaults *msdefaults=[[MachineDefaults alloc] init:nil];
+		NSMutableDictionary *higherFav=[[NSMutableDictionary alloc] initWithObjectsAndKeys:@"Higher RPM", @"Title",
-		NSMutableDictionary *sec_fav=[NSMutableDictionary dictionaryWithObjectsAndKeys:@"Higher RPM", @"Title",
+                                        [NSKeyedUnarchiver unarchiveObjectWithData:[NSKeyedArchiver archivedDataWithRootObject:[[mdefaults get_machine_defaults] objectForKey:@"Fans"]]], @"FanData",nil];
-							[[msdefaults get_machine_defaults] objectForKey:@"Fans"], @"FanData",nil];
+		for (NSUInteger i=0;i<[_machineDefaultsDict[@"Fans"] count];i++) {
-		[favorites addObject:sec_fav];	
+            
-		int i;					
+            int min_value=([[[[_machineDefaultsDict objectForKey:@"Fans"] objectAtIndex:i] objectForKey:@"Minspeed"] intValue])*2;
-		for (i=0;i<[[s_sed objectForKey:@"Fans"] count];i++) {
+            [[[higherFav objectForKey:@"FanData"] objectAtIndex:i] setObject:[NSNumber numberWithInt:min_value] forKey:@"selspeed"];
-			int min_value=([[[[s_sed objectForKey:@"Fans"] objectAtIndex:i] valueForKey:@"Minspeed"] intValue])*2;
-			[[[[favorites objectAtIndex:1] objectForKey:@"FanData"] objectAtIndex:i] setObject:[NSNumber numberWithInt:min_value] forKey:@"selspeed"];
-
 		}
-		[msdefaults release];
+        [favorites addObject:higherFav];
-	}							
+
+	}
 
 	//sync option for Macbook Pro's
 	NSRange range_mbp=[[MachineDefaults computerModel] rangeOfString:@"MacBookPro"];
-	if (range_mbp.length>0) {
+	if (range_mbp.length>0  && [_machineDefaultsDict[@"Fans"] count] == 2) {
 		[sync setHidden:NO];
 	}
 
-	
-	NSString *feedURL = nil;
-	if ([SystemVersion isTiger]) {
-		feedURL = @"http://www.eidac.de/smcfancontrol/smcfancontrol_tiger.xml";
-	} else {
-		feedURL = @"http://www.eidac.de/smcfancontrol/smcfancontrol.xml";
-	}
-																													
 	//load user defaults
 	defaults = [NSUserDefaults standardUserDefaults];
 	[defaults registerDefaults:
 		[NSMutableDictionary dictionaryWithObjectsAndKeys:
-			[NSNumber numberWithInt:0], @"Unit",
+			@0, @"Unit",
-			[NSNumber numberWithInt:0], @"SelDefault",
+			@0, @"SelDefault",
-			[NSNumber numberWithBool:NO], @"AutoStart",
+			@NO, @"AutoStart",
-			[NSNumber numberWithBool:NO],@"AutomaticChange",
+			@NO,@"AutomaticChange",
-			[NSNumber numberWithInt:0],@"selbatt",
+			@0,@"selbatt",
-			[NSNumber numberWithInt:0],@"selac",
+			@0,@"selac",
-			[NSNumber numberWithInt:0],@"selload",
+			@0,@"selload",
-			[NSNumber numberWithInt:0],@"MenuBar",
+			@0,@"MenuBar",
-			feedURL,@"SUFeedURL",
+            @"TC0D",@"TSensor",
+            @0,@"NumLaunches",
+            @NO,@"DonationMessageShown",
 			[NSArchiver archivedDataWithRootObject:[NSColor blackColor]],@"MenuColor",
 			favorites,@"Favorites",
 	nil]];
 	
 	
 
-	
+	g_numFans = [smcWrapper get_fan_num];
 	s_menus=[[NSMutableArray alloc] init];
-	[s_menus autorelease];
 	int i;
-	for(i=0;i<[smcWrapper get_fan_num];i++){
+	for(i=0;i<g_numFans;i++){
 		NSMenuItem *mitem=[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Fan: %d",i] action:NULL keyEquivalent:@""];
 		[mitem setTag:(i+1)*10];
 		[s_menus insertObject:mitem atIndex:i];
-		[mitem release];
 	}
 	
 	[FavoritesController bind:@"content"
@@ -188,9 +175,9 @@ NSString *authpw;
 	
 	// set slider sync - only for MBP
 	for (i=0;i<[[FavoritesController arrangedObjects] count];i++) {
-		if([[[[FavoritesController arrangedObjects] objectAtIndex:i] objectForKey:@"sync"] boolValue]==YES) {
+		if([[FavoritesController arrangedObjects][i][@"sync"] boolValue]==YES) {
 			[FavoritesController setSelectionIndex:i];
-			[self syncBinder:[[[[FavoritesController arrangedObjects] objectAtIndex:i] objectForKey:@"sync"] boolValue]];
+			[self syncBinder:[[FavoritesController arrangedObjects][i][@"sync"] boolValue]];
 		}
 	}
 
@@ -217,32 +204,67 @@ NSString *authpw;
 	[self changeMenu:nil];
 	
 	//seting toolbar image
-	menu_image=[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"smc" ofType:@"png"]];
+    menu_image = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"smc" ofType:@"png"]];
-	menu_image_alt=[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"smcover" ofType:@"png"]];
+    menu_image_alt  = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"smcover" ofType:@"png"]];
+    if ([menu_image respondsToSelector:@selector(setTemplate:)]) {
+        [menu_image setTemplate:YES];
+        [menu_image_alt setTemplate:YES];
+    }
 
-	//release MachineDefaults class first call
 	//add timer for reading to RunLoop
-	_readTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(readFanData:) userInfo:nil repeats:YES];
+	_readTimer = [NSTimer scheduledTimerWithTimeInterval:4.0 target:self selector:@selector(readFanData:) userInfo:nil repeats:YES];
+    if ([_readTimer respondsToSelector:@selector(setTolerance:)]) {
+        [_readTimer setTolerance:2.0];
+    }
 	[_readTimer fire];
+    
 	//autoapply settings if valid
 	[self upgradeFavorites];
     
     //autostart
-    [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithBool:[self isInAutoStart]] forKey:@"AutoStart"];
+    [[NSUserDefaults standardUserDefaults] setValue:@([self isInAutoStart]) forKey:@"AutoStart"];
-		
+     NSUInteger numLaunches = [[[NSUserDefaults standardUserDefaults] objectForKey:@"NumLaunches"] integerValue];
+    [[NSUserDefaults standardUserDefaults] setObject:@(numLaunches+1) forKey:@"NumLaunches"];
+    if (numLaunches != 0 && (numLaunches % 5 == 0) && ![[[NSUserDefaults standardUserDefaults] objectForKey:@"DonationMessageShown"] boolValue]) {
+        [self displayDonationMessage];
+    }
+}
+
+-(void)displayDonationMessage
+{
+    NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Consider a donation",nil)
+                                     defaultButton:NSLocalizedString(@"Donate over Paypal",nil) alternateButton:NSLocalizedString(@"Never ask me again",nil) otherButton:NSLocalizedString(@"Remind me later",nil)
+                         informativeTextWithFormat:NSLocalizedString(@"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated.",nil)];
+    NSModalResponse code=[alert runModal];
+    if (code == NSAlertDefaultReturn) {
+        [self paypal:nil];
+        [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"DonationMessageShown"];
+    } else if (code == NSAlertAlternateReturn) {
+        [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"DonationMessageShown"];
+    }
 }
 
 
 -(void)init_statusitem{
-	statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength: NSVariableStatusItemLength] retain];
+	statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength: NSVariableStatusItemLength];
 	[statusItem setMenu: theMenu];
-	[statusItem setEnabled: YES];
+    
-	[statusItem setHighlightMode:YES];
+    if ([statusItem respondsToSelector:@selector(button)]) {
-	[statusItem setTitle:@"smc..."];
+        [statusItem.button setTitle:@"smc..."];
+    } else {
+        [statusItem setEnabled: YES];
+        [statusItem setHighlightMode:YES];
+        [statusItem setTitle:@"smc..."];
+    }
 	int i;
 	for(i=0;i<[s_menus count];i++) {
-		[theMenu insertItem:[s_menus objectAtIndex:i] atIndex:i];
+		[theMenu insertItem:s_menus[i] atIndex:i];
 	};
+    
+    // Sign up for menuNeedsUpdate call
+    // so that the fan speeds in the menu can be updated
+    // only when needed.
+    [theMenu setDelegate:self];
 }
 
 
@@ -271,141 +293,213 @@ NSString *authpw;
 - (IBAction)save_favorite:(id)sender{
 	MachineDefaults *msdefaults=[[MachineDefaults alloc] init:nil];
 	if ([[newfavorite_title stringValue] length]>0) {
-		NSMutableDictionary *toinsert=[[NSMutableDictionary alloc] initWithObjectsAndKeys:[newfavorite_title stringValue],@"Title",[[msdefaults get_machine_defaults] objectForKey:@"Fans"],@"FanData",nil]; //default as template
+		NSMutableDictionary *toinsert=[[NSMutableDictionary alloc] initWithObjectsAndKeys:[newfavorite_title stringValue],@"Title",[msdefaults get_machine_defaults][@"Fans"],@"FanData",nil]; //default as template
-		[toinsert setValue:[NSNumber numberWithInt:0] forKey:@"Standard"];
+		[toinsert setValue:@0 forKey:@"Standard"];
 		[FavoritesController addObject:toinsert];
-		[toinsert release];
 		[newfavoritewindow close];
 		[[NSApplication sharedApplication] endSheet:newfavoritewindow];
 	}
-	[msdefaults release];
 	[self upgradeFavorites];
 }
 
 
 -(void) check_deletion:(id)combo{
  if ([FavoritesController selectionIndex]==[[defaults objectForKey:combo] intValue]) {
-	 [defaults setObject:[NSNumber numberWithInt:0] forKey:combo];
+	 [defaults setObject:@0 forKey:combo];
  }
 }
 
-- (IBAction)delete_favorite:(id)sender{
+
-	int pressesButton=NSRunCriticalAlertPanelRelativeToWindow(
+
-			NSLocalizedString(@"Delete favorite",nil),
+- (void) deleteAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
-			[NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete the favorite %@?",nil), [ [ [FavoritesController arrangedObjects] objectAtIndex:[FavoritesController selectionIndex]] objectForKey:@"Title"] ],
+{
-			NSLocalizedString(@"No",nil),
+    if (returnCode==0) {
-			NSLocalizedString(@"Yes",nil),nil,mainwindow);
-	if (pressesButton==0) {
 		//delete favorite, but resets presets before
 		[self check_deletion:@"selbatt"];
 		[self check_deletion:@"selac"];
 		[self check_deletion:@"selload"];
-		[FavoritesController removeObjects:[FavoritesController selectedObjects]];
+        [FavoritesController removeObjects:[FavoritesController selectedObjects]];
 	}
 }
 
+- (IBAction)delete_favorite:(id)sender{
+	
+    NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Delete favorite",nil) defaultButton:NSLocalizedString(@"No",nil) alternateButton:NSLocalizedString(@"Yes",nil) otherButton:nil informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete the favorite %@?",nil), [FavoritesController arrangedObjects][[FavoritesController selectionIndex]][@"Title"] ]];
+    
+    [alert beginSheetModalForWindow:mainwindow modalDelegate:self didEndSelector:@selector(deleteAlertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+}
+
 
 
+// Called via a timer mechanism. This is where all the temp / RPM reading is done.
 //reads fan data and updates the gui
--(void) readFanData:(NSTimer*)timer{
+-(void) readFanData:(id)caller{
 	
-	NSString *temp;
+    int i = 0;
-	NSString *fan;
-
 	
 	//on init handling
-	if (s_sed==nil) {
+	if (_machineDefaultsDict==nil) {
 		return;
 	}
-	
+    
-	//populate Menu Items with recent Data
+    // Determine what data is actually needed to keep the energy impact
-	int i;
+    // as low as possible.
-	for(i=0;i<[smcWrapper get_fan_num];i++){
+    bool bNeedTemp = false;
-		NSString *fandesc=[[[s_sed objectForKey:@"Fans"] objectAtIndex:i] objectForKey:@"Description"];
+    bool bNeedRpm = false;
-		[[theMenu itemWithTag:(i+1)*10] setTitle:[NSString stringWithFormat:@"%@: %@ rpm",fandesc,[[NSNumber numberWithInt:[smcWrapper get_fan_rpm:i]] stringValue]]];
+    const int menuBarSetting = [[defaults objectForKey:@"MenuBar"] intValue];
-	}
+    switch (menuBarSetting) {
-	
+        default:
-	
+        case 1:
-	float c_temp=[smcWrapper get_maintemp];
+            bNeedTemp = true;
-	if ([[defaults objectForKey:@"Unit"] intValue]==0) { 
+            bNeedRpm = true;
-		temp=[NSString stringWithFormat:@"%@%CC",[NSNumber numberWithFloat:c_temp],(unsigned short)0xb0];
+            break;
-	} else {
+            
-		NSNumberFormatter *ncf=[[[NSNumberFormatter alloc] init] autorelease];
+        case 2:
-		[ncf setFormat:@"00;00;-00"];
+            bNeedTemp = true;
-		temp=[NSString stringWithFormat:@"%@%CF",[ncf stringForObjectValue:[[NSNumber numberWithFloat:c_temp] celsius_fahrenheit]],(unsigned short)0xb0];
+            bNeedRpm = true;
-	}	
+            break;
-	NSNumberFormatter *nc=[[[NSNumberFormatter alloc] init] autorelease];
+            
-	//avoid jumping in menu bar
+        case 3:
-	[nc setFormat:@"000;000;-000"];
+            bNeedTemp = true;
-	
+            bNeedRpm = false;
-	int selected = 0;
+            break;
-	NSArray *fans = [[[FavoritesController arrangedObjects] objectAtIndex:[FavoritesController selectionIndex]] objectForKey:@"FanData"];
+            
-	for (i=0;i<[fans count];i++)
+        case 4:
-	{
+            bNeedTemp = false;
-		if ([[[fans objectAtIndex:i] objectForKey:@"menu"] boolValue]==YES) {
+            bNeedRpm = true;
-			selected = i;
+            break;
-		}
+    }
-	}
-	
-	fan=[NSString stringWithFormat:@"%@rpm",[nc stringForObjectValue:[NSNumber numberWithFloat:[smcWrapper get_fan_rpm:selected]]]];
 
-	if ([[defaults objectForKey:@"MenuBar"] intValue]<=1) { 
+    NSString *temp = nil;
-		NSString *add;
+	NSString *fan = nil;
-		int fsize;
+    float c_temp = 0.0f;
-		if ([[defaults objectForKey:@"MenuBar"] intValue]==0) {
+    int selectedRpm = 0;
-			add=@"\n";
+    
-			fsize=9;
+    if (bNeedRpm == true) {
-			[statusItem setLength:53];
+        // Read the current fan speed for the desired fan and format text for display in the menubar.
-		} else {
+        NSArray *fans = [FavoritesController arrangedObjects][[FavoritesController selectionIndex]][@"FanData"];
-			add=@" ";
+        for (i=0; i<g_numFans && i<[fans count]; i++)
-			fsize=11;
+        {
-			[statusItem setLength:96];
+            if ([fans[i][@"menu"] boolValue]==YES) {
-		}
+                selectedRpm = [smcWrapper get_fan_rpm:i];
-		NSMutableAttributedString *s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@%@",temp,add,fan]];
+                break;
-		NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+            }
-		[paragraphStyle setAlignment:NSLeftTextAlignment];
+        }
-		[s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:fsize] range:NSMakeRange(0,[s_status length])];
+        
-		[s_status addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,[s_status length])];
+        NSNumberFormatter *nc=[[NSNumberFormatter alloc] init];
-		[s_status addAttribute:NSForegroundColorAttributeName value:(NSColor*)[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"MenuColor"]]  range:NSMakeRange(0,[s_status length])];
+        //avoid jumping in menu bar
-		[statusItem setAttributedTitle:s_status];
+        [nc setFormat:@"000;000;-000"];
-		[statusItem setImage:nil];
+        
-		[statusItem setAlternateImage:nil];
+        fan = [NSString stringWithFormat:@"%@rpm",[nc stringForObjectValue:[NSNumber numberWithFloat:selectedRpm]]];
-		[paragraphStyle release];
+    }
-		[s_status release];
+    
-	}
+    if (bNeedTemp == true) {
-	
+        // Read current temperature and format text for the menubar.
-	
+        c_temp = [smcWrapper get_maintemp];
-	if ([[defaults objectForKey:@"MenuBar"] intValue]==2) {
+        
-		[statusItem setLength:26]; 
+        if ([[defaults objectForKey:@"Unit"] intValue]==0) {
-		[statusItem setTitle:nil];
+            temp = [NSString stringWithFormat:@"%@%CC",@(c_temp),(unsigned short)0xb0];
-		[statusItem setToolTip:[NSString stringWithFormat:@"%@\n%@",temp,fan]];
+        } else {
-		[statusItem setImage:menu_image];
+            NSNumberFormatter *ncf=[[NSNumberFormatter alloc] init];
-		[statusItem setAlternateImage:menu_image_alt];
+            [ncf setFormat:@"00;00;-00"];
-		
+            temp = [NSString stringWithFormat:@"%@%CF",[ncf stringForObjectValue:[@(c_temp) celsius_fahrenheit]],(unsigned short)0xb0];
-	}
+        }
-
+    }
-	if ([[defaults objectForKey:@"MenuBar"] intValue]==3) { 
+    
-		[statusItem setLength:46];
+    // Update the temp and/or fan speed text in the menubar.
-		NSMutableAttributedString *s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",temp]];
+    NSMutableAttributedString *s_status = nil;
-		[s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:12] range:NSMakeRange(0,[s_status length])];
+    NSMutableParagraphStyle *paragraphStyle = nil;
-		[s_status addAttribute:NSForegroundColorAttributeName value:(NSColor*)[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"MenuColor"]]  range:NSMakeRange(0,[s_status length])];
+    
-		[statusItem setAttributedTitle:s_status];
+    NSColor *menuColor = (NSColor*)[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"MenuColor"]];
-		[statusItem setImage:nil];
+    BOOL setColor = NO;
-		[statusItem setAlternateImage:nil];
+    if (!([[menuColor colorUsingColorSpaceName:
-		[s_status release];
+              NSCalibratedWhiteColorSpace] whiteComponent] == 0.0) || ![statusItem respondsToSelector:@selector(button)]) setColor = YES;
-
+    
-	}
+    switch (menuBarSetting) {
-	if ([[defaults objectForKey:@"MenuBar"] intValue]==4) { 
+        default:
-		[statusItem setLength:65];
+        case 1: {
-		NSMutableAttributedString *s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",fan]];
+            int fsize = 0;
-		[s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:12] range:NSMakeRange(0,[s_status length])];
+            NSString *add = nil;
-		[s_status addAttribute:NSForegroundColorAttributeName value:(NSColor*)[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"MenuColor"]]  range:NSMakeRange(0,[s_status length])];
+            if (menuBarSetting==0) {
-		[statusItem setAttributedTitle:s_status];
+                add=@"\n";
-		[statusItem setImage:nil];
+                fsize=9;
-		[statusItem setAlternateImage:nil];
+                [statusItem setLength:53];
-		[s_status release];
+            } else {
-		
+                add=@" ";
-	}
+                fsize=11;
+                [statusItem setLength:96];
+            }
+            
+            s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@%@",temp,add,fan]];
+            paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+            [paragraphStyle setAlignment:NSLeftTextAlignment];
+            [s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:fsize] range:NSMakeRange(0,[s_status length])];
+            [s_status addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,[s_status length])];
+         
+            if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
+            
+            if ([statusItem respondsToSelector:@selector(button)]) {
+                [statusItem.button setAttributedTitle:s_status];
+                [statusItem.button setImage:nil];
+                [statusItem.button setAlternateImage:nil];
+            } else {
+                [statusItem setAttributedTitle:s_status];
+                [statusItem setImage:nil];
+                [statusItem setAlternateImage:nil];
+            }
+            break;
+        }
+            
+        case 2:
+            // TODO: Big waste of energy to update this tooltip every X seconds when the user
+            // is unlikely to hover the smcFanControl icon over and over again.
+            [statusItem setLength:26];
+            if ([statusItem respondsToSelector:@selector(button)]) {
+                [statusItem.button setTitle:nil];
+                [statusItem.button setToolTip:[NSString stringWithFormat:@"%@\n%@",temp,fan]];
+                [statusItem.button setImage:menu_image];
+                [statusItem.button setAlternateImage:menu_image_alt];
+            } else {
+                [statusItem setTitle:nil];
+                [statusItem setToolTip:[NSString stringWithFormat:@"%@\n%@",temp,fan]];
+                [statusItem setImage:menu_image];
+                [statusItem setAlternateImage:menu_image_alt];
+            }
+            break;
+            
+        case 3:
+            [statusItem setLength:46];
+            s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",temp]];
+            [s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:12] range:NSMakeRange(0,[s_status length])];
+            if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
+            if ([statusItem respondsToSelector:@selector(button)]) {
+                [statusItem.button setAttributedTitle:s_status];
+                [statusItem.button setImage:nil];
+                [statusItem.button setAlternateImage:nil];
+            } else {
+                [statusItem setAttributedTitle:s_status];
+                [statusItem setImage:nil];
+                [statusItem setAlternateImage:nil];
+            }
+            break;
+            
+        case 4:
+            [statusItem setLength:65];
+            s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",fan]];
+            [s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:12] range:NSMakeRange(0,[s_status length])];
+            if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
+            if ([statusItem respondsToSelector:@selector(button)]) {
+                [statusItem.button setAttributedTitle:s_status];
+                [statusItem.button setImage:nil];
+                [statusItem.button setAlternateImage:nil];
+            } else {
+                [statusItem setAttributedTitle:s_status];
+                [statusItem setImage:nil];
+                [statusItem setAlternateImage:nil];
+            }
+            break;
+    }
+    
 }
 
 
@@ -432,17 +526,17 @@ NSString *authpw;
 	int i;
 	[FanControl setRights];
 	[FavoritesController setSelectionIndex:cIndex];
-	for (i=0;i<[[[[FavoritesController arrangedObjects] objectAtIndex:cIndex] objectForKey:@"FanData"] count];i++) {
+	for (i=0;i<[[FavoritesController arrangedObjects][cIndex][@"FanData"] count];i++) {
-		[smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMn",i] value:[[[[FanController arrangedObjects] objectAtIndex:i] objectForKey:@"selspeed"] tohex]];
+		[smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMn",i] value:[[FanController arrangedObjects][i][@"selspeed"] tohex]];
 	}
-	NSMenu *submenu = [[[NSMenu alloc] init] autorelease];
+	NSMenu *submenu = [[NSMenu alloc] init];
 	
 	for(i=0;i<[[FavoritesController arrangedObjects] count];i++){
-		NSMenuItem *submenuItem = [[[NSMenuItem alloc] initWithTitle:[[[FavoritesController arrangedObjects] objectAtIndex:i] objectForKey:@"Title"] action:@selector(apply_quickselect:) keyEquivalent:@""] autorelease];
+		NSMenuItem *submenuItem = [[NSMenuItem alloc] initWithTitle:[FavoritesController arrangedObjects][i][@"Title"] action:@selector(apply_quickselect:) keyEquivalent:@""];
 		[submenuItem setTag:i*100]; //for later manipulation
 		[submenuItem setEnabled:YES];
 		[submenuItem setTarget:self];
-		[submenuItem setRepresentedObject:[[FavoritesController arrangedObjects] objectAtIndex:i]];
+		[submenuItem setRepresentedObject:[FavoritesController arrangedObjects][i]];
 		[submenu addItem:submenuItem];
 	}
 	
@@ -451,9 +545,9 @@ NSString *authpw;
 		[[[[theMenu itemWithTag:1] submenu] itemAtIndex:i] setState:NSOffState];
 	}
 	[[[[theMenu itemWithTag:1] submenu] itemAtIndex:cIndex] setState:NSOnState];
-	[defaults setObject:[NSNumber numberWithInt:cIndex] forKey:@"SelDefault"];
+	[defaults setObject:@(cIndex) forKey:@"SelDefault"];
 	//change active setting display
-	[[theMenu itemWithTag:1] setTitle:[NSString stringWithFormat:@"%@: %@",NSLocalizedString(@"Active Setting",nil),[ [ [FavoritesController arrangedObjects] objectAtIndex:[FavoritesController selectionIndex]] objectForKey:@"Title"] ]];
+	[[theMenu itemWithTag:1] setTitle:[NSString stringWithFormat:@"%@: %@",NSLocalizedString(@"Active Setting",nil),[FavoritesController arrangedObjects][[FavoritesController selectionIndex]][@"Title"] ]];
 }
 
 
@@ -474,17 +568,10 @@ NSString *authpw;
 -(void)terminate:(id)sender{
 	//get last active selection
 	[defaults synchronize];
-	SMCClose(conn);
+	[smcWrapper cleanUp];
 	[_readTimer invalidate];
 	[pw deregisterForSleepWakeNotification];
 	[pw deregisterForPowerChange];
-	[pw release];
-	[menu_image release];
-	[menu_image_alt release];
-	//[mdefaults release];
-	//[statusItem release];
-	//[s_menus release];
-	//[theMenu release];
 	[[NSApplication sharedApplication] terminate:self];
 }
 
@@ -513,10 +600,29 @@ NSString *authpw;
 	int i;
 	for (i=0;i<[[FanController arrangedObjects] count];i++) {
 		if (i!=[sender selectedRow]) {
-			[[[FanController arrangedObjects] objectAtIndex:i] setValue:[NSNumber numberWithBool:NO] forKey:@"menu"];
+			[[FanController arrangedObjects][i] setValue:@NO forKey:@"menu"];
 		}	
 	}
-}	
+}
+
+// Called when user clicks on smcFanControl status bar item
+// in the status area of the menubar. The fan speed
+// menu items are now only updated here in order to
+// reduce the energy impact of -readFanData.
+- (void)menuNeedsUpdate:(NSMenu*)menu {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (theMenu == menu) {
+            if (_machineDefaultsDict == nil)
+                return;
+            
+            int i;
+            for(i=0; i<g_numFans; ++i){
+                NSString *fandesc=_machineDefaultsDict[@"Fans"][i][@"Description"];
+                [[theMenu itemWithTag:(i+1)*10] setTitle:[NSString stringWithFormat:@"%@: %@ rpm",fandesc,[@([smcWrapper get_fan_rpm:i]) stringValue]]];
+            }
+        }
+    });
+}
 
 
 
@@ -524,10 +630,51 @@ NSString *authpw;
 
 //just a helper to bringt update-info-window to the front
 - (IBAction)updateCheck:(id)sender{
-	[[[SUUpdater alloc] init] checkForUpdates:sender];
+    SUUpdater *updater = [[SUUpdater alloc] init];
+	[updater checkForUpdates:sender];
 	[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
 }
 
+
+-(void)performReset
+{
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+
+    NSError *error;
+    NSString *machinesPath = [[fileManager applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"];
+    [fileManager removeItemAtPath:machinesPath error:&error];
+    if (error) {
+        NSLog(@"Error deleting %@",machinesPath);
+    }
+    error = nil;
+    
+    NSString *domainName = [[NSBundle mainBundle] bundleIdentifier];
+    [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:domainName];
+    
+    
+    NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Shutdown required",nil)
+                                     defaultButton:NSLocalizedString(@"OK",nil) alternateButton:nil otherButton:nil
+                         informativeTextWithFormat:NSLocalizedString(@"Please shutdown your computer now to return to default fan settings.",nil)];
+    NSModalResponse code=[alert runModal];
+    if (code == NSAlertDefaultReturn) {
+        [[NSApplication sharedApplication] terminate:self];
+    }
+}
+
+- (IBAction)resetSettings:(id)sender
+{
+    NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Reset Settings",nil)
+                                     defaultButton:NSLocalizedString(@"Yes",nil) alternateButton:NSLocalizedString(@"No",nil) otherButton:nil
+                         informativeTextWithFormat:NSLocalizedString(@"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed.",nil)];
+    NSModalResponse code=[alert runModal];
+    if (code == NSAlertDefaultReturn) {
+        [self performReset];
+    } else if (code == NSAlertAlternateReturn) {
+
+    }
+
+}
+
 - (IBAction)visitHomepage:(id)sender{
 	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.eidac.de/products"]];
 }
@@ -541,11 +688,11 @@ NSString *authpw;
 	//in case plist is corrupt, don't bind
 	if ([[FanController arrangedObjects] count]>1 ) {
 		if (bind==YES) {
-			[[[FanController arrangedObjects] objectAtIndex:1] bind:@"selspeed" toObject:[[FanController arrangedObjects] objectAtIndex:0] withKeyPath:@"selspeed" options:nil];
+			[[FanController arrangedObjects][1] bind:@"selspeed" toObject:[FanController arrangedObjects][0] withKeyPath:@"selspeed" options:nil];
-			[[[FanController arrangedObjects] objectAtIndex:0] bind:@"selspeed" toObject:[[FanController arrangedObjects] objectAtIndex:1] withKeyPath:@"selspeed" options:nil];
+			[[FanController arrangedObjects][0] bind:@"selspeed" toObject:[FanController arrangedObjects][1] withKeyPath:@"selspeed" options:nil];
 		} else {
-			[[[FanController arrangedObjects] objectAtIndex:1] unbind:@"selspeed"];
+			[[FanController arrangedObjects][1] unbind:@"selspeed"];
-			[[[FanController arrangedObjects] objectAtIndex:0] unbind:@"selspeed"];
+			[[FanController arrangedObjects][0] unbind:@"selspeed"];
 		}
 	}	
 }
@@ -588,14 +735,14 @@ NSString *authpw;
 	BOOL found = NO;
 	LSSharedFileListRef loginItems = LSSharedFileListCreate(kCFAllocatorDefault, kLSSharedFileListSessionLoginItems, /*options*/ NULL);
 	NSString *path = [[NSBundle mainBundle] bundlePath];
-	CFURLRef URLToToggle = (CFURLRef)[NSURL fileURLWithPath:path];
+	CFURLRef URLToToggle = (__bridge CFURLRef)[NSURL fileURLWithPath:path];
-	LSSharedFileListItemRef existingItem = NULL;
+	//LSSharedFileListItemRef existingItem = NULL;
 	
 	UInt32 seed = 0U;
-	NSArray *currentLoginItems = [NSMakeCollectable(LSSharedFileListCopySnapshot(loginItems, &seed)) autorelease];
+    NSArray *currentLoginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItems, &seed));
 	
 	for (id itemObject in currentLoginItems) {
-		LSSharedFileListItemRef item = (LSSharedFileListItemRef)itemObject;
+		LSSharedFileListItemRef item = (__bridge LSSharedFileListItemRef)itemObject;
 		
 		UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes;
 		CFURLRef URL = NULL;
@@ -605,7 +752,7 @@ NSString *authpw;
 			CFRelease(URL);
 			
 			if (foundIt) {
-				existingItem = item;
+				//existingItem = item;
 				found = YES;
 				break;
 			}
@@ -622,14 +769,14 @@ NSString *authpw;
 	NSString *path = [[NSBundle mainBundle] bundlePath];
 	
 	OSStatus status;
-	CFURLRef URLToToggle = (CFURLRef)[NSURL fileURLWithPath:path];
+	CFURLRef URLToToggle = (__bridge CFURLRef)[NSURL fileURLWithPath:path];
 	LSSharedFileListItemRef existingItem = NULL;
 	
 	UInt32 seed = 0U;
-	NSArray *currentLoginItems = [NSMakeCollectable(LSSharedFileListCopySnapshot(loginItems, &seed)) autorelease];
+    NSArray *currentLoginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItems, &seed));
 	
 	for (id itemObject in currentLoginItems) {
-		LSSharedFileListItemRef item = (LSSharedFileListItemRef)itemObject;
+		LSSharedFileListItemRef item = (__bridge LSSharedFileListItemRef)itemObject;
 		
 		UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes;
 		CFURLRef URL = NULL;
@@ -661,45 +808,68 @@ NSString *authpw;
 				icon = NULL;
 		}
 		
-		LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst, (CFStringRef)displayName, icon, URLToToggle, /*propertiesToSet*/ NULL, /*propertiesToClear*/ NULL);
+		LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst, (__bridge CFStringRef)displayName, icon, URLToToggle, /*propertiesToSet*/ NULL, /*propertiesToClear*/ NULL);
 	} else if (!enabled && (existingItem != NULL))
 		LSSharedFileListItemRemove(loginItems, existingItem);
 }
 
 
++(void) checkRightStatus:(OSStatus) status
+{
+    if (status != errAuthorizationSuccess) {
+        NSAlert *alert = [NSAlert alertWithMessageText:@"Authorization failed" defaultButton:@"Quit" alternateButton:nil otherButton:nil informativeTextWithFormat:[NSString stringWithFormat:@"Authorization failed with code %d",status]];
+        [alert setAlertStyle:2];
+        NSInteger result = [alert runModal];
+        
+        if (result == NSAlertDefaultReturn) {
+            [[NSApplication sharedApplication] terminate:self];
+        }
+    }
+}
 
 #pragma mark **SMC-Binary Owner/Right Check**
+//TODO: It looks like this function is called inefficiently.
 //call smc binary with sudo rights and apply
 +(void)setRights{
 	NSString *smcpath = [[NSBundle mainBundle]   pathForResource:@"smc" ofType:@""];
 	NSFileManager *fmanage=[NSFileManager defaultManager];
     NSDictionary *fdic = [fmanage attributesOfItemAtPath:smcpath error:nil];
 	if ([[fdic valueForKey:@"NSFileOwnerAccountName"] isEqualToString:@"root"] && [[fdic valueForKey:@"NSFileGroupOwnerAccountName"] isEqualToString:@"admin"] && ([[fdic valueForKey:@"NSFilePosixPermissions"] intValue]==3437)) {
-		return;
+		// If the SMC binary has already been modified to run as root, then do nothing.
-	 } 
+        return;
+	 }
+    //TODO: Is the usage of commPipe safe?
 	FILE *commPipe;
 	AuthorizationRef authorizationRef;
 	AuthorizationItem gencitem = { "system.privilege.admin", 0, NULL, 0 };
 	AuthorizationRights gencright = { 1, &gencitem };
 	int flags = kAuthorizationFlagExtendRights | kAuthorizationFlagInteractionAllowed;
-	status = AuthorizationCreate(&gencright,  kAuthorizationEmptyEnvironment, flags, &authorizationRef);
+	OSStatus status = AuthorizationCreate(&gencright,  kAuthorizationEmptyEnvironment, flags, &authorizationRef);
-	NSString *tool=@"/usr/sbin/chown";
+    
-    NSArray *argsArray = [NSArray arrayWithObjects: @"root:admin",smcpath,nil];
+    [self checkRightStatus:status];
+    
+    NSString *tool=@"/usr/sbin/chown";
+    NSArray *argsArray = @[@"root:admin",smcpath];
 	int i;
 	char *args[255];
 	for(i = 0;i < [argsArray count];i++){
-		args[i] = (char *)[[argsArray objectAtIndex:i]cString];
+		args[i] = (char *)[argsArray[i]cString];
 	}
 	args[i] = NULL;
 	status=AuthorizationExecuteWithPrivileges(authorizationRef,[tool UTF8String],0,args,&commPipe);
-	//second call for suid-bit
+    
+    [self checkRightStatus:status];
+    
+    	//second call for suid-bit
 	tool=@"/bin/chmod";
-	argsArray = [NSArray arrayWithObjects: @"6555",smcpath,nil];
+	argsArray = @[@"6555",smcpath];
 	for(i = 0;i < [argsArray count];i++){
-		args[i] = (char *)[[argsArray objectAtIndex:i]cString];
+		args[i] = (char *)[argsArray[i]cString];
 	}
 	args[i] = NULL;
 	status=AuthorizationExecuteWithPrivileges(authorizationRef,[tool UTF8String],0,args,&commPipe);
+
+    [self checkRightStatus:status];
 }
 
 
@@ -718,7 +888,7 @@ NSString *authpw;
 - (NSNumber*) celsius_fahrenheit{
 	float celsius=[self floatValue];
 	float fahrenheit=(celsius*9)/5+32;
-	return [NSNumber numberWithFloat:fahrenheit];
+	return @(fahrenheit);
 }
 
 @end

Classes/MachineDefaults.h

@@ -30,8 +30,9 @@
 	int machine_num;
 }
 
-	+ (NSString *)computerModel;
++ (NSString *)computerModel;
-	- (id)init:(NSString*)p_machine;
+- (instancetype)init:(NSString*)p_machine ;
-	-(NSDictionary*)get_machine_defaults;
+
-	- (void)dealloc;
+@property (NS_NONATOMIC_IOSONLY, getter=get_machine_defaults, readonly, copy) NSDictionary *_machine_defaults;
+
 @end

Classes/MachineDefaults.m

@@ -23,57 +23,60 @@
 #import "MachineDefaults.h"
 #import "NSFileManager+DirectoryLocations.h"
 
+@interface MachineDefaults ()
+{
+    
+}
+@end
+
 @implementation MachineDefaults
 
 
-- (id)init:(NSString*)p_machine{
+- (instancetype)init:(NSString*)p_machine{
-	machine=[MachineDefaults computerModel];
+    if (self = [super init]){
-	supported_machines=[[NSArray alloc] initWithContentsOfFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"]];
+        machine=[MachineDefaults computerModel];
+        [self refreshPlist];
+    }
 	return self;
 }
 
-
+-(void)refreshPlist
--(Boolean)is_supported{
+{
-	int i;
+    supported_machines=[[NSArray alloc] initWithContentsOfFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"]];
-	supported=NO;
+    supported=NO;
-	for(i=0;i<[supported_machines count];i++) {
+    int i;
-		if ([machine isEqualToString:[[supported_machines objectAtIndex:i] objectForKey:@"Machine"]]) {
+    for(i=0;i<[supported_machines count];i++) {
-			supported=YES;
+        if ([machine isEqualToString:supported_machines[i][@"Machine"]]) {
-			machine_num=i;
+            supported=YES;
-		}
+            machine_num=i;
-	}
+        }
-	return supported;
+    }
 }
 
 
-
+-(NSDictionary*) readFromPlist{
--(NSDictionary*) readfrom_plist{
 	if (!supported) {return nil;}
-	return [supported_machines objectAtIndex:machine_num];
+	return supported_machines[machine_num];
 }
 
 
 
--(NSDictionary*) readfrom_smc{
+-(void) readFromSMC{
-	if (supported) {return nil;}
+	NSUInteger num_fans=[smcWrapper get_fan_num];
-	int num_fans,i;
-	[smcWrapper init];	
-	num_fans=[smcWrapper get_fan_num];
 	NSString  *desc;
 	NSNumber *min,*max;
 	NSData *xmldata;
 	NSString *error;
 	NSMutableArray *fans=[[NSMutableArray alloc] init];
-	for (i = 0; i < num_fans; i++) {
+	for (NSUInteger i = 0; i < num_fans; i++) {
-		min=[NSNumber numberWithInt:[smcWrapper get_min_speed:i]];
+		min=@([smcWrapper get_min_speed:i]);
-		max=[NSNumber numberWithInt:[smcWrapper get_max_speed:i]];
+		max=@([smcWrapper get_max_speed:i]);
 		desc=[smcWrapper get_fan_descr:i];
-		[fans addObject:[NSDictionary dictionaryWithObjectsAndKeys:desc,@"Description",min,@"Minspeed",max,@"Maxspeed",min,@"selspeed",nil]];
+        [fans addObject:[[NSMutableDictionary alloc] initWithDictionary:@{@"Description": desc,@"Minspeed": min,@"Maxspeed": max,@"selspeed": min}]];
 	}
 	//save to plist for future
 	NSMutableArray *supported_m=[[NSMutableArray alloc] initWithContentsOfFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"]];
-	NSDictionary *new_machine= [NSDictionary dictionaryWithObjectsAndKeys:fans,@"Fans",[NSNumber numberWithInt:num_fans],@"NumFans",machine,@"Machine",@"Autogenerated",@"Comment",nil];
+    NSMutableDictionary *new_machine= [[NSMutableDictionary alloc] initWithDictionary:@{@"Fans": fans,@"NumFans": @(num_fans),@"Machine": machine,@"Comment": @"Autogenerated",@"Minspeed": min,@"Maxspeed": max}];
-	[fans release];
 	[supported_m addObject:new_machine];
 	
 	//save to plist
@@ -81,37 +84,36 @@
                                        format:NSPropertyListXMLFormat_v1_0
                                        errorDescription:&error];
 	[xmldata writeToFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"] atomically:YES];
-	[supported_m release];
-	//return new machine-live-data
-	return [new_machine retain];
 }
 
 
 
 
 -(NSDictionary*)get_machine_defaults{
-	NSDictionary *m_defaults=nil;
+    
-	if ([self is_supported]) {
+    if (!supported) {
-		m_defaults=[self readfrom_plist];
+        NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Alert!",nil)
-		int i;
-		//localize fan-descriptions
-		for (i=0;i<[[m_defaults objectForKey:@"Fans"] count];i++) {
-			NSString *newvalue=NSLocalizedString([[[m_defaults objectForKey:@"Fans"] objectAtIndex:i] objectForKey:@"Description"],nil);
-			[[[m_defaults objectForKey:@"Fans"] objectAtIndex:i] setValue:newvalue forKey:@"Description"];
-		}
-	} else {
-		NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Alert!",nil) 
 						  defaultButton:NSLocalizedString(@"Continue",nil) alternateButton:NSLocalizedString(@"Quit",nil) otherButton:nil
 						informativeTextWithFormat:NSLocalizedString(@"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!",nil)];
-		int code=[alert runModal];
+		NSModalResponse code=[alert runModal];
-		if (code==NSAlertDefaultReturn) {
+		if (code == NSAlertDefaultReturn) {
-			m_defaults=[self readfrom_smc];
+			[self readFromSMC];
+            [self refreshPlist];
 		} else {
 			[[NSApplication sharedApplication] terminate:nil];
 		}
 		
 	}
-	return m_defaults;
+    
+    NSDictionary *defaultsDict=[self readFromPlist];
+    NSUInteger i;
+    //localize fan-descriptions
+    for (i=0;i<[defaultsDict[@"Fans"] count];i++) {
+        NSString *newvalue=NSLocalizedString(defaultsDict[@"Fans"][i][@"Description"],nil);
+        [defaultsDict[@"Fans"][i] setValue:newvalue forKey:@"Description"];
+    }
+    
+	return defaultsDict;
 }
 
 + (NSString *)computerModel
@@ -122,18 +124,13 @@
         if ((pexpdev = IOServiceGetMatchingService (kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"))))
         {
             NSData *data;
-            if ((data = (id)IORegistryEntryCreateCFProperty(pexpdev, CFSTR("model"), kCFAllocatorDefault, 0))) {
+            if ((data = (id)CFBridgingRelease(IORegistryEntryCreateCFProperty(pexpdev, CFSTR("model"), kCFAllocatorDefault, 0)))) {
                 computerModel = [[NSString allocWithZone:NULL]  initWithCString:[data bytes] encoding:NSASCIIStringEncoding];
-                [data release];
             }
         }
     }
     return computerModel;
 }
 
-- (void)dealloc{
-	[super dealloc];
-	//[supported_machines release];
-}
 
 @end

Classes/NSFileManager+DirectoryLocations.h

@@ -31,6 +31,6 @@
 	inDomain:(NSSearchPathDomainMask)domainMask
 	appendPathComponent:(NSString *)appendComponent
 	error:(NSError **)errorOut;
-- (NSString *)applicationSupportDirectory;
+@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSString *applicationSupportDirectory;
 
 @end

Classes/NSFileManager+DirectoryLocations.m

@@ -31,120 +31,93 @@ NSString * const DirectoryLocationDomain = @"DirectoryLocationDomain";
 
 @implementation NSFileManager (DirectoryLocations)
 
-//
+
-// findOrCreateDirectory:inDomain:appendPathComponent:error:
+/*!  Method to tie together the steps of:
-//
+	1) Locate a standard directory by search path and domain mask
-// Method to tie together the steps of:
+    2) Select the first path in the results
-//	1) Locate a standard directory by search path and domain mask
+ 	3) Append a subdirectory to that path
-//  2) Select the first path in the results
+	4) Create the directory and intermediate directories if needed
-//	3) Append a subdirectory to that path
+	5) Handle errors by emitting a proper NSError object
-//	4) Create the directory and intermediate directories if needed
+
-//	5) Handle errors by emitting a proper NSError object
+* \pararm searchPathDirectory - the search path passed to NSSearchPathForDirectoriesInDomains
-//
+* \pararm domainMask - the domain mask passed to NSSearchPathForDirectoriesInDomains
-// Parameters:
+* \pararm appendComponent - the subdirectory appended
-//    searchPathDirectory - the search path passed to NSSearchPathForDirectoriesInDomains
+* \pararm errorOut - any error from file operations
-//    domainMask - the domain mask passed to NSSearchPathForDirectoriesInDomains
+
-//    appendComponent - the subdirectory appended
+* \returns returns the path to the directory (if path found and exists), nil otherwise
-//    errorOut - any error from file operations
+*/
-//
-// returns the path to the directory (if path found and exists), nil otherwise
-//
 - (NSString *)findOrCreateDirectory:(NSSearchPathDirectory)searchPathDirectory
 	inDomain:(NSSearchPathDomainMask)domainMask
 	appendPathComponent:(NSString *)appendComponent
 	error:(NSError **)errorOut
 {
+    // Declare an NSError first, so we don't need to check errorOut again and again
+    NSError *error;
+    
+    if (errorOut) {
+        error = *errorOut;
+    }
+    else {
+        error = nil;
+    }
+
 	//
 	// Search for the path
 	//
-	NSArray* paths = NSSearchPathForDirectoriesInDomains(
+	NSArray* paths = NSSearchPathForDirectoriesInDomains(searchPathDirectory,domainMask,YES);
-		searchPathDirectory,
+    
-		domainMask,
-		YES);
 	if ([paths count] == 0)
 	{
-		if (errorOut)
+        NSDictionary *userInfo = @{NSLocalizedDescriptionKey: NSLocalizedStringFromTable(@"No path found for directory in domain.",@"Errors",nil),
-		{
+                                    @"NSSearchPathDirectory":@(searchPathDirectory),
-			NSDictionary *userInfo =
+                                    @"NSSearchPathDomainMask":@(domainMask)};
-				[NSDictionary dictionaryWithObjectsAndKeys:
+				
-					NSLocalizedStringFromTable(
+        error = [NSError errorWithDomain:DirectoryLocationDomain
-						@"No path found for directory in domain.",
+                                        code:DirectoryLocationErrorNoPathFound
-						@"Errors",
+                                    userInfo:userInfo];
-					nil),
-					NSLocalizedDescriptionKey,
-					[NSNumber numberWithInteger:searchPathDirectory],
-					@"NSSearchPathDirectory",
-					[NSNumber numberWithInteger:domainMask],
-					@"NSSearchPathDomainMask",
-				nil];
-			*errorOut =
-				[NSError 
-					errorWithDomain:DirectoryLocationDomain
-					code:DirectoryLocationErrorNoPathFound
-					userInfo:userInfo];
-		}
 		return nil;
 	}
 	
 	//
 	// Normally only need the first path returned
 	//
-	NSString *resolvedPath = [paths objectAtIndex:0];
+	NSString *resolvedPath = paths[0];
 
 	//
 	// Append the extra path component
 	//
 	if (appendComponent)
 	{
-		resolvedPath = [resolvedPath
+		resolvedPath = [resolvedPath stringByAppendingPathComponent:appendComponent];
-			stringByAppendingPathComponent:appendComponent];
 	}
 	
 	//
 	// Create the path if it doesn't exist
 	//
-	NSError *error = nil;
+    
-	BOOL success = [self
+    
-		createDirectoryAtPath:resolvedPath
+	if ([self createDirectoryAtPath:resolvedPath withIntermediateDirectories:YES
-		withIntermediateDirectories:YES
+                          attributes:nil error:&error])
-		attributes:nil
+        return resolvedPath;
-		error:&error];
+    else
-	if (!success) 
+        return nil;
-	{
-		if (errorOut)
-		{
-			*errorOut = error;
-		}
-		return nil;
-	}
-	
-	//
-	// If we've made it this far, we have a success
-	//
-	if (errorOut)
-	{
-		*errorOut = nil;
-	}
-	return resolvedPath;
 }
 
-//
+
-// applicationSupportDirectory
+/*! applicationSupportDirectory
-//
+
-// Returns the path to the applicationSupportDirectory (creating it if it doesn't
+* \returns The path to the applicationSupportDirectory (creating it if it doesn't exist).
-// exist).
+*/
-//
 - (NSString *)applicationSupportDirectory
 {
-	NSString *executableName =
+	NSString *executableName = [[NSBundle mainBundle] infoDictionary][@"CFBundleExecutable"];
-		[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleExecutable"];
+    
-	NSError *error;
+	NSError *error = nil;
-	NSString *result =
+    
-		[self
+	NSString *result = [self findOrCreateDirectory:NSApplicationSupportDirectory
-			findOrCreateDirectory:NSApplicationSupportDirectory
+                                          inDomain:NSUserDomainMask
-			inDomain:NSUserDomainMask
+                               appendPathComponent:executableName
-			appendPathComponent:executableName
+                                             error:&error];
-			error:&error];
 	if (!result)
 	{
 		NSLog(@"Unable to find or create application support directory:\n%@", error);

Classes/Power.h

@@ -37,10 +37,9 @@
 	
 }
 
-- (id)init;
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
 
-- (id)delegate;
+@property (NS_NONATOMIC_IOSONLY, unsafe_unretained) id delegate;
-- (void)setDelegate:(id)new_delegate;
 
 - (void)registerForSleepWakeNotification;
 - (void)deregisterForSleepWakeNotification;

Classes/Power.m

@@ -31,7 +31,7 @@ static int lastsource=0;
 
 
 void SleepWatcher( void * refCon, io_service_t service, natural_t messageType, void * messageArgument ){
-		[(Power *)refCon powerMessageReceived: messageType withArgument: messageArgument];
+		[(__bridge Power *)refCon powerMessageReceived: messageType withArgument: messageArgument];
 }
 
 
@@ -48,29 +48,31 @@ static void powerSourceChanged(void * refCon)
 		powerSource = CFArrayGetValueAtIndex(powerSourcesList, i);
 		description = IOPSGetPowerSourceDescription(powerBlob, powerSource);
 		//work with NSArray from here
-		NSDictionary *n_description = (NSDictionary *)description;
+		NSDictionary *n_description = (__bridge NSDictionary *)description;
-		[(Power *)refCon powerSourceMesssageReceived:n_description];	
+		[(__bridge Power *)refCon powerSourceMesssageReceived:n_description];
 	}	
 	CFRelease(powerBlob);
 	CFRelease(powerSourcesList);
 }
 
-- (id)init{
+- (instancetype)init{
-	[super init];
+    if (self = [super init]) {
+        
+    }
 	return self;
 }
 
 
 - (void)registerForSleepWakeNotification
 {
-	root_port = IORegisterForSystemPower(self, &notificationPort, SleepWatcher, &notifier);
+	root_port = IORegisterForSystemPower((__bridge void *)(self), &notificationPort, SleepWatcher, &notifier);
 	CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notificationPort), kCFRunLoopDefaultMode);
 }
 
 
 - (void)registerForPowerChange
 {
-	powerNotifierRunLoopSource = IOPSNotificationCreateRunLoopSource(powerSourceChanged,self);
+	powerNotifierRunLoopSource = IOPSNotificationCreateRunLoopSource(powerSourceChanged,(__bridge void *)(self));
 	if (powerNotifierRunLoopSource) {
 		CFRunLoopAddSource(CFRunLoopGetCurrent(), powerNotifierRunLoopSource, kCFRunLoopDefaultMode);
 	}
@@ -116,7 +118,7 @@ static void powerSourceChanged(void * refCon)
 }
 
 - (void)powerSourceMesssageReceived:(NSDictionary *)n_description{
-		if (([[n_description objectForKey:@"Power Source State"] isEqualToString:@"AC Power"] && [[n_description objectForKey:@"Is Charging"] intValue]==1) && lastsource!=1) {
+		if (([n_description[@"Power Source State"] isEqualToString:@"AC Power"] && [n_description[@"Is Charging"] intValue]==1) && lastsource!=1) {
 				lastsource=1;
 			if ([_delegate respondsToSelector:@selector(powerChangeToACLoading:)])
 				[_delegate powerChangeToACLoading:self];
@@ -127,7 +129,7 @@ static void powerSourceChanged(void * refCon)
 		}
 		
 		
-		if (([[n_description objectForKey:@"Power Source State"] isEqualToString:@"AC Power"] && [[n_description objectForKey:@"Is Charging"] intValue]==0) && lastsource!=2) {
+		if (([n_description[@"Power Source State"] isEqualToString:@"AC Power"] && [n_description[@"Is Charging"] intValue]==0) && lastsource!=2) {
 				lastsource=2;
 			if ([_delegate respondsToSelector:@selector(powerChangeToAC:)])
 				[_delegate powerChangeToAC:self];
@@ -137,7 +139,7 @@ static void powerSourceChanged(void * refCon)
 			}
 		}
 	
-		if (([[n_description objectForKey:@"Power Source State"] isEqualToString:@"Battery Power"]) && lastsource!=3) {
+		if (([n_description[@"Power Source State"] isEqualToString:@"Battery Power"]) && lastsource!=3) {
 			lastsource=3;
 			if ([_delegate respondsToSelector:@selector(powerChangeToBattery:)])
 				[_delegate powerChangeToBattery:self];
@@ -169,7 +171,6 @@ static void powerSourceChanged(void * refCon)
     if (_delegate)
         [nc removeObserver:_delegate name:nil object:self];
 	
-    [super dealloc];
 }
 
 

Classes/SystemVersion.m

@@ -68,18 +68,18 @@ static NSString *const kSystemVersionPlistPath = @"/System/Library/CoreServices/
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_3
 		
 #else // GTM_MACOS_SDK
-		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+		@autoreleasepool {
-		NSDictionary *systemVersionPlist
+			NSDictionary *systemVersionPlist
-		= [NSDictionary dictionaryWithContentsOfFile:kSystemVersionPlistPath];
+			= [NSDictionary dictionaryWithContentsOfFile:kSystemVersionPlistPath];
-		NSString *version = [systemVersionPlist objectForKey:@"ProductVersion"];
+			NSString *version = systemVersionPlist[@"ProductVersion"];
-		NSArray *versionInfo = [version componentsSeparatedByString:@"."];
+			NSArray *versionInfo = [version componentsSeparatedByString:@"."];
-		int length = [versionInfo count];
+			int length = [versionInfo count];
-		sGTMSystemVersionMajor = [[versionInfo objectAtIndex:0] intValue];
+			sGTMSystemVersionMajor = [versionInfo[0] intValue];
-		sGTMSystemVersionMinor = [[versionInfo objectAtIndex:1] intValue];
+			sGTMSystemVersionMinor = [versionInfo[1] intValue];
-		if (length == 3) {
+			if (length == 3) {
-			sGTMSystemVersionBugFix = [[versionInfo objectAtIndex:2] intValue];
+				sGTMSystemVersionBugFix = [versionInfo[2] intValue];
+			}
 		}
-		[pool release];
 #endif // GTM_MACOS_SDK
 	}
 }
@@ -104,7 +104,7 @@ static NSString *const kSystemVersionPlistPath = @"/System/Library/CoreServices/
 		if (!sBuild) {
 			NSDictionary *systemVersionPlist
 			= [NSDictionary dictionaryWithContentsOfFile:kSystemVersionPlistPath];
-			sBuild = [[systemVersionPlist objectForKey:@"ProductBuildVersion"] retain];
+			sBuild = systemVersionPlist[@"ProductBuildVersion"];
 		}
 	}
 	return sBuild;

Classes/smcWrapper.h

@@ -2,7 +2,8 @@
  *	FanControl
  *
  *	Copyright (c) 2006-2012 Hendrik Holtmann
-*
+ *  Portions Copyright (c) 2013 Michael Wilber
+ *
  *	smcWrapper.m - MacBook(Pro) FanControl application
  *
  *	This program is free software; you can redistribute it and/or modify
@@ -28,6 +29,8 @@
 @interface smcWrapper : NSObject {
 }
 
++(void) cleanUp;
+
 +(int) get_fan_rpm:(int)fan_number;
 +(float) get_maintemp;
 +(float) get_mptemp;

Classes/smcWrapper.m

@@ -2,7 +2,8 @@
  *	FanControl
  *
  *	Copyright (c) 2006-2012 Hendrik Holtmann
-*
+ *  Portions Copyright (c) 2013 Michael Wilber
+ *
  *	smcWrapper.m - MacBook(Pro) FanControl application
  *
  *	This program is free software; you can redistribute it and/or modify
@@ -22,48 +23,54 @@
 
 #import "smcWrapper.h"
 #import <CommonCrypto/CommonDigest.h>
+NSString * const smc_checksum=@"4c9919172e1111c660f12015a7324767";
 
-NSString * const smc_checksum=@"2ea544babe8a58dccc1364c920d473c8";
+NSArray *allSensors;
-static NSDictionary *tsensors = nil;
 
 @implementation smcWrapper
 	io_connect_t conn;
 
 +(void)init{
 	SMCOpen(&conn);
-    tsensors = [[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"tsensors" ofType:@"plist"]];
+}
++(void)cleanUp{
+    SMCClose(conn);
 }
 
-+(float) get_maintemp{
++(float)readTempSensors
-	float c_temp;
+{
-        
+    float retValue;
-	NSRange range_pro=[[MachineDefaults computerModel] rangeOfString:@"MacPro"];
+    SMCVal_t      val;
-	if (range_pro.length > 0) {
+    NSString *sensor = [[NSUserDefaults standardUserDefaults] objectForKey:@"TSensor"];
-		//special readout for MacPro
+    SMCReadKey2((char*)[sensor UTF8String], &val,conn);
-		c_temp=[smcWrapper get_mptemp];
+    retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64;
-	} else {
+    allSensors = [NSArray arrayWithObjects:@"TC0D",@"TC0P",@"TCAD",@"TC0H",@"TC0F",@"TCAH",@"TCBH",nil];
-        SMCVal_t      val;
+    if (retValue<=0 || floor(retValue) == 129 ) { //workaround for some iMac Models
-        NSMutableArray *allTSensors = [[tsensors allKeys] mutableCopy];
+        for (NSString *sensor in allSensors) {
-        NSString *foundKey = [tsensors objectForKey:[MachineDefaults computerModel]];
+            SMCReadKey2((char*)[sensor UTF8String], &val,conn);
-        if (foundKey !=nil) {
+            retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64;
-            foundKey = [MachineDefaults computerModel];
+            if (retValue>0 && floor(retValue) != 129 ) {
-        } else {
+                [[NSUserDefaults standardUserDefaults] setObject:sensor forKey:@"TSensor"];
-            foundKey = @"standard";
+                [[NSUserDefaults standardUserDefaults] synchronize];
-        }
+                break;
-        [allTSensors removeObject:foundKey];
-        SMCReadKey2((char*)[[tsensors objectForKey:foundKey] UTF8String], &val,conn);
-		c_temp= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64;
-        
-        if (c_temp<=0) {
-            for (NSString *key in allTSensors) {
-                SMCReadKey2((char*)[[tsensors objectForKey:key] UTF8String], &val,conn);
-                c_temp= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64;
-                if (c_temp>0) break;
             }
         }
     }
+    return retValue;
+}
 
-	return c_temp;
++(float) get_maintemp{
+    float retValue;
+    NSRange range_pro=[[MachineDefaults computerModel] rangeOfString:@"MacPro"];
+    if (range_pro.length > 0) {
+        retValue = [smcWrapper get_mptemp];
+        if (retValue<=0 || floor(retValue) == 129 ) {
+            retValue = [smcWrapper readTempSensors];
+        }
+    } else {
+        retValue = [smcWrapper readTempSensors];
+    }
+    return retValue;
 }
 
 
@@ -109,7 +116,7 @@ static NSDictionary *tsensors = nil;
     SMCVal_t      val;
     int           totalFans;
 	SMCReadKey2("FNum", &val,conn);
-    totalFans = _strtoul(val.bytes, val.dataSize, 10); 
+    totalFans = _strtoul((char *)val.bytes, val.dataSize, 10);
 	return totalFans;
 }
 
@@ -120,7 +127,7 @@ static NSDictionary *tsensors = nil;
 	//kern_return_t result;
 	NSMutableString *desc;
 //	desc=[[NSMutableString alloc] initWithFormat:@"Fan #%d: ",fan_number+1];
-	desc=[[[NSMutableString alloc]init] autorelease];
+	desc=[[NSMutableString alloc]init];
 	sprintf(key, "F%dID", fan_number);
 	SMCReadKey2(key, &val,conn);
 	int i;
@@ -155,34 +162,64 @@ static NSDictionary *tsensors = nil;
 }	
 
 
++ (BOOL)validateSMC:(NSString*)path
+{
+    SecStaticCodeRef ref = NULL;
+    
+    NSURL * url = [NSURL URLWithString:path];
+    
+    OSStatus status;
+    
+    // obtain the cert info from the executable
+    status = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &ref);
+    
+    if (status != noErr) {
+        return false;
+    }
+    
+    @try {
+        status = SecStaticCodeCheckValidity(ref, kSecCSDefaultFlags, nil);
+        
+        if (status != noErr) {
+            NSLog(@"Codesign verification failed: Error id = %d",status);
+            return false;
+        }
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Codesign exception %@",exception);
+        return false;
+    }
+    
+    return true;
+}
+
 + (NSString*)createCheckSum:(NSString*)path {
     NSData *d=[NSData dataWithContentsOfMappedFile:path];
     unsigned char result[CC_MD5_DIGEST_LENGTH];
     CC_MD5((void *)[d bytes], [d length], result);
     NSMutableString *ret = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH*2];
-    int i;
+    for(int i = 0; i<CC_MD5_DIGEST_LENGTH; i++) {
-    for(i = 0; i<CC_MD5_DIGEST_LENGTH; i++) {
         [ret appendFormat:@"%02x",result[i]];
     }
     return ret;
 }
 
 //call smc binary with setuid rights and apply
+// The smc binary is given root permissions in FanControl.m with the setRights method.
 +(void)setKey_external:(NSString *)key value:(NSString *)value{
 	NSString *launchPath = [[NSBundle mainBundle]   pathForResource:@"smc" ofType:@""];
-	//first check if it's the right binary (security)
+    
-	NSString *checksum=[smcWrapper createCheckSum:launchPath];
+   	NSString *checksum=[smcWrapper createCheckSum:launchPath];
-	if (![checksum  isEqualToString:smc_checksum]) {
+    if (![checksum  isEqualToString:smc_checksum]) {
-		NSLog(@"smcFanControl: Security Error: smc-binary is not the distributed one");
+        NSLog(@"smcFanControl: Security Error: smc-binary is not the distributed one");
-		return;
+        return;
-	}
+    }
-    NSArray *argsArray = [NSArray arrayWithObjects: @"-k",key,@"-w",value,nil];
+    NSArray *argsArray = @[@"-k",key,@"-w",value];
 	NSTask *task;
     task = [[NSTask alloc] init];
 	[task setLaunchPath: launchPath];
 	[task setArguments: argsArray];
 	[task launch];
-	[task release];
 }
 
 @end

Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>smcFanControl</string>
 	<key>CFBundleGetInfoString</key>
-	<string>smcFanControl 2.4, Hendrik Holtmann (GPL)</string>
+	<string>smcFanControl 2.5.2, Hendrik Holtmann (GPL)</string>
 	<key>CFBundleIconFile</key>
 	<string>smcfancontrol_v2</string>
 	<key>CFBundleIdentifier</key>
@@ -19,18 +19,20 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4</string>
+	<string>2.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.4</string>
+	<string>2.5.2</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Hendrik Holtmann(GPL)</string>
+	<string>Hendrik Holtmann (GPL)</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>http://www.eidac.de/smcfancontrol/smcfancontrol.xml</string>
 </dict>
 </plist>

README

@@ -1,5 +0,0 @@
-smcFanControl lets the user set the minimum speed of the build in fans. So you can increase your minimum fan speed to make your Intel Mac run cooler. However in order not to damage your machines smcFanControl doesn't let you set a minimum speed to a value below Apple's defaults.
-
-Requirements: Intel Mac / OS X 10.5 or higher 
-
-License: GPL 2

Readme.md

@@ -0,0 +1,14 @@
+smcFanControl
+=============
+
+smcFanControl lets the user set a minimum speed for built-in fans. It allows you to increase your minimum fan speed to make your Intel Mac run cooler. In order to not damage your machine, smcFanControl does not let you set a minimum speed to a value below Apple's defaults.
+
+![My image](https://dl.dropbox.com/u/363242/screenshots/smc_screenshot.png)
+
+Requirements: Intel Mac / OS X 10.5 or higher 
+
+Compiled version: http://www.eidac.de/smcfancontrol/smcfancontrol_2_4.zip
+
+FAQ / More info: Found in project under "Ressources/*.lproj/F.A.Q.rtf" or included in above .zip
+
+License: GPL 2

Ressources/Dutch.lproj/Localizable.strings

@@ -21,3 +21,22 @@
 "Alert!" = "Let op!";
 
 "Active Setting" = "Actieve Instelling";
+
+
+"Remind me later" = "Remind me later";
+
+"Consider a donation" = "Consider a donation";
+
+"Never ask me again" = "Never ask me again";
+
+"Donate over Paypal" = "Donate over Paypal";
+
+"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated." = "smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated.";
+
+"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed." = "Do you want to reset smcFanControl to default settings?\nFavorites will be deleted and fans will return to default speed.";
+
+"Please shutdown your computer now to return to default fan settings." = "Please shutdown your computer now to return to default fan settings.";
+
+"Reset Settings" = "Reset Settings";
+
+"Shutdown required" = "Shutdown required";

Ressources/German.lproj/Localizable.strings

@@ -21,3 +21,21 @@
 "Alert!" = "Achtung!";
 
 "Active Setting" = "Aktive Einstellung";
+
+"Remind me later" = "Später erinnern";
+
+"Consider a donation" = "Spenden...";
+
+"Never ask me again" = "Nie wieder fragen";
+
+"Donate over Paypal" = "Spenden über PayPal";
+
+"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated." = "smcFanControl hält seit 2006 Macs in aller Welt kühl.\n\nWenn Sie smcFanControl gerne benutzen und Sie die Weiterentwicklung unterstützen wollen, freuen wir uns über eine kleine Spende über PayPal.";
+
+"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed." = "Wollen Sie smcFanControl auf die Default-Einstellungen zurücksetzen?\nDie Favoriten werden gelöscht und die Lüfter auf Werkseinstellung gesetzt.";
+
+"Please shutdown your computer now to return to default fan settings." = "Bitte schalten Sie den Computer jetzt aus, um die Werkseinstellung für die Lüfter wiederherzustellen.";
+
+"Reset Settings" = "Einstellungen zurücksetzen";
+
+"Shutdown required" = "Ausschalten erforderlich";

Ressources/German.lproj/MainMenu.nib/designable.nib

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
+		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.SystemVersion">14A388a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">6249</string>
-		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.AppKitVersion">1343.14</string>
-		<string key="IBDocument.HIToolboxVersion">624.00</string>
+		<string key="IBDocument.HIToolboxVersion">755.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2549</string>
+			<string key="NS.object.0">6249</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSArrayController</string>
@@ -70,7 +70,7 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="56889179">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSScrollView" id="461777313">
@@ -79,14 +79,15 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<object class="NSClipView" id="316084299">
 									<reference key="NSNextResponder" ref="461777313"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2322</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTableView" id="439850576">
 											<reference key="NSNextResponder" ref="316084299"/>
 											<int key="NSvFlags">4352</int>
 											<string key="NSFrameSize">{295, 81}</string>
 											<reference key="NSSuperview" ref="316084299"/>
-											<reference key="NSNextKeyView" ref="362041177"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="769171705"/>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -95,6 +96,7 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{295, 17}</string>
 												<reference key="NSSuperview" ref="362041177"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="316084299"/>
 												<reference key="NSTableView" ref="439850576"/>
 											</object>
@@ -114,7 +116,7 @@
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Menü</string>
 														<object class="NSFont" key="NSSupport" id="383878287">
-															<string key="NSName">LucidaGrande</string>
+															<bool key="IBIsSystemFont">YES</bool>
 															<double key="NSSize">10</double>
 															<int key="NSfFlags">2843</int>
 														</object>
@@ -137,7 +139,7 @@
 														<int key="NSCellFlags2">134348800</int>
 														<string key="NSContents"/>
 														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
+															<bool key="IBIsSystemFont">YES</bool>
 															<double key="NSSize">11</double>
 															<int key="NSfFlags">3100</int>
 														</object>
@@ -180,11 +182,7 @@
 													<object class="NSTextFieldCell" key="NSDataCell" id="804844221">
 														<int key="NSCellFlags">337641536</int>
 														<int key="NSCellFlags2">2048</int>
-														<object class="NSFont" key="NSSupport" id="757538014">
+														<reference key="NSSupport" ref="26"/>
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">16</int>
-														</object>
 														<reference key="NSControlView" ref="439850576"/>
 														<object class="NSColor" key="NSBackgroundColor" id="150410406">
 															<int key="NSColorSpace">6</int>
@@ -259,7 +257,7 @@
 													<object class="NSTextFieldCell" key="NSDataCell" id="350081106">
 														<int key="NSCellFlags">337641472</int>
 														<int key="NSCellFlags2">67108864</int>
-														<reference key="NSSupport" ref="757538014"/>
+														<reference key="NSSupport" ref="26"/>
 														<object class="NSNumberFormatter" key="NSFormatter" id="1062102580">
 															<dictionary class="NSMutableDictionary" key="NS.attributes">
 																<boolean value="YES" key="allowsFloats"/>
@@ -343,30 +341,39 @@
 									</array>
 									<string key="NSFrame">{{1, 17}, {295, 81}}</string>
 									<reference key="NSSuperview" ref="461777313"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="439850576"/>
 									<reference key="NSDocView" ref="439850576"/>
 									<reference key="NSBGColor" ref="150410406"/>
 									<int key="NScvFlags">4</int>
+									<bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
 								</object>
 								<object class="NSScroller" id="950083609">
 									<reference key="NSNextResponder" ref="461777313"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{282, 17}, {14, 81}}</string>
+									<string key="NSFrame">{{-100, -100}, {14, 81}}</string>
 									<reference key="NSSuperview" ref="461777313"/>
-									<reference key="NSNextKeyView" ref="769171705"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="295815136"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="461777313"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="461777313"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.4375</double>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.85217391304347823</double>
 								</object>
 								<object class="NSScroller" id="295815136">
 									<reference key="NSNextResponder" ref="461777313"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 84}, {295, 14}}</string>
+									<string key="NSFrame">{{-100, -100}, {295, 14}}</string>
 									<reference key="NSSuperview" ref="461777313"/>
-									<reference key="NSNextKeyView" ref="950083609"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="362041177"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="461777313"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="461777313"/>
 									<string key="NSAction">_doScroller:</string>
@@ -374,22 +381,23 @@
 								</object>
 								<object class="NSClipView" id="362041177">
 									<reference key="NSNextResponder" ref="461777313"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2338</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<reference ref="515038836"/>
 									</array>
 									<string key="NSFrame">{{1, 0}, {295, 17}}</string>
 									<reference key="NSSuperview" ref="461777313"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="515038836"/>
 									<reference key="NSDocView" ref="515038836"/>
-									<reference key="NSBGColor" ref="150410406"/>
+									<bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
-									<int key="NScvFlags">4</int>
 								</object>
 							</array>
 							<string key="NSFrame">{{20, 292}, {297, 99}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
-							<reference key="NSNextKeyView" ref="316084299"/>
+							<reference key="NSWindow"/>
-							<int key="NSsFlags">133170</int>
+							<reference key="NSNextKeyView" ref="950083609"/>
+							<int key="NSsFlags">133650</int>
 							<reference key="NSVScroller" ref="950083609"/>
 							<reference key="NSHScroller" ref="295815136"/>
 							<reference key="NSContentView" ref="316084299"/>
@@ -404,6 +412,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{73, 395}, {177, 22}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="859938138"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="323849087">
@@ -481,6 +490,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{17, 399}, {54, 15}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="660719381"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="44536311">
@@ -498,12 +508,15 @@
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSButton" id="766867091">
 							<reference key="NSNextResponder" ref="56889179"/>
 							<int key="NSvFlags">264</int>
+							<array class="NSMutableArray" key="NSSubviews"/>
 							<string key="NSFrame">{{285, 392}, {37, 28}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="461777313"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="641395264">
@@ -527,8 +540,10 @@
 						<object class="NSButton" id="859938138">
 							<reference key="NSNextResponder" ref="56889179"/>
 							<int key="NSvFlags">264</int>
+							<array class="NSMutableArray" key="NSSubviews"/>
 							<string key="NSFrame">{{250, 392}, {37, 28}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="766867091"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="610011289">
@@ -560,8 +575,10 @@
 										<object class="NSButton" id="102278614">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
+											<array class="NSMutableArray" key="NSSubviews"/>
 											<string key="NSFrame">{{13, 85}, {272, 29}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="884733860"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="253815144">
@@ -587,6 +604,7 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{107, 58}, {168, 22}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="468559655"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="486155901">
@@ -658,6 +676,7 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{107, 33}, {168, 22}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="697176732"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="896990097">
@@ -729,6 +748,7 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{107, 8}, {168, 22}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="488752593"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="707934314">
@@ -800,6 +820,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{42, 63}, {63, 14}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="212534085"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="31094978">
@@ -812,12 +833,14 @@
 												<reference key="NSTextColor" ref="549414805"/>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 										</object>
 										<object class="NSTextField" id="468559655">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{42, 38}, {63, 14}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="626682786"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="699273588">
@@ -830,12 +853,14 @@
 												<reference key="NSTextColor" ref="549414805"/>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 										</object>
 										<object class="NSTextField" id="697176732">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{28, 13}, {77, 14}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="477850836"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="736528615">
@@ -848,12 +873,15 @@
 												<reference key="NSTextColor" ref="549414805"/>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 										</object>
 										<object class="NSButton" id="734683507">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
+											<array class="NSMutableArray" key="NSSubviews"/>
 											<string key="NSFrame">{{13, 116}, {261, 23}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="102278614"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="823492718">
@@ -877,6 +905,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{13, 169}, {132, 14}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="970341474"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="60536666">
@@ -889,12 +918,14 @@
 												<reference key="NSTextColor" ref="549414805"/>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 										</object>
 										<object class="NSMatrix" id="970341474">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{146, 166}, {80, 18}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="276221505"/>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -942,7 +973,7 @@
 												<int key="NSCellFlags2">0</int>
 												<string key="NSContents">Radio</string>
 												<object class="NSFont" key="NSSupport" id="632123868">
-													<string key="NSName">LucidaGrande</string>
+													<bool key="IBIsSystemFont">YES</bool>
 													<double key="NSSize">13</double>
 													<int key="NSfFlags">1044</int>
 												</object>
@@ -962,6 +993,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{13, 193}, {111, 14}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="695087236"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="195785791">
@@ -974,12 +1006,14 @@
 												<reference key="NSTextColor" ref="549414805"/>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 										</object>
 										<object class="NSPopUpButton" id="695087236">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{74, 188}, {154, 22}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="249918606"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="19520968">
@@ -1075,8 +1109,10 @@
 										<object class="NSButton" id="276221505">
 											<reference key="NSNextResponder" ref="154902579"/>
 											<int key="NSvFlags">256</int>
+											<array class="NSMutableArray" key="NSSubviews"/>
 											<string key="NSFrame">{{13, 141}, {261, 23}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="734683507"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="371945940">
@@ -1105,6 +1141,7 @@
 											</set>
 											<string key="NSFrame">{{233, 192}, {39, 17}}</string>
 											<reference key="NSSuperview" ref="154902579"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="284152290"/>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1114,11 +1151,13 @@
 									</array>
 									<string key="NSFrame">{{2, 2}, {299, 226}}</string>
 									<reference key="NSSuperview" ref="924234733"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="326397700"/>
 								</object>
 							</array>
 							<string key="NSFrame">{{17, 41}, {303, 243}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="154902579"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1128,8 +1167,10 @@
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSBackgroundColor" ref="174422548"/>
 								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
+									<int key="NSColorSpace">6</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">labelColor</string>
+									<reference key="NSColor" ref="31933628"/>
 								</object>
 							</object>
 							<reference key="NSContentView" ref="154902579"/>
@@ -1141,8 +1182,10 @@
 						<object class="NSButton" id="583559165">
 							<reference key="NSNextResponder" ref="56889179"/>
 							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews"/>
 							<string key="NSFrame">{{240, 13}, {82, 28}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="562606331">
 								<int key="NSCellFlags">67108864</int>
@@ -1165,8 +1208,10 @@
 						<object class="NSButton" id="488752593">
 							<reference key="NSNextResponder" ref="56889179"/>
 							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews"/>
 							<string key="NSFrame">{{157, 13}, {85, 28}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="583559165"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="14383402">
@@ -1188,18 +1233,20 @@
 						<object class="NSButton" id="769171705">
 							<reference key="NSNextResponder" ref="56889179"/>
 							<int key="NSvFlags">-2147483392</int>
-							<string key="NSFrame">{{97, 289}, {80, 22}}</string>
+							<array class="NSMutableArray" key="NSSubviews"/>
+							<string key="NSFrame">{{97, 289}, {85, 22}}</string>
 							<reference key="NSSuperview" ref="56889179"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="924234733"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="188829269">
 								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">262144</int>
 								<string key="NSContents">Slider syncen</string>
-								<object class="NSFont" key="NSSupport">
+								<object class="NSFont" key="NSSupport" id="22">
-									<string key="NSName">LucidaGrande</string>
+									<bool key="IBIsSystemFont">YES</bool>
 									<double key="NSSize">9</double>
-									<int key="NSfFlags">16</int>
+									<int key="NSfFlags">3614</int>
 								</object>
 								<reference key="NSControlView" ref="769171705"/>
 								<int key="NSButtonFlags">1211912448</int>
@@ -1218,9 +1265,11 @@
 						</object>
 					</array>
 					<string key="NSFrameSize">{337, 436}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="326311059"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">MainWindow</string>
@@ -1261,7 +1310,7 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="628206674">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSScrollView" id="322110668">
@@ -1270,7 +1319,7 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<object class="NSClipView" id="687821647">
 									<reference key="NSNextResponder" ref="322110668"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2322</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTextView" id="342559074">
 											<reference key="NSNextResponder" ref="687821647"/>
@@ -1560,7 +1609,7 @@ Uwo</bytes>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">11109</int>
+												<int key="NSFlags">67119973</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="687483911"/>
@@ -1578,7 +1627,7 @@ Uwo</bytes>
 														<reference key="NSColor" ref="31933628"/>
 													</object>
 												</dictionary>
-												<reference key="NSInsertionColor" ref="31933628"/>
+												<reference key="NSInsertionColor" ref="549414805"/>
 												<dictionary key="NSLinkAttributes">
 													<object class="NSColor" key="NSColor" id="47976812">
 														<int key="NSColorSpace">1</int>
@@ -1626,6 +1675,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 										</object>
 									</object>
 									<int key="NScvFlags">4</int>
+									<bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
 								</object>
 								<object class="NSScroller" id="91928660">
 									<reference key="NSNextResponder" ref="322110668"/>
@@ -1634,6 +1684,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<reference key="NSSuperview" ref="322110668"/>
 									<bool key="NSEnabled">YES</bool>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="322110668"/>
 									<reference key="NSTarget" ref="322110668"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.15277071682765633</double>
@@ -1645,6 +1697,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<reference key="NSSuperview" ref="322110668"/>
 									<reference key="NSNextKeyView" ref="687821647"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="322110668"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="322110668"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1666,10 +1720,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						</object>
 					</array>
 					<string key="NSFrameSize">{575, 603}</string>
-					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="322110668"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1687,7 +1740,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="1050492388">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTextField" id="45449479">
@@ -1695,36 +1748,37 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{97, 280}, {262, 19}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="163206888"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="792398739">
 								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4194304</int>
 								<string key="NSContents">Programversion</string>
 								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande-Bold</string>
+									<bool key="IBIsSystemFont">YES</bool>
 									<double key="NSSize">16</double>
-									<int key="NSfFlags">16</int>
+									<int key="NSfFlags">2072</int>
 								</object>
 								<reference key="NSControlView" ref="45449479"/>
 								<reference key="NSBackgroundColor" ref="858343721"/>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSTextField" id="163206888">
 							<reference key="NSNextResponder" ref="1050492388"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{99, 235}, {143, 37}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="204638104"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="435006901">
 								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">Small System Font Text</string>
 								<object class="NSFont" key="NSSupport">
-									<string key="NSName">LucidaGrande-Bold</string>
+									<bool key="IBIsSystemFont">YES</bool>
 									<double key="NSSize">11</double>
 									<int key="NSfFlags">3357</int>
 								</object>
@@ -1733,13 +1787,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSButton" id="835092286">
 							<reference key="NSNextResponder" ref="1050492388"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{121, 23}, {66, 37}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="900680627">
 								<int key="NSCellFlags">67108864</int>
@@ -1764,7 +1818,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 119}, {265, 29}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="496031971"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="135250125">
 								<int key="NSCellFlags">67108864</int>
@@ -1776,13 +1830,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSTextField" id="860382620">
 							<reference key="NSNextResponder" ref="1050492388"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 150}, {114, 17}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="514008135"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="116060185">
 								<int key="NSCellFlags">67108864</int>
@@ -1794,13 +1849,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSTextField" id="496031971">
 							<reference key="NSNextResponder" ref="1050492388"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 59}, {265, 52}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="835092286"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="774144706">
 								<int key="NSCellFlags">67108864</int>
@@ -1812,13 +1868,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSTextField" id="204638104">
 							<reference key="NSNextResponder" ref="1050492388"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 178}, {265, 49}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="860382620"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="698963648">
 								<int key="NSCellFlags">67108864</int>
@@ -1830,6 +1887,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSImageView" id="226050686">
 							<reference key="NSNextResponder" ref="1050492388"/>
@@ -1844,7 +1902,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							</set>
 							<string key="NSFrame">{{20, 235}, {64, 64}}</string>
 							<reference key="NSSuperview" ref="1050492388"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="45449479"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="184744502">
 								<int key="NSCellFlags">134217728</int>
@@ -1863,10 +1921,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						</object>
 					</array>
 					<string key="NSFrameSize">{299, 327}</string>
-					<reference key="NSSuperview"/>
+					<reference key="NSNextKeyView" ref="226050686"/>
-					<reference key="NSWindow"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1926,15 +1983,16 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<object class="NSMenuItem" id="375779764">
 						<reference key="NSMenu" ref="70791087"/>
-						<string key="NSTitle">Info</string>
+						<string key="NSTitle">Info &amp; Support</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="735526217"/>
 						<reference key="NSMixedImage" ref="311919643"/>
 						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="392629622"/>
 						<object class="NSMenu" key="NSSubmenu" id="392629622">
-							<string key="NSTitle">Info</string>
+							<string key="NSTitle">Info &amp; Support</string>
 							<array class="NSMutableArray" key="NSMenuItems">
 								<object class="NSMenuItem" id="837645033">
 									<reference key="NSMenu" ref="392629622"/>
@@ -1947,13 +2005,21 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								</object>
 								<object class="NSMenuItem" id="557822969">
 									<reference key="NSMenu" ref="392629622"/>
-									<string key="NSTitle">Nach Updates suchen</string>
+									<string key="NSTitle">Nach Updates suchen...</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="735526217"/>
 									<reference key="NSMixedImage" ref="311919643"/>
 								</object>
+								<object class="NSMenuItem" id="499716841">
+									<reference key="NSMenu" ref="392629622"/>
+									<string key="NSTitle">Zurücksetzen...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="735526217"/>
+									<reference key="NSMixedImage" ref="311919643"/>
+								</object>
 								<object class="NSMenuItem" id="874576862">
 									<reference key="NSMenu" ref="392629622"/>
 									<string key="NSTitle">FAQ</string>
@@ -2074,6 +2140,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSTextField" id="1024752490">
 							<reference key="NSNextResponder" ref="219116160"/>
@@ -2097,6 +2164,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								</object>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 						<object class="NSButton" id="545512860">
 							<reference key="NSNextResponder" ref="219116160"/>
@@ -2153,21 +2221,18 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<int key="NSCellFlags2">4194304</int>
 								<string type="base64-UTF8" key="NSContents">QWxzIFZvcmdhYmVuIGRlcyBuZXVlbiBGYXZvcml0ZW4Kd2VyZGVuIGRpZSBFaW5zdGVsbHVuZ2VuIGRl
 cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
-								<object class="NSFont" key="NSSupport">
+								<reference key="NSSupport" ref="22"/>
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">9</double>
-									<int key="NSfFlags">3614</int>
-								</object>
 								<reference key="NSControlView" ref="376739262"/>
 								<reference key="NSBackgroundColor" ref="858343721"/>
 								<reference key="NSTextColor" ref="549414805"/>
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 						</object>
 					</array>
 					<string key="NSFrameSize">{221, 145}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -2231,7 +2296,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 													<reference key="NSBackgroundColor" ref="67968537"/>
 													<reference key="NSColor" ref="434880261"/>
 												</dictionary>
-												<reference key="NSInsertionColor" ref="31933628"/>
+												<reference key="NSInsertionColor" ref="549414805"/>
 												<dictionary key="NSLinkAttributes">
 													<reference key="NSColor" ref="47976812"/>
 													<integer value="1" key="NSUnderline"/>
@@ -2252,6 +2317,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 									<reference key="NSBGColor" ref="687483911"/>
 									<reference key="NSCursor" ref="696172213"/>
 									<int key="NScvFlags">4</int>
+									<bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
 								</object>
 								<object class="NSScroller" id="756989930">
 									<reference key="NSNextResponder" ref="542193225"/>
@@ -2259,6 +2325,8 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 									<string key="NSFrame">{{-30, 1}, {15, 587}}</string>
 									<reference key="NSSuperview" ref="542193225"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="542193225"/>
 									<reference key="NSTarget" ref="542193225"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.15277071297168732</double>
@@ -2269,6 +2337,8 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="542193225"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<string key="NSControlAction">_doScroller:</string>
+									<reference key="NSControlTarget" ref="542193225"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="542193225"/>
 									<string key="NSAction">_doScroller:</string>
@@ -2291,7 +2361,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 					</array>
 					<string key="NSFrameSize">{575, 665}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -2301,7 +2371,15 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
+			<array key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1005416442"/>
+						<reference key="destination" ref="73883337"/>
+					</object>
+					<int key="connectionID">871</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">makeKeyAndOrderFront:</string>
@@ -2558,6 +2636,14 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 					</object>
 					<int key="connectionID">774</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resetSettings:</string>
+						<reference key="source" ref="73883337"/>
+						<reference key="destination" ref="499716841"/>
+					</object>
+					<int key="connectionID">873</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">makeKeyAndOrderFront:</string>
@@ -3446,6 +3532,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 							<reference ref="259933181"/>
 							<reference ref="557822969"/>
 							<reference ref="313435913"/>
+							<reference ref="499716841"/>
 						</array>
 						<reference key="parent" ref="375779764"/>
 					</object>
@@ -4087,6 +4174,11 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 						<reference key="object" ref="249918606"/>
 						<reference key="parent" ref="924234733"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">872</int>
+						<reference key="object" ref="499716841"/>
+						<reference key="parent" ref="392629622"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4238,12 +4330,13 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 				<string key="868.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="869.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="870.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">870</int>
+			<int key="maxID">873</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4259,6 +4352,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 						<string key="loginItem:">id</string>
 						<string key="menuSelect:">id</string>
 						<string key="paypal:">id</string>
+						<string key="resetSettings:">id</string>
 						<string key="savePreferences:">id</string>
 						<string key="save_favorite:">id</string>
 						<string key="syncSliders:">id</string>
@@ -4298,6 +4392,10 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 							<string key="name">paypal:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="resetSettings:">
+							<string key="name">resetSettings:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="savePreferences:">
 							<string key="name">savePreferences:</string>
 							<string key="candidateClassName">id</string>
@@ -4455,9 +4553,95 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/FanControl.h</string>
+						<string key="minorKey">../Classes/FanControl.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FanControl</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="add_favorite:">id</string>
+						<string key="changeMenu:">id</string>
+						<string key="closePreferences:">id</string>
+						<string key="close_favorite:">id</string>
+						<string key="delete_favorite:">id</string>
+						<string key="loginItem:">id</string>
+						<string key="menuSelect:">id</string>
+						<string key="paypal:">id</string>
+						<string key="savePreferences:">id</string>
+						<string key="save_favorite:">id</string>
+						<string key="syncSliders:">id</string>
+						<string key="updateCheck:">id</string>
+						<string key="visitHomepage:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="add_favorite:">
+							<string key="name">add_favorite:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="changeMenu:">
+							<string key="name">changeMenu:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="closePreferences:">
+							<string key="name">closePreferences:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="close_favorite:">
+							<string key="name">close_favorite:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="delete_favorite:">
+							<string key="name">delete_favorite:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="loginItem:">
+							<string key="name">loginItem:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="menuSelect:">
+							<string key="name">menuSelect:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="paypal:">
+							<string key="name">paypal:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="savePreferences:">
+							<string key="name">savePreferences:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="save_favorite:">
+							<string key="name">save_favorite:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="syncSliders:">
+							<string key="name">syncSliders:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="updateCheck:">
+							<string key="name">updateCheck:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="visitHomepage:">
+							<string key="name">visitHomepage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../Classes/FanControl.m</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">StatusItemWindow</string>
+					<string key="superclassName">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../Classes/StatusItemWindow.h</string>
+					</object>
+				</object>
+			</array>
+			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
 				<object class="IBPartialClassDescription">
 					<string key="className">SUUpdater</string>
 					<string key="superclassName">NSObject</string>
@@ -4472,36 +4656,40 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+					<object class="NSMutableDictionary" key="outlets">
-						<string key="majorKey">IBProjectSource</string>
+						<string key="NS.key.0">delegate</string>
-						<string key="minorKey">./Classes/SUUpdater.h</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">StatusItemWindow</string>
-					<string key="superclassName">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
+						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">./Classes/StatusItemWindow.h</string>
+						<string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
 					</object>
 				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
+			<integer value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<real value="1070" key="NS.object.0"/>
+			<integer value="4600" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuCheckmark">{12, 12}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSMenuMixedState">{10, 2}</string>
 			<string key="NSRadioButton">{16, 15}</string>
 			<string key="NSSwitch">{15, 15}</string>
 			<string key="paypal">{62, 31}</string>

Ressources/Spanish.lproj/InfoPlist.strings

@@ -1,3 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-NSHumanReadableCopyright = "by Hendrik Holtmann, 2009 (GPL License)";

Ressources/Spanish.lproj/Localizable.strings

@@ -20,4 +20,22 @@
 
 "Alert!" = "¡Atención!";
 
-"Active Setting" = "Configuración activa";
+"Active Setting" = "Configuración activa";
+
+"Remind me later" = "Remind me later";
+
+"Consider a donation" = "Consider a donation";
+
+"Never ask me again" = "Never ask me again";
+
+"Donate over Paypal" = "Donate over Paypal";
+
+"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated." = "smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated.";
+
+"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed." = "Do you want to reset smcFanControl to default settings?\nFavorites will be deleted and fans will return to default speed.";
+
+"Please shutdown your computer now to return to default fan settings." = "Please shutdown your computer now to return to default fan settings.";
+
+"Reset Settings" = "Reset Settings";
+
+"Shutdown required" = "Shutdown required";

Ressources/tsensors.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>standard</key>
-	<string>TC0D</string>
-	<key>lastAlternative</key>
-	<string>TCAH</string>
-	<key>MacBookPro10,1</key>
-	<string>TC0F</string>
-	<key>iMac12,2</key>
-	<string>TC0H</string>
-	<key>iMac12,1</key>
-	<string>TC0H</string>
-</dict>
-</plist>

Sparkle.framework/Versions/A/Headers/NSApplication+AppCopies.h

@@ -1,13 +0,0 @@
-//
-//  NSApplication+AppCopies.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface NSApplication (SUAppCopies)
-- (int)copiesRunning;
-@end

Sparkle.framework/Versions/A/Headers/NSFileManager+Authentication.h

@@ -1,11 +0,0 @@
-//
-//  NSFileManager+Authentication.m
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/9/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-@interface NSFileManager (SUAuthenticationAdditions)
-- (BOOL)movePathWithAuthentication:(NSString *)src toPath:(NSString *)dst;
-@end

Sparkle.framework/Versions/A/Headers/NSFileManager+Verification.h

@@ -1,15 +0,0 @@
-//
-//  NSFileManager+Verification.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-// For the paranoid folks!
-@interface NSFileManager (SUVerification)
-- (BOOL)validatePath:(NSString *)path withMD5Hash:(NSString *)hash;
-- (BOOL)validatePath:(NSString *)path withEncodedDSASignature:(NSString *)encodedSignature;
-@end

Sparkle.framework/Versions/A/Headers/NSString+extras.h

@@ -1,61 +0,0 @@
-/*
-
-BSD License
-
-Copyright (c) 2002, Brent Simmons
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-*	Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-*	Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-*	Neither the name of ranchero.com or Brent Simmons nor the names of its
-	contributors may be used to endorse or promote products derived
-	from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-*/
-
-
-/*
-	NSString+extras.h
-	NetNewsWire
-
-	Created by Brent Simmons on Fri Jun 14 2002.
-	Copyright (c) 2002 Brent Simmons. All rights reserved.
-*/
-
-
-#import <Foundation/Foundation.h>
-#import <CoreFoundation/CoreFoundation.h>
-
-
-@interface NSString (extras)
-
-- (NSString *)stringWithSubstitute:(NSString *)subs forCharactersFromSet:(NSCharacterSet *)set;
-
-- (NSString *) trimWhiteSpace;
-
-- (NSString *) stripHTML;
-
-- (NSString *) ellipsizeAfterNWords: (int) n;
-
-+ (BOOL) stringIsEmpty: (NSString *) s;
-
-
-@end

Sparkle.framework/Versions/A/Headers/RSS.h

@@ -1,98 +0,0 @@
-/*
-
-BSD License
-
-Copyright (c) 2002, Brent Simmons
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-*	Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-*	Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-*	Neither the name of ranchero.com or Brent Simmons nor the names of its
-	contributors may be used to endorse or promote products derived
-	from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-*/
-
-/*
-	RSS.h
-	A class for reading RSS feeds.
-
-	Created by Brent Simmons on Wed Apr 17 2002.
-	Copyright (c) 2002 Brent Simmons. All rights reserved.
-*/
-
-
-#import <Cocoa/Cocoa.h>
-#import <CoreFoundation/CoreFoundation.h>
-#import "NSString+extras.h"
-
-
-@interface RSS : NSObject {
-	
-	NSDictionary *headerItems;
-	NSMutableArray *newsItems;
-	NSString *version;
-	
-	BOOL flRdf;
-	BOOL normalize;
-	}
-
-
-/*Public*/
-
-- (RSS *) initWithTitle: (NSString *) title andDescription: (NSString *) description;
-
-- (RSS *) initWithData: (NSData *) rssData normalize: (BOOL) fl;
-
-- (RSS *) initWithURL: (NSURL *) url normalize: (BOOL) fl;
-- (RSS *) initWithURL: (NSURL *) url normalize: (BOOL) fl userAgent:(NSString *)userAgent;
-
-- (NSDictionary *) headerItems;
-
-- (NSMutableArray *) newsItems;
-
-- (NSString *) version;
-
-// AMM's extensions for Sparkle
-- (NSDictionary *)newestItem;
-
-
-/*Private*/
-
-- (void) createheaderdictionary: (CFXMLTreeRef) tree;
-
-- (void) createitemsarray: (CFXMLTreeRef) tree;
-
-- (void) setversionstring: (CFXMLTreeRef) tree;
-
-- (void) flattenimagechildren: (CFXMLTreeRef) tree into: (NSMutableDictionary *) dictionary;
-
-- (void) flattensourceattributes: (CFXMLNodeRef) node into: (NSMutableDictionary *) dictionary;
-
-- (CFXMLTreeRef) getchanneltree: (CFXMLTreeRef) tree;
-
-- (CFXMLTreeRef) getnamedtree: (CFXMLTreeRef) currentTree name: (NSString *) name;
-
-- (void) normalizeRSSItem: (NSMutableDictionary *) rssItem;
-
-- (NSString *) getelementvalue: (CFXMLTreeRef) tree;
-
-@end

Sparkle.framework/Versions/A/Headers/SUAppcast.h

@@ -6,22 +6,32 @@
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#ifndef SUAPPCAST_H
+#define SUAPPCAST_H
 
-@class RSS, SUAppcastItem;
+@protocol SUAppcastDelegate;
-@interface SUAppcast : NSObject {
+
+@class SUAppcastItem;
+@interface SUAppcast : NSObject<NSURLDownloadDelegate>
+{
+@private
 	NSArray *items;
-	id delegate;
+	NSString *userAgentString;
+	id<SUAppcastDelegate> delegate;
+	NSString *downloadFilename;
+	NSURLDownload *download;
 }
+@property (assign) id<SUAppcastDelegate> delegate;
+@property (copy) NSString *userAgentString;
 
 - (void)fetchAppcastFromURL:(NSURL *)url;
-- (void)setDelegate:delegate;
 
-- (SUAppcastItem *)newestItem;
 - (NSArray *)items;
-
 @end
 
-@interface NSObject (SUAppcastDelegate)
+@protocol SUAppcastDelegate <NSObject>
-- appcastDidFinishLoading:(SUAppcast *)appcast;
+- (void)appcastDidFinishLoading:(SUAppcast *)appcast;
-@end
+- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error;
+@end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -6,52 +6,57 @@
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#ifndef SUAPPCASTITEM_H
+#define SUAPPCASTITEM_H
 
-
+@interface SUAppcastItem : NSObject
-@interface SUAppcastItem : NSObject {
+{
+@private
 	NSString *title;
 	NSDate *date;
-	NSString *description;
+	NSString *itemDescription;
 	
 	NSURL *releaseNotesURL;
 	
-	NSString *DSASignature;
+	NSString *DSASignature;	
-	NSString *MD5Sum;
+	NSString *minimumSystemVersion;
+    NSString *maximumSystemVersion;
 	
 	NSURL *fileURL;
-	NSString *fileVersion;
 	NSString *versionString;
+	NSString *displayVersionString;
+
+	NSDictionary *deltaUpdates;
+
+	NSDictionary *propertiesDictionary;
+
+	NSURL *infoURL;	// UK 2007-08-31
 }
+@property (copy, readonly) NSString *title;
+@property (copy, readonly) NSDate *date;
+@property (copy, readonly) NSString *itemDescription;
+@property (retain, readonly) NSURL *releaseNotesURL;
+@property (copy, readonly) NSString *DSASignature;
+@property (copy, readonly) NSString *minimumSystemVersion;
+@property (copy, readonly) NSString *maximumSystemVersion;
+@property (retain, readonly) NSURL *fileURL;
+@property (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *displayVersionString;
+@property (copy, readonly) NSDictionary *deltaUpdates;
+@property (retain, readonly) NSURL *infoURL;
 
 // Initializes with data from a dictionary provided by the RSS class.
-- initWithDictionary:(NSDictionary *)dict;
+- (id)initWithDictionary:(NSDictionary *)dict;
+- (id)initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error;
 
-- (NSString *)title;
+- (BOOL)isDeltaUpdate;
-- (void)setTitle:(NSString *)aTitle;
+- (BOOL)isCriticalUpdate;
 
-- (NSDate *)date;
+// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
-- (void)setDate:(NSDate *)aDate;
+- (NSDictionary *)propertiesDictionary;
 
-- (NSString *)description;
+- (NSURL *)infoURL;						// UK 2007-08-31
-- (void)setDescription:(NSString *)aDescription;
-
-- (NSURL *)releaseNotesURL;
-- (void)setReleaseNotesURL:(NSURL *)aReleaseNotesURL;
-
-- (NSString *)DSASignature;
-- (void)setDSASignature:(NSString *)aDSASignature;
-
-- (NSString *)MD5Sum;
-- (void)setMD5Sum:(NSString *)aMd5Sum;
-
-- (NSURL *)fileURL;
-- (void)setFileURL:(NSURL *)aFileURL;
-
-- (NSString *)fileVersion;
-- (void)setFileVersion:(NSString *)aFileVersion;
-
-- (NSString *)versionString;
-- (void)setVersionString:(NSString *)versionString;
 
 @end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h

@@ -1,21 +0,0 @@
-//
-//  SUAutomaticUpdateAlert.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/18/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@class SUAppcastItem;
-@interface SUAutomaticUpdateAlert : NSWindowController {
-	SUAppcastItem *updateItem;
-}
-
-- initWithAppcastItem:(SUAppcastItem *)item;
-
-- (IBAction)relaunchNow:sender;
-- (IBAction)relaunchLater:sender;
-
-@end

Sparkle.framework/Versions/A/Headers/SUConstants.h

@@ -1,20 +0,0 @@
-//
-//  SUConstants.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-extern NSString *SUUpdaterWillRestartNotification;
-
-extern NSString *SUCheckAtStartupKey;
-extern NSString *SUFeedURLKey;
-extern NSString *SUShowReleaseNotesKey;
-extern NSString *SUSkippedVersionKey;
-extern NSString *SUScheduledCheckIntervalKey;
-extern NSString *SULastCheckTimeKey;
-extern NSString *SUExpectsDSASignatureKey;
-extern NSString *SUPublicDSAKeyKey;
-extern NSString *SUAutomaticallyUpdateKey;
-extern NSString *SUAllowsAutomaticUpdatesKey;

Sparkle.framework/Versions/A/Headers/SUStatusChecker.h

@@ -1,26 +0,0 @@
-//
-//  SUStatusChecker.h
-//  Sparkle
-//
-//  Created by Evan Schoenberg on 7/6/06.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <Sparkle/SUUpdater.h>
-
-@class SUStatusChecker;
-
-@protocol SUStatusCheckerDelegate <NSObject>
-//versionString will be nil and isNewVersion will be NO if version checking fails.
-- (void)statusChecker:(SUStatusChecker *)statusChecker foundVersion:(NSString *)versionString isNewVersion:(BOOL)isNewVersion;
-@end
-
-@interface SUStatusChecker : SUUpdater {
-	id<SUStatusCheckerDelegate> scDelegate;
-}
-
-// Create a status checker which will notifiy delegate once the appcast version is determined.
-// Notification occurs via the method defined in the SUStatusCheckerDelegate informal protocol.
-+ (SUStatusChecker *)statusCheckerForDelegate:(id<SUStatusCheckerDelegate>)delegate;
-
-@end

Sparkle.framework/Versions/A/Headers/SUStatusController.h

@@ -1,33 +0,0 @@
-//
-//  SUStatusController.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/14/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface SUStatusController : NSWindowController {
-	double progressValue, maxProgressValue;
-	NSString *title, *statusText, *buttonTitle;
-	IBOutlet NSButton *actionButton;
-}
-
-// Pass 0 for the max progress value to get an indeterminate progress bar.
-// Pass nil for the status text to not show it.
-- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText;
-
-// If isDefault is YES, the button's key equivalent will be \r.
-- (void)setButtonTitle:(NSString *)buttonTitle target:target action:(SEL)action isDefault:(BOOL)isDefault;
-- (void)setButtonEnabled:(BOOL)enabled;
-
-- (double)progressValue;
-- (void)setProgressValue:(double)value;
-- (double)maxProgressValue;
-- (void)setMaxProgressValue:(double)value;
-
-- (void)setStatusText:(NSString *)statusText;
-
-@end

Sparkle.framework/Versions/A/Headers/SUUnarchiver.h

@@ -1,25 +0,0 @@
-//
-//  SUUnarchiver.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface SUUnarchiver : NSObject {
-	id delegate;
-}
-
-- (void)unarchivePath:(NSString *)path;
-- (void)setDelegate:delegate;
-
-@end
-
-@interface NSObject (SUUnarchiverDelegate)
-- (void)unarchiver:(SUUnarchiver *)unarchiver extractedLength:(long)length;
-- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver;
-- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver;
-@end

Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h

@@ -1,40 +0,0 @@
-//
-//  SUUpdateAlert.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-typedef enum
-{
-	SUInstallUpdateChoice,
-	SURemindMeLaterChoice,
-	SUSkipThisVersionChoice
-} SUUpdateAlertChoice;
-
-@class WebView, SUAppcastItem;
-@interface SUUpdateAlert : NSWindowController {
-	SUAppcastItem *updateItem;
-	id delegate;
-	
-	IBOutlet WebView *releaseNotesView;
-	IBOutlet NSTextField *description;
-	NSProgressIndicator *releaseNotesSpinner;
-	BOOL webViewFinishedLoading;
-}
-
-- initWithAppcastItem:(SUAppcastItem *)item;
-- (void)setDelegate:delegate;
-
-- (IBAction)installUpdate:sender;
-- (IBAction)skipThisVersion:sender;
-- (IBAction)remindMeLater:sender;
-
-@end
-
-@interface NSObject (SUUpdateAlertDelegate)
-- (void)updateAlert:(SUUpdateAlert *)updateAlert finishedWithChoice:(SUUpdateAlertChoice)updateChoice;
-@end

Sparkle.framework/Versions/A/Headers/SUUpdater.h

@@ -6,50 +6,177 @@
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#ifndef SUUPDATER_H
+#define SUUPDATER_H
 
-// Before you use Sparkle in your app, you must set SUFeedURL in Info.plist to the
+#import "SUVersionComparisonProtocol.h"
-// address of the appcast on your webserver. If you don't already have an 
+#import "SUVersionDisplayProtocol.h"
-// appcast, please see the Sparkle documentation to learn about how to set one up.
 
-// .zip, .dmg, .tar, .tbz, .tgz archives are supported at this time.
+@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast;
 
-// By default, Sparkle offers to show the user the release notes of the build they'll be
+@interface SUUpdater : NSObject
-// getting, which it assumes are in the description (or body) field of the relevant RSS item.
+{
-// Set SUShowReleaseNotes to <false/> in Info.plist to hide the button.
+@private
-
-@class SUAppcastItem, SUUpdateAlert, SUStatusController;
-@interface SUUpdater : NSObject {
-	SUAppcastItem *updateItem;
-	
-	SUStatusController *statusController;
-	SUUpdateAlert *updateAlert;
-	
-	NSURLDownload *downloader;
-	NSString *downloadPath;
-			
 	NSTimer *checkTimer;
-	NSTimeInterval checkInterval;	
+	SUUpdateDriver *driver;
-	
+
-	BOOL verbose;
+	NSString *customUserAgentString;
-	BOOL updateInProgress;
+	SUHost *host;
+	IBOutlet id delegate;
 }
+@property (assign) id delegate;
+
++ (SUUpdater *)sharedUpdater;
++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
+- (id)initForBundle:(NSBundle *)bundle;
+
+- (NSBundle *)hostBundle;
+
+- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks;
+- (BOOL)automaticallyChecksForUpdates;
+
+- (void)setUpdateCheckInterval:(NSTimeInterval)interval;
+- (NSTimeInterval)updateCheckInterval;
+
+- (void)setFeedURL:(NSURL *)feedURL;
+- (NSURL *)feedURL;	// *** MUST BE CALLED ON MAIN THREAD ***
+
+- (void)setUserAgentString:(NSString *)userAgent;
+- (NSString *)userAgentString;
+
+- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile;
+- (BOOL)sendsSystemProfile;
+
+- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates;
+- (BOOL)automaticallyDownloadsUpdates;
 
 // This IBAction is meant for a main menu item. Hook up any menu item to this action,
 // and Sparkle will check for updates and report back its findings verbosely.
-- (IBAction)checkForUpdates:sender;
+- (IBAction)checkForUpdates:(id)sender;
 
-// This method is similar to the above, but it's intended for updates initiated by
+// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update,
-// the computer instead of by the user. It does not alert the user when he is up to date,
+// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an
-// and it remains silent about network errors in fetching the feed. This is what you
+// update is found, it will be downloaded and prepped for installation.
-// want to call to update programmatically; only use checkForUpdates: with buttons and menu items.
 - (void)checkForUpdatesInBackground;
 
-// This method allows you to schedule a check to run every time interval. You can
+// Date of last update check. Returns nil if no check has been performed.
-// pass 0 to this method to cancel a previously scheduled timer. You probably don't want
+- (NSDate*)lastUpdateCheckDate;
-// to call this directly: if you set a SUScheduledCheckInterval key in Info.plist or
-// the user defaults, Sparkle will set this up for you automatically on startup. You might
-// just want to call this every time the user changes the setting in the preferences.
-- (void)scheduleCheckWithInterval:(NSTimeInterval)interval;
 
-@end
+// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though,
+// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI.
+- (void)checkForUpdateInformation;
+
+// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer.
+- (void)resetUpdateCycle;
+
+- (BOOL)updateInProgress;
+
+@end
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+extern NSString *const SUUpdaterWillInstallUpdateNotification;
+extern NSString *const SUUpdaterWillRelaunchApplicationNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification & SUUpdaterWillInstallUpdateNotification userInfos
+extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+//	SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+@interface NSObject (SUUpdaterDelegateInformalProtocol)
+
+// Use this to keep Sparkle from popping up e.g. while your setup assistant is showing:
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle;
+
+// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+// Override this to dynamically specify the entire URL.
+- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater;
+
+// Use this to override the default behavior for Sparkle prompting the user about automatic update checks.
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle;
+
+// Implement this if you want to do some special handling with the appcast once it finishes loading.
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding
+// a valid update, if any, in the given appcast.
+- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle;
+
+// Sent when a valid update is found by the update driver.
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update;
+
+// Sent when a valid update is not found.
+- (void)updaterDidNotFindUpdate:(SUUpdater *)update;
+
+// Sent immediately before installing the specified update.
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
+
+// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue.
+//	This is not called if the user didn't relaunch on the previous update, in that case it will immediately
+//	restart.
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
+
+// Some apps *can not* be relaunched in certain circumstances. They can use this method
+//	to prevent a relaunch "hard":
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+// Called immediately before relaunching.
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+// This method allows you to provide a custom version comparator.
+// If you don't implement this method or return nil, the standard version comparator will be used.
+- (id <SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+// This method allows you to provide a custom version comparator.
+// If you don't implement this method or return nil, the standard version displayer will be used.
+- (id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle.
+- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+// Called before and after, respectively, an updater shows a modal alert window, to give the host
+//	the opportunity to hide attached windows etc. that may get in the way:
+-(void)	updaterWillShowModalAlert:(SUUpdater *)updater;
+-(void)	updaterDidShowModalAlert:(SUUpdater *)updater;
+
+// Called when an update is scheduled to be silently installed on quit.
+// The invocation can be used to trigger an immediate silent install and relaunch.
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)update immediateInstallationInvocation:(NSInvocation *)invocation;
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)update;
+
+@end
+
+
+// -----------------------------------------------------------------------------
+//	Constants:
+// -----------------------------------------------------------------------------
+
+#ifndef DEBUG
+#define DEBUG	0
+#endif
+
+// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds.
+#if defined(DEBUG) && DEBUG && 0
+#define SU_MIN_CHECK_INTERVAL 60
+#else
+#define SU_MIN_CHECK_INTERVAL 60*60
+#endif
+
+#if defined(DEBUG) && DEBUG && 0
+#define SU_DEFAULT_CHECK_INTERVAL 60
+#else
+#define SU_DEFAULT_CHECK_INTERVAL 60*60*24
+#endif
+
+#endif

Sparkle.framework/Versions/A/Headers/SUUtilities.h

@@ -1,20 +0,0 @@
-//
-//  SUUtilities.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-id SUInfoValueForKey(NSString *key);
-NSString *SUHostAppName();
-NSString *SUHostAppDisplayName();
-NSString *SUHostAppVersion();
-NSString *SUHostAppVersionString();
-
-NSComparisonResult SUStandardVersionComparison(NSString * versionA, NSString * versionB);
-
-// If running make localizable-strings for genstrings, ignore the error on this line.
-NSString *SULocalizedString(NSString *key, NSString *comment);

Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h

@@ -0,0 +1,29 @@
+//
+//  SUVersionComparisonProtocol.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 12/21/07.
+//  Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUVERSIONCOMPARISONPROTOCOL_H
+#define SUVERSIONCOMPARISONPROTOCOL_H
+
+#import <Cocoa/Cocoa.h>
+
+/*!
+    @protocol
+    @abstract    Implement this protocol to provide version comparison facilities for Sparkle.
+*/
+@protocol SUVersionComparison
+
+/*!
+    @method     
+    @abstract   An abstract method to compare two version strings.
+    @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;	// *** MAY BE CALLED ON NON-MAIN THREAD!
+
+@end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h

@@ -0,0 +1,27 @@
+//
+//  SUVersionDisplayProtocol.h
+//  EyeTV
+//
+//  Created by Uli Kusterer on 08.12.09.
+//  Copyright 2009 Elgato Systems GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+/*!
+    @protocol
+    @abstract	Implement this protocol to apply special formatting to the two
+				version numbers.
+*/
+@protocol SUVersionDisplay
+
+/*!
+    @method     
+    @abstract   An abstract method to format two version strings.
+    @discussion You get both so you can display important distinguishing
+				information, but leave out unnecessary/confusing parts.
+*/
+-(void)	formatVersion: (NSString**)inOutVersionA andVersion: (NSString**)inOutVersionB; 
+
+@end

Sparkle.framework/Versions/A/Headers/Sparkle.h

@@ -2,21 +2,20 @@
 //  Sparkle.h
 //  Sparkle
 //
-//  Created by Andy Matuschak on 3/16/06.
+//  Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#import "SUUpdater.h"
+#ifndef SPARKLE_H
-#import "SUUtilities.h"
+#define SPARKLE_H
-#import "SUConstants.h"
-#import "SUAppcast.h"
-#import "SUAppcastItem.h"
-#import "SUUpdateAlert.h"
-#import "SUAutomaticUpdateAlert.h"
-#import "SUStatusController.h"
-#import "SUUnarchiver.h"
-#import "SUStatusChecker.h"
 
-#import "NSApplication+AppCopies.h"
+// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
-#import "NSFileManager+Authentication.h"
+// there are name-space collisions) so we can list all of them to start with:
-#import "NSFileManager+Verification.h"
+
+#import <Sparkle/SUUpdater.h>
+
+#import <Sparkle/SUAppcast.h>
+#import <Sparkle/SUAppcastItem.h>
+#import <Sparkle/SUVersionComparisonProtocol.h>
+
+#endif

Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>13C64</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Autoupdate</string>
+	<key>CFBundleIconFile</key>
+	<string>Sparkle</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.andymatuschak.sparkle.Autoupdate</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.6</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.6</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>5B103i</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>13A595</string>
+	<key>DTSDKName</key>
+	<string>macosx10.9</string>
+	<key>DTXcode</key>
+	<string>0510</string>
+	<key>DTXcodeBuild</key>
+	<string>5B103i</string>
+	<key>LSBackgroundOnly</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.6</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources

@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/SUStatus.nib</key>
+		<data>
+		AY4YXjlQrzqM9SfsrxpSB1B1u+k=
+		</data>
+		<key>Resources/Sparkle.icns</key>
+		<data>
+		RAPi1GDm7RjA+JlOSVD1eYK+1VA=
+		</data>
+		<key>Resources/ar.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			dM38Ha/cZwg8Sls9xWHXg0+oKvQ=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/cs.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			FlXetLwR0j5/1odm0Db+H2CctTg=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/da.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			/IwCWEjabs9+XPC2kpnVYBcIsAU=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/de.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			QtXxl9WDwzVVxXrSvEcYxzgYnp8=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zzMk9fvGPMnNUAXXV/+jnYJnziE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/es.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			GrNcWzFjNuy3aBJY7IG8OL9BnEM=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/fr.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			5z8VRMQoNLwAyzB9My8omBTkKZA=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/is.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			d0sFFGqw9ifMmvrnHhIgvezLdfE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/it.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			HodRH2wN987WiLqfo9YkRcEa1AM=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ja.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			iRM0gMYfeAM58HxcdGHlGJqSFYc=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ko.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			72vg45GkQZIgSVEw6gTdm4ewl8c=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/nl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			8FkGwpespW8x/FyRktfq1gF03Rk=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			JBZVMxBpAMwrWcyc+dgE6K4wv3Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			m0/z0E7FyKhR88ARE7krxlBddIE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pt_PT.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			WnZVm2N1QLkSKFEXroDxWwQaEaI=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ro.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			H7PP1/P5528PLJWO/CMO22lrYSk=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ru.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zk1n3RGCHav3+MVeWQsPfR+ZSJo=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sk.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zt6PAVDMa8jGWGNq3+Ji28mrbBs=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			dgUB5F/WJ5Td9OA6QTa8c0FNn1I=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sv.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			BYZnFFxRUyXZshGKoeGKOKZUhvA=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/th.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			egT6SGyVhdOvD7rEK46LORU4AcI=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/tr.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			5DY87FLxTqUqML4xDc2ijrL/U/Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/uk.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			hL54lBspraUdyo0J8GLbd35jROY=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/zh_CN.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			wSKJNIlrBnFcVPjJctSy9AHpIlU=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/zh_TW.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			bkwIz4OBKwtmku2hCdjEC3hUCYo=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Resources/SUStatus.nib</key>
+		<data>
+		AY4YXjlQrzqM9SfsrxpSB1B1u+k=
+		</data>
+		<key>Resources/Sparkle.icns</key>
+		<data>
+		RAPi1GDm7RjA+JlOSVD1eYK+1VA=
+		</data>
+		<key>Resources/ar.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			dM38Ha/cZwg8Sls9xWHXg0+oKvQ=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/cs.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			FlXetLwR0j5/1odm0Db+H2CctTg=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/da.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			/IwCWEjabs9+XPC2kpnVYBcIsAU=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/de.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			QtXxl9WDwzVVxXrSvEcYxzgYnp8=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zzMk9fvGPMnNUAXXV/+jnYJnziE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/es.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			GrNcWzFjNuy3aBJY7IG8OL9BnEM=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/fr.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			5z8VRMQoNLwAyzB9My8omBTkKZA=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/is.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			d0sFFGqw9ifMmvrnHhIgvezLdfE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/it.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			HodRH2wN987WiLqfo9YkRcEa1AM=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ja.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			iRM0gMYfeAM58HxcdGHlGJqSFYc=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ko.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			72vg45GkQZIgSVEw6gTdm4ewl8c=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/nl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			8FkGwpespW8x/FyRktfq1gF03Rk=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			JBZVMxBpAMwrWcyc+dgE6K4wv3Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			m0/z0E7FyKhR88ARE7krxlBddIE=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/pt_PT.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			WnZVm2N1QLkSKFEXroDxWwQaEaI=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ro.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			H7PP1/P5528PLJWO/CMO22lrYSk=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/ru.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zk1n3RGCHav3+MVeWQsPfR+ZSJo=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sk.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			zt6PAVDMa8jGWGNq3+Ji28mrbBs=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sl.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			dgUB5F/WJ5Td9OA6QTa8c0FNn1I=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/sv.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			BYZnFFxRUyXZshGKoeGKOKZUhvA=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/th.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			egT6SGyVhdOvD7rEK46LORU4AcI=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/tr.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			5DY87FLxTqUqML4xDc2ijrL/U/Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/uk.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			hL54lBspraUdyo0J8GLbd35jROY=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/zh_CN.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			wSKJNIlrBnFcVPjJctSy9AHpIlU=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/zh_TW.lproj/Sparkle.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			bkwIz4OBKwtmku2hCdjEC3hUCYo=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

Sparkle.framework/Versions/A/Resources/Info.plist

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>12A269</string>
+	<string>13C64</string>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>Sparkle</string>
 	<key>CFBundleIdentifier</key>
@@ -16,23 +16,25 @@
 	<string>Sparkle</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>6f24f56</string>
 	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvmgcc42</string>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>4F1003</string>
+	<string>5B103i</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>9L31a</string>
+	<string>13A595</string>
 	<key>DTSDKName</key>
-	<string>macosx10.5</string>
+	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0441</string>
+	<string>0510</string>
 	<key>DTXcodeBuild</key>
-	<string>4F1003</string>
+	<string>5B103i</string>
 </dict>
 </plist>

Sparkle.framework/Versions/A/Resources/License.txt

@@ -0,0 +1,38 @@
+Copyright (c) 2006 Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=================
+EXTERNAL LICENSES
+=================
+
+License for bspatch.c and bsdiff.c, from bsdiff 4.3 (<http://www.daemonology.net/bsdiff/>:
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions 
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */

Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>ADP2,1</key>
+	<string>Developer Transition Kit</string>
+	<key>iMac1,1</key>
+	<string>iMac G3 (Rev A-D)</string>
+	<key>iMac4,1</key>
+	<string>iMac (Core Duo)</string>
+	<key>iMac4,2</key>
+	<string>iMac for Education (17-inch, Core Duo)</string>
+	<key>iMac5,1</key>
+	<string>iMac (Core 2 Duo, 17 or 20 inch, SuperDrive)</string>
+	<key>iMac5,2</key>
+	<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
+	<key>iMac6,1</key>
+	<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
+	<key>iMac8,1</key>
+	<string>iMac (April 2008)</string>
+	<key>MacBook1,1</key>
+	<string>MacBook (Core Duo)</string>
+	<key>MacBook2,1</key>
+	<string>MacBook (Core 2 Duo)</string>
+	<key>MacBook4,1</key>
+	<string>MacBook (Core 2 Duo Feb 2008)</string>
+	<key>MacBookAir1,1</key>
+	<string>MacBook Air (January 2008)</string>
+	<key>MacBookAir2,1</key>
+	<string>MacBook Air (June 2009)</string>
+	<key>MacBookAir3,1</key>
+	<string>MacBook Air (October 2010)</string>
+	<key>MacBookPro1,1</key>
+	<string>MacBook Pro Core Duo (15-inch)</string>
+	<key>MacBookPro1,2</key>
+	<string>MacBook Pro Core Duo (17-inch)</string>
+	<key>MacBookPro2,1</key>
+	<string>MacBook Pro Core 2 Duo (17-inch)</string>
+	<key>MacBookPro2,2</key>
+	<string>MacBook Pro Core 2 Duo (15-inch)</string>
+	<key>MacBookPro3,1</key>
+	<string>MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo)</string>
+	<key>MacBookPro3,2</key>
+	<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
+	<key>MacBookPro4,1</key>
+	<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
+	<key>Macmini1,1</key>
+	<string>Mac Mini (Core Solo/Duo)</string>
+	<key>MacPro1,1</key>
+	<string>Mac Pro (four-core)</string>
+	<key>MacPro2,1</key>
+	<string>Mac Pro (eight-core)</string>
+	<key>MacPro3,1</key>
+	<string>Mac Pro (January 2008 4- or 8- core &quot;Harpertown&quot;)</string>
+	<key>MacPro4,1</key>
+	<string>Mac Pro (March 2009)</string>
+	<key>MacPro5,1</key>
+	<string>Mac Pro (August 2010)</string>
+	<key>PowerBook1,1</key>
+	<string>PowerBook G3</string>
+	<key>PowerBook2,1</key>
+	<string>iBook G3</string>
+	<key>PowerBook2,2</key>
+	<string>iBook G3 (FireWire)</string>
+	<key>PowerBook2,3</key>
+	<string>iBook G3</string>
+	<key>PowerBook2,4</key>
+	<string>iBook G3</string>
+	<key>PowerBook3,1</key>
+	<string>PowerBook G3 (FireWire)</string>
+	<key>PowerBook3,2</key>
+	<string>PowerBook G4</string>
+	<key>PowerBook3,3</key>
+	<string>PowerBook G4 (Gigabit Ethernet)</string>
+	<key>PowerBook3,4</key>
+	<string>PowerBook G4 (DVI)</string>
+	<key>PowerBook3,5</key>
+	<string>PowerBook G4 (1GHz / 867MHz)</string>
+	<key>PowerBook4,1</key>
+	<string>iBook G3 (Dual USB, Late 2001)</string>
+	<key>PowerBook4,2</key>
+	<string>iBook G3 (16MB VRAM)</string>
+	<key>PowerBook4,3</key>
+	<string>iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003)</string>
+	<key>PowerBook5,1</key>
+	<string>PowerBook G4 (17 inch)</string>
+	<key>PowerBook5,2</key>
+	<string>PowerBook G4 (15 inch FW 800)</string>
+	<key>PowerBook5,3</key>
+	<string>PowerBook G4 (17-inch 1.33GHz)</string>
+	<key>PowerBook5,4</key>
+	<string>PowerBook G4 (15 inch 1.5/1.33GHz)</string>
+	<key>PowerBook5,5</key>
+	<string>PowerBook G4 (17-inch 1.5GHz)</string>
+	<key>PowerBook5,6</key>
+	<string>PowerBook G4 (15 inch 1.67GHz/1.5GHz)</string>
+	<key>PowerBook5,7</key>
+	<string>PowerBook G4 (17-inch 1.67GHz)</string>
+	<key>PowerBook5,8</key>
+	<string>PowerBook G4 (Double layer SD, 15 inch)</string>
+	<key>PowerBook5,9</key>
+	<string>PowerBook G4 (Double layer SD, 17 inch)</string>
+	<key>PowerBook6,1</key>
+	<string>PowerBook G4 (12 inch)</string>
+	<key>PowerBook6,2</key>
+	<string>PowerBook G4 (12 inch, DVI)</string>
+	<key>PowerBook6,3</key>
+	<string>iBook G4</string>
+	<key>PowerBook6,4</key>
+	<string>PowerBook G4 (12 inch 1.33GHz)</string>
+	<key>PowerBook6,5</key>
+	<string>iBook G4 (Early-Late 2004)</string>
+	<key>PowerBook6,7</key>
+	<string>iBook G4 (Mid 2005)</string>
+	<key>PowerBook6,8</key>
+	<string>PowerBook G4 (12 inch 1.5GHz)</string>
+	<key>PowerMac1,1</key>
+	<string>Power Macintosh G3 (Blue &amp; White)</string>
+	<key>PowerMac1,2</key>
+	<string>Power Macintosh G4 (PCI Graphics)</string>
+	<key>PowerMac10,1</key>
+	<string>Mac Mini G4</string>
+	<key>PowerMac10,2</key>
+	<string>Mac Mini (Late 2005)</string>
+	<key>PowerMac11,2</key>
+	<string>Power Macintosh G5 (Late 2005)</string>
+	<key>PowerMac12,1</key>
+	<string>iMac G5 (iSight)</string>
+	<key>PowerMac2,1</key>
+	<string>iMac G3 (Slot-loading CD-ROM)</string>
+	<key>PowerMac2,2</key>
+	<string>iMac G3 (Summer 2000)</string>
+	<key>PowerMac3,1</key>
+	<string>Power Macintosh G4 (AGP Graphics)</string>
+	<key>PowerMac3,2</key>
+	<string>Power Macintosh G4 (AGP Graphics)</string>
+	<key>PowerMac3,3</key>
+	<string>Power Macintosh G4 (Gigabit Ethernet)</string>
+	<key>PowerMac3,4</key>
+	<string>Power Macintosh G4 (Digital Audio)</string>
+	<key>PowerMac3,5</key>
+	<string>Power Macintosh G4 (Quick Silver)</string>
+	<key>PowerMac3,6</key>
+	<string>Power Macintosh G4 (Mirrored Drive Door)</string>
+	<key>PowerMac4,1</key>
+	<string>iMac G3 (Early/Summer 2001)</string>
+	<key>PowerMac4,2</key>
+	<string>iMac G4 (Flat Panel)</string>
+	<key>PowerMac4,4</key>
+	<string>eMac</string>
+	<key>PowerMac4,5</key>
+	<string>iMac G4 (17-inch Flat Panel)</string>
+	<key>PowerMac5,1</key>
+	<string>Power Macintosh G4 Cube</string>
+	<key>PowerMac6,1</key>
+	<string>iMac G4 (USB 2.0)</string>
+	<key>PowerMac6,3</key>
+	<string>iMac G4 (20-inch Flat Panel)</string>
+	<key>PowerMac6,4</key>
+	<string>eMac (USB 2.0, 2005)</string>
+	<key>PowerMac7,2</key>
+	<string>Power Macintosh G5</string>
+	<key>PowerMac7,3</key>
+	<string>Power Macintosh G5</string>
+	<key>PowerMac8,1</key>
+	<string>iMac G5</string>
+	<key>PowerMac8,2</key>
+	<string>iMac G5 (Ambient Light Sensor)</string>
+	<key>PowerMac9,1</key>
+	<string>Power Macintosh G5 (Late 2005)</string>
+	<key>RackMac1,1</key>
+	<string>Xserve G4</string>
+	<key>RackMac1,2</key>
+	<string>Xserve G4 (slot-loading, cluster node)</string>
+	<key>RackMac3,1</key>
+	<string>Xserve G5</string>
+	<key>Xserve1,1</key>
+	<string>Xserve (Intel Xeon)</string>
+	<key>Xserve2,1</key>
+	<string>Xserve (January 2008 quad-core)</string>
+</dict>
+</plist>