hrev51179 adds 1 changeset to branch 'master'
old head: ebd5f1ef6b0e868b6431ce7c78ce198eaa9f09f7
new head: 7ce3cbfbe8464ba87b000ca9b8b688d0ddfd2b55
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=7ce3cbfbe846+%5Eebd5f1ef6b0e
----------------------------------------------------------------------------
7ce3cbfbe846: "fail-safe video mode" is confusing.
The same wording was used for two unrelated things: using the VESA
driver, and forcing a specific resolution. Relabel the menu items to
make it clear that they are not related.
fixes #8887
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
[ Rahul Jain <talentediq@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51179
Commit: 7ce3cbfbe8464ba87b000ca9b8b688d0ddfd2b55
URL: http://cgit.haiku-os.org/haiku/commit/?id=7ce3cbfbe846
Author: Rahul Jain <talentediq@xxxxxxxxx>
Date: Thu May 25 08:47:02 2017 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Thu May 25 09:46:02 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/8887
----------------------------------------------------------------------------
3 files changed, 6 insertions(+), 6 deletions(-)
src/system/boot/platform/amiga_m68k/menu.cpp | 4 ++--
src/system/boot/platform/atari_m68k/menu.cpp | 4 ++--
src/system/boot/platform/bios_ia32/menu.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/amiga_m68k/menu.cpp
b/src/system/boot/platform/amiga_m68k/menu.cpp
index ec82229..67690bd 100644
--- a/src/system/boot/platform/amiga_m68k/menu.cpp
+++ b/src/system/boot/platform/amiga_m68k/menu.cpp
@@ -19,11 +19,11 @@ platform_add_menus(Menu *menu)
switch (menu->Type()) {
case MAIN_MENU:
- menu->AddItem(item = new(nothrow) MenuItem("Select
fail-safe video mode", video_mode_menu()));
+ menu->AddItem(item = new(nothrow) MenuItem("Select
screen resolution", video_mode_menu()));
item->SetTarget(video_mode_hook);
break;
case SAFE_MODE_MENU:
- menu->AddItem(item = new(nothrow) MenuItem("Use
fail-safe video mode"));
+ menu->AddItem(item = new(nothrow) MenuItem("Use
fail-safe graphics driver"));
item->SetType(MENU_ITEM_MARKABLE);
item->SetData(B_SAFEMODE_FAIL_SAFE_VIDEO_MODE);
item->SetHelpText("The system will use VESA mode and
won't try to open any video graphics driver");
diff --git a/src/system/boot/platform/atari_m68k/menu.cpp
b/src/system/boot/platform/atari_m68k/menu.cpp
index 57a448b..b32d5d4 100644
--- a/src/system/boot/platform/atari_m68k/menu.cpp
+++ b/src/system/boot/platform/atari_m68k/menu.cpp
@@ -20,11 +20,11 @@ platform_add_menus(Menu *menu)
switch (menu->Type()) {
case MAIN_MENU:
- menu->AddItem(item = new(nothrow) MenuItem("Select
fail-safe video mode", video_mode_menu()));
+ menu->AddItem(item = new(nothrow) MenuItem("Select
screen resolution", video_mode_menu()));
item->SetTarget(video_mode_hook);
break;
case SAFE_MODE_MENU:
- menu->AddItem(item = new(nothrow) MenuItem("Use
fail-safe video mode"));
+ menu->AddItem(item = new(nothrow) MenuItem("Use
fail-safe graphics driver"));
item->SetType(MENU_ITEM_MARKABLE);
item->SetData(B_SAFEMODE_FAIL_SAFE_VIDEO_MODE);
item->SetHelpText("The system will use VESA mode and
won't try to open any video graphics driver");
diff --git a/src/system/boot/platform/bios_ia32/menu.cpp
b/src/system/boot/platform/bios_ia32/menu.cpp
index 6d59614..42d8e75 100644
--- a/src/system/boot/platform/bios_ia32/menu.cpp
+++ b/src/system/boot/platform/bios_ia32/menu.cpp
@@ -41,7 +41,7 @@ platform_add_menus(Menu* menu)
switch (menu->Type()) {
case MAIN_MENU:
- item = new(std::nothrow) MenuItem("Select fail-safe
video mode",
+ item = new(std::nothrow) MenuItem("Select screen
resolution",
video_mode_menu());
if (item != NULL) {
menu->AddItem(item);
@@ -53,7 +53,7 @@ platform_add_menus(Menu* menu)
break;
case SAFE_MODE_MENU:
- item = new(std::nothrow) MenuItem("Use fail-safe video
mode");
+ item = new(std::nothrow) MenuItem("Use fail-safe
graphics driver");
if (item != NULL) {
menu->AddItem(item);
item->SetType(MENU_ITEM_MARKABLE);
