* Renamed bootman to BootManager, and moved it to the applications.

* Renamed its signature to BootManager as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40114 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/HaikuImage

@@ -27,7 +27,7 @@ if $(HAIKU_ATA_STACK) = 1 {
 	IDE_ONLY = "" ;
 }
 
-SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
+SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bzip2
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
@@ -63,11 +63,12 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc Devices
+SYSTEM_APPS = AboutSystem ActivityMonitor BootManager CharacterMap CodyCam
-	DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer
+	DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander
-	LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
+	Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer
-	PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
+	MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus
-	ShowImage SoundRecorder StyledEdit Terminal TextSearch TV	Workspaces
+	ProcessController Screenshot ShowImage SoundRecorder StyledEdit Terminal
+	TextSearch TV Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
 	<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media
@@ -153,7 +154,7 @@ SYSTEM_ADD_ONS_PRINT =
 SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow Flurry 
+SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow Flurry
 	$(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message Spider ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;

src/apps/Jamfile

@@ -5,7 +5,7 @@ HaikuSubInclude aboutsystem ;
 HaikuSubInclude activitymonitor ;
 HaikuSubInclude autoraise ;
 HaikuSubInclude bsnow ;
-HaikuSubInclude bootman ;
+HaikuSubInclude bootmanager ;
 HaikuSubInclude cdplayer ;
 HaikuSubInclude charactermap ;
 HaikuSubInclude clock ;

src/apps/bootmanager/BootManager.rdef

@@ -1,10 +1,10 @@
-/* 
+/*
- * Copyright 2008-2009, Haiku Inc. All rights reserved.
+ * Copyright 2008-2010, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  * 		Michael Pfeiffer <[email protected]>
- * 
+ *
  */
 
 resource(1, "BEOS:APP_FLAGS") (#'APPF') $"00000000";
@@ -67,7 +67,7 @@ resource vector_icon {
 	$"AA40FA7D0117810004"
 };
 
-resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.Haiku-bootman";
+resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.Haiku-BootManager";
 
 resource(1, "BEOS:FILE_TYPES") message { };
 

src/apps/bootmanager/Jamfile

@@ -1,8 +1,8 @@
-SubDir HAIKU_TOP src apps bootman ;
+SubDir HAIKU_TOP src apps bootmanager ;
 
 UsePrivateHeaders shared storage tracker ;
 
-Application bootman :
+Application BootManager :
 	BootManager.cpp
 	BootManagerController.cpp
 	BootManagerWindow.cpp
@@ -17,18 +17,18 @@ Application bootman :
 	WizardController.cpp
 	WizardPageView.cpp
 	WizardView.cpp
-	: 
+	:
-	be 
+	be
 	textencoding
 	tracker
 	$(HAIKU_LOCALE_LIBS)
 	$(TARGET_LIBSUPC++)
-	: 
+	:
-	bootman.rdef
+	BootManager.rdef
 ;
 
-DoCatalogs bootman :
+DoCatalogs BootManager :
-	x-vnd.Haiku-bootman
+	x-vnd.Haiku-BootManager
 	:
 	BootManager.cpp
 	BootManagerController.cpp

src/apps/installer/InstallerWindow.cpp

@@ -49,7 +49,8 @@
 #define B_TRANSLATE_CONTEXT "InstallerWindow"
 
 #define DRIVESETUP_SIG "application/x-vnd.Haiku-DriveSetup"
-#define BOOTMAN_SIG "application/x-vnd.Haiku-Bootman"
+#define BOOTMAN_SIG "application/x-vnd.Haiku-BootManager"
+
 
 const uint32 BEGIN_MESSAGE = 'iBGN';
 const uint32 SHOW_BOTTOM_MESSAGE = 'iSBT';
@@ -59,6 +60,7 @@ const uint32 START_SCAN = 'iSSC';
 const uint32 PACKAGE_CHECKBOX = 'iPCB';
 const uint32 ENCOURAGE_DRIVESETUP = 'iENC';
 
+
 class LogoView : public BView {
 public:
 								LogoView(const BRect& frame);

src/apps/showimage/ImageCache.cpp

@@ -111,7 +111,8 @@ ImageCache::RetrieveImage(const entry_ref& ref, int32 page,
 		entry->ref = ref;
 		entry->page = page;
 
-		if (fThreadCount < fMaxThreadCount) {
+		if (fThreadCount < fMaxThreadCount
+			|| (target != NULL && fThreadCount == fMaxThreadCount)) {
 			// start a new worker thread to load the image
 			thread_id thread = spawn_thread(&ImageCache::_QueueWorkerThread,
 				"image loader", B_LOW_PRIORITY, this);