From b76ca311d17d58bd6c3ac6948d839076558adc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 4 Jan 2011 19:23:24 +0000 Subject: [PATCH] * 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 | 15 ++++++++------- src/apps/Jamfile | 2 +- src/apps/{bootman => bootmanager}/BootDrive.h | 0 src/apps/{bootman => bootmanager}/BootLoader.h | 0 .../{bootman => bootmanager}/BootManager.cpp | 0 .../BootManager.rdef} | 8 ++++---- .../BootManagerController.cpp | 0 .../BootManagerController.h | 0 .../BootManagerWindow.cpp | 0 .../{bootman => bootmanager}/BootManagerWindow.h | 0 .../DefaultPartitionPage.cpp | 0 .../DefaultPartitionPage.h | 0 .../{bootman => bootmanager}/DescriptionPage.cpp | 0 .../{bootman => bootmanager}/DescriptionPage.h | 0 src/apps/{bootman => bootmanager}/EntryPage.cpp | 0 src/apps/{bootman => bootmanager}/EntryPage.h | 0 .../FileSelectionPage.cpp | 0 .../{bootman => bootmanager}/FileSelectionPage.h | 0 src/apps/{bootman => bootmanager}/Jamfile | 16 ++++++++-------- .../{bootman => bootmanager}/LegacyBootDrive.cpp | 0 .../{bootman => bootmanager}/LegacyBootDrive.h | 0 src/apps/{bootman => bootmanager}/MakeArray.cpp | 0 .../{bootman => bootmanager}/PartitionsPage.cpp | 0 .../{bootman => bootmanager}/PartitionsPage.h | 0 .../{bootman => bootmanager}/TestBootDrive.cpp | 0 .../{bootman => bootmanager}/TestBootDrive.h | 0 .../{bootman => bootmanager}/UninstallPage.cpp | 0 .../{bootman => bootmanager}/UninstallPage.h | 0 .../WizardController.cpp | 0 .../{bootman => bootmanager}/WizardController.h | 0 .../{bootman => bootmanager}/WizardPageView.cpp | 0 .../{bootman => bootmanager}/WizardPageView.h | 0 src/apps/{bootman => bootmanager}/WizardView.cpp | 0 src/apps/{bootman => bootmanager}/WizardView.h | 0 src/apps/{bootman => bootmanager}/bootman.S | 0 src/apps/installer/InstallerWindow.cpp | 4 +++- src/apps/showimage/ImageCache.cpp | 3 ++- 37 files changed, 26 insertions(+), 22 deletions(-) rename src/apps/{bootman => bootmanager}/BootDrive.h (100%) rename src/apps/{bootman => bootmanager}/BootLoader.h (100%) rename src/apps/{bootman => bootmanager}/BootManager.cpp (100%) rename src/apps/{bootman/bootman.rdef => bootmanager/BootManager.rdef} (96%) rename src/apps/{bootman => bootmanager}/BootManagerController.cpp (100%) rename src/apps/{bootman => bootmanager}/BootManagerController.h (100%) rename src/apps/{bootman => bootmanager}/BootManagerWindow.cpp (100%) rename src/apps/{bootman => bootmanager}/BootManagerWindow.h (100%) rename src/apps/{bootman => bootmanager}/DefaultPartitionPage.cpp (100%) rename src/apps/{bootman => bootmanager}/DefaultPartitionPage.h (100%) rename src/apps/{bootman => bootmanager}/DescriptionPage.cpp (100%) rename src/apps/{bootman => bootmanager}/DescriptionPage.h (100%) rename src/apps/{bootman => bootmanager}/EntryPage.cpp (100%) rename src/apps/{bootman => bootmanager}/EntryPage.h (100%) rename src/apps/{bootman => bootmanager}/FileSelectionPage.cpp (100%) rename src/apps/{bootman => bootmanager}/FileSelectionPage.h (100%) rename src/apps/{bootman => bootmanager}/Jamfile (81%) rename src/apps/{bootman => bootmanager}/LegacyBootDrive.cpp (100%) rename src/apps/{bootman => bootmanager}/LegacyBootDrive.h (100%) rename src/apps/{bootman => bootmanager}/MakeArray.cpp (100%) rename src/apps/{bootman => bootmanager}/PartitionsPage.cpp (100%) rename src/apps/{bootman => bootmanager}/PartitionsPage.h (100%) rename src/apps/{bootman => bootmanager}/TestBootDrive.cpp (100%) rename src/apps/{bootman => bootmanager}/TestBootDrive.h (100%) rename src/apps/{bootman => bootmanager}/UninstallPage.cpp (100%) rename src/apps/{bootman => bootmanager}/UninstallPage.h (100%) rename src/apps/{bootman => bootmanager}/WizardController.cpp (100%) rename src/apps/{bootman => bootmanager}/WizardController.h (100%) rename src/apps/{bootman => bootmanager}/WizardPageView.cpp (100%) rename src/apps/{bootman => bootmanager}/WizardPageView.h (100%) rename src/apps/{bootman => bootmanager}/WizardView.cpp (100%) rename src/apps/{bootman => bootmanager}/WizardView.h (100%) rename src/apps/{bootman => bootmanager}/bootman.S (100%) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 8dcc9cc87a..e3e448e7b1 100644 --- a/build/jam/HaikuImage +++ b/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 zipgrep zipnote zipsplit zmore znew ; -SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc Devices - DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer - LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus - PackageInstaller People PoorMan PowerStatus ProcessController Screenshot - ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces +SYSTEM_APPS = AboutSystem ActivityMonitor BootManager CharacterMap CodyCam + DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander + Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer + MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus + ProcessController Screenshot ShowImage SoundRecorder StyledEdit Terminal + TextSearch TV Workspaces ; SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations 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 ; diff --git a/src/apps/Jamfile b/src/apps/Jamfile index eccbc19284..c45d119b53 100644 --- a/src/apps/Jamfile +++ b/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 ; diff --git a/src/apps/bootman/BootDrive.h b/src/apps/bootmanager/BootDrive.h similarity index 100% rename from src/apps/bootman/BootDrive.h rename to src/apps/bootmanager/BootDrive.h diff --git a/src/apps/bootman/BootLoader.h b/src/apps/bootmanager/BootLoader.h similarity index 100% rename from src/apps/bootman/BootLoader.h rename to src/apps/bootmanager/BootLoader.h diff --git a/src/apps/bootman/BootManager.cpp b/src/apps/bootmanager/BootManager.cpp similarity index 100% rename from src/apps/bootman/BootManager.cpp rename to src/apps/bootmanager/BootManager.cpp diff --git a/src/apps/bootman/bootman.rdef b/src/apps/bootmanager/BootManager.rdef similarity index 96% rename from src/apps/bootman/bootman.rdef rename to src/apps/bootmanager/BootManager.rdef index 5c3e67e465..a4e685ef1a 100644 --- a/src/apps/bootman/bootman.rdef +++ b/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 - * + * */ 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 { }; diff --git a/src/apps/bootman/BootManagerController.cpp b/src/apps/bootmanager/BootManagerController.cpp similarity index 100% rename from src/apps/bootman/BootManagerController.cpp rename to src/apps/bootmanager/BootManagerController.cpp diff --git a/src/apps/bootman/BootManagerController.h b/src/apps/bootmanager/BootManagerController.h similarity index 100% rename from src/apps/bootman/BootManagerController.h rename to src/apps/bootmanager/BootManagerController.h diff --git a/src/apps/bootman/BootManagerWindow.cpp b/src/apps/bootmanager/BootManagerWindow.cpp similarity index 100% rename from src/apps/bootman/BootManagerWindow.cpp rename to src/apps/bootmanager/BootManagerWindow.cpp diff --git a/src/apps/bootman/BootManagerWindow.h b/src/apps/bootmanager/BootManagerWindow.h similarity index 100% rename from src/apps/bootman/BootManagerWindow.h rename to src/apps/bootmanager/BootManagerWindow.h diff --git a/src/apps/bootman/DefaultPartitionPage.cpp b/src/apps/bootmanager/DefaultPartitionPage.cpp similarity index 100% rename from src/apps/bootman/DefaultPartitionPage.cpp rename to src/apps/bootmanager/DefaultPartitionPage.cpp diff --git a/src/apps/bootman/DefaultPartitionPage.h b/src/apps/bootmanager/DefaultPartitionPage.h similarity index 100% rename from src/apps/bootman/DefaultPartitionPage.h rename to src/apps/bootmanager/DefaultPartitionPage.h diff --git a/src/apps/bootman/DescriptionPage.cpp b/src/apps/bootmanager/DescriptionPage.cpp similarity index 100% rename from src/apps/bootman/DescriptionPage.cpp rename to src/apps/bootmanager/DescriptionPage.cpp diff --git a/src/apps/bootman/DescriptionPage.h b/src/apps/bootmanager/DescriptionPage.h similarity index 100% rename from src/apps/bootman/DescriptionPage.h rename to src/apps/bootmanager/DescriptionPage.h diff --git a/src/apps/bootman/EntryPage.cpp b/src/apps/bootmanager/EntryPage.cpp similarity index 100% rename from src/apps/bootman/EntryPage.cpp rename to src/apps/bootmanager/EntryPage.cpp diff --git a/src/apps/bootman/EntryPage.h b/src/apps/bootmanager/EntryPage.h similarity index 100% rename from src/apps/bootman/EntryPage.h rename to src/apps/bootmanager/EntryPage.h diff --git a/src/apps/bootman/FileSelectionPage.cpp b/src/apps/bootmanager/FileSelectionPage.cpp similarity index 100% rename from src/apps/bootman/FileSelectionPage.cpp rename to src/apps/bootmanager/FileSelectionPage.cpp diff --git a/src/apps/bootman/FileSelectionPage.h b/src/apps/bootmanager/FileSelectionPage.h similarity index 100% rename from src/apps/bootman/FileSelectionPage.h rename to src/apps/bootmanager/FileSelectionPage.h diff --git a/src/apps/bootman/Jamfile b/src/apps/bootmanager/Jamfile similarity index 81% rename from src/apps/bootman/Jamfile rename to src/apps/bootmanager/Jamfile index f9f8a2bccc..6cf71df5a5 100644 --- a/src/apps/bootman/Jamfile +++ b/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 : - x-vnd.Haiku-bootman +DoCatalogs BootManager : + x-vnd.Haiku-BootManager : BootManager.cpp BootManagerController.cpp diff --git a/src/apps/bootman/LegacyBootDrive.cpp b/src/apps/bootmanager/LegacyBootDrive.cpp similarity index 100% rename from src/apps/bootman/LegacyBootDrive.cpp rename to src/apps/bootmanager/LegacyBootDrive.cpp diff --git a/src/apps/bootman/LegacyBootDrive.h b/src/apps/bootmanager/LegacyBootDrive.h similarity index 100% rename from src/apps/bootman/LegacyBootDrive.h rename to src/apps/bootmanager/LegacyBootDrive.h diff --git a/src/apps/bootman/MakeArray.cpp b/src/apps/bootmanager/MakeArray.cpp similarity index 100% rename from src/apps/bootman/MakeArray.cpp rename to src/apps/bootmanager/MakeArray.cpp diff --git a/src/apps/bootman/PartitionsPage.cpp b/src/apps/bootmanager/PartitionsPage.cpp similarity index 100% rename from src/apps/bootman/PartitionsPage.cpp rename to src/apps/bootmanager/PartitionsPage.cpp diff --git a/src/apps/bootman/PartitionsPage.h b/src/apps/bootmanager/PartitionsPage.h similarity index 100% rename from src/apps/bootman/PartitionsPage.h rename to src/apps/bootmanager/PartitionsPage.h diff --git a/src/apps/bootman/TestBootDrive.cpp b/src/apps/bootmanager/TestBootDrive.cpp similarity index 100% rename from src/apps/bootman/TestBootDrive.cpp rename to src/apps/bootmanager/TestBootDrive.cpp diff --git a/src/apps/bootman/TestBootDrive.h b/src/apps/bootmanager/TestBootDrive.h similarity index 100% rename from src/apps/bootman/TestBootDrive.h rename to src/apps/bootmanager/TestBootDrive.h diff --git a/src/apps/bootman/UninstallPage.cpp b/src/apps/bootmanager/UninstallPage.cpp similarity index 100% rename from src/apps/bootman/UninstallPage.cpp rename to src/apps/bootmanager/UninstallPage.cpp diff --git a/src/apps/bootman/UninstallPage.h b/src/apps/bootmanager/UninstallPage.h similarity index 100% rename from src/apps/bootman/UninstallPage.h rename to src/apps/bootmanager/UninstallPage.h diff --git a/src/apps/bootman/WizardController.cpp b/src/apps/bootmanager/WizardController.cpp similarity index 100% rename from src/apps/bootman/WizardController.cpp rename to src/apps/bootmanager/WizardController.cpp diff --git a/src/apps/bootman/WizardController.h b/src/apps/bootmanager/WizardController.h similarity index 100% rename from src/apps/bootman/WizardController.h rename to src/apps/bootmanager/WizardController.h diff --git a/src/apps/bootman/WizardPageView.cpp b/src/apps/bootmanager/WizardPageView.cpp similarity index 100% rename from src/apps/bootman/WizardPageView.cpp rename to src/apps/bootmanager/WizardPageView.cpp diff --git a/src/apps/bootman/WizardPageView.h b/src/apps/bootmanager/WizardPageView.h similarity index 100% rename from src/apps/bootman/WizardPageView.h rename to src/apps/bootmanager/WizardPageView.h diff --git a/src/apps/bootman/WizardView.cpp b/src/apps/bootmanager/WizardView.cpp similarity index 100% rename from src/apps/bootman/WizardView.cpp rename to src/apps/bootmanager/WizardView.cpp diff --git a/src/apps/bootman/WizardView.h b/src/apps/bootmanager/WizardView.h similarity index 100% rename from src/apps/bootman/WizardView.h rename to src/apps/bootmanager/WizardView.h diff --git a/src/apps/bootman/bootman.S b/src/apps/bootmanager/bootman.S similarity index 100% rename from src/apps/bootman/bootman.S rename to src/apps/bootmanager/bootman.S diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index b277e84d36..7d8c7e2a3d 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/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); diff --git a/src/apps/showimage/ImageCache.cpp b/src/apps/showimage/ImageCache.cpp index 7eb6fec1d6..d96eb16401 100644 --- a/src/apps/showimage/ImageCache.cpp +++ b/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);