anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

J�rgen Spitzm�ller's tweak of the Paragraph dialog.

Browse Source 
Finally (?) fix memory leak in Maths Bitmap dialog.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2717 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-09-10 12:25:40 +00:00
parent 168d6528f4
commit 5bca243109
5 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,12 @@
2001-09-10 Angus Leeming <a.leeming@ic.ac.uk>
* FormMathsBitmap (build): fix memory leak.
2001-09-08 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* forms/form_paragraph.fd: cosmetics (renamed "Label Width" to "Longest
Label", added a labelframe).
2001-09-10 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Toolbar_pimpl.C (C_Toolbar_BubblePost): fix linking

6
src/frontends/xforms/FormMathsBitmap.C
View File

@ -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<bm_ptr>::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);

3
src/frontends/xforms/FormParagraph.C
View File

@ -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);

9
src/frontends/xforms/form_paragraph.C
View File

@ -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);

26
src/frontends/xforms/forms/form_paragraph.fd
View File

@ -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