From 37fb24734106c315e58eadc7cff99f9b2566f4a7 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Wed, 23 Jan 2013 18:20:10 -0500 Subject: [PATCH] Renamed ReadOnlyBootPrompt to FirstBootPrompt. The previous name is no longer applicable, as *BootPrompt is now launched on the first boot of writable medium (e.g., USB thumb drive and hard drives). Fixes part of #9399. Notes: * BootPrompt.rdef may have lost its history. * The renaming was done with the following command: git mv src/apps/readonlybootprompt src/apps/firstbootprompt --- data/system/boot/Bootscript | 2 +- src/apps/Jamfile | 2 +- .../BootPrompt.cpp | 2 +- .../BootPrompt.h | 0 src/apps/firstbootprompt/BootPrompt.rdef | 18 ++++++++++++++++++ .../BootPromptWindow.cpp | 2 +- .../BootPromptWindow.h | 0 .../Jamfile | 8 ++++---- src/apps/readonlybootprompt/BootPrompt.rdef | 18 ------------------ src/kits/locale/Jamfile | 2 +- src/kits/locale/LocaleRoster.cpp | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) rename src/apps/{readonlybootprompt => firstbootprompt}/BootPrompt.cpp (92%) rename src/apps/{readonlybootprompt => firstbootprompt}/BootPrompt.h (100%) create mode 100644 src/apps/firstbootprompt/BootPrompt.rdef rename src/apps/{readonlybootprompt => firstbootprompt}/BootPromptWindow.cpp (99%) rename src/apps/{readonlybootprompt => firstbootprompt}/BootPromptWindow.h (100%) rename src/apps/{readonlybootprompt => firstbootprompt}/Jamfile (69%) delete mode 100644 src/apps/readonlybootprompt/BootPrompt.rdef diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index 071a4060a4..f20aa43dd7 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -119,7 +119,7 @@ fi # Now ask the user if he wants to run the Installer or continue to the Desktop. freshInstallIndicator=/boot/common/settings/fresh_install if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then - /bin/ReadOnlyBootPrompt + /bin/FirstBootPrompt if [ $? -eq 0 ]; then launchscript $SCRIPTS/Bootscript.cd exit 0 # and return diff --git a/src/apps/Jamfile b/src/apps/Jamfile index 0f90365340..7cd5efc724 100644 --- a/src/apps/Jamfile +++ b/src/apps/Jamfile @@ -20,6 +20,7 @@ HaikuSubInclude diskprobe ; HaikuSubInclude diskusage ; HaikuSubInclude drivesetup ; HaikuSubInclude expander ; +HaikuSubInclude firstbootprompt ; HaikuSubInclude fontdemo ; HaikuSubInclude glteapot ; HaikuSubInclude gradients ; @@ -46,7 +47,6 @@ HaikuSubInclude poorman ; HaikuSubInclude powerstatus ; HaikuSubInclude processcontroller ; HaikuSubInclude pulse ; -HaikuSubInclude readonlybootprompt ; HaikuSubInclude remotedesktop ; HaikuSubInclude resedit ; HaikuSubInclude screenshot ; diff --git a/src/apps/readonlybootprompt/BootPrompt.cpp b/src/apps/firstbootprompt/BootPrompt.cpp similarity index 92% rename from src/apps/readonlybootprompt/BootPrompt.cpp rename to src/apps/firstbootprompt/BootPrompt.cpp index 6bda68837c..d25ac66950 100644 --- a/src/apps/readonlybootprompt/BootPrompt.cpp +++ b/src/apps/firstbootprompt/BootPrompt.cpp @@ -28,7 +28,7 @@ main(int, char **) // #pragma mark - -const char* kAppSignature = "application/x-vnd.Haiku-ReadOnlyBootPrompt"; +const char* kAppSignature = "application/x-vnd.Haiku-FirstBootPrompt"; BootPromptApp::BootPromptApp() diff --git a/src/apps/readonlybootprompt/BootPrompt.h b/src/apps/firstbootprompt/BootPrompt.h similarity index 100% rename from src/apps/readonlybootprompt/BootPrompt.h rename to src/apps/firstbootprompt/BootPrompt.h diff --git a/src/apps/firstbootprompt/BootPrompt.rdef b/src/apps/firstbootprompt/BootPrompt.rdef new file mode 100644 index 0000000000..68eb6b1f69 --- /dev/null +++ b/src/apps/firstbootprompt/BootPrompt.rdef @@ -0,0 +1,18 @@ + +resource app_signature "application/x-vnd.Haiku-FirstBootPrompt"; + +resource app_name_catalog_entry "x-vnd.Haiku-FirstBootPrompt:System name:FirstBootPrompt"; + +resource app_version { + major = 1, + middle = 0, + minor = 0, + + variety = B_APPV_BETA, + internal = 0, + + short_info = "FirstBootPrompt", + long_info = "FirstBootPrompt ©2011-2013 The Haiku Project" +}; + +resource app_flags B_EXCLUSIVE_LAUNCH; diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/firstbootprompt/BootPromptWindow.cpp similarity index 99% rename from src/apps/readonlybootprompt/BootPromptWindow.cpp rename to src/apps/firstbootprompt/BootPromptWindow.cpp index d1804cf18c..113a7d7fcd 100644 --- a/src/apps/readonlybootprompt/BootPromptWindow.cpp +++ b/src/apps/firstbootprompt/BootPromptWindow.cpp @@ -316,7 +316,7 @@ BootPromptWindow::_PopulateLanguages() BMessage installedCatalogs; BLocaleRoster::Default()->GetAvailableCatalogs(&installedCatalogs, - "x-vnd.Haiku-ReadOnlyBootPrompt"); + "x-vnd.Haiku-FirstBootPrompt"); BFont font; fLanguagesListView->GetFont(&font); diff --git a/src/apps/readonlybootprompt/BootPromptWindow.h b/src/apps/firstbootprompt/BootPromptWindow.h similarity index 100% rename from src/apps/readonlybootprompt/BootPromptWindow.h rename to src/apps/firstbootprompt/BootPromptWindow.h diff --git a/src/apps/readonlybootprompt/Jamfile b/src/apps/firstbootprompt/Jamfile similarity index 69% rename from src/apps/readonlybootprompt/Jamfile rename to src/apps/firstbootprompt/Jamfile index cc60acc5e8..c0a67929ad 100644 --- a/src/apps/readonlybootprompt/Jamfile +++ b/src/apps/firstbootprompt/Jamfile @@ -1,10 +1,10 @@ -SubDir HAIKU_TOP src apps readonlybootprompt ; +SubDir HAIKU_TOP src apps firstbootprompt ; UsePrivateHeaders interface locale shared ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences keymap ] ; -Application ReadOnlyBootPrompt : +Application FirstBootPrompt : BootPrompt.cpp BootPromptWindow.cpp Keymap.cpp @@ -13,8 +13,8 @@ Application ReadOnlyBootPrompt : : BootPrompt.rdef ; -DoCatalogs ReadOnlyBootPrompt : - x-vnd.Haiku-ReadOnlyBootPrompt +DoCatalogs FirstBootPrompt : + x-vnd.Haiku-FirstBootPrompt : BootPrompt.cpp BootPromptWindow.cpp diff --git a/src/apps/readonlybootprompt/BootPrompt.rdef b/src/apps/readonlybootprompt/BootPrompt.rdef deleted file mode 100644 index 93792b1253..0000000000 --- a/src/apps/readonlybootprompt/BootPrompt.rdef +++ /dev/null @@ -1,18 +0,0 @@ - -resource app_signature "application/x-vnd.Haiku-ReadOnlyBootPrompt"; - -resource app_name_catalog_entry "x-vnd.Haiku-ReadOnlyBootPrompt:System name:ReadOnlyBootPrompt"; - -resource app_version { - major = 1, - middle = 0, - minor = 0, - - variety = B_APPV_BETA, - internal = 0, - - short_info = "ReadOnlyBootPrompt", - long_info = "ReadOnlyBootPrompt ©2011 The Haiku Project" -}; - -resource app_flags B_EXCLUSIVE_LAUNCH; diff --git a/src/kits/locale/Jamfile b/src/kits/locale/Jamfile index 61ad69f0e2..ec9d4d4f35 100644 --- a/src/kits/locale/Jamfile +++ b/src/kits/locale/Jamfile @@ -30,7 +30,7 @@ local sources = TimeFormat.cpp TimeUnitFormat.cpp Format.cpp # Used by some of the above. - UnicodeChar.cpp # Already used in ReadOnlyBootPrompt. + UnicodeChar.cpp # Already used in FirstBootPrompt. # old, needs investigation # Currency.cpp diff --git a/src/kits/locale/LocaleRoster.cpp b/src/kits/locale/LocaleRoster.cpp index 22d2961bbc..c296ab64d8 100644 --- a/src/kits/locale/LocaleRoster.cpp +++ b/src/kits/locale/LocaleRoster.cpp @@ -69,7 +69,7 @@ country_code_for_language(const BLanguage& language) return language.CountryCode(); // TODO: implement for real! For now, we just map some well known - // languages to countries to make ReadOnlyBootPrompt happy. + // languages to countries to make FirstBootPrompt happy. switch ((tolower(language.Code()[0]) << 8) | tolower(language.Code()[1])) { case 'be': // Belarus return "BY";