#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "frontends/Painter.h"
-#include "lyxrc.h"
-#include "frontends/font_metrics.h"
#include "debug.h"
+#include "format.h"
+#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "lyxlex.h"
+#include "lyxrc.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
+#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
-
-#include "frontends/controllers/helper_funcs.h" // getVectorFromString
+#include "frontends/Painter.h"
#include "support/LAssert.h"
#include "support/filetools.h"
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode\n";
if (contains(suffix, "ps") || suffix == "pdf")
return "pdf";
- else if (suffix == "jpg") // pdflatex can use jpeg
+ if (suffix == "jpg") // pdflatex can use jpeg
return suffix;
- else
- return "png"; // and also png
+ return "png"; // and also png
}
// If it's postscript, we always do eps.
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode\n";
- if (suffix != "ps") // any other than ps
- return "eps"; // is changed to eps
- else
- return suffix; // let ps untouched
+ if (suffix != "ps") // any other than ps
+ return "eps"; // is changed to eps
+ return suffix; // let ps untouched
}
} // namespace anon
}
+Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const
+{
+ return new InsetGraphics(*this, buffer.filePath(), same_id);
+}
+
+
InsetGraphics::~InsetGraphics()
{
- // Emits the hide signal to the dialog connected (if any)
- hideDialog();
+ InsetGraphicsMailer mailer(*this);
+ mailer.hideDialog();
}
-string const InsetGraphics::statusMessage() const
+dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
{
- string msg;
+ dispatch_result result = UNDISPATCHED;
+
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY: {
+ InsetGraphicsParams p;
+ InsetGraphicsMailer::string2params(cmd.argument, p);
+ if (p.filename.empty())
+ break;
+
+ string const filepath = cmd.view()->buffer()->filePath();
+ setParams(p, filepath);
+ cmd.view()->updateInset(this);
+ result = DISPATCHED;
+ }
+ break;
- switch (cache_->loader.status()) {
- case grfx::WaitingToLoad:
- msg = _("Not shown.");
- break;
- case grfx::Loading:
- msg = _("Loading...");
- break;
- case grfx::Converting:
- msg = _("Converting to loadable format...");
- break;
- case grfx::Loaded:
- msg = _("Loaded into memory. Must now generate pixmap.");
- break;
- case grfx::ScalingEtc:
- msg = _("Scaling etc...");
- break;
- case grfx::Ready:
- msg = _("Ready to display");
- break;
- case grfx::ErrorNoFile:
- msg = _("No file found!");
- break;
- case grfx::ErrorConverting:
- msg = _("Error converting to loadable format");
- break;
- case grfx::ErrorLoading:
- msg = _("Error loading file into memory");
- break;
- case grfx::ErrorGeneratingPixmap:
- msg = _("Error generating the pixmap");
+ case LFUN_INSET_DIALOG_UPDATE: {
+ InsetGraphicsMailer mailer(*this);
+ mailer.updateDialog(cmd.view());
+ }
+ break;
+
+ case LFUN_MOUSE_RELEASE:
+ edit(cmd.view(), cmd.x, cmd.y, cmd.button());
break;
- case grfx::ErrorUnknown:
- msg = _("No image");
+
+ default:
+ result = DISPATCHED;
break;
}
- return msg;
+ return result;
+}
+
+
+string const InsetGraphics::statusMessage() const
+{
+ using namespace grfx;
+
+ switch (cache_->loader.status()) {
+ case WaitingToLoad:
+ return _("Not shown.");
+ case Loading:
+ return _("Loading...");
+ case Converting:
+ return _("Converting to loadable format...");
+ case Loaded:
+ return _("Loaded into memory. Must now generate pixmap.");
+ case ScalingEtc:
+ return _("Scaling etc...");
+ case Ready:
+ return _("Ready to display");
+ case ErrorNoFile:
+ return _("No file found!");
+ case ErrorConverting:
+ return _("Error converting to loadable format");
+ case ErrorLoading:
+ return _("Error loading file into memory");
+ case ErrorGeneratingPixmap:
+ return _("Error generating the pixmap");
+ case ErrorUnknown:
+ return _("No image");
+ }
+ return string();
}
{
if (imageIsDrawable())
return cache_->loader.image()->getWidth() + 2 * TEXT_TO_INSET_OFFSET;
- else {
- int font_width = 0;
- LyXFont msgFont(font);
- msgFont.setFamily(LyXFont::SANS_FAMILY);
+ int font_width = 0;
- string const justname = OnlyFilename (params().filename);
- if (!justname.empty()) {
- msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
- font_width = font_metrics::width(justname, msgFont);
- }
+ LyXFont msgFont(font);
+ msgFont.setFamily(LyXFont::SANS_FAMILY);
- string const msg = statusMessage();
- if (!msg.empty()) {
- msgFont.setSize(LyXFont::SIZE_TINY);
- int const msg_width = font_metrics::width(msg, msgFont);
- font_width = std::max(font_width, msg_width);
- }
+ string const justname = OnlyFilename (params().filename);
+ if (!justname.empty()) {
+ msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
+ font_width = font_metrics::width(justname, msgFont);
+ }
- return std::max(50, font_width + 15);
+ string const msg = statusMessage();
+ if (!msg.empty()) {
+ msgFont.setSize(LyXFont::SIZE_TINY);
+ int const msg_width = font_metrics::width(msg, msgFont);
+ font_width = std::max(font_width, msg_width);
}
+
+ return std::max(50, font_width + 15);
+}
+
+
+BufferView * InsetGraphics::view() const
+{
+ return cache_->view.lock().get();
}
void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
- int baseline, float & x, bool) const
+ int baseline, float & x) const
{
// MakeAbsPath returns params().filename unchanged if it absolute
// already.
// This is not a nice thing to do and should be fixed properly somehow.
// But I still don't know the best way to go. So let's do this like this
// for now (Jug 20020311)
- if (lascent != oasc) {
+ if (lascent != oasc)
return;
- }
// Make sure now that x is updated upon exit from this routine
int old_x = int(x);
grfx::Params const & gparams = params().as_grfxParams();
- if (gparams.display != grfx::NoDisplay
- && cache_->loader.status() == grfx::WaitingToLoad)
+ if (gparams.display != grfx::NoDisplay &&
+ cache_->loader.status() == grfx::WaitingToLoad)
cache_->loader.startLoading();
if (!cache_->loader.monitoring())
paint.text(old_x + TEXT_TO_INSET_OFFSET + 6, baseline - 4, msg, msgFont);
}
}
-
- // the status message may mean we changed size, so indicate
- // we need a row redraw
-#if 0
- if (old_status_ != grfx::ErrorUnknown && old_status_ != cached_status_) {
- bv->getLyXText()->status(bv, LyXText::CHANGED_IN_DRAW);
- }
-#endif
-
- // Reset the cache, ready for the next draw request
-#if 0
- cached_status_ = grfx::ErrorUnknown;
- cached_image_.reset();
- cache_filled_ = false;
-#endif
}
-void InsetGraphics::edit(BufferView *bv, int, int, mouse_button::state)
+void InsetGraphics::edit(BufferView * bv, int, int, mouse_button::state)
{
- bv->owner()->getDialogs().showGraphics(this);
+ InsetGraphicsMailer mailer(*this);
+ mailer.showDialog(bv);
}
// temp_file will contain the file for LaTeX to act on if, for example,
// we move it to a temp dir or uncompress it.
- string temp_file(orig_file);
+ string temp_file = orig_file;
if (zipped) {
// Uncompress the file if necessary.
// No conversion is needed. LaTeX can handle the
// graphic file as is.
// This is true even if the orig_file is compressed.
- if (formats.getFormat(to)->extension() == GetExtension(orig_file)) {
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
return RemoveExtension(orig_file_with_path);
- } else {
- return orig_file_with_path;
- }
- }
+ return orig_file_with_path;
+ }
// We're going to be running the exported buffer through the LaTeX
// compiler, so must ensure that LaTeX can cope with the graphics
if (from == to) {
// No conversion is needed. LaTeX can handle the
// graphic file as is.
- if (formats.getFormat(to)->extension() == GetExtension(orig_file))
+ if (formats.getFormat(to)->extension() == GetExtension(orig_file))
return RemoveExtension(temp_file);
- else
- return temp_file;
+ return temp_file;
}
}
-
+
string const outfile_base = RemoveExtension(temp_file);
lyxerr[Debug::GRAPHICS]
<< "\tThe original file is " << orig_file << "\n"
}
-int InsetGraphics::latex(Buffer const *buf, ostream & os,
+int InsetGraphics::latex(Buffer const * buf, ostream & os,
bool /*fragile*/, bool/*fs*/) const
{
// If there is no file specified or not existing,
// A missing (e)ps-extension is no problem for LaTeX, so
// we have to test three different cases
- string const file_(MakeAbsPath(params().filename, buf->filePath()));
+ string const file_ = MakeAbsPath(params().filename, buf->filePath());
bool const file_exists =
!file_.empty() &&
(IsFileReadable(file_) || // original
os << latex_str;
// Return how many newlines we issued.
- int const newlines =
- int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
-
- return newlines;
+ return int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
}
{
// If we have no image, we should not require anything.
if (params().filename.empty())
- return ;
+ return;
features.includeFile(graphic_label, RemoveExtension(params().filename));
void InsetGraphics::statusChanged()
{
- if (cache_->view.get())
- cache_->view.get()->updateInset(this, false);
+ if (!cache_->view.expired())
+ cache_->view.lock()->updateInset(this);
}
string const & filepath)
{
// If nothing is changed, just return and say so.
- if (params() == p && !p.filename.empty()) {
+ if (params() == p && !p.filename.empty())
return false;
- }
// Copy the new parameters.
params_ = p;
}
-Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const
+string const InsetGraphicsMailer::name_("graphics");
+
+InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
+ : inset_(inset)
+{}
+
+
+string const InsetGraphicsMailer::inset2string() const
{
- return new InsetGraphics(*this, buffer.filePath(), same_id);
+ return params2string(inset_.params());
+}
+
+
+void InsetGraphicsMailer::string2params(string const & in,
+ InsetGraphicsParams & params)
+{
+ params = InsetGraphicsParams();
+
+ istringstream data(in);
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
+
+ if (lex.isOK()) {
+ InsetGraphics inset;
+ inset.readInsetGraphics(lex);
+ params = inset.params();
+ }
+}
+
+
+string const
+InsetGraphicsMailer::params2string(InsetGraphicsParams const & params)
+{
+ ostringstream data;
+ data << name_ << ' ';
+ params.Write(data);
+ data << "\\end_inset\n";
+
+ return data.str();
}
projects / lyx.git / blobdiff