diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index 2e0429a6c0..c781d13130 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -147,8 +147,8 @@ TermWindow::TermWindow(BRect frame, const char* title, Arguments *args) fFindPanel(NULL), fSavedFrame(0, 0, -1, -1), fFindString(""), - fFindForwardMenuItem(NULL), - fFindBackwardMenuItem(NULL), + fFindNextMenuItem(NULL), + fFindPreviousMenuItem(NULL), fFindSelection(false), fForwardSearch(false), fMatchCase(false), @@ -289,14 +289,14 @@ TermWindow::_SetupMenu() fEditmenu->AddSeparatorItem(); fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(MENU_FIND_STRING),'F')); - fFindBackwardMenuItem = new BMenuItem("Find Previous", + fFindPreviousMenuItem = new BMenuItem("Find Previous", new BMessage(MENU_FIND_PREVIOUS), 'G', B_SHIFT_KEY); - fEditmenu->AddItem(fFindBackwardMenuItem); - fFindBackwardMenuItem->SetEnabled(false); - fFindForwardMenuItem = new BMenuItem("Find Next", + fEditmenu->AddItem(fFindPreviousMenuItem); + fFindPreviousMenuItem->SetEnabled(false); + fFindNextMenuItem = new BMenuItem("Find Next", new BMessage(MENU_FIND_NEXT), 'G'); - fEditmenu->AddItem(fFindForwardMenuItem); - fFindForwardMenuItem->SetEnabled(false); + fEditmenu->AddItem(fFindNextMenuItem); + fFindNextMenuItem->SetEnabled(false); fMenubar->AddItem(fEditmenu); @@ -427,8 +427,8 @@ TermWindow::MessageReceived(BMessage *message) BAlert *alert = new BAlert("find failed", "No search string.", "Okay", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(); - fFindBackwardMenuItem->SetEnabled(false); - fFindForwardMenuItem->SetEnabled(false); + fFindPreviousMenuItem->SetEnabled(false); + fFindNextMenuItem->SetEnabled(false); break; } @@ -441,14 +441,14 @@ TermWindow::MessageReceived(BMessage *message) BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(); - fFindBackwardMenuItem->SetEnabled(false); - fFindForwardMenuItem->SetEnabled(false); + fFindPreviousMenuItem->SetEnabled(false); + fFindNextMenuItem->SetEnabled(false); break; } - // Enable the menu items Find Forward and Find Backward - fFindBackwardMenuItem->SetEnabled(true); - fFindForwardMenuItem->SetEnabled(true); + // Enable the menu items Find Next and Find Previous + fFindPreviousMenuItem->SetEnabled(true); + fFindNextMenuItem->SetEnabled(true); break; case MENU_FIND_NEXT: diff --git a/src/apps/terminal/TermWindow.h b/src/apps/terminal/TermWindow.h index 744240f727..72b8703292 100644 --- a/src/apps/terminal/TermWindow.h +++ b/src/apps/terminal/TermWindow.h @@ -1,7 +1,7 @@ /* * Copyright 2001-2007, Haiku. * Copyright (c) 2003-4 Kian Duffy - * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. + * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files or portions @@ -86,7 +86,7 @@ private: BString fInitialTitle; BList fSessions; - + TabView *fTabView; TermView *fTermView; @@ -106,8 +106,8 @@ private: // Saved search parameters BString fFindString; - BMenuItem *fFindForwardMenuItem; - BMenuItem *fFindBackwardMenuItem; + BMenuItem *fFindNextMenuItem; + BMenuItem *fFindPreviousMenuItem; BMenuItem *fIncreaseFontSizeMenuItem; BMenuItem *fDecreaseFontSizeMenuItem;