diff --git a/Classes/FanControl.h b/Classes/FanControl.h index cb55c6b..19f5a8f 100755 --- a/Classes/FanControl.h +++ b/Classes/FanControl.h @@ -117,6 +117,7 @@ - (IBAction)closePreferences:(id)sender; - (IBAction)savePreferences:(id)sender; - (IBAction)updateCheck:(id)sender; +- (IBAction)resetSettings:(id)sender; - (void)init_statusitem; diff --git a/Classes/FanControl.m b/Classes/FanControl.m index ed1cc0a..cccd7ad 100755 --- a/Classes/FanControl.m +++ b/Classes/FanControl.m @@ -635,6 +635,46 @@ - (IBAction)updateCheck:(id)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"]]; } diff --git a/Classes/smcWrapper.m b/Classes/smcWrapper.m index 2aea415..f33a16a 100755 --- a/Classes/smcWrapper.m +++ b/Classes/smcWrapper.m @@ -23,7 +23,7 @@ #import "smcWrapper.h" #import - +NSString * const smc_checksum=@"4c9919172e1111c660f12015a7324767"; NSArray *allSensors; @@ -37,34 +37,40 @@ +(void)cleanUp{ SMCClose(conn); } - ++(float)readTempSensors +{ + float retValue; + SMCVal_t val; + NSString *sensor = [[NSUserDefaults standardUserDefaults] objectForKey:@"TSensor"]; + SMCReadKey2((char*)[sensor UTF8String], &val,conn); + retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64; + allSensors = [NSArray arrayWithObjects:@"TC0D",@"TC0P",@"TCAD",@"TC0H",@"TC0F",@"TCAH",@"TCBH",nil]; + if (retValue<=0 || floor(retValue) == 129 ) { //workaround for some iMac Models + for (NSString *sensor in allSensors) { + SMCReadKey2((char*)[sensor UTF8String], &val,conn); + retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64; + if (retValue>0 && floor(retValue) != 129 ) { + [[NSUserDefaults standardUserDefaults] setObject:sensor forKey:@"TSensor"]; + [[NSUserDefaults standardUserDefaults] synchronize]; + break; + } + } + } + return retValue; +} +(float) get_maintemp{ float retValue; NSRange range_pro=[[MachineDefaults computerModel] rangeOfString:@"MacPro"]; if (range_pro.length > 0) { retValue = [smcWrapper get_mptemp]; - } else { - - SMCVal_t val; - NSString *sensor = [[NSUserDefaults standardUserDefaults] objectForKey:@"TSensor"]; - SMCReadKey2((char*)[sensor UTF8String], &val,conn); - retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64; - allSensors = [NSArray arrayWithObjects:@"TC0D",@"TC0P",@"TCAD",@"TC0H",@"TC0F",@"TCAH",@"TCBH",nil]; - if (retValue<=0 || floor(retValue) == 129 ) { //workaround for some iMac Models - for (NSString *sensor in allSensors) { - SMCReadKey2((char*)[sensor UTF8String], &val,conn); - retValue= ((val.bytes[0] * 256 + val.bytes[1]) >> 2)/64; - if (retValue>0 && floor(retValue) != 129 ) { - [[NSUserDefaults standardUserDefaults] setObject:sensor forKey:@"TSensor"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - break; - } - } + if (retValue<=0 || floor(retValue) == 129 ) { + retValue = [smcWrapper readTempSensors]; } + } else { + retValue = [smcWrapper readTempSensors]; } - - return retValue; + return retValue; } @@ -187,17 +193,27 @@ + (BOOL)validateSMC:(NSString*)path 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]; + for(int i = 0; iCFBundleExecutable smcFanControl CFBundleGetInfoString - smcFanControl 2.5, Hendrik Holtmann (GPL) + smcFanControl 2.5.2, Hendrik Holtmann (GPL) CFBundleIconFile smcfancontrol_v2 CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.5.1 + 2.5.2 CFBundleSignature ???? CFBundleVersion - 2.5.1 + 2.5.2 LSUIElement 1 NSHumanReadableCopyright diff --git a/Ressources/Dutch.lproj/Localizable.strings b/Ressources/Dutch.lproj/Localizable.strings index 6d2a119..854eb70 100644 --- a/Ressources/Dutch.lproj/Localizable.strings +++ b/Ressources/Dutch.lproj/Localizable.strings @@ -31,4 +31,12 @@ "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."; \ No newline at end of file +"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"; \ No newline at end of file diff --git a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib index a89216e..c5d8d78 100644 --- a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib @@ -70,7 +70,7 @@ {213, 107} - + 256 @@ -86,6 +86,7 @@ 4352 {295, 81} + YES NO @@ -95,6 +96,7 @@ 256 {295, 17} + @@ -339,6 +341,7 @@ {{1, 17}, {295, 81}} + @@ -350,6 +353,7 @@ -2147483392 {{282, 17}, {14, 81}} + NO _doScroller: @@ -365,6 +369,7 @@ -2147483392 {{-100, -100}, {295, 14}} + NO _doScroller: @@ -382,6 +387,7 @@ {{1, 0}, {295, 17}} + YES @@ -389,6 +395,7 @@ {{20, 292}, {297, 99}} + 133650 @@ -405,6 +412,7 @@ 264 {{73, 395}, {177, 22}} + YES @@ -482,6 +490,7 @@ 264 {{17, 397}, {54, 17}} + YES @@ -507,6 +516,7 @@ {{285, 392}, {37, 28}} + YES @@ -533,6 +543,7 @@ {{250, 392}, {37, 28}} + YES @@ -567,6 +578,7 @@ {{13, 85}, {278, 29}} + YES @@ -592,6 +604,7 @@ 264 {{107, 58}, {168, 22}} + YES @@ -663,6 +676,7 @@ 264 {{107, 33}, {168, 22}} + YES @@ -734,6 +748,7 @@ 264 {{107, 8}, {168, 22}} + YES @@ -805,6 +820,7 @@ 256 {{42, 60}, {63, 17}} + YES @@ -824,6 +840,7 @@ 256 {{25, 24}, {80, 28}} + YES @@ -843,6 +860,7 @@ 256 {{28, 10}, {77, 17}} + YES @@ -863,6 +881,7 @@ {{13, 116}, {261, 23}} + YES @@ -886,6 +905,7 @@ 256 {{13, 155}, {137, 28}} + YES @@ -905,6 +925,7 @@ 256 {{192, 166}, {80, 18}} + YES NO @@ -972,6 +993,7 @@ 256 {{13, 193}, {111, 14}} + YES @@ -991,6 +1013,7 @@ 264 {{74, 188}, {154, 22}} + YES @@ -1089,6 +1112,7 @@ {{13, 141}, {261, 23}} + YES @@ -1117,6 +1141,7 @@ {{233, 192}, {39, 17}} + YES NO @@ -1126,11 +1151,13 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} + {0, 0} @@ -1158,6 +1185,7 @@ {{242, 13}, {80, 28}} + YES 67108864 @@ -1183,6 +1211,7 @@ {{159, 13}, {85, 28}} + YES @@ -1207,6 +1236,7 @@ {{97, 289}, {150, 22}} + YES @@ -1235,9 +1265,11 @@ {337, 436} + + - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1871,7 +1903,7 @@ wGw {575, 603} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2064,7 +2096,7 @@ wGw {299, 327} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2146,13 +2178,21 @@ wGw - Controleer op updates + Controleer op updates... 1048576 2147483647 + + + Reset... + + 2147483647 + + + FAQ @@ -2364,7 +2404,7 @@ wGw {221, 145} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2493,7 +2533,7 @@ wGw {{1, 9}, {575, 665}} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2760,6 +2800,14 @@ wGw 784 + + + resetSettings: + + + + 881 + makeKeyAndOrderFront: @@ -3644,6 +3692,7 @@ wGw + @@ -4285,6 +4334,11 @@ wGw + + 880 + + + @@ -4449,14 +4503,350 @@ wGw com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 879 + 881 + + + + + FanControl + NSObject + + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + add_favorite: + id + + + changeMenu: + id + + + closePreferences: + id + + + close_favorite: + id + + + delete_favorite: + id + + + loginItem: + id + + + menuSelect: + id + + + paypal: + id + + + resetSettings: + id + + + savePreferences: + id + + + save_favorite: + id + + + syncSliders: + id + + + updateCheck: + id + + + visitHomepage: + id + + + + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + NSMenu + + + + DefaultsController + id + + + FanController + id + + + FavoritesController + id + + + TemperatureController + id + + + applybutton + id + + + autochange + id + + + colorSelector + id + + + copyright + id + + + currentSpeed + id + + + currentSpeed1 + id + + + faqText + id + + + faqWindow + id + + + field1 + id + + + field2 + id + + + levelIndicator + id + + + mainwindow + id + + + newfavorite_title + id + + + newfavoritewindow + id + + + programinfo + id + + + slider1 + id + + + slider2 + id + + + sliderCell + id + + + sync + id + + + syncslider + id + + + tabview + id + + + theMenu + NSMenu + + + + IBProjectSource + ../Classes/FanControl.h + + + + FanControl + + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + add_favorite: + id + + + changeMenu: + id + + + closePreferences: + id + + + close_favorite: + id + + + delete_favorite: + id + + + loginItem: + id + + + menuSelect: + id + + + paypal: + id + + + savePreferences: + id + + + save_favorite: + id + + + syncSliders: + id + + + updateCheck: + id + + + visitHomepage: + id + + + + IBProjectSource + ../Classes/FanControl.m + + + + StatusItemWindow + NSWindow + + IBProjectSource + ../Classes/StatusItemWindow.h + + + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + checkForUpdates: + + checkForUpdates: + id + + + + delegate + id + + + delegate + + delegate + id + + + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + - 0 IBCocoaFramework NO diff --git a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib index 532e0c2..d16419d 100644 Binary files a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/English.lproj/Localizable.strings b/Ressources/English.lproj/Localizable.strings index f9c586c..c9bc681 100644 Binary files a/Ressources/English.lproj/Localizable.strings and b/Ressources/English.lproj/Localizable.strings differ diff --git a/Ressources/English.lproj/MainMenu.nib/designable.nib b/Ressources/English.lproj/MainMenu.nib/designable.nib index 83341c6..8890a47 100644 --- a/Ressources/English.lproj/MainMenu.nib/designable.nib +++ b/Ressources/English.lproj/MainMenu.nib/designable.nib @@ -84,10 +84,10 @@ 4352 - {295, 98} + {295, 81} - + YES NO YES @@ -344,7 +344,7 @@ {{0, -17}, {295, 98}} - + 4 @@ -359,7 +359,7 @@ {{1, 0}, {295, 17}} - + YES @@ -370,7 +370,6 @@ - YES NO _doScroller: @@ -399,9 +398,9 @@ {{20, 292}, {297, 99}} - + YES - 133730 + 133666 @@ -1273,7 +1272,7 @@ - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1726,7 +1725,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1937,7 +1936,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1997,7 +1996,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - Info + Info & Support 1048576 2147483647 @@ -2006,7 +2005,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA submenuAction: - Info + Info & Support @@ -2019,13 +2018,21 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - Check for updates + Check for updates... 1048576 2147483647 + + + Reset... + + 2147483647 + + + FAQ @@ -2243,7 +2250,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA {221, 145} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2376,7 +2383,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA {575, 665} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2643,6 +2650,14 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA 784 + + + resetSettings: + + + + 938 + makeKeyAndOrderFront: @@ -3527,6 +3542,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA + @@ -4168,6 +4184,11 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA + + 937 + + + @@ -4320,12 +4341,13 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 936 + 938 @@ -4341,6 +4363,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA id id id + id id id id @@ -4380,6 +4403,10 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA paypal: id + + resetSettings: + id + savePreferences: id diff --git a/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib index 8e018a5..d902e53 100644 Binary files a/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/German.lproj/Localizable.strings b/Ressources/German.lproj/Localizable.strings index ca0ab8f..e1dbb8b 100644 --- a/Ressources/German.lproj/Localizable.strings +++ b/Ressources/German.lproj/Localizable.strings @@ -30,4 +30,12 @@ "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."; \ No newline at end of file +"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"; \ No newline at end of file diff --git a/Ressources/German.lproj/MainMenu.nib/designable.nib b/Ressources/German.lproj/MainMenu.nib/designable.nib index 7c8efb7..b69d4f9 100644 --- a/Ressources/German.lproj/MainMenu.nib/designable.nib +++ b/Ressources/German.lproj/MainMenu.nib/designable.nib @@ -86,6 +86,7 @@ 4352 {295, 81} + YES NO @@ -95,6 +96,7 @@ 256 {295, 17} + @@ -339,6 +341,7 @@ {{1, 17}, {295, 81}} + @@ -350,6 +353,7 @@ -2147483392 {{-100, -100}, {14, 81}} + NO _doScroller: @@ -365,6 +369,7 @@ -2147483392 {{-100, -100}, {295, 14}} + NO _doScroller: @@ -382,6 +387,7 @@ {{1, 0}, {295, 17}} + YES @@ -389,6 +395,7 @@ {{20, 292}, {297, 99}} + 133650 @@ -405,6 +412,7 @@ 264 {{73, 395}, {177, 22}} + YES @@ -482,6 +490,7 @@ 264 {{17, 399}, {54, 15}} + YES @@ -507,6 +516,7 @@ {{285, 392}, {37, 28}} + YES @@ -533,6 +543,7 @@ {{250, 392}, {37, 28}} + YES @@ -567,6 +578,7 @@ {{13, 85}, {272, 29}} + YES @@ -592,6 +604,7 @@ 264 {{107, 58}, {168, 22}} + YES @@ -663,6 +676,7 @@ 264 {{107, 33}, {168, 22}} + YES @@ -734,6 +748,7 @@ 264 {{107, 8}, {168, 22}} + YES @@ -805,6 +820,7 @@ 256 {{42, 63}, {63, 14}} + YES @@ -824,6 +840,7 @@ 256 {{42, 38}, {63, 14}} + YES @@ -843,6 +860,7 @@ 256 {{28, 13}, {77, 14}} + YES @@ -863,6 +881,7 @@ {{13, 116}, {261, 23}} + YES @@ -886,6 +905,7 @@ 256 {{13, 169}, {132, 14}} + YES @@ -905,6 +925,7 @@ 256 {{146, 166}, {80, 18}} + YES NO @@ -972,6 +993,7 @@ 256 {{13, 193}, {111, 14}} + YES @@ -991,6 +1013,7 @@ 264 {{74, 188}, {154, 22}} + YES @@ -1089,6 +1112,7 @@ {{13, 141}, {261, 23}} + YES @@ -1117,6 +1141,7 @@ {{233, 192}, {39, 17}} + YES NO @@ -1126,11 +1151,13 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} + {0, 0} @@ -1158,7 +1185,7 @@ {{240, 13}, {82, 28}} - + YES 67108864 @@ -1184,6 +1211,7 @@ {{157, 13}, {85, 28}} + YES @@ -1208,6 +1236,7 @@ {{97, 289}, {85, 22}} + YES @@ -1237,9 +1266,10 @@ {337, 436} + - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1692,7 +1722,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1893,7 +1923,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {299, 327} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1953,7 +1983,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - Info + Info & Support 1048576 2147483647 @@ -1962,7 +1992,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA submenuAction: - Info + Info & Support @@ -1975,13 +2005,21 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - Nach Updates suchen + Nach Updates suchen... 1048576 2147483647 + + + Zurücksetzen... + + 2147483647 + + + FAQ @@ -2194,7 +2232,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 {221, 145} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2323,7 +2361,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 {575, 665} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2598,6 +2636,14 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 774 + + + resetSettings: + + + + 873 + makeKeyAndOrderFront: @@ -3486,6 +3532,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 + @@ -4127,6 +4174,11 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 + + 872 + + + @@ -4278,12 +4330,13 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 871 + 873 @@ -4299,6 +4352,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 id id id + id id id id @@ -4338,6 +4392,10 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 paypal: id + + resetSettings: + id + savePreferences: id @@ -4598,6 +4656,17 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 id + + delegate + id + + + delegate + + delegate + id + + IBFrameworkSource Sparkle.framework/Headers/SUUpdater.h diff --git a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib index 3c0c20d..59b2282 100644 Binary files a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/Spanish.lproj/Localizable.strings b/Ressources/Spanish.lproj/Localizable.strings index 9378f55..db3f784 100644 --- a/Ressources/Spanish.lproj/Localizable.strings +++ b/Ressources/Spanish.lproj/Localizable.strings @@ -30,4 +30,12 @@ "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."; \ No newline at end of file +"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"; \ No newline at end of file diff --git a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib index 37932ec..f661114 100644 --- a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib @@ -70,7 +70,7 @@ {213, 107} - + 256 @@ -86,6 +86,7 @@ 4352 {295, 81} + YES NO @@ -95,6 +96,7 @@ 256 {295, 17} + @@ -339,6 +341,7 @@ {{1, 17}, {295, 81}} + @@ -350,6 +353,7 @@ -2147483392 {{282, 17}, {14, 81}} + NO _doScroller: @@ -365,6 +369,7 @@ -2147483392 {{-100, -100}, {295, 14}} + NO _doScroller: @@ -382,6 +387,7 @@ {{1, 0}, {295, 17}} + YES @@ -389,6 +395,7 @@ {{20, 292}, {297, 99}} + 133650 @@ -405,6 +412,7 @@ 264 {{73, 395}, {177, 22}} + YES @@ -482,6 +490,7 @@ 264 {{17, 397}, {54, 17}} + YES @@ -507,6 +516,7 @@ {{285, 392}, {37, 28}} + YES 67108864 @@ -532,6 +542,7 @@ {{250, 392}, {37, 28}} + YES 67108864 @@ -565,6 +576,7 @@ {{13, 92}, {239, 18}} + YES 603979776 @@ -589,6 +601,7 @@ 264 {{107, 58}, {168, 22}} + YES @@ -660,6 +673,7 @@ 264 {{107, 33}, {168, 22}} + YES @@ -731,6 +745,7 @@ 264 {{107, 8}, {168, 22}} + YES @@ -802,6 +817,7 @@ 256 {{42, 60}, {63, 17}} + YES @@ -821,6 +837,7 @@ 256 {{42, 35}, {63, 17}} + YES @@ -840,6 +857,7 @@ 256 {{28, 10}, {77, 17}} + YES @@ -860,6 +878,7 @@ {{13, 117}, {183, 18}} + YES 67108864 @@ -882,6 +901,7 @@ 256 {{13, 155}, {138, 28}} + YES @@ -901,6 +921,7 @@ 256 {{151, 166}, {80, 18}} + YES NO @@ -968,6 +989,7 @@ 256 {{13, 190}, {111, 17}} + YES @@ -987,6 +1009,7 @@ 264 {{54, 188}, {174, 22}} + YES @@ -1085,6 +1108,7 @@ {{13, 142}, {222, 18}} + YES 67108864 @@ -1112,6 +1136,7 @@ {{233, 192}, {39, 17}} + YES NO @@ -1121,11 +1146,13 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} + {0, 0} 67108864 @@ -1152,6 +1179,7 @@ {{242, 13}, {80, 28}} + YES 67108864 @@ -1177,6 +1205,7 @@ {{159, 13}, {85, 28}} + YES 67108864 @@ -1200,6 +1229,7 @@ {{97, 289}, {100, 22}} + YES 67108864 @@ -1227,9 +1257,11 @@ {337, 436} + + - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1679,7 +1711,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1872,7 +1904,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {299, 327} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1954,13 +1986,21 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - Comprobar actualizaciones + Comprobar actualizaciones... 1048576 2147483647 + + + Reajustar... + + 2147483647 + + + FAQ @@ -2172,7 +2212,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {221, 145} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2301,7 +2341,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 665} - {{0, 0}, {1440, 877}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2568,6 +2608,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 777 + + + resetSettings: + + + + 827 + makeKeyAndOrderFront: @@ -3452,6 +3500,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + @@ -4093,6 +4142,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 826 + + + @@ -4245,14 +4299,350 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 825 + 827 + + + + + FanControl + NSObject + + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + add_favorite: + id + + + changeMenu: + id + + + closePreferences: + id + + + close_favorite: + id + + + delete_favorite: + id + + + loginItem: + id + + + menuSelect: + id + + + paypal: + id + + + resetSettings: + id + + + savePreferences: + id + + + save_favorite: + id + + + syncSliders: + id + + + updateCheck: + id + + + visitHomepage: + id + + + + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + NSMenu + + + + DefaultsController + id + + + FanController + id + + + FavoritesController + id + + + TemperatureController + id + + + applybutton + id + + + autochange + id + + + colorSelector + id + + + copyright + id + + + currentSpeed + id + + + currentSpeed1 + id + + + faqText + id + + + faqWindow + id + + + field1 + id + + + field2 + id + + + levelIndicator + id + + + mainwindow + id + + + newfavorite_title + id + + + newfavoritewindow + id + + + programinfo + id + + + slider1 + id + + + slider2 + id + + + sliderCell + id + + + sync + id + + + syncslider + id + + + tabview + id + + + theMenu + NSMenu + + + + IBProjectSource + ../Classes/FanControl.h + + + + FanControl + + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + add_favorite: + id + + + changeMenu: + id + + + closePreferences: + id + + + close_favorite: + id + + + delete_favorite: + id + + + loginItem: + id + + + menuSelect: + id + + + paypal: + id + + + savePreferences: + id + + + save_favorite: + id + + + syncSliders: + id + + + updateCheck: + id + + + visitHomepage: + id + + + + IBProjectSource + ../Classes/FanControl.m + + + + StatusItemWindow + NSWindow + + IBProjectSource + ../Classes/StatusItemWindow.h + + + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + checkForUpdates: + + checkForUpdates: + id + + + + delegate + id + + + delegate + + delegate + id + + + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + - 0 IBCocoaFramework NO diff --git a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib index 2e6d7ec..ecac22b 100644 Binary files a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate b/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate index 9ee3e45..a3f0a06 100644 Binary files a/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate and b/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme b/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme index 10e8ea7..09b2011 100644 --- a/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme +++ b/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme @@ -47,7 +47,8 @@ buildConfiguration = "Release" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - allowLocationSimulation = "YES"> + allowLocationSimulation = "YES" + language = "en">