Changeset 13318
- Timestamp:
- May 27, 2012, 10:31:58 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
Transmission.xcodeproj/project.pbxproj (modified) (3 diffs)
-
macosx/Controller.h (modified) (3 diffs)
-
macosx/Controller.m (modified) (3 diffs)
-
macosx/MessageWindow.xib (modified) (20 diffs)
-
macosx/MessageWindowController.m (modified) (4 diffs)
-
macosx/PrefsController.m (modified) (1 diff)
-
macosx/StatsWindow.xib (modified) (23 diffs)
-
macosx/StatsWindowController.h (modified) (1 diff)
-
macosx/StatsWindowController.m (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Transmission.xcodeproj/project.pbxproj
r13299 r13318 2768 2768 FRAMEWORK_SEARCH_PATHS = macosx; 2769 2769 GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch; 2770 INFOPLIST_FILE = macosx/Info.plist;2771 2770 LIBRARY_SEARCH_PATHS = ( 2772 2771 "$(inherited)", … … 2925 2924 FRAMEWORK_SEARCH_PATHS = macosx; 2926 2925 GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch; 2927 INFOPLIST_FILE = macosx/Info.plist;2928 2926 LIBRARY_SEARCH_PATHS = ( 2929 2927 "$(inherited)", … … 3033 3031 FRAMEWORK_SEARCH_PATHS = macosx; 3034 3032 GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch; 3035 INFOPLIST_FILE = macosx/Info.plist;3036 3033 LIBRARY_SEARCH_PATHS = ( 3037 3034 "$(inherited)", -
trunk/macosx/Controller.h
r13256 r13318 58 58 PrefsController * fPrefsController; 59 59 InfoWindowController * fInfoController; 60 MessageWindowController * fMessageController;61 60 62 61 NSUserDefaults * fDefaults; … … 135 134 136 135 - (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo; 136 137 - (tr_session *) sessionHandle; 137 138 138 139 - (void) createFile: (id) sender; … … 182 183 - (void) setInfoTab: (id) sender; 183 184 185 @property (retain, readonly) MessageWindowController * messageWindowController; 184 186 - (void) showMessageWindow: (id) sender; 185 187 - (void) showStatsWindow: (id) sender; -
trunk/macosx/Controller.m
r13315 r13318 158 158 @implementation Controller 159 159 160 @synthesize messageWindowController = fMessageController; 161 160 162 + (void) initialize 161 163 { … … 731 733 //complete cleanup 732 734 tr_sessionClose(fLib); 735 } 736 737 - (tr_session *) sessionHandle 738 { 739 return fLib; 733 740 } 734 741 … … 1745 1752 } 1746 1753 1747 - ( void) showMessageWindow: (id) sender1754 - (MessageWindowController *) messageWindowController 1748 1755 { 1749 1756 if (!fMessageController) 1750 1757 fMessageController = [[MessageWindowController alloc] init]; 1751 [fMessageController showWindow: nil]; 1758 1759 return fMessageController; 1760 } 1761 1762 - (void) showMessageWindow: (id) sender 1763 { 1764 [[self messageWindowController] showWindow: nil]; 1752 1765 } 1753 1766 1754 1767 - (void) showStatsWindow: (id) sender 1755 1768 { 1756 [[StatsWindowController statsWindow : fLib] showWindow: nil];1769 [[StatsWindowController statsWindow] showWindow: nil]; 1757 1770 } 1758 1771 -
trunk/macosx/MessageWindow.xib
r12940 r13318 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 <string key="IBDocument.SystemVersion">11 B26</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 1617</string>7 <string key="IBDocument.AppKitVersion">1138 </string>8 <string key="IBDocument.HIToolboxVersion">56 6.00</string>5 <string key="IBDocument.SystemVersion">11E53</string> 6 <string key="IBDocument.InterfaceBuilderVersion">2182</string> 7 <string key="IBDocument.AppKitVersion">1138.47</string> 8 <string key="IBDocument.HIToolboxVersion">569.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 1617</string>11 <string key="NS.object.0">2182</string> 12 12 </object> 13 13 <array key="IBDocument.IntegratedClassDependencies"> … … 35 35 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 36 36 </array> 37 <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> 37 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 38 <string key="NS.key.0">PluginDependencyRecalculationVersion</string> 39 <integer value="1" key="NS.object.0"/> 40 </object> 38 41 <array class="NSMutableArray" key="IBDocument.RootObjects" id="667254319"> 39 42 <object class="NSCustomObject" id="135867518"> … … 59 62 <string key="NSWindowContentMinSize">{550, 200}</string> 60 63 <object class="NSView" key="NSWindowView" id="459370864"> 61 < nilkey="NSNextResponder"/>64 <reference key="NSNextResponder"/> 62 65 <int key="NSvFlags">256</int> 63 66 <array class="NSMutableArray" key="NSSubviews"> … … 67 70 <string key="NSFrame">{{509, 5}, {82, 25}}</string> 68 71 <reference key="NSSuperview" ref="459370864"/> 72 <reference key="NSWindow"/> 73 <reference key="NSNextKeyView"/> 69 74 <bool key="NSEnabled">YES</bool> 70 75 <object class="NSButtonCell" key="NSCell" id="56180972"> … … 98 103 <string key="NSFrame">{{20, 5}, {101, 25}}</string> 99 104 <reference key="NSSuperview" ref="459370864"/> 105 <reference key="NSWindow"/> 100 106 <reference key="NSNextKeyView" ref="945411764"/> 101 107 <bool key="NSEnabled">YES</bool> … … 185 191 <string key="NSFrame">{{129, 5}, {82, 25}}</string> 186 192 <reference key="NSSuperview" ref="459370864"/> 193 <reference key="NSWindow"/> 187 194 <reference key="NSNextKeyView" ref="619449639"/> 188 195 <bool key="NSEnabled">YES</bool> … … 217 224 <string key="NSFrameSize">{611, 276}</string> 218 225 <reference key="NSSuperview" ref="417557193"/> 219 <reference key="NSNextKeyView" ref="998736021"/> 226 <reference key="NSWindow"/> 227 <reference key="NSNextKeyView" ref="546510574"/> 220 228 <bool key="NSEnabled">YES</bool> 221 229 <object class="NSTableHeaderView" key="NSHeaderView" id="956628727"> … … 224 232 <string key="NSFrameSize">{611, 17}</string> 225 233 <reference key="NSSuperview" ref="449180771"/> 234 <reference key="NSWindow"/> 226 235 <reference key="NSNextKeyView" ref="417557193"/> 227 236 <reference key="NSTableView" ref="422137489"/> … … 292 301 AAMAAAABAA4AAAECAAMAAAAEAAADtgEDAAMAAAABAAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES 293 302 AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAA4AAAEXAAQAAAABAAAC9AEcAAMAAAABAAEAAAE9 294 AAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAADvodzAAcAAA w4AAADxgAAAAAACAAIAAgACAAB295 AAEAAQABAAAM OGFwcGwCEAAAbW50clJHQiBYWVogB9sACAAQABIADAAIYWNzcEFQUEwAAAAAAAAAAAAA303 AAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAADvodzAAcAAAyYAAADxgAAAAAACAAIAAgACAAB 304 AAEAAQABAAAMmGFwcGwCEAAAbW50clJHQiBYWVogB9wABQAJABcANgAqYWNzcEFQUEwAAAAAAAAAAAAA 296 305 AAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 297 AAAAAAAAAAAAAAAAAAAAAAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAA EgY3BydAAAAtQAAAAjd3RwdAAA298 A vgAAAAUclhZWgAAAwwAAAAUZ1hZWgAAAyAAAAAUYlhZWgAAAzQAAAAUclRSQwAAA0gAAAgMYWFyZwAA299 C 1QAAAAgdmNndAAAC3QAAAAwbmRpbgAAC6QAAAA+Y2hhZAAAC+QAAAAsbW1vZAAADBAAAAAoYlRSQwAA300 A 0gAAAgMZ1RSQwAAA0gAAAgMYWFiZwAAC1QAAAAgYWFnZwAAC1QAAAAgZGVzYwAAAAAAAAAIRGlzcGxh306 AAAAAAAAAAAAAAAAAAAAAAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAAGAY3BydAAAAzQAAAAkd3RwdAAA 307 A1gAAAAUclhZWgAAA2wAAAAUZ1hZWgAAA4AAAAAUYlhZWgAAA5QAAAAUclRSQwAAA6gAAAgMYWFyZwAA 308 C7QAAAAgdmNndAAAC9QAAAAwbmRpbgAADAQAAAA+Y2hhZAAADEQAAAAsbW1vZAAADHAAAAAoYlRSQwAA 309 A6gAAAgMZ1RSQwAAA6gAAAgMYWFiZwAAC7QAAAAgYWFnZwAAC7QAAAAgZGVzYwAAAAAAAAAIRGlzcGxh 301 310 eQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 302 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1sdWMAAAAAAAAAFgAAAAxwdEJSAAAACAAAARhpdElUAAAACAAA 303 ARhodUhVAAAACAAAARh6aFRXAAAACAAAARhuYk5PAAAACAAAARhjc0NaAAAACAAAARhrb0tSAAAACAAA 304 ARhkZURFAAAACAAAARhzdlNFAAAACAAAARh6aENOAAAACAAAARhqYUpQAAAACAAAARhhcgAAAAAACAAA 305 ARhwdFBUAAAACAAAARhubE5MAAAACAAAARhmckZSAAAACAAAARhlc0VTAAAACAAAARh0clRSAAAACAAA 306 ARhmaUZJAAAACAAAARhwbFBMAAAACAAAARhydVJVAAAACAAAARhlblVTAAAACAAAARhkYURLAAAACAAA 307 ARgAaQBNAGEAY3RleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDExAFhZWiAAAAAAAADzFgAB 308 AAAAARbKWFlaIAAAAAAAAHHAAAA5igAAAWdYWVogAAAAAAAAYSMAALnmAAAT9lhZWiAAAAAAAAAj8gAA 309 DJAAAL3QY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA2ADsAQABFAEoATwBUAFkAXgBj 310 AGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKMAqACtALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7 311 AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJ 312 AdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLg 313 AusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRI 314 BFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYG 315 BhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgf 316 CDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoKgQqY 317 Cq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUANWg10 318 DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBhEH4QmxC5 319 ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRq 320 FIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiK 321 GK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyjHMwc9R0e 322 HUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUghdSGhIc4h+yIn 323 IlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcYJ0kneier 324 J9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2r 325 LeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQr 326 NGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zst 327 O2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1 328 QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrE 329 SwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1Nf 330 U6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyG 331 XNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9 332 ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CG 333 cOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7BHtj 334 e8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wrhg6GcobX 335 hzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLj 336 k02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6fHZ+L 337 n/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1q+msXKzQ 338 rUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1 339 uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6 340 ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk 341 2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy 342 6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio 343 +Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//9wYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQAAAKDnZj 344 Z3QAAAAAAAAAAQABAAAAAAAAAAEAAAABAAAAAAAAAAEAAAABAAAAAAAAAAEAAG5kaW4AAAAAAAAANgAA 345 p0AAAFWAAABMwAAAnsAAACWAAAAMwAAAUAAAAFRAAAIzMwACMzMAAjMzAAAAAAAAAABzZjMyAAAAAAAB 346 DHIAAAX4///zHQAAB7oAAP1y///7nf///aQAAAPZAADAcW1tb2QAAAAAAAAGEAAAoAcAAAAAySceAAAA 347 AAAAAAAAAAAAAAAAAAA</bytes> 311 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1sdWMAAAAAAAAAHgAAAAxza1NLAAAACAAAAXhjYUVTAAAACAAA 312 AXhoZUlMAAAACAAAAXhwdEJSAAAACAAAAXhpdElUAAAACAAAAXhodUhVAAAACAAAAXh1a1VBAAAACAAA 313 AXhrb0tSAAAACAAAAXhuYk5PAAAACAAAAXhjc0NaAAAACAAAAXh6aFRXAAAACAAAAXhkZURFAAAACAAA 314 AXhyb1JPAAAACAAAAXhzdlNFAAAACAAAAXh6aENOAAAACAAAAXhqYUpQAAAACAAAAXhhcgAAAAAACAAA 315 AXhlbEdSAAAACAAAAXhwdFBUAAAACAAAAXhubE5MAAAACAAAAXhmckZSAAAACAAAAXhlc0VTAAAACAAA 316 AXh0aFRIAAAACAAAAXh0clRSAAAACAAAAXhmaUZJAAAACAAAAXhockhSAAAACAAAAXhwbFBMAAAACAAA 317 AXhydVJVAAAACAAAAXhlblVTAAAACAAAAXhkYURLAAAACAAAAXgAaQBNAGEAY3RleHQAAAAAQ29weXJp 318 Z2h0IEFwcGxlLCBJbmMuLCAyMDEyAFhZWiAAAAAAAADzFgABAAAAARbKWFlaIAAAAAAAAHHAAAA5igAA 319 AWdYWVogAAAAAAAAYSMAALnmAAAT9lhZWiAAAAAAAAAj8gAADJAAAL3QY3VydgAAAAAAAAQAAAAABQAK 320 AA8AFAAZAB4AIwAoAC0AMgA2ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCf 321 AKMAqACtALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFF 322 AUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIv 323 AjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNm 324 A3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTw 325 BP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbR 326 BuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQ 327 CSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuw 328 C8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62 329 DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxIm 330 EkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYD 331 FiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpR 332 GncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8T 333 Hz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRN 334 JHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoC 335 KjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1 336 MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbp 337 NyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4g 338 PmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXe 339 RiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4l 340 Tm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3 341 V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBX 342 YKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpI 343 ap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTM 344 dSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/l 345 gEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuW 346 i/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfg 347 mEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTH 348 pTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJL 349 ssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBw 350 wOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83 351 z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i 352 3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO60 353 70DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t 354 //9wYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQAAAKDnZjZ3QAAAAAAAAAAQABAAAAAAAAAAEAAAAB 355 AAAAAAAAAAEAAAABAAAAAAAAAAEAAG5kaW4AAAAAAAAANgAAp0AAAFWAAABMwAAAnsAAACWAAAAMwAAA 356 UAAAAFRAAAIzMwACMzMAAjMzAAAAAAAAAABzZjMyAAAAAAABDHIAAAX4///zHQAAB7oAAP1y///7nf// 357 /aQAAAPZAADAcW1tb2QAAAAAAAAGEAAAoAcAAAAAySceAAAAAAAAAAAAAAAAAAAAAAA</bytes> 348 358 </object> 349 359 <string key="NSCacheWindowColorSpace">NSCalibratedRGBColorSpace</string> … … 531 541 <string key="NSFrame">{{1, 17}, {611, 276}}</string> 532 542 <reference key="NSSuperview" ref="104571253"/> 543 <reference key="NSWindow"/> 533 544 <reference key="NSNextKeyView" ref="422137489"/> 534 545 <reference key="NSDocView" ref="422137489"/> … … 541 552 <string key="NSFrame">{{597, 17}, {15, 276}}</string> 542 553 <reference key="NSSuperview" ref="104571253"/> 554 <reference key="NSWindow"/> 543 555 <reference key="NSNextKeyView" ref="539084345"/> 544 556 <reference key="NSTarget" ref="104571253"/> … … 551 563 <string key="NSFrame">{{-100, -100}, {596, 15}}</string> 552 564 <reference key="NSSuperview" ref="104571253"/> 565 <reference key="NSWindow"/> 553 566 <reference key="NSNextKeyView" ref="449180771"/> 554 567 <int key="NSsFlags">1</int> … … 565 578 <string key="NSFrame">{{1, 0}, {611, 17}}</string> 566 579 <reference key="NSSuperview" ref="104571253"/> 580 <reference key="NSWindow"/> 567 581 <reference key="NSNextKeyView" ref="956628727"/> 568 582 <reference key="NSDocView" ref="956628727"/> … … 573 587 <string key="NSFrame">{{-1, 35}, {613, 294}}</string> 574 588 <reference key="NSSuperview" ref="459370864"/> 575 <reference key="NSNextKeyView" ref="417557193"/> 589 <reference key="NSWindow"/> 590 <reference key="NSNextKeyView" ref="998736021"/> 576 591 <int key="NSsFlags">133138</int> 577 592 <reference key="NSVScroller" ref="546510574"/> … … 586 601 <string key="NSFrame">{{351, 7}, {150, 22}}</string> 587 602 <reference key="NSSuperview" ref="459370864"/> 603 <reference key="NSWindow"/> 588 604 <reference key="NSNextKeyView" ref="324840191"/> 589 605 <bool key="NSEnabled">YES</bool> … … 641 657 </array> 642 658 <string key="NSFrameSize">{611, 328}</string> 659 <reference key="NSSuperview"/> 660 <reference key="NSWindow"/> 643 661 <reference key="NSNextKeyView" ref="104571253"/> 644 662 </object> 645 <string key="NSScreenRect">{{0, 0}, { 1680, 1028}}</string>663 <string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string> 646 664 <string key="NSMinSize">{550, 222}</string> 647 665 <string key="NSMaxSize">{10000000000000, 10000000000000}</string> 648 <bool key="NSWindowIsRestorable"> NO</bool>666 <bool key="NSWindowIsRestorable">YES</bool> 649 667 </object> 650 668 </array> … … 693 711 <object class="IBConnectionRecord"> 694 712 <object class="IBOutletConnection" key="connection"> 713 <string key="label">fMessageTable</string> 714 <reference key="source" ref="135867518"/> 715 <reference key="destination" ref="422137489"/> 716 </object> 717 <int key="connectionID">42</int> 718 </object> 719 <object class="IBConnectionRecord"> 720 <object class="IBOutletConnection" key="connection"> 721 <string key="label">fSaveButton</string> 722 <reference key="source" ref="135867518"/> 723 <reference key="destination" ref="945411764"/> 724 </object> 725 <int key="connectionID">70</int> 726 </object> 727 <object class="IBConnectionRecord"> 728 <object class="IBOutletConnection" key="connection"> 729 <string key="label">fClearButton</string> 730 <reference key="source" ref="135867518"/> 731 <reference key="destination" ref="324840191"/> 732 </object> 733 <int key="connectionID">71</int> 734 </object> 735 <object class="IBConnectionRecord"> 736 <object class="IBOutletConnection" key="connection"> 737 <string key="label">fFilterField</string> 738 <reference key="source" ref="135867518"/> 739 <reference key="destination" ref="619449639"/> 740 </object> 741 <int key="connectionID">74</int> 742 </object> 743 <object class="IBConnectionRecord"> 744 <object class="IBActionConnection" key="connection"> 745 <string key="label">changeFilter:</string> 746 <reference key="source" ref="135867518"/> 747 <reference key="destination" ref="619449639"/> 748 </object> 749 <int key="connectionID">75</int> 750 </object> 751 <object class="IBConnectionRecord"> 752 <object class="IBOutletConnection" key="connection"> 753 <string key="label">delegate</string> 754 <reference key="source" ref="905673783"/> 755 <reference key="destination" ref="135867518"/> 756 </object> 757 <int key="connectionID">67</int> 758 </object> 759 <object class="IBConnectionRecord"> 760 <object class="IBOutletConnection" key="connection"> 695 761 <string key="label">dataSource</string> 696 762 <reference key="source" ref="422137489"/> … … 706 772 </object> 707 773 <int key="connectionID">40</int> 708 </object>709 <object class="IBConnectionRecord">710 <object class="IBOutletConnection" key="connection">711 <string key="label">fMessageTable</string>712 <reference key="source" ref="135867518"/>713 <reference key="destination" ref="422137489"/>714 </object>715 <int key="connectionID">42</int>716 </object>717 <object class="IBConnectionRecord">718 <object class="IBOutletConnection" key="connection">719 <string key="label">delegate</string>720 <reference key="source" ref="905673783"/>721 <reference key="destination" ref="135867518"/>722 </object>723 <int key="connectionID">67</int>724 </object>725 <object class="IBConnectionRecord">726 <object class="IBOutletConnection" key="connection">727 <string key="label">fSaveButton</string>728 <reference key="source" ref="135867518"/>729 <reference key="destination" ref="945411764"/>730 </object>731 <int key="connectionID">70</int>732 </object>733 <object class="IBConnectionRecord">734 <object class="IBOutletConnection" key="connection">735 <string key="label">fClearButton</string>736 <reference key="source" ref="135867518"/>737 <reference key="destination" ref="324840191"/>738 </object>739 <int key="connectionID">71</int>740 </object>741 <object class="IBConnectionRecord">742 <object class="IBOutletConnection" key="connection">743 <string key="label">fFilterField</string>744 <reference key="source" ref="135867518"/>745 <reference key="destination" ref="619449639"/>746 </object>747 <int key="connectionID">74</int>748 </object>749 <object class="IBConnectionRecord">750 <object class="IBActionConnection" key="connection">751 <string key="label">changeFilter:</string>752 <reference key="source" ref="135867518"/>753 <reference key="destination" ref="619449639"/>754 </object>755 <int key="connectionID">75</int>756 774 </object> 757 775 </array> … … 1002 1020 <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 1003 1021 <string key="5.IBWindowTemplateEditedContentRect">{{215, 593}, {611, 328}}</string> 1022 <string key="5.userInterfaceItemIdentifier">MessageWindow</string> 1004 1023 <string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 1005 1024 <string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> … … 1077 1096 <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> 1078 1097 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> 1079 < integer value="1060" key="NS.object.0"/>1098 <real value="1070" key="NS.object.0"/> 1080 1099 </object> 1081 1100 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> 1082 1101 <int key="IBDocument.defaultPropertyAccessControl">3</int> 1083 1102 <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> 1084 <string key="NSMenuCheckmark">{ 9, 8}</string>1085 <string key="NSMenuMixedState">{ 7, 2}</string>1103 <string key="NSMenuCheckmark">{11, 11}</string> 1104 <string key="NSMenuMixedState">{10, 3}</string> 1086 1105 <string key="PurpleDot">{16, 16}</string> 1087 1106 <string key="RedDot">{16, 16}</string> -
trunk/macosx/MessageWindowController.m
r13251 r13318 24 24 25 25 #import "MessageWindowController.h" 26 #import "Controller.h" 26 27 #import "NSApplicationAdditions.h" 27 28 #import "NSMutableArrayAdditions.h" … … 57 58 [window setFrameAutosaveName: @"MessageWindowFrame"]; 58 59 [window setFrameUsingName: @"MessageWindowFrame"]; 60 61 [window setRestorationClass: [self class]]; 59 62 60 63 [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeColumn) … … 150 153 if (!fTimer) 151 154 { 152 fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self 153 selector: @selector(updateLog:) userInfo: nil repeats: YES]; 155 fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateLog:) userInfo: nil repeats: YES]; 154 156 [self updateLog: nil]; 155 157 } … … 160 162 [fTimer invalidate]; 161 163 fTimer = nil; 164 } 165 166 + (void) restoreWindowWithIdentifier: (NSString *) identifier state: (NSCoder *) state completionHandler: (void (^)(NSWindow *, NSError *)) completionHandler 167 { 168 NSAssert1([identifier isEqualToString: @"MessageWindow"], @"Trying to restore unexpected identifier %@", identifier); 169 170 NSWindow * window = [[(Controller *)[NSApp delegate] messageWindowController] window]; 171 completionHandler(window, nil); 172 } 173 174 - (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder 175 { 176 [fTimer invalidate]; 177 fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateLog:) userInfo: nil repeats: YES]; 178 [self updateLog: nil]; 162 179 } 163 180 -
trunk/macosx/PrefsController.m
r13251 r13318 66 66 @implementation PrefsController 67 67 68 #warning just call method in Controller? 68 69 tr_session * fHandle; 69 70 + (void) setHandle: (tr_session *) handle -
trunk/macosx/StatsWindow.xib
r12940 r13318 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 <string key="IBDocument.SystemVersion">11 B26</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 1617</string>7 <string key="IBDocument.AppKitVersion">1138 </string>8 <string key="IBDocument.HIToolboxVersion">56 6.00</string>5 <string key="IBDocument.SystemVersion">11E53</string> 6 <string key="IBDocument.InterfaceBuilderVersion">2182</string> 7 <string key="IBDocument.AppKitVersion">1138.47</string> 8 <string key="IBDocument.HIToolboxVersion">569.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 1617</string>11 <string key="NS.object.0">2182</string> 12 12 </object> 13 13 <array key="IBDocument.IntegratedClassDependencies"> … … 23 23 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 24 24 </array> 25 <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> 25 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 26 <string key="NS.key.0">PluginDependencyRecalculationVersion</string> 27 <integer value="1" key="NS.object.0"/> 28 </object> 26 29 <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> 27 30 <object class="NSCustomObject" id="1001"> … … 46 49 <string key="NSWindowContentMinSize">{326, 191}</string> 47 50 <object class="NSView" key="NSWindowView" id="1006"> 48 < nilkey="NSNextResponder"/>51 <reference key="NSNextResponder"/> 49 52 <int key="NSvFlags">256</int> 50 53 <array class="NSMutableArray" key="NSSubviews"> … … 54 57 <string key="NSFrame">{{17, 157}, {94, 14}}</string> 55 58 <reference key="NSSuperview" ref="1006"/> 59 <reference key="NSWindow"/> 56 60 <reference key="NSNextKeyView" ref="703685169"/> 57 61 <bool key="NSEnabled">YES</bool> … … 91 95 <string key="NSFrame">{{17, 125}, {94, 14}}</string> 92 96 <reference key="NSSuperview" ref="1006"/> 97 <reference key="NSWindow"/> 93 98 <reference key="NSNextKeyView" ref="253460222"/> 94 99 <bool key="NSEnabled">YES</bool> … … 108 113 <string key="NSFrame">{{17, 93}, {94, 14}}</string> 109 114 <reference key="NSSuperview" ref="1006"/> 115 <reference key="NSWindow"/> 110 116 <reference key="NSNextKeyView" ref="536006120"/> 111 117 <bool key="NSEnabled">YES</bool> … … 125 131 <string key="NSFrame">{{17, 61}, {94, 14}}</string> 126 132 <reference key="NSSuperview" ref="1006"/> 133 <reference key="NSWindow"/> 127 134 <reference key="NSNextKeyView" ref="941353735"/> 128 135 <bool key="NSEnabled">YES</bool> … … 142 149 <string key="NSFrame">{{113, 157}, {196, 14}}</string> 143 150 <reference key="NSSuperview" ref="1006"/> 151 <reference key="NSWindow"/> 144 152 <reference key="NSNextKeyView" ref="431969193"/> 145 153 <bool key="NSEnabled">YES</bool> … … 159 167 <string key="NSFrame">{{113, 125}, {196, 14}}</string> 160 168 <reference key="NSSuperview" ref="1006"/> 169 <reference key="NSWindow"/> 161 170 <reference key="NSNextKeyView" ref="550850235"/> 162 171 <bool key="NSEnabled">YES</bool> … … 176 185 <string key="NSFrame">{{113, 93}, {196, 14}}</string> 177 186 <reference key="NSSuperview" ref="1006"/> 187 <reference key="NSWindow"/> 178 188 <reference key="NSNextKeyView" ref="892058372"/> 179 189 <bool key="NSEnabled">YES</bool> … … 193 203 <string key="NSFrame">{{113, 61}, {196, 14}}</string> 194 204 <reference key="NSSuperview" ref="1006"/> 205 <reference key="NSWindow"/> 195 206 <reference key="NSNextKeyView" ref="1005247565"/> 196 207 <bool key="NSEnabled">YES</bool> … … 210 221 <string key="NSFrame">{{17, 29}, {94, 14}}</string> 211 222 <reference key="NSSuperview" ref="1006"/> 223 <reference key="NSWindow"/> 212 224 <reference key="NSNextKeyView" ref="857281737"/> 213 225 <bool key="NSEnabled">YES</bool> … … 227 239 <string key="NSFrame">{{113, 29}, {196, 14}}</string> 228 240 <reference key="NSSuperview" ref="1006"/> 241 <reference key="NSWindow"/> 229 242 <reference key="NSNextKeyView" ref="200761340"/> 230 243 <bool key="NSEnabled">YES</bool> … … 244 257 <string key="NSFrame">{{113, 141}, {196, 14}}</string> 245 258 <reference key="NSSuperview" ref="1006"/> 259 <reference key="NSWindow"/> 246 260 <reference key="NSNextKeyView" ref="21891891"/> 247 261 <bool key="NSEnabled">YES</bool> … … 261 275 <string key="NSFrame">{{113, 109}, {196, 14}}</string> 262 276 <reference key="NSSuperview" ref="1006"/> 277 <reference key="NSWindow"/> 263 278 <reference key="NSNextKeyView" ref="64479925"/> 264 279 <bool key="NSEnabled">YES</bool> … … 278 293 <string key="NSFrame">{{113, 77}, {196, 14}}</string> 279 294 <reference key="NSSuperview" ref="1006"/> 295 <reference key="NSWindow"/> 280 296 <reference key="NSNextKeyView" ref="496824416"/> 281 297 <bool key="NSEnabled">YES</bool> … … 295 311 <string key="NSFrame">{{113, 45}, {196, 14}}</string> 296 312 <reference key="NSSuperview" ref="1006"/> 313 <reference key="NSWindow"/> 297 314 <reference key="NSNextKeyView" ref="586749298"/> 298 315 <bool key="NSEnabled">YES</bool> … … 312 329 <string key="NSFrame">{{246, 3}, {65, 28}}</string> 313 330 <reference key="NSSuperview" ref="1006"/> 331 <reference key="NSWindow"/> 332 <reference key="NSNextKeyView"/> 314 333 <bool key="NSEnabled">YES</bool> 315 334 <object class="NSButtonCell" key="NSCell" id="992392450"> … … 333 352 </array> 334 353 <string key="NSFrameSize">{326, 191}</string> 354 <reference key="NSSuperview"/> 355 <reference key="NSWindow"/> 335 356 <reference key="NSNextKeyView" ref="848189093"/> 336 357 </object> 337 <string key="NSScreenRect">{{0, 0}, { 1680, 1028}}</string>358 <string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string> 338 359 <string key="NSMinSize">{326, 213}</string> 339 360 <string key="NSMaxSize">{326, 213}</string> 340 361 <string key="NSFrameAutosaveName"/> 341 <bool key="NSWindowIsRestorable"> NO</bool>362 <bool key="NSWindowIsRestorable">YES</bool> 342 363 </object> 343 364 </array> … … 354 375 <object class="IBConnectionRecord"> 355 376 <object class="IBOutletConnection" key="connection"> 377 <string key="label">fUploadedField</string> 378 <reference key="source" ref="1001"/> 379 <reference key="destination" ref="703685169"/> 380 </object> 381 <int key="connectionID">31</int> 382 </object> 383 <object class="IBConnectionRecord"> 384 <object class="IBOutletConnection" key="connection"> 385 <string key="label">fDownloadedField</string> 386 <reference key="source" ref="1001"/> 387 <reference key="destination" ref="253460222"/> 388 </object> 389 <int key="connectionID">32</int> 390 </object> 391 <object class="IBConnectionRecord"> 392 <object class="IBOutletConnection" key="connection"> 393 <string key="label">fRatioField</string> 394 <reference key="source" ref="1001"/> 395 <reference key="destination" ref="536006120"/> 396 </object> 397 <int key="connectionID">33</int> 398 </object> 399 <object class="IBConnectionRecord"> 400 <object class="IBOutletConnection" key="connection"> 401 <string key="label">fTimeField</string> 402 <reference key="source" ref="1001"/> 403 <reference key="destination" ref="941353735"/> 404 </object> 405 <int key="connectionID">34</int> 406 </object> 407 <object class="IBConnectionRecord"> 408 <object class="IBOutletConnection" key="connection"> 409 <string key="label">fNumOpenedField</string> 410 <reference key="source" ref="1001"/> 411 <reference key="destination" ref="857281737"/> 412 </object> 413 <int key="connectionID">39</int> 414 </object> 415 <object class="IBConnectionRecord"> 416 <object class="IBOutletConnection" key="connection"> 417 <string key="label">fUploadedAllField</string> 418 <reference key="source" ref="1001"/> 419 <reference key="destination" ref="431969193"/> 420 </object> 421 <int key="connectionID">48</int> 422 </object> 423 <object class="IBConnectionRecord"> 424 <object class="IBOutletConnection" key="connection"> 425 <string key="label">fDownloadedAllField</string> 426 <reference key="source" ref="1001"/> 427 <reference key="destination" ref="550850235"/> 428 </object> 429 <int key="connectionID">49</int> 430 </object> 431 <object class="IBConnectionRecord"> 432 <object class="IBOutletConnection" key="connection"> 433 <string key="label">fRatioAllField</string> 434 <reference key="source" ref="1001"/> 435 <reference key="destination" ref="892058372"/> 436 </object> 437 <int key="connectionID">50</int> 438 </object> 439 <object class="IBConnectionRecord"> 440 <object class="IBOutletConnection" key="connection"> 441 <string key="label">fTimeAllField</string> 442 <reference key="source" ref="1001"/> 443 <reference key="destination" ref="1005247565"/> 444 </object> 445 <int key="connectionID">51</int> 446 </object> 447 <object class="IBConnectionRecord"> 448 <object class="IBOutletConnection" key="connection"> 449 <string key="label">fUploadedLabelField</string> 450 <reference key="source" ref="1001"/> 451 <reference key="destination" ref="848189093"/> 452 </object> 453 <int key="connectionID">52</int> 454 </object> 455 <object class="IBConnectionRecord"> 456 <object class="IBOutletConnection" key="connection"> 457 <string key="label">fDownloadedLabelField</string> 458 <reference key="source" ref="1001"/> 459 <reference key="destination" ref="21891891"/> 460 </object> 461 <int key="connectionID">53</int> 462 </object> 463 <object class="IBConnectionRecord"> 464 <object class="IBOutletConnection" key="connection"> 465 <string key="label">fRatioLabelField</string> 466 <reference key="source" ref="1001"/> 467 <reference key="destination" ref="64479925"/> 468 </object> 469 <int key="connectionID">54</int> 470 </object> 471 <object class="IBConnectionRecord"> 472 <object class="IBOutletConnection" key="connection"> 473 <string key="label">fTimeLabelField</string> 474 <reference key="source" ref="1001"/> 475 <reference key="destination" ref="496824416"/> 476 </object> 477 <int key="connectionID">55</int> 478 </object> 479 <object class="IBConnectionRecord"> 480 <object class="IBOutletConnection" key="connection"> 481 <string key="label">fNumOpenedLabelField</string> 482 <reference key="source" ref="1001"/> 483 <reference key="destination" ref="586749298"/> 484 </object> 485 <int key="connectionID">56</int> 486 </object> 487 <object class="IBConnectionRecord"> 488 <object class="IBActionConnection" key="connection"> 489 <string key="label">resetStats:</string> 490 <reference key="source" ref="1001"/> 491 <reference key="destination" ref="200761340"/> 492 </object> 493 <int key="connectionID">66</int> 494 </object> 495 <object class="IBConnectionRecord"> 496 <object class="IBOutletConnection" key="connection"> 497 <string key="label">fResetButton</string> 498 <reference key="source" ref="1001"/> 499 <reference key="destination" ref="200761340"/> 500 </object> 501 <int key="connectionID">67</int> 502 </object> 503 <object class="IBConnectionRecord"> 504 <object class="IBOutletConnection" key="connection"> 356 505 <string key="label">delegate</string> 357 506 <reference key="source" ref="1005"/> … … 359 508 </object> 360 509 <int key="connectionID">30</int> 361 </object>362 <object class="IBConnectionRecord">363 <object class="IBOutletConnection" key="connection">364 <string key="label">fUploadedField</string>365 <reference key="source" ref="1001"/>366 <reference key="destination" ref="703685169"/>367 </object>368 <int key="connectionID">31</int>369 </object>370 <object class="IBConnectionRecord">371 <object class="IBOutletConnection" key="connection">372 <string key="label">fDownloadedField</string>373 <reference key="source" ref="1001"/>374 <reference key="destination" ref="253460222"/>375 </object>376 <int key="connectionID">32</int>377 </object>378 <object class="IBConnectionRecord">379 <object class="IBOutletConnection" key="connection">380 <string key="label">fRatioField</string>381 <reference key="source" ref="1001"/>382 <reference key="destination" ref="536006120"/>383 </object>384 <int key="connectionID">33</int>385 </object>386 <object class="IBConnectionRecord">387 <object class="IBOutletConnection" key="connection">388 <string key="label">fTimeField</string>389 <reference key="source" ref="1001"/>390 <reference key="destination" ref="941353735"/>391 </object>392 <int key="connectionID">34</int>393 </object>394 <object class="IBConnectionRecord">395 <object class="IBOutletConnection" key="connection">396 <string key="label">fNumOpenedField</string>397 <reference key="source" ref="1001"/>398 <reference key="destination" ref="857281737"/>399 </object>400 <int key="connectionID">39</int>401 </object>402 <object class="IBConnectionRecord">403 <object class="IBOutletConnection" key="connection">404 <string key="label">fUploadedAllField</string>405 <reference key="source" ref="1001"/>406 <reference key="destination" ref="431969193"/>407 </object>408 <int key="connectionID">48</int>409 </object>410 <object class="IBConnectionRecord">411 <object class="IBOutletConnection" key="connection">412 <string key="label">fDownloadedAllField</string>413 <reference key="source" ref="1001"/>414 <reference key="destination" ref="550850235"/>415 </object>416 <int key="connectionID">49</int>417 </object>418 <object class="IBConnectionRecord">419 <object class="IBOutletConnection" key="connection">420 <string key="label">fRatioAllField</string>421 <reference key="source" ref="1001"/>422 <reference key="destination" ref="892058372"/>423 </object>424 <int key="connectionID">50</int>425 </object>426 <object class="IBConnectionRecord">427 <object class="IBOutletConnection" key="connection">428 <string key="label">fTimeAllField</string>429 <reference key="source" ref="1001"/>430 <reference key="destination" ref="1005247565"/>431 </object>432 <int key="connectionID">51</int>433 </object>434 <object class="IBConnectionRecord">435 <object class="IBOutletConnection" key="connection">436 <string key="label">fUploadedLabelField</string>437 <reference key="source" ref="1001"/>438 <reference key="destination" ref="848189093"/>439 </object>440 <int key="connectionID">52</int>441 </object>442 <object class="IBConnectionRecord">443 <object class="IBOutletConnection" key="connection">444 <string key="label">fDownloadedLabelField</string>445 <reference key="source" ref="1001"/>446 <reference key="destination" ref="21891891"/>447 </object>448 <int key="connectionID">53</int>449 </object>450 <object class="IBConnectionRecord">451 <object class="IBOutletConnection" key="connection">452 <string key="label">fRatioLabelField</string>453 <reference key="source" ref="1001"/>454 <reference key="destination" ref="64479925"/>455 </object>456 <int key="connectionID">54</int>457 </object>458 <object class="IBConnectionRecord">459 <object class="IBOutletConnection" key="connection">460 <string key="label">fTimeLabelField</string>461 <reference key="source" ref="1001"/>462 <reference key="destination" ref="496824416"/>463 </object>464 <int key="connectionID">55</int>465 </object>466 <object class="IBConnectionRecord">467 <object class="IBOutletConnection" key="connection">468 <string key="label">fNumOpenedLabelField</string>469 <reference key="source" ref="1001"/>470 <reference key="destination" ref="586749298"/>471 </object>472 <int key="connectionID">56</int>473 </object>474 <object class="IBConnectionRecord">475 <object class="IBActionConnection" key="connection">476 <string key="label">resetStats:</string>477 <reference key="source" ref="1001"/>478 <reference key="destination" ref="200761340"/>479 </object>480 <int key="connectionID">66</int>481 </object>482 <object class="IBConnectionRecord">483 <object class="IBOutletConnection" key="connection">484 <string key="label">fResetButton</string>485 <reference key="source" ref="1001"/>486 <reference key="destination" ref="200761340"/>487 </object>488 <int key="connectionID">67</int>489 510 </object> 490 511 </array> … … 750 771 <string key="1.IBWindowTemplateEditedContentRect">{{612, 485}, {284, 191}}</string> 751 772 <integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/> 773 <boolean value="NO" key="1.showNotes"/> 774 <string key="1.userInterfaceItemIdentifier">StatsWindow</string> 752 775 <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 753 776 <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> … … 887 910 <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> 888 911 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> 889 < integer value="1060" key="NS.object.0"/>912 <real value="1070" key="NS.object.0"/> 890 913 </object> 891 914 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> -
trunk/macosx/StatsWindowController.h
r13162 r13318 35 35 } 36 36 37 + (StatsWindowController *) statsWindow : (tr_session *) lib;37 + (StatsWindowController *) statsWindow; 38 38 39 39 - (void) resetStats: (id) sender; -
trunk/macosx/StatsWindowController.m
r13251 r13318 24 24 25 25 #import "StatsWindowController.h" 26 #import "Controller.h" 26 27 #import "NSStringAdditions.h" 27 28 … … 40 41 41 42 StatsWindowController * fStatsWindowInstance = nil; 42 tr_session * fLib ;43 + (StatsWindowController *) statsWindow : (tr_session *) lib43 tr_session * fLib = NULL; 44 + (StatsWindowController *) statsWindow 44 45 { 45 46 if (!fStatsWindowInstance) 46 47 { 47 if ((fStatsWindowInstance = [[self alloc] init WithWindowNibName: @"StatsWindow"]))48 if ((fStatsWindowInstance = [[self alloc] init])) 48 49 { 49 fLib = lib;50 fLib = [(Controller *)[NSApp delegate] sessionHandle]; 50 51 } 51 52 } … … 53 54 } 54 55 56 - (id) init 57 { 58 return [super initWithWindowNibName: @"StatsWindow"]; 59 } 60 55 61 - (void) awakeFromNib 56 62 { 57 63 [self updateStats]; 58 64 59 fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self 60 selector: @selector(updateStats) userInfo: nil repeats: YES]; 65 fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateStats) userInfo: nil repeats: YES]; 61 66 [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode]; 62 67 [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode]; 68 69 [[self window] setRestorationClass: [self class]]; 63 70 64 71 [[self window] setTitle: NSLocalizedString(@"Statistics", "Stats window -> title")]; … … 69 76 [fRatioLabelField setStringValue: [NSLocalizedString(@"Ratio", "Stats window -> label") stringByAppendingString: @":"]]; 70 77 [fTimeLabelField setStringValue: [NSLocalizedString(@"Running Time", "Stats window -> label") stringByAppendingString: @":"]]; 71 [fNumOpenedLabelField setStringValue: [NSLocalizedString(@"Program Started", "Stats window -> label") 72 stringByAppendingString: @":"]]; 78 [fNumOpenedLabelField setStringValue: [NSLocalizedString(@"Program Started", "Stats window -> label") stringByAppendingString: @":"]]; 73 79 74 80 //size all elements … … 129 135 [fStatsWindowInstance autorelease]; 130 136 fStatsWindowInstance = nil; 137 } 138 139 + (void) restoreWindowWithIdentifier: (NSString *) identifier state: (NSCoder *) state completionHandler: (void (^)(NSWindow *, NSError *)) completionHandler 140 { 141 NSAssert1([identifier isEqualToString: @"StatsWindow"], @"Trying to restore unexpected identifier %@", identifier); 142 143 completionHandler([[StatsWindowController statsWindow] window], nil); 131 144 } 132 145
Note: See TracChangeset
for help on using the changeset viewer.
