Angus Leeming wrote:
The next installment of Rob's changes.
Ok to apply?
Index: src/frontends/xforms/FormGraphics.C:
- string str = _("The file you want to insert.");
+ string str = _("The file you want to insert");
- str = _("Scale the image to inserted percentage value.");
+ str = _("Scale the image to inserted percentage value");
- str = _("Set the image width to the inserted value.");
+ str = _("Set the image width to the inserted value");
etc. etc. etc.
John once refused to apply a patch of mine because the tooltips were not
proper English, i.e. ending with a full stop! So I did my best to write
tooltips in proper English.....and now you are removing the full stops
at the end !?!?! Grumph, grumph....
+ igp.scale = strToDbl(getString(file_->input_width));
+ if (igp.scale == 0.0) {
+ igp.scale = 100.0;
}
At this spot the scale is flipped to 100.0 if its (too close to) zero.
(Should we use "if (!lyx::float_equal(scale, 0.0, 0.05))" instead, or not?).
As it is now:
scale = 0.0 means: don't use scale, but width/height instead.
scale != 0.0 means: use scale, not width/height.
I thus made the decision, if you select "scale%", but entered the
value 0.0, then flip it to 100.0, since scaling by 0.0 percent is
illegal; don't know whether it actually would crash LyX or LaTeX.
Now I think of it, we may better use "scale = -1" (or any negative value)
to indicate the use of width/height. Checking "scale < 0" is safer than
checking "scale == 0.0", isn't it? Would you allow me to fix this?
Rob.
