fix completion painting for RTL (inline completion and completion list)

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

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index d1e14c819fe975cb9c5acc462722786e792d2bbc..2d9ec85655efd60093913a431712bba26ee87954 100644 (file)
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -20,17 +20,19 @@
 #include "BufferView.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "support/gettext.h"
 #include "Paragraph.h"
 #include "TexRow.h"
 
+#include "support/lassert.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
+#include <QSettings>
 #include <QTextCursor>
 #include <QTextDocument>
-#include <boost/tuple/tuple.hpp>
+#include <QVariant>
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
@@ -40,7 +42,6 @@ ViewSourceWidget::ViewSourceWidget(GuiViewSource & controller)
                highlighter_(new LaTeXHighlighter(document_))
 {
        setupUi(this);
-       setWindowTitle(qt_("LaTeX Source"));
 
        connect(viewFullSourceCB, SIGNAL(clicked()),
                this, SLOT(updateView()));
@@ -69,31 +70,31 @@ ViewSourceWidget::ViewSourceWidget(GuiViewSource & controller)
 
 void ViewSourceWidget::updateView()
 {
-       if (autoUpdateCB->isChecked())
-               update(viewFullSourceCB->isChecked());
+       BufferView * view = controller_.bufferview();
+       if (!view) {
+               document_->setPlainText(QString());
+               setEnabled(false);
+               return;
+       }
+       document_->setPlainText(controller_.getContent(
+               viewFullSourceCB->isChecked()));
 
-       int beg, end;
-       boost::tie(beg, end) = controller_.getRows();
+       GuiViewSource::Row row = controller_.getRows();
        QTextCursor c = QTextCursor(viewSourceTV->document());
-       c.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, beg);
+       c.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, row.begin);
        c.select(QTextCursor::BlockUnderCursor);
-       c.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor, end - beg + 1);
+       c.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor,
+               row.end - row.begin + 1);
        viewSourceTV->setTextCursor(c);
 }
 
 
-void ViewSourceWidget::update(bool full_source)
-{
-       document_->setPlainText(controller_.getContent(full_source));
-}
-
-
-GuiViewSource::GuiViewSource(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags)
-       : DockView(parent, "view-source", area, flags)
+GuiViewSource::GuiViewSource(GuiView & parent,
+               Qt::DockWidgetArea area, Qt::WindowFlags flags)
+       : DockView(parent, "view-source", qt_("LaTeX Source"), area, flags)
 {
        widget_ = new ViewSourceWidget(*this);
        setWidget(widget_);
-       setWindowTitle(widget_->windowTitle());
 }
 
 
@@ -105,7 +106,17 @@ GuiViewSource::~GuiViewSource()
 
 void GuiViewSource::updateView()
 {
-       widget_->updateView();
+       if (widget_->autoUpdateCB->isChecked())
+               widget_->updateView();
+}
+
+
+void GuiViewSource::enableView(bool enable)
+{
+       if (!enable)
+               // In the opposite case, updateView() will be called anyway.
+               widget_->updateView();
+       widget_->setEnabled(enable);
 }
 
 
@@ -132,14 +143,14 @@ QString GuiViewSource::getContent(bool fullSource)
                par_end = view->cursor().selectionEnd().bottom().pit();
        }
        if (par_begin > par_end)
-               std::swap(par_begin, par_end);
+               swap(par_begin, par_end);
        odocstringstream ostr;
        view->buffer().getSourceCode(ostr, par_begin, par_end + 1, fullSource);
        return toqstr(ostr.str());
 }
 
 
-std::pair<int, int> GuiViewSource::getRows() const
+GuiViewSource::Row GuiViewSource::getRows() const
 {
        BufferView const * view = bufferview();
        CursorSlice beg = view->cursor().selectionBegin().bottom();
@@ -151,7 +162,10 @@ std::pair<int, int> GuiViewSource::getRows() const
                getRowFromIdPos(end.paragraph().id(), end.pos());
        int nextendrow = view->buffer().texrow().
                getRowFromIdPos(end.paragraph().id(), end.pos() + 1);
-       return std::make_pair(begrow, endrow == nextendrow ? endrow : (nextendrow - 1));
+       Row row;
+       row.begin = begrow;
+       row.end = endrow == nextendrow ? endrow : (nextendrow - 1);
+       return row;
 }
 
 
@@ -165,14 +179,36 @@ QString GuiViewSource::title() const
                case LITERATE:
                        return qt_("Literate Source");
        }
-       BOOST_ASSERT(false);
+       LASSERT(false, /**/);
        return QString();
 }
 
 
+void GuiViewSource::saveSession() const
+{
+       Dialog::saveSession();
+       QSettings settings;
+       settings.setValue(
+               sessionKey() + "/fullsource", widget_->viewFullSourceCB->isChecked());
+       settings.setValue(
+               sessionKey() + "/autoupdate", widget_->autoUpdateCB->isChecked());
+}
+
+
+void GuiViewSource::restoreSession()
+{
+       Dialog::restoreSession();
+       QSettings settings;
+       widget_->viewFullSourceCB->setChecked(
+               settings.value(sessionKey() + "/fullsource", false).toBool());
+       widget_->autoUpdateCB->setChecked(
+               settings.value(sessionKey() + "/autoupdate", true).toBool());
+}
+
+
 Dialog * createGuiViewSource(GuiView & lv)
 {
-       return new GuiViewSource(static_cast<GuiView &>(lv));
+       return new GuiViewSource(lv);
 }