*
* \author John Levon
* \author Angus Leeming
+ * \author Asger Alstrup
*
* Full author contact details are available in file CREDITS.
*/
#include "GuiExternal.h"
-#include "ControlExternal.h"
-#include "lengthcommon.h"
+#include "FuncRequest.h"
+#include "support/gettext.h"
+#include "Length.h"
#include "LyXRC.h"
+#include "insets/ExternalSupport.h"
#include "insets/ExternalTemplate.h"
#include "insets/InsetExternal.h"
-#include "support/lstrings.h"
+#include "graphics/GraphicsCache.h"
+#include "graphics/GraphicsCacheItem.h"
+#include "graphics/GraphicsImage.h"
+
#include "support/convert.h"
-#include "support/os.h"
+#include "support/FileFilterList.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
#include "support/lyxlib.h"
+#include "support/os.h"
#include "LengthCombo.h"
#include "qt_helpers.h"
#include "Validator.h"
-#include <QCloseEvent>
#include <QCheckBox>
#include <QLineEdit>
#include <QPushButton>
#include <QTabWidget>
#include <QTextBrowser>
-namespace external = lyx::external;
+using namespace std;
+using namespace lyx::support;
-using lyx::support::isStrDbl;
-using lyx::support::token;
-using lyx::support::trim;
-using lyx::support::float_equal;
+namespace lyx {
+namespace frontend {
-using lyx::support::os::internal_path;
+using namespace external;
-using std::string;
-using std::vector;
+namespace {
+RotationDataType origins_array[] = {
+ RotationData::DEFAULT,
+ RotationData::TOPLEFT,
+ RotationData::BOTTOMLEFT,
+ RotationData::BASELINELEFT,
+ RotationData::CENTER,
+ RotationData::TOPCENTER,
+ RotationData::BOTTOMCENTER,
+ RotationData::BASELINECENTER,
+ RotationData::TOPRIGHT,
+ RotationData::BOTTOMRIGHT,
+ RotationData::BASELINERIGHT
+};
+
+
+size_type const origins_array_size =
+sizeof(origins_array) / sizeof(origins_array[0]);
+
+vector<external::RotationDataType> const
+all_origins(origins_array, origins_array + origins_array_size);
+
+// These are the strings, corresponding to the above, that the GUI should
+// use. Note that they can/should be translated.
+char const * const origin_gui_strs[] = {
+ N_("Default"),
+ N_("Top left"), N_("Bottom left"), N_("Baseline left"),
+ N_("Center"), N_("Top center"), N_("Bottom center"), N_("Baseline center"),
+ N_("Top right"), N_("Bottom right"), N_("Baseline right")
+};
-namespace lyx {
-namespace frontend {
+} // namespace anon
-GuiExternalDialog::GuiExternalDialog(LyXView & lv)
- : GuiDialog(lv, "external")
+
+GuiExternal::GuiExternal(GuiView & lv)
+ : GuiDialog(lv, "external", qt_("External Material")), bbChanged_(false)
{
setupUi(this);
- setViewTitle(_("External Material"));
- setController(new ControlExternal(*this));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
showCO, SLOT(setEnabled(bool)));
connect(displayCB, SIGNAL(toggled(bool)),
displayscaleED, SLOT(setEnabled(bool)));
- connect(showCO, SIGNAL(activated(const QString&)),
+ connect(showCO, SIGNAL(activated(QString)),
this, SLOT(change_adaptor()));
connect(originCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(browsePB, SIGNAL(clicked()),
this, SLOT(browseClicked()));
+ connect(embedCB, SIGNAL(toggled(bool)),
+ this, SLOT(change_adaptor()));
connect(editPB, SIGNAL(clicked()),
this, SLOT(editClicked()));
- connect(externalCO, SIGNAL(activated(const QString &)),
+ connect(externalCO, SIGNAL(activated(QString)),
this, SLOT(templateChanged()));
- connect(extraED, SIGNAL(textChanged(const QString &)),
- this, SLOT(extraChanged(const QString&)));
- connect(extraFormatCO, SIGNAL(activated(const QString &)),
- this, SLOT(formatChanged(const QString&)));
+ connect(extraED, SIGNAL(textChanged(QString)),
+ this, SLOT(extraChanged(QString)));
+ connect(extraFormatCO, SIGNAL(activated(QString)),
+ this, SLOT(formatChanged(QString)));
connect(widthUnitCO, SIGNAL(activated(int)),
this, SLOT(widthUnitChanged()));
connect(heightUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(change_adaptor()));
connect(displayCB, SIGNAL(stateChanged(int)),
this, SLOT(change_adaptor()));
- connect(displayscaleED, SIGNAL(textChanged(const QString &)),
+ connect(displayscaleED, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
- connect(angleED, SIGNAL(textChanged(const QString &)),
+ connect(angleED, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
- connect(widthED, SIGNAL(textChanged(const QString &)),
+ connect(widthED, SIGNAL(textChanged(QString)),
this, SLOT(sizeChanged()));
- connect(heightED, SIGNAL(textChanged(const QString &)),
+ connect(heightED, SIGNAL(textChanged(QString)),
this, SLOT(sizeChanged()));
- connect(fileED, SIGNAL(textChanged(const QString &)),
+ connect(fileED, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(clipCB, SIGNAL(stateChanged(int)),
this, SLOT(change_adaptor()));
connect(getbbPB, SIGNAL(clicked()), this, SLOT(getbbClicked()));
- connect(xrED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged()));
- connect(ytED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged()));
- connect(xlED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged()));
- connect(ybED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged()));
+ connect(xrED, SIGNAL(textChanged(QString)), this, SLOT(bbChanged()));
+ connect(ytED, SIGNAL(textChanged(QString)), this, SLOT(bbChanged()));
+ connect(xlED, SIGNAL(textChanged(QString)), this, SLOT(bbChanged()));
+ connect(ybED, SIGNAL(textChanged(QString)), this, SLOT(bbChanged()));
connect(draftCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
QIntValidator * validator = new QIntValidator(displayscaleED);
bc().addCheckedLineEdit(ytED, rtLA);
bc().addCheckedLineEdit(fileED, fileLA);
- std::vector<string> templates(controller().getTemplates());
+ vector<string> templates = getTemplates();
- for (std::vector<string>::const_iterator cit = templates.begin();
+ for (vector<string>::const_iterator cit = templates.begin();
cit != templates.end(); ++cit) {
externalCO->addItem(qt_(*cit));
}
// Fill the origins combo
- typedef vector<external::RotationDataType> Origins;
- Origins const & all_origins = external::all_origins();
- for (Origins::size_type i = 0; i != all_origins.size(); ++i)
- originCO->addItem(toqstr(external::origin_gui_str(i)));
+ for (size_t i = 0; i != all_origins.size(); ++i)
+ originCO->addItem(qt_(origin_gui_strs[i]));
// Fill the width combo
widthUnitCO->addItem(qt_("Scale%"));
}
-ControlExternal & GuiExternalDialog::controller() const
-{
- return static_cast<ControlExternal &>(Dialog::controller());
-}
-
-
-bool GuiExternalDialog::activateAspectratio() const
+bool GuiExternal::activateAspectratio() const
{
if (widthUnitCO->currentIndex() == 0)
return false;
}
-void GuiExternalDialog::bbChanged()
+void GuiExternal::bbChanged()
{
- controller().bbChanged(true);
+ bbChanged_ = true;
changed();
}
-void GuiExternalDialog::browseClicked()
+void GuiExternal::browseClicked()
{
int const choice = externalCO->currentIndex();
- docstring const template_name =
- from_utf8(controller().getTemplate(choice).lyxName);
- docstring const str =
- controller().browse(qstring_to_ucs4(fileED->text()),
- template_name);
+ docstring const template_name = from_utf8(getTemplate(choice).lyxName);
+ docstring const str = browse(qstring_to_ucs4(fileED->text()), template_name);
if (!str.empty()) {
fileED->setText(toqstr(str));
changed();
}
-void GuiExternalDialog::change_adaptor()
+void GuiExternal::change_adaptor()
{
changed();
}
-void GuiExternalDialog::closeEvent(QCloseEvent * e)
+void GuiExternal::editClicked()
{
- slotWMHide();
- e->accept();
+ editExternal();
}
-void GuiExternalDialog::editClicked()
-{
- controller().editExternal();
-}
-
-
-void GuiExternalDialog::extraChanged(const QString& text)
+void GuiExternal::extraChanged(const QString& text)
{
- std::string const format = fromqstr(extraFormatCO->currentText());
+ string const format = fromqstr(extraFormatCO->currentText());
extra_[format] = text;
changed();
}
-void GuiExternalDialog::formatChanged(const QString& format)
+void GuiExternal::formatChanged(const QString& format)
{
extraED->setText(extra_[fromqstr(format)]);
}
-void GuiExternalDialog::getbbClicked()
+void GuiExternal::getbbClicked()
{
getBB();
}
-void GuiExternalDialog::sizeChanged()
+void GuiExternal::sizeChanged()
{
aspectratioCB->setEnabled(activateAspectratio());
changed();
}
-void GuiExternalDialog::templateChanged()
+void GuiExternal::templateChanged()
{
updateTemplate();
changed();
}
-void GuiExternalDialog::widthUnitChanged()
+void GuiExternal::widthUnitChanged()
{
bool useHeight = (widthUnitCO->currentIndex() > 0);
}
-
-namespace {
-
-Length::UNIT defaultUnit()
+static Length::UNIT defaultUnit()
{
Length::UNIT default_unit = Length::CM;
switch (lyxrc.default_papersize) {
}
-void setDisplay(QCheckBox & displayCB, QComboBox & showCO, QLineEdit & scaleED,
- external::DisplayType display, unsigned int scale,
- bool read_only)
+static void setDisplay(
+ QCheckBox & displayCB, QComboBox & showCO, QLineEdit & scaleED,
+ external::DisplayType display, unsigned int scale, bool read_only)
{
int item = 0;
switch (display) {
showCO.setEnabled(!no_display && !read_only);
displayCB.setChecked(!no_display);
scaleED.setEnabled(!no_display && !read_only);
- scaleED.setText(toqstr(convert<string>(scale)));
+ scaleED.setText(QString::number(scale));
}
-void getDisplay(external::DisplayType & display,
+static void getDisplay(external::DisplayType & display,
unsigned int & scale,
QCheckBox const & displayCB,
QComboBox const & showCO,
if (!displayCB.isChecked())
display = external::NoDisplay;
- scale = convert<int>(fromqstr(scaleED.text()));
+ scale = scaleED.text().toInt();
}
-void setRotation(QLineEdit & angleED, QComboBox & originCO,
- external::RotationData const & data)
+static void setRotation(QLineEdit & angleED, QComboBox & originCO,
+ external::RotationData const & data)
{
originCO.setCurrentIndex(int(data.origin()));
angleED.setText(toqstr(data.angle));
}
-void getRotation(external::RotationData & data,
- QLineEdit const & angleED, QComboBox const & originCO)
+static void getRotation(external::RotationData & data,
+ QLineEdit const & angleED, QComboBox const & originCO)
{
typedef external::RotationData::OriginType OriginType;
}
-void setSize(QLineEdit & widthED, QComboBox & widthUnitCO,
- QLineEdit & heightED, LengthCombo & heightUnitCO,
- QCheckBox & aspectratioCB,
- external::ResizeData const & data)
+static void setSize(QLineEdit & widthED, QComboBox & widthUnitCO,
+ QLineEdit & heightED, LengthCombo & heightUnitCO,
+ QCheckBox & aspectratioCB,
+ external::ResizeData const & data)
{
bool using_scale = data.usingScale();
- std::string scale = data.scale;
+ string scale = data.scale;
if (data.no_resize()) {
// Everything is zero, so default to this!
using_scale = true;
widthED.setText(toqstr(scale));
widthUnitCO.setCurrentIndex(0);
} else {
- widthED.setText(toqstr(convert<string>(data.width.value())));
+ widthED.setText(QString::number(data.width.value()));
// Because 'Scale' is position 0...
// Note also that width cannot be zero here, so
// we don't need to worry about the default unit.
}
-void getSize(external::ResizeData & data,
- QLineEdit const & widthED, QComboBox const & widthUnitCO,
- QLineEdit const & heightED, LengthCombo const & heightUnitCO,
- QCheckBox const & aspectratioCB)
+static void getSize(external::ResizeData & data,
+ QLineEdit const & widthED, QComboBox const & widthUnitCO,
+ QLineEdit const & heightED, LengthCombo const & heightUnitCO,
+ QCheckBox const & aspectratioCB)
{
string const width = fromqstr(widthED.text());
void setCrop(QCheckBox & clipCB,
- QLineEdit & xlED, QLineEdit & ybED,
- QLineEdit & xrED, QLineEdit & ytED,
- external::ClipData const & data)
+ QLineEdit & xlED, QLineEdit & ybED,
+ QLineEdit & xrED, QLineEdit & ytED,
+ external::ClipData const & data)
{
clipCB.setChecked(data.clip);
graphics::BoundingBox const & bbox = data.bbox;
- xlED.setText(toqstr(convert<string>(bbox.xl)));
- ybED.setText(toqstr(convert<string>(bbox.yb)));
- xrED.setText(toqstr(convert<string>(bbox.xr)));
- ytED.setText(toqstr(convert<string>(bbox.yt)));
+ xlED.setText(QString::number(bbox.xl));
+ ybED.setText(QString::number(bbox.yb));
+ xrED.setText(QString::number(bbox.xr));
+ ytED.setText(QString::number(bbox.yt));
}
-void getCrop(external::ClipData & data,
- QCheckBox const & clipCB,
- QLineEdit const & xlED, QLineEdit const & ybED,
- QLineEdit const & xrED, QLineEdit const & ytED,
- bool bb_changed)
+static void getCrop(external::ClipData & data,
+ QCheckBox const & clipCB,
+ QLineEdit const & xlED, QLineEdit const & ybED,
+ QLineEdit const & xrED, QLineEdit const & ytED,
+ bool bb_changed)
{
data.clip = clipCB.isChecked();
if (!bb_changed)
return;
- data.bbox.xl = convert<int>(fromqstr(xlED.text()));
- data.bbox.yb = convert<int>(fromqstr(ybED.text()));
- data.bbox.xr = convert<int>(fromqstr(xrED.text()));
- data.bbox.yt = convert<int>(fromqstr(ytED.text()));
+ data.bbox.xl = xlED.text().toInt();
+ data.bbox.yb = ybED.text().toInt();
+ data.bbox.xr = xrED.text().toInt();
+ data.bbox.yt = ytED.text().toInt();
}
-void getExtra(external::ExtraData & data,
- GuiExternalDialog::MapType const & extra)
+static void getExtra(external::ExtraData & data,
+ GuiExternal::MapType const & extra)
{
- typedef GuiExternalDialog::MapType MapType;
- MapType::const_iterator it = extra.begin();
+ typedef GuiExternal::MapType MapType;
+ MapType::const_iterator it = extra.begin();
MapType::const_iterator const end = extra.end();
for (; it != end; ++it)
data.set(it->first, trim(fromqstr(it->second)));
}
-} // namespace anon
-
-
-void GuiExternalDialog::update_contents()
+void GuiExternal::updateContents()
{
tab->setCurrentIndex(0);
- InsetExternalParams const & params = controller().params();
string const name =
- params.filename.outputFilename(kernel().bufferFilepath());
+ params_.filename.outputFilename(bufferFilepath());
fileED->setText(toqstr(name));
+ embedCB->setCheckState(params_.filename.embedded() ? Qt::Checked : Qt::Unchecked);
- externalCO->setCurrentIndex(
- controller().getTemplateNumber(params.templatename()));
+ externalCO->setCurrentIndex(getTemplateNumber(params_.templatename()));
updateTemplate();
- draftCB->setChecked(params.draft);
+ draftCB->setChecked(params_.draft);
- setDisplay(*displayCB, *showCO,
- *displayscaleED,
- params.display, params.lyxscale, readOnly());
+ setDisplay(*displayCB, *showCO, *displayscaleED,
+ params_.display, params_.lyxscale, isBufferReadonly());
- setRotation(*angleED, *originCO, params.rotationdata);
+ setRotation(*angleED, *originCO, params_.rotationdata);
- setSize(*widthED, *widthUnitCO,
- *heightED, *heightUnitCO,
- *aspectratioCB,
- params.resizedata);
+ setSize(*widthED, *widthUnitCO, *heightED, *heightUnitCO,
+ *aspectratioCB, params_.resizedata);
- setCrop(*clipCB,
- *xlED, *ybED,
- *xrED, *ytED,
- params.clipdata);
- controller().bbChanged(!params.clipdata.bbox.empty());
+ setCrop(*clipCB, *xlED, *ybED, *xrED, *ytED, params_.clipdata);
+ bbChanged_ = !params_.clipdata.bbox.empty();
isValid();
}
-void GuiExternalDialog::updateTemplate()
+void GuiExternal::updateTemplate()
{
- external::Template templ =
- controller().getTemplate(externalCO->currentIndex());
+ external::Template templ = getTemplate(externalCO->currentIndex());
externalTB->setPlainText(qt_(templ.helpText));
// Ascertain which (if any) transformations the template supports
it->second.option_transformers.end())
continue;
string const format = it->first;
- string const opt = controller().params().extradata.get(format);
+ string const opt = params_.extradata.get(format);
extraFormatCO->addItem(toqstr(format));
extra_[format] = toqstr(opt);
}
tab->setTabEnabled(
tab->indexOf(optionstab), enabled);
- extraED->setEnabled(enabled && !kernel().isBufferReadonly());
+ extraED->setEnabled(enabled && !isBufferReadonly());
extraFormatCO->setEnabled(enabled);
if (enabled) {
}
-void GuiExternalDialog::applyView()
+void GuiExternal::applyView()
{
- InsetExternalParams params = controller().params();
-
- params.filename.set(internal_path(fromqstr(fileED->text())),
- kernel().bufferFilepath());
+ params_.filename.set(fromqstr(fileED->text()), bufferFilepath());
+ params_.filename.setEmbed(embedCB->checkState() == Qt::Checked);
- params.settemplate(controller().getTemplate(
- externalCO->currentIndex()).lyxName);
+ params_.settemplate(getTemplate(externalCO->currentIndex()).lyxName);
- params.draft = draftCB->isChecked();
+ params_.draft = draftCB->isChecked();
- getDisplay(params.display, params.lyxscale,
+ getDisplay(params_.display, params_.lyxscale,
*displayCB, *showCO,
*displayscaleED);
if (tab->isTabEnabled(tab->indexOf(rotatetab)))
- getRotation(params.rotationdata, *angleED, *originCO);
+ getRotation(params_.rotationdata, *angleED, *originCO);
if (tab->isTabEnabled(tab->indexOf(scaletab)))
- getSize(params.resizedata, *widthED, *widthUnitCO,
+ getSize(params_.resizedata, *widthED, *widthUnitCO,
*heightED, *heightUnitCO, *aspectratioCB);
if (tab->isTabEnabled(tab->indexOf(croptab)))
- getCrop(params.clipdata, *clipCB, *xlED, *ybED,
- *xrED, *ytED, controller().bbChanged());
+ getCrop(params_.clipdata, *clipCB, *xlED, *ybED,
+ *xrED, *ytED, bbChanged_);
if (tab->isTabEnabled(tab->indexOf(optionstab)))
- getExtra(params.extradata, extra_);
-
- controller().setParams(params);
+ getExtra(params_.extradata, extra_);
}
-void GuiExternalDialog::getBB()
+void GuiExternal::getBB()
{
xlED->setText("0");
ybED->setText("0");
if (filename.empty())
return;
- string const bb = controller().readBB(filename);
+ string const bb = readBB(filename);
if (bb.empty())
return;
xrED->setText(toqstr(token(bb, ' ', 2)));
ytED->setText(toqstr(token(bb, ' ', 3)));
- controller().bbChanged(false);
+ bbChanged_ = false;
+}
+
+
+bool GuiExternal::initialiseParams(string const & data)
+{
+ InsetExternalMailer::string2params(data, buffer(), params_);
+ return true;
+}
+
+
+void GuiExternal::clearParams()
+{
+ params_ = InsetExternalParams();
}
+
+void GuiExternal::dispatchParams()
+{
+ string const lfun = InsetExternalMailer::params2string(params_, buffer());
+ dispatch(FuncRequest(getLfun(), lfun));
+}
+
+
+void GuiExternal::editExternal()
+{
+ applyView();
+ string const lfun = InsetExternalMailer::params2string(params_, buffer());
+ dispatch(FuncRequest(LFUN_EXTERNAL_EDIT, lfun));
+}
+
+
+vector<string> const GuiExternal::getTemplates() const
+{
+ vector<string> result;
+
+ external::TemplateManager::Templates::const_iterator i1, i2;
+ i1 = external::TemplateManager::get().getTemplates().begin();
+ i2 = external::TemplateManager::get().getTemplates().end();
+
+ for (; i1 != i2; ++i1) {
+ result.push_back(i1->second.lyxName);
+ }
+ return result;
+}
+
+
+int GuiExternal::getTemplateNumber(string const & name) const
+{
+ external::TemplateManager::Templates::const_iterator i1, i2;
+ i1 = external::TemplateManager::get().getTemplates().begin();
+ i2 = external::TemplateManager::get().getTemplates().end();
+ for (int i = 0; i1 != i2; ++i1, ++i) {
+ if (i1->second.lyxName == name)
+ return i;
+ }
+
+ // we can get here if a LyX document has a template not installed
+ // on this machine.
+ return -1;
+}
+
+
+external::Template GuiExternal::getTemplate(int i) const
+{
+ external::TemplateManager::Templates::const_iterator i1
+ = external::TemplateManager::get().getTemplates().begin();
+
+ advance(i1, i);
+
+ return i1->second;
+}
+
+
+string const
+GuiExternal::getTemplateFilters(string const & template_name) const
+{
+ /// Determine the template file extension
+ external::TemplateManager const & etm =
+ external::TemplateManager::get();
+ external::Template const * const et_ptr =
+ etm.getTemplateByName(template_name);
+
+ if (et_ptr)
+ return et_ptr->fileRegExp;
+
+ return string();
+}
+
+
+docstring const GuiExternal::browse(docstring const & input,
+ docstring const & template_name) const
+{
+ docstring const title = _("Select external file");
+
+ docstring const bufpath = from_utf8(bufferFilepath());
+ FileFilterList const filter =
+ FileFilterList(from_utf8(getTemplateFilters(to_utf8(template_name))));
+
+ docstring const label1 = _("Documents|#o#O");
+ docstring const dir1 = from_utf8(lyxrc.document_path);
+
+ return browseRelFile(input, bufpath, title, filter, false, label1, dir1);
+}
+
+
+string const GuiExternal::readBB(string const & file)
+{
+ FileName const abs_file(makeAbsPath(file, bufferFilepath()));
+
+ // try to get it from the file, if possible. Zipped files are
+ // unzipped in the readBB_from_PSFile-Function
+ string const bb = readBB_from_PSFile(abs_file);
+ if (!bb.empty())
+ return bb;
+
+ // we don't, so ask the Graphics Cache if it has loaded the file
+ int width = 0;
+ int height = 0;
+
+ graphics::Cache & gc = graphics::Cache::get();
+ if (gc.inCache(abs_file)) {
+ graphics::Image const * image = gc.item(abs_file)->image();
+
+ if (image) {
+ width = image->width();
+ height = image->height();
+ }
+ }
+
+ return ("0 0 " + convert<string>(width) + ' ' + convert<string>(height));
+}
+
+
+Dialog * createGuiExternal(GuiView & lv) { return new GuiExternal(lv); }
+
+
} // namespace frontend
} // namespace lyx