#include "GuiGraphics.h"
-#include "debug.h"
#include "LengthCombo.h"
#include "Length.h"
#include "LyXRC.h"
#include "Validator.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "graphics/GraphicsCache.h"
#include "graphics/GraphicsCacheItem.h"
#include "insets/InsetGraphicsParams.h"
#include "support/convert.h"
+#include "support/debug.h"
#include "support/FileFilterList.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 <boost/bind.hpp>
-
#include <QCheckBox>
-#include <QCloseEvent>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QValidator>
-#include <algorithm>
#include <cmath>
#include <utility>
-#ifndef CXX_GLOBAL_CSTD
-using std::floor;
-#endif
-using std::find;
-using std::vector;
-using std::string;
-using std::transform;
-using std::make_pair;
-using std::pair;
-using std::vector;
+using namespace std;
+using namespace lyx::support;
-namespace lyx {
-namespace frontend {
+namespace {
-using support::addName;
-using support::FileFilterList;
-using support::FileName;
-using support::float_equal;
-using support::makeAbsPath;
-using support::os::internal_path;
-using support::package;
-using support::readBB_from_PSFile;
-using support::token;
+// 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
+// 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") };
+
+size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *);
+
+} // namespace anon
+
+
+namespace lyx {
+namespace frontend {
//FIXME setAutoTextCB should really take an argument, as indicated, that
//determines what text is to be written for "auto". But making
lengthCombo->currentLengthItem());
}
+
template<class Pair>
-vector<typename Pair::first_type> const
-getFirst(vector<Pair> const & pr)
+vector<typename Pair::first_type> getFirst(vector<Pair> const & pr)
{
- vector<typename Pair::first_type> tmp(pr.size());
- transform(pr.begin(), pr.end(), tmp.begin(),
- boost::bind(&Pair::first, _1));
+ size_t const n = pr.size();
+ vector<typename Pair::first_type> tmp(n);
+ for (size_t i = 0; i != n; ++i)
+ tmp[i] = pr[i].first;
return tmp;
}
+
///
template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
+vector<typename Pair::second_type> getSecond(vector<Pair> const & pr)
{
- vector<typename Pair::second_type> tmp(pr.size());
- transform(pr.begin(), pr.end(), tmp.begin(),
- boost::bind(&Pair::second, _1));
- return tmp;
+ size_t const n = pr.size();
+ vector<typename Pair::second_type> tmp(n);
+ for (size_t i = 0; i != n; ++i)
+ tmp[i] = pr[i].second;
+ return tmp;
}
-/// The (tranlated) GUI std::string and it's LaTeX equivalent.
-typedef std::pair<docstring, std::string> RotationOriginPair;
+
+/// The (tranlated) GUI string and it's LaTeX equivalent.
+typedef pair<docstring, string> RotationOriginPair;
///
-std::vector<RotationOriginPair> getRotationOriginData();
+vector<RotationOriginPair> getRotationOriginData()
+{
+ static vector<RotationOriginPair> data;
+ if (!data.empty())
+ return data;
+
+ data.resize(rorigin_size);
+ for (size_type i = 0; i < rorigin_size; ++i) {
+ data[i] = make_pair(_(rorigin_gui_strs[i]),
+ rorigin_lyx_strs[i]);
+ }
+
+ return data;
+}
+
GuiGraphics::GuiGraphics(GuiView & lv)
- : GuiDialog(lv, "graphics")
+ : GuiDialog(lv, "graphics", qt_("Graphics"))
{
setupUi(this);
- setViewTitle(_("Graphics"));
-
+
//main buttons
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
// 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)),
bc().setCancel(closePB);
bc().addReadOnly(latexoptions);
- bc().addReadOnly(subfigure);
bc().addReadOnly(filenameL);
bc().addReadOnly(filename);
bc().addReadOnly(browsePB);
}
-void GuiGraphics::closeEvent(QCloseEvent * e)
-{
- slotClose();
- GuiDialog::closeEvent(e);
-}
-
-
void GuiGraphics::on_browsePB_clicked()
{
- docstring const str = browse(qstring_to_ucs4(filename->text()));
- if (!str.empty()) {
- filename->setText(toqstr(str));
- embedCB->setCheckState(Qt::Unchecked);
+ QString const str = browse(filename->text());
+ if (!str.isEmpty()) {
+ filename->setText(str);
changed();
}
}
}
-void GuiGraphics::on_editPB_clicked()
-{
- editGraphics();
-}
-
-
-void GuiGraphics::on_filename_textChanged(const QString & filename)
-{
- editPB->setDisabled(filename.isEmpty());
-}
-
-
void GuiGraphics::setAutoText()
{
if (scaleCB->isChecked())
}
// returns the number of the string s in the vector v
-static int getItemNo(const vector<string> & v, string const & s)
+static int itemNumber(const vector<string> & v, string const & s)
{
vector<string>::const_iterator cit =
find(v.begin(), v.end(), s);
void GuiGraphics::updateContents()
{
- // clear and fill in the comboboxes
- vector<string> const bb_units = frontend::getBBUnits();
+ static char const * const bb_units[] = { "bp", "cm", "mm", "in" };
+ size_t const bb_size = sizeof(bb_units) / sizeof(bb_units[0]);
+
+ vector<string> const units = vector<string>(bb_units, bb_units + bb_size);
lbXunit->clear();
lbYunit->clear();
rtXunit->clear();
rtYunit->clear();
- for (vector<string>::const_iterator it = bb_units.begin();
- it != bb_units.end(); ++it) {
+ for (vector<string>::const_iterator it = units.begin();
+ it != units.end(); ++it) {
lbXunit->addItem(toqstr(*it));
lbYunit->addItem(toqstr(*it));
rtXunit->addItem(toqstr(*it));
}
string const name =
- igp.filename.outputFilename(bufferFilepath());
+ igp.filename.outputFilename(fromqstr(bufferFilepath()));
filename->setText(toqstr(name));
- embedCB->setCheckState(igp.filename.embedded() ? Qt::Checked : Qt::Unchecked);
// set the bounding box values
if (igp.bb.empty()) {
- string const bb = 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)));
string const yr = token(igp.bb, ' ', 3);
if (isValidLength(xl, &anyLength)) {
lbX->setText(toqstr(convert<string>(anyLength.value())));
- string const unit(unit_name[anyLength.unit()]);
- lbXunit->setCurrentIndex(getItemNo(bb_units, unit));
+ string const unit = unit_name[anyLength.unit()];
+ lbXunit->setCurrentIndex(itemNumber(units, unit));
} else {
lbX->setText(toqstr(xl));
}
if (isValidLength(yl, &anyLength)) {
lbY->setText(toqstr(convert<string>(anyLength.value())));
- string const unit(unit_name[anyLength.unit()]);
- lbYunit->setCurrentIndex(getItemNo(bb_units, unit));
+ string const unit = unit_name[anyLength.unit()];
+ lbYunit->setCurrentIndex(itemNumber(units, unit));
} else {
lbY->setText(toqstr(xl));
}
if (isValidLength(xr, &anyLength)) {
rtX->setText(toqstr(convert<string>(anyLength.value())));
- string const unit(unit_name[anyLength.unit()]);
- rtXunit->setCurrentIndex(getItemNo(bb_units, unit));
+ string const unit = unit_name[anyLength.unit()];
+ rtXunit->setCurrentIndex(itemNumber(units, unit));
} else {
rtX->setText(toqstr(xl));
}
if (isValidLength(yr, &anyLength)) {
rtY->setText(toqstr(convert<string>(anyLength.value())));
- string const unit(unit_name[anyLength.unit()]);
- rtYunit->setCurrentIndex(getItemNo(bb_units, unit));
+ string const unit = unit_name[anyLength.unit()];
+ rtYunit->setCurrentIndex(itemNumber(units, unit));
} else {
rtY->setText(toqstr(xl));
}
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;
origin->addItem(toqstr(*it));
if (!igp.rotateOrigin.empty())
- origin->setCurrentIndex(
- getItemNo(origin_ltx, igp.rotateOrigin));
+ origin->setCurrentIndex(itemNumber(origin_ltx, 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));
}
{
InsetGraphicsParams & igp = params_;
- igp.filename.set(fromqstr(filename->text()), bufferFilepath());
- igp.filename.setEmbed(embedCB->checkState() == Qt::Checked);
+ igp.filename.set(fromqstr(filename->text()), fromqstr(bufferFilepath()));
// the bb section
igp.bb.erase();
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;
igp.rotateAngle = fromqstr(angle->text());
double rotAngle = convert<double>(igp.rotateAngle);
- if (std::abs(rotAngle) > 360.0) {
+ if (abs(rotAngle) > 360.0) {
rotAngle -= 360.0 * floor(rotAngle / 360.0);
igp.rotateAngle = convert<string>(rotAngle);
}
string const fn = fromqstr(filename->text());
if (fn.empty())
return;
- string const bb = readBB(fn);
+ string const bb = readBoundingBox(fn);
bbChanged = false;
if (bb.empty())
return;
bool GuiGraphics::initialiseParams(string const & data)
{
- InsetGraphicsMailer::string2params(data, buffer(), params_);
+ InsetGraphics::string2params(data, buffer(), params_);
return true;
}
void GuiGraphics::dispatchParams()
{
InsetGraphicsParams tmp_params(params_);
- string const lfun =
- InsetGraphicsMailer::params2string(tmp_params, buffer());
+ string const lfun = InsetGraphics::params2string(tmp_params, buffer());
dispatch(FuncRequest(getLfun(), lfun));
}
-docstring const GuiGraphics::browse(docstring const & in_name) const
+QString GuiGraphics::browse(QString const & in_name) const
{
- docstring const title = _("Select graphics file");
+ 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.exists() && clip.isDirectory()))
+ if (!clip.isDirectory())
clipdir = addName(package().system_support().absFilename(), "clipart");
- return browseRelFile(in_name, from_utf8(bufferFilepath()),
+ return browseRelFile(in_name, bufferFilepath(),
title, FileFilterList(), false,
- _("Clipart|#C#c"), from_utf8(clipdir),
- _("Documents|#o#O"), from_utf8(lyxrc.document_path));
+ qt_("Clipart|#C#c"), toqstr(clipdir),
+ qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
}
-string const GuiGraphics::readBB(string const & file)
+string GuiGraphics::readBoundingBox(string const & file)
{
- FileName const abs_file = makeAbsPath(file, bufferFilepath());
+ FileName const abs_file = makeAbsPath(file, fromqstr(bufferFilepath()));
// try to get it from the file, if possible. Zipped files are
// unzipped in the readBB_from_PSFile-Function
}
-bool GuiGraphics::isFilenameValid(string const & fname) const
+bool GuiGraphics::isFileNameValid(string const & fname) const
{
// It may be that the filename is relative.
- return makeAbsPath(fname, bufferFilepath()).isReadableFile();
-}
-
-
-void GuiGraphics::editGraphics()
-{
- applyView();
- string const lfun =
- InsetGraphicsMailer::params2string(params_, buffer());
- dispatch(FuncRequest(LFUN_GRAPHICS_EDIT, lfun));
-}
-
-
-namespace {
-
-char const * const bb_units[] = { "bp", "cm", "mm", "in" };
-size_t const bb_size = sizeof(bb_units) / sizeof(char *);
-
-// 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
-
-// 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") };
-
-size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *);
-
-} // namespace anon
-
-
-vector<string> const getBBUnits()
-{
- return vector<string>(bb_units, bb_units + bb_size);
-}
-
-
-vector<RotationOriginPair> getRotationOriginData()
-{
- static vector<RotationOriginPair> data;
- if (!data.empty())
- return data;
-
- data.resize(rorigin_size);
- for (size_type i = 0; i < rorigin_size; ++i) {
- data[i] = make_pair(_(rorigin_gui_strs[i]),
- rorigin_lyx_strs[i]);
- }
-
- return data;
+ return makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile();
}
projects / lyx.git / blobdiff