Rename figure-insert.xpm as graphics-insert.xpm.

Martin's tweek of the graphics dialog.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3466 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8b355389d03cd71d31b4e2ac6d30661dda8f1f04..ddb1bad61155547caa64ff1c5893ea6a012c1609 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-31  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * images/figure-insert.xpm: renamed as images/graphics-insert.xpm.
+
 2002-01-30  Herbert Voss  <voss@lyx.org>
 
        * configure.m4: add convert-support for ps-files

diff --git a/lib/images/figure-insert.xpm b/lib/images/figure-insert.xpm
deleted file mode 100644 (file)
index 9b3d063..0000000
--- a/lib/images/figure-insert.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char const * fig_xpm[] = {
-"20 20 4 1",
-"      c None",
-".     c #FFFFFFFFFFFF",
-"X     c #7B7B00000000",
-"o     c gray70",
-"                    ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ....XXXXXXXXXX.... ",
-" ....X........X.... ",
-" ....X....  ..X.... ",
-" ....X... .. .X.... ",
-" ....X.. oooo X.... ",
-" ....X. ooooooX.... ",
-" ....X oooooooX.... ",
-" ....XXXXXXXXXX.... ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-"                    "};
-
-

diff --git a/lib/images/graphics-insert.xpm b/lib/images/graphics-insert.xpm
new file mode 100644 (file)
index 0000000..9b3d063
--- /dev/null
+++ b/lib/images/graphics-insert.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char const * fig_xpm[] = {
+"20 20 4 1",
+"      c None",
+".     c #FFFFFFFFFFFF",
+"X     c #7B7B00000000",
+"o     c gray70",
+"                    ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ....XXXXXXXXXX.... ",
+" ....X........X.... ",
+" ....X....  ..X.... ",
+" ....X... .. .X.... ",
+" ....X.. oooo X.... ",
+" ....X. ooooooX.... ",
+" ....X oooooooX.... ",
+" ....XXXXXXXXXX.... ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+" ..              .. ",
+" .................. ",
+"                    "};
+
+

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 52393d778d386e553e381dd5d47edff5c36feacc..164de5cfdaeafb7e110a0138bd66b89dd9d1425a 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-31  Martin Vermeer <martin.vermeer@hut.fi>
+
+       * forms/form_graphics.fd: tweeks.
+
 2002-01-30  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * FormGraphics.C: Fix MAXDIGIT values for height and width.

diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C
index 32095e3cdef218e1f746932cb7083a6eed23d3a1..4a2784b31f91fa653da3e6c18532c562f0319557 100644 (file)
--- a/src/frontends/xforms/form_graphics.C
+++ b/src/frontends/xforms/form_graphics.C
@@ -269,61 +269,61 @@ FD_form_bbox * FormGraphics::build_bbox()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 25, 455, 195, _("Bounding Box"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 120, 35, 35, 25, _("X"));
+  obj = fl_add_text(FL_NORMAL_TEXT, 135, 35, 35, 25, _("X"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 325, 35, 30, 25, _("Y"));
+  obj = fl_add_text(FL_NORMAL_TEXT, 360, 35, 30, 25, _("Y"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Left Bottom:|#L");
-    fdui->input_bb_x0 = obj = fl_add_input(FL_NORMAL_INPUT, 120, 60, 50, 30, idex(_(dummy)));
+    fdui->input_bb_x0 = obj = fl_add_input(FL_NORMAL_INPUT, 135, 60, 50, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_bb_x0 = obj = fl_add_choice(FL_NORMAL_CHOICE, 175, 60, 50, 30, "");
+  fdui->choice_bb_x0 = obj = fl_add_choice(FL_NORMAL_CHOICE, 190, 60, 50, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Right Top:|#R");
-    fdui->input_bb_x1 = obj = fl_add_input(FL_NORMAL_INPUT, 120, 100, 50, 30, idex(_(dummy)));
+    fdui->input_bb_x1 = obj = fl_add_input(FL_NORMAL_INPUT, 135, 100, 50, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_bb_x1 = obj = fl_add_choice(FL_NORMAL_CHOICE, 175, 100, 50, 30, "");
+  fdui->choice_bb_x1 = obj = fl_add_choice(FL_NORMAL_CHOICE, 190, 100, 50, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Left Bottom:|#f");
-    fdui->input_bb_y0 = obj = fl_add_input(FL_NORMAL_INPUT, 325, 60, 50, 30, idex(_(dummy)));
+    fdui->input_bb_y0 = obj = fl_add_input(FL_NORMAL_INPUT, 360, 60, 50, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_bb_y0 = obj = fl_add_choice(FL_NORMAL_CHOICE, 380, 60, 45, 30, "");
+  fdui->choice_bb_y0 = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 60, 45, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Right Top:|#T");
-    fdui->input_bb_y1 = obj = fl_add_input(FL_NORMAL_INPUT, 325, 100, 50, 30, idex(_(dummy)));
+    fdui->input_bb_y1 = obj = fl_add_input(FL_NORMAL_INPUT, 360, 100, 50, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_bb_y1 = obj = fl_add_choice(FL_NORMAL_CHOICE, 380, 100, 45, 30, "");
+  fdui->choice_bb_y1 = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 100, 45, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("clip to bounding box|#c");
-    fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 295, 145, 30, 30, idex(_(dummy)));
+    fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 260, 145, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -331,7 +331,7 @@ FD_form_bbox * FormGraphics::build_bbox()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("draft mode|#d");
-    fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 295, 180, 30, 30, idex(_(dummy)));
+    fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 260, 180, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -339,7 +339,7 @@ FD_form_bbox * FormGraphics::build_bbox()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Get bounding box from file|#G");
-    fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 30, 160, 200, 30, idex(_(dummy)));
+    fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 30, 160, 220, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);

diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd
index a7b27af3e0455053dab110877648ade6c4eee408..57eb1baba99773e3e25842114a43f5824f7aea55 100644 (file)
--- a/src/frontends/xforms/forms/form_graphics.fd
+++ b/src/frontends/xforms/forms/form_graphics.fd
@@ -406,7 +406,7 @@ argument:
 --------------------
 class: FL_BEGIN_GROUP
 type: 0
-box: 0 10 10 0
+box: 0 0 0 0
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
@@ -664,7 +664,7 @@ argument:
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 120 35 35 25
+box: 135 35 35 25
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@@ -682,7 +682,7 @@ argument:
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 325 35 30 25
+box: 360 35 30 25
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@@ -700,7 +700,7 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 120 60 50 30
+box: 135 60 50 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -718,7 +718,7 @@ argument: 0
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 175 60 50 30
+box: 190 60 50 30
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -736,7 +736,7 @@ argument: 0
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 120 100 50 30
+box: 135 100 50 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -754,7 +754,7 @@ argument: 0
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 175 100 50 30
+box: 190 100 50 30
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -772,7 +772,7 @@ argument: 0
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 325 60 50 30
+box: 360 60 50 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -790,7 +790,7 @@ argument: 0
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 380 60 45 30
+box: 415 60 45 30
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -808,7 +808,7 @@ argument: 0
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 325 100 50 30
+box: 360 100 50 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -826,7 +826,7 @@ argument: 0
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 380 100 45 30
+box: 415 100 45 30
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -844,7 +844,7 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 295 145 30 30
+box: 260 145 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
@@ -862,7 +862,7 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 295 180 30 30
+box: 260 180 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
@@ -880,7 +880,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 30 160 200 30
+box: 30 160 220 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER