Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index a779ae22681bd8e7ee75e2dee1c8db3db6d6771d..3f6a8158eae68b4ba69ad454f8d98147ccdc6ba7 100644 (file)
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -12,33 +12,34 @@
 
 #include <config.h>
 
+#include "GuiApplication.h"
 #include "GuiViewSource.h"
 #include "LaTeXHighlighter.h"
 #include "qt_helpers.h"
 
-#include "Application.h"
 #include "BufferView.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "gettext.h"
 #include "Paragraph.h"
 #include "TexRow.h"
 
+#include "support/assert.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
+
 #include <QTextCursor>
 #include <QTextDocument>
-#include <boost/tuple/tuple.hpp>
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiViewSourceDialog::GuiViewSourceDialog(ControlViewSource & controller)
+ViewSourceWidget::ViewSourceWidget(GuiViewSource & controller)
        :       controller_(controller), document_(new QTextDocument(this)),
                highlighter_(new LaTeXHighlighter(document_))
 {
        setupUi(this);
-       setWindowTitle(qt_("LaTeX Source"));
 
        connect(viewFullSourceCB, SIGNAL(clicked()),
                this, SLOT(updateView()));
@@ -49,13 +50,13 @@ GuiViewSourceDialog::GuiViewSourceDialog(ControlViewSource & controller)
 
        // setting a document at this point trigger an assertion in Qt
        // so we disable the signals here:
-       document()->blockSignals(true);
-       viewSourceTV->setDocument(document());
-       document()->blockSignals(false);
+       document_->blockSignals(true);
+       viewSourceTV->setDocument(document_);
+       document_->blockSignals(false);
        viewSourceTV->setReadOnly(true);
        ///dialog_->viewSourceTV->setAcceptRichText(false);
        // this is personal. I think source code should be in fixed-size font
-       QFont font(toqstr(theApp()->typewriterFontName()));
+       QFont font(guiApp->typewriterFontName());
        font.setKerning(false);
        font.setFixedPitch(true);
        font.setStyleHint(QFont::TypeWriter);
@@ -65,40 +66,56 @@ GuiViewSourceDialog::GuiViewSourceDialog(ControlViewSource & controller)
 }
 
 
-void GuiViewSourceDialog::updateView()
+void ViewSourceWidget::updateView()
 {
        if (autoUpdateCB->isChecked())
                update(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);
-       QWidget::update();
 }
 
 
-void GuiViewSourceDialog::update(bool full_source)
+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", qt_("LaTeX Source"), area, flags)
 {
-       document_->setPlainText(toqstr(controller_.updateContent(full_source)));
+       widget_ = new ViewSourceWidget(*this);
+       setWidget(widget_);
 }
 
 
-ControlViewSource::ControlViewSource(Dialog & parent)
-       : Controller(parent)
-{}
+GuiViewSource::~GuiViewSource()
+{
+       delete widget_;
+}
+
+
+void GuiViewSource::updateView()
+{
+       widget_->updateView();
+}
 
 
-bool ControlViewSource::initialiseParams(string const & /*source*/)
+bool GuiViewSource::initialiseParams(string const & /*source*/)
 {
+       setWindowTitle(title());
        return true;
 }
 
 
-docstring const ControlViewSource::updateContent(bool fullSource)
+QString GuiViewSource::getContent(bool fullSource)
 {
        // get the *top* level paragraphs that contain the cursor,
        // or the selected text
@@ -114,14 +131,14 @@ docstring const ControlViewSource::updateContent(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 ostr.str();
+       return toqstr(ostr.str());
 }
 
 
-std::pair<int, int> ControlViewSource::getRows() const
+GuiViewSource::Row GuiViewSource::getRows() const
 {
        BufferView const * view = bufferview();
        CursorSlice beg = view->cursor().selectionBegin().bottom();
@@ -133,29 +150,31 @@ std::pair<int, int> ControlViewSource::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;
 }
 
 
-docstring const ControlViewSource::title() const
+QString GuiViewSource::title() const
 {
        switch (docType()) {
                case LATEX:
-                       return _("LaTeX Source");
+                       return qt_("LaTeX Source");
                case DOCBOOK:
-                       return _("DocBook Source");
+                       return qt_("DocBook Source");
                case LITERATE:
-                       return _("Literate Source");
-               default:
-                       BOOST_ASSERT(false);
-                       return docstring();
+                       return qt_("Literate Source");
        }
+       LASSERT(false, /**/);
+       return QString();
 }
 
 
-Dialog * createGuiViewSource(LyXView & lv)
+Dialog * createGuiViewSource(GuiView & lv)
 {
-       return new GuiViewSource(static_cast<GuiViewBase &>(lv));
+       return new GuiViewSource(lv);
 }