Changeset 2033

Timestamp:

Jun 10, 2007, 10:03:01 PM (15 years ago)

Author:

livings124

Message:

setting of file priorities and checks is now possible through the context menu

Location:

branches/file_selection/macosx

Files:

• English.lproj/InfoWindow.nib/classes.nib (modified) (2 diffs)
• English.lproj/InfoWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• FileOutlineView.m (modified) (1 diff)
• InfoWindowController.h (modified) (2 diffs)
• InfoWindowController.m (modified) (3 diffs)
• Torrent.m (modified) (1 diff)

branches/file_selection/macosx/English.lproj/InfoWindow.nib/classes.nib

@@ -8 +8 @@
                 revealFile = id; 
                 revealTorrentFile = id; 
+                setCheck = id; 
                 setLimitSetting = id; 
                 setPex = id; 
+                setPriority = id; 
                 setRatioLimit = id; 
                 setRatioSetting = id; 
@@ -33 +35 @@
                 fDownloadingFromField = NSTextField; 
                 fErrorMessageView = NSTextView; 
+                fFileCheckItem = NSMenuItem; 
                 fFileOutline = NSOutlineView; 
+                fFilePriorityHigh = NSMenuItem; 
+                fFilePriorityLow = NSMenuItem; 
+                fFilePriorityNormal = NSMenuItem; 
                 fFileTableStatusField = NSTextField; 
+                fFileUncheckItem = NSMenuItem; 
                 fHashField = NSTextField; 
                 fImageView = NSImageView; 

branches/file_selection/macosx/English.lproj/InfoWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>549</key>
-                <string>364 417 144 49 0 0 1152 842 </string>
+                <string>565 283 144 118 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -22 +22 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>549</integer>
                 <integer>5</integer>
         </array>

branches/file_selection/macosx/FileOutlineView.m

@@ -80 +80 @@
 }
 
