From c5d80d47d8ede71277f5285506c63496fd250747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 23 Mar 2006 15:11:07 +0000 Subject: [PATCH] * Changed the signature of "Backgrounds" to follow how those signatures are supposed to look like. * Fixed Screen to have the correct signature for Backgrounds (had the one from Be before). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16865 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/backgrounds/Backgrounds.cpp | 4 ++-- src/preferences/backgrounds/Backgrounds.rdef | 2 +- src/preferences/screen/Constants.h | 5 +++-- src/preferences/screen/MonitorView.cpp | 4 ++-- src/preferences/screen/ScreenApplication.cpp | 5 ++++- src/preferences/screen/ScreenWindow.cpp | 4 +++- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/preferences/backgrounds/Backgrounds.cpp b/src/preferences/backgrounds/Backgrounds.cpp index 3bdd3fb915..eefec953bb 100644 --- a/src/preferences/backgrounds/Backgrounds.cpp +++ b/src/preferences/backgrounds/Backgrounds.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005, Haiku, Inc. All Rights Reserved. + * Copyright 2002-2006, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -15,7 +15,7 @@ #include -static const char *kSignature = "application/x-vnd.haiku.Backgrounds"; +static const char *kSignature = "application/x-vnd.haiku-backgrounds"; class BackgroundsApplication : public BApplication { diff --git a/src/preferences/backgrounds/Backgrounds.rdef b/src/preferences/backgrounds/Backgrounds.rdef index 90d855ff0e..65c55822cb 100644 --- a/src/preferences/backgrounds/Backgrounds.rdef +++ b/src/preferences/backgrounds/Backgrounds.rdef @@ -57,7 +57,7 @@ resource mini_icon $"FFFF00000E0F0F0F0F0F0F000F0F0FFF" }; -resource app_signature "application/x-vnd.haiku.Backgrounds"; +resource app_signature "application/x-vnd.haiku-backgrounds"; resource app_version { diff --git a/src/preferences/screen/Constants.h b/src/preferences/screen/Constants.h index 00d2060346..96fb941043 100644 --- a/src/preferences/screen/Constants.h +++ b/src/preferences/screen/Constants.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005, Haiku. + * Copyright 2001-2006, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -37,7 +37,8 @@ static const uint32 DIM_COUNT_MSG = 'scrf'; static const uint32 MAKE_INITIAL_MSG = 'mkin'; // Constants -static const char kAppSignature[] = "application/x-vnd.Be-SCRN"; +extern const char* kBackgroundsSignature; + static const int32 gMinRefresh = 45; // This is the minimum selectable refresh static const int32 gMaxRefresh = 140; // This is the maximum selectable refresh diff --git a/src/preferences/screen/MonitorView.cpp b/src/preferences/screen/MonitorView.cpp index 9c53671c40..154cd657a5 100644 --- a/src/preferences/screen/MonitorView.cpp +++ b/src/preferences/screen/MonitorView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005, Haiku. + * Copyright 2001-2006, Haiku. * Copyright 2002, Thomas Kurschel. * Distributed under the terms of the MIT License. * @@ -45,7 +45,7 @@ MonitorView::AttachedToWindow() void MonitorView::MouseDown(BPoint point) { - be_roster->Launch("application/x-vnd.Be-BACK"); + be_roster->Launch(kBackgroundsSignature); } diff --git a/src/preferences/screen/ScreenApplication.cpp b/src/preferences/screen/ScreenApplication.cpp index 4cf7f739f2..fb8b1f8f3a 100644 --- a/src/preferences/screen/ScreenApplication.cpp +++ b/src/preferences/screen/ScreenApplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005, Haiku. + * Copyright 2001-2006, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -18,6 +18,9 @@ #include +static const char* kAppSignature = "application/x-vnd.Be-SCRN"; + + ScreenApplication::ScreenApplication() : BApplication(kAppSignature), fScreenWindow(new ScreenWindow(new ScreenSettings())) diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp index ac191f7b32..78c8bf00cd 100644 --- a/src/preferences/screen/ScreenWindow.cpp +++ b/src/preferences/screen/ScreenWindow.cpp @@ -57,6 +57,8 @@ // undefine to get standard refresh rates from driver +const char* kBackgroundsSignature = "application/x-vnd.haiku-backgrounds"; + // list of officially supported colour spaces static const struct { color_space space; @@ -836,7 +838,7 @@ ScreenWindow::MessageReceived(BMessage* message) break; case BUTTON_LAUNCH_BACKGROUNDS_MSG: - be_roster->Launch("application/x-vnd.Be-BACK"); + be_roster->Launch(kBackgroundsSignature); break; case BUTTON_DEFAULTS_MSG: