From 2db5c7580ca967a5f65615854a3f126982a94a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sun, 5 Apr 2009 13:08:42 +0000 Subject: [PATCH] Spotted a few left-over occurences of the previous names: TrackerGrep and Tracker Grep. Simplified the About window: Version is no longer essential. Its simply part of Haiku now. The name is more self-explanatory now, so there is no need to explain the purpose of the application in the About window. Removed the mention of myself as the maintainer, as its maintained collectively by Haiku now. Moved myself into the list of contributors, after Oliver Tappe, which I think is chronologically correct. If the primary copyright holder was Haiku and not Matthijs Hollemans, it would have been appropriate to use Haikus BAboutWindow, but alas. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29932 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/text_search/GrepWindow.cpp | 33 ++++++----------------------- src/apps/text_search/TextSearch.cpp | 2 +- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp index 1c5d5f901b..74eb2ee14d 100644 --- a/src/apps/text_search/GrepWindow.cpp +++ b/src/apps/text_search/GrepWindow.cpp @@ -1438,7 +1438,7 @@ GrepWindow::_OnSelectInTracker() if (!_AreAllFoldersOpenInTracker(&folderList)) { BAlert* alert = new BAlert(NULL, - _T("Tracker Grep couldn't open one or more folders, and it's very " + _T(APP_NAME " couldn't open one or more folders, and it's very " "sorry about it."), _T("Forgive and forget!"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); @@ -1469,37 +1469,16 @@ GrepWindow::_OnQuitNow() void GrepWindow::_OnAboutRequested() { - app_info appInfo; - version_info vInfo; - BFile appFile; - BAppFileInfo appFileInfo; - BString fAppVersion; - - if (be_app->Lock()) { - be_app->GetAppInfo(&appInfo); - appFile.SetTo(&appInfo.ref, B_READ_ONLY); - appFileInfo.SetTo(&appFile); - if (appFileInfo.GetVersionInfo(&vInfo, B_APP_VERSION_KIND) == B_OK) - fAppVersion = BString("") << vInfo.major << '.' << vInfo.middle; - be_app->Unlock(); - } - BString text; - text << APP_NAME << " " << fAppVersion << "\n"; + text << APP_NAME << " " << "\n\n"; int32 titleLength = text.Length(); - text << _T("Get a grip on grep.") << "\n\n"; - text << _T(APP_NAME " lets you search the contents of your files.") << " "; - text << _T("It is primarily intended for use with text files.") << "\n\n"; - text << _T("Created by Matthijs Hollemans") << "\n"; - text << "mahlzeit@users.sf.net" << "\n\n"; - text << _T("Maintained by Jonas Sundström") << "\n"; - text << "jonas@kirilla.com" << "\n\n"; - text << _T("Contributed to by: "); + text << _T("Created by Matthijs Hollemans.") << "\n\n"; + text << _T("Contributed to by "); text << _T("Peter Hinely, Serge Fantino, Hideki Naito, Oscar Lesta, " - "Oliver Tappe, Luc Schrijvers and momoziro."); + "Oliver Tappe, Jonas Sundström, Luc Schrijvers and momoziro."); text << "\n"; - BAlert* alert = new BAlert("Tracker Grep", text.String(), _T("Ok"), NULL, + BAlert* alert = new BAlert("TextSearch", text.String(), _T("Ok"), NULL, NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT); BTextView* view = alert->TextView(); diff --git a/src/apps/text_search/TextSearch.cpp b/src/apps/text_search/TextSearch.cpp index f22c36cdf9..c1356ae377 100644 --- a/src/apps/text_search/TextSearch.cpp +++ b/src/apps/text_search/TextSearch.cpp @@ -51,7 +51,7 @@ process_refs(entry_ref dirRef, BMessage *message, void* /*reserved*/) // array contains the entry_refs of the selected files. The last // argument, "reserved", is currently unused. - // This version of TrackerGrep is a Tracker add-on, but primarily + // This version of TextSearch is a Tracker add-on, but primarily // it is a stand-alone application. The add-on launches the app // on the set of files you had selected in Tracker. That way you // get the benefits of the Tracker add-on with the benefits of the