remove ability to remove .torrent files for the ui

diff --git a/macosx/Controller.h b/macosx/Controller.h
index a9f6c52059afcdbef6b50ccdfe1df390dbe3fe20..bd2b419f0db6071616bedfad1ddb5133715665dd 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -140,15 +140,12 @@ typedef enum
 - (void) stopAllTorrents:           (id) sender;
 - (void) stopTorrents:              (NSArray *) torrents;
 
-- (void) removeTorrents: (NSArray *) torrents
-        deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteData;
+- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData;
 - (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode
                         contextInfo: (NSDictionary *) dict;
-- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent;
+- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData;
 - (void) removeNoDelete:                (id) sender;
 - (void) removeDeleteData:              (id) sender;
-- (void) removeDeleteTorrent:           (id) sender;
-- (void) removeDeleteDataAndTorrent:    (id) sender;
 
 - (void) moveDataFilesSelected: (id) sender;
 - (void) moveDataFiles: (NSArray *) torrents;

diff --git a/macosx/Controller.m b/macosx/Controller.m
index b38b8aaadb726775939da8beba28e4d6c24008b5..17acdada195d41cf23f84ab31b0a99f1a22f616a 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1145,7 +1145,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [self updateTorrentHistory];
 }
 
-- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent
+- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData
 {
     [torrents retain];
     NSInteger active = 0, downloading = 0;
@@ -1164,32 +1164,23 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         {
             NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
                                     torrents, @"Torrents",
-                                    [NSNumber numberWithBool: deleteData], @"DeleteData",
-                                    [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent", nil];
+                                    [NSNumber numberWithBool: deleteData], @"DeleteData", nil];
             
             NSString * title, * message;
             
-            NSInteger selected = [torrents count];
+            const NSInteger selected = [torrents count];
             if (selected == 1)
             {
                 NSString * torrentName = [[torrents objectAtIndex: 0] name];
                 
-                if (!deleteData && !deleteTorrent)
-                    title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?",
-                                "Removal confirm panel -> title"), torrentName];
-                else if (deleteData && !deleteTorrent)
+                if (deleteData)
                     title = [NSString stringWithFormat:
                                 NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
                                 " and trash the data file?", "Removal confirm panel -> title"), torrentName];
-                else if (!deleteData && deleteTorrent)
-                    title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
-                                " and trash the torrent file?", "Removal confirm panel -> title"), torrentName];
                 else
                     title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list"
-                                " and trash both the data and torrent files?", "Removal confirm panel -> title"), torrentName];
+                                NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?",
+                                "Removal confirm panel -> title"), torrentName];
                 
                 message = NSLocalizedString(@"This transfer is active."
                             " Once removed, continuing the transfer will require the torrent file.",
@@ -1197,22 +1188,14 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             }
             else
             {
-                if (!deleteData && !deleteTorrent)
-                    title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list?",
-                                "Removal confirm panel -> title"), selected];
-                else if (deleteData && !deleteTorrent)
+                if (deleteData)
                     title = [NSString stringWithFormat:
                                 NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
-                                " and trash the data file?", "Removal confirm panel -> title"), selected];
-                else if (!deleteData && deleteTorrent)
-                    title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
-                                " and trash the torrent file?", "Removal confirm panel -> title"), selected];
+                                " and trash the data files?", "Removal confirm panel -> title"), selected];
                 else
                     title = [NSString stringWithFormat:
-                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list"
-                                " and trash both the data and torrent files?", "Removal confirm panel -> title"), selected];
+                                NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list?",
+                                "Removal confirm panel -> title"), selected];
                 
                 if (selected == active)
                     message = [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers.",
@@ -1232,22 +1215,21 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         }
     }
     
