Restore the version number position on the splash screen

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 78e2dc659af7434dff8ec0833f51c53ac8a35129..4b288ba7f5f306ed78b89503496f98c510a52fb5 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -145,7 +145,7 @@ Buffer * BufferView::buffer() const
 
 void BufferView::setBuffer(Buffer * b)
 {
-       lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+       LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
                            << "[ b = " << b << "]" << endl;
 
        if (buffer_) {
@@ -181,7 +181,7 @@ void BufferView::setBuffer(Buffer * b)
        // If we are closing current buffer, switch to the first in
        // buffer list.
        if (!b) {
-               lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+               LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
                                    << " No Buffer!" << endl;
                // We are closing the buffer, use the first buffer as current
                buffer_ = theBufferList().first();
@@ -196,7 +196,7 @@ void BufferView::setBuffer(Buffer * b)
        offset_ref_ = 0;
 
        if (buffer_) {
-               lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+               LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
                                    << "Buffer addr: " << buffer_ << endl;
                cursor_.push(buffer_->inset());
                cursor_.resetAnchor();
@@ -297,7 +297,7 @@ void BufferView::resize()
        if (!buffer_)
                return;
 
-       lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << endl;
+       LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << endl;
 
        updateMetrics(false);
        switchKeyMap();
@@ -338,22 +338,18 @@ bool BufferView::update(Update::flags flags)
        // causes screen update(), I reset last_inset_ to avoid such a problem.
        last_inset_ = 0;
        // This is close to a hot-path.
-       if (lyxerr.debugging(Debug::DEBUG)) {
-               lyxerr[Debug::DEBUG]
-                       << BOOST_CURRENT_FUNCTION
-                       << "[fitcursor = " << (flags & Update::FitCursor)
-                       << ", forceupdate = " << (flags & Update::Force)
-                       << ", singlepar = " << (flags & Update::SinglePar)
-                       << "]  buffer: " << buffer_ << endl;
-       }
+       LYXERR(Debug::DEBUG)
+               << BOOST_CURRENT_FUNCTION
+               << "[fitcursor = " << (flags & Update::FitCursor)
+               << ", forceupdate = " << (flags & Update::Force)
+               << ", singlepar = " << (flags & Update::SinglePar)
+               << "]  buffer: " << buffer_ << endl;
 
        // Check needed to survive LyX startup
        if (!buffer_)
                return false;
 
-       if (lyxerr.debugging(Debug::WORKAREA)) {
-               lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
-       }
+       LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
 
        // Update macro store
        buffer_->buildMacros();
@@ -409,7 +405,7 @@ bool BufferView::update(Update::flags flags)
 void BufferView::updateScrollbar()
 {
        if (!buffer_) {
-               lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+               LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
                                     << " no text in updateScrollbar" << endl;
                scrollbarParameters_.reset();
                return;
@@ -424,13 +420,11 @@ void BufferView::updateScrollbar()
                offset_ref_ = 0;
        }
 
-       if (lyxerr.debugging(Debug::GUI)) {
-               lyxerr[Debug::GUI]
-                       << BOOST_CURRENT_FUNCTION
-                       << " Updating scrollbar: height: " << t.paragraphs().size()
-                       << " curr par: " << cursor_.bottom().pit()
-                       << " default height " << defaultRowHeight() << endl;
-       }
+       LYXERR(Debug::GUI)
+               << BOOST_CURRENT_FUNCTION
+               << " Updating scrollbar: height: " << t.paragraphs().size()
+               << " curr par: " << cursor_.bottom().pit()
+               << " default height " << defaultRowHeight() << endl;
 
        // It would be better to fix the scrollbar to understand
        // values in [0..1] and divide everything by wh
@@ -479,7 +473,7 @@ ScrollbarParameters const & BufferView::scrollbarParameters() const
 
 void BufferView::scrollDocView(int value)
 {
-       lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
+       LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
                           << "[ value = " << value << "]" << endl;
 
        if (!buffer_)
@@ -551,16 +545,16 @@ Change const BufferView::getCurrentChange() const
 }
 
 
-void BufferView::saveBookmark(bool persistent)
+void BufferView::saveBookmark(unsigned int idx)
 {
        LyX::ref().session().bookmarks().save(
                FileName(buffer_->fileName()),
                cursor_.pit(),
                cursor_.paragraph().id(),
                cursor_.pos(),
-               persistent
+               idx
        );
-       if (persistent)
+       if (idx)
                // emit message signal.
                message(_("Save bookmark"));
 }
@@ -716,7 +710,7 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
        //       << [ cmd = " << cmd << "]" << endl;
 
        // Make sure that the cached BufferView is correct.
-       lyxerr[Debug::ACTION] << BOOST_CURRENT_FUNCTION
+       LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION
                << " action[" << cmd.action << ']'
                << " arg[" << to_utf8(cmd.argument()) << ']'
                << " x[" << cmd.x << ']'
@@ -786,7 +780,7 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
                        if (inset) {
                                label = inset->getParam("reference");
                                // persistent=false: use temp_bookmark
-                               saveBookmark(false);
+                               saveBookmark(0);
                        }
                }
 
@@ -801,11 +795,11 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
                for (Buffer * b = buffer_; i == 0 || b != buffer_; b = theBufferList().next(b)) {
                        ParIterator par = b->getParFromID(id);
                        if (par == b->par_iterator_end()) {
-                               lyxerr[Debug::INFO]
+                               LYXERR(Debug::INFO)
                                        << "No matching paragraph found! ["
                                        << id << "]." << endl;
                        } else {
-                               lyxerr[Debug::INFO]
+                               LYXERR(Debug::INFO)
                                        << "Paragraph " << par->id()
                                        << " found in buffer `"
                                        << b->fileName() << "'." << endl;
@@ -1084,7 +1078,7 @@ InsetBase const * BufferView::getCoveringInset(LyXText const & text, int x, int
        BOOST_ASSERT(pit != -1);
        Paragraph const & par = text.getPar(pit);
 
-       lyxerr[Debug::DEBUG]
+       LYXERR(Debug::DEBUG)
                << BOOST_CURRENT_FUNCTION
                << ": x: " << x
                << " y: " << y
@@ -1113,13 +1107,13 @@ InsetBase const * BufferView::getCoveringInset(LyXText const & text, int x, int
                                }
                        }
 
-                       lyxerr[Debug::DEBUG]
+                       LYXERR(Debug::DEBUG)
                                << BOOST_CURRENT_FUNCTION
                                << ": Hit inset: " << inset << endl;
                        return inset;
                }
        }
-       lyxerr[Debug::DEBUG]
+       LYXERR(Debug::DEBUG)
                << BOOST_CURRENT_FUNCTION
                << ": No inset hit. " << endl;
        return 0;
@@ -1519,7 +1513,7 @@ void BufferView::updateMetrics(bool singlepar)
                pit2 = cursor_.bottom().pit();
        }
 
-       lyxerr[Debug::DEBUG]
+       LYXERR(Debug::DEBUG)
                << BOOST_CURRENT_FUNCTION
                << " y1: " << y1
                << " y2: " << y2
@@ -1534,7 +1528,7 @@ void BufferView::updateMetrics(bool singlepar)
                singlepar? SingleParUpdate: FullScreenUpdate, size);
 
        if (lyxerr.debugging(Debug::WORKAREA)) {
-               lyxerr[Debug::WORKAREA] << "BufferView::updateMetrics" << endl;
+               LYXERR(Debug::WORKAREA) << "BufferView::updateMetrics" << endl;
                coord_cache_.dump();
        }
 }
@@ -1561,7 +1555,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
                FileDialog fileDlg(_("Select LyX document to insert"),
                        LFUN_FILE_INSERT,
                        make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
-                       make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support(), "examples"))));
+                       make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support().absFilename(), "examples"))));
 
                FileDialog::Result result =
                        fileDlg.open(from_utf8(initpath),