Changeset 923 for trunk

Timestamp:

Sep 25, 2006, 8:53:10 PM (16 years ago)

Author:

livings124

Message:

Move the pieces viewer into the Activity pane of Inspector.

Location:

trunk

Files:

• PiecesView.h (added)
• PiecesView.m (added)
• PiecesWindowController.h (deleted)
• PiecesWindowController.m (deleted)
• Transmission.xcodeproj/project.pbxproj (modified) (9 diffs)
• macosx/Controller.h (modified) (3 diffs)
• macosx/Controller.m (modified) (8 diffs)
• macosx/Defaults.plist (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/classes.nib (modified) (2 diffs)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• 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/Images/PiecesBack.tiff (modified) (previous)
• macosx/InfoWindowController.h (modified) (2 diffs)
• macosx/InfoWindowController.m (modified) (4 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
-                3518E4A50AC620FC002ED3A2 /* PiecesWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3518E4A30AC620FC002ED3A2 /* PiecesWindowController.h */; };
-                3518E4A60AC620FC002ED3A2 /* PiecesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3518E4A40AC620FC002ED3A2 /* PiecesWindowController.m */; };
+                3518E4A50AC620FC002ED3A2 /* PiecesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3518E4A30AC620FC002ED3A2 /* PiecesView.h */; };
+                3518E4A60AC620FC002ED3A2 /* PiecesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3518E4A40AC620FC002ED3A2 /* PiecesView.m */; };
                 3518E4D10AC62517002ED3A2 /* PiecesBack.tiff in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3518E4CD0AC62517002ED3A2 /* PiecesBack.tiff */; };
                 3518E4D30AC62517002ED3A2 /* BoxBlue1.tiff in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3518E4CF0AC62517002ED3A2 /* BoxBlue1.tiff */; };
                 3518E4D40AC62517002ED3A2 /* BoxBlue2.tiff in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3518E4D00AC62517002ED3A2 /* BoxBlue2.tiff */; };
-                3518E4D70AC6253F002ED3A2 /* PiecesWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3518E4D50AC6253F002ED3A2 /* PiecesWindow.nib */; };
-                3518E4FB0AC62832002ED3A2 /* PiecesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3518E4A40AC620FC002ED3A2 /* PiecesWindowController.m */; };
+                3518E4FB0AC62832002ED3A2 /* PiecesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3518E4A40AC620FC002ED3A2 /* PiecesView.m */; };
                 3518E5210AC62A29002ED3A2 /* PiecesBack.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3518E4CD0AC62517002ED3A2 /* PiecesBack.tiff */; };
                 3518E5230AC62A2A002ED3A2 /* BoxBlue2.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3518E4D00AC62517002ED3A2 /* BoxBlue2.tiff */; };
@@ -250 +249 @@
                 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                 32CA4F630368D1EE00C91783 /* Transmission_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transmission_Prefix.pch; path = macosx/Transmission_Prefix.pch; sourceTree = "<group>"; };
-                3518E4A30AC620FC002ED3A2 /* PiecesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PiecesWindowController.h; sourceTree = "<group>"; };
-                3518E4A40AC620FC002ED3A2 /* PiecesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PiecesWindowController.m; sourceTree = "<group>"; };
+                3518E4A30AC620FC002ED3A2 /* PiecesView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PiecesView.h; sourceTree = "<group>"; };
+                3518E4A40AC620FC002ED3A2 /* PiecesView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PiecesView.m; sourceTree = "<group>"; };
                 3518E4CD0AC62517002ED3A2 /* PiecesBack.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PiecesBack.tiff; path = macosx/Images/PiecesBack.tiff; sourceTree = "<group>"; };
                 3518E4CF0AC62517002ED3A2 /* BoxBlue1.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BoxBlue1.tiff; path = macosx/Images/BoxBlue1.tiff; sourceTree = "<group>"; };
                 3518E4D00AC62517002ED3A2 /* BoxBlue2.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BoxBlue2.tiff; path = macosx/Images/BoxBlue2.tiff; sourceTree = "<group>"; };
-                3518E4D60AC6253F002ED3A2 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PiecesWindow.nib; sourceTree = "<group>"; };
                 3518E5270AC62A55002ED3A2 /* BoxBlue3.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BoxBlue3.tiff; path = macosx/Images/BoxBlue3.tiff; sourceTree = "<group>"; };
                 3518E5280AC62A55002ED3A2 /* BoxWhite.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BoxWhite.tiff; path = macosx/Images/BoxWhite.tiff; sourceTree = "<group>"; };
@@ -453 +451 @@
                         isa = PBXGroup;
                         children = (
-                                3518E4A30AC620FC002ED3A2 /* PiecesWindowController.h */,
-                                3518E4A40AC620FC002ED3A2 /* PiecesWindowController.m */,
+                                3518E4A30AC620FC002ED3A2 /* PiecesView.h */,
+                                3518E4A40AC620FC002ED3A2 /* PiecesView.m */,
                                 A2A306530AAD24A80049E2AC /* UKFileWatcher.h */,
                                 A2A306540AAD24A80049E2AC /* UKFileWatcher.m */,
