From 3bbde60e5a1a0d0e07f489f1e8dde3d7563bc503 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 25 Jan 2002 10:21:46 +0000 Subject: [PATCH] =?utf8?q?Bugfixes:=20checkboxes=20to=20radiobuttons=20(fr?= =?utf8?q?om=20J=EF=BF=BDrgen=20S)=20and=20remove=20a=20little=20redundant?= =?utf8?q?=20code=20(from=20me).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3432 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 8 ++++++++ src/frontends/xforms/FormTabular.C | 8 ++------ src/frontends/xforms/form_tabular.C | 18 ++++++++++++------ src/frontends/xforms/forms/form_tabular.fd | 12 ++++++------ 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 69c4fec606..f1fd912487 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2002-01-25 Angus Leeming + + * FormTabular.C (update): Remove redundant code. + +2002-01-24 Jürgen Spitzmüller + + * forms/form_tabular.fd: checkbox2radiobutton changes. + 2002-01-20 Herbert Voss * FormInclude.[C]: better control of unexistings files diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index 0848acfca0..9f9afcb501 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -203,9 +203,7 @@ void FormTabular::update() fl_set_button(cell_options_->radio_align_right, 1); else fl_set_button(cell_options_->radio_align_center, 1); - setEnabled(cell_options_->radio_align_left, true); - setEnabled(cell_options_->radio_align_right, true); - setEnabled(cell_options_->radio_align_center, true); + align = tabular->GetVAlignment(cell); fl_set_button(cell_options_->radio_valign_top, 0); fl_set_button(cell_options_->radio_valign_bottom, 0); @@ -216,9 +214,7 @@ void FormTabular::update() fl_set_button(cell_options_->radio_valign_bottom, 1); else fl_set_button(cell_options_->radio_valign_top, 1); - setEnabled(cell_options_->radio_valign_top, true); - setEnabled(cell_options_->radio_valign_bottom, true); - setEnabled(cell_options_->radio_valign_center, true); + special = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI); fl_set_input(cell_options_->input_special_multialign, special.c_str()); bool const metric = lyxrc.default_papersize > 3; diff --git a/src/frontends/xforms/form_tabular.C b/src/frontends/xforms/form_tabular.C index ed02ab6ef0..13851adbd8 100644 --- a/src/frontends/xforms/form_tabular.C +++ b/src/frontends/xforms/form_tabular.C @@ -225,23 +225,26 @@ FD_form_column_options * FormTabular::build_column_options() fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Top|#p"); - fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 330, 135, 155, 25, idex(_(dummy))); + fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 135, 155, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Center|#n"); - fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 330, 160, 155, 25, idex(_(dummy))); + fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 160, 155, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Bottom|#o"); - fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 330, 185, 155, 25, idex(_(dummy))); + fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 185, 155, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { @@ -360,23 +363,26 @@ FD_form_cell_options * FormTabular::build_cell_options() fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Top|#p"); - fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 135, 125, 25, idex(_(dummy))); + fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 135, 125, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Center|#n"); - fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 160, 125, 25, idex(_(dummy))); + fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 160, 125, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Bottom|#o"); - fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 185, 125, 25, idex(_(dummy))); + fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 185, 125, 25, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } + fl_set_object_color(obj, FL_COL1, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd index ed704f952b..23001056f0 100644 --- a/src/frontends/xforms/forms/form_tabular.fd +++ b/src/frontends/xforms/forms/form_tabular.fd @@ -548,7 +548,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 330 135 155 25 boxtype: FL_NO_BOX @@ -566,7 +566,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 330 160 155 25 boxtype: FL_NO_BOX @@ -584,7 +584,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 330 185 155 25 boxtype: FL_NO_BOX @@ -896,7 +896,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 350 135 125 25 boxtype: FL_NO_BOX @@ -914,7 +914,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 350 160 125 25 boxtype: FL_NO_BOX @@ -932,7 +932,7 @@ callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_CHECKBUTTON +class: FL_ROUND3DBUTTON type: PUSH_BUTTON box: 350 185 125 25 boxtype: FL_NO_BOX -- 2.39.2