i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted variable names for the "Find {Previous,Next}" menu items.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32387 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-08-14 19:22:01 +00:00
parent d76009fdce
commit 4aa87c0410
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermWindow.cpp
+15 -15
View File
@@ -147,8 +147,8 @@ TermWindow::TermWindow(BRect frame, const char* title, Arguments *args)
fFindPanel(NULL), fFindPanel(NULL),
fSavedFrame(0, 0, -1, -1), fSavedFrame(0, 0, -1, -1),
fFindString(""), fFindString(""),
fFindForwardMenuItem(NULL), fFindNextMenuItem(NULL),
fFindBackwardMenuItem(NULL), fFindPreviousMenuItem(NULL),
fFindSelection(false), fFindSelection(false),
fForwardSearch(false), fForwardSearch(false),
fMatchCase(false), fMatchCase(false),
@@ -289,14 +289,14 @@ TermWindow::_SetupMenu()
fEditmenu->AddSeparatorItem(); fEditmenu->AddSeparatorItem();
fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS, fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS,
new BMessage(MENU_FIND_STRING),'F')); 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); new BMessage(MENU_FIND_PREVIOUS), 'G', B_SHIFT_KEY);
fEditmenu->AddItem(fFindBackwardMenuItem); fEditmenu->AddItem(fFindPreviousMenuItem);
fFindBackwardMenuItem->SetEnabled(false); fFindPreviousMenuItem->SetEnabled(false);
fFindForwardMenuItem = new BMenuItem("Find Next", fFindNextMenuItem = new BMenuItem("Find Next",
new BMessage(MENU_FIND_NEXT), 'G'); new BMessage(MENU_FIND_NEXT), 'G');
fEditmenu->AddItem(fFindForwardMenuItem); fEditmenu->AddItem(fFindNextMenuItem);
fFindForwardMenuItem->SetEnabled(false); fFindNextMenuItem->SetEnabled(false);
fMenubar->AddItem(fEditmenu); fMenubar->AddItem(fEditmenu);
@@ -427,8 +427,8 @@ TermWindow::MessageReceived(BMessage *message)
BAlert *alert = new BAlert("find failed", "No search string.", "Okay", NULL, BAlert *alert = new BAlert("find failed", "No search string.", "Okay", NULL,
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->Go(); alert->Go();
fFindBackwardMenuItem->SetEnabled(false); fFindPreviousMenuItem->SetEnabled(false);
fFindForwardMenuItem->SetEnabled(false); fFindNextMenuItem->SetEnabled(false);
break; break;
} }
@@ -441,14 +441,14 @@ TermWindow::MessageReceived(BMessage *message)
BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL, BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->Go(); alert->Go();
fFindBackwardMenuItem->SetEnabled(false); fFindPreviousMenuItem->SetEnabled(false);
fFindForwardMenuItem->SetEnabled(false); fFindNextMenuItem->SetEnabled(false);
break; break;
} }
// Enable the menu items Find Forward and Find Backward // Enable the menu items Find Next and Find Previous
fFindBackwardMenuItem->SetEnabled(true); fFindPreviousMenuItem->SetEnabled(true);
fFindForwardMenuItem->SetEnabled(true); fFindNextMenuItem->SetEnabled(true);
break; break;
case MENU_FIND_NEXT: case MENU_FIND_NEXT:
src/apps/terminal/TermWindow.h
+4 -4
View File
@@ -1,7 +1,7 @@
/* /*
* Copyright 2001-2007, Haiku. * Copyright 2001-2007, Haiku.
* Copyright (c) 2003-4 Kian Duffy <[email protected]> * Copyright (c) 2003-4 Kian Duffy <[email protected]>
* 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 * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files or portions * a copy of this software and associated documentation files or portions
@@ -86,7 +86,7 @@ private:
BString fInitialTitle; BString fInitialTitle;
BList fSessions; BList fSessions;
TabView *fTabView; TabView *fTabView;
TermView *fTermView; TermView *fTermView;
@@ -106,8 +106,8 @@ private:
// Saved search parameters // Saved search parameters
BString fFindString; BString fFindString;
BMenuItem *fFindForwardMenuItem; BMenuItem *fFindNextMenuItem;
BMenuItem *fFindBackwardMenuItem; BMenuItem *fFindPreviousMenuItem;
BMenuItem *fIncreaseFontSizeMenuItem; BMenuItem *fIncreaseFontSizeMenuItem;
BMenuItem *fDecreaseFontSizeMenuItem; BMenuItem *fDecreaseFontSizeMenuItem;