convert graphics for .tex export, fixes bug 1231

[lyx.git] / src / insets / insetbox.C

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 0b224108d10ca0c46b966af7a788405300e919f3..4f8124fff5579fdd78c07bd616787fb684de7ebc 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -14,7 +14,7 @@
 
 #include "insetbox.h"
 
-#include "BufferView.h"
+#include "cursor.h"
 #include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
@@ -139,11 +139,11 @@ void InsetBox::setButtonLabel()
        BoxType btype = boxtranslator().find(params_.type);
        if (btype == Frameless) {
                if (params_.use_parbox)
-                       setLabel(_("Parbox"));
+                       setLabel(_("Box") + " (" + _("Parbox") + ")");
                else
-                       setLabel(_("Minipage"));
+                       setLabel(_("Box") + " (" + _("Minipage") + ")");
        } else
-               setLabel(boxtranslator_loc().find(btype));
+               setLabel(_("Box") + " (" + boxtranslator_loc().find(btype) + ")");
 
        font.setColor(LColor::foreground);
        setBackgroundColor(LColor::background);
@@ -154,7 +154,7 @@ void InsetBox::setButtonLabel()
 void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 {
        MetricsInfo mi = m;
-       mi.base.textwidth = params_.width.inPixels(m.base.textwidth); 
+       mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
        InsetCollapsable::metrics(mi, dim);
        //if (params_.inner_box && isOpen())
        //      dim.wid = mi.base.textwidth;
@@ -169,38 +169,32 @@ bool InsetBox::showInsetDialog(BufferView * bv) const
 }
 
 
-DispatchResult
-InsetBox::priv_dispatch(FuncRequest const & cmd,
-                       idx_type & idx, pos_type & pos)
+void InsetBox::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       DispatchResult result(false);
-       BufferView * bv = cmd.view();
-
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
                lyxerr << "InsetBox::dispatch MODIFY" << endl;
                InsetBoxMailer::string2params(cmd.argument, params_);
                setButtonLabel();
-               result.dispatched(true);
-               result.update(true);
-               return result;
+               break;
        }
 
        case LFUN_INSET_DIALOG_UPDATE:
-               InsetBoxMailer(*this).updateDialog(bv);
-               result.dispatched(true);
-               return result;
+               InsetBoxMailer(*this).updateDialog(&cur.bv());
+               break;
 
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
-                       InsetBoxMailer(*this).showDialog(bv);
-                       return DispatchResult(true);
+                       InsetBoxMailer(*this).showDialog(&cur.bv());
+                       break;
                }
-               return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+               InsetCollapsable::priv_dispatch(cur, cmd);
+               break;
 
        default:
-               return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+               InsetCollapsable::priv_dispatch(cur, cmd);
+               break;
        }
 }
 
@@ -302,7 +296,7 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
                i += 1;
        }
 
-       i += inset.latex(buf, os, runparams);
+       i += InsetText::latex(buf, os, runparams);
 
        if (params_.inner_box) {
                if (params_.use_parbox)
@@ -337,14 +331,14 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 int InsetBox::linuxdoc(Buffer const & buf, std::ostream & os,
                       OutputParams const & runparams) const
 {
-       return inset.linuxdoc(buf, os, runparams);
+       return InsetText::linuxdoc(buf, os, runparams);
 }
 
 
 int InsetBox::docbook(Buffer const & buf, std::ostream & os,
                      OutputParams const & runparams) const
 {
-       return inset.docbook(buf, os, runparams);
+       return InsetText::docbook(buf, os, runparams);
 }
 
 
@@ -362,7 +356,7 @@ int InsetBox::plaintext(Buffer const & buf, std::ostream & os,
                case Doublebox: os << "[["; break;
        }
 
-       int i = inset.plaintext(buf, os, runparams);
+       int i = InsetText::plaintext(buf, os, runparams);
 
        switch (btype) {
                case Frameless: break;
@@ -392,14 +386,13 @@ void InsetBox::validate(LaTeXFeatures & features) const
                features.require("fancybox");
                break;
        }
-       inset.validate(features);
+       InsetText::validate(features);
 }
 
 
 InsetBoxMailer::InsetBoxMailer(InsetBox & inset)
        : inset_(inset)
-{
-}
+{}
 
 
 string const InsetBoxMailer::name_ = "box";