Amend f441590c

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

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index fbc2eca088e9c44d125c4fac203ada58d488356c..2bd7c8e5b1825fcbede7f02b1a9b69819c70dd4c 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -132,7 +132,9 @@ namespace frontend {
 
 class CursorWidget {
 public:
-       CursorWidget() {
+       CursorWidget() : rtl_(false), l_shape_(false), completable_(false),
+               show_(false), x_(0), cursor_width_(0)
+       {
                recomputeWidth();
        }
 
@@ -244,10 +246,11 @@ SyntheticMouseEvent::SyntheticMouseEvent()
 
 
 GuiWorkArea::Private::Private(GuiWorkArea * parent)
-: p(parent), screen_(0), buffer_view_(0), lyx_view_(0), cursor_visible_(false),
+: 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))
+completer_(new GuiCompleter(p, p)), dialog_mode_(false)
 {
 }
 
@@ -262,6 +265,7 @@ GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv)
 : d(new Private(this))
 {
        setGuiView(gv);
+       buffer.params().display_pixel_ratio = theGuiApp()->pixelRatio();
        setBuffer(buffer);
        init();
 }
@@ -269,7 +273,7 @@ GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv)
 
 double GuiWorkArea::pixelRatio() const
 {
-#if QT_VERSION > 0x050000
+#if QT_VERSION >= 0x050000
        return devicePixelRatio();
 #else
        return 1.0;
@@ -639,6 +643,12 @@ void GuiWorkArea::Private::showCursor()
                && !completer_->inlineVisible();
        cursor_visible_ = true;
        cursor_->recomputeWidth();
+
+       //int cur_x = buffer_view_->getPos(cur).x_;
+       // We may have decided to slide the cursor row so that cursor
+       // is visible.
+       p.x_ -= buffer_view_->horizScrollOffset();
+
        showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
 }
 
@@ -688,6 +698,7 @@ void GuiWorkArea::scrollTo(int value)
        }
        // Show the cursor immediately after any operation.
        startBlinkingCursor();
+       // FIXME QT5
 #ifdef Q_WS_X11
        QApplication::syncX();
 #endif
@@ -810,7 +821,7 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e)
                return;
        }
 
-#if (QT_VERSION < 0x050000)
+#if (QT_VERSION < 0x050000) && !defined(__HAIKU__)
        inputContext()->reset();
 #endif
 
@@ -1053,7 +1064,7 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
        // do nothing if there are other events
        // (the auto repeated events come too fast)
        // it looks like this is only needed on X11
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) || defined(QPA_XCB)
        if (qApp->hasPendingEvents() && ev->isAutoRepeat()) {
                switch (ev->key()) {
                case Qt::Key_PageDown:
@@ -1552,7 +1563,7 @@ TabWorkArea::TabWorkArea(QWidget * parent)
        closeBufferButton = new QToolButton(this);
        closeBufferButton->setPalette(pal);
        // FIXME: rename the icon to closebuffer.png
-       closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "png")));
+       closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "svgz,png")));
        closeBufferButton->setText("Close File");
        closeBufferButton->setAutoRaise(true);
        closeBufferButton->setCursor(Qt::ArrowCursor);
@@ -1844,7 +1855,7 @@ public:
 
                if (!dotted) {
                        if (dottedPrefix_ && !prefix_.isEmpty())
-                               prefix_ += ".../";
+                               prefix_ += ellipsisSlash_;
                        prefix_ += postfix_.front() + "/";
                }
                dottedPrefix_ = dotted && !prefix_.isEmpty();
@@ -1857,7 +1868,7 @@ public:
                        return filename_;
 
                bool dots = dottedPrefix_ || !postfix_.isEmpty();
-               return prefix_ + (dots ? ".../" : "") + filename_;
+               return prefix_ + (dots ? ellipsisSlash_ : "") + filename_;
        }
        ///
        QString forecastPathString() const
@@ -1866,7 +1877,7 @@ public:
                        return displayString();
 
                return prefix_
-                       + (dottedPrefix_ ? ".../" : "")
+                       + (dottedPrefix_ ? ellipsisSlash_ : "")
                        + postfix_.front() + "/";
        }
        ///
@@ -1875,6 +1886,8 @@ public:
        int tab() const { return tab_; }
 
 private:
+       /// ".../"
+       static QString const ellipsisSlash_;
        ///
        QString prefix_;
        ///
@@ -1890,6 +1903,9 @@ private:
 };
 
 
+QString const DisplayPath::ellipsisSlash_ = QString(QChar(0x2026)) + "/";
+
+
 ///
 bool operator<(DisplayPath const & a, DisplayPath const & b)
 {
@@ -2003,8 +2019,14 @@ void TabWorkArea::updateTabTexts()
                QString tab_text = it->displayString().replace("&", "&&");
                if (!buf.fileName().empty() && !buf.isClean())
                        tab_text += "*";
+               QString tab_tooltip = it->abs();
+               if (buf.isReadonly()) {
+                       setTabIcon(tab_index, QIcon(getPixmap("images/", "emblem-readonly", "svgz,png")));
+                       tab_tooltip = qt_("%1 (read only)").arg(it->abs());
+               } else
+                       setTabIcon(tab_index, QIcon());
                setTabText(tab_index, tab_text);
-               setTabToolTip(tab_index, it->abs());
+               setTabToolTip(tab_index, tab_tooltip);
        }
 }
 
@@ -2018,9 +2040,9 @@ void TabWorkArea::showContextMenu(const QPoint & pos)
 
        // show tab popup
        QMenu popup;
-       popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")),
+       popup.addAction(QIcon(getPixmap("images/", "hidetab", "svgz,png")),
                qt_("Hide tab"), this, SLOT(hideCurrentTab()));
-       popup.addAction(QIcon(getPixmap("images/", "closetab", "png")),
+       popup.addAction(QIcon(getPixmap("images/", "closetab", "svgz,png")),
                qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
        popup.exec(tabBar()->mapToGlobal(pos));