anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mainly whitespace, but also a helper func getLyXLengthFromWidgets.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3799 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-03-21 16:51:33 +00:00
parent 7514c31edf
commit c75af79458
1 changed files with 187 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/frontends/xforms/FormGraphics.C
View File

@ -39,6 +39,12 @@ int const ROTATE_MAXCHARS = 4;
int const FILENAME_MAXCHARS = 1024;
string defaultUnit("cm");
/// Given input and choice widgets, create a LyXLength
LyXLength getLyXLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
{
return LyXLength(getLengthFromWidgets(input, choice));
}
} // namespace anon
@ -231,10 +237,13 @@ void FormGraphics::apply()
igp.lyxsize_type = InsetGraphicsParams::WH;
else
igp.lyxsize_type = InsetGraphicsParams::SCALE;
igp.lyxwidth = LyXLength(getLengthFromWidgets(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth));
igp.lyxheight = LyXLength(getLengthFromWidgets(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight));
igp.lyxwidth = getLyXLengthFromWidgets(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth);
igp.lyxheight = getLyXLengthFromWidgets(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight);
igp.lyxscale = strToInt(getStringFromInput(lyxview_->input_lyxscale));
// the size section
@ -244,10 +253,13 @@ void FormGraphics::apply()
igp.size_type = InsetGraphicsParams::WH;
else
igp.size_type = InsetGraphicsParams::SCALE;
igp.width = LyXLength(getLengthFromWidgets(size_->input_width,
size_->choice_width_units));
igp.height = LyXLength(getLengthFromWidgets(size_->input_height,
size_->choice_height_units));
igp.width = getLyXLengthFromWidgets(size_->input_width,
size_->choice_width_units);
igp.height = getLyXLengthFromWidgets(size_->input_height,
size_->choice_height_units);
igp.scale = strToInt(getStringFromInput(size_->input_scale));
igp.keepAspectRatio = fl_get_button(size_->check_aspectratio);
@ -506,14 +518,18 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
_("The units t%, p%, c% and l% are not allowed here."),
_("Cannot use the values from LaTeX size!"));
else {
LyXLength dummy = LyXLength(getLengthFromWidgets(size_->input_width,
size_->choice_width_units));
LyXLength dummy =
getLyXLengthFromWidgets(size_->input_width,
size_->choice_width_units);
updateWidgetsFromLength(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth, dummy, defaultUnit);
dummy = LyXLength(getLengthFromWidgets(size_->input_height,
size_->choice_height_units));
lyxview_->choice_width_lyxwidth,
dummy, defaultUnit);
dummy = getLyXLengthFromWidgets(size_->input_height,
size_->choice_height_units);
updateWidgetsFromLength(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight, dummy, defaultUnit);
lyxview_->choice_width_lyxheight,
dummy, defaultUnit);
string const scale = getStringFromInput(size_->input_scale);
fl_set_input(lyxview_->input_lyxscale, scale.c_str());
if (fl_get_button (size_->radio_asis) == 1) {
@ -591,14 +607,16 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
setEnabled(size_->check_aspectratio, 0);
setEnabled(size_->input_scale, 1);
} else if (ob == size_->button_lyx_values) {
LyXLength dummy = LyXLength(getLengthFromWidgets(
lyxview_->input_lyxwidth, lyxview_->choice_width_lyxwidth));
LyXLength dummy = getLyXLengthFromWidgets(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth);
updateWidgetsFromLength(size_->input_width,
size_->choice_width_units, dummy, defaultUnit);
dummy = LyXLength(getLengthFromWidgets(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight));
size_->choice_width_units,
dummy, defaultUnit);
dummy = getLyXLengthFromWidgets(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight);
updateWidgetsFromLength(size_->input_height,
size_->choice_height_units, dummy, defaultUnit);
size_->choice_height_units,
dummy, defaultUnit);
string const scale = getStringFromInput(lyxview_->input_lyxscale);
fl_set_input(size_->input_scale, scale.c_str());
if (fl_get_button (lyxview_->radio_lyxasis) == 1) {
@ -654,4 +672,3 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
return ButtonPolicy::SMI_VALID;
}