Changeset 16

Timestamp:

Jan 12, 2006, 6:54:46 PM (15 years ago)

Author:

root

Message:

Update 2005-12-17

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (12 diffs)
• English.lproj/MainMenu.nib/classes.nib (modified) (3 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/macosx/Controller.h

@@ -44 +44 @@
     IBOutlet NSMenuItem          * fPauseResumeItem;
     IBOutlet NSMenuItem          * fRemoveItem;
+    IBOutlet NSMenuItem          * fRemoveTorrentItem;
+    IBOutlet NSMenuItem          * fRemoveDataItem;
+    IBOutlet NSMenuItem          * fRemoveBothItem;
     IBOutlet NSMenuItem          * fRevealItem;
+    IBOutlet NSMenuItem          * fShowHideToolbar;
 
     IBOutlet NSWindow            * fWindow;
@@ -95 +99 @@
 - (NSMenu *) menuForIndex: (int) idx;
 
+- (void) runCustomizationPalette: (id) sender;
+- (void) showHideToolbar: (id) sender;
+
 - (void) showMainWindow:  (id) sender;
 - (void) linkHomepage:    (id) sender;
 - (void) linkForums:      (id) sender;
-- (void) notifyGrowl:     (NSString *) file;
+- (void) notifyGrowl:     (NSString *) file;
 - (void) finderReveal:    (NSString *) path;
 - (void) finderTrash:     (NSString *) path;

trunk/macosx/Controller.m

@@ -28 +28 @@
 #include "TorrentTableView.h"
 
-#define TOOLBAR_OPEN   @"Toolbar Open"
-#define TOOLBAR_REMOVE @"Toolbar Remove"
-#define TOOLBAR_PREFS  @"Toolbar Preferences"
-#define TOOLBAR_INFO   @"Toolbar Info"
+#define TOOLBAR_OPEN        @"Toolbar Open"
+#define TOOLBAR_REMOVE      @"Toolbar Remove"
+#define TOOLBAR_PREFS       @"Toolbar Preferences"
+#define TOOLBAR_INFO        @"Toolbar Info"
+#define TOOLBAR_PAUSE_ALL   @"Toolbar Pause All"
+#define TOOLBAR_RESUME_ALL  @"Toolbar Resume All"
 
 #define CONTEXT_PAUSE           1
@@ -48 +50 @@
 
 @implementation Controller
-
-- (void) updateBars
-{
-    NSArray * items;
-    NSToolbarItem * item;
-    BOOL enable;
-    int row;
-    unsigned i;
-
-    row = [fTableView selectedRow];
-
-    /* Can we remove it ? */
-    enable = ( row >= 0 ) && ( fStat[row].status &
-                ( TR_STATUS_STOPPING | TR_STATUS_PAUSE ) );
-    items = [fToolbar items];
-    for( i = 0; i < [items count]; i++ )
-    {
-        item = [items objectAtIndex: i];
-        if( [[item itemIdentifier] isEqualToString: TOOLBAR_REMOVE] )
-        {
-            [item setAction: enable ? @selector( removeTorrent: ) : NULL];
-        }
-    }
-    [fRemoveItem setAction: enable ? @selector( removeTorrent: ) : NULL];
-
-    /* Can we pause or resume it ? */
-    [fPauseResumeItem setTitle: @"Pause"];
-    [fPauseResumeItem setAction: NULL];
-    if( row < 0 )
-    {
-        [fRevealItem setAction: NULL];
-        return;
-    }
-    
-    [fRevealItem setAction: @selector( revealFromMenu: )];
-
-    if( fStat[row].status & TR_STATUS_PAUSE )
-    {
-        [fPauseResumeItem setTitle: @"Resume"];
-        [fPauseResumeItem setAction: @selector( resumeTorrent: )];
-    }
-    else if( fStat[row].status & ( TR_STATUS_CHECK |
-                TR_STATUS_DOWNLOAD | TR_STATUS_SEED ) )
-    {
-        [fPauseResumeItem setAction: @selector( stopTorrent: )];
-    }
-}
 
 - (void) awakeFromNib
@@ -557 +512 @@
         tr_setFinished( fHandle, i, 0 );
     }
-
-    /* Must we do this? Can't remember */
-    [self updateBars];
 }
 
@@ -663 +615 @@
     int row = [fTableView selectedRow];
 