@@ -600 +598 @@
                                 A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */,
                                 A2912C520A2956E80097A0CA /* PrefsWindow.nib */,
-                                3518E4D50AC6253F002ED3A2 /* PiecesWindow.nib */,
                         );
                         name = Resources;
@@ -733 +730 @@
                                 4DAB87C90ABE1F730081CF7E /* natpmp.h in Headers */,
                                 4DAB87CB0ABE1F730081CF7E /* http.h in Headers */,
-                                3518E4A50AC620FC002ED3A2 /* PiecesWindowController.h in Headers */,
+                                3518E4A50AC620FC002ED3A2 /* PiecesView.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -887 +884 @@
                                 35B038130AC5B6EB00A10FDF /* ResumeNoWaitOn.png in Resources */,
                                 35B038140AC5B6EC00A10FDF /* ResumeNoWaitOff.png in Resources */,
-                                3518E4D70AC6253F002ED3A2 /* PiecesWindow.nib in Resources */,
                                 3518E5210AC62A29002ED3A2 /* PiecesBack.tiff in Resources */,
                                 3518E5230AC62A2A002ED3A2 /* BoxBlue2.tiff in Resources */,
@@ -923 +919 @@
                                 4DAB87CA0ABE1F730081CF7E /* natpmp.c in Sources */,
                                 4DAB87CC0ABE1F730081CF7E /* http.c in Sources */,
-                                3518E4A60AC620FC002ED3A2 /* PiecesWindowController.m in Sources */,
+                                3518E4A60AC620FC002ED3A2 /* PiecesView.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -958 +954 @@
                                 A2A306600AAD24A80049E2AC /* UKKQueue.m in Sources */,
                                 A2A306620AAD24A80049E2AC /* UKMainThreadProxy.m in Sources */,
-                                3518E4FB0AC62832002ED3A2 /* PiecesWindowController.m in Sources */,
+                                3518E4FB0AC62832002ED3A2 /* PiecesView.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -992 +988 @@
                         );
                         name = MainMenu.nib;
-                        sourceTree = "<group>";
-                };
-                3518E4D50AC6253F002ED3A2 /* PiecesWindow.nib */ = {
-                        isa = PBXVariantGroup;
-                        children = (
-                                3518E4D60AC6253F002ED3A2 /* English */,
-                        );
-                        name = PiecesWindow.nib;
                         sourceTree = "<group>";
                 };

trunk/macosx/Controller.h

@@ -31 +31 @@
 #import "InfoWindowController.h"
 #import "MessageWindowController.h"
-#import "PiecesWindowController.h"
 #import "Badger.h"
 #import "ImageBackgroundView.h"
@@ -51 +50 @@
     InfoWindowController            * fInfoController;
     MessageWindowController         * fMessageController;
-    PiecesWindowController          * fPiecesWindowController;
 
     IBOutlet NSWindow               * fWindow;
@@ -142 +140 @@
 
 - (void) showMessageWindow: (id) sender;
-- (void) showPiecesView: (id) sender;
 
 - (void) updateControlTint: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -87 +87 @@
         fMessageController = [[MessageWindowController alloc] initWithWindowNibName: @"MessageWindow"];
         fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
-        fPiecesWindowController = [[PiecesWindowController alloc] initWithWindowNibName: @"PiecesWindow"];
         fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow" handle: fLib];
         
@@ -105 +104 @@
     [fInfoController release];
     [fMessageController release];
-    [fPiecesWindowController release];
     [fPrefsController release];
     
@@ -359 +357 @@
     if ([fDefaults boolForKey: @"InfoVisible"])
         [self showInfo: nil];
-    
-    if ([fDefaults boolForKey: @"PiecesViewerVisible"])
-        [self showPiecesView: nil];
     
     //timer to auto toggle speed limit
@@ -429 +424 @@
     //remember window states and close all windows
     [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
-    [fDefaults setBool: [[fPiecesWindowController window] isVisible] forKey: @"PiecesViewerVisible"];
     [[NSApp windows] makeObjectsPerformSelector: @selector(close)];
     [self showStatusBar: NO animate: NO];
@@ -937 +931 @@
 }
 
