diff --git a/Classes/FanControl.h b/Classes/FanControl.h index 7069724..db6ff0e 100755 --- a/Classes/FanControl.h +++ b/Classes/FanControl.h @@ -106,6 +106,8 @@ NSImage *menu_image; NSImage *menu_image_alt; } +@property (assign) IBOutlet NSTableView *fanTableView; + -(void)terminate:(id)sender; diff --git a/Classes/FanControl.m b/Classes/FanControl.m index 24a9617..d8a40fa 100755 --- a/Classes/FanControl.m +++ b/Classes/FanControl.m @@ -101,10 +101,10 @@ NSUserDefaults *defaults; [pw registerForSleepWakeNotification]; [pw registerForPowerChange]; - - //load defaults - [DefaultsController setAppliesImmediately:NO]; + //load defaults + + [DefaultsController setAppliesImmediately:NO]; mdefaults=[[MachineDefaults alloc] init:nil]; @@ -232,7 +232,7 @@ NSUserDefaults *defaults; //autostart [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithBool:[self isInAutoStart]] forKey:@"AutoStart"]; - + } diff --git a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib index 2019dc0..b08cf84 100644 --- a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib @@ -1,14 +1,14 @@ - 1050 - 12A269 - 2549 - 1187 - 624.00 + 1060 + 14A388a + 6249 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 6249 NSArrayController @@ -79,7 +79,7 @@ - 2304 + 2322 @@ -87,6 +87,7 @@ {295, 81} + YES NO YES @@ -96,6 +97,7 @@ {295, 17} + @@ -114,7 +116,7 @@ 2048 Menu - LucidaGrande + YES 10 2843 @@ -137,7 +139,7 @@ 134348800 - LucidaGrande + YES 11 3100 @@ -180,11 +182,7 @@ 337641536 2048 - - LucidaGrande - 11 - 16 - + 6 @@ -259,7 +257,7 @@ 337641472 67108864 - + @@ -341,33 +339,42 @@ 1 - {{1, 17}, {295, 81}} + {{1, 0}, {295, 98}} + {{0, -17}, {295, 98}} 4 + YES - 256 + -2147483392 {{282, 17}, {14, 81}} + NO + _doScroller: + 256 _doScroller: - 0.4375 + 1 + 0.85217391304347823 - 256 - {{1, 84}, {295, 14}} + -2147483392 + {{-100, -100}, {295, 14}} + NO + _doScroller: + 257 _doScroller: @@ -375,24 +382,23 @@ - 2304 + 2338 {{1, 0}, {295, 17}} - + - - 4 + YES {{20, 292}, {297, 99}} - 133170 + 133650 @@ -408,6 +414,7 @@ {{73, 395}, {177, 22}} + YES -2076180416 @@ -502,13 +509,16 @@ NO + 1 264 + {{285, 392}, {37, 28}} + YES 67108864 @@ -531,6 +541,7 @@ 264 + {{250, 392}, {37, 28}} @@ -565,9 +576,11 @@ 256 + {{13, 85}, {278, 29}} + YES 603979776 @@ -593,6 +606,7 @@ {{107, 58}, {168, 22}} + YES -2076180416 @@ -664,6 +678,7 @@ {{107, 33}, {168, 22}} + YES -2076180416 @@ -735,6 +750,7 @@ {{107, 8}, {168, 22}} + YES -2076180416 @@ -806,6 +822,7 @@ {{42, 60}, {63, 17}} + YES 67108864 @@ -817,6 +834,7 @@ NO + 1 @@ -824,6 +842,7 @@ {{25, 24}, {80, 28}} + YES 67108864 @@ -835,6 +854,7 @@ NO + 1 @@ -842,6 +862,7 @@ {{28, 10}, {77, 17}} + YES 67108864 @@ -853,13 +874,16 @@ NO + 1 256 + {{13, 116}, {261, 23}} + YES 67108864 @@ -883,6 +907,7 @@ {{13, 155}, {137, 28}} + YES 67108864 @@ -894,6 +919,7 @@ NO + 1 @@ -901,6 +927,7 @@ {{192, 166}, {80, 18}} + YES NO 1 @@ -947,7 +974,7 @@ 0 Radio - LucidaGrande + YES 13 1044 @@ -968,6 +995,7 @@ {{13, 193}, {111, 14}} + YES 67108864 @@ -979,6 +1007,7 @@ NO + 1 @@ -986,6 +1015,7 @@ {{74, 188}, {154, 22}} + YES 71303232 @@ -1080,9 +1110,11 @@ 256 + {{13, 141}, {261, 23}} + YES 67108864 @@ -1111,6 +1143,7 @@ {{233, 192}, {39, 17}} + YES NO YES @@ -1120,11 +1153,13 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} + {0, 0} 67108864 @@ -1133,8 +1168,10 @@ - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + @@ -1146,6 +1183,7 @@ 256 + {{242, 13}, {80, 28}} @@ -1171,9 +1209,11 @@ 256 + {{159, 13}, {85, 28}} + YES 67108864 @@ -1191,101 +1231,24 @@ NO - - - 256 - {{100, 375}, {141, 16}} - - - YES - - 603979776 - 134479872 - Button - - LucidaGrande - 9 - 3614 - - - -2038251520 - 1 - - LucidaGrande - 9 - 16 - - - - - - 200 - 25 - - NO - - - - 256 - {{19, 375}, {81, 16}} - - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - - - - 256 - {{240, 375}, {76, 16}} - - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - -2147483392 - {{97, 289}, {142, 22}} + + {{97, 289}, {150, 22}} + YES 67108864 262144 Synchroniseer schuifbalken - + + YES + 9 + 3614 + 1211912448 2 @@ -1305,8 +1268,9 @@ {337, 436} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1347,7 +1311,7 @@ {213, 107} - + 256 @@ -1363,8 +1327,7 @@ 2322 {573, 3934} - - + @@ -1647,7 +1610,7 @@ Uwo 1 - 11109 + 67119973 0 @@ -1665,7 +1628,7 @@ Uwo - + 1 @@ -1685,7 +1648,6 @@ Uwo {{1, 1}, {573, 601}} - @@ -1766,11 +1728,63 @@ AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A ////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA -EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE -AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB -AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA -AAAAIAAAAAEAAQABAAE +////AP///wD///8A////AP///wD///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8 @@ -1843,15 +1857,17 @@ wGw 4 + YES 256 {{558, 1}, {16, 601}} - YES NO + _doScroller: + _doScroller: 0.15277071682765633 @@ -1861,9 +1877,10 @@ wGw -2147483392 {{-100, -100}, {87, 18}} - NO + _doScroller: + 1 _doScroller: @@ -1873,8 +1890,7 @@ wGw {575, 603} - - + 133714 @@ -1886,11 +1902,9 @@ wGw {575, 603} - - - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1908,7 +1922,7 @@ wGw {213, 107} - + 256 @@ -1916,36 +1930,35 @@ wGw 256 {{97, 280}, {262, 19}} - YES 67108864 4194304 Programversion - LucidaGrande-Bold + YES 16 - 16 + 2072 NO + 1 256 {{99, 235}, {143, 37}} - YES 67108864 272629760 Small System Font Text - LucidaGrande-Bold + YES 11 3357 @@ -1954,13 +1967,13 @@ wGw NO + 1 256 {{121, 23}, {66, 37}} - YES 67108864 @@ -1985,7 +1998,6 @@ wGw 256 {{17, 119}, {265, 29}} - YES 67108864 @@ -1997,13 +2009,13 @@ wGw NO + 1 256 {{17, 150}, {114, 17}} - YES 67108864 @@ -2015,13 +2027,13 @@ wGw NO + 1 256 {{17, 59}, {265, 52}} - YES 67108864 @@ -2033,13 +2045,13 @@ wGw NO + 1 256 {{17, 180}, {265, 51}} - YES 67108864 @@ -2051,6 +2063,7 @@ wGw NO + 1 @@ -2065,7 +2078,6 @@ wGw {{20, 235}, {64, 64}} - YES 134217728 @@ -2084,10 +2096,8 @@ wGw {299, 327} - - - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2154,6 +2164,7 @@ wGw submenuAction: + Info @@ -2295,6 +2306,7 @@ wGw NO + 1 @@ -2318,6 +2330,7 @@ wGw NO + 1 @@ -2379,11 +2392,12 @@ wGw NO + 1 {221, 145} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2447,7 +2461,7 @@ wGw - + @@ -2468,6 +2482,7 @@ wGw 4 + YES @@ -2475,6 +2490,8 @@ wGw {{-30, 1}, {15, 587}} NO + _doScroller: + _doScroller: 0.15277071297168732 @@ -2485,6 +2502,8 @@ wGw {{-100, -100}, {87, 18}} NO + _doScroller: + 1 _doScroller: @@ -2507,7 +2526,7 @@ wGw {{1, 9}, {575, 665}} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2517,7 +2536,7 @@ wGw - + makeKeyAndOrderFront: @@ -3319,9 +3338,6 @@ wGw - - - @@ -3466,30 +3482,6 @@ wGw - - 697 - - - - - - - - 698 - - - - - - - - 699 - - - - - - 212 @@ -3873,21 +3865,6 @@ wGw - - 854 - - - - - 855 - - - - - 856 - - - 857 @@ -4347,6 +4324,7 @@ wGw com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{841, 659}, {337, 436}} @@ -4449,9 +4427,6 @@ wGw com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4475,9 +4450,6 @@ wGw com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4602,6 +4574,7 @@ wGw id id id + NSTableView id id id @@ -4660,6 +4633,10 @@ wGw currentSpeed1 id + + fanTableView + NSTableView + faqText id @@ -4727,9 +4704,95 @@ wGw IBProjectSource - ./Classes/FanControl.h + ../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 @@ -4745,35 +4808,28 @@ wGw - IBProjectSource - ./Classes/SUUpdater.h - - - - StatusItemWindow - NSWindow - - IBProjectSource - ./Classes/StatusItemWindow.h + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx - + - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {16, 15} {15, 15} {62, 31} diff --git a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib index 549e5a3..c0561b8 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 e69de29..bab0bf4 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 2383b66..5624af0 100644 --- a/Ressources/English.lproj/MainMenu.nib/designable.nib +++ b/Ressources/English.lproj/MainMenu.nib/designable.nib @@ -1,14 +1,14 @@ - 1050 - 12A269 - 2549 - 1187 - 624.00 + 1060 + 14A388a + 6249 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 6249 NSArrayController @@ -28,6 +28,7 @@ NSScrollView NSScroller NSSliderCell + NSTableCellView NSTableColumn NSTableHeaderView NSTableView @@ -79,23 +80,25 @@ - 2304 + 2322 4352 {295, 81} - + + YES NO YES - - + + 256 {295, 17} - - + + + @@ -115,7 +118,7 @@ 2048 Menu - LucidaGrande + YES 10 2843 @@ -138,7 +141,7 @@ 134348800 - LucidaGrande + YES 11 3100 @@ -181,11 +184,7 @@ 337641536 2048 - - LucidaGrande - 11 - 16 - + 6 @@ -246,7 +245,7 @@ 2048 RPM - + 6 System headerColor @@ -260,7 +259,7 @@ 337641472 67108864 - + @@ -321,7 +320,7 @@ 3 2 - + 6 System gridColor @@ -342,59 +341,71 @@ 1 - {{1, 17}, {295, 81}} + {{1, 0}, {295, 98}} + {{0, -17}, {295, 98}} + 4 + YES - + - 256 - {{282, 17}, {14, 81}} - - - NO - 256 - - _doScroller: - 0.4375 - - - - 256 - {{1, 84}, {295, 14}} - - - NO - 257 - - _doScroller: - 0.98269897699356079 - - - - 2304 + 2338 - + {{1, 0}, {295, 17}} - - - - 4 + + + + YES + + + + -2147483392 + {{-100, -100}, {11, 81}} + + + + NO + _doScroller: + + 256 + + _doScroller: + 1 + 0.85217391304347823 + + + + -2147483392 + {{1, 84}, {295, 14}} + + + + NO + _doScroller: + + 257 + + _doScroller: + 0.9966216216216216 {{20, 292}, {297, 99}} - - 133170 + + + YES + 133666 - + AAAAAAAAAABBgAAAQYAAAA 0.25 4 @@ -405,6 +416,7 @@ 264 {{73, 395}, {177, 22}} + YES @@ -482,6 +494,7 @@ 264 {{17, 399}, {54, 15}} + YES @@ -499,13 +512,16 @@ NO + 1 264 + {{285, 392}, {37, 28}} - + + YES 67108864 @@ -528,8 +544,10 @@ 264 + {{250, 392}, {37, 28}} + YES @@ -561,8 +579,10 @@ 256 + {{13, 84}, {272, 29}} + YES @@ -588,6 +608,7 @@ 264 {{107, 58}, {168, 22}} + YES @@ -659,6 +680,7 @@ 264 {{107, 33}, {168, 22}} + YES @@ -730,6 +752,7 @@ 264 {{107, 8}, {168, 22}} + YES @@ -801,6 +824,7 @@ 256 {{42, 63}, {63, 14}} + YES @@ -813,12 +837,14 @@ NO + 1 256 {{42, 38}, {63, 14}} + YES @@ -831,12 +857,14 @@ NO + 1 256 {{28, 13}, {77, 14}} + YES @@ -849,12 +877,15 @@ NO + 1 256 + {{13, 116}, {261, 23}} + YES @@ -878,6 +909,7 @@ 256 {{13, 169}, {106, 14}} + YES @@ -890,12 +922,14 @@ NO + 1 256 {{122, 166}, {80, 18}} + YES NO @@ -943,7 +977,7 @@ 0 Radio - LucidaGrande + YES 13 1044 @@ -963,6 +997,7 @@ 256 {{13, 193}, {111, 14}} + YES @@ -975,12 +1010,14 @@ NO + 1 264 {{74, 188}, {154, 22}} + YES @@ -1076,8 +1113,10 @@ 256 + {{13, 141}, {261, 23}} + YES @@ -1106,6 +1145,7 @@ {{233, 192}, {39, 17}} + YES NO @@ -1115,11 +1155,13 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} + {0, 0} @@ -1129,8 +1171,10 @@ - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + @@ -1142,8 +1186,10 @@ 256 + {{242, 13}, {80, 28}} + YES @@ -1167,8 +1213,10 @@ 256 + {{159, 13}, {85, 28}} + YES @@ -1187,101 +1235,24 @@ NO - - - 256 - {{100, 375}, {141, 16}} - - - YES - - 603979776 - 134479872 - Button - - LucidaGrande - 9 - 3614 - - - -2038251520 - 1 - - LucidaGrande - 9 - 16 - - - - - - 200 - 25 - - NO - - - - 256 - {{19, 375}, {81, 16}} - - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - - - - 256 - {{240, 375}, {76, 16}} - - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - -2147483392 - {{97, 289}, {74, 22}} + + {{97, 289}, {85, 22}} + YES 67108864 262144 Sync sliders - + + YES + 9 + 3614 + 1211912448 2 @@ -1300,9 +1271,10 @@ {337, 436} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1352,7 +1324,7 @@ - 2304 + 2322 @@ -1643,7 +1615,7 @@ Uwo 1 - 11109 + 67119973 0 @@ -1661,7 +1633,7 @@ Uwo - + 1 @@ -1710,6 +1682,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -1720,6 +1693,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES NO + _doScroller: + _doScroller: 0.15277071682765633 @@ -1732,6 +1707,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + _doScroller: + 1 _doScroller: @@ -1758,7 +1735,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1784,6 +1761,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{97, 280}, {262, 19}} + YES @@ -1791,21 +1769,23 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4194304 Programversion - LucidaGrande-Bold + YES 16 - 16 + 2072 NO + 1 256 {{99, 235}, {143, 37}} + YES @@ -1813,7 +1793,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 272629760 Small System Font Text - LucidaGrande-Bold + YES 11 3357 @@ -1822,12 +1802,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{121, 23}, {66, 37}} + YES @@ -1853,6 +1835,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{17, 119}, {265, 29}} + YES @@ -1865,12 +1848,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 150}, {114, 17}} + YES @@ -1883,12 +1868,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 59}, {265, 52}} + YES @@ -1901,12 +1888,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 175}, {265, 40}} + YES @@ -1919,6 +1908,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1933,6 +1923,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{20, 235}, {64, 64}} + YES @@ -1953,9 +1944,10 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {299, 327} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2022,6 +2014,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA submenuAction: + Info @@ -2152,6 +2145,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{17, 121}, {230, 14}} + YES @@ -2164,12 +2158,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{20, 94}, {181, 19}} + YES @@ -2188,12 +2184,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{122, 13}, {84, 28}} + YES @@ -2217,6 +2215,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{40, 13}, {84, 28}} + YES @@ -2240,6 +2239,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{17, 45}, {266, 41}} + YES @@ -2253,13 +2253,15 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA NO + 1 {221, 145} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2280,7 +2282,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA {213, 107} - + 256 @@ -2296,7 +2298,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA 2322 {573, 663} - + @@ -2324,7 +2326,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - + @@ -2345,6 +2347,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA 4 + YES @@ -2353,6 +2356,8 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA NO + _doScroller: + _doScroller: 0.15277071297168732 @@ -2364,6 +2369,8 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA NO + _doScroller: + 1 _doScroller: @@ -2373,7 +2380,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA {575, 665} - + 133650 @@ -2385,10 +2392,9 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA {575, 665} - - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2396,9 +2402,445 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA SUUpdater + + + 268 + + + + 2322 + + + + 256 + + + + 274 + + + + 266 + {116, 17} + + {250, 750} + YES + + 67108928 + 272631808 + Table View Cell + + + + + + NO + 1 + + + {{1, 1}, {116, 17}} + + + + + 274 + + + + 266 + {116, 17} + + {250, 750} + YES + + 67108928 + 272631808 + Table View Cell + + + + + + NO + 1 + + + {{120, 1}, {116, 17}} + + + + {238, 117} + + _NS:13 + YES + NO + YES + + + 256 + {238, 17} + + _NS:15 + + + + + 256 + {15, 20} + _NS:19 + + + + 116 + 40 + 1000 + + 75497536 + 2048 + + + + + + + 337641537 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + + 116 + 40 + 1000 + + 75497536 + 2048 + + + + + + + 337641537 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + + 3 + 2 + + + 17 + -700448768 + + + 4 + -1 + 0 + YES + 0 + 1 + + + {{1, 17}, {238, 117}} + + + _NS:11 + + + 4 + YES + + + + 2338 + + + + {{1, 0}, {238, 17}} + + + _NS:16 + + YES + + + + -2147483392 + {{1, 119}, {223, 15}} + + _NS:61 + NO + _doScroller: + + 1 + + _doScroller: + + + + -2147483392 + {{224, 17}, {15, 102}} + + _NS:65 + NO + _doScroller: + + + _doScroller: + + + {240, 135} + + _NS:9 + 133682 + + + + + QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 + + + + 268 + + + + 2322 + + + + 256 + + + + 274 + + + + 266 + {116, 17} + + {250, 750} + YES + + 67108928 + 272631808 + Table View Cell + + + + + + NO + 1 + + + {{1, 1}, {116, 17}} + + + + + 274 + + + + 266 + {116, 17} + + {250, 750} + YES + + 67108928 + 272631808 + Table View Cell + + + + + + NO + 1 + + + {{120, 1}, {116, 17}} + + + + {238, 117} + + _NS:13 + YES + NO + YES + + + 256 + {238, 17} + + _NS:15 + + + + + 256 + {15, 20} + _NS:19 + + + + 116 + 40 + 1000 + + 75497536 + 2048 + + + + + + + 337641537 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + + 116 + 40 + 1000 + + 75497536 + 2048 + + + + + + + 337641537 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + + 3 + 2 + + + 17 + -700448768 + + + 4 + -1 + 0 + YES + 0 + 1 + + + {{1, 17}, {238, 117}} + + + _NS:11 + + + 4 + YES + + + + 2338 + + + + {{1, 0}, {238, 17}} + + + _NS:16 + + YES + + + + -2147483392 + {{1, 119}, {223, 15}} + + _NS:61 + NO + _doScroller: + + 1 + + _doScroller: + + + + -2147483392 + {{224, 17}, {15, 102}} + + _NS:65 + NO + _doScroller: + + + _doScroller: + + + {240, 135} + + _NS:9 + 133682 + + + + + QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 + - + makeKeyAndOrderFront: @@ -2655,6 +3097,14 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA 784 + + + fanTableView + + + + 883 + makeKeyAndOrderFront: @@ -3151,6 +3601,38 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA 833 + + + textField + + + + 915 + + + + textField + + + + 919 + + + + textField + + + + 932 + + + + textField + + + + 936 + @@ -3200,9 +3682,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - - - @@ -3212,8 +3691,8 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - + @@ -3347,30 +3826,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - - 697 - - - - - - - - 698 - - - - - - - - 699 - - - - - - 212 @@ -3754,21 +4209,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - - 854 - - - - - 855 - - - - - 856 - - - 857 @@ -3882,11 +4322,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - - 874 - - - 875 @@ -4222,12 +4657,228 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA + + 882 + + + + + 903 + + + + + + + + + + + 904 + + + + + + + + + 905 + + + + + 906 + + + + + 907 + + + + + 908 + + + + + + + + + 909 + + + + + + + + + 910 + + + + + 911 + + + + + 912 + + + + + + + + 913 + + + + + + + + 914 + + + + + 916 + + + + + + + + 917 + + + + + + + + 918 + + + + + 920 + + + + + + + + + + + 921 + + + + + + + + + 922 + + + + + 923 + + + + + 924 + + + + + 925 + + + + + + + + + 926 + + + + + + + + + 927 + + + + + 928 + + + + + 929 + + + + + + + + 930 + + + + + + + + 931 + + + + + 933 + + + + + + + + 934 + + + + + + + + 935 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4327,9 +4978,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4353,9 +5001,6 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4373,18 +5018,68 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {689, 57.5} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {627, -23.5} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 879 + 936 @@ -4471,6 +5166,7 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA id id id + NSTableView id id id @@ -4529,6 +5225,10 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA currentSpeed1 id + + fanTableView + NSTableView + faqText id @@ -4596,9 +5296,95 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA IBProjectSource - ./Classes/FanControl.h + ../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 @@ -4614,35 +5400,28 @@ IGZhdm9yaXRlICJkZWZhdWx0IiB3aWxsCmJlIHVzZWQuA - IBProjectSource - ./Classes/SUUpdater.h - - - - StatusItemWindow - NSWindow - - IBProjectSource - ./Classes/StatusItemWindow.h + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx - + - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {16, 15} {15, 15} {62, 31} diff --git a/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/English.lproj/MainMenu.nib/keyedobjects.nib index 9f57f2f..f10b833 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/MainMenu.nib/designable.nib b/Ressources/German.lproj/MainMenu.nib/designable.nib index 7997c35..d349c1b 100644 --- a/Ressources/German.lproj/MainMenu.nib/designable.nib +++ b/Ressources/German.lproj/MainMenu.nib/designable.nib @@ -1,14 +1,14 @@ - 1050 - 12A269 - 2549 - 1187 - 624.00 + 1060 + 14A388a + 6249 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 6249 NSArrayController @@ -70,7 +70,7 @@ {213, 107} - + 256 @@ -79,13 +79,14 @@ - 2304 + 2322 4352 {295, 81} + YES NO @@ -95,7 +96,8 @@ 256 {295, 17} - + + @@ -114,7 +116,7 @@ 2048 Menü - LucidaGrande + YES 10 2843 @@ -137,7 +139,7 @@ 134348800 - LucidaGrande + YES 11 3100 @@ -180,11 +182,7 @@ 337641536 2048 - - LucidaGrande - 11 - 16 - + 6 @@ -259,7 +257,7 @@ 337641472 67108864 - + @@ -341,32 +339,42 @@ 1 - {{1, 17}, {295, 81}} + {{1, 0}, {295, 98}} + {{0, -17}, {295, 98}} + 4 + YES - 256 - {{282, 17}, {14, 81}} + -2147483392 + {{-100, -100}, {14, 81}} + NO + _doScroller: + 256 _doScroller: - 0.4375 + 1 + 0.85217391304347823 - 256 - {{1, 84}, {295, 14}} + -2147483392 + {{-100, -100}, {295, 14}} + NO + _doScroller: + 257 _doScroller: @@ -374,22 +382,23 @@ - 2304 + 2338 {{1, 0}, {295, 17}} - + + - - 4 + YES {{20, 292}, {297, 99}} + - 133170 + 133650 @@ -404,6 +413,7 @@ 264 {{73, 395}, {177, 22}} + YES @@ -481,6 +491,7 @@ 264 {{17, 399}, {54, 15}} + YES @@ -498,13 +509,15 @@ NO + 1 264 + {{285, 392}, {37, 28}} - + YES 67108864 @@ -527,9 +540,10 @@ 264 + {{250, 392}, {37, 28}} - + YES 67108864 @@ -560,9 +574,10 @@ 256 + {{13, 85}, {272, 29}} - + YES 603979776 @@ -587,6 +602,7 @@ 264 {{107, 58}, {168, 22}} + YES @@ -658,6 +674,7 @@ 264 {{107, 33}, {168, 22}} + YES @@ -729,6 +746,7 @@ 264 {{107, 8}, {168, 22}} + YES @@ -800,6 +818,7 @@ 256 {{42, 63}, {63, 14}} + YES @@ -812,12 +831,14 @@ NO + 1 256 {{42, 38}, {63, 14}} + YES @@ -830,12 +851,14 @@ NO + 1 256 {{28, 13}, {77, 14}} + YES @@ -848,13 +871,15 @@ NO + 1 256 + {{13, 116}, {261, 23}} - + YES 67108864 @@ -877,6 +902,7 @@ 256 {{13, 169}, {132, 14}} + YES @@ -889,12 +915,14 @@ NO + 1 256 {{146, 166}, {80, 18}} + YES NO @@ -942,7 +970,7 @@ 0 Radio - LucidaGrande + YES 13 1044 @@ -962,6 +990,7 @@ 256 {{13, 193}, {111, 14}} + YES @@ -974,12 +1003,14 @@ NO + 1 264 {{74, 188}, {154, 22}} + YES @@ -1075,9 +1106,10 @@ 256 + {{13, 141}, {261, 23}} - + YES 67108864 @@ -1105,6 +1137,7 @@ {{233, 192}, {39, 17}} + YES NO @@ -1114,12 +1147,14 @@ {{2, 2}, {299, 226}} + {{17, 41}, {303, 243}} - + + {0, 0} 67108864 @@ -1128,8 +1163,10 @@ - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + @@ -1141,8 +1178,10 @@ 256 + {{240, 13}, {82, 28}} + YES 67108864 @@ -1165,9 +1204,10 @@ 256 + {{157, 13}, {85, 28}} - + YES 67108864 @@ -1188,18 +1228,19 @@ -2147483392 - {{97, 289}, {80, 22}} + + {{97, 289}, {85, 22}} - + YES 67108864 262144 Slider syncen - - LucidaGrande + + YES 9 - 16 + 3614 1211912448 @@ -1218,9 +1259,11 @@ {337, 436} + + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1261,7 +1304,7 @@ {213, 107} - + 256 @@ -1270,7 +1313,7 @@ - 2304 + 2322 @@ -1560,7 +1603,7 @@ Uwo 1 - 11109 + 67119973 0 @@ -1578,7 +1621,7 @@ Uwo - + 1 @@ -1626,6 +1669,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -1634,6 +1678,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES NO + _doScroller: + _doScroller: 0.15277071682765633 @@ -1645,6 +1691,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + _doScroller: + 1 _doScroller: @@ -1666,10 +1714,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1687,7 +1734,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {213, 107} - + 256 @@ -1695,36 +1742,37 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{97, 280}, {262, 19}} - + YES 67108864 4194304 Programversion - LucidaGrande-Bold + YES 16 - 16 + 2072 NO + 1 256 {{99, 235}, {143, 37}} - + YES 67108864 272629760 Small System Font Text - LucidaGrande-Bold + YES 11 3357 @@ -1733,13 +1781,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{121, 23}, {66, 37}} - YES 67108864 @@ -1764,7 +1812,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{17, 119}, {265, 29}} - + YES 67108864 @@ -1776,13 +1824,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 150}, {114, 17}} - + YES 67108864 @@ -1794,13 +1843,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 59}, {265, 52}} - + YES 67108864 @@ -1812,13 +1862,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 256 {{17, 178}, {265, 49}} - + YES 67108864 @@ -1830,6 +1881,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1844,7 +1896,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{20, 235}, {64, 64}} - + YES 134217728 @@ -1863,10 +1915,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {299, 327} - - + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1933,6 +1984,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA submenuAction: + Info @@ -2074,6 +2126,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -2097,6 +2150,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -2153,21 +2207,18 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4194304 QWxzIFZvcmdhYmVuIGRlcyBuZXVlbiBGYXZvcml0ZW4Kd2VyZGVuIGRpZSBFaW5zdGVsbHVuZ2VuIGRl cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 - - LucidaGrande - 9 - 3614 - + NO + 1 {221, 145} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2231,7 +2282,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 - + @@ -2252,6 +2303,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 4 + YES @@ -2259,6 +2311,8 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 {{-30, 1}, {15, 587}} NO + _doScroller: + _doScroller: 0.15277071297168732 @@ -2269,6 +2323,8 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 {{-100, -100}, {87, 18}} NO + _doScroller: + 1 _doScroller: @@ -2291,7 +2347,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 {575, 665} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2301,7 +2357,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 - + makeKeyAndOrderFront: @@ -4330,6 +4386,7 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 id id id + NSTableView id id id @@ -4388,6 +4445,10 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 currentSpeed1 id + + fanTableView + NSTableView + faqText id @@ -4455,9 +4516,95 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 IBProjectSource - ./Classes/FanControl.h + ../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 @@ -4473,35 +4620,28 @@ cyBGYXZvcml0ZW4KIkRlZmF1bHQiIHZlcndlbmRldC4 - IBProjectSource - ./Classes/SUUpdater.h - - - - StatusItemWindow - NSWindow - - IBProjectSource - ./Classes/StatusItemWindow.h + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx - + - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {16, 15} {15, 15} {62, 31} diff --git a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib index caf1ced..2845a2c 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/MainMenu.nib/designable.nib b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib index c242663..814fe5d 100644 --- a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib @@ -1,14 +1,14 @@ - 1050 - 12A269 - 2549 - 1187 - 624.00 + 1060 + 14A388a + 6249 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 6249 NSArrayController @@ -70,7 +70,7 @@ {213, 107} - + 256 @@ -79,13 +79,15 @@ - 2304 + 2322 4352 {295, 81} + + YES NO YES @@ -94,6 +96,8 @@ 256 {295, 17} + + @@ -112,7 +116,7 @@ 2048 Menú - LucidaGrande + YES 10 2843 @@ -135,7 +139,7 @@ 134348800 - LucidaGrande + YES 11 3100 @@ -178,11 +182,7 @@ 337641536 2048 - - LucidaGrande - 11 - 16 - + 6 @@ -257,7 +257,7 @@ 337641472 67108864 - + @@ -339,30 +339,42 @@ 1 - {{1, 17}, {295, 81}} + {{1, 0}, {295, 98}} + {{0, -17}, {295, 98}} + 4 + YES - 256 - {{285, 17}, {11, 75}} + -2147483392 + {{282, 17}, {14, 81}} + + NO + _doScroller: + 256 _doScroller: - 0.4375 + 1 + 0.85217391304347823 - 256 - {{1, 87}, {289, 11}} + -2147483392 + {{-100, -100}, {295, 14}} + + NO + _doScroller: + 257 _doScroller: @@ -370,22 +382,23 @@ - 2304 + 2338 {{1, 0}, {295, 17}} - + + - - 4 + YES {{20, 292}, {297, 99}} + - 133170 + 133650 @@ -400,6 +413,8 @@ 264 {{73, 395}, {177, 22}} + + YES -2076180416 @@ -476,6 +491,7 @@ 264 {{17, 397}, {54, 17}} + YES @@ -493,12 +509,15 @@ NO + 1 264 + {{285, 392}, {37, 28}} + YES 67108864 @@ -521,9 +540,10 @@ 264 + {{250, 392}, {37, 28}} - + YES 67108864 @@ -554,8 +574,10 @@ 256 + {{13, 92}, {239, 18}} + YES 603979776 @@ -580,6 +602,8 @@ 264 {{107, 58}, {168, 22}} + + YES -2076180416 @@ -650,6 +674,8 @@ 264 {{107, 33}, {168, 22}} + + YES -2076180416 @@ -720,6 +746,8 @@ 264 {{107, 8}, {168, 22}} + + YES -2076180416 @@ -790,6 +818,8 @@ 256 {{42, 60}, {63, 17}} + + YES 67108864 @@ -801,12 +831,15 @@ NO + 1 256 {{42, 35}, {63, 17}} + + YES 67108864 @@ -818,12 +851,15 @@ NO + 1 256 {{28, 10}, {77, 17}} + + YES 67108864 @@ -835,12 +871,15 @@ NO + 1 256 + {{13, 117}, {183, 18}} + YES 67108864 @@ -863,6 +902,8 @@ 256 {{13, 155}, {138, 28}} + + YES 67108864 @@ -874,12 +915,15 @@ NO + 1 256 {{151, 166}, {80, 18}} + + YES NO 1 @@ -926,7 +970,7 @@ 0 Radio - LucidaGrande + YES 13 1044 @@ -946,6 +990,8 @@ 256 {{13, 190}, {111, 17}} + + YES 67108864 @@ -957,12 +1003,15 @@ NO + 1 264 {{54, 188}, {174, 22}} + + YES 71303232 @@ -1057,8 +1106,10 @@ 256 + {{13, 142}, {222, 18}} + YES 67108864 @@ -1086,6 +1137,8 @@ {{233, 192}, {39, 17}} + + YES NO YES @@ -1094,10 +1147,14 @@ {{2, 2}, {299, 226}} + + {{17, 41}, {303, 243}} + + {0, 0} 67108864 @@ -1106,8 +1163,10 @@ - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + @@ -1119,8 +1178,10 @@ 256 + {{242, 13}, {80, 28}} + YES 67108864 @@ -1143,8 +1204,10 @@ 256 + {{159, 13}, {85, 28}} + YES 67108864 @@ -1162,97 +1225,23 @@ NO - - - 256 - {{100, 375}, {141, 16}} - - YES - - 603979776 - 134479872 - Button - - LucidaGrande - 9 - 3614 - - - -2038251520 - 1 - - LucidaGrande - 9 - 16 - - - - - - 200 - 25 - - NO - - - - 256 - {{19, 375}, {81, 16}} - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - - - - 256 - {{240, 375}, {76, 16}} - - YES - - 603979776 - 134479872 - Button - - - -2038251520 - 1 - - - - - - 200 - 25 - - NO - -2147483392 - {{97, 289}, {74, 22}} + + {{97, 289}, {100, 22}} + YES 67108864 262144 Sincronizar selectores - + + YES + 9 + 3614 + 1211912448 2 @@ -1270,8 +1259,11 @@ {337, 436} + + + - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} MainWindow @@ -1312,7 +1304,7 @@ {213, 107} - + 256 @@ -1328,7 +1320,6 @@ 2322 {573, 3934} - @@ -1611,7 +1602,7 @@ Uwo 1 - 11109 + 67119973 0 @@ -1629,7 +1620,7 @@ Uwo - + 1 @@ -1649,7 +1640,6 @@ Uwo {{1, 1}, {573, 601}} - @@ -1678,15 +1668,17 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES 256 {{558, 1}, {16, 601}} - YES NO + _doScroller: + _doScroller: 0.15277071682765633 @@ -1696,8 +1688,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -2147483392 {{-100, -100}, {87, 18}} - NO + _doScroller: + 1 _doScroller: @@ -1707,7 +1700,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - 133714 @@ -1720,10 +1712,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 603} - - - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1755,15 +1745,16 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4194304 Programversion - LucidaGrande-Bold + YES 16 - 16 + 2072 NO + 1 @@ -1776,7 +1767,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 272629760 Small System Font Text - LucidaGrande-Bold + YES 11 3357 @@ -1785,6 +1776,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1826,6 +1818,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1843,6 +1836,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1860,6 +1854,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1877,6 +1872,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1910,7 +1906,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {299, 327} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -1977,6 +1973,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA submenuAction: + Información @@ -2118,6 +2115,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -2141,6 +2139,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -2202,11 +2201,12 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 {221, 145} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2270,7 +2270,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - + @@ -2291,6 +2291,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -2298,6 +2299,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{-30, 1}, {15, 587}} NO + _doScroller: + _doScroller: 0.15277071297168732 @@ -2308,6 +2311,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{-100, -100}, {87, 18}} NO + _doScroller: + 1 _doScroller: @@ -2330,7 +2335,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {575, 665} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {213, 129} {10000000000000, 10000000000000} YES @@ -2340,7 +2345,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - + makeKeyAndOrderFront: @@ -3142,9 +3147,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - - @@ -3289,30 +3291,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 697 - - - - - - - - 698 - - - - - - - - 699 - - - - - - 212 @@ -3696,21 +3674,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 800 - - - - - 801 - - - - - 802 - - - 803 @@ -4170,6 +4133,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4269,9 +4233,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4295,9 +4256,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4413,6 +4371,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + NSTableView id id id @@ -4471,6 +4430,10 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA currentSpeed1 id + + fanTableView + NSTableView + faqText id @@ -4538,9 +4501,95 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA IBProjectSource - ./Classes/FanControl.h + ../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 @@ -4556,35 +4605,28 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - IBProjectSource - ./Classes/SUUpdater.h - - - - StatusItemWindow - NSWindow - - IBProjectSource - ./Classes/StatusItemWindow.h + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx - + - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {16, 15} {15, 15} {62, 31} diff --git a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib index db7e8d5..1a7c0c6 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.pbxproj b/smcFanControl.xcodeproj/project.pbxproj index 145cf09..c7e820e 100644 --- a/smcFanControl.xcodeproj/project.pbxproj +++ b/smcFanControl.xcodeproj/project.pbxproj @@ -443,7 +443,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -468,7 +468,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SDKROOT = macosx; diff --git a/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate b/smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate index 0b61b4c..58fd6fc 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