remove indirection from LyXView::viewStatusMessage().

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

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index ca6ae54f609e7b7ee68c9806b1a1970a71c62584..ef568b57e5471275cc567ac07110bcb026abd7d6 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -946,12 +946,7 @@ docstring LyXFunc::viewStatusMessage()
        if (keyseq.length() > 0 && !keyseq.deleted())
                return keyseq.printOptions(true);
 
-       LyXView * lv = theApp()->currentWindow();
-       LASSERT(lv, /**/);
-       if (!lv->currentBufferView())
-               return _("Welcome to LyX!");
-
-       return lv->currentBufferView()->cursor().currentState();
+       return docstring();
 }
 
 

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 78416da3cec5799eaa8e69e726473ace292d55b9..01968506bcf286a61a957b542191ecb938593134 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -652,7 +652,7 @@ void GuiView::clearMessage()
 {
        if (!hasFocus())
                return;
-       statusBar()->showMessage(toqstr(theLyXFunc().viewStatusMessage()));
+       showMessage();
        d.statusbar_timer_.stop();
 }
 
@@ -729,7 +729,21 @@ void GuiView::updateStatusBar()
        if (d.statusbar_timer_.isActive())
                return;
 
-       statusBar()->showMessage(toqstr(theLyXFunc().viewStatusMessage()));
+       showMessage();
+}
+
+
+void GuiView::showMessage()
+{
+       QString msg = toqstr(theLyXFunc().viewStatusMessage());
+       if (msg.isEmpty()) {
+               BufferView const * bv = currentBufferView();
+               if (bv)
+                       msg = toqstr(bv->cursor().currentState());
+               else
+                       msg = qt_("Welcome to LyX!");
+       }
+       statusBar()->showMessage(msg);
 }
 
 

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index b4fa5bc297f67466e0216a53b89439fc62974f37..c3e6dd039db013eeed659e047c5165f879409bc6 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -334,6 +334,8 @@ private:
        void reloadBuffer();
        ///
        void dispatchVC(FuncRequest const & cmd);
+       ///
+       void showMessage();
 
        /// This view ID.
        int id_;