anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rob's latest and greatest dialog tweaking.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5282 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-09-12 08:44:23 +00:00
parent 121cf03d40
commit b0357a33ae
9 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-12 Rob Lahaye <lahaye@snu.ac.kr>
* FormGraphics.C: improve tooltips text
* forms/form_graphics.fd: cosmetic change in file tab
2002-09-12 Rob Lahaye <lahaye@snu.ac.kr> 2002-09-12 Rob Lahaye <lahaye@snu.ac.kr>
* FormPrint.[Ch]: * FormPrint.[Ch]:

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

@ -100,11 +100,10 @@ void FormGraphics::build()
fl_set_input_maxchars(file_->input_filename, FILENAME_MAXCHARS); fl_set_input_maxchars(file_->input_filename, FILENAME_MAXCHARS);
fl_set_input_filter(file_->input_lyxscale, fl_unsigned_int_filter); fl_set_input_filter(file_->input_lyxscale, fl_unsigned_int_filter);
// width default is scaling, thus unsigned integer input // width default is scaling, thus unsigned integer input
fl_set_input_filter(file_->input_width, fl_unsigned_int_filter); fl_set_input_filter(file_->input_width, fl_unsigned_int_filter);
fl_set_input_maxchars(file_->input_height, SIZE_MAXDIGITS); fl_set_input_maxchars(file_->input_height, SIZE_MAXDIGITS);
string const display_List = _("Default|Monochrome|Grayscale|Color|Do not display"); string const display_List = _("Default|Monochrome|Grayscale|Color|Do not display");
fl_addto_choice(file_->choice_display, display_List.c_str()); fl_addto_choice(file_->choice_display, display_List.c_str());
@ -124,14 +123,14 @@ void FormGraphics::build()
str = _("Browse the directories."); str = _("Browse the directories.");
tooltips().init(file_->button_browse, str); tooltips().init(file_->button_browse, str);
str = _("Scale the image to inserted percentage value"); str = _("Scale the image to inserted percentage value.");
tooltips().init(file_->input_lyxscale, str); tooltips().init(file_->input_lyxscale, str);
str = _("Select display mode for this image."); str = _("Select display mode for this image.");
tooltips().init(file_->choice_display, str); tooltips().init(file_->choice_display, str);
str = _("Set the image width to the inserted value."); str = _("Set the image width to the inserted value.");
tooltips().init(file_->input_width, str); tooltips().init(file_->input_width, str);
str = _("Select unit for width; Scale% for scaling whole image"); str = _("Select unit for width; Scale% for scaling whole image.");
tooltips().init(file_->choice_width, str); tooltips().init(file_->choice_width, str);
str = _("Set the image height to the inserted value."); str = _("Set the image height to the inserted value.");
tooltips().init(file_->input_height, str); tooltips().init(file_->input_height, str);
@ -142,7 +141,7 @@ void FormGraphics::build()
tooltips().init(file_->check_aspectratio, str); tooltips().init(file_->check_aspectratio, str);
str = _("Pass a filename like \"file.eps.gz\" to the LaTeX output. " str = _("Pass a filename like \"file.eps.gz\" to the LaTeX output. "
"This is useful when LaTeX should unzip the file. Needs an additional file " "Useful when LaTeX should unzip the file. Needs an additional file "
"like \"file.eps.bb\" which holds the values for the bounding box."); "like \"file.eps.bb\" which holds the values for the bounding box.");
tooltips().init(file_->check_nounzip, str); tooltips().init(file_->check_nounzip, str);
@ -185,11 +184,10 @@ void FormGraphics::build()
str = _("Read the image coordinates new from file. If it's an (e)ps-file " str = _("Read the image coordinates new from file. If it's an (e)ps-file "
"then the bounding box is read otherwise the imagesize in pixels. " "then the bounding box is read otherwise the imagesize in pixels. "
"The default unit is \"bp\", the PostScript's b(ig) p(oint)."); "Default unit is \"bp\", the PostScript's b(ig) p(oint).");
tooltips().init(bbox_->button_getBB, str); tooltips().init(bbox_->button_getBB, str);
str = _("Enable this checkbox when the image should be clipped to the " str = _("Clip image to the bounding box values.");
"bounding box values.");
tooltips().init(bbox_->check_clip, str); tooltips().init(bbox_->check_clip, str);
// the extra section // the extra section
@ -218,13 +216,13 @@ void FormGraphics::build()
// set up the tooltips for the extra section // set up the tooltips for the extra section
str = _("Insert the rotation angle in degrees. " str = _("Insert the rotation angle in degrees. "
"Positive value rotates anti-clockwise, negative value clockwise"); "Positive value rotates anti-clockwise, negative value clockwise.");
tooltips().init(extra_->input_rotate_angle, str); tooltips().init(extra_->input_rotate_angle, str);
str = _("Insert the point of origin for rotation "); str = _("Insert the point of origin for rotation.");
tooltips().init(extra_->choice_origin, str); tooltips().init(extra_->choice_origin, str);
str = _("Enables use of subfigure with its own caption."); str = _("Enables use of subfigure with its own caption.");
tooltips().init(extra_->check_subcaption, str); tooltips().init(extra_->check_subcaption, str);
str = _("Insert the optional subfigure caption"); str = _("Insert the optional subfigure caption.");
tooltips().init(extra_->input_subcaption, str); tooltips().init(extra_->input_subcaption, str);
str = _("Add any additional latex option, which is defined in the " str = _("Add any additional latex option, which is defined in the "
"graphicx-package and not mentioned in the gui's tabfolders."); "graphicx-package and not mentioned in the gui's tabfolders.");

