anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

missing regenerated xform files; tiny tweak for POTFILES.in generation; segfault fix for buffer-close

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1092 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2000-10-10 03:22:54 +00:00
parent 4423983d83
commit ceb34404ab
6 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2000-10-10 Allan Rae <rae@lyx.org>
* src/BufferView_pimpl.C (buffer): don't call upadteBufferDependent
unless there really is a buffer. hideBufferDependent is called
instead.
* Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
stays in $(srcdir).
2000-10-09 Dekel Tsur <dekelts@tau.ac.il>
* lib/lyxrc.example: Few changes.

5
po/ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-10 Allan Rae <rae@lyx.org>
* Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
stays in $(srcdir).
2000-10-06 Allan Rae <rae@lyx.org>
* Makefile.in.in: Over zealous in yesterdays work.

2
po/Makefile.in.in
View File

@ -242,7 +242,7 @@ POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
awk 'BEGIN {FS= ":"} {print $$1}' | \
sed -e '/xforms.forms/d' | \
sort -f -d | uniq ) > $@-t \
&& mv $@-t $@
&& mv $@-t $(srcdir)/$@
POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \

8
src/BufferView_pimpl.C
View File

@ -183,7 +183,13 @@ void BufferView::Pimpl::buffer(Buffer * b)
owner_->updateWindowTitle();
// Similarly, buffer-dependent dialogs should be updated or hidden.
// This should go here because some dialogs (ToC) require bv_->text.
owner_->getDialogs()->updateBufferDependent();
if (buffer_) owner_->getDialogs()->updateBufferDependent();
#ifdef WITH_WARNINGS
#warning Is this the right place for this?
// What was wrong with where it used to be in the previous if(buffer_) above?
// There also used to be a hideBufferDependent somewhere here but I haven't
// time at present to check. This should at least fix the segfault.
#endif
}

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

@ -41,7 +41,7 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_gravity(obj, FL_West, FL_East);
fl_set_object_resize(obj, FL_RESIZE_X);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_text(FL_NORMAL_TEXT, 370, 100, 60, 20, _("Indent"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@ -49,59 +49,59 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 30, 120, 30, idex(_("Above|#b")));
fl_set_button_shortcut(obj, scex(_("Above|#b")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 60, 120, 30, idex(_("Below|#E")));
fl_set_button_shortcut(obj, scex(_("Below|#E")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 30, 120, 30, idex(_("Above|#o")));
fl_set_button_shortcut(obj, scex(_("Above|#o")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 60, 120, 30, idex(_("Below|#l")));
fl_set_button_shortcut(obj, scex(_("Below|#l")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 120, 120, 30, idex(_("No Indent|#I")));
fl_set_button_shortcut(obj, scex(_("No Indent|#I")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->group_radio_alignment = fl_bgn_group();
fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 80, 30, idex(_("Right|#R")));
fl_set_button_shortcut(obj, scex(_("Right|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 80, 30, idex(_("Left|#f")));
fl_set_button_shortcut(obj, scex(_("Left|#f")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 30, 80, 30, idex(_("Block|#c")));
fl_set_button_shortcut(obj, scex(_("Block|#c")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 60, 80, 30, idex(_("Center|#n")));
fl_set_button_shortcut(obj, scex(_("Center|#n")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 120, 90, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 160, 90, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 120, 100, 30, idex(_("Above:|#v")));
fl_set_button_shortcut(obj, scex(_("Above:|#v")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 160, 100, 30, idex(_("Below:|#w")));
fl_set_button_shortcut(obj, scex(_("Below:|#w")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_text(FL_NORMAL_TEXT, 370, 10, 100, 20, _("Pagebreaks"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@ -121,11 +121,11 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 120, 40, 30, idex(_("Keep|#K")));
fl_set_button_shortcut(obj, scex(_("Keep|#K")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 160, 40, 30, idex(_("Keep|#p")));
fl_set_button_shortcut(obj, scex(_("Keep|#p")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;
@ -162,11 +162,11 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra()
fdui->input_pextra_width = obj = fl_add_input(FL_NORMAL_INPUT, 240, 30, 90, 30, idex(_("Length|#L")));
fl_set_button_shortcut(obj, scex(_("Length|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_pextra_widthp = obj = fl_add_input(FL_INT_INPUT, 240, 70, 90, 30, idex(_("or %|#o")));
fl_set_button_shortcut(obj, scex(_("or %|#o")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_text(FL_NORMAL_TEXT, 200, 10, 60, 20, _("Width"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@ -180,39 +180,39 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra()
fdui->radio_pextra_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 30, 80, 30, idex(_("Top|#T")));
fl_set_button_shortcut(obj, scex(_("Top|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_pextra_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 60, 80, 30, idex(_("Middle|#d")));
fl_set_button_shortcut(obj, scex(_("Middle|#d")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_pextra_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 90, 80, 30, idex(_("Bottom|#B")));
fl_set_button_shortcut(obj, scex(_("Bottom|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fdui->radio_pextra_hfill = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 130, 300, 30, idex(_("HFill between Minipage paragraphs|#H")));
fl_set_button_shortcut(obj, scex(_("HFill between Minipage paragraphs|#H")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_pextra_startmp = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 260, 30, idex(_("Start new Minipage|#S")));
fl_set_button_shortcut(obj, scex(_("Start new Minipage|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->group_extraopt = fl_bgn_group();
fdui->radio_pextra_indent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 30, 160, 30, idex(_("Indented Paragraph|#I")));
fl_set_button_shortcut(obj, scex(_("Indented Paragraph|#I")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_pextra_minipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 60, 160, 30, idex(_("Minipage|#M")));
fl_set_button_shortcut(obj, scex(_("Minipage|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_pextra_floatflt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 90, 160, 30, idex(_("Floatflt|#F")));
fl_set_button_shortcut(obj, scex(_("Floatflt|#F")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fl_end_form();
@ -243,18 +243,18 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph()
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_("Cancel|^[")));
fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphCancelCB, 0);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_("Apply|#A")));
fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphApplyCB, 0);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 180, 310, 100, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphOKCB, 0);
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 310, 100, 30, idex(_("Restore|#R")));
fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormParagraphRestoreCB, 0);
fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 280, 490, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);

13
src/frontends/xforms/form_paragraph.h
View File

@ -5,15 +5,14 @@
#define FD_form_paragraph_general_h_
/** Callbacks, globals and object handlers **/
extern "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphVSpaceCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphCancelCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphApplyCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphOKCB(FL_OBJECT *, long);
extern "C" void C_FormParagraphRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
/**** Forms and Objects ****/