Two separators collapse into one

[lyx.git] / src / frontends / qt4 / GuiWorkArea.cpp

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 75afebfd02e1e69750cba20c497cb0d37331631f..aa5e285da733a6e6bdb76727f5a08368e6b44d57 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -47,7 +47,6 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
-#include "support/FileName.h"
 #include "support/lassert.h"
 #include "support/TempFile.h"
 
@@ -247,11 +246,12 @@ SyntheticMouseEvent::SyntheticMouseEvent()
 
 
 GuiWorkArea::Private::Private(GuiWorkArea * parent)
-: p(parent), screen_(0), buffer_view_(0), read_only_(false), lyx_view_(0),
-cursor_visible_(false), cursor_(0),
-need_resize_(false), schedule_redraw_(false), preedit_lines_(1),
-pixel_ratio_(1.0),
-completer_(new GuiCompleter(p, p)), dialog_mode_(false)
+: p(parent), screen_(0), buffer_view_(0), lyx_view_(0),
+  cursor_visible_(false), cursor_(0),
+  need_resize_(false), schedule_redraw_(false), preedit_lines_(1),
+  pixel_ratio_(1.0),
+  completer_(new GuiCompleter(p, p)), dialog_mode_(false),
+  read_only_(false), clean_(true)
 {
 }
 
@@ -392,6 +392,7 @@ void GuiWorkArea::setBuffer(Buffer & buffer)
        if (buffer.text().paragraphs().size() > 4)
                setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
        QTimer::singleShot(50, this, SLOT(fixVerticalScrollBar()));
+       Q_EMIT bufferViewChanged();
 }
 
 
@@ -1251,7 +1252,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
                stopBlinkingCursor();
 
        // last_width : for checking if last preedit string was/wasn't empty.
-       // FIXME THREAD
+       // FIXME THREAD && FIXME
        // We could have more than one work area, right?
        static bool last_width = false;
        if (!last_width && preedit_string.empty()) {
@@ -1263,6 +1264,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
        GuiPainter pain(d->screen_, pixelRatio());
        d->buffer_view_->updateMetrics();
        d->buffer_view_->draw(pain);
+       // FIXME: shall we use real_current_font here? (see #10478)
        FontInfo font = d->buffer_view_->cursor().getFont().fontInfo();
        FontMetrics const & fm = theFontMetrics(font);
        int height = fm.maxHeight();
@@ -1387,33 +1389,14 @@ QVariant GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const
 
 void GuiWorkArea::updateWindowTitle()
 {
-       docstring maximize_title;
-       docstring minimize_title;
-
-       Buffer const & buf = d->buffer_view_->buffer();
-       FileName const file_name = buf.fileName();
-       if (!file_name.empty()) {
-               maximize_title = file_name.displayName(130);
-               minimize_title = from_utf8(file_name.onlyFileName());
-               if (buf.lyxvc().inUse()) {
-                       if (buf.lyxvc().locking())
-                               maximize_title +=  _(" (version control, locking)");
-                       else
-                               maximize_title +=  _(" (version control)");
-               }
-               if (!buf.isClean()) {
-                       maximize_title += _(" (changed)");
-                       minimize_title += char_type('*');
-               }
-               if (buf.isReadonly())
-                       maximize_title += _(" (read only)");
-       }
-
-       QString const new_title = toqstr(maximize_title);
-       if (new_title != windowTitle()) {
-               QWidget::setWindowTitle(new_title);
-               QWidget::setWindowIconText(toqstr(minimize_title));
-               titleChanged(this);
+       Buffer const & buf = bufferView().buffer();
+       if (buf.fileName() != d->file_name_ || buf.isReadonly() != d->read_only_
+           || buf.lyxvc().vcstatus() != d->vc_status_ || buf.isClean() != d->clean_) {
+               d->file_name_ = buf.fileName();
+               d->read_only_ = buf.isReadonly();
+               d->vc_status_ = buf.lyxvc().vcstatus();
+               d->clean_ = buf.isClean();
+               Q_EMIT titleChanged(this);
        }
 }