}
-template<class Pair>
-vector<typename Pair::first_type> getFirst(vector<Pair> const & pr)
-{
- 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> getSecond(vector<Pair> const & pr)
-{
- 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 string and it's LaTeX equivalent.
-typedef pair<docstring, string> RotationOriginPair;
-///
-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", qt_("Graphics"))
{
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()));
connect(displayscale, SIGNAL(textChanged(const QString&)),
this, SLOT(change_adaptor()));
connect(groupCO, SIGNAL(currentIndexChanged(int)),
- this, SLOT(change_group(int)));
+ this, SLOT(changeGroup(int)));
displayscale->setValidator(new QIntValidator(displayscale));
}
-void GuiGraphics::change_group(int /* index */)
+void GuiGraphics::changeGroup(int /* index */)
{
QString const new_group = groupCO->itemData(
groupCO->currentIndex()).toString();
}
-void GuiGraphics::change_bb()
+void GuiGraphics::changeBB()
{
bbChanged = true;
LYXERR(Debug::GRAPHICS, "[bb_Changed set to true]");
(filename != "0"));
}
-// returns the number of the string s in the vector v
-static int itemNumber(const vector<string> & v, string const & s)
-{
- vector<string>::const_iterator cit =
- find(v.begin(), v.end(), s);
- return (cit != v.end()) ? int(cit - v.begin()) : 0;
-}
-
void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp)
{
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]);
- 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 = units.begin();
- it != 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]));
}
-
+
// set the right default unit
Length::UNIT const defaultUnit = Length::defaultUnit();
if (igp.bb.empty()) {
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);
string const xr = token(igp.bb, ' ', 2);
string const yr = token(igp.bb, ' ', 3);
if (isValidLength(xl, &anyLength)) {
- lbX->setText(toqstr(convert<string>(anyLength.value())));
+ doubleToWidget(lbX, anyLength.value());
string const unit = unit_name[anyLength.unit()];
- lbXunit->setCurrentIndex(itemNumber(units, unit));
+ lbXunit->setCurrentIndex(lbXunit->findData(toqstr(unit)));
} else {
lbX->setText(toqstr(xl));
}
if (isValidLength(yl, &anyLength)) {
- lbY->setText(toqstr(convert<string>(anyLength.value())));
+ doubleToWidget(lbY, anyLength.value());
string const unit = unit_name[anyLength.unit()];
- lbYunit->setCurrentIndex(itemNumber(units, unit));
+ lbYunit->setCurrentIndex(lbYunit->findData(toqstr(unit)));
} else {
lbY->setText(toqstr(xl));
}
if (isValidLength(xr, &anyLength)) {
- rtX->setText(toqstr(convert<string>(anyLength.value())));
+ doubleToWidget(rtX, anyLength.value());
string const unit = unit_name[anyLength.unit()];
- rtXunit->setCurrentIndex(itemNumber(units, unit));
+ rtXunit->setCurrentIndex(rtXunit->findData(toqstr(unit)));
} else {
rtX->setText(toqstr(xl));
}
if (isValidLength(yr, &anyLength)) {
- rtY->setText(toqstr(convert<string>(anyLength.value())));
+ doubleToWidget(rtY, anyLength.value());
string const unit = unit_name[anyLength.unit()];
- rtYunit->setCurrentIndex(itemNumber(units, unit));
+ rtYunit->setCurrentIndex(rtYunit->findData(toqstr(unit)));
} else {
rtY->setText(toqstr(xl));
}
// 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);
setAutoText();
- angle->setText(toqstr(igp.rotateAngle));
+ doubleToWidget(angle, igp.rotateAngle);
rotateOrderCB->setChecked(igp.scaleBeforeRotation);
rotateOrderCB->setEnabled( (widthChecked || heightChecked || scaleChecked)
origin->clear();
- vector<RotationOriginPair> origindata = getRotationOriginData();
- vector<docstring> const origin_lang = getFirst(origindata);
- origin_ltx = getSecond(origindata);
-
- for (vector<docstring>::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(itemNumber(origin_ltx, igp.rotateOrigin));
+ origin->setCurrentIndex(origin->findData(toqstr(igp.rotateOrigin)));
else
origin->setCurrentIndex(0);
// latex section
latexoptions->setText(toqstr(igp.special));
+ // cf bug #3852
+ filename->setFocus();
}
igp.bb.erase();
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<int>(lbXs) + convert<int>(lbYs) +
convert<int>(rtXs) + convert<int>(rtXs);
//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;
igp.noUnzip = unzipCB->isChecked();
igp.lyxscale = displayscale->text().toInt();
- igp.rotateAngle = fromqstr(angle->text());
+ igp.rotateAngle = widgetToDoubleStr(angle);
- double rotAngle = convert<double>(igp.rotateAngle);
+ double rotAngle = widgetToDouble(angle);
if (abs(rotAngle) > 360.0) {
rotAngle -= 360.0 * floor(rotAngle / 360.0);
igp.rotateAngle = convert<string>(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
bbChanged = false;
if (bb.empty())
return;
- 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));
// the default units for the bb values when reading
// it from the file
lbXunit->setCurrentIndex(0);
projects / lyx.git / blobdiff