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
This commit is contained in:
@@ -119,7 +119,7 @@ fi
|
|||||||
# Now ask the user if he wants to run the Installer or continue to the Desktop.
|
# Now ask the user if he wants to run the Installer or continue to the Desktop.
|
||||||
freshInstallIndicator=/boot/common/settings/fresh_install
|
freshInstallIndicator=/boot/common/settings/fresh_install
|
||||||
if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
|
if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
|
||||||
/bin/ReadOnlyBootPrompt
|
/bin/FirstBootPrompt
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
launchscript $SCRIPTS/Bootscript.cd
|
launchscript $SCRIPTS/Bootscript.cd
|
||||||
exit 0 # and return
|
exit 0 # and return
|
||||||
|
|||||||
+1
-1
@@ -20,6 +20,7 @@ HaikuSubInclude diskprobe ;
|
|||||||
HaikuSubInclude diskusage ;
|
HaikuSubInclude diskusage ;
|
||||||
HaikuSubInclude drivesetup ;
|
HaikuSubInclude drivesetup ;
|
||||||
HaikuSubInclude expander ;
|
HaikuSubInclude expander ;
|
||||||
|
HaikuSubInclude firstbootprompt ;
|
||||||
HaikuSubInclude fontdemo ;
|
HaikuSubInclude fontdemo ;
|
||||||
HaikuSubInclude glteapot ;
|
HaikuSubInclude glteapot ;
|
||||||
HaikuSubInclude gradients ;
|
HaikuSubInclude gradients ;
|
||||||
@@ -46,7 +47,6 @@ HaikuSubInclude poorman ;
|
|||||||
HaikuSubInclude powerstatus ;
|
HaikuSubInclude powerstatus ;
|
||||||
HaikuSubInclude processcontroller ;
|
HaikuSubInclude processcontroller ;
|
||||||
HaikuSubInclude pulse ;
|
HaikuSubInclude pulse ;
|
||||||
HaikuSubInclude readonlybootprompt ;
|
|
||||||
HaikuSubInclude remotedesktop ;
|
HaikuSubInclude remotedesktop ;
|
||||||
HaikuSubInclude resedit ;
|
HaikuSubInclude resedit ;
|
||||||
HaikuSubInclude screenshot ;
|
HaikuSubInclude screenshot ;
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ main(int, char **)
|
|||||||
// #pragma mark -
|
// #pragma mark -
|
||||||
|
|
||||||
|
|
||||||
const char* kAppSignature = "application/x-vnd.Haiku-ReadOnlyBootPrompt";
|
const char* kAppSignature = "application/x-vnd.Haiku-FirstBootPrompt";
|
||||||
|
|
||||||
|
|
||||||
BootPromptApp::BootPromptApp()
|
BootPromptApp::BootPromptApp()
|
||||||
@@ -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;
|
||||||
+1
-1
@@ -316,7 +316,7 @@ BootPromptWindow::_PopulateLanguages()
|
|||||||
|
|
||||||
BMessage installedCatalogs;
|
BMessage installedCatalogs;
|
||||||
BLocaleRoster::Default()->GetAvailableCatalogs(&installedCatalogs,
|
BLocaleRoster::Default()->GetAvailableCatalogs(&installedCatalogs,
|
||||||
"x-vnd.Haiku-ReadOnlyBootPrompt");
|
"x-vnd.Haiku-FirstBootPrompt");
|
||||||
|
|
||||||
BFont font;
|
BFont font;
|
||||||
fLanguagesListView->GetFont(&font);
|
fLanguagesListView->GetFont(&font);
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
SubDir HAIKU_TOP src apps readonlybootprompt ;
|
SubDir HAIKU_TOP src apps firstbootprompt ;
|
||||||
|
|
||||||
UsePrivateHeaders interface locale shared ;
|
UsePrivateHeaders interface locale shared ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences keymap ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences keymap ] ;
|
||||||
|
|
||||||
Application ReadOnlyBootPrompt :
|
Application FirstBootPrompt :
|
||||||
BootPrompt.cpp
|
BootPrompt.cpp
|
||||||
BootPromptWindow.cpp
|
BootPromptWindow.cpp
|
||||||
Keymap.cpp
|
Keymap.cpp
|
||||||
@@ -13,8 +13,8 @@ Application ReadOnlyBootPrompt :
|
|||||||
: BootPrompt.rdef
|
: BootPrompt.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
DoCatalogs ReadOnlyBootPrompt :
|
DoCatalogs FirstBootPrompt :
|
||||||
x-vnd.Haiku-ReadOnlyBootPrompt
|
x-vnd.Haiku-FirstBootPrompt
|
||||||
:
|
:
|
||||||
BootPrompt.cpp
|
BootPrompt.cpp
|
||||||
BootPromptWindow.cpp
|
BootPromptWindow.cpp
|
||||||
@@ -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;
|
|
||||||
@@ -30,7 +30,7 @@ local sources =
|
|||||||
TimeFormat.cpp
|
TimeFormat.cpp
|
||||||
TimeUnitFormat.cpp
|
TimeUnitFormat.cpp
|
||||||
Format.cpp # Used by some of the above.
|
Format.cpp # Used by some of the above.
|
||||||
UnicodeChar.cpp # Already used in ReadOnlyBootPrompt.
|
UnicodeChar.cpp # Already used in FirstBootPrompt.
|
||||||
|
|
||||||
# old, needs investigation
|
# old, needs investigation
|
||||||
# Currency.cpp
|
# Currency.cpp
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ country_code_for_language(const BLanguage& language)
|
|||||||
return language.CountryCode();
|
return language.CountryCode();
|
||||||
|
|
||||||
// TODO: implement for real! For now, we just map some well known
|
// 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])) {
|
switch ((tolower(language.Code()[0]) << 8) | tolower(language.Code()[1])) {
|
||||||
case 'be': // Belarus
|
case 'be': // Belarus
|
||||||
return "BY";
|
return "BY";
|
||||||
|
|||||||
Reference in New Issue
Block a user