Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: hholtmann/smcFanControl
base: master
...
head fork: Daij-Djan/smcFanControl
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 41 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 12, 2012
@Daij-Djan Daij-Djan added ML Notification for fan speed changes
Signed-off-by: Dominik Pich <Dominik@pich.info>
459f6f9
Commits on Sep 14, 2012
@Daij-Djan Daij-Djan ignore build files
Signed-off-by: Dominik Pich <Dominik@pich.info>
7760418
@Daij-Djan Daij-Djan now calling [NSApp deactivate] so ML NC shows our notifications
Signed-off-by: Dominik Pich <Dominik@pich.info>
ff63378
Commits on Sep 20, 2012
@Daij-Djan Daij-Djan checksum now determined by script, removed some logs
Signed-off-by: Dominik Pich <Dominik@pich.info>
89269d7
Showing with 987 additions and 319 deletions.
  1. +4 −0 .gitignore
  2. +2 −4 Classes/FanControl.h
  3. +77 −16 Classes/FanControl.m
  4. +3 −4 Classes/MachineDefaults.h
  5. +8 −5 Classes/MachineDefaults.m
  6. +0 −2  Classes/Power.h
  7. +0 −6 Classes/Power.m
  8. +12 −3 Classes/smcWrapper.m
  9. +4 −4 Info.plist
  10. 0  {Ressources → Resources}/Dutch.lproj/F.A.Q.rtf
  11. 0  {Ressources → Resources}/Dutch.lproj/InfoPlist.strings
  12. 0  {Ressources → Resources}/Dutch.lproj/Localizable.strings
  13. +176 −60 {Ressources → Resources}/Dutch.lproj/MainMenu.nib/designable.nib
  14. BIN  Resources/Dutch.lproj/MainMenu.nib/keyedobjects.nib
  15. +10 −2 {Ressources → Resources}/English.lproj/F.A.Q.rtf
  16. 0  {Ressources → Resources}/English.lproj/InfoPlist.strings
  17. 0  {Ressources → Resources}/English.lproj/Localizable.strings
  18. +248 −73 {Ressources → Resources}/English.lproj/MainMenu.nib/designable.nib
  19. BIN  Resources/English.lproj/MainMenu.nib/keyedobjects.nib
  20. 0  {Ressources → Resources}/German.lproj/F.A.Q.rtf
  21. 0  {Ressources → Resources}/German.lproj/InfoPlist.strings
  22. 0  {Ressources → Resources}/German.lproj/Localizable.strings
  23. +164 −49 {Ressources → Resources}/German.lproj/MainMenu.nib/designable.nib
  24. BIN  Resources/German.lproj/MainMenu.nib/keyedobjects.nib
  25. 0  {Ressources → Resources}/Machines.plist
  26. 0  {Ressources → Resources}/Spanish.lproj/F.A.Q.rtf
  27. 0  {Ressources → Resources}/Spanish.lproj/InfoPlist.strings
  28. 0  {Ressources → Resources}/Spanish.lproj/Localizable.strings
  29. +210 −60 {Ressources → Resources}/Spanish.lproj/MainMenu.nib/designable.nib
  30. BIN  Resources/Spanish.lproj/MainMenu.nib/keyedobjects.nib
  31. 0  {Ressources → Resources}/paypal.gif
  32. 0  {Ressources → Resources}/smc.png
  33. 0  {Ressources → Resources}/smcfancontrol_v2.icns
  34. 0  {Ressources → Resources}/smcover.png
  35. 0  {Ressources → Resources}/tsensors.plist
  36. BIN  Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib
  37. BIN  Ressources/English.lproj/MainMenu.nib/keyedobjects.nib
  38. BIN  Ressources/German.lproj/MainMenu.nib/keyedobjects.nib
  39. BIN  Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib
  40. BIN  icon.png
  41. +69 −31 smcFanControl.xcodeproj/project.pbxproj
