Changeset 7662
- Timestamp:
- Jan 11, 2009, 4:58:14 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 8 edited
-
configure.ac (modified) (1 diff)
-
macosx/Controller.m (modified) (1 diff)
-
macosx/Defaults.plist (modified) (1 diff)
-
macosx/Info.plist (modified) (1 diff)
-
macosx/PrefsController.h (modified) (1 diff)
-
macosx/PrefsController.m (modified) (3 diffs)
-
macosx/appcast/appcast_beta.xml (added)
-
macosx/appcast/releasenotes_beta.html (added)
-
macosx/en.lproj/PrefsWindow.xib (modified) (34 diffs)
-
macosx/version.sh (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r7617 r7662 1 1 dnl convention: -TR MAJOR MINOR MAINT STATUS - (each a single char) 2 dnl STATUS: "X" for prerelease testbuilds,2 dnl STATUS: "X" for prerelease beta builds, 3 3 dnl "Z" for unsupported trunk builds, 4 4 dnl "0" for stable, supported releases -
trunk/macosx/Controller.m
r7659 r7662 264 264 [updater setDelegate: self]; 265 265 fUpdateInProgress = NO; 266 267 //reset old Sparkle settings from previous versions268 [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"];269 if ([fDefaults objectForKey: @"CheckForUpdates"])270 {271 [updater setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]];272 [fDefaults removeObjectForKey: @"CheckForUpdates"];273 }274 266 } 275 267 return self; -
trunk/macosx/Defaults.plist
r7483 r7662 9 9 <key>AutoStartDownload</key> 10 10 <true/> 11 <key>AutoUpdateBeta</key> 12 <false/> 11 13 <key>BadgeDownloadRate</key> 12 14 <true/> -
trunk/macosx/Info.plist
r7504 r7662 80 80 <key>SUAllowsAutomaticUpdates</key> 81 81 <false/> 82 <key> SUFeedURL</key>82 <key>AppcastRelease</key> 83 83 <string>http://www.transmissionbt.com/appcast.xml</string> 84 <key>AppcastBeta</key> 85 <string>http://www.transmissionbt.com/appcast_beta.xml</string> 84 86 <key>SUPublicDSAKeyFile</key> 85 87 <string>sparkle_dsa_pub.pem</string> -
trunk/macosx/PrefsController.h
r7659 r7662 65 65 + (void) setHandle: (tr_session *) handle; 66 66 + (tr_session *) handle; 67 68 - (void) updateAppcastURL: (id) sender; 67 69 68 70 - (void) setPort: (id) sender; -
trunk/macosx/PrefsController.m
r7659 r7662 32 32 #import "utils.h" 33 33 34 #import <Sparkle/Sparkle.h> 35 34 36 #define DOWNLOAD_FOLDER 0 35 37 #define DOWNLOAD_TORRENT 2 … … 140 142 fRPCWhitelistArray = [[NSMutableArray arrayWithObject: @"127.0.0.1"] retain]; 141 143 [self updateRPCWhitelist]; 144 145 //reset old Sparkle settings from previous versions 146 [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"]; 147 if ([fDefaults objectForKey: @"CheckForUpdates"]) 148 { 149 [[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]]; 150 [fDefaults removeObjectForKey: @"CheckForUpdates"]; 151 } 152 153 [self updateAppcastURL: nil]; 142 154 } 143 155 … … 325 337 return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_TRANSFERS, TOOLBAR_GROUPS, TOOLBAR_BANDWIDTH, 326 338 TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil]; 339 } 340 341 //for a beta release, always use the beta appcast 342 #if defined(BETA_RELEASE) 343 #define APPCAST_URL @"AppcastBeta" 344 #else 345 #define APPCAST_URL ([[NSUserDefaults standardUserDefaults] boolForKey: @"AutoUpdateBeta"] ? @"AppcastBeta" : @"AppcastRelease") 346 #endif 347 - (void) updateAppcastURL: (id) sender 348 { 349 [[SUUpdater sharedUpdater] setFeedURL: [NSURL URLWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey: APPCAST_URL]]]; 327 350 } 328 351 -
trunk/macosx/en.lproj/PrefsWindow.xib
r7577 r7662 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="1760"/> 12 <integer value="66"/> 13 <integer value="153"/> 11 <integer value="28"/> 14 12 </object> 15 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 57 55 </object> 58 56 <object class="NSCustomView" id="249126185"> 59 < nilkey="NSNextResponder"/>57 <reference key="NSNextResponder"/> 60 58 <int key="NSvFlags">256</int> 61 59 <object class="NSMutableArray" key="NSSubviews"> … … 64 62 <reference key="NSNextResponder" ref="249126185"/> 65 63 <int key="NSvFlags">256</int> 66 <string key="NSFrame">{{189, 1 01}, {181, 18}}</string>64 <string key="NSFrame">{{189, 120}, {181, 18}}</string> 67 65 <reference key="NSSuperview" ref="249126185"/> 68 66 <bool key="NSEnabled">YES</bool> … … 95 93 <reference key="NSNextResponder" ref="249126185"/> 96 94 <int key="NSvFlags">256</int> 97 <string key="NSFrame">{{189, 1 41}, {193, 18}}</string>95 <string key="NSFrame">{{189, 160}, {193, 18}}</string> 98 96 <reference key="NSSuperview" ref="249126185"/> 99 97 <bool key="NSEnabled">YES</bool> … … 117 115 <reference key="NSNextResponder" ref="249126185"/> 118 116 <int key="NSvFlags">256</int> 119 <string key="NSFrame">{{78, 1 42}, {108, 17}}</string>117 <string key="NSFrame">{{78, 161}, {108, 17}}</string> 120 118 <reference key="NSSuperview" ref="249126185"/> 121 119 <bool key="NSEnabled">YES</bool> … … 149 147 <reference key="NSNextResponder" ref="249126185"/> 150 148 <int key="NSvFlags">256</int> 151 <string key="NSFrame">{{42, 198}, {144, 17}}</string>149 <string key="NSFrame">{{42, 217}, {144, 17}}</string> 152 150 <reference key="NSSuperview" ref="249126185"/> 153 151 <bool key="NSEnabled">YES</bool> … … 165 163 <reference key="NSNextResponder" ref="249126185"/> 166 164 <int key="NSvFlags">256</int> 167 <string key="NSFrame">{{189, 197}, {149, 18}}</string>165 <string key="NSFrame">{{189, 216}, {149, 18}}</string> 168 166 <reference key="NSSuperview" ref="249126185"/> 169 167 <bool key="NSEnabled">YES</bool> … … 187 185 <reference key="NSNextResponder" ref="249126185"/> 188 186 <int key="NSvFlags">256</int> 189 <string key="NSFrame">{{189, 1 77}, {131, 18}}</string>187 <string key="NSFrame">{{189, 196}, {131, 18}}</string> 190 188 <reference key="NSSuperview" ref="249126185"/> 191 189 <bool key="NSEnabled">YES</bool> … … 209 207 <reference key="NSNextResponder" ref="249126185"/> 210 208 <int key="NSvFlags">256</int> 211 <string key="NSFrame">{{208, 1 21}, {258, 18}}</string>209 <string key="NSFrame">{{208, 140}, {258, 18}}</string> 212 210 <reference key="NSSuperview" ref="249126185"/> 213 211 <bool key="NSEnabled">YES</bool> … … 231 229 <reference key="NSNextResponder" ref="249126185"/> 232 230 <int key="NSvFlags">256</int> 233 <string key="NSFrame">{{208, 81}, {258, 18}}</string>231 <string key="NSFrame">{{208, 100}, {258, 18}}</string> 234 232 <reference key="NSSuperview" ref="249126185"/> 235 233 <bool key="NSEnabled">YES</bool> … … 253 251 <reference key="NSNextResponder" ref="249126185"/> 254 252 <int key="NSvFlags">256</int> 255 <string key="NSFrame">{{106, 2 35}, {80, 17}}</string>253 <string key="NSFrame">{{106, 254}, {80, 17}}</string> 256 254 <reference key="NSSuperview" ref="249126185"/> 257 255 <bool key="NSEnabled">YES</bool> … … 269 267 <reference key="NSNextResponder" ref="249126185"/> 270 268 <int key="NSvFlags">256</int> 271 <string key="NSFrame">{{189, 2 34}, {303, 18}}</string>269 <string key="NSFrame">{{189, 253}, {303, 18}}</string> 272 270 <reference key="NSSuperview" ref="249126185"/> 273 271 <bool key="NSEnabled">YES</bool> … … 291 289 <reference key="NSNextResponder" ref="249126185"/> 292 290 <int key="NSvFlags">256</int> 293 <string key="NSFrame">{{288, 49}, {82, 32}}</string>291 <string key="NSFrame">{{288, 68}, {82, 32}}</string> 294 292 <reference key="NSSuperview" ref="249126185"/> 295 293 <bool key="NSEnabled">YES</bool> … … 314 312 <reference key="NSNextResponder" ref="249126185"/> 315 313 <int key="NSvFlags">256</int> 316 <string key="NSFrame">{{188, 59}, {101, 17}}</string>314 <string key="NSFrame">{{188, 78}, {101, 17}}</string> 317 315 <reference key="NSSuperview" ref="249126185"/> 318 316 <bool key="NSEnabled">YES</bool> … … 330 328 <reference key="NSNextResponder" ref="249126185"/> 331 329 <int key="NSvFlags">256</int> 332 <string key="NSFrame">{{189, 19}, {183, 18}}</string>330 <string key="NSFrame">{{189, 38}, {183, 18}}</string> 333 331 <reference key="NSSuperview" ref="249126185"/> 334 332 <bool key="NSEnabled">YES</bool> … … 349 347 </object> 350 348 </object> 349 <object class="NSButton" id="1005555131"> 350 <reference key="NSNextResponder" ref="249126185"/> 351 <int key="NSvFlags">256</int> 352 <string key="NSFrame">{{208, 18}, {155, 18}}</string> 353 <reference key="NSSuperview" ref="249126185"/> 354 <bool key="NSEnabled">YES</bool> 355 <object class="NSButtonCell" key="NSCell" id="794987986"> 356 <int key="NSCellFlags">67239424</int> 357 <int key="NSCellFlags2">0</int> 358 <string key="NSContents">Include beta releases</string> 359 <reference key="NSSupport" ref="86725571"/> 360 <reference key="NSControlView" ref="1005555131"/> 361 <int key="NSButtonFlags">1211912703</int> 362 <int key="NSButtonFlags2">2</int> 363 <reference key="NSNormalImage" ref="1001726176"/> 364 <reference key="NSAlternateImage" ref="764913887"/> 365 <string key="NSAlternateContents"/> 366 <string key="NSKeyEquivalent"/> 367 <int key="NSPeriodicDelay">200</int> 368 <int key="NSPeriodicInterval">25</int> 369 </object> 370 </object> 351 371 <object class="NSTextField" id="964665196"> 352 372 <reference key="NSNextResponder" ref="249126185"/> 353 373 <int key="NSvFlags">256</int> 354 <string key="NSFrame">{{69, 20}, {117, 17}}</string>374 <string key="NSFrame">{{69, 39}, {117, 17}}</string> 355 375 <reference key="NSSuperview" ref="249126185"/> 356 376 <bool key="NSEnabled">YES</bool> … … 366 386 </object> 367 387 </object> 368 <string key="NSFrameSize">{535, 272}</string> 388 <string key="NSFrameSize">{535, 291}</string> 389 <reference key="NSSuperview"/> 369 390 <string key="NSClassName">NSView</string> 370 391 <string key="NSExtension">NSResponder</string> … … 1529 1550 </object> 1530 1551 <object class="NSCustomView" id="284666863"> 1531 < referencekey="NSNextResponder"/>1552 <nil key="NSNextResponder"/> 1532 1553 <int key="NSvFlags">256</int> 1533 1554 <object class="NSMutableArray" key="NSSubviews"> … … 3049 3070 <string key="NSFrame">{{1, 1}, {141, 169}}</string> 3050 3071 <reference key="NSSuperview" ref="544077474"/> 3051 <reference key="NSNextKeyView" ref="638525082"/>3052 3072 <reference key="NSDocView" ref="638525082"/> 3053 3073 <reference key="NSBGColor" ref="729660797"/> … … 3077 3097 <string key="NSFrame">{{20, 49}, {143, 171}}</string> 3078 3098 <reference key="NSSuperview" ref="284666863"/> 3079 <reference key="NSNextKeyView" ref="568562479"/>3080 3099 <int key="NSsFlags">530</int> 3081 3100 <reference key="NSVScroller" ref="287972127"/> … … 3344 3363 </object> 3345 3364 <string key="NSFrameSize">{535, 240}</string> 3346 <reference key="NSSuperview"/>3347 3365 <string key="NSClassName">NSView</string> 3348 3366 </object> 3349 3367 <object class="NSCustomView" id="352903881"> 3350 < referencekey="NSNextResponder"/>3368 <nil key="NSNextResponder"/> 3351 3369 <int key="NSvFlags">256</int> 3352 3370 <object class="NSMutableArray" key="NSSubviews"> … … 3938 3956 </object> 3939 3957 <string key="NSFrameSize">{535, 226}</string> 3940 <reference key="NSSuperview"/>3941 3958 <string key="NSClassName">NSView</string> 3942 3959 <string key="NSExtension">NSResponder</string> … … 4401 4418 </object> 4402 4419 <object class="NSCustomView" id="204700639"> 4403 < referencekey="NSNextResponder"/>4420 <nil key="NSNextResponder"/> 4404 4421 <int key="NSvFlags">256</int> 4405 4422 <object class="NSMutableArray" key="NSSubviews"> … … 5032 5049 </object> 5033 5050 <string key="NSFrameSize">{535, 345}</string> 5034 <reference key="NSSuperview"/>5035 5051 <string key="NSClassName">NSView</string> 5036 5052 <string key="NSExtension">NSResponder</string> … … 5519 5535 </object> 5520 5536 <object class="NSUserDefaultsController" id="356871564"> 5537 <object class="NSMutableArray" key="NSDeclaredKeys"> 5538 <bool key="EncodedWithXMLCoder">YES</bool> 5539 <string>AutoUpdateBeta</string> 5540 <string>SUEnableAutomaticChecks</string> 5541 </object> 5521 5542 <bool key="NSSharedInstance">YES</bool> 5522 5543 </object> … … 8695 8716 <int key="connectionID">1894</int> 8696 8717 </object> 8718 <object class="IBConnectionRecord"> 8719 <object class="IBBindingConnection" key="connection"> 8720 <string key="label">value: values.AutoUpdateBeta</string> 8721 <reference key="source" ref="1005555131"/> 8722 <reference key="destination" ref="356871564"/> 8723 <object class="NSNibBindingConnector" key="connector"> 8724 <reference key="NSSource" ref="1005555131"/> 8725 <reference key="NSDestination" ref="356871564"/> 8726 <string key="NSLabel">value: values.AutoUpdateBeta</string> 8727 <string key="NSBinding">value</string> 8728 <string key="NSKeyPath">values.AutoUpdateBeta</string> 8729 <int key="NSNibBindingConnectorVersion">2</int> 8730 </object> 8731 </object> 8732 <int key="connectionID">1897</int> 8733 </object> 8734 <object class="IBConnectionRecord"> 8735 <object class="IBBindingConnection" key="connection"> 8736 <string key="label">enabled: values.SUEnableAutomaticChecks</string> 8737 <reference key="source" ref="1005555131"/> 8738 <reference key="destination" ref="356871564"/> 8739 <object class="NSNibBindingConnector" key="connector"> 8740 <reference key="NSSource" ref="1005555131"/> 8741 <reference key="NSDestination" ref="356871564"/> 8742 <string key="NSLabel">enabled: values.SUEnableAutomaticChecks</string> 8743 <string key="NSBinding">enabled</string> 8744 <string key="NSKeyPath">values.SUEnableAutomaticChecks</string> 8745 <int key="NSNibBindingConnectorVersion">2</int> 8746 </object> 8747 </object> 8748 <int key="connectionID">1898</int> 8749 </object> 8750 <object class="IBConnectionRecord"> 8751 <object class="IBActionConnection" key="connection"> 8752 <string key="label">updateAppcastURL:</string> 8753 <reference key="source" ref="511492310"/> 8754 <reference key="destination" ref="1005555131"/> 8755 </object> 8756 <int key="connectionID">1899</int> 8757 </object> 8697 8758 </object> 8698 8759 <object class="IBMutableOrderedSet" key="objectRecords"> … … 8759 8820 <reference ref="688052354"/> 8760 8821 <reference ref="964665196"/> 8822 <reference ref="1005555131"/> 8761 8823 </object> 8762 8824 <reference key="parent" ref="37013934"/> … … 11321 11383 <reference key="object" ref="660134747"/> 11322 11384 <reference key="parent" ref="360885126"/> 11385 </object> 11386 <object class="IBObjectRecord"> 11387 <int key="objectID">1895</int> 11388 <reference key="object" ref="1005555131"/> 11389 <object class="NSMutableArray" key="children"> 11390 <bool key="EncodedWithXMLCoder">YES</bool> 11391 <reference ref="794987986"/> 11392 </object> 11393 <reference key="parent" ref="249126185"/> 11394 </object> 11395 <object class="IBObjectRecord"> 11396 <int key="objectID">1896</int> 11397 <reference key="object" ref="794987986"/> 11398 <reference key="parent" ref="1005555131"/> 11323 11399 </object> 11324 11400 </object> … … 11684 11760 <string>1891.ImportedFromIB2</string> 11685 11761 <string>1892.IBPluginDependency</string> 11762 <string>1895.IBPluginDependency</string> 11763 <string>1895.ImportedFromIB2</string> 11764 <string>1896.IBPluginDependency</string> 11686 11765 <string>190.IBPluginDependency</string> 11687 11766 <string>190.ImportedFromIB2</string> … … 12243 12322 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12244 12323 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12324 <real value="1.000000e+00"/> 12325 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12326 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12245 12327 <reference ref="761722050"/> 12246 12328 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 12318 12400 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12319 12401 <reference ref="761722050"/> 12320 <string>{{24 , 399}, {535, 272}}</string>12402 <string>{{242, 542}, {535, 291}}</string> 12321 12403 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 12322 12404 <reference ref="761722050"/> … … 12470 12552 </object> 12471 12553 <nil key="sourceID"/> 12472 <int key="maxID">189 4</int>12554 <int key="maxID">1899</int> 12473 12555 </object> 12474 12556 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 12657 12739 <string>setStalled:</string> 12658 12740 <string>setStalledMinutes:</string> 12741 <string>updateAppcastURL:</string> 12659 12742 <string>updateBlocklist:</string> 12660 12743 </object> … … 12709 12792 <string>id</string> 12710 12793 <string>id</string> 12794 <string>id</string> 12711 12795 </object> 12712 12796 </object> -
trunk/macosx/version.sh
r7497 r7662 4 4 5 5 # convention: -TR MAJOR MINOR MAINT STATUS - (each a single char) 6 # STATUS: "X" for prerelease testbuilds,6 # STATUS: "X" for prerelease beta builds, 7 7 # "Z" for unsupported trunk builds, 8 8 # "0" for stable, supported releases … … 38 38 #define BUNDLE_VERSION_INFOPLIST $SVN_REVISION 39 39 EOF 40 41 # Check if it's a beta release 42 if [ ${PEERID_PREFIX:6:1} = X ]; then 43 cat >> libtransmission/version.h.new << EOF 44 #define BETA_RELEASE "BETA" 45 EOF 46 fi 47 40 48 replace_if_differs libtransmission/version.h.new libtransmission/version.h 41 49
Note: See TracChangeset
for help on using the changeset viewer.
