From 5bca2431091765b1552cbb5410b1f2c18bbcb9c1 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 10 Sep 2001 12:25:40 +0000 Subject: [PATCH] =?utf8?q?J=EF=BF=BDrgen=20Spitzm=EF=BF=BDller's=20tweak?= =?utf8?q?=20of=20the=20Paragraph=20dialog.=20Finally=20(=3F)=20fix=20memo?= =?utf8?q?ry=20leak=20in=20Maths=20Bitmap=20dialog.?= 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@2717 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 9 +++++++ src/frontends/xforms/FormMathsBitmap.C | 6 ++--- src/frontends/xforms/FormParagraph.C | 3 +++ src/frontends/xforms/form_paragraph.C | 9 ++++--- src/frontends/xforms/forms/form_paragraph.fd | 26 +++++++++++++++++--- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 603127aff0..ba10bfb157 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,12 @@ +2001-09-10 Angus Leeming + + * FormMathsBitmap (build): fix memory leak. + +2001-09-08 Jürgen Spitzmüller + + * forms/form_paragraph.fd: cosmetics (renamed "Label Width" to "Longest + Label", added a labelframe). + 2001-09-10 Lars Gullik Bjønnes * Toolbar_pimpl.C (C_Toolbar_BubblePost): fix linking diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C index 50c5f27f2c..aadd9c8f9b 100644 --- a/src/frontends/xforms/FormMathsBitmap.C +++ b/src/frontends/xforms/FormMathsBitmap.C @@ -64,6 +64,7 @@ void FormMathsBitmap::build() form_->u_vdata = this; FL_OBJECT * obj = fl_add_box(FL_UP_BOX, 0, 0, w_, h_, ""); + fl_add_object(form_.get(), obj); y_ = 0; for (vector::const_iterator it = bitmaps_.begin(); @@ -81,10 +82,9 @@ void FormMathsBitmap::build() x_ = (form_->w - 90) / 2; y_ += 10; - FL_OBJECT * button_cancel = obj = - fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30, idex(_(label))); + obj = fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30, idex(_(label))); + fl_add_object(form_.get(), obj); fl_set_button_shortcut(obj, scex(_(label)), 1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0); diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index 1006f38376..b921336adc 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -287,6 +287,9 @@ void FormParagraph::update() fl_set_input(dialog_->input_labelwidth, par_->getLabelWidthString().c_str()); + setEnabled(dialog_->input_labelwidth, + (par_->getLabelWidthString() != _("Senseless with this layout!"))); + fl_set_button(dialog_->radio_align_right, 0); fl_set_button(dialog_->radio_align_left, 0); fl_set_button(dialog_->radio_align_center, 0); diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C index f7f914f8f4..8abf5edcd4 100644 --- a/src/frontends/xforms/form_paragraph.C +++ b/src/frontends/xforms/form_paragraph.C @@ -141,9 +141,12 @@ FD_form_paragraph * FormParagraph::build_paragraph() fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 380, 185, 100, 30, ""); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 245, 350, 45, _("Label Width")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_lstyle(obj, FL_BOLD_STYLE); { - char const * const dummy = N_("Label Width:|#d"); - fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 250, 235, 30, idex(_(dummy))); + char const * const dummy = N_("Longest Label:|#g"); + fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 255, 230, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -155,7 +158,7 @@ FD_form_paragraph * FormParagraph::build_paragraph() fl_set_object_lstyle(obj, FL_BOLD_STYLE); { char const * const dummy = N_("No Indent|#I"); - fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 250, 115, 30, idex(_(dummy))); + fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 255, 115, 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_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index bd4cf6eadf..be616a5bee 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -11,7 +11,7 @@ SnapGrid: 5 Name: form_paragraph Width: 500 Height: 395 -Number of Objects: 33 +Number of Objects: 34 -------------------- class: FL_BOX @@ -445,17 +445,35 @@ name: input_linespacing callback: C_FormBaseDeprecatedInputCB argument: 0 +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 245 350 45 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_BOLD_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Label Width +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 125 250 235 30 +box: 125 255 230 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: Label Width:|#d +label: Longest Label:|#g shortcut: resize: FL_RESIZE_X gravity: FL_West FL_East @@ -484,7 +502,7 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 375 250 115 30 +box: 375 255 115 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER -- 2.39.5