View
4 .gitignore
@@ -0,0 +1,4 @@
+/build/
+/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/dominik.xcuserdatad/
+/smcFanControl.xcodeproj/xcuserdata/dominik.xcuserdatad/
+/InfoPlist.h
View
6 Classes/FanControl.h
@@ -25,7 +25,7 @@
#import <smc.h>
#import <smcWrapper.h>
#import <MachineDefaults.h>
-
+#import <Sparkle/SUUpdater.h>
#import <Power.h>
#include <mach/mach_port.h>
#include <mach/mach_interface.h>
@@ -105,10 +105,8 @@
NSImage *menu_image;
NSImage *menu_image_alt;
-
-
+ IBOutlet SUUpdater *updater;
}
-
-(void)terminate:(id)sender;
- (IBAction)paypal:(id)sender;
View
93 Classes/FanControl.m
@@ -26,15 +26,8 @@
#import <Security/Authorization.h>
#import <Security/AuthorizationDB.h>
#import <Security/AuthorizationTags.h>
-#import <Sparkle/SUUpdater.h>
#import "SystemVersion.h"
-@interface FanControl ()
-+(void)copyMachinesIfNecessary;
-- (BOOL)isInAutoStart;
-- (void) setStartAtLogin:(BOOL)enabled;
-@end
-
@implementation FanControl
io_connect_t conn;
@@ -99,6 +92,11 @@ -(void)upgradeFavorites
}
+- (NSNumber*)hasNSUserNotification {
+ BOOL hasNSUserNotification = (NSClassFromString(@"NSUserNotification") != nil);
+ return [NSNumber numberWithBool:hasNSUserNotification];
+}
+
-(void) awakeFromNib {
s_sed = nil;
@@ -113,7 +111,7 @@ -(void) awakeFromNib {
mdefaults=[[MachineDefaults alloc] init:nil];
- s_sed=[mdefaults get_machine_defaults];
+ s_sed=[mdefaults copy_machine_defaults];
NSMutableArray *favorites=[NSMutableArray arrayWithObjects:
@@ -125,7 +123,7 @@ -(void) awakeFromNib {
//for macbooks add a second default
MachineDefaults *msdefaults=[[MachineDefaults alloc] init:nil];
NSMutableDictionary *sec_fav=[NSMutableDictionary dictionaryWithObjectsAndKeys:@"Higher RPM", @"Title",
- [[msdefaults get_machine_defaults] objectForKey:@"Fans"], @"FanData",nil];
+ [[[msdefaults copy_machine_defaults] autorelease] objectForKey:@"Fans"], @"FanData",nil];
[favorites addObject:sec_fav];
int i;
for (i=0;i<[[s_sed objectForKey:@"Fans"] count];i++) {
@@ -157,7 +155,8 @@ -(void) awakeFromNib {
[NSNumber numberWithInt:0], @"Unit",
[NSNumber numberWithInt:0], @"SelDefault",
[NSNumber numberWithBool:NO], @"AutoStart",
- [NSNumber numberWithBool:NO],@"AutomaticChange",
+ [NSNumber numberWithBool:NO], @"AutomaticChange",
+ [NSNumber numberWithBool:NO], @"NotificationCenter",
[NSNumber numberWithInt:0],@"selbatt",
[NSNumber numberWithInt:0],@"selac",
[NSNumber numberWithInt:0],@"selload",
@@ -245,7 +244,6 @@ -(void)init_statusitem{
};
}
-
#pragma mark **Action-Methods**
- (IBAction)loginItem:(id)sender{
if ([sender state]==NSOnState) {
@@ -271,7 +269,7 @@ - (IBAction)close_favorite:(id)sender{
- (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 copy_machine_defaults] autorelease] objectForKey:@"Fans"],@"FanData",nil]; //default as template
[toinsert setValue:[NSNumber numberWithInt:0] forKey:@"Standard"];
[FavoritesController addObject:toinsert];
[toinsert release];
@@ -406,6 +404,70 @@ -(void) readFanData:(NSTimer*)timer{
[s_status release];
}
+
+ //--- NOTIFICATION CENTER
+ BOOL postEnabled = [[defaults objectForKey:@"NotificationCenter"] boolValue];
+ if(postEnabled) {
+ [self sendNotificationIfNeeded:fan.doubleValue];
+ }
+}
+
+- (void)sendNotificationIfNeeded:(double)newFanValue {
+ //see if fans changed, have a static var to save old value
+ static double _oldFanValue = NSNotFound;
+ if(_oldFanValue == NSNotFound) {
+ _oldFanValue = newFanValue;
+ return;
+ }
+
+// NSLog(@"%f - %f = %f", newFanValue, _oldFanValue, fabs(newFanValue - _oldFanValue));
+
+ //check for change
+ static BOOL _needsChangeOfSpeed = YES;
+ if(_needsChangeOfSpeed) {
+ BOOL changeWasNotBigEnough = fabs(newFanValue - _oldFanValue) < 500;
+ if(changeWasNotBigEnough) {
+// NSLog(@"_needsChangeOfSpeed but changeWasNotBigEnough");
+ return;
+ }
+ _needsChangeOfSpeed = NO;
+
+ //save
+ _oldFanValue = newFanValue;
+// NSLog(@"save");
+ return;
+ }
+
+ //check for stability
+ static BOOL _needsStability = YES;
+ if(_needsStability) {
+ BOOL changeWasTooBig = fabs(newFanValue - _oldFanValue) >= 500;
+ if(changeWasTooBig) {
+// NSLog(@"_needsStability but changeWasTooBig");
+
+ //save
+ _oldFanValue = newFanValue;
+// NSLog(@"save");
+ return;
+ }
+ _needsStability = NO;
+ }
+
+ //do notifications IF we want to
+// NSLog(@"Post %d", [[defaults objectForKey:@"NotificationCenter"] boolValue]);
+ [[NSUserNotificationCenter defaultUserNotificationCenter] removeAllDeliveredNotifications];
+ NSUserNotification *note = [[NSUserNotification alloc] init];
+ note.title = [NSString stringWithFormat:@"Fan at %f RPM", newFanValue];
+
+ [NSApp deactivate]; //we need this because the center often doesnt present |note| when we are active
+ [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:note];
+
+ //save
+ _oldFanValue = newFanValue;
+
+ //reset
+ _needsChangeOfSpeed = YES;
+ _needsStability = YES;
}
@@ -470,7 +532,6 @@ -(void)apply_quickselect:(id)sender{
[self apply_settings:sender controllerindex:[[[theMenu itemWithTag:1] submenu] indexOfItem:sender]];
}
-
-(void)terminate:(id)sender{
//get last active selection
[defaults synchronize];
@@ -524,7 +585,7 @@ - (IBAction)menuSelect:(id)sender{
//just a helper to bringt update-info-window to the front
- (IBAction)updateCheck:(id)sender{
- [[[SUUpdater alloc] init] checkForUpdates:sender];
+ [updater checkForUpdates:sender];
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
}
@@ -589,7 +650,7 @@ - (BOOL)isInAutoStart
LSSharedFileListRef loginItems = LSSharedFileListCreate(kCFAllocatorDefault, kLSSharedFileListSessionLoginItems, /*options*/ NULL);
NSString *path = [[NSBundle mainBundle] bundlePath];
CFURLRef URLToToggle = (CFURLRef)[NSURL fileURLWithPath:path];
- LSSharedFileListItemRef existingItem = NULL;
+ //LSSharedFileListItemRef existingItem = NULL;
UInt32 seed = 0U;
NSArray *currentLoginItems = [NSMakeCollectable(LSSharedFileListCopySnapshot(loginItems, &seed)) autorelease];
@@ -605,7 +666,7 @@ - (BOOL)isInAutoStart
CFRelease(URL);
if (foundIt) {
- existingItem = item;
+ //existingItem = item;
found = YES;
break;
}
View
7 Classes/MachineDefaults.h
@@ -30,8 +30,7 @@
int machine_num;
}
- + (NSString *)computerModel;
- - (id)init:(NSString*)p_machine;
- -(NSDictionary*)get_machine_defaults;
- - (void)dealloc;
++ (NSString *)computerModel;
+- (id)init:(NSString*)p_machine;
+-(NSDictionary*)copy_machine_defaults;
@end
View
13 Classes/MachineDefaults.m
@@ -27,8 +27,11 @@ @implementation MachineDefaults
- (id)init:(NSString*)p_machine{
- machine=[MachineDefaults computerModel];
- supported_machines=[[NSArray alloc] initWithContentsOfFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"]];
+ self = [super init];
+ if(self) {
+ machine=[MachineDefaults computerModel];
+ supported_machines=[[NSArray alloc] initWithContentsOfFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"]];
+ }
return self;
}
@@ -83,13 +86,13 @@ -(NSDictionary*) readfrom_smc{
[xmldata writeToFile:[[[NSFileManager defaultManager] applicationSupportDirectory] stringByAppendingPathComponent:@"Machines.plist"] atomically:YES];
[supported_m release];
//return new machine-live-data
- return [new_machine retain];
+ return new_machine;
}
--(NSDictionary*)get_machine_defaults{
+-(NSDictionary*)copy_machine_defaults{
NSDictionary *m_defaults=nil;
if ([self is_supported]) {
m_defaults=[self readfrom_plist];
@@ -111,7 +114,7 @@ -(NSDictionary*)get_machine_defaults{
}
}
- return m_defaults;
+ return [m_defaults retain];
}
+ (NSString *)computerModel
View
2  Classes/Power.h
@@ -37,8 +37,6 @@
}
-- (id)init;
-
- (id)delegate;
- (void)setDelegate:(id)new_delegate;
View
6 Classes/Power.m
@@ -55,12 +55,6 @@ static void powerSourceChanged(void * refCon)
CFRelease(powerSourcesList);
}
-- (id)init{
- [super init];
- return self;
-}
-
-
- (void)registerForSleepWakeNotification
{
root_port = IORegisterForSystemPower(self, &notificationPort, SleepWatcher, &notifier);
View
15 Classes/smcWrapper.m
@@ -19,11 +19,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "InfoPlist.h"
#import "smcWrapper.h"
#import <CommonCrypto/CommonDigest.h>
-NSString * const smc_checksum=@"2ea544babe8a58dccc1364c920d473c8";
static NSDictionary *tsensors = nil;
@implementation smcWrapper
@@ -61,6 +61,7 @@ +(float) get_maintemp{
if (c_temp>0) break;
}
}
+ [allTSensors release];
}
return c_temp;
@@ -170,11 +171,19 @@ + (NSString*)createCheckSum:(NSString*)path {
//call smc binary with setuid rights and apply
+(void)setKey_external:(NSString *)key value:(NSString *)value{
NSString *launchPath = [[NSBundle mainBundle] pathForResource:@"smc" ofType:@""];
+ if(!launchPath) {
+ NSLog(@"ERROR: smcFanControl: Security Error: no smc-binary found. wont apply settings");
+ return;
+ }
//first check if it's the right binary (security)
NSString *checksum=[smcWrapper createCheckSum:launchPath];
- if (![checksum isEqualToString:smc_checksum]) {
- NSLog(@"smcFanControl: Security Error: smc-binary is not the distributed one");
+ if (![checksum isEqualToString:SMC_CHECKSUM]) {
+#ifdef DEBUG
+ NSLog(@"WARN: smcFanControl: Security Error: smc-binary is not the distributed one, will use it anyways in DEBUG mode");
+#else
+ NSLog(@"ERROR: smcFanControl: Security Error: smc-binary is not the distributed one. wont apply settings");
return;
+#endif
}
NSArray *argsArray = [NSArray arrayWithObjects: @"-k",key,@"-w",value,nil];
NSTask *task;
View
8 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.4.1, Hendrik Holtmann (GPL)</string>
<key>CFBundleIconFile</key>
<string>smcfancontrol_v2</string>
<key>CFBundleIdentifier</key>
@@ -19,15 +19,15 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4</string>
+ <string>2.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4</string>
+ <string>2.4.1</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>
View
0  Ressources/Dutch.lproj/F.A.Q.rtf → Resources/Dutch.lproj/F.A.Q.rtf
File renamed without changes
View
0  Ressources/Dutch.lproj/InfoPlist.strings → Resources/Dutch.lproj/InfoPlist.strings
File renamed without changes
View
0  Ressources/Dutch.lproj/Localizable.strings → Resources/Dutch.lproj/Localizable.strings
File renamed without changes
View
236 ...s/Dutch.lproj/MainMenu.nib/designable.nib → ...s/Dutch.lproj/MainMenu.nib/designable.nib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">12A269</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.SystemVersion">12B19</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2829</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.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">2829</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSArrayController</string>
@@ -60,7 +60,7 @@
<object class="NSWindowTemplate" id="745393535">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{519, 155}, {337, 436}}</string>
+ <string key="NSWindowRect">{{519, 155}, {337, 453}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">smcFanControl</string>
<string key="NSWindowClass">StatusItemWindow</string>
@@ -87,6 +87,7 @@
<string key="NSFrameSize">{295, 81}</string>
<reference key="NSSuperview" ref="66125443"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="376513767"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -96,6 +97,7 @@
<string key="NSFrameSize">{295, 17}</string>
<reference key="NSSuperview" ref="486708331"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="66125443"/>
<reference key="NSTableView" ref="547650058"/>
</object>
<object class="_NSCornerView" key="NSCornerView">
@@ -267,9 +269,9 @@
<string key="NSString">0</string>
<dictionary key="NSAttributes" id="81173466"/>
</object>
- <string key="decimalSeparator">,</string>
+ <string key="decimalSeparator">.</string>
<integer value="1000" key="formatterBehavior"/>
- <string key="groupingSeparator">.</string>
+ <string key="groupingSeparator">,</string>
<string key="negativeFormat">-0</string>
<string key="positiveFormat">0</string>
<boolean value="NO" key="usesGroupingSeparator"/>
@@ -296,8 +298,8 @@
</object>
<reference key="NS.max" ref="466926324"/>
<nil key="NS.rounding"/>
- <string key="NS.decimal">,</string>
- <string key="NS.thousand">.</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
@@ -355,6 +357,7 @@
<string key="NSFrame">{{282, 17}, {14, 81}}</string>
<reference key="NSSuperview" ref="947742182"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="910861855"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="947742182"/>
@@ -367,6 +370,7 @@
<string key="NSFrame">{{1, 84}, {295, 14}}</string>
<reference key="NSSuperview" ref="947742182"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="357210889"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="947742182"/>
@@ -388,10 +392,10 @@
<int key="NScvFlags">4</int>
</object>
</array>
- <string key="NSFrame">{{20, 292}, {297, 99}}</string>
+ <string key="NSFrame">{{20, 309}, {297, 99}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="66125443"/>
+ <reference key="NSNextKeyView" ref="486708331"/>
<int key="NSsFlags">133170</int>
<reference key="NSVScroller" ref="357210889"/>
<reference key="NSHScroller" ref="376513767"/>
@@ -405,9 +409,10 @@
<object class="NSPopUpButton" id="569926231">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{73, 395}, {177, 22}}</string>
+ <string key="NSFrame">{{73, 412}, {177, 22}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="986218956"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="898067172">
<int key="NSCellFlags">-2076180416</int>
@@ -482,7 +487,7 @@
<object class="NSTextField" id="245431366">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 397}, {54, 17}}</string>
+ <string key="NSFrame">{{17, 414}, {54, 17}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="569926231"/>
@@ -506,9 +511,10 @@
<object class="NSButton" id="252395473">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{285, 392}, {37, 28}}</string>
+ <string key="NSFrame">{{285, 409}, {37, 28}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="498323828"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="809563853">
<int key="NSCellFlags">67108864</int>
@@ -531,7 +537,7 @@
<object class="NSButton" id="986218956">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{250, 392}, {37, 28}}</string>
+ <string key="NSFrame">{{250, 409}, {37, 28}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="252395473"/>
@@ -565,9 +571,10 @@
<object class="NSButton" id="1052343400">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 85}, {278, 29}}</string>
+ <string key="NSFrame">{{13, 77}, {278, 29}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="122494031"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="44648956">
<int key="NSCellFlags">603979776</int>
@@ -590,9 +597,10 @@
<object class="NSPopUpButton" id="31179332">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 58}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 61}, {168, 22}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="695337844"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="305324046">
<int key="NSCellFlags">-2076180416</int>
@@ -661,9 +669,10 @@
<object class="NSPopUpButton" id="1058079857">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 33}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 36}, {168, 22}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="262651359"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="578752891">
<int key="NSCellFlags">-2076180416</int>
@@ -732,9 +741,10 @@
<object class="NSPopUpButton" id="501512619">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 8}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 11}, {168, 22}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="610454875"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="690549531">
<int key="NSCellFlags">-2076180416</int>
@@ -803,9 +813,10 @@
<object class="NSTextField" id="122494031">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{42, 60}, {63, 17}}</string>
+ <string key="NSFrame">{{42, 63}, {63, 17}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="31179332"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="838837073">
<int key="NSCellFlags">67108864</int>
@@ -821,9 +832,10 @@
<object class="NSTextField" id="695337844">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{25, 24}, {80, 28}}</string>
+ <string key="NSFrame">{{25, 27}, {80, 28}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1058079857"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="480408954">
<int key="NSCellFlags">67108864</int>
@@ -839,9 +851,10 @@
<object class="NSTextField" id="262651359">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{28, 10}, {77, 17}}</string>
+ <string key="NSFrame">{{28, 13}, {77, 17}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="501512619"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="437138997">
<int key="NSCellFlags">67108864</int>
@@ -857,9 +870,10 @@
<object class="NSButton" id="804304236">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 116}, {261, 23}}</string>
+ <string key="NSFrame">{{13, 134}, {261, 23}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="116647029"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="811829449">
<int key="NSCellFlags">67108864</int>
@@ -880,9 +894,10 @@
<object class="NSTextField" id="832576590">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 155}, {137, 28}}</string>
+ <string key="NSFrame">{{13, 171}, {137, 28}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="55886499"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="489224044">
<int key="NSCellFlags">67108864</int>
@@ -898,9 +913,10 @@
<object class="NSMatrix" id="55886499">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{192, 166}, {80, 18}}</string>
+ <string key="NSFrame">{{192, 182}, {80, 18}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="579276543"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">1</int>
@@ -965,9 +981,10 @@
<object class="NSTextField" id="931777478">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 193}, {111, 14}}</string>
+ <string key="NSFrame">{{13, 209}, {111, 14}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="301926071"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="357894692">
<int key="NSCellFlags">67108864</int>
@@ -983,9 +1000,10 @@
<object class="NSPopUpButton" id="301926071">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{74, 188}, {154, 22}}</string>
+ <string key="NSFrame">{{74, 204}, {154, 22}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="495658388"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="110429129">
<int key="NSCellFlags">71303232</int>
@@ -1080,9 +1098,10 @@
<object class="NSButton" id="579276543">
<reference key="NSNextResponder" ref="126393833"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 141}, {261, 23}}</string>
+ <string key="NSFrame">{{13, 157}, {261, 23}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="804304236"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="397019942">
<int key="NSCellFlags">67108864</int>
@@ -1108,23 +1127,51 @@
<characters key="NS.bytes">NSColor pasteboard type</characters>
</object>
</set>
- <string key="NSFrame">{{233, 192}, {39, 17}}</string>
+ <string key="NSFrame">{{233, 208}, {39, 17}}</string>
<reference key="NSSuperview" ref="126393833"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="832576590"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSIsBordered">YES</bool>
<reference key="NSColor" ref="384039964"/>
</object>
+ <object class="NSButton" id="116647029">
+ <reference key="NSNextResponder" ref="126393833"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{13, 106}, {263, 28}}</string>
+ <reference key="NSSuperview" ref="126393833"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1052343400"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="983676213">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">131072</int>
+ <string type="base64-UTF8" key="NSContents">VG9vbiBNb3VudGFpbiBMaW9uIG1lbGRpbmdlbgpvcCBncm90ZSBzbmVsaGVpZCB2YW4gZGUgdmVudGls
+YXRvciB2ZXJhbmRlcnQ</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="116647029"/>
+ <int key="NSButtonFlags">1211912448</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="1071850612"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
</array>
- <string key="NSFrame">{{2, 2}, {299, 226}}</string>
+ <string key="NSFrame">{{2, 2}, {299, 242}}</string>
<reference key="NSSuperview" ref="618214823"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="931777478"/>
</object>
</array>
- <string key="NSFrame">{{17, 41}, {303, 243}}</string>
+ <string key="NSFrame">{{17, 42}, {303, 259}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="126393833"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67108864</int>
@@ -1146,9 +1193,10 @@
<object class="NSButton" id="193000782">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{242, 13}, {80, 28}}</string>
+ <string key="NSFrame">{{242, 14}, {80, 28}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="201332166">
<int key="NSCellFlags">67108864</int>
@@ -1171,9 +1219,10 @@
<object class="NSButton" id="610454875">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{159, 13}, {85, 28}}</string>
+ <string key="NSFrame">{{159, 14}, {85, 28}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="193000782"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="395331208">
<int key="NSCellFlags">67108864</int>
@@ -1194,9 +1243,10 @@
<object class="NSButton" id="910861855">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{100, 375}, {141, 16}}</string>
+ <string key="NSFrame">{{100, 392}, {141, 16}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="895199888"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="693533234">
<int key="NSCellFlags">603979776</int>
@@ -1227,9 +1277,10 @@
<object class="NSButton" id="498323828">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{19, 375}, {81, 16}}</string>
+ <string key="NSFrame">{{19, 392}, {81, 16}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="947742182"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="134119392">
<int key="NSCellFlags">603979776</int>
@@ -1252,9 +1303,10 @@
<object class="NSButton" id="895199888">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{240, 375}, {76, 16}}</string>
+ <string key="NSFrame">{{240, 392}, {76, 16}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="918662982"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="331553137">
<int key="NSCellFlags">603979776</int>
@@ -1277,9 +1329,10 @@
<object class="NSButton" id="918662982">
<reference key="NSNextResponder" ref="431031305"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{97, 289}, {142, 22}}</string>
+ <string key="NSFrame">{{97, 306}, {142, 22}}</string>
<reference key="NSSuperview" ref="431031305"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="618214823"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="730439229">
<int key="NSCellFlags">67108864</int>
@@ -1302,9 +1355,10 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{337, 436}</string>
+ <string key="NSFrameSize">{337, 453}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="245431366"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -1347,7 +1401,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="381846659">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSScrollView" id="346431778">
@@ -1363,8 +1417,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{573, 3934}</string>
<reference key="NSSuperview" ref="779698223"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="902191255"/>
+ <reference key="NSNextKeyView" ref="445745715"/>
<object class="NSTextContainer" key="NSTextContainer" id="1072395191">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -1647,7 +1700,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="130159937"/>
@@ -1685,7 +1738,6 @@ Uwo</bytes>
</array>
<string key="NSFrame">{{1, 1}, {573, 601}}</string>
<reference key="NSSuperview" ref="346431778"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="505608133"/>
<reference key="NSDocView" ref="505608133"/>
<reference key="NSBGColor" ref="130159937"/>
@@ -1849,7 +1901,6 @@ wGw</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{558, 1}, {16, 601}}</string>
<reference key="NSSuperview" ref="346431778"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="346431778"/>
@@ -1861,7 +1912,6 @@ wGw</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="346431778"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="779698223"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -1873,8 +1923,7 @@ wGw</bytes>
</array>
<string key="NSFrameSize">{575, 603}</string>
<reference key="NSSuperview" ref="381846659"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="445745715"/>
+ <reference key="NSNextKeyView" ref="779698223"/>
<int key="NSsFlags">133714</int>
<reference key="NSVScroller" ref="902191255"/>
<reference key="NSHScroller" ref="445745715"/>
@@ -1886,8 +1935,6 @@ wGw</bytes>
</object>
</array>
<string key="NSFrameSize">{575, 603}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="346431778"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1917,6 +1964,7 @@ wGw</bytes>
<string key="NSFrame">{{97, 280}, {262, 19}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="125310941"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1046736199">
<int key="NSCellFlags">67108864</int>
@@ -1939,6 +1987,7 @@ wGw</bytes>
<string key="NSFrame">{{99, 235}, {143, 37}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="6071827"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="8816090">
<int key="NSCellFlags">67108864</int>
@@ -1961,6 +2010,7 @@ wGw</bytes>
<string key="NSFrame">{{121, 23}, {66, 37}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="936787261">
<int key="NSCellFlags">67108864</int>
@@ -1986,11 +2036,12 @@ wGw</bytes>
<string key="NSFrame">{{17, 119}, {265, 29}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="980169086"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="942414471">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">Sujay Thomas</string>
+ <string key="NSContents">Sujay Thomas en Dominik Pich</string>
<reference key="NSSupport" ref="847624022"/>
<reference key="NSControlView" ref="232191628"/>
<reference key="NSBackgroundColor" ref="447094347"/>
@@ -2001,14 +2052,15 @@ wGw</bytes>
<object class="NSTextField" id="1021481905">
<reference key="NSNextResponder" ref="91098791"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 150}, {114, 17}}</string>
+ <string key="NSFrame">{{17, 150}, {265, 17}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="232191628"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="211269790">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">Icon-Design:</string>
+ <string key="NSContents">Icoon ontwerp en andere bijdragen:</string>
<reference key="NSSupport" ref="847624022"/>
<reference key="NSControlView" ref="1021481905"/>
<reference key="NSBackgroundColor" ref="447094347"/>
@@ -2022,6 +2074,7 @@ wGw</bytes>
<string key="NSFrame">{{17, 59}, {265, 52}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="923674381"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="477307234">
<int key="NSCellFlags">67108864</int>
@@ -2040,6 +2093,7 @@ wGw</bytes>
<string key="NSFrame">{{17, 180}, {265, 51}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1021481905"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="573427922">
<int key="NSCellFlags">67108864</int>
@@ -2066,6 +2120,7 @@ wGw</bytes>
<string key="NSFrame">{{20, 235}, {64, 64}}</string>
<reference key="NSSuperview" ref="91098791"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="176306129"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="331797913">
<int key="NSCellFlags">134217728</int>
@@ -2086,6 +2141,7 @@ wGw</bytes>
<string key="NSFrameSize">{299, 327}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="195110620"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -2404,7 +2460,7 @@ wGw</bytes>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="312131081">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSScrollView" id="885338749">
@@ -2420,6 +2476,8 @@ wGw</bytes>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{573, 663}</string>
<reference key="NSSuperview" ref="958991311"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<object class="NSTextContainer" key="NSTextContainer" id="46151088">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -2463,6 +2521,7 @@ wGw</bytes>
</array>
<string key="NSFrame">{{1, 1}, {573, 663}}</string>
<reference key="NSSuperview" ref="885338749"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="193441585"/>
<reference key="NSDocView" ref="193441585"/>
<reference key="NSBGColor" ref="130159937"/>
@@ -2474,6 +2533,8 @@ wGw</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 587}}</string>
<reference key="NSSuperview" ref="885338749"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="958991311"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="885338749"/>
<string key="NSAction">_doScroller:</string>
@@ -2481,9 +2542,11 @@ wGw</bytes>
</object>
<object class="NSScroller" id="637837669">
<reference key="NSNextResponder" ref="885338749"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="885338749"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="654295744"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="885338749"/>
@@ -2494,7 +2557,8 @@ wGw</bytes>
</array>
<string key="NSFrameSize">{575, 665}</string>
<reference key="NSSuperview" ref="312131081"/>
- <reference key="NSNextKeyView" ref="958991311"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="637837669"/>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="654295744"/>
<reference key="NSHScroller" ref="637837669"/>
@@ -2505,7 +2569,10 @@ wGw</bytes>
<double key="NSMagnification">1</double>
</object>
</array>
- <string key="NSFrame">{{1, 9}, {575, 665}}</string>
+ <string key="NSFrameSize">{575, 665}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="885338749"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -3270,6 +3337,38 @@ wGw</bytes>
</object>
<int key="connectionID">833</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.NotificationCenter</string>
+ <reference key="source" ref="116647029"/>
+ <reference key="destination" ref="614263795"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="116647029"/>
+ <reference key="NSDestination" ref="614263795"/>
+ <string key="NSLabel">value: values.NotificationCenter</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.NotificationCenter</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">882</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">enabled: hasNSUserNotification</string>
+ <reference key="source" ref="116647029"/>
+ <reference key="destination" ref="864489552"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="116647029"/>
+ <reference key="NSDestination" ref="864489552"/>
+ <string key="NSLabel">enabled: hasNSUserNotification</string>
+ <string key="NSBinding">enabled</string>
+ <string key="NSKeyPath">hasNSUserNotification</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">884</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -3439,6 +3538,7 @@ wGw</bytes>
<reference ref="301926071"/>
<reference ref="579276543"/>
<reference ref="495658388"/>
+ <reference ref="116647029"/>
</array>
<reference key="parent" ref="431031305"/>
</object>
@@ -4341,6 +4441,19 @@ wGw</bytes>
<reference key="object" ref="495658388"/>
<reference key="parent" ref="618214823"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">880</int>
+ <reference key="object" ref="116647029"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="983676213"/>
+ </array>
+ <reference key="parent" ref="618214823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">881</int>
+ <reference key="object" ref="983676213"/>
+ <reference key="parent" ref="116647029"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4510,12 +4623,14 @@ wGw</bytes>
<boolean value="YES" key="878.IBShouldRemoveOnLegacySave"/>
<string key="879.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="879.IBShouldRemoveOnLegacySave"/>
+ <string key="880.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="881.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">879</int>
+ <int key="maxID">884</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4618,6 +4733,7 @@ wGw</bytes>
<string key="syncslider">id</string>
<string key="tabview">id</string>
<string key="theMenu">NSMenu</string>
+ <string key="updater">SUUpdater</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="DefaultsController">
@@ -4724,6 +4840,10 @@ wGw</bytes>
<string key="name">theMenu</string>
<string key="candidateClassName">NSMenu</string>
</object>
+ <object class="IBToOneOutletInfo" key="updater">
+ <string key="name">updater</string>
+ <string key="candidateClassName">SUUpdater</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -4765,10 +4885,6 @@ wGw</bytes>
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1070" key="NS.object.0"/>
- </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
View
BIN  Resources/Dutch.lproj/MainMenu.nib/keyedobjects.nib
Binary file not shown
View
12 Ressources/English.lproj/F.A.Q.rtf → Resources/English.lproj/F.A.Q.rtf
@@ -3,10 +3,10 @@
{\colortbl;\red255\green255\blue255;}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
-\paperw12240\paperh15840\vieww10800\viewh8400\viewkind0
+\vieww10800\viewh8400\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
-\f0\fs62 \cf0 F.A.Q for smcFanControl 2.4\
+\f0\fs62 \cf0 F.A.Q for smcFanControl 2.4.1\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\fs24 \cf0 \
@@ -49,6 +49,14 @@ a) You enter standby mode and smcFanControl is not running (If its running it wa
b) You power off the machine.\
\
+\b When will smcFanControl display notifications for fan speed changes?\
+
+\b0 Changes in speed of the fan will result in a notification when the 'step' is bigger than ~700 rpms (faster or slower)\
+The App only posts notificaion on 10.8 where there is a notification center.
+\b \
+
+\b0 \
+
\b Which sensor is read out for the temperature?\
\b0 It's not the sensor on the CoreDuo CPU's. The advantage is, that there is no Kernel Extension loaded for temperature readout and temperature should always be reported (some CoreDuo's stop temperature reporting after some minutes unfortunately). The sensor readout is very close to what CoreDuoTemp reports, but its not exactly the same cause of different sensors.
View
0  Ressources/English.lproj/InfoPlist.strings → Resources/English.lproj/InfoPlist.strings
File renamed without changes
View
0  Ressources/English.lproj/Localizable.strings → Resources/English.lproj/Localizable.strings
File renamed without changes
View
321 ...English.lproj/MainMenu.nib/designable.nib → ...English.lproj/MainMenu.nib/designable.nib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">12A269</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.SystemVersion">12B19</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2829</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.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">2829</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSArrayController</string>
@@ -60,7 +60,7 @@
<object class="NSWindowTemplate" id="453247033">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{519, 155}, {337, 436}}</string>
+ <string key="NSWindowRect">{{519, 155}, {337, 462}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">smcFanControl</string>
<string key="NSWindowClass">StatusItemWindow</string>
@@ -86,6 +86,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{295, 81}</string>
<reference key="NSSuperview" ref="742277460"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="42510737"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -95,6 +96,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{295, 17}</string>
<reference key="NSSuperview" ref="636115979"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="742277460"/>
<reference key="NSTableView" ref="145957871"/>
</object>
@@ -268,9 +270,9 @@
<string key="NSString">0</string>
<dictionary key="NSAttributes" id="272857690"/>
</object>
- <string key="decimalSeparator">,</string>
+ <string key="decimalSeparator">.</string>
<integer value="1000" key="formatterBehavior"/>
- <string key="groupingSeparator">.</string>
+ <string key="groupingSeparator">,</string>
<string key="negativeFormat">-0</string>
<string key="positiveFormat">0</string>
<boolean value="NO" key="usesGroupingSeparator"/>
@@ -297,8 +299,8 @@
</object>
<reference key="NS.max" ref="378325352"/>
<nil key="NS.rounding"/>
- <string key="NS.decimal">,</string>
- <string key="NS.thousand">.</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
@@ -344,6 +346,7 @@
</array>
<string key="NSFrame">{{1, 17}, {295, 81}}</string>
<reference key="NSSuperview" ref="424677925"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="145957871"/>
<reference key="NSDocView" ref="145957871"/>
<reference key="NSBGColor" ref="1056402222"/>
@@ -354,6 +357,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{282, 17}, {14, 81}}</string>
<reference key="NSSuperview" ref="424677925"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="708907136"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
@@ -366,6 +370,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{1, 84}, {295, 14}}</string>
<reference key="NSSuperview" ref="424677925"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="47206575"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
@@ -381,14 +386,16 @@
</array>
<string key="NSFrame">{{1, 0}, {295, 17}}</string>
<reference key="NSSuperview" ref="424677925"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="645364616"/>
<reference key="NSDocView" ref="645364616"/>
<reference key="NSBGColor" ref="1056402222"/>
<int key="NScvFlags">4</int>
</object>
</array>
- <string key="NSFrame">{{20, 292}, {297, 99}}</string>
+ <string key="NSFrame">{{20, 318}, {297, 99}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636115979"/>
<int key="NSsFlags">133170</int>
<reference key="NSVScroller" ref="47206575"/>
@@ -403,8 +410,9 @@
<object class="NSPopUpButton" id="714162342">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{73, 395}, {177, 22}}</string>
+ <string key="NSFrame">{{73, 421}, {177, 22}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1064758675"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="22862970">
@@ -480,8 +488,9 @@
<object class="NSTextField" id="745295913">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 399}, {54, 15}}</string>
+ <string key="NSFrame">{{17, 425}, {54, 15}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="714162342"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="285340765">
@@ -503,8 +512,9 @@
<object class="NSButton" id="96232013">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{285, 392}, {37, 28}}</string>
+ <string key="NSFrame">{{285, 418}, {37, 28}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="191900676"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="333470646">
@@ -528,8 +538,9 @@
<object class="NSButton" id="1064758675">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{250, 392}, {37, 28}}</string>
+ <string key="NSFrame">{{250, 418}, {37, 28}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="96232013"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="687753612">
@@ -561,8 +572,9 @@
<object class="NSButton" id="331426431">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 84}, {272, 29}}</string>
+ <string key="NSFrame">{{13, 82}, {272, 29}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="732344994"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="638624641">
@@ -586,8 +598,9 @@
<object class="NSPopUpButton" id="87674398">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 58}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 60}, {168, 22}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="385063123"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1039987841">
@@ -657,8 +670,9 @@
<object class="NSPopUpButton" id="923851913">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 33}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 35}, {168, 22}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="236811898"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="615134252">
@@ -728,8 +742,9 @@
<object class="NSPopUpButton" id="866041678">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{107, 8}, {168, 22}}</string>
+ <string key="NSFrame">{{107, 10}, {168, 22}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="978127145"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1020636882">
@@ -799,8 +814,9 @@
<object class="NSTextField" id="732344994">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{42, 63}, {63, 14}}</string>
+ <string key="NSFrame">{{42, 65}, {63, 14}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="87674398"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="219974468">
@@ -817,8 +833,9 @@
<object class="NSTextField" id="385063123">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{42, 38}, {63, 14}}</string>
+ <string key="NSFrame">{{42, 40}, {63, 14}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="923851913"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="763417371">
@@ -835,8 +852,9 @@
<object class="NSTextField" id="236811898">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{28, 13}, {77, 14}}</string>
+ <string key="NSFrame">{{28, 15}, {77, 14}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="866041678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="906454329">
@@ -853,14 +871,16 @@
<object class="NSButton" id="1011651734">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 116}, {261, 23}}</string>
+ <string key="NSFrame">{{13, 111}, {261, 28}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="331426431"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="536670318">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">131072</int>
- <string key="NSContents">Autostart smcFanControl after login</string>
+ <string type="base64-UTF8" key="NSContents">U2hvdyBNb3VudGFpbiBMaW9uIG5vdGlmaWNhdGlvbnMKb24gY29uc2lkZXJhYmxlIGZhbiBzcGVlZCBj
+aGFuZ2VzA</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="1011651734"/>
<int key="NSButtonFlags">1211912448</int>
@@ -873,11 +893,36 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
+ <object class="NSButton" id="760447877">
+ <reference key="NSNextResponder" ref="239106252"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{13, 141}, {261, 23}}</string>
+ <reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1011651734"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="687286230">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">131072</int>
+ <string key="NSContents">Autostart smcFanControl after login</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="760447877"/>
+ <int key="NSButtonFlags">1211912448</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="141623511"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
<object class="NSTextField" id="1034513704">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 169}, {106, 14}}</string>
+ <string key="NSFrame">{{13, 194}, {106, 14}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="581118473"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1039367854">
@@ -894,8 +939,9 @@
<object class="NSMatrix" id="581118473">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{122, 166}, {80, 18}}</string>
+ <string key="NSFrame">{{122, 191}, {80, 18}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="42875280"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -961,8 +1007,9 @@
<object class="NSTextField" id="419662642">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 193}, {111, 14}}</string>
+ <string key="NSFrame">{{13, 218}, {111, 14}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="681192896"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="854520123">
@@ -979,8 +1026,9 @@
<object class="NSPopUpButton" id="681192896">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{74, 188}, {154, 22}}</string>
+ <string key="NSFrame">{{74, 213}, {154, 22}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="884401207"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="658767894">
@@ -1076,9 +1124,10 @@
<object class="NSButton" id="42875280">
<reference key="NSNextResponder" ref="239106252"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{13, 141}, {261, 23}}</string>
+ <string key="NSFrame">{{13, 166}, {261, 23}}</string>
<reference key="NSSuperview" ref="239106252"/>
- <reference key="NSNextKeyView" ref="1011651734"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="760447877"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="499866252">
<int key="NSCellFlags">67108864</int>
@@ -1104,8 +1153,9 @@
<characters key="NS.bytes">NSColor pasteboard type</characters>
</object>
</set>
- <string key="NSFrame">{{233, 192}, {39, 17}}</string>
+ <string key="NSFrame">{{233, 217}, {39, 17}}</string>
<reference key="NSSuperview" ref="239106252"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034513704"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1113,13 +1163,15 @@
<reference key="NSColor" ref="654925718"/>
</object>
</array>
- <string key="NSFrame">{{2, 2}, {299, 226}}</string>
+ <string key="NSFrame">{{2, 2}, {299, 251}}</string>
<reference key="NSSuperview" ref="310987403"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="419662642"/>
</object>
</array>
- <string key="NSFrame">{{17, 41}, {303, 243}}</string>
+ <string key="NSFrame">{{17, 42}, {303, 268}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="239106252"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1142,8 +1194,9 @@
<object class="NSButton" id="630675777">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{242, 13}, {80, 28}}</string>
+ <string key="NSFrame">{{240, 14}, {80, 28}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="827768051">
@@ -1167,8 +1220,9 @@
<object class="NSButton" id="978127145">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{159, 13}, {85, 28}}</string>
+ <string key="NSFrame">{{157, 14}, {85, 28}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="630675777"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="191993377">
@@ -1190,8 +1244,9 @@
<object class="NSButton" id="708907136">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{100, 375}, {141, 16}}</string>
+ <string key="NSFrame">{{100, 401}, {141, 16}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="565147689"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="832225540">
@@ -1223,8 +1278,9 @@
<object class="NSButton" id="191900676">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{19, 375}, {81, 16}}</string>
+ <string key="NSFrame">{{19, 401}, {81, 16}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="424677925"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="636849242">
@@ -1248,8 +1304,9 @@
<object class="NSButton" id="565147689">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{240, 375}, {76, 16}}</string>
+ <string key="NSFrame">{{240, 401}, {76, 16}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="446538853"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="858136481">
@@ -1273,8 +1330,9 @@
<object class="NSButton" id="446538853">
<reference key="NSNextResponder" ref="998649417"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{97, 289}, {74, 22}}</string>
+ <string key="NSFrame">{{97, 315}, {74, 22}}</string>
<reference key="NSSuperview" ref="998649417"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="310987403"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="843496759">
@@ -1298,8 +1356,9 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{337, 436}</string>
+ <string key="NSFrameSize">{337, 462}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="745295913"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1359,7 +1418,6 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{573, 3934}</string>
<reference key="NSSuperview" ref="535258620"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="439641942"/>
<object class="NSTextContainer" key="NSTextContainer" id="343349017">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1643,7 +1701,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="137195156"/>
@@ -1681,7 +1739,6 @@ Uwo</bytes>
</array>
<string key="NSFrame">{{1, 1}, {573, 601}}</string>
<reference key="NSSuperview" ref="860180128"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="847482374"/>
<reference key="NSDocView" ref="847482374"/>
<reference key="NSBGColor" ref="137195156"/>
@@ -1716,7 +1773,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{558, 1}, {16, 601}}</string>
<reference key="NSSuperview" ref="860180128"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1729,7 +1785,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="860180128"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="535258620"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -1741,7 +1796,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrameSize">{575, 603}</string>
<reference key="NSSuperview" ref="801958587"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="135646872"/>
<int key="NSsFlags">133714</int>
<reference key="NSVScroller" ref="439641942"/>
@@ -1755,7 +1809,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrameSize">{575, 603}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="860180128"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1784,6 +1837,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{97, 280}, {262, 19}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636850864"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="316696850">
@@ -1806,6 +1860,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{99, 235}, {143, 37}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="285214791"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="275951483">
@@ -1828,6 +1883,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{121, 23}, {66, 37}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="512732891">
@@ -1853,12 +1909,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 119}, {265, 29}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="940143931"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="888896092">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">Sujay Thomas</string>
+ <string key="NSContents">Sujay Thomas and Dominik Pich</string>
<reference key="NSSupport" ref="788170194"/>
<reference key="NSControlView" ref="324444910"/>
<reference key="NSBackgroundColor" ref="615325262"/>
@@ -1869,14 +1926,15 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSTextField" id="778473375">
<reference key="NSNextResponder" ref="817445018"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 150}, {114, 17}}</string>
+ <string key="NSFrame">{{17, 150}, {265, 17}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="324444910"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="946057775">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">Icon-Design:</string>
+ <string key="NSContents">Icon-Design and other contributions:</string>
<reference key="NSSupport" ref="788170194"/>
<reference key="NSControlView" ref="778473375"/>
<reference key="NSBackgroundColor" ref="615325262"/>
@@ -1889,6 +1947,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 59}, {265, 52}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="359026458"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="69507230">
@@ -1907,6 +1966,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 175}, {265, 40}}</string>
<reference key="NSSuperview" ref="817445018"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="778473375"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="263004884">
@@ -1933,6 +1993,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</set>