-- (NSMenu *) menuForEvent: (NSEvent *) e
+- (NSMenu *) menuForEvent: (NSEvent *) event
 {
-    int row = [self rowAtPoint: [self convertPoint: [e locationInWindow] fromView: nil]];
+    int row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
     
     if (row >= 0)
     {
-        if ([self itemAtRow: row] && ![self isRowSelected: row])
+        if (![self isRowSelected: row])
             [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
     }

branches/file_selection/macosx/InfoWindowController.h

@@ -55 +55 @@
     IBOutlet NSOutlineView * fFileOutline;
     IBOutlet NSTextField * fFileTableStatusField;
+    IBOutlet NSMenuItem * fFileCheckItem, * fFileUncheckItem,
+                        * fFilePriorityNormal, * fFilePriorityHigh, * fFilePriorityLow;
     
     IBOutlet NSPopUpButton * fRatioPopUp, * fUploadLimitPopUp, * fDownloadLimitPopUp;
@@ -74 +76 @@
 - (void) revealFile: (id) sender;
 
+- (void) setCheck: (id) sender;
+- (void) setPriority: (id) sender;
+
 - (void) setLimitSetting: (id) sender;
 - (void) setSpeedLimit: (id) sender;

branches/file_selection/macosx/InfoWindowController.m

@@ -589 +589 @@
         return [fFileOutline numberOfSelectedRows] > 0 &&
             [[[fTabView selectedTabViewItem] identifier] isEqualToString: TAB_FILES_IDENT];
+    
+    if (action == @selector(setCheck:))
+    {
+        Torrent * torrent = [fTorrents objectAtIndex: 0];
+        NSDictionary * item;
+        NSIndexSet * indexSet = [fFileOutline selectedRowIndexes], * itemIndexes;
+        int i, index, state = (menuItem == fFileCheckItem) ? NSOnState : NSOffState;
+        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+        {
+            item = [fFileOutline itemAtRow: i];
+            if ([[item objectForKey: @"IsFolder"] boolValue])
+            {
+                itemIndexes = [item objectForKey: @"Indexes"];
+                if ([torrent checkForFileFolder: itemIndexes] != state
+                        && [torrent canChangeDownloadCheckForFileFolder: itemIndexes])
+                    return YES;
+            }
+            else
+            {
+                index = [[item objectForKey: @"Index"] intValue];
+                if ([torrent checkForFile: index] != state && [torrent canChangeDownloadCheckFile: index])
+                    return YES;
+            }
+        }
+        return NO;
+    }
+    
+    if (action == @selector(setPriority:))
+    {
+        return [fFileOutline numberOfSelectedRows] > 0;
+    }
         
     return YES;
@@ -813 +844 @@
     else if ([[tableColumn identifier] isEqualToString: @"Check"])
     {
-        //[(NSButtonCell *)cell setImagePosition: NSImageOnly];
-        
         Torrent * torrent = [fTorrents objectAtIndex: 0];
         if ([[item objectForKey: @"IsFolder"] boolValue])
@@ -902 +931 @@
         [[NSWorkspace sharedWorkspace] selectFile: [folder stringByAppendingPathComponent:
                 [[fFileOutline itemAtRow: i] objectForKey: @"Path"]] inFileViewerRootedAtPath: nil];
+}
+
+- (void) setCheck: (id) sender
+{
+    int state = sender == fFileCheckItem ? NSOnState : NSOffState;
+    
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
+    NSIndexSet * indexSet = [fFileOutline selectedRowIndexes];
+    int i;
+    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+        [torrent setFileCheckState: state forFileItem: [fFileOutline itemAtRow: i]];
+    
+    [fFileOutline reloadData];
+}
+
+- (void) setPriority: (id) sender
+{
+    int priority;
+    if (sender == fFilePriorityHigh)
+        priority = PRIORITY_HIGH;
+    else if (sender == fFilePriorityLow)
+        priority = PRIORITY_LOW;
+    else
+        priority = PRIORITY_NORMAL;
+    
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
+    NSIndexSet * indexSet = [fFileOutline selectedRowIndexes];
+    int i;
+    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+        [torrent setFilePriority: priority forFileItem: [fFileOutline itemAtRow: i]];
+    
+    [fFileOutline reloadData];
 }
 

branches/file_selection/macosx/Torrent.m

@@ -1379 +1379 @@
 - (void) setFilePriority: (int) priority forFileItem: (NSMutableDictionary *) item
 {
-    if ([[item objectForKey: @"IsFolder"] boolValue])
-        return;
-    
-    [item setObject: [NSNumber numberWithInt: priority] forKey: @"Priority"];
-    
-    int index = [[item objectForKey: @"Index"] intValue];
-    if ([self checkForFile: index] == NSOnState)
-    {
-        tr_priority_t actualPriority;
-        if (priority == PRIORITY_HIGH)
-            actualPriority = TR_PRI_HIGH;
-        else if (priority == PRIORITY_LOW)
-            actualPriority = TR_PRI_LOW;
-        else
-            actualPriority = TR_PRI_NORMAL;
-        tr_torrentSetFilePriority(fHandle, index, actualPriority);
+    if (![[item objectForKey: @"IsFolder"] boolValue])
+    {
+        [item setObject: [NSNumber numberWithInt: priority] forKey: @"Priority"];
+        
+        int index = [[item objectForKey: @"Index"] intValue];
+        if ([self checkForFile: index] == NSOnState)
+        {
+            tr_priority_t actualPriority;
+            if (priority == PRIORITY_HIGH)
+                actualPriority = TR_PRI_HIGH;
+            else if (priority == PRIORITY_LOW)
+                actualPriority = TR_PRI_LOW;
+            else
+                actualPriority = TR_PRI_NORMAL;
+            tr_torrentSetFilePriority(fHandle, index, actualPriority);
+        }
+    }
+    else
+    {
+        NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
+        NSMutableDictionary * child;
+        while ((child = [enumerator nextObject]))
+            [self setFilePriority: priority forFileItem: child];
     }
 }