fixed close click save does not save bug
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4241 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -773,17 +773,15 @@ StyledEditWindow::QuitRequested()
|
|||||||
saveAlert->SetShortcut(1,'d');
|
saveAlert->SetShortcut(1,'d');
|
||||||
saveAlert->SetShortcut(2,'s');
|
saveAlert->SetShortcut(2,'s');
|
||||||
buttonIndex= saveAlert->Go();
|
buttonIndex= saveAlert->Go();
|
||||||
|
|
||||||
if (buttonIndex==0) { //"cancel": dont save, dont close the window
|
if (buttonIndex==0) { //"cancel": dont save, dont close the window
|
||||||
return false;
|
return false;
|
||||||
} else if(buttonIndex==1) { // "don't save": just close the window
|
} else if(buttonIndex==1) { // "don't save": just close the window
|
||||||
return true;
|
return true;
|
||||||
} else if(!fSaveMessage) { //save as
|
} else if(!fSaveMessage) { //save as
|
||||||
DispatchMessage(new BMessage(MENU_SAVEAS), this);
|
return SaveAs();
|
||||||
return false;
|
} else {
|
||||||
} else {
|
return (Save(fSaveMessage) == B_OK);
|
||||||
DispatchMessage(new BMessage(B_SAVE_REQUESTED), this);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}/***QuitRequested()***/
|
}/***QuitRequested()***/
|
||||||
@@ -791,7 +789,7 @@ StyledEditWindow::QuitRequested()
|
|||||||
status_t
|
status_t
|
||||||
StyledEditWindow::Save(BMessage *message)
|
StyledEditWindow::Save(BMessage *message)
|
||||||
{
|
{
|
||||||
status_t err;
|
status_t err = B_OK;
|
||||||
|
|
||||||
if(!message){
|
if(!message){
|
||||||
message=fSaveMessage;
|
message=fSaveMessage;
|
||||||
@@ -855,12 +853,12 @@ StyledEditWindow::Save(BMessage *message)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// clear clean modes
|
// clear clean modes
|
||||||
fSaveItem->SetEnabled(false);
|
fSaveItem->SetEnabled(false);
|
||||||
fRevertItem->SetEnabled(false);
|
fRevertItem->SetEnabled(false);
|
||||||
fUndoCleans = false;
|
fUndoCleans = false;
|
||||||
fRedoCleans = false;
|
fRedoCleans = false;
|
||||||
fClean = true;
|
fClean = true;
|
||||||
return err;
|
return err;
|
||||||
} /***Save()***/
|
} /***Save()***/
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
@@ -914,6 +912,7 @@ StyledEditWindow::SaveAs()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fSavePanel->Show();
|
fSavePanel->Show();
|
||||||
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
Reference in New Issue
Block a user