Changeset 3886

Timestamp:

Nov 19, 2007, 6:13:41 PM (15 years ago)

Author:

livings124

Message:

add stats window...right now the values mean nothing

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (7 diffs)
• macosx/Controller.h (modified) (1 diff)
• macosx/Controller.m (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/English.lproj/StatsWindow.xib (added)
• macosx/NSStringAdditions.h (modified) (1 diff)
• macosx/NSStringAdditions.m (modified) (1 diff)
• macosx/StatsWindowController.h (added)
• macosx/StatsWindowController.m (added)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -99 +99 @@
                 A256588D0A9A695400E8A03B /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A256588B0A9A695400E8A03B /* MessageWindowController.m */; };
                 A257C1820CAD3003004E121C /* PeerTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A257C1800CAD3003004E121C /* PeerTableView.m */; };
+                A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A25892630CF1F7E800CCCDDF /* StatsWindowController.m */; };
+                A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A25892750CF1FCE800CCCDDF /* StatsWindow.xib */; };
                 A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* TransmissionHelp */; };
                 A25E74650AF5097C006F11AE /* ExpandedPathToPathTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = A25E74440AF5089E006F11AE /* ExpandedPathToPathTransformer.m */; };
@@ -443 +445 @@
                 A257C17F0CAD3003004E121C /* PeerTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerTableView.h; path = macosx/PeerTableView.h; sourceTree = "<group>"; };
                 A257C1800CAD3003004E121C /* PeerTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PeerTableView.m; path = macosx/PeerTableView.m; sourceTree = "<group>"; };
+                A25892620CF1F7E800CCCDDF /* StatsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsWindowController.h; path = macosx/StatsWindowController.h; sourceTree = "<group>"; };
+                A25892630CF1F7E800CCCDDF /* StatsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsWindowController.m; path = macosx/StatsWindowController.m; sourceTree = "<group>"; };
+                A25892760CF1FCE800CCCDDF /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = macosx/English.lproj/StatsWindow.xib; sourceTree = "<group>"; };
                 A259316A0A73B2CC002F4FE7 /* TransmissionHelp */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TransmissionHelp; path = macosx/TransmissionHelp; sourceTree = "<group>"; };
                 A25E74440AF5089E006F11AE /* ExpandedPathToPathTransformer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ExpandedPathToPathTransformer.m; path = macosx/ExpandedPathToPathTransformer.m; sourceTree = "<group>"; };
@@ -750 +755 @@
                                 A2DF37040C220D03006523C1 /* CreatorWindowController.h */,
                                 A2DF37050C220D03006523C1 /* CreatorWindowController.m */,
+                                A25892620CF1F7E800CCCDDF /* StatsWindowController.h */,
+                                A25892630CF1F7E800CCCDDF /* StatsWindowController.m */,
                                 A2085DD90C53BC74000BC3B7 /* AboutWindowController.h */,
                                 A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */,
@@ -815 +822 @@
                                 A2912C520A2956E80097A0CA /* PrefsWindow.nib */,
                                 A2AE68310C628A35008753C9 /* Creator.nib */,
+                                A25892750CF1FCE800CCCDDF /* StatsWindow.xib */,
                                 A2A6E39F0CA7E4C900F10FEF /* AboutWindow.nib */,
                                 A20B6FA40C4D97840034AB1D /* PriorityNone.png */,
@@ -1477 +1485 @@
                                 A2F151250CD438DE001F3B0E /* InfoTabBack.png in Resources */,
                                 A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */,
+                                A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1608 +1617 @@
                                 A2A6321B0CD9751700E3DA60 /* BadgeView.m in Sources */,
                                 A2ED7D8F0CEF431B00970975 /* FilterButton.m in Sources */,
+                                A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1787 +1797 @@
                         sourceTree = "<group>";
                 };
+                A25892750CF1FCE800CCCDDF /* StatsWindow.xib */ = {
+                        isa = PBXVariantGroup;
+                        children = (
+                                A25892760CF1FCE800CCCDDF /* English */,
+                        );
+                        name = StatsWindow.xib;
+                        sourceTree = "<group>";
+                };
                 A2912C520A2956E80097A0CA /* PrefsWindow.nib */ = {
                         isa = PBXVariantGroup;

trunk/macosx/Controller.h

@@ -158 +158 @@
 
 - (void) showMessageWindow: (id) sender;
+- (void) showStatsWindow: (id) sender;
 
 - (void) updateControlTint: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -30 +30 @@
 #import "TorrentTableView.h"
 #import "CreatorWindowController.h"
+#import "StatsWindowController.h"
 #import "AboutWindowController.h"
 #import "NSApplicationAdditions.h"
@@ -1368 +1369 @@
 }
 
+- (void) showStatsWindow: (id) sender
+{
+    [[StatsWindowController statsWindow: fLib] showWindow: nil];
+}
+
 - (void) updateUI
 {

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

@@ -120 +120 @@
                                 <string>id</string>
                                 <key>showPreferenceWindow</key>
+                                <string>id</string>
+                                <key>showStatsWindow</key>
                                 <string>id</string>
                                 <key>stopAllTorrents</key>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1400</integer>
+                <integer>1684</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/NSStringAdditions.h

@@ -31 +31 @@
 
 + (NSString *) stringForFileSize: (uint64_t) size;
++ (NSString *) stringForLargeFileSizeGigs: (uint64_t) gigs bytes: (uint64_t) bytes;
+
 + (NSString *) stringForSpeed: (float) speed;
 + (NSString *) stringForSpeedAbbrev: (float) speed;

trunk/macosx/NSStringAdditions.m

@@ -40 +40 @@
 + (NSString *) stringForFileSize: (uint64_t) size
 {
-    if (size < 1024)
-        return [NSString stringWithFormat: NSLocalizedString(@"%lld bytes", "File size"), size];
+    [self stringForLargeFileSizeGigs: size / 1073741824 bytes: size % 1073741824];
+}
 
++ (NSString *) stringForLargeFileSizeGigs: (uint64_t) gigs bytes: (uint64_t) bytes
+{
     float convertedSize;
     NSString * unit;
-    if (size < 1048576)
+    if (gigs == 0)
     {
-        convertedSize = size / 1024.0;
-        unit = NSLocalizedString(@"KB", "File size");
-    }
-    else if (size < 1073741824)
-    {
-        convertedSize = size / 1048576.0;
-        unit = NSLocalizedString(@"MB", "File size");
-    }
-    else if (size < 1099511627776.0)
-    {
-        convertedSize = size / 1073741824.0;
-        unit = NSLocalizedString(@"GB", "File size");
+        if (bytes < 1024)
+            return [NSString stringWithFormat: NSLocalizedString(@"%lld bytes", "File size"), bytes];
+        else if (bytes < 1048576)
+        {
+            convertedSize = bytes / 1024.0;
+            unit = NSLocalizedString(@"KB", "File size");
+        }
+        else
+        {
+            convertedSize = bytes / 1048576.0;
+            unit = NSLocalizedString(@"MB", "File size");
+        }
     }
     else
     {
-        convertedSize = size / 1099511627776.0;
-        unit = NSLocalizedString(@"TB", "File size");
+        if (gigs < 1024)
+        {
+            convertedSize = (float)gigs + bytes / 1073741824.0;
+            unit = NSLocalizedString(@"GB", "File size");
+        }
+        else
+        {
+            convertedSize = gigs / 1024.0;
+            unit = NSLocalizedString(@"TB", "File size");
+        }
     }