Author: wim Date: 2010-06-08 15:15:17 +0200 (Tue, 08 Jun 2010) New Revision: 37059 Changeset: http://dev.haiku-os.org/changeset/37059/haiku Modified: haiku/trunk/build/jam/HaikuImage haiku/trunk/src/apps/screenshot/Jamfile haiku/trunk/src/apps/screenshot/Screenshot.cpp haiku/trunk/src/apps/screenshot/Screenshot.rdef haiku/trunk/src/apps/screenshot/ScreenshotApp.cpp haiku/trunk/src/apps/screenshot/ScreenshotApp.rdef haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp haiku/trunk/src/kits/interface/Window.cpp Log: * Rename "ScreenshotApp" to "Screenshot", rename its signature from "application/x-vnd.haiku-screenshotapp" to "application/x-vnd.haiku-screenshot" * Rename "Screenshot" to "screenshot", rename its signature from "application/x-vnd.haiku-screenshot" to "application/x-vnd.haiku-screenshot-cli" * Move screenshot from /system/apps to /bin Modified: haiku/trunk/build/jam/HaikuImage =================================================================== --- haiku/trunk/build/jam/HaikuImage 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/build/jam/HaikuImage 2010-06-08 13:15:17 UTC (rev 37059) @@ -51,7 +51,7 @@ query quit rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr rmindex rmdir roster route - safemode screen_blanker screenmode sdiff setdecor settype setversion + safemode screen_blanker screenmode screenshot sdiff setdecor settype setversion setvolume setwep seq sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace stty su sum sync sysinfo tac tail tcpdump tcptester tee telnet telnetd test timeout top touch @@ -66,8 +66,7 @@ DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus ProcessController Screenshot - ScreenshotApp ShowImage SoundRecorder StyledEdit Terminal TextSearch TV - Workspaces + ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces ; SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations <preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media Modified: haiku/trunk/src/apps/screenshot/Jamfile =================================================================== --- haiku/trunk/src/apps/screenshot/Jamfile 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/Jamfile 2010-06-08 13:15:17 UTC (rev 37059) @@ -2,7 +2,7 @@ UsePrivateHeaders interface ; -Application ScreenshotApp : +Application Screenshot : ScreenshotApp.cpp ScreenshotWindow.cpp PreviewView.cpp @@ -11,14 +11,14 @@ : ScreenshotApp.rdef ; -DoCatalogs ScreenshotApp : - x-vnd.Haiku-ScreenshotApp +DoCatalogs Screenshot : + x-vnd.haiku-screenshot : ScreenshotWindow.cpp Utility.cpp ; -Application Screenshot : +Application screenshot : Screenshot.cpp Utility.cpp : be locale translation $(TARGET_LIBSUPC++) Modified: haiku/trunk/src/apps/screenshot/Screenshot.cpp =================================================================== --- haiku/trunk/src/apps/screenshot/Screenshot.cpp 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/Screenshot.cpp 2010-06-08 13:15:17 UTC (rev 37059) @@ -31,7 +31,7 @@ Screenshot::Screenshot() : - BApplication("application/x-vnd.Haiku-Screenshot"), + BApplication("application/x-vnd.haiku-screenshot-cli"), fUtility(new Utility()), fLaunchGui(true) { @@ -151,7 +151,7 @@ message.AddRect("tabFrame", fUtility->tabFrame); message.AddFloat("borderSize", fUtility->borderSize); - be_roster->Launch("application/x-vnd.Haiku-ScreenshotApp", + be_roster->Launch("application/x-vnd.haiku-screenshot", &message); } } Modified: haiku/trunk/src/apps/screenshot/Screenshot.rdef =================================================================== --- haiku/trunk/src/apps/screenshot/Screenshot.rdef 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/Screenshot.rdef 2010-06-08 13:15:17 UTC (rev 37059) @@ -1,4 +1,4 @@ -resource app_signature "application/x-vnd.Haiku-Screenshot"; +resource app_signature "application/x-vnd.haiku-screenshot-cli"; resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP; @@ -8,8 +8,8 @@ minor = 0, variety = B_APPV_BETA, internal = 0, - short_info = "Screenshot", - long_info = "Screenshot ©2008-2010 Haiku" + short_info = "Screenshot CLI", + long_info = "Screenshot CLI ©2008-2010 Haiku" }; resource vector_icon { Modified: haiku/trunk/src/apps/screenshot/ScreenshotApp.cpp =================================================================== --- haiku/trunk/src/apps/screenshot/ScreenshotApp.cpp 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/ScreenshotApp.cpp 2010-06-08 13:15:17 UTC (rev 37059) @@ -21,7 +21,7 @@ ScreenshotApp::ScreenshotApp() : - BApplication("application/x-vnd.Haiku-ScreenshotApp"), + BApplication("application/x-vnd.haiku-screenshot"), fUtility(new Utility) { be_locale->GetAppCatalog(&fCatalog); Modified: haiku/trunk/src/apps/screenshot/ScreenshotApp.rdef =================================================================== --- haiku/trunk/src/apps/screenshot/ScreenshotApp.rdef 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/ScreenshotApp.rdef 2010-06-08 13:15:17 UTC (rev 37059) @@ -1,4 +1,4 @@ -resource app_signature "application/x-vnd.Haiku-ScreenshotApp"; +resource app_signature "application/x-vnd.haiku-screenshot"; resource app_flags B_MULTIPLE_LAUNCH; @@ -8,8 +8,8 @@ minor = 0, variety = B_APPV_BETA, internal = 0, - short_info = "ScreenshotApp", - long_info = "ScreenshotApp ©2008-2010 Haiku" + short_info = "Screenshot", + long_info = "Screenshot ©2008-2010 Haiku" }; resource vector_icon { Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp =================================================================== --- haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp 2010-06-08 13:15:17 UTC (rev 37059) @@ -332,7 +332,7 @@ delay.CopyInto(argv[2], 0, charCount); argv[2][charCount] = '\0'; - be_roster->Launch("application/x-vnd.Haiku-Screenshot", argc, argv); + be_roster->Launch("application/x-vnd.haiku-screenshot-cli", argc, argv); be_app->PostMessage(B_QUIT_REQUESTED); } Modified: haiku/trunk/src/kits/interface/Window.cpp =================================================================== --- haiku/trunk/src/kits/interface/Window.cpp 2010-06-08 06:14:05 UTC (rev 37058) +++ haiku/trunk/src/kits/interface/Window.cpp 2010-06-08 13:15:17 UTC (rev 37059) @@ -3618,7 +3618,7 @@ if ((modifiers & B_SHIFT_KEY) != 0 || (modifiers & B_OPTION_KEY) != 0) message.ReplaceBool("silent", false); - be_roster->Launch("application/x-vnd.haiku-screenshot", &message); + be_roster->Launch("application/x-vnd.haiku-screenshot-cli", &message); return true; }