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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32625 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 62e991d340b03f234495e6c1dee313bca7cb9fc0..8923da5abe8f19e62f597cf5376f0a62e3c4153f 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -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));
 }