-    [self updateBars];
-
     if( row < 0 )
     {
@@ -676 +626 @@
         [fInfoDownloaded setStringValue: @""];
         [fInfoUploaded   setStringValue: @""];
-        [fInfoSeeders    setStringValue: @""];
+        [fInfoSeeders    setStringValue: @""];
         [fInfoLeechers   setStringValue: @""];
         return;
@@ -698 +648 @@
         
     if ( fStat[row].seeders == -1 ) {
-                [fInfoSeeders setStringValue: [NSString stringWithUTF8String: "?"]];
-        } else {
-                [fInfoSeeders setStringValue: [NSString stringWithFormat: @"%d",
-                        fStat[row].seeders]];
-        }
-        if ( fStat[row].leechers == -1 ) {
-                [fInfoLeechers setStringValue: [NSString stringWithUTF8String: "?"]];
-        } else {
-                [fInfoLeechers setStringValue: [NSString stringWithFormat: @"%d",
-                        fStat[row].leechers]];
-        }
+        [fInfoSeeders setStringValue: [NSString stringWithUTF8String: "?"]];
+    } else {
+        [fInfoSeeders setStringValue: [NSString stringWithFormat: @"%d",
+            fStat[row].seeders]];
+    }
+    if ( fStat[row].leechers == -1 ) {
+        [fInfoLeechers setStringValue: [NSString stringWithUTF8String: "?"]];
+    } else {
+        [fInfoLeechers setStringValue: [NSString stringWithFormat: @"%d",
+            fStat[row].leechers]];
+    }
 }
 
@@ -720 +670 @@
     {
         [item setLabel: @"Open"];
+        [item setPaletteLabel: [item label]];
         [item setToolTip: @"Open a torrent"];
         [item setImage: [NSImage imageNamed: @"Open.png"]];
@@ -728 +679 @@
     {
         [item setLabel: @"Remove"];
+        [item setPaletteLabel: [item label]];
         [item setToolTip: @"Remove torrent from list"];
         [item setImage: [NSImage imageNamed: @"Remove.png"]];
         [item setTarget: self];
-        /* We set the selector in updateBars: */
+        [item setAction: @selector( removeTorrent: )];
     }
     else if( [ident isEqualToString: TOOLBAR_PREFS] )
     {
         [item setLabel: @"Preferences"];
+        [item setPaletteLabel: [item label]];
         [item setToolTip: @"Show the Preferences panel"];
         [item setImage: [NSImage imageNamed: @"Preferences.png"]];
@@ -744 +697 @@
     {
         [item setLabel: @"Info"];
+        [item setPaletteLabel: [item label]];
         [item setToolTip: @"Information"];
         [item setImage: [NSImage imageNamed: @"Info.png"]];
@@ -749 +703 @@
         [item setAction: @selector( showInfo: )];
     }
+    else if( [ident isEqualToString: TOOLBAR_RESUME_ALL] )
+    {
+        [item setLabel: @"Resume All"];
+        [item setPaletteLabel: [item label]];
+        [item setToolTip: @"Resume all torrents"];
+        [item setImage: [NSImage imageNamed: @"Resume.png"]];
+        [item setTarget: self];
+        [item setAction: @selector( resumeAllTorrents: )];
+    }
+    else if( [ident isEqualToString: TOOLBAR_PAUSE_ALL] )
+    {
+        [item setLabel: @"Pause All"];
+        [item setPaletteLabel: [item label]];
+        [item setToolTip: @"Pause all torrents"];
+        [item setImage: [NSImage imageNamed: @"Stop.png"]];
+        [item setTarget: self];
+        [item setAction: @selector( stopAllTorrents: )];
+    }
     else
     {
@@ -760 +732 @@
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) t
 {
-    return [NSArray arrayWithObjects: TOOLBAR_OPEN, TOOLBAR_REMOVE,
-            NSToolbarFlexibleSpaceItemIdentifier, TOOLBAR_PREFS,
-            TOOLBAR_INFO, NULL];
+    return [NSArray arrayWithObjects:
+            TOOLBAR_OPEN, TOOLBAR_REMOVE,
+            /* TOOLBAR_RESUME_ALL, TOOLBAR_PAUSE_ALL, */
+            TOOLBAR_PREFS, TOOLBAR_INFO,
+            NSToolbarSeparatorItemIdentifier,
+            NSToolbarSpaceItemIdentifier,
+            NSToolbarFlexibleSpaceItemIdentifier,
+            NSToolbarCustomizeToolbarItemIdentifier,
+            NULL];
 }
 
 - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) t
 {
-    return [self toolbarAllowedItemIdentifiers: t];
+    return [NSArray arrayWithObjects:
+            TOOLBAR_OPEN, TOOLBAR_REMOVE,
+            /* NSToolbarSeparatorItemIdentifier,
+            TOOLBAR_RESUME_ALL, TOOLBAR_PAUSE_ALL, */
+            NSToolbarFlexibleSpaceItemIdentifier,
+            TOOLBAR_PREFS, TOOLBAR_INFO,
+            NULL];
+}
+
+- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem
+{
+    //check remove item
+    if ([toolbarItem action] == @selector(removeTorrent:))
+    {
+        int row = [fTableView selectedRow];
+        return ( row >= 0 ) && ( fStat[row].status &
+                ( TR_STATUS_STOPPING | TR_STATUS_PAUSE ) );
+    }
+    
+    return true;
+}
+
+- (void) runCustomizationPalette: (id) sender
+{
+    [fToolbar runCustomizationPalette:sender];
+}
+
+- (void) showHideToolbar: (id) sender
+{
+    [fWindow toggleToolbarShown:sender];
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+    //enable customize toolbar item
+    if ([menuItem action] == @selector(showHideToolbar:))
+        [menuItem setTitle: [fToolbar isVisible] ? @"Hide Toolbar" : @"Show Toolbar"];
+        
+    if ([fToolbar customizationPaletteIsRunning])
+        return false;
+        
+    //enable show info
+    if ([menuItem action] == @selector(showInfo:))
+    {
+        [menuItem setTitle: [fInfoPanel isVisible] ? @"Hide Info" : @"Show Info"];
+        return true;
+    }
+        
+    int row = [fTableView selectedRow];
+        
+    //enable remove items
+    if ([menuItem action] == @selector(removeTorrent:) || [menuItem action] == @selector(removeTorrentDeleteFile:)
+        || [menuItem action] == @selector(removeTorrentDeleteData:) || [menuItem action] == @selector(removeTorrentDeleteBoth:)) {
+        /* Can we remove it ? */
+        return ( row >= 0 ) && ( fStat[row].status &
+                ( TR_STATUS_STOPPING | TR_STATUS_PAUSE ) );
+    }
+    
+    //enable reveal in finder item
+    if ([menuItem action] == @selector(revealFromMenu:))
+        return row >= 0;
+        
+    //enable and change pause and remove item
+    if ([menuItem action] == @selector(resumeTorrent:) || [menuItem action] == @selector(stopTorrent:))
+    {
+        if (row >= 0 && fStat[row].status & TR_STATUS_PAUSE)
+        {
+            [menuItem setTitle: @"Resume"];
+            [menuItem setAction: @selector( resumeTorrent: )];
+        }
+        else
+        {
+            [menuItem setTitle: @"Pause"];
+            [menuItem setAction: @selector( stopTorrent: )];
+        }
+        return row >= 0;
+    }
+    
+    return true;
 }
 
@@ -815 +871 @@
                 }
             }
