// end of each line.
char const * const rorigin_lyx_strs[] = {
// the LaTeX default is leftBaseline
- "leftBaseline", "leftTop", "leftBottom", // lB lt lb
- "center", "centerBaseline", "centerTop", "centerBottom", // c cB ct cb
- "rightBaseline", "rightTop", "rightBottom" }; // rt rb rB
+ "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_("left baseline"), N_("left top"), N_("left bottom"),
- N_("center"), N_("center baseline"), N_("center top"), N_("center bottom"),
- N_("right baseline"), N_("right top"), N_("right bottom") };
+ N_("Top left"), N_("Bottom left"), N_("Left baseline"),
+ N_("Center"), N_("Top center"), N_("Bottom center"), N_("Center baseline"),
+ N_("Top right"), N_("Bottom right"), N_("Right baseline") };
size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *);
// Store the identifiers for later
origins_ = getSecond(origindata);
- string const choice = " " + getStringFromVector(getFirst(origindata), " | ") + " ";
+ string const choice = "Default|" + getStringFromVector(getFirst(origindata), "|");
fl_addto_choice(extra_->choice_origin, choice.c_str());
// set up the tooltips for the extra section
fl_set_input(extra_->input_rotate_angle, tostr(igp.rotateAngle).c_str());
int const origin_pos = fl_get_choice(extra_->choice_origin);
- igp.rotateOrigin = origins_[origin_pos-1];
+ if (origin_pos == 1) {
+ igp.rotateOrigin.erase();
+ } else {
+ igp.rotateOrigin = origins_[origin_pos - 2];
+ }
igp.subcaption = fl_get_button(extra_->check_subcaption);
igp.subcaptionText = getString(extra_->input_subcaption);
fl_set_input(extra_->input_rotate_angle,
tostr(igp.rotateAngle).c_str());
- int const origin_pos = findPos(origins_, igp.rotateOrigin);
- fl_set_choice(extra_->choice_origin, 1 + origin_pos);
+ int origin_pos;
+ if (igp.rotateOrigin.empty()) {
+ origin_pos = 1;
+ } else {
+ origin_pos = 2 + findPos(origins_, igp.rotateOrigin);
+ }
+ fl_set_choice(extra_->choice_origin, origin_pos);
fl_set_button(extra_->check_subcaption, igp.subcaption);
fl_set_input(extra_->input_subcaption, igp.subcaptionText.c_str());
=============== FORM ===============
Name: form_graphics
-Width: 510
-Height: 340
+Width: 430
+Height: 325
Number of Objects: 7
--------------------
class: FL_BOX
type: FLAT_BOX
-box: 0 0 510 340
+box: 0 0 430 325
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_TABFOLDER
type: TOP_TABFOLDER
-box: 5 5 500 270
+box: 0 5 430 260
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_TOP_LEFT
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 5 305 100 30
+box: 5 295 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
-box: 225 305 90 30
+box: 145 295 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 415 305 90 30
+box: 335 295 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 320 305 90 30
+box: 240 295 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_TEXT
type: NORMAL_TEXT
-box: 5 275 500 25
+box: 0 265 430 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
=============== FORM ===============
Name: form_graphics_file
-Width: 500
-Height: 245
+Width: 430
+Height: 235
Number of Objects: 15
--------------------
class: FL_BOX
type: FLAT_BOX
-box: 0 0 500 245
+box: 0 0 430 235
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
-box: 10 130 480 105
+box: 5 125 420 105
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
lcol: FL_BLACK
label: Output
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_ALL
+gravity: FL_West FL_East
name:
callback:
argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 75 10 285 30
+box: 75 10 245 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: File|#F
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_NorthEast
name: input_filename
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 365 10 100 30
+box: 325 10 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
label: Browse...|#B
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_NorthEast FL_NorthEast
name: button_browse
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
-box: 10 60 480 60
+box: 5 55 420 60
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
lcol: FL_BLACK
label: LyX View
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_ALL
+gravity: FL_West FL_East
name:
callback:
argument:
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 315 145 30 30
+box: 265 135 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
label: Draft mode|#m
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name: check_draft
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 315 180 30 30
+box: 265 165 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
label: Do not unzip|#u
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name: check_nounzip
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 95 75 70 30
+box: 95 70 70 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Scale|#S
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
name: input_lyxscale
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 95 145 70 30
+box: 95 135 70 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Width|#W
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
name: input_width
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 165 145 50 30
+box: 165 135 60 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
label:
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name: choice_width
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 165 175 50 30
+box: 165 165 60 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
label:
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name: choice_height
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 175 205 30 30
+box: 95 200 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_RIGHT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Maintain aspect ratio|#M
+label: Maintain aspect ratio|#a
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_West FL_West
name: check_aspectratio
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 95 175 70 30
+box: 95 165 70 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Height|#H
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
name: input_height
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_TEXT
type: NORMAL_TEXT
-box: 165 75 30 30
+box: 165 70 25 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
label: %
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name:
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 315 75 100 30
+box: 275 70 115 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
label: Display|#D
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_East FL_East
name: choice_display
callback: C_FormBaseInputCB
argument: 0
=============== FORM ===============
Name: form_graphics_bbox
-Width: 500
-Height: 245
+Width: 430
+Height: 235
Number of Objects: 10
--------------------
class: FL_BOX
type: FLAT_BOX
-box: 0 0 500 245
+box: 0 0 430 235
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 135 55 50 30
+box: 135 55 50 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Right top|#R
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_bb_x1
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 190 55 50 30
+box: 190 55 50 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label:
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_bb_y1
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 135 90 50 30
+box: 135 85 50 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Left bottom|#L
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_bb_x0
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 190 90 50 30
+box: 190 85 50 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_RIGHT
lcol: FL_BLACK
label:
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_bb_y0
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_TEXT
type: NORMAL_TEXT
-box: 145 30 30 25
+box: 150 30 25 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
label: X
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_North FL_North
name:
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
-box: 200 30 30 25
+box: 200 30 25 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
label: Y
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_North FL_North
name:
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 260 70 45 30
+box: 255 70 45 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_RIGHT
label: Units|#U
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_North FL_North
name: choice_bb_units
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 45 165 30 30
+box: 45 165 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
lcol: FL_BLACK
label: Clip to bounding box|#C
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_NorthWest FL_NorthWest
name: check_clip
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 305 165 125 30
+box: 285 165 130 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
label: Get from file|#G
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_NorthWest FL_NorthWest
name: button_getBB
callback: C_FormBaseInputCB
argument: 0
=============== FORM ===============
Name: form_graphics_extra
-Width: 500
-Height: 245
+Width: 430
+Height: 235
Number of Objects: 8
--------------------
class: FL_BOX
type: FLAT_BOX
-box: 0 0 500 245
+box: 0 0 430 235
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
callback:
argument:
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 120 170 370 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: LaTeX options|#L
-shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
-name: input_special
-callback: C_FormBaseInputCB
-argument: 0
-
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
-box: 10 15 480 60
+box: 5 20 420 55
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
lcol: FL_BLACK
label: Rotation
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_ALL
+gravity: FL_North FL_North
name:
callback:
argument:
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 115 165 310 25
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: LaTeX options|#L
+shortcut:
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
+name: input_special
+callback: C_FormBaseInputCB
+argument: 0
+
--------------------
class: FL_TEXT
type: NORMAL_TEXT
-box: 155 30 38 30
+box: 150 35 35 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
lcol: FL_BLACK
label: deg
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
name:
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 300 30 118 28
+box: 255 35 150 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Origin|#O
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: choice_origin
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 10 115 30 30
+box: 5 105 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
label: Subfigure|#S
shortcut:
resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_West FL_West
name: check_subcaption
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: INT_INPUT
-box: 100 30 55 30
+box: 95 35 55 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label: Angle|#A
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_rotate_angle
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 120 115 370 30
+box: 115 105 310 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
lcol: FL_BLACK
label:
shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
name: input_subcaption
callback: C_FormBaseInputCB
argument: 0