enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / LyXView.C

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index f531278ee2e50f3e5abfee32c7b87848dbf1f8cc..0eeaacee0381cc4d5f2de6a1ea446a8c58aae38b 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include "LyXView.h"
-#include "Gui.h"
 #include "Dialogs.h"
 #include "Timeout.h"
 #include "Toolbars.h"
@@ -50,9 +49,9 @@
 # include <unistd.h>
 #endif
 
-using lyx::frontend::Gui;
 using lyx::frontend::WorkArea;
 
+using lyx::docstring;
 using lyx::support::bformat;
 using lyx::support::makeDisplayPath;
 using lyx::support::onlyFilename;
@@ -64,25 +63,23 @@ using lyx::frontend::ControlCommandBuffer;
 
 string current_layout;
 
-Gui & LyXView::gui()
-{
-       return owner_;
-}
 
-
-LyXView::LyXView(Gui & owner)
+LyXView::LyXView()
        : work_area_(0),
-         owner_(owner),
          toolbars_(new Toolbars(*this)),
-         intl_(new Intl),
          autosave_timeout_(new Timeout(5000)),
-         lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
          controlcommand_(new ControlCommandBuffer(*this))
 {
-       lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
+       // Start autosave timer
+       if (lyxrc.autosave) {
+               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
+               autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
+               autosave_timeout_->start();
+       }
 }
 
+
 LyXView::~LyXView()
 {
 }
@@ -107,22 +104,6 @@ WorkArea * LyXView::workArea()
 }
 
 
-void LyXView::init()
-{
-       updateLayoutChoice();
-       updateMenubar();
-
-       // Start autosave timer
-       if (lyxrc.autosave) {
-               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
-               autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
-               autosave_timeout_->start();
-       }
-
-       intl_->initKeyMapper(lyxrc.use_kbmap);
-}
-
-
 Buffer * LyXView::buffer() const
 {
        return work_area_->bufferView().buffer();
@@ -139,19 +120,17 @@ void LyXView::setBuffer(Buffer * b)
 
        work_area_->bufferView().setBuffer(b);
 
-       updateLayoutChoice();
-
        if (work_area_->bufferView().buffer()) {
                // Buffer-dependent dialogs should be updated or
                // hidden. This should go here because some dialogs (eg ToC)
                // require bv_->text.
                getDialogs().updateBufferDependent(true);
                connectBuffer(*work_area_->bufferView().buffer());
-               setLayout(work_area_->bufferView().firstLayout());
        }
 
        updateMenubar();
        updateToolbars();
+       updateLayoutChoice();
        updateWindowTitle();
        redrawWorkArea();
 }
@@ -170,7 +149,6 @@ bool LyXView::loadLyXFile(string const & filename, bool tolastfiles)
        updateWindowTitle();
        if (loaded) {
                connectBuffer(*work_area_->bufferView().buffer());
-               setLayout(work_area_->bufferView().firstLayout());
                showErrorList("Parse");
        }
        redrawWorkArea();
@@ -221,6 +199,31 @@ void LyXView::disconnectBuffer()
        timerConnection_.disconnect();
        readonlyConnection_.disconnect();
        closingConnection_.disconnect();
+       layout_changed_connection_.disconnect();
+}
+
+
+void LyXView::connectBufferView(BufferView & bv)
+{
+       show_dialog_connection_ = bv.showDialog.connect(
+                       boost::bind(&LyXView::showDialog, this, _1));
+       show_dialog_with_data_connection_ = bv.showDialogWithData.connect(
+                       boost::bind(&LyXView::showDialogWithData, this, _1, _2));
+       show_inset_dialog_connection_ = bv.showInsetDialog.connect(
+                       boost::bind(&LyXView::showInsetDialog, this, _1, _2, _3));
+       update_dialog_connection_ = bv.updateDialog.connect(
+                       boost::bind(&LyXView::updateDialog, this, _1, _2));
+       layout_changed_connection_ = bv.layoutChanged.connect(
+                       boost::bind(&Toolbars::setLayout, toolbars_.get(), _1));
+}
+
+
+void LyXView::disconnectBufferView()
+{
+       show_dialog_connection_.disconnect();
+       show_dialog_with_data_connection_.disconnect();
+       show_inset_dialog_connection_.disconnect();
+       update_dialog_connection_.disconnect();
 }
 
 
@@ -233,6 +236,33 @@ void LyXView::showErrorList(string const & error_type)
 }
 
 
+void LyXView::showDialog(string const & name)
+{
+       getDialogs().show(name);
+}
+
+
+void LyXView::showDialogWithData(string const & name,
+                                                                string const & data)
+{
+       getDialogs().show(name, data);
+}
+
+
+void LyXView::showInsetDialog(string const & name, string const & data,
+                                                         InsetBase * inset)
+{
+       getDialogs().show(name, data, inset);
+}
+
+
+void LyXView::updateDialog(string const & name, string const & data)
+{
+       if (getDialogs().visible(name))
+               getDialogs().update(name, data);
+}
+
+
 void LyXView::showReadonly(bool)
 {
        updateWindowTitle();
@@ -246,12 +276,6 @@ BufferView * LyXView::view() const
 }
 
 
-void LyXView::setLayout(string const & layout)
-{
-       toolbars_->setLayout(layout);
-}
-
-
 void LyXView::updateToolbars()
 {
        bool const math = work_area_->bufferView().cursor().inMathed();
@@ -275,7 +299,7 @@ void LyXView::autoSave()
 {
        lyxerr[Debug::INFO] << "Running autoSave()" << endl;
 
-       if (view()->available()) {
+       if (view()->buffer()) {
                ::autoSave(view());
        }
 }
@@ -316,18 +340,18 @@ void LyXView::updateLayoutChoice()
 
 void LyXView::updateWindowTitle()
 {
-       static string last_title = "LyX";
-       string maximize_title = "LyX";
-       string minimize_title = "LyX";
+       static docstring last_title = lyx::from_ascii("LyX");
+       docstring maximize_title = lyx::from_ascii("LyX");
+       docstring minimize_title = lyx::from_ascii("LyX");
 
-       if (view()->available()) {
+       if (view()->buffer()) {
                string const cur_title = buffer()->fileName();
                if (!cur_title.empty()) {
-                       maximize_title += ": " + makeDisplayPath(cur_title, 30);
-                       minimize_title = onlyFilename(cur_title);
+                       maximize_title += lyx::from_ascii(": ") + makeDisplayPath(cur_title, 30);
+                       minimize_title = lyx::from_utf8(onlyFilename(cur_title));
                        if (!buffer()->isClean()) {
                                maximize_title += _(" (changed)");
-                               minimize_title += '*';
+                               minimize_title += lyx::char_type('*');
                        }
                        if (buffer()->isReadonly())
                                maximize_title += _(" (read only)");