-            [self updateBars];
             break;
     }

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

@@ -4 +4 @@
             ACTIONS = {
                 advancedChanged = id; 
+                growlRegister = id; 
                 linkForums = id; 
                 linkHomepage = id; 
@@ -14 +15 @@
                 resumeTorrent = id; 
                 revealFromMenu = id; 
+                runCustomizationPalette = id; 
+                showHideToolbar = id; 
                 showInfo = id; 
                 showMainWindow = id; 
@@ -38 +41 @@
                 fPauseResumeItem = NSMenuItem; 
                 fPrefsController = PrefsController; 
+                fRemoveBothItem = NSMenuItem; 
+                fRemoveDataItem = NSMenuItem; 
                 fRemoveItem = NSMenuItem; 
+                fRemoveTorrentItem = NSMenuItem; 
                 fRevealItem = NSMenuItem; 
+                fShowHideToolbar = NSMenuItem; 
                 fTableView = TorrentTableView; 
                 fTotalDLField = NSTextField; 

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

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>231 62 361 432 0 0 1280 832 </string>
+        <string>416 137 361 432 0 0 1152 842 </string>
         <key>IBEditorPositions</key>
         <dict>
                 <key>29</key>
-                <string>92 769 371 44 0 0 1280 832 </string>
+                <string>79 779 371 44 0 0 1152 842 </string>
                 <key>456</key>
-                <string>116 510 147 106 0 0 1280 832 </string>
+                <string>134 408 144 106 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -18 +18 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>456</integer>
                 <integer>29</integer>
-                <integer>21</integer>
-                <integer>273</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/Transmission.xcodeproj/project.pbxproj

@@ -334 +334 @@
                                 FRAMEWORK_SEARCH_PATHS = (
                                         "$(FRAMEWORK_SEARCH_PATHS)",
-                                        "$(SRCROOT)/Frameworks",
                                 );
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;