anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-28 06:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorder a bit status messages, but they are still cleared at the end of LyXFunc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32625 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2009-12-23 16:02:40 +00:00
parent 0b5fe5494b
commit aee4e7ba34
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2451,6 +2451,8 @@ void GuiView::checkExternallyModifiedBuffers()
void GuiView::dispatchVC(FuncRequest const & cmd)
{
// message for statusbar
string msg;
Buffer * buffer = documentBufferView()
? &(documentBufferView()->buffer()) : 0;
@ -2468,7 +2470,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
message(from_utf8(buffer->lyxvc().checkIn()));
msg = buffer->lyxvc().checkIn();
reloadBuffer();
}
break;
@ -2477,7 +2479,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse()) {
message(from_utf8(buffer->lyxvc().checkOut()));
msg = buffer->lyxvc().checkOut();
reloadBuffer();
}
break;
@ -2492,7 +2494,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
frontend::Alert::error(_("Revision control error."),
_("Error when setting the locking property."));
} else {
message(from_utf8(res));
msg = res;
reloadBuffer();
}
}
@ -2513,8 +2515,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
case LFUN_VC_REPO_UPDATE:
LASSERT(buffer, return);
if (ensureBufferClean(buffer)) {
string res = buffer->lyxvc().repoUpdate();
message(from_utf8(res));
msg = buffer->lyxvc().repoUpdate();
checkExternallyModifiedBuffers();
}
break;
@ -2563,6 +2564,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
default:
break;
}
if (!msg.empty())
message(from_utf8(msg));
}