Add a buffer_path arg to InsetGraphicsMailer's params2string, string2params.

[lyx.git] / src / frontends / controllers / ControlExternal.C

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index 07d5d3e6bb5e17ae2645bd68bfffa0de7b2e4d4c..8874e85487920ac03d6923d454eef6b155feeb01 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -12,82 +12,69 @@
 
 #include <config.h>
 
-
 #include "ControlExternal.h"
 #include "buffer.h"
-#include "BufferView.h"
+#include "funcrequest.h"
 #include "gettext.h"
 #include "helper_funcs.h"
 #include "lyxrc.h"
-#include "support/filetools.h"
 
+#include "insets/ExternalTemplate.h"
+
+#include "support/LAssert.h"
 #include <vector>
 
+using namespace lyx::support;
 using std::vector;
 
 
-ControlExternal::ControlExternal(LyXView & lv, Dialogs & d)
-       : ControlInset<InsetExternal, InsetExternal::Params>(lv, d)
+ControlExternal::ControlExternal(Dialog & parent)
+       : Dialog::Controller(parent)
 {}
 
 
-InsetExternal::Params const ControlExternal::getParams(string const &)
+bool ControlExternal::initialiseParams(string const & data)
 {
-       return InsetExternal::Params();
+       params_.reset(new InsetExternal::Params);
+       InsetExternalMailer::string2params(data, *params_);
+       return true;
 }
 
 
-InsetExternal::Params const
-ControlExternal::getParams(InsetExternal const & inset)
+void ControlExternal::clearParams()
 {
-       return inset.params();
+       params_.reset();
 }
 
 
-void ControlExternal::applyParamsToInset()
+void ControlExternal::dispatchParams()
 {
-       inset()->setFromParams(params());
-       bufferview()->updateInset(inset(), true);
+       string const lfun = InsetExternalMailer::params2string(params());
+       kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
 }
 
 
-void ControlExternal::editExternal()
+void ControlExternal::setParams(InsetExternal::Params const & p)
 {
-       // fill the local, controller's copy of the Params struct with
-       // the contents of the dialog's fields.
-       view().apply();
-
-       // Create a local copy of the inset and initialise it with this
-       // params struct.
-       boost::scoped_ptr<InsetExternal> ie;
-       ie.reset(static_cast<InsetExternal *>(inset()->clone(*buffer())));
-       ie->setFromParams(params());
-
-       ie->editExternal();
+       Assert(params_.get());
+       *params_ = p;
 }
 
 
-void ControlExternal::viewExternal()
+InsetExternal::Params const & ControlExternal::params() const
 {
-       view().apply();
-
-       boost::scoped_ptr<InsetExternal> ie;
-       ie.reset(static_cast<InsetExternal *>(inset()->clone(*buffer())));
-       ie->setFromParams(params());
-
-       ie->viewExternal();
+       Assert(params_.get());
+       return *params_;
 }
 
 
-void ControlExternal::updateExternal()
+void ControlExternal::editExternal()
 {
-       view().apply();
+       Assert(params_.get());
 
-       boost::scoped_ptr<InsetExternal> ie;
-       ie.reset(static_cast<InsetExternal *>(inset()->clone(*buffer())));
-       ie->setFromParams(params());
-
-       ie->updateExternal();
+       dialog().view().apply();
+       string const lfun = InsetExternalMailer::params2string(params());
+       kernel().dispatch(FuncRequest(LFUN_EXTERNAL_EDIT, lfun));
 }
 
 
@@ -127,23 +114,37 @@ ExternalTemplate ControlExternal::getTemplate(int i) const
        ExternalTemplateManager::Templates::const_iterator i1
                = ExternalTemplateManager::get().getTemplates().begin();
 
-       std::advance(i1,  i);
+       std::advance(i1, i);
 
        return i1->second;
 }
 
 
+namespace {
+
+ExternalTemplate const * getTemplatePtr(InsetExternal::Params const & params)
+{
+       ExternalTemplateManager & etm = ExternalTemplateManager::get();
+       ExternalTemplate const & templ = etm.getTemplateByName(params.templatename);
+       if (templ.lyxName.empty())
+               return 0;
+       return &templ;
+}
+
+} // namespace anon
+
+
 string const ControlExternal::Browse(string const & input) const
 {
        string const title =  _("Select external file");
 
-       string const bufpath = buffer()->filePath();
+       string const bufpath = kernel().buffer()->filePath();
 
        /// Determine the template file extension
-       ExternalTemplate const & et = params().templ;
-       string pattern = et.fileRegExp;
-       if (pattern.empty())
-               pattern = "*";
+       string pattern = "*";
+       ExternalTemplate const * const et_ptr = getTemplatePtr(params());
+       if (et_ptr)
+               pattern = et_ptr->fileRegExp;
 
        // FIXME: a temporary hack until the FileDialog interface is updated
        pattern += '|';
@@ -151,5 +152,5 @@ string const ControlExternal::Browse(string const & input) const
        std::pair<string, string> dir1(N_("Documents|#o#O"),
                                  string(lyxrc.document_path));
 
-       return browseRelFile(&lv_, input, bufpath, title, pattern, false, dir1);
+       return browseRelFile(input, bufpath, title, pattern, false, dir1);
 }