Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slight tweak to located file handling.

Browse Source 
- When the user helps locate a missing source file, verify that the
source and located file names match. If they don't, prompt the user to
verify that they did in fact intend to choose the file in question.
Helps avoid accidentally clicking the wrong file when performing
location.
This commit is contained in:
Rene Gollent 2013-06-21 18:50:47 -04:00
parent 143fdaf7cf
commit 21d8063591
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
View File

@ -349,7 +349,9 @@ TeamWindow::MessageReceived(BMessage* message)
case B_REFS_RECEIVED:
{
entry_ref locatedPath;
message->FindRef("refs", &locatedPath);
if (message->FindRef("refs", &locatedPath) != B_OK)
break;
_HandleResolveMissingSourceFile(locatedPath);
break;
}
@ -1438,11 +1440,30 @@ TeamWindow::_HandleResolveMissingSourceFile(entry_ref& locatedPath)
->SourceFile();
if (sourceFile != NULL) {
BString sourcePath;
BString targetPath;
sourceFile->GetPath(sourcePath);
BPath path(&locatedPath);
targetPath = path.Path();
fListener->SourceEntryLocateRequested(sourcePath, targetPath);
BPath sourceFilePath(sourcePath);
BPath targetFilePath(&locatedPath);
if (sourceFilePath.InitCheck() != B_OK
|| targetFilePath.InitCheck() != B_OK) {
return;
}
if (strcmp(sourceFilePath.Leaf(), targetFilePath.Leaf()) != 0) {
BString message;
message.SetToFormat("The names of source file '%s' and located"
" file '%s' differ. Use file anyway?",
sourceFilePath.Leaf(), targetFilePath.Leaf());
BAlert* alert = new(std::nothrow) BAlert(
"Source path mismatch", message.String(), "Cancel", "Use");
if (alert == NULL)
return;
int32 choice = alert->Go();
if (choice <= 0)
return;
}
fListener->SourceEntryLocateRequested(sourcePath,
targetFilePath.Path());
fListener->FunctionSourceCodeRequested(fActiveFunction);
}
}