X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiGraphics.cpp;h=e89bd4cfe6467e0e050ea0d0c88df64609a2b07a;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=684dbbdf152e305d2462c92d2e31ffc2eaa4d932;hpb=c9ea6e6eef090b863fb54445010f24443b15eb23;p=lyx.git diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp index 684dbbdf15..e89bd4cfe6 100644 --- a/src/frontends/qt4/GuiGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -3,9 +3,10 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * + * \author Angus Leeming * \author John Levon * \author Edwin Leuven - * \author Herbert Voß + * \author Herbert Voß * \author Richard Heck * * Full author contact details are available in file CREDITS. @@ -14,68 +15,105 @@ #include #include "GuiGraphics.h" +#include "frontends/alert.h" +#include "qt_helpers.h" +#include "Validator.h" -#include "ControlGraphics.h" -#include "debug.h" +#include "Buffer.h" +#include "FuncRequest.h" #include "LengthCombo.h" -#include "lengthcommon.h" +#include "Length.h" #include "LyXRC.h" -#include "qt_helpers.h" -#include "Validator.h" +#include "Undo.h" -#include "controllers/frontend_helpers.h" +#include "graphics/GraphicsCache.h" +#include "graphics/GraphicsCacheItem.h" +#include "graphics/GraphicsImage.h" -#include "insets/InsetGraphicsParams.h" +#include "insets/InsetGraphics.h" #include "support/convert.h" +#include "support/debug.h" +#include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" -#include "support/lyxlib.h" #include "support/os.h" +#include "support/Package.h" +#include "support/types.h" #include -#include #include #include #include #include -#include #include +#include + +using namespace std; +using namespace lyx::support; + +namespace { + +// These are the strings that are stored in the LyX file and which +// correspond to the LaTeX identifiers shown in the comments at the +// end of each line. +char const * const rorigin_lyx_strs[] = { + // the LaTeX default is leftBaseline + "", + "leftTop", "leftBottom", "leftBaseline", // lt lb lB + "center", "centerTop", "centerBottom", "centerBaseline", // c ct cb cB + "rightTop", "rightBottom", "rightBaseline" }; // rt rb rB -using lyx::support::float_equal; -using lyx::support::token; +// These are the strings, corresponding to the above, that the GUI should +// use. Note that they can/should be translated. +char const * const rorigin_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") }; -using lyx::support::os::internal_path; +size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *); -#ifndef CXX_GLOBAL_CSTD -using std::floor; -#endif +static string autostr = N_("automatically"); -using std::vector; -using std::string; +} // namespace anon namespace lyx { namespace frontend { - -template -std::vector const -getFirst(std::vector const & pr) +//FIXME setAutoTextCB should really take an argument, as indicated, that +//determines what text is to be written for "auto". But making +//that work involves more extensive revisions than we now want +//to make, since "auto" also appears in paramsToDialog(). +//The right way to do this, I think, would be to define a class +//checkedLengthSet (and a partnering labeledLengthSete) that encapsulated +//the checkbox, line edit, and length combo together, and then made e.g. +//lengthToWidgets, widgetsToLength, etc, all public methods of that class. +//Perhaps even the validator could be exposed through it. +/** + * sets a checkbox-line edit-length combo group, using "text" if the + * checkbox is unchecked and clearing the line edit if it previously + * said "text". +*/ +static void setAutoTextCB(QCheckBox * checkBox, QLineEdit * lineEdit, + LengthCombo * lengthCombo/*, string text = "auto"*/) { - std::vector tmp(pr.size()); - std::transform(pr.begin(), pr.end(), tmp.begin(), - boost::bind(&Pair::first, _1)); - return tmp; + if (!checkBox->isChecked()) + lengthToWidgets(lineEdit, lengthCombo, + _(autostr), lengthCombo->currentLengthItem()); + else if (lineEdit->text() == qt_(autostr)) + lengthToWidgets(lineEdit, lengthCombo, string(), + lengthCombo->currentLengthItem()); } -GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) - : GuiDialog(lv, "graphics") + +GuiGraphics::GuiGraphics(GuiView & lv) + : GuiDialog(lv, "graphics", qt_("Graphics")) { setupUi(this); - setViewTitle(_("Graphics")); - setController(new ControlGraphics(*this)); - + //main buttons connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); @@ -85,9 +123,9 @@ GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) //graphics pane connect(filename, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(WidthCB, SIGNAL( clicked()), + connect(WidthCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(HeightCB, SIGNAL( clicked()), + connect(HeightCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(Width, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); @@ -113,33 +151,34 @@ GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) filename->setValidator(new PathValidator(true, filename)); setFocusProxy(filename); - QDoubleValidator * scaleValidator = new DoubleAutoValidator(Scale); + QDoubleValidator * scaleValidator = + new DoubleAutoValidator(Scale, qt_(autostr)); scaleValidator->setBottom(0); scaleValidator->setDecimals(256); //I guess that will do Scale->setValidator(scaleValidator); - Height->setValidator(unsignedLengthAutoValidator(Height)); - Width->setValidator(unsignedLengthAutoValidator(Width)); + Height->setValidator(unsignedLengthAutoValidator(Height, qt_(autostr))); + Width->setValidator(unsignedLengthAutoValidator(Width, qt_(autostr))); angle->setValidator(new QDoubleValidator(-360, 360, 2, angle)); //clipping pane connect(clip, SIGNAL(stateChanged(int)), this, SLOT(change_adaptor())); connect(lbY, SIGNAL(textChanged(const QString&)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(lbYunit, SIGNAL(activated(int)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(rtY, SIGNAL(textChanged(const QString&)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(rtYunit, SIGNAL(activated(int)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(lbX, SIGNAL(textChanged(const QString&)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(lbXunit, SIGNAL(activated(int)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(rtX, SIGNAL(textChanged(const QString&)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(rtXunit, SIGNAL(activated(int)), - this, SLOT(change_bb())); + this, SLOT(changeBB())); connect(getPB, SIGNAL(clicked()), this, SLOT(change_adaptor())); @@ -162,16 +201,12 @@ GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) // setChecked(). Note, too, that clicked() would get called whenever it // is clicked, even right clicked (I think), not just whenever it is // toggled. - connect(subfigure, SIGNAL(toggled(bool)), - this, SLOT(change_adaptor())); - connect(subcaption, SIGNAL(textChanged(const QString&)), - this, SLOT(change_adaptor())); - connect(displayGB, SIGNAL(toggled(bool)), - this, SLOT(change_adaptor())); - connect(showCB, SIGNAL(currentIndexChanged(int)), - this, SLOT(change_adaptor())); + connect(displayGB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); connect(displayscale, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); + connect(groupCO, SIGNAL(currentIndexChanged(int)), + this, SLOT(changeGroup(int))); + displayscale->setValidator(new QIntValidator(displayscale)); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); @@ -181,7 +216,6 @@ GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) bc().setCancel(closePB); bc().addReadOnly(latexoptions); - bc().addReadOnly(subfigure); bc().addReadOnly(filenameL); bc().addReadOnly(filename); bc().addReadOnly(browsePB); @@ -211,82 +245,139 @@ GuiGraphicsDialog::GuiGraphicsDialog(LyXView & lv) } -ControlGraphics & GuiGraphicsDialog::controller() const +void GuiGraphics::change_adaptor() { - return static_cast(GuiDialog::controller()); + changed(); } -void GuiGraphicsDialog::showView() +void GuiGraphics::changeGroup(int /* index */) { - QDialog::show(); -} + QString const new_group = groupCO->itemData( + groupCO->currentIndex()).toString(); + + // check if the old group consisted only of this member + if (current_group_ != fromqstr(new_group) + && graphics::countGroupMembers(buffer(), current_group_) == 1) { + if (!new_group.isEmpty()) { + if (Alert::prompt(_("Dissolve previous group?"), + bformat(_("If you assign this graphic to group '%2$s',\n" + "the previously assigned group '%1$s' will be dissolved,\n" + "because this graphic was its only member.\n" + "How do you want to proceed?"), + from_utf8(current_group_), qstring_to_ucs4(new_group)), + 0, 0, + bformat(_("Stick with group '%1$s'"), + from_utf8(current_group_)), + bformat(_("Assign to group '%1$s' anyway"), + qstring_to_ucs4(new_group))) == 0) { + groupCO->setCurrentIndex( + groupCO->findData(toqstr(current_group_), Qt::MatchExactly)); + return; + } + } else { + if (Alert::prompt(_("Dissolve previous group?"), + bformat(_("If you sign off this graphic from group '%1$s',\n" + "the group will be dissolved,\n" + "because this graphic was its only member.\n" + "How do you want to proceed?"), + from_utf8(current_group_)), + 0, 0, + bformat(_("Stick with group '%1$s'"), + from_utf8(current_group_)), + bformat(_("Sign off from group '%1$s'"), + from_utf8(current_group_))) == 0) { + groupCO->setCurrentIndex( + groupCO->findData(toqstr(current_group_), Qt::MatchExactly)); + return; + } + } + } + if (new_group.isEmpty()) { + changed(); + return; + } + + string grp = graphics::getGroupParams(buffer(), fromqstr(new_group)); + if (grp.empty()) { + // group does not exist yet + changed(); + return; + } + + // filename might have been changed + QString current_filename = filename->text(); + + // group exists: load params into the dialog + groupCO->blockSignals(true); + InsetGraphics::string2params(grp, buffer(), params_); + paramsToDialog(params_); + groupCO->blockSignals(false); + + // reset filename + filename->setText(current_filename); -void GuiGraphicsDialog::change_adaptor() -{ changed(); } -void GuiGraphicsDialog::change_bb() +void GuiGraphics::on_newGroupPB_clicked() { - controller().bbChanged = true; - LYXERR(Debug::GRAPHICS) - << "[controller().bb_Changed set to true]\n"; - changed(); + docstring newgroup; + if (!Alert::askForText(newgroup, _("Enter unique group name:"))) + return; + if (newgroup.empty()) + return; + if (groupCO->findData(toqstr(newgroup), Qt::MatchExactly) != -1) { + Alert::warning(_("Group already defined!"), + bformat(_("A graphics group with the name '%1$s' already exists."), + newgroup)); + return; + } + groupCO->addItem(toqstr(newgroup), toqstr(newgroup)); + groupCO->setCurrentIndex( + groupCO->findData(toqstr(newgroup), Qt::MatchExactly)); } -void GuiGraphicsDialog::closeEvent(QCloseEvent * e) +void GuiGraphics::changeBB() { - slotWMHide(); - e->accept(); + bbChanged = true; + LYXERR(Debug::GRAPHICS, "[bb_Changed set to true]"); + changed(); } -void GuiGraphicsDialog::on_browsePB_clicked() +void GuiGraphics::on_browsePB_clicked() { - docstring const str = - controller().browse(qstring_to_ucs4(filename->text())); - if(!str.empty()){ - filename->setText(toqstr(str)); + QString const str = browse(filename->text()); + if (!str.isEmpty()) { + filename->setText(str); changed(); } } -void GuiGraphicsDialog::on_getPB_clicked() +void GuiGraphics::on_getPB_clicked() { getBB(); } -void GuiGraphicsDialog::on_editPB_clicked() -{ - controller().editGraphics(); -} - - -void GuiGraphicsDialog::on_filename_textChanged(const QString & filename) -{ - editPB->setDisabled(filename.isEmpty()); -} - - -void GuiGraphicsDialog::setAutoText() +void GuiGraphics::setAutoText() { if (scaleCB->isChecked()) return; if (!Scale->isEnabled() && Scale->text() != "100") - Scale->setText(QString("auto")); + Scale->setText(qt_(autostr)); setAutoTextCB(WidthCB, Width, widthUnit); setAutoTextCB(HeightCB, Height, heightUnit); } -void GuiGraphicsDialog::on_scaleCB_toggled(bool setScale) +void GuiGraphics::on_scaleCB_toggled(bool setScale) { Scale->setEnabled(setScale); if (setScale) { @@ -320,7 +411,7 @@ void GuiGraphicsDialog::on_scaleCB_toggled(bool setScale) } -void GuiGraphicsDialog::on_WidthCB_toggled(bool setWidth) +void GuiGraphics::on_WidthCB_toggled(bool setWidth) { Width->setEnabled(setWidth); widthUnit->setEnabled(setWidth); @@ -345,7 +436,7 @@ void GuiGraphicsDialog::on_WidthCB_toggled(bool setWidth) } -void GuiGraphicsDialog::on_HeightCB_toggled(bool setHeight) +void GuiGraphics::on_HeightCB_toggled(bool setHeight) { Height->setEnabled(setHeight); heightUnit->setEnabled(setHeight); @@ -370,7 +461,7 @@ void GuiGraphicsDialog::on_HeightCB_toggled(bool setHeight) } -void GuiGraphicsDialog::on_angle_textChanged(const QString & filename) +void GuiGraphics::on_angle_textChanged(const QString & filename) { rotateOrderCB->setEnabled((WidthCB->isChecked() || HeightCB->isChecked() || @@ -378,145 +469,142 @@ void GuiGraphicsDialog::on_angle_textChanged(const QString & filename) (filename != "0")); } -// returns the number of the string s in the vector v -static int getItemNo(const vector & v, string const & s) -{ - vector::const_iterator cit = - find(v.begin(), v.end(), s); - return (cit != v.end()) ? int(cit - v.begin()) : 0; -} - -void GuiGraphicsDialog::update_contents() +void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp) { - // clear and fill in the comboboxes - vector const bb_units = frontend::getBBUnits(); + static char const * const bb_units[] = { "bp", "cm", "mm", "in" }; + static char const * const bb_units_gui[] = { N_("bp"), N_("cm"), N_("mm"), N_("in") }; + size_t const bb_size = sizeof(bb_units) / sizeof(bb_units[0]); + lbXunit->clear(); lbYunit->clear(); rtXunit->clear(); rtYunit->clear(); - for (vector::const_iterator it = bb_units.begin(); - it != bb_units.end(); ++it) { - lbXunit->addItem(toqstr(*it)); - lbYunit->addItem(toqstr(*it)); - rtXunit->addItem(toqstr(*it)); - rtYunit->addItem(toqstr(*it)); + + for (size_t i = 0; i < bb_size; i++) { + lbXunit->addItem(qt_(bb_units_gui[i]), + toqstr(bb_units[i])); + lbYunit->addItem(qt_(bb_units_gui[i]), + toqstr(bb_units[i])); + rtXunit->addItem(qt_(bb_units_gui[i]), + toqstr(bb_units[i])); + rtYunit->addItem(qt_(bb_units_gui[i]), + toqstr(bb_units[i])); } - - InsetGraphicsParams & igp = controller().params(); - + // set the right default unit - Length::UNIT unitDefault = Length::CM; - switch (lyxrc.default_papersize) { - case PAPER_USLETTER: - case PAPER_USLEGAL: - case PAPER_USEXECUTIVE: - unitDefault = Length::IN; - break; - default: - break; - } + Length::UNIT const defaultUnit = Length::defaultUnit(); + //lyxerr << bufferFilepath(); string const name = - igp.filename.outputFilename(kernel().bufferFilepath()); + igp.filename.outputFilename(fromqstr(bufferFilepath())); filename->setText(toqstr(name)); // set the bounding box values if (igp.bb.empty()) { - string const bb = controller().readBB(igp.filename.absFilename()); + string const bb = readBoundingBox(igp.filename.absFilename()); // the values from the file always have the bigpoint-unit bp - lbX->setText(toqstr(token(bb, ' ', 0))); - lbY->setText(toqstr(token(bb, ' ', 1))); - rtX->setText(toqstr(token(bb, ' ', 2))); - rtY->setText(toqstr(token(bb, ' ', 3))); + doubleToWidget(lbX, token(bb, ' ', 0)); + doubleToWidget(lbY, token(bb, ' ', 1)); + doubleToWidget(rtX, token(bb, ' ', 2)); + doubleToWidget(rtY, token(bb, ' ', 3)); lbXunit->setCurrentIndex(0); lbYunit->setCurrentIndex(0); rtXunit->setCurrentIndex(0); rtYunit->setCurrentIndex(0); - controller().bbChanged = false; + bbChanged = false; } else { // get the values from the inset Length anyLength; - string const xl(token(igp.bb, ' ', 0)); - string const yl(token(igp.bb, ' ', 1)); - string const xr(token(igp.bb, ' ', 2)); - string const yr(token(igp.bb, ' ', 3)); + string const xl = token(igp.bb, ' ', 0); + string const yl = token(igp.bb, ' ', 1); + string const xr = token(igp.bb, ' ', 2); + string const yr = token(igp.bb, ' ', 3); if (isValidLength(xl, &anyLength)) { - lbX->setText(toqstr(convert(anyLength.value()))); - string const unit(unit_name[anyLength.unit()]); - lbXunit->setCurrentIndex(getItemNo(bb_units, unit)); + doubleToWidget(lbX, anyLength.value()); + string const unit = unit_name[anyLength.unit()]; + lbXunit->setCurrentIndex(lbXunit->findData(toqstr(unit))); } else { lbX->setText(toqstr(xl)); } if (isValidLength(yl, &anyLength)) { - lbY->setText(toqstr(convert(anyLength.value()))); - string const unit(unit_name[anyLength.unit()]); - lbYunit->setCurrentIndex(getItemNo(bb_units, unit)); + doubleToWidget(lbY, anyLength.value()); + string const unit = unit_name[anyLength.unit()]; + lbYunit->setCurrentIndex(lbYunit->findData(toqstr(unit))); } else { lbY->setText(toqstr(xl)); } if (isValidLength(xr, &anyLength)) { - rtX->setText(toqstr(convert(anyLength.value()))); - string const unit(unit_name[anyLength.unit()]); - rtXunit->setCurrentIndex(getItemNo(bb_units, unit)); + doubleToWidget(rtX, anyLength.value()); + string const unit = unit_name[anyLength.unit()]; + rtXunit->setCurrentIndex(rtXunit->findData(toqstr(unit))); } else { rtX->setText(toqstr(xl)); } if (isValidLength(yr, &anyLength)) { - rtY->setText(toqstr(convert(anyLength.value()))); - string const unit(unit_name[anyLength.unit()]); - rtYunit->setCurrentIndex(getItemNo(bb_units, unit)); + doubleToWidget(rtY, anyLength.value()); + string const unit = unit_name[anyLength.unit()]; + rtYunit->setCurrentIndex(rtYunit->findData(toqstr(unit))); } else { rtY->setText(toqstr(xl)); } - controller().bbChanged = true; + bbChanged = true; } // Update the draft and clip mode draftCB->setChecked(igp.draft); clip->setChecked(igp.clip); unzipCB->setChecked(igp.noUnzip); - - // Update the subcaption check button and input field - subfigure->setChecked(igp.subcaption); - subcaption->setText(toqstr(igp.subcaptionText)); - - int item = 0; - switch (igp.display) { - case graphics::DefaultDisplay: item = 0; break; - case graphics::MonochromeDisplay: item = 1; break; - case graphics::GrayscaleDisplay: item = 2; break; - case graphics::ColorDisplay: item = 3; break; - case graphics::NoDisplay: item = 0; break; - } - showCB->setCurrentIndex(item); + displayGB->setChecked(igp.display); displayscale->setText(toqstr(convert(igp.lyxscale))); - displayGB->setChecked(igp.display != graphics::NoDisplay); // the output section (width/height) - Scale->setText(toqstr(igp.scale)); + doubleToWidget(Scale, igp.scale); //igp.scale defaults to 100, so we treat it as empty bool const scaleChecked = !igp.scale.empty() && igp.scale != "100"; scaleCB->blockSignals(true); scaleCB->setChecked(scaleChecked); scaleCB->blockSignals(false); Scale->setEnabled(scaleChecked); + displayGB->setEnabled(lyxrc.display_graphics); + + set grp; + graphics::getGraphicsGroups(buffer(), grp); + set::const_iterator it = grp.begin(); + set::const_iterator end = grp.end(); + groupCO->blockSignals(true); + groupCO->clear(); + for (; it != end; it++) + groupCO->addItem(toqstr(*it), toqstr(*it)); + groupCO->insertItem(0, qt_("None"), QString()); + if (igp.groupId.empty()) + groupCO->setCurrentIndex(0); + else + groupCO->setCurrentIndex( + groupCO->findData(toqstr(igp.groupId), Qt::MatchExactly)); + groupCO->blockSignals(false); + + if (igp.width.value() == 0) + lengthToWidgets(Width, widthUnit, _(autostr), defaultUnit); + else + lengthToWidgets(Width, widthUnit, igp.width, defaultUnit); - lengthAutoToWidgets(Width, widthUnit, igp.width, - unitDefault); bool const widthChecked = !Width->text().isEmpty() && - Width->text() != "auto"; + Width->text() != qt_(autostr); WidthCB->blockSignals(true); WidthCB->setChecked(widthChecked); WidthCB->blockSignals(false); Width->setEnabled(widthChecked); widthUnit->setEnabled(widthChecked); - lengthAutoToWidgets(Height, heightUnit, igp.height, - unitDefault); + if (igp.height.value() == 0) + lengthToWidgets(Height, heightUnit, _(autostr), defaultUnit); + else + lengthToWidgets(Height, heightUnit, igp.height, defaultUnit); + bool const heightChecked = !Height->text().isEmpty() - && Height->text() != "auto"; + && Height->text() != qt_(autostr); HeightCB->blockSignals(true); HeightCB->setChecked(heightChecked); HeightCB->blockSignals(false); @@ -530,7 +618,7 @@ void GuiGraphicsDialog::update_contents() setAutoText(); - angle->setText(toqstr(igp.rotateAngle)); + doubleToWidget(angle, igp.rotateAngle); rotateOrderCB->setChecked(igp.scaleBeforeRotation); rotateOrderCB->setEnabled( (widthChecked || heightChecked || scaleChecked) @@ -538,43 +626,37 @@ void GuiGraphicsDialog::update_contents() origin->clear(); - vector origindata = getRotationOriginData(); - vector const origin_lang = getFirst(origindata); - origin_ltx = getSecond(origindata); - - for (vector::const_iterator it = origin_lang.begin(); - it != origin_lang.end(); ++it) - origin->addItem(toqstr(*it)); + for (size_t i = 0; i < rorigin_size; i++) { + origin->addItem(qt_(rorigin_gui_strs[i]), + toqstr(rorigin_lyx_strs[i])); + } if (!igp.rotateOrigin.empty()) - origin->setCurrentIndex( - getItemNo(origin_ltx, igp.rotateOrigin)); + origin->setCurrentIndex(origin->findData(toqstr(igp.rotateOrigin))); else origin->setCurrentIndex(0); - // disable edit button when no filename is present - editPB->setDisabled(filename->text().isEmpty()); - - //// latex section + // latex section latexoptions->setText(toqstr(igp.special)); + // cf bug #3852 + filename->setFocus(); } -void GuiGraphicsDialog::applyView() +void GuiGraphics::applyView() { - InsetGraphicsParams & igp = controller().params(); + InsetGraphicsParams & igp = params_; - igp.filename.set(internal_path(fromqstr(filename->text())), - kernel().bufferFilepath()); + igp.filename.set(fromqstr(filename->text()), fromqstr(bufferFilepath())); // the bb section igp.bb.erase(); - if (controller().bbChanged) { + if (bbChanged) { string bb; - string lbXs = fromqstr(lbX->text()); - string lbYs = fromqstr(lbY->text()); - string rtXs = fromqstr(rtX->text()); - string rtYs = fromqstr(rtY->text()); + string lbXs = widgetToDoubleStr(lbX); + string lbYs = widgetToDoubleStr(lbY); + string rtXs = widgetToDoubleStr(rtX); + string rtYs = widgetToDoubleStr(rtY); int bb_sum = convert(lbXs) + convert(lbYs) + convert(rtXs) + convert(rtXs); @@ -601,23 +683,11 @@ void GuiGraphicsDialog::applyView() igp.draft = draftCB->isChecked(); igp.clip = clip->isChecked(); - igp.subcaption = subfigure->isChecked(); - igp.subcaptionText = fromqstr(subcaption->text()); - - switch (showCB->currentIndex()) { - case 0: igp.display = graphics::DefaultDisplay; break; - case 1: igp.display = graphics::MonochromeDisplay; break; - case 2: igp.display = graphics::GrayscaleDisplay; break; - case 3: igp.display = graphics::ColorDisplay; break; - default:; - } - - if (!displayGB->isChecked()) - igp.display = graphics::NoDisplay; + igp.display = displayGB->isChecked(); //the graphics section if (scaleCB->isChecked() && !Scale->text().isEmpty()) { - igp.scale = fromqstr(Scale->text()); + igp.scale = widgetToDoubleStr(Scale); igp.width = Length("0pt"); igp.height = Length("0pt"); igp.keepAspectRatio = false; @@ -638,54 +708,138 @@ void GuiGraphicsDialog::applyView() igp.noUnzip = unzipCB->isChecked(); igp.lyxscale = displayscale->text().toInt(); - igp.rotateAngle = fromqstr(angle->text()); + igp.rotateAngle = widgetToDoubleStr(angle); - double rotAngle = convert(igp.rotateAngle); - if (std::abs(rotAngle) > 360.0) { + double rotAngle = widgetToDouble(angle); + if (abs(rotAngle) > 360.0) { rotAngle -= 360.0 * floor(rotAngle / 360.0); igp.rotateAngle = convert(rotAngle); } // save the latex name for the origin. If it is the default // then origin_ltx returns "" - igp.rotateOrigin = origin_ltx[origin->currentIndex()]; + igp.rotateOrigin = + fromqstr(origin->itemData(origin->currentIndex()).toString()); igp.scaleBeforeRotation = rotateOrderCB->isChecked(); // more latex options igp.special = fromqstr(latexoptions->text()); + + igp.groupId = fromqstr(groupCO->itemData( + groupCO->currentIndex()).toString()); + current_group_ = igp.groupId; } -void GuiGraphicsDialog::getBB() +void GuiGraphics::getBB() { string const fn = fromqstr(filename->text()); - if (!fn.empty()) { - string const bb = controller().readBB(fn); - if (!bb.empty()) { - lbX->setText(toqstr(token(bb, ' ', 0))); - lbY->setText(toqstr(token(bb, ' ', 1))); - rtX->setText(toqstr(token(bb, ' ', 2))); - rtY->setText(toqstr(token(bb, ' ', 3))); - // the default units for the bb values when reading - // it from the file - lbXunit->setCurrentIndex(0); - lbYunit->setCurrentIndex(0); - rtXunit->setCurrentIndex(0); - rtYunit->setCurrentIndex(0); + if (fn.empty()) + return; + string const bb = readBoundingBox(fn); + bbChanged = false; + if (bb.empty()) + return; + doubleToWidget(lbX, token(bb, ' ', 0)); + doubleToWidget(lbY, token(bb, ' ', 1)); + doubleToWidget(rtX, token(bb, ' ', 2)); + doubleToWidget(rtY, token(bb, ' ', 3)); + // the default units for the bb values when reading + // it from the file + lbXunit->setCurrentIndex(0); + lbYunit->setCurrentIndex(0); + rtXunit->setCurrentIndex(0); + rtYunit->setCurrentIndex(0); +} + + +bool GuiGraphics::isValid() +{ + return !filename->text().isEmpty(); +} + + +bool GuiGraphics::initialiseParams(string const & data) +{ + InsetGraphics::string2params(data, buffer(), params_); + paramsToDialog(params_); + current_group_ = params_.groupId; + return true; +} + + +void GuiGraphics::clearParams() +{ + params_ = InsetGraphicsParams(); +} + + +void GuiGraphics::dispatchParams() +{ + InsetGraphicsParams tmp_params(params_); + string const lfun = InsetGraphics::params2string(tmp_params, buffer()); + dispatch(FuncRequest(getLfun(), lfun)); +} + + +QString GuiGraphics::browse(QString const & in_name) const +{ + QString const title = qt_("Select graphics file"); + + // Does user clipart directory exist? + string clipdir = addName(package().user_support().absFilename(), "clipart"); + FileName clip(clipdir); + + // bail out to system clipart directory + if (!clip.isDirectory()) + clipdir = addName(package().system_support().absFilename(), "clipart"); + + return browseRelFile(in_name, bufferFilepath(), + title, fileFilters(QString()), false, + qt_("Clipart|#C#c"), toqstr(clipdir), + qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); +} + + +string GuiGraphics::readBoundingBox(string const & file) +{ + FileName const abs_file = support::makeAbsPath(file, fromqstr(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(); } - controller().bbChanged = false; } + + return ("0 0 " + convert(width) + ' ' + convert(height)); } -bool GuiGraphicsDialog::isValid() +bool GuiGraphics::isFileNameValid(string const & fname) const { - return !filename->text().isEmpty(); + // It may be that the filename is relative. + return support::makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile(); } -} // namespace frontend -} // namespace lyx +Dialog * createGuiGraphics(GuiView & lv) { return new GuiGraphics(lv); } -#include "GuiGraphics_moc.cpp" +} // namespace frontend +} // namespace lyx + +#include "moc_GuiGraphics.cpp"