-    [self confirmRemoveTorrents: torrents deleteData: deleteData deleteTorrent: deleteTorrent];
+    [self confirmRemoveTorrents: torrents deleteData: deleteData];
 }
 
 - (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (NSDictionary *) dict
 {
     NSArray * torrents = [dict objectForKey: @"Torrents"];
     if (returnCode == NSAlertDefaultReturn)
-        [self confirmRemoveTorrents: torrents deleteData: [[dict objectForKey: @"DeleteData"] boolValue]
-                deleteTorrent: [[dict objectForKey: @"DeleteTorrent"] boolValue]];
+        [self confirmRemoveTorrents: torrents deleteData: [[dict objectForKey: @"DeleteData"] boolValue]];
     else
         [torrents release];
     
     [dict release];
 }
 
-- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent
+- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData
 {
     //don't want any of these starting then stopping
     for (Torrent * torrent in torrents)
@@ -1262,8 +1244,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         if (deleteData)
             [torrent trashData];
-        if (deleteTorrent)
-            [torrent trashTorrent];
         
         [torrent closeRemoveTorrent];
     }
@@ -1277,22 +1257,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) removeNoDelete: (id) sender
 {
-    [self removeTorrents: [fTableView selectedTorrents] deleteData: NO deleteTorrent: NO];
+    [self removeTorrents: [fTableView selectedTorrents] deleteData: NO];
 }
 
 - (void) removeDeleteData: (id) sender
 {
-    [self removeTorrents: [fTableView selectedTorrents] deleteData: YES deleteTorrent: NO];
-}
-
-- (void) removeDeleteTorrent: (id) sender
-{
-    [self removeTorrents: [fTableView selectedTorrents] deleteData: NO deleteTorrent: YES];
-}
-
-- (void) removeDeleteDataAndTorrent: (id) sender
-{
-    [self removeTorrents: [fTableView selectedTorrents] deleteData: YES deleteTorrent: YES];
+    [self removeTorrents: [fTableView selectedTorrents] deleteData: YES];
 }
 
 - (void) moveDataFilesSelected: (id) sender
@@ -3540,26 +3510,19 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         return canUseTable && [fTableView numberOfSelectedRows] > 0;
 
     //enable remove items
-    if (action == @selector(removeNoDelete:) || action == @selector(removeDeleteData:)
-        || action == @selector(removeDeleteTorrent:) || action == @selector(removeDeleteDataAndTorrent:))
+    if (action == @selector(removeNoDelete:) || action == @selector(removeDeleteData:))
     {
-        BOOL warning = NO,
-            onlyDownloading = [fDefaults boolForKey: @"CheckRemoveDownloading"],
-            canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteDataAndTorrent:);
+        BOOL warning = NO;
         
         for (Torrent * torrent in [fTableView selectedTorrents])
         {
-            if (!warning && [torrent isActive])
-            {
-                warning = onlyDownloading ? ![torrent isSeeding] : YES;
-                if (warning && canDelete)
-                    break;
-            }
-            if (!canDelete && [torrent publicTorrent])
+            if ([torrent isActive])
             {
-                canDelete = YES;
-                if (warning)
+                if ([fDefaults boolForKey: @"CheckRemoveDownloading"] ? ![torrent isSeeding] : YES)
+                {
+                    warning = YES;
                     break;
+                }
             }
         }
     
@@ -3576,7 +3539,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                 [menuItem setTitle: [title substringToIndex: [title rangeOfString: ellipsis].location]];
         }
         
-        return canUseTable && canDelete && [fTableView numberOfSelectedRows] > 0;
+        return canUseTable && [fTableView numberOfSelectedRows] > 0;
     }
 
     //enable pause all item
@@ -4123,7 +4086,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) rpcRemoveTorrent: (Torrent *) torrent
 {
-    [self confirmRemoveTorrents: [[NSArray arrayWithObject: torrent] retain] deleteData: NO deleteTorrent: NO];
+    [self confirmRemoveTorrents: [[NSArray arrayWithObject: torrent] retain] deleteData: NO];
     [torrent release];
 }
 

diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib
index b5b7c4b755c284c406d24efcadc333397c289439..18f457b4f7e22c8dd92c4d57321028fb807ae692 100644 (file)
--- a/macosx/en.lproj/MainMenu.xib
+++ b/macosx/en.lproj/MainMenu.xib
@@ -8,8 +8,9 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
+                       <integer value="1400"/>
                        <integer value="3088"/>
-                       <integer value="1533"/>
+                       <integer value="456"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2691,26 +2692,6 @@ zTTNVc11zYbNps3HzefOCM4ozknOac6KzqrOus7bzvvPHM88z13Pfc+ez77P38/v0ADQINBB0GHQgtCi
                                                                        <reference key="NSMixedImage" ref="3851078"/>
                                                                        <int key="NSTag">4</int>
                                                                </object>
-                                                               <object class="NSMenuItem" id="529318312">
-                                                                       <reference key="NSMenu" ref="335948734"/>
-                                                                       <string key="NSTitle">Remove Torrent File</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSKeyEquivModMask">1572864</int>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="322614661"/>
-                                                                       <reference key="NSMixedImage" ref="3851078"/>
-                                                                       <int key="NSTag">4</int>
-                                                               </object>
-                                                               <object class="NSMenuItem" id="535651621">
-                                                                       <reference key="NSMenu" ref="335948734"/>
-                                                                       <string key="NSTitle">Remove All Files</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="322614661"/>
-                                                                       <reference key="NSMixedImage" ref="3851078"/>
-                                                                       <int key="NSTag">4</int>
-                                                               </object>
                                                                <object class="NSMenuItem" id="135816226">
                                                                        <reference key="NSMenu" ref="335948734"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
@@ -3153,26 +3134,6 @@ zTTNVc11zYbNps3HzefOCM4ozknOac6KzqrOus7bzvvPHM88z13Pfc+ez77P38/v0ADQINBB0GHQgtCi
                                                <reference key="NSMixedImage" ref="3851078"/>
                                                <int key="NSTag">4</int>
                                        </object>
-                                       <object class="NSMenuItem" id="1022418913">
-                                               <reference key="NSMenu" ref="434296936"/>
-                                               <string key="NSTitle">Remove Torrent File</string>
-                                               <string key="NSKeyEquiv"/>
-                                               <int key="NSKeyEquivModMask">1572864</int>
-                                               <int key="NSMnemonicLoc">2147483647</int>
-                                               <reference key="NSOnImage" ref="322614661"/>
-                                               <reference key="NSMixedImage" ref="3851078"/>
-                                               <int key="NSTag">4</int>
-                                       </object>
-                                       <object class="NSMenuItem" id="776874527">
-                                               <reference key="NSMenu" ref="434296936"/>
-                                               <string key="NSTitle">Remove All Files</string>
-                                               <string key="NSKeyEquiv"/>
-                                               <int key="NSKeyEquivModMask">1048576</int>
-                                               <int key="NSMnemonicLoc">2147483647</int>
-                                               <reference key="NSOnImage" ref="322614661"/>
-                                               <reference key="NSMixedImage" ref="3851078"/>
-                                               <int key="NSTag">4</int>
-                                       </object>
                                        <object class="NSMenuItem" id="763908271">
                                                <reference key="NSMenu" ref="434296936"/>
                                                <bool key="NSIsDisabled">YES</bool>
@@ -4989,14 +4950,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">1547</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">removeDeleteTorrent:</string>
-                                               <reference key="source" ref="30116300"/>
-                                               <reference key="destination" ref="529318312"/>
-                                       </object>
-                                       <int key="connectionID">1548</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">removeNoDelete:</string>
@@ -5013,14 +4966,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">1555</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">removeDeleteTorrent:</string>
-                                               <reference key="source" ref="30116300"/>
-                                               <reference key="destination" ref="1022418913"/>
-                                       </object>
-                                       <int key="connectionID">1556</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">linkHomepage:</string>
@@ -5077,22 +5022,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">1584</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">removeDeleteDataAndTorrent:</string>
-                                               <reference key="source" ref="30116300"/>
-                                               <reference key="destination" ref="535651621"/>
-                                       </object>
-                                       <int key="connectionID">1585</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">removeDeleteDataAndTorrent:</string>
-                                               <reference key="source" ref="30116300"/>
-                                               <reference key="destination" ref="776874527"/>
-                                       </object>
-                                       <int key="connectionID">1586</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">fFilterBar</string>
@@ -6826,8 +6755,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <reference ref="135816226"/>
                                                        <reference ref="910530743"/>
                                                        <reference ref="698258555"/>
