Changeset 3194

Timestamp:

Sep 26, 2007, 11:49:21 PM (15 years ago)

Author:

livings124

Message:

use LSMinimumSystemVersion instead of custom version check, because on < 10.4 it will never reach that custom code

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Info.plist.in (modified) (1 diff)
• TorrentCell.m (modified) (2 diffs)
• en.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• en.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• en.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.m

@@ -102 +102 @@
 + (void) initialize
 {
-    //make sure system requirements are met
-    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_3)
-    {
-        NSAlert * alert = [[NSAlert alloc] init];
-        [alert addButtonWithTitle: NSLocalizedString(@"Quit", "OS update needed -> button")];
-        [alert setMessageText: NSLocalizedString(@"Transmission requires Mac OS X 10.4 or greater.",
-                                                "OS update needed -> title")];
-        [alert setInformativeText: NSLocalizedString(@"Transmission has features that require a more "
-            "up-to-date operating system. The operating system must be updated before this version can run.",
-            "OS update needed -> message")];
-        [alert setAlertStyle: NSWarningAlertStyle];
-        
-        [alert runModal];
-        [alert release];
-        
-        exit(0);
-    }
-    
     //make sure another Transmission.app isn't running already
     NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];

trunk/macosx/Info.plist.in

@@ -46 +46 @@
         <key>CFBundleVersion</key>
         <string>%%BUNDLE_VERSION%%</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.4.0</string>
         <key>NSAppleScriptEnabled</key>
         <string>YES</string>

trunk/macosx/TorrentCell.m

@@ -253 +253 @@
     
     //progress
-    NSRect progressRect;
     if (!minimal)
     {
         NSAttributedString * progressString = [self attributedStatusString: [torrent progressString] withColor: statusColor];
-        progressRect = [self rectForProgressWithString: progressString inBounds: cellFrame];
+        NSRect progressRect = [self rectForProgressWithString: progressString inBounds: cellFrame];
         [progressString drawInRect: progressRect];
     }
@@ -263 +262 @@
     //bar
     NSRect barRect = [self barRectForBounds: cellFrame];
-    //[fDefaults boolForKey: @"UseAdvancedBar"] ? [self drawAdvancedBar: barRect] : [self drawSimpleBar: barRect];
     [self drawBar: barRect];
     

trunk/macosx/en.lproj/MainMenu.nib/classes.nib

@@ -44 +44 @@
                 stopSelectedTorrents = id; 
                 switchFilter = id; 
-                toggleAdvancedBar = id; 
                 toggleFilterBar = id; 
                 toggleSmallView = id; 

trunk/macosx/en.lproj/MainMenu.nib/info.nib

@@ -10 +10 @@
                 <string>480 344 208 149 0 0 1680 1028 </string>
                 <key>1480</key>
-                <string>687 587 420 63 0 0 1680 1028 </string>
+                <string>630 671 420 63 0 0 1680 1028 </string>
                 <key>1603</key>
                 <string>601 669 477 67 0 0 1680 1028 </string>
@@ -37 +37 @@
         <array>
                 <integer>29</integer>
+                <integer>1603</integer>
                 <integer>2043</integer>
-                <integer>1603</integer>
                 <integer>21</integer>
                 <integer>1480</integer>