Changeset 2102

Timestamp:

Jun 16, 2007, 9:21:43 PM (15 years ago)

Author:

livings124

Message:

add the ability to change the torrent name

Location:

branches/file_selection/macosx

Files:

• CreatorWindowController.h (modified) (1 diff)
• CreatorWindowController.m (modified) (3 diffs)

branches/file_selection/macosx/CreatorWindowController.h

@@ -30 +30 @@
     IBOutlet NSImageView * fIcon, * fLocationIcon;
     IBOutlet NSTextField * fNameField, * fStatusField, * fPiecesField, * fLocationField,
-                * fTrackerField;
+                * fTrackerField, * fTorrentNameField;
     IBOutlet NSTextView * fCommentView;
     IBOutlet NSButton * fPrivateCheck;

branches/file_selection/macosx/CreatorWindowController.m

@@ -92 +92 @@
     [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];
     [fLocationField setToolTip: fLocation];
+    
+    [fTorrentNameField setStringValue: [name stringByAppendingPathExtension: @"torrent"]];
 }
 
@@ -132 +134 @@
             [alert setMessageText: NSLocalizedString(@"Tracker address must begin with \"http://\".",
                                                     "Create torrent -> http warning -> title")];
-            [alert setInformativeText: NSLocalizedString(@"Please change the tracker address to create the torrent.",
+            [alert setInformativeText: NSLocalizedString(@"Change the tracker address to create the torrent.",
                                                         "Create torrent -> http warning -> warning")];
             [alert setAlertStyle: NSWarningAlertStyle];
@@ -144 +146 @@
         trackerString = [@"http://" stringByAppendingString: trackerString];
     
-    #warning make user-settable
-    NSString * file = [fLocation stringByAppendingPathComponent:
-                        [[fPath lastPathComponent] stringByAppendingPathExtension: @"torrent"]];
-    
-    tr_makeMetaInfo(fInfo, [file UTF8String], [trackerString UTF8String], [[fCommentView string] UTF8String],
-                    [fPrivateCheck state] == NSOnState);
+    NSString * torrentName = [fTorrentNameField stringValue];
+    if ([[torrentName pathExtension] caseInsensitiveCompare: @"torrent"] != NSOrderedSame)
+    {
+        NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> .torrent warning -> button")];
+        [alert setMessageText: NSLocalizedString(@"Torrents must end in \".torrent\".",
+                                                "Create torrent -> .torrent warning -> title")];
+        [alert setInformativeText: NSLocalizedString(@"Add this file extension to create the torrent.",
+                                                    "Create torrent -> .torrent warning -> warning")];
+        [alert setAlertStyle: NSWarningAlertStyle];
+        
+        [alert beginSheetModalForWindow: [self window] modalDelegate: self didEndSelector: nil contextInfo: nil];
+        
+        return;
+    }
+    
+    tr_makeMetaInfo(fInfo, [[fLocation stringByAppendingPathComponent: torrentName] UTF8String], [trackerString UTF8String],
+                            [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
     
     #warning add to T