12
src/frontends/xforms/forms/form_citation.fd
View File

@ -214,7 +214,7 @@ argument:
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 360 60 25 25 box: 360 60 170 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -232,7 +232,7 @@ argument:
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 360 90 25 25 box: 360 90 170 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -304,10 +304,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 365 245 25 25 box: 365 245 200 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
@ -322,10 +322,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 365 275 25 25 box: 365 275 200 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK

28
src/frontends/xforms/forms/form_graphics.fd
View File

@ -238,10 +238,10 @@ argument:
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 265 135 25 25 box: 265 135 155 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
@ -256,10 +256,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 265 165 25 25 box: 265 165 155 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
@ -292,7 +292,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 95 135 70 25 box: 95 140 70 25
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -310,7 +310,7 @@ argument: 0
-------------------- --------------------
class: FL_CHOICE class: FL_CHOICE
type: NORMAL_CHOICE type: NORMAL_CHOICE
box: 165 135 60 25 box: 165 140 60 25
boxtype: FL_FRAME_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -328,7 +328,7 @@ argument: 0
-------------------- --------------------
class: FL_CHOICE class: FL_CHOICE
type: NORMAL_CHOICE type: NORMAL_CHOICE
box: 165 165 60 25 box: 165 170 60 25
boxtype: FL_FRAME_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -346,10 +346,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 95 200 25 25 box: 70 200 190 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
@ -364,7 +364,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 95 165 70 25 box: 95 170 70 25
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -568,10 +568,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 45 165 25 25 box: 45 165 200 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
@ -700,10 +700,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 5 105 25 25 box: 5 105 110 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK

12
src/frontends/xforms/forms/form_print.fd
View File

@ -160,7 +160,7 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 175 265 25 25 box: 175 265 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -214,7 +214,7 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 5 305 25 25 box: 5 305 200 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -291,7 +291,7 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 10 210 25 25 box: 10 210 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -309,7 +309,7 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 110 210 25 25 box: 110 210 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -417,7 +417,7 @@ argument:
-------------------- --------------------
class: FL_ROUND3DBUTTON class: FL_ROUND3DBUTTON
type: RADIO_BUTTON type: RADIO_BUTTON
box: 10 140 25 25 box: 10 140 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -435,7 +435,7 @@ argument: 0
-------------------- --------------------
class: FL_ROUND3DBUTTON class: FL_ROUND3DBUTTON
type: RADIO_BUTTON type: RADIO_BUTTON
box: 10 170 25 25 box: 10 170 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER

4
src/frontends/xforms/forms/form_ref.fd
View File

@ -70,10 +70,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 5 155 25 25 box: 5 155 100 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK

4
src/frontends/xforms/forms/form_url.fd
View File

@ -70,10 +70,10 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 70 5 25 25 box: 70 5 320 25
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK

7
src/insets/ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-12 Rob Lahaye <lahaye@snu.ac.kr>
* insetgraphicsParams.C: use empty string as default for rotateOrigin
2002-09-10 Rob Lahaye <lahaye@snu.ac.kr>
* insetgraphicsParams.C: use empty string as default for rotateOrigin
2002-09-11 André Pönitz <poenitz@gmx.net> 2002-09-11 André Pönitz <poenitz@gmx.net>

18
src/insets/insetgraphicsParams.C
View File

@ -6,7 +6,7 @@
* Copyright 1995-2001 The LyX Team. * Copyright 1995-2001 The LyX Team.
* *
* \author Baruch Even * \author Baruch Even
* \author Herbert Voss <voss@lyx.org> * \author Herbert Voss
* *
* ================================================= */ * ================================================= */
@ -56,24 +56,24 @@ InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
void InsetGraphicsParams::init() void InsetGraphicsParams::init()
{ {
subcaptionText = filename = string(); filename.erase();
lyxscale = 100; // lyx scaling in percentage lyxscale = 100; // lyx scaling in percentage
display = grfx::DefaultDisplay; // see pref display = grfx::DefaultDisplay; // display mode; see preferences
scale = 100; // output scaling in percentage scale = 100; // output scaling in percentage
width = LyXLength(); width = LyXLength();
height = LyXLength(); height = LyXLength();
keepAspectRatio = false; // for latex keepAspectRatio = false; // for LaTeX output
draft = false; // draft mode draft = false; // draft mode
noUnzip = false; // unzip files noUnzip = false; // unzip files
bb = string(); // bounding box bb = string(); // bounding box
clip = false; // clip image clip = false; // clip image
rotateOrigin = "leftBaseline"; // Origin rotateAngle = 0.0; // angle of rotation in degrees
rotateAngle = 0.0; // in degrees rotateOrigin.erase(); // Origin of rotation
subcaption = false; // subfigure subcaption = false; // subfigure
subcaptionText = string(); // subfigure caption subcaptionText.erase(); // subfigure caption
special = string(); // userdefined stuff special.erase(); // additional userdefined stuff
} }
void InsetGraphicsParams::copy(InsetGraphicsParams const & igp) void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
@ -167,7 +167,7 @@ void InsetGraphicsParams::Write(ostream & os) const
if (rotateAngle != 0.0) if (rotateAngle != 0.0)
os << "\trotateAngle " << rotateAngle << '\n'; os << "\trotateAngle " << rotateAngle << '\n';
if (rotateOrigin != "leftBaseline") if (!rotateOrigin.empty())
os << "\trotateOrigin " << rotateOrigin << '\n'; os << "\trotateOrigin " << rotateOrigin << '\n';
if (subcaption) if (subcaption)
os << "\tsubcaption\n"; os << "\tsubcaption\n";