-- (void) showPiecesView: (id) sender
-{
-    if ([[fPiecesWindowController window] isVisible])
-        [fPiecesWindowController close];
-    else
-    {
-        [fPiecesWindowController updateView: NO];
-        [[fPiecesWindowController window] orderFront: nil];
-    }
-}
-
 - (void) updateControlTint: (NSNotification *) notification
 {
@@ -977 +960 @@
     if ([[fInfoController window] isVisible])
         [fInfoController updateInfoStats];
-    
-    //update pieces viewer
-    if ([[fPiecesWindowController window] isVisible])
-        [fPiecesWindowController updateView: NO];
 
     //badge dock
@@ -1728 +1707 @@
 - (void) tableViewSelectionDidChange: (NSNotification *) notification
 {
-    NSArray * torrents = [self torrentsAtIndexes: [fTableView selectedRowIndexes]];
-    [fInfoController updateInfoForTorrents: torrents];
-    
-    Torrent * torrent = [torrents count] == 1 ? [torrents objectAtIndex: 0] : nil;
-    [fPiecesWindowController setTorrent: torrent];
+    [fInfoController updateInfoForTorrents: [self torrentsAtIndexes: [fTableView selectedRowIndexes]]];
 }
 
@@ -2071 +2046 @@
     {
         NSString * title = [[fInfoController window] isVisible] ? @"Hide Inspector" : @"Show Inspector";
-        if (![[menuItem title] isEqualToString: title])
-                [menuItem setTitle: title];
-
-        return YES;
-    }
-    
-    //enable show pieces window
-    if (action == @selector(showPiecesView:))
-    {
-        NSString * title = [[fPiecesWindowController window] isVisible] ? @"Hide Pieces Viewer" : @"Show Pieces Viewer";
         if (![[menuItem title] isEqualToString: title])
                 [menuItem setTitle: title];

trunk/macosx/Defaults.plist

@@ -55 +55 @@
         <key>NatTraversal</key>
         <true/>
-        <key>PiecesViewerVisible</key>
-        <false/>
         <key>PlayDownloadSound</key>
         <true/>

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

@@ -29 +29 @@
                 fPieceSizeField = NSTextField; 
                 fPiecesField = NSTextField; 
+                fPiecesView = PiecesView; 
                 fRatioField = NSTextField; 
                 fRatioLimitField = NSTextField; 
@@ -44 +45 @@
             SUPERCLASS = NSWindowController; 
         }, 
-        {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }
+        {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
+        {
+            CLASS = PiecesView; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {fImageView = NSImageView; }; 
+            SUPERCLASS = NSObject; 
+        }
     ); 
     IBVersion = 1; 

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

@@ -29 +29 @@
                 showMainWindow = id; 
                 showMessageWindow = id; 
-                showPiecesView = id; 
                 showPreferenceWindow = id; 
                 stopAllTorrents = id; 

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

@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>21</integer>
                 <integer>29</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/InfoWindowController.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 #import "Torrent.h"
+#import "PiecesView.h"
 #import <transmission.h>
 
@@ -53 +54 @@
     IBOutlet NSMatrix * fRatioMatrix;
     IBOutlet NSTextField * fRatioLimitField;
+    
+    IBOutlet PiecesView * fPiecesView;
 }
 

trunk/macosx/InfoWindowController.m

@@ -170 +170 @@
         [fPeers removeAllObjects];
         [fPeerTable reloadData];
+        
+        [fPiecesView setTorrent: nil];
     }
     else
@@ -206 +208 @@
         [fTorrentLocationField setSelectable: YES];
         [fDataLocationField setSelectable: YES];
+        
+        [fPiecesView setTorrent: torrent];
     }
     
@@ -280 +284 @@
         if ([[[fTabView selectedTabViewItem] identifier] isEqualToString: TAB_PEERS_IDENT])
             [self reloadPeerTable];
+        
+        //update pieces view if visible
+        if ([[[fTabView selectedTabViewItem] identifier] isEqualToString: TAB_ACTIVITY_IDENT])
+            [fPiecesView updateView: NO];
     }
 }
@@ -385 +393 @@
     float height;
     if ([identifier isEqualToString: TAB_ACTIVITY_IDENT])
+    {
         height = TAB_ACTIVITY_HEIGHT;
+        
+        [fPiecesView updateView: NO];
+    }
     else if ([identifier isEqualToString: TAB_PEERS_IDENT])
     {