Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Rename "ScreenshotApp" to "Screenshot", rename its signature from

Browse Source 
"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


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37059 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Wim van der Meer 2010-06-08 13:15:17 +00:00
parent 5aa0503c7c
commit 3417d2a90f
8 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/jam/HaikuImage
View File

@ -51,7 +51,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
query quit query quit
rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
rmindex rmdir roster route 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 setvolume setwep seq sha1sum shar shred shuf shutdown sleep sort spamdbm
split stat strace stty su sum sync sysinfo split stat strace stty su sum sync sysinfo
tac tail tcpdump tcptester tee telnet telnetd test timeout top touch tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
@ -66,8 +66,7 @@ SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc Devices
DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer
LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
PackageInstaller People PoorMan PowerStatus ProcessController Screenshot PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
ScreenshotApp ShowImage SoundRecorder StyledEdit Terminal TextSearch TV ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces
Workspaces
; ;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media <preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media

8
src/apps/screenshot/Jamfile
View File

@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps screenshot ;
UsePrivateHeaders interface ; UsePrivateHeaders interface ;
Application ScreenshotApp : Application Screenshot :
ScreenshotApp.cpp ScreenshotApp.cpp
ScreenshotWindow.cpp ScreenshotWindow.cpp
PreviewView.cpp PreviewView.cpp
@ -11,14 +11,14 @@ Application ScreenshotApp :
: ScreenshotApp.rdef : ScreenshotApp.rdef
; ;
DoCatalogs ScreenshotApp : DoCatalogs Screenshot :
x-vnd.Haiku-ScreenshotApp x-vnd.haiku-screenshot
: :
ScreenshotWindow.cpp ScreenshotWindow.cpp
Utility.cpp Utility.cpp
; ;
Application Screenshot : Application screenshot :
Screenshot.cpp Screenshot.cpp
Utility.cpp Utility.cpp
: be locale translation $(TARGET_LIBSUPC++) : be locale translation $(TARGET_LIBSUPC++)

4
src/apps/screenshot/Screenshot.cpp
View File

@ -31,7 +31,7 @@
Screenshot::Screenshot() Screenshot::Screenshot()
: :
BApplication("application/x-vnd.Haiku-Screenshot"), BApplication("application/x-vnd.haiku-screenshot-cli"),
fUtility(new Utility()), fUtility(new Utility()),
fLaunchGui(true) fLaunchGui(true)
{ {
@ -151,7 +151,7 @@ Screenshot::ReadyToRun()
message.AddRect("tabFrame", fUtility->tabFrame); message.AddRect("tabFrame", fUtility->tabFrame);
message.AddFloat("borderSize", fUtility->borderSize); message.AddFloat("borderSize", fUtility->borderSize);
be_roster->Launch("application/x-vnd.Haiku-ScreenshotApp", be_roster->Launch("application/x-vnd.haiku-screenshot",
&message); &message);
} }
} }

6
src/apps/screenshot/Screenshot.rdef
View File

@ -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; resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
@ -8,8 +8,8 @@ resource app_version {
minor = 0, minor = 0,
variety = B_APPV_BETA, variety = B_APPV_BETA,
internal = 0, internal = 0,
short_info = "Screenshot", short_info = "Screenshot CLI",
long_info = "Screenshot ©2008-2010 Haiku" long_info = "Screenshot CLI ©2008-2010 Haiku"
}; };
resource vector_icon { resource vector_icon {

2
src/apps/screenshot/ScreenshotApp.cpp
View File

@ -21,7 +21,7 @@
ScreenshotApp::ScreenshotApp() ScreenshotApp::ScreenshotApp()
: :
BApplication("application/x-vnd.Haiku-ScreenshotApp"), BApplication("application/x-vnd.haiku-screenshot"),
fUtility(new Utility) fUtility(new Utility)
{ {
be_locale->GetAppCatalog(&fCatalog); be_locale->GetAppCatalog(&fCatalog);

6
src/apps/screenshot/ScreenshotApp.rdef
View File

@ -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; resource app_flags B_MULTIPLE_LAUNCH;
@ -8,8 +8,8 @@ resource app_version {
minor = 0, minor = 0,
variety = B_APPV_BETA, variety = B_APPV_BETA,
internal = 0, internal = 0,
short_info = "ScreenshotApp", short_info = "Screenshot",
long_info = "ScreenshotApp ©2008-2010 Haiku" long_info = "Screenshot ©2008-2010 Haiku"
}; };
resource vector_icon { resource vector_icon {

2
src/apps/screenshot/ScreenshotWindow.cpp
View File

@ -332,7 +332,7 @@ ScreenshotWindow::_NewScreenshot()
delay.CopyInto(argv[2], 0, charCount); delay.CopyInto(argv[2], 0, charCount);
argv[2][charCount] = '\0'; 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); be_app->PostMessage(B_QUIT_REQUESTED);
} }

2
src/kits/interface/Window.cpp
View File

@ -3618,7 +3618,7 @@ BWindow::_HandleKeyDown(BMessage* event)
if ((modifiers & B_SHIFT_KEY) != 0 || (modifiers & B_OPTION_KEY) != 0) if ((modifiers & B_SHIFT_KEY) != 0 || (modifiers & B_OPTION_KEY) != 0)
message.ReplaceBool("silent", false); 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; return true;
} }