J�rgen Spitzm�ller's bullet patch.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 216d3381eafc2de7e712a4d78873e2d08f38736c..be5afc28e5b8c889fcc5686061d7bbf446a04046 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -7,6 +7,11 @@
 
        * FormSpellchecker.C: fix possible crash on clicking a suggestion
 
+2002-01-08  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * forms/form_document.fd (bullets): fix small cosmetic problem after
+       John's radio2button change.
+
 2002-01-07  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormDocument.C:

diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C
index 629a528c33042ca9f1bff9f2570991443c45e0e8..7dc99b81ec0d867a78e6027ee58f2b998e29560e 100644 (file)
--- a/src/frontends/xforms/form_document.C
+++ b/src/frontends/xforms/form_document.C
@@ -579,39 +579,39 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
   fdui->radio_bullet_depth = fl_bgn_group();
   {
     char const * const dummy = N_("1|#1");
-    fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 40, 30, idex(_(dummy)));
+    fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 55, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_LARGE_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH1);
     fl_set_button(obj, 1);
   {
     char const * const dummy = N_("2|#2");
-    fdui->radio_bullet_depth_2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 210, 35, 40, 30, idex(_(dummy)));
+    fdui->radio_bullet_depth_2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 215, 35, 55, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_LARGE_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH2);
   {
     char const * const dummy = N_("3|#3");
-    fdui->radio_bullet_depth_3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 270, 35, 40, 30, idex(_(dummy)));
+    fdui->radio_bullet_depth_3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 275, 35, 55, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_LARGE_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH3);
   {
     char const * const dummy = N_("4|#4");
-    fdui->radio_bullet_depth_4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 35, 40, 30, idex(_(dummy)));
+    fdui->radio_bullet_depth_4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 335, 35, 55, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_LARGE_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH4);
   fl_end_group();
@@ -627,7 +627,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL1);
@@ -638,7 +638,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL2);
@@ -648,7 +648,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL3);
@@ -658,7 +658,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL4);
@@ -668,7 +668,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL5);
@@ -678,7 +678,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);

diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd
index ab1b7de6d521f35d9ce5891363b76a7bf6f3546d..ca2ffbac5ab139a278c6c943fcd3dabb294bcabb 100644 (file)
--- a/src/frontends/xforms/forms/form_document.fd
+++ b/src/frontends/xforms/forms/form_document.fd
@@ -1615,9 +1615,9 @@ argument:
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 150 35 40 30
+box: 150 35 55 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_LARGE_SIZE
@@ -1634,9 +1634,9 @@ argument: BULLETDEPTH1
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 210 35 40 30
+box: 215 35 55 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_LARGE_SIZE
@@ -1652,9 +1652,9 @@ argument: BULLETDEPTH2
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 270 35 40 30
+box: 275 35 55 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_LARGE_SIZE
@@ -1670,9 +1670,9 @@ argument: BULLETDEPTH3
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 330 35 40 30
+box: 335 35 55 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_LARGE_SIZE
@@ -1744,7 +1744,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 105 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -1763,7 +1763,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 135 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -1781,7 +1781,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 195 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -1799,7 +1799,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 225 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -1817,7 +1817,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 255 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -1835,7 +1835,7 @@ class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
 box: 15 165 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE