anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #5001: Tab order not preserved when starting lyx.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29533 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-05-04 19:20:20 +00:00
parent ee2bad7dc7
commit bcf361f389
1 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/frontends/qt4/GuiView.cpp
View File

@ -526,58 +526,68 @@ void GuiView::closeEvent(QCloseEvent * close_event)
// e.g. when clicking the close button on a background window. // e.g. when clicking the close button on a background window.
setFocus(); setFocus();
while (Buffer * b = buffer()) { int splitter_count = d.splitter_->count();
if (b->parent()) { for (; splitter_count > 0; --splitter_count) {
// This is a child document, just close the tab TabWorkArea * twa = d.tabWorkArea(0);
// after saving but keep the file loaded.
if (!closeBuffer(*b, true)) { int twa_count = twa->count();
for (; twa_count > 0; --twa_count) {
twa->setCurrentIndex(0);
GuiWorkArea * wa = twa->currentWorkArea();
Buffer * b = &wa->bufferView().buffer();
if (b->parent()) {
// This is a child document, just close the tab
// after saving but keep the file loaded.
if (!closeBuffer(*b, true)) {
closing_ = false;
close_event->ignore();
return;
}
continue;
}
vector<Buffer *> clist = b->getChildren();
for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
if ((*it)->isClean())
continue;
Buffer * c = *it;
// If a child is dirty, do not close
// without user intervention
if (!closeBuffer(*c, false)) {
closing_ = false;
close_event->ignore();
return;
}
}
QList<int> const ids = guiApp->viewIds();
for (int i = 0; i != ids.size(); ++i) {
if (id_ == ids[i])
continue;
if (guiApp->view(ids[i]).workArea(*b)) {
// FIXME 1: should we put an alert box here that the buffer
// is viewed elsewhere?
// FIXME 2: should we try to save this buffer in any case?
//saveBuffer(b);
// This buffer is also opened in another view, so
// close the associated work area...
removeWorkArea(d.current_work_area_);
// ... but don't close the buffer.
b = 0;
break;
}
}
if (b && !closeBuffer(*b, true)) {
closing_ = false; closing_ = false;
close_event->ignore(); close_event->ignore();
return; return;
} }
continue;
}
vector<Buffer *> clist = b->getChildren();
for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
if ((*it)->isClean())
continue;
Buffer * c = *it;
// If a child is dirty, do not close
// without user intervention
if (!closeBuffer(*c, false)) {
closing_ = false;
close_event->ignore();
return;
}
}
QList<int> const ids = guiApp->viewIds();
for (int i = 0; i != ids.size(); ++i) {
if (id_ == ids[i])
continue;
if (guiApp->view(ids[i]).workArea(*b)) {
// FIXME 1: should we put an alert box here that the buffer
// is viewed elsewhere?
// FIXME 2: should we try to save this buffer in any case?
//saveBuffer(b);
// This buffer is also opened in another view, so
// close the associated work area...
removeWorkArea(d.current_work_area_);
// ... but don't close the buffer.
b = 0;
break;
}
}
if (b && !closeBuffer(*b, true)) {
closing_ = false;
close_event->ignore();
return;
} }
} }
// Make sure that nothing will use this close to be closed View. // Make sure that nothing will use this close to be closed View.
guiApp->unregisterView(this); guiApp->unregisterView(this);