← Back to branch summary

~ubuntu-branches/ubuntu/lucid/transmission/lucid

« back to all changes in this revision

Viewing changes to macosx/AddWindowController.m

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda, Krzysztof Klimonda, Chris Coulson
  • Date: 2010-03-03 02:55:26 UTC
  • mfrom: (1.1.34 upstream) (2.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100303025526-qcjmpnlvk9jv3y5o
Tags: 1.92-0ubuntu1
https://launchpad.net/bugs/538034
https://launchpad.net/bugs/518692
https://launchpad.net/bugs/529037
https://launchpad.net/bugs/527299
https://launchpad.net/bugs/505861
https://launchpad.net/bugs/542194
[ Krzysztof Klimonda ]
* New upstream release (LP: #538034), rebased on debian testing.
  Remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
      Can be removed in lucid+1
    + Added liblaunchpad-integration-dev and lsb-release to Build-Depends
  - debian/rules:
    + create a po template during package build.
  - debian/patches/01_lpi.patch:
    + integrate transmission with launchpad
  - debian/patches/20_add_x-ubuntu-gettext-domain.diff:
    + add x-ubuntu-gettext-domain to .desktop file.
  - debian/transmission-daemon.default:
    - remove --auth from OPTIONS
  - debian/control, debian/rules:
    + build transmission gtk+ client with both gconf and libcanberra support.
  - debian/patches/dont_build_libevent.patch:
    + disable libevent in configure.ac and Makefile.am because we use autotools
      to regenerate build files.
  - lucid/debian/patches/updateminiupnpcstrings_double_escape_slash.patch:
    + Deleted as the bug is fixed upstream
* Fixes bugs:
  - Fix directory selection error in GTK+ 2.19 (LP: #518692)
  - Transmission "Set Location" - dialog doesn't disappear (LP: #529037)
  - The "Torrent Options" dialog's Torrent Priority row gets too much
    vertical stretch (LP: #527299)
  - "Open Folder" behavior can be confusing for single-file torrents
    (LP: #505861)
* Refreshed 99_autoreconf.patch

[ Chris Coulson ]
* debian/patches/disable_web_ui.patch:
  - Disable the web UI by default again (LP: #542194)

Show diffs side-by-side

added added

removed removed

Lines of Context:
macosx/AddWindowController.m
1
1
/******************************************************************************
2
 
 * $Id: AddWindowController.m 10205 2010-02-15 14:41:53Z livings124 $
 
2
 * $Id: AddWindowController.m 10345 2010-03-10 03:45:15Z livings124 $
3
3
 *
4
4
 * Copyright (c) 2008-2010 Transmission authors and contributors
5
5
 *
73
73
        fDeleteEnable = canToggleDelete;
74
74
        
75
75
        fGroupValue = [torrent groupValue];
 
76
        
 
77
        [fVerifyIndicator setUsesThreadedAnimation: YES];
76
78
    }
77
79
    return self;
78
80
}
98
100
    [self setGroupsMenu];
99
101
    [fGroupPopUp selectItemWithTag: fGroupValue];
100
102
    
101
 
    NSInteger priorityTag;
 
103
    NSInteger priorityIndex;
102
104
    switch ([fTorrent priority])
103
105
    {
104
 
        case TR_PRI_HIGH: priorityTag = POPUP_PRIORITY_HIGH; break;
105
 
        case TR_PRI_NORMAL: priorityTag = POPUP_PRIORITY_NORMAL; break;
106
 
        case TR_PRI_LOW: priorityTag = POPUP_PRIORITY_LOW; break;
 
106
        case TR_PRI_HIGH: priorityIndex = POPUP_PRIORITY_HIGH; break;
 
107
        case TR_PRI_NORMAL: priorityIndex = POPUP_PRIORITY_NORMAL; break;
 
108
        case TR_PRI_LOW: priorityIndex = POPUP_PRIORITY_LOW; break;
107
109
        default: NSAssert1(NO, @"Unknown priority for adding torrent: %d", [fTorrent priority]);
108
110
    }
109
 
    [fPriorityPopUp selectItemWithTag: priorityTag];
 
111
    [fPriorityPopUp selectItemAtIndex: priorityIndex];
110
112
    
111
113
    [fStartCheck setState: [[NSUserDefaults standardUserDefaults] boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState];
112
114
    
215
217
- (void) changePriority: (id) sender
216
218
{
217
219
    tr_priority_t priority;
218
 
    switch ([sender tag])
 
220
    switch ([sender indexOfSelectedItem])
219
221
    {
220
222
        case POPUP_PRIORITY_HIGH: priority = TR_PRI_HIGH; break;
221
223
        case POPUP_PRIORITY_NORMAL: priority = TR_PRI_NORMAL; break;
268
270
    
269
271
    if ([fTorrent isChecking])
270
272
    {
 
273
        const BOOL waiting = [fTorrent isCheckingWaiting];
 
274
        [fVerifyIndicator setIndeterminate: waiting];
 
275
        if (!waiting)
 
276
            [fVerifyIndicator setDoubleValue: [fTorrent checkingProgress]];
 
277
        else
 
278
            [fVerifyIndicator startAnimation: self];
 
279
        
271
280
        [fVerifyIndicator setHidden: NO];
272
 
        [fVerifyIndicator setDoubleValue: [fTorrent checkingProgress]];
273
281
    }
274
282
    else
 
283
    {
 
284
        [fVerifyIndicator stopAnimation: self];
275
285
        [fVerifyIndicator setHidden: YES];
 
286
    }
276
287
}
277
288
 
278
289
- (void) confirmAdd