Ticket #2185: src_bin_desklink_desklink.cpp.diff

src/bin/desklink/desklink.cpp

@@ -159 +159 @@
     case B_ABOUT_REQUESTED:
         (new BAlert("About Volume Control", "Volume Control (Replicant)\n"
                 "  Brought to you by Jérôme DUVAL.\n\n"
-                "Copyright " B_UTF8_COPYRIGHT "2003-2007, Haiku","OK"))->Go();
+                "Copyright " B_UTF8_COPYRIGHT "2003-2008, Haiku","OK"))->Go(NULL);
         break;
+
     case OPEN_MEDIA_PLAYER:
+    {
+        BPath mediaPlayerPath;
+        status_t status = find_directory(B_BEOS_APPS_DIRECTORY, &mediaPlayerPath);
+        if (status < B_OK) {
+            BString errorMessage;
+            errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+            errorMessage << "find_directory() failed. \nReason: ";
+            errorMessage << strerror(status);
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            break;
+        }
+        mediaPlayerPath.Append("MediaPlayer");
+
         // launch the media player app
         if (LaunchBySig("application/x-vnd.Haiku-MediaPlayer") == B_OK
             || LaunchBySig("application/x-vnd.Be.MediaPlayer") == B_OK
-            || LaunchByPath("/boot/beos/apps/MediaPlayer") == B_OK)
+            || LaunchByPath(mediaPlayerPath.Path()) == B_OK)
             break;
 
         (new BAlert("desklink", "Couldn't launch MediaPlayer", "OK"))->Go();
         break;
+    }
+
     case MEDIA_SETTINGS:
+    {
+        BPath mediaPrefsPath;
+        status_t status = find_directory(B_BEOS_PREFERENCES_DIRECTORY,
+            &mediaPrefsPath);
+        if (status < B_OK) {
+            BString errorMessage;
+            errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+            errorMessage << "find_directory() failed. \nReason: ";
+            errorMessage << strerror(status);
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            break;
+        }
+        mediaPrefsPath.Append("Media");
+
         // launch the media prefs app
         if (LaunchBySig("application/x-vnd.Haiku-Media") == B_OK
             || LaunchBySig("application/x-vnd.Be.MediaPrefs") == B_OK
-            || LaunchByPath("/boot/home/config/be/Preferences/Media") == B_OK)
+            || LaunchByPath(mediaPrefsPath.Path()) == B_OK)
             break;
 
         (new BAlert("desklink", "Couldn't launch Media Preferences", "OK"))->Go();
         break;
+    }
+
     case SOUND_SETTINGS:
+    {
+        BPath soundsPrefsPath;
+        status_t status = find_directory(B_BEOS_PREFERENCES_DIRECTORY,
+            &soundsPrefsPath);
+        if (status < B_OK) {
+            BString errorMessage;
+            errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+            errorMessage << "find_directory() failed. \nReason: ";
+            errorMessage << strerror(status);
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            break;
+        }
+        soundsPrefsPath.Append("Sounds");
+        
         // launch the sounds prefs app
         if (LaunchBySig("application/x-vnd.Haiku-Sounds") == B_OK
             || LaunchBySig("application/x-vnd.Be.SoundsPrefs") == B_OK
-            || LaunchByPath("/boot/home/config/be/Preferences/Sounds") == B_OK)
+            || LaunchByPath(soundsPrefsPath.Path()) == B_OK)
             break;
 
         (new BAlert("desklink", "Couldn't launch Sounds Preferences", "OK"))->Go();
         break;
+    }
+
     case TOGGLE_DONT_BEEP:
         fDontBeep = !fDontBeep;
         break;
+
     case SET_VOLUME_WHICH:
         message->FindInt32("volwhich", &fVolumeWhich);
         break;
+
     default:
         BView::MessageReceived(message);
         break;      
@@ -296 +349 @@
         volMenu->AddItem(tmpItem);
         tmpItem->SetMarked(fVolumeWhich == VOLUME_USE_PHYS_OUTPUT);
         menu->AddItem(volMenu);
-        
+
+        menu->AddSeparatorItem();
+        menu->SetFont(be_plain_font);
+        menu->AddItem(new BMenuItem("About desklink " B_UTF8_ELLIPSIS,
+            new BMessage(B_ABOUT_REQUESTED)));
+
         menu->SetTargetForItems(this);
         volMenu->SetTargetForItems(this);
         menu->Go(where, true, true, BRect(where - BPoint(4, 4),