diff --git a/src/apps/stylededit/StyledEditView.cpp b/src/apps/stylededit/StyledEditView.cpp index b4e685425b..41c1c31e9e 100644 --- a/src/apps/stylededit/StyledEditView.cpp +++ b/src/apps/stylededit/StyledEditView.cpp @@ -60,8 +60,13 @@ StyledEditView::GetStyledText(BPositionIO * stream) { status_t result = B_OK; fSuppressChanges = true; + result = BTranslationUtils::GetStyledText(stream, this, NULL); - + if (result != B_OK) { + fSuppressChanges = false; + return result; + } + BNode * node = dynamic_cast(stream); if (node != 0) { ssize_t bytesRead; @@ -71,6 +76,7 @@ StyledEditView::GetStyledText(BPositionIO * stream) if (bytesRead > 0) { CharacterSetRoster * roster = CharacterSetRoster::Roster(&result); if (result != B_OK) { + fSuppressChanges = false; return result; } if (encoding == 65535) { diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index 0678148ebc..132baf9763 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -910,7 +910,22 @@ StyledEditWindow::OpenFile(entry_ref *ref) result = fTextView->GetStyledText(&file); //he he he :) if (result != B_OK) { - // TODO: notify user? + BEntry entry(ref, true); + char name[B_FILE_NAME_LENGTH]; + entry.GetName(name); + BAlert *loadFailedAlert; + BString alertText; + if (result == B_TRANSLATION_ERROR_BASE) { + alertText.SetTo("Translation error loading \""); + } else { + alertText.SetTo("Unknown error loading \""); + } + alertText<< name; + alertText<<"\"."; + loadFailedAlert= new BAlert("loadFailedAlert",alertText.String(), "Bummer", 0, 0, + B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_STOP_ALERT); + loadFailedAlert->Go(); + return; } // update alignment