Changeset 1219

Timestamp:

Dec 15, 2006, 1:18:36 AM (16 years ago)

Author:

livings124

Message:

show an error dialog when trying to open another copy of Transmission, and make the formatting match the cocoa-style

File:

• trunk/macosx/Controller.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -75 +75 @@
 + (void) initialize
 {
-    /* Make sure another Transmission.app isn't running already */
-    NSString * myBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
-    int myProcessIdentifier = [[NSProcessInfo processInfo] processIdentifier];
-
-    NSDictionary * dico;
+    //make sure another Transmission.app isn't running already
+    NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+    int processIdentifier = [[NSProcessInfo processInfo] processIdentifier];
+
+    NSDictionary * dic;
     NSEnumerator * enumerator = [[[NSWorkspace sharedWorkspace] launchedApplications] objectEnumerator];
-    while( ( dico = [enumerator nextObject] ) )
-    {
-        if( ![[dico objectForKey: @"NSApplicationBundleIdentifier"] isEqualToString: myBundleIdentifier] )
-        {
-            /* This isn't Transmission */
-            continue;
-        }
-        if( [[dico objectForKey: @"NSApplicationProcessIdentifier"] intValue] == myProcessIdentifier )
-        {
-            /* This is ourselves */
-            continue;
-        }
-        
-        /* Activate the already running instance, then kill ourselves right away */
-        NSLog( @"Another instance of Transmission is already running, aborting" );
-        [[NSWorkspace sharedWorkspace] launchApplication: [dico objectForKey: @"NSApplicationPath"]];
-        exit( 0 );
+    while ((dic = [enumerator nextObject]))
+    {
+        if ([[dic objectForKey: @"NSApplicationBundleIdentifier"] isEqualToString: bundleIdentifier]
+            && [[dic objectForKey: @"NSApplicationProcessIdentifier"] intValue] != processIdentifier)
+        {
+            NSAlert * alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle: NSLocalizedString(@"Quit", "Transmission already running alert -> button")];
+            [alert setMessageText: NSLocalizedString(@"Transmission is already running",
+                                                    "Transmission already running alert -> title")];
+            [alert setInformativeText: NSLocalizedString(@"There is already a copy of Transmission running. "
+                "Please quit that instance before opening another.", "Transmission already running alert -> message")];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            [alert runModal];
+            [alert release];
+            
+            //activate the already running instance, then kill ourselves right away
+            [[NSWorkspace sharedWorkspace] launchApplication: [dic objectForKey: @"NSApplicationPath"]];
+            exit(0);
+        }
     }