-                                                       <reference ref="529318312"/>
-                                                       <reference ref="535651621"/>
                                                        <reference ref="200454823"/>
                                                        <reference ref="117698132"/>
                                                        <reference ref="522160989"/>
@@ -6891,16 +6818,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                <reference key="object" ref="698258555"/>
                                                <reference key="parent" ref="335948734"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1544</int>
-                                               <reference key="object" ref="529318312"/>
-                                               <reference key="parent" ref="335948734"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1545</int>
-                                               <reference key="object" ref="535651621"/>
-                                               <reference key="parent" ref="335948734"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1566</int>
                                                <reference key="object" ref="200454823"/>
@@ -7082,8 +6999,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <reference ref="274991158"/>
                                                        <reference ref="767449940"/>
                                                        <reference ref="46144164"/>
-                                                       <reference ref="1022418913"/>
-                                                       <reference ref="776874527"/>
                                                        <reference ref="572427220"/>
                                                        <reference ref="897097834"/>
                                                        <reference ref="813229434"/>
@@ -7135,16 +7050,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                <reference key="object" ref="46144164"/>
                                                <reference key="parent" ref="434296936"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1552</int>
-                                               <reference key="object" ref="1022418913"/>
-                                               <reference key="parent" ref="434296936"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1553</int>
-                                               <reference key="object" ref="776874527"/>
-                                               <reference key="parent" ref="434296936"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1808</int>
                                                <reference key="object" ref="572427220"/>
@@ -8443,18 +8348,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <string>1539.ImportedFromIB2</string>
                                        <string>1541.IBPluginDependency</string>
                                        <string>1541.ImportedFromIB2</string>
-                                       <string>1544.IBPluginDependency</string>
-                                       <string>1544.ImportedFromIB2</string>
-                                       <string>1545.IBPluginDependency</string>
-                                       <string>1545.ImportedFromIB2</string>
                                        <string>1550.IBPluginDependency</string>
                                        <string>1550.ImportedFromIB2</string>
                                        <string>1551.IBPluginDependency</string>
                                        <string>1551.ImportedFromIB2</string>
-                                       <string>1552.IBPluginDependency</string>
-                                       <string>1552.ImportedFromIB2</string>
-                                       <string>1553.IBPluginDependency</string>
-                                       <string>1553.ImportedFromIB2</string>
                                        <string>1558.IBPluginDependency</string>
                                        <string>1558.ImportedFromIB2</string>
                                        <string>1559.IBPluginDependency</string>
@@ -9009,7 +8906,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{376, 427}, {293, 373}}</string>
+                                       <string>{{376, 467}, {293, 333}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{446, 528}, {293, 373}}</string>
@@ -9081,14 +8978,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>{{382, 705}, {457, 23}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -9492,7 +9381,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{529, 336}, {277, 273}}</string>
+                                       <string>{{529, 376}, {277, 233}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9590,8 +9479,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <string>openURLEndSheet:</string>
                                                        <string>openURLShowSheet:</string>
                                                        <string>removeDeleteData:</string>
-                                                       <string>removeDeleteDataAndTorrent:</string>
-                                                       <string>removeDeleteTorrent:</string>
                                                        <string>removeNoDelete:</string>
                                                        <string>resumeAllTorrents:</string>
                                                        <string>resumeSelectedTorrents:</string>
@@ -9688,8 +9575,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">