From 943ef65ef48716af1e31641031ca0fd11dadddc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 9 Jun 2007 12:07:55 +0000 Subject: [PATCH] * cleanup in the Leaf menu: Applications is no longer a link to /boot/beos/apps, but a folder containing links to _selected_ apps in that folder * a new entry "Desktop Applets" has been added, which contains all the apps that you either do or do not start at system boot, but don't need frequent access to * some apps have been hidden: - ShowImage and Expander are usually not directly started on their own, but through double clicking documents - AboutSystem is invoked elsewhere from the Leaf menu, so it doesn't need to clutter the Applications menu * we almost introduced a third category for rarely used apps, but in the end it would only have contained Installer, Icon-O-Matic and Diskprobe, and we felt that it is ok to leave these in the Applications menu, as long as their number is small git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21374 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 67 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 5ed483bb4e..e652711bc6 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -43,17 +43,19 @@ BEOS_BIN = "[" addattr alert arp basename bc beep bzip2 cat cardctl catattr chgr zipcloak zipgrep zipnote zipsplit zmore znew ; -BEOS_APPS = Terminal Expander People ShowImage ProcessController - SoundRecorder Magnify DiskProbe AboutSystem StyledEdit Installer Workspaces - $(X86_ONLY)Cortex MediaPlayer DeskCalc MidiPlayer - Icon-O-Matic Mail CDPlayer NetworkStatus TV + +BEOS_APPS = AboutSystem DeskCalc DiskProbe CDPlayer Expander Icon-O-Matic + Installer LaunchBox Magnify Mail MediaPlayer MidiPlayer NetworkStatus + People PowerStatus ProcessController ShowImage SoundRecorder StyledEdit + Terminal TV Workspaces ; BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes - Fonts Media Menu Mouse Keyboard Keymap Printers Screen ScreenSaver Sounds + Fonts Keyboard Keymap Media Menu Mouse Printers Screen ScreenSaver Sounds Time VirtualMemory ; -BEOS_DEMOS = BitmapDrawing Chart Clock FontDemo $(X86_ONLY)GLDirectMode - $(X86_ONLY)GLTeapot Mandelbrot PictureTest Playground Pulse +BEOS_DEMOS = BitmapDrawing Chart Clock $(X86_ONLY)Cortex FontDemo + $(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest + Playground Pulse ; BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so @@ -79,6 +81,7 @@ BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accele BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator JPEG2000Translator TIFFTranslator PNGTranslator PPMTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator + WonderBrushTranslator ; BEOS_ADD_ONS_MEDIA = mixer.media_addon hmulti_audio.media_addon tone_producer_demo.media_addon @@ -146,8 +149,8 @@ if $(TARGET_ARCH) = x86 { AddDriversToHaikuImage : console dprintf $(X86_ONLY)keyboard null random tty zero ; AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ; -AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ; -AddDriversToHaikuImage bus : usb_raw ; +AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ; +AddDriversToHaikuImage bus : usb_raw ; AddDriversToHaikuImage disk scsi : scsi_cd scsi_dsk ; AddDriversToHaikuImage disk virtual : nbd ; AddDriversToHaikuImage dvb : cx23882 ; @@ -176,12 +179,54 @@ AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ; AddFilesToHaikuImage beos system : runtime_loader Deskbar Tracker ; AddFilesToHaikuImage beos bin : $(BEOS_BIN) consoled ; AddFilesToHaikuImage beos apps : $(BEOS_APPS) ; -AddFilesToHaikuImage beos preferences : $(BEOS_PREFERENCES) ; +AddFilesToHaikuImage beos preferences : $(BEOS_PREFERENCES) ; AddFilesToHaikuImage beos demos : $(BEOS_DEMOS) ; AddSymlinkToHaikuImage home Desktop : /boot/home : Home ; -AddSymlinkToHaikuImage home config be : /boot/beos/apps : Applications ; +# Deskbar Application links +AddDirectoryToHaikuImage home config be Applications ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/CDPlayer : CDPlayer ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/DeskCalc : DeskCalc ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/DiskProbe : DiskProbe ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/Icon-O-Matic : Icon-O-Matic ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/Magnify : Magnify ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/Mail : Mail ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/MediaPlayer : MediaPlayer ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/MidiPlayer : MidiPlayer ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/People : People ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/SoundRecorder : SoundRecorder ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/StyledEdit : StyledEdit ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/Terminal : Terminal ; +AddSymlinkToHaikuImage home config be Applications + : /boot/beos/apps/TV : TV ; + +# Deskbar Desktop Applets links +AddDirectoryToHaikuImage home config be Desktop\ Applets ; +AddSymlinkToHaikuImage home config be Desktop\ Applets + : /boot/beos/apps/LaunchBox : LaunchBox ; +AddSymlinkToHaikuImage home config be Desktop\ Applets + : /boot/beos/apps/NetworkStatus : NetworkStatus ; +AddSymlinkToHaikuImage home config be Desktop\ Applets + : /boot/beos/apps/PowerStatus : PowerStatus ; +AddSymlinkToHaikuImage home config be Desktop\ Applets + : /boot/beos/apps/ProcessController : ProcessController ; +AddSymlinkToHaikuImage home config be Desktop\ Applets + : /boot/beos/apps/Workspaces : Workspaces ; + +# Deskbar Preferences and Demos links AddSymlinkToHaikuImage home config be : /boot/beos/preferences : Preferences ; AddSymlinkToHaikuImage home config be : /boot/beos/demos : Demos ;