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

fix in formcharacter ; remove extra tabular duplication

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2163 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-07-02 14:12:18 +00:00
parent 8eada76ac0
commit 41981acdb5
7 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -9,7 +9,6 @@ src/converter.C
src/CutAndPaste.C src/CutAndPaste.C
src/debug.C src/debug.C
src/exporter.C src/exporter.C
src/ext_l10n.h
src/figure_form.C src/figure_form.C
src/figureForm.C src/figureForm.C
src/FontLoader.C src/FontLoader.C

7
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,10 @@
2001-06-22 John Levon <moz@compsoc.man.ac.uk>
* FormCharacter.C:
* form_character.C:
* forms/form_character.fd: hide the widget underneath language
combox hack.
2001-06-27 John Levon <moz@compsoc.man.ac.uk> 2001-06-27 John Levon <moz@compsoc.man.ac.uk>
* FormPreferences.h: * FormPreferences.h:

2
src/frontends/xforms/FormCharacter.C
View File

@ -87,7 +87,7 @@ void FormCharacter::build()
// insert default language box manually // insert default language box manually
fl_addto_form(dialog_->form); fl_addto_form(dialog_->form);
FL_OBJECT * ob = dialog_->choice_language; FL_OBJECT * ob = dialog_->choice_language;
fl_deactivate_object(dialog_->choice_language); fl_hide_object(dialog_->choice_language);
combo_language2_.reset(new Combox(FL_COMBOX_DROPLIST)); combo_language2_.reset(new Combox(FL_COMBOX_DROPLIST));
combo_language2_->add(ob->x, ob->y, ob->w, ob->h, 250); combo_language2_->add(ob->x, ob->y, ob->w, ob->h, 250);

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

@ -125,6 +125,9 @@ FD_form_character * FormCharacter::build_character()
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 325, 280, 45, _("These are always toggled")); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 325, 280, 45, _("These are always toggled"));
fl_set_object_lstyle(obj, FL_BOLD_STYLE); fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast); fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
obj = fl_add_text(FL_NORMAL_TEXT, 25, 170, 70, 40, _("Language:"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;

20
src/frontends/xforms/forms/form_character.fd
View File

@ -11,7 +11,7 @@ SnapGrid: 5
Name: form_character Name: form_character
Width: 300 Width: 300
Height: 415 Height: 415
Number of Objects: 14 Number of Objects: 15
-------------------- --------------------
class: FL_BOX class: FL_BOX
@ -265,5 +265,23 @@ name:
callback: callback:
argument: argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 25 170 70 40
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Language:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
============================== ==============================
create_the_forms create_the_forms

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2001-06-29 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* insettabular.C (clone): do not copy the LyXTabular twice
2001-06-29 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-06-29 Lars Gullik Bjønnes <larsbj@birdstep.com>
* insettext.h (TEXT): delete method * insettext.h (TEXT): delete method

4
src/insets/insettabular.C
View File

@ -159,9 +159,7 @@ InsetTabular::~InsetTabular()
Inset * InsetTabular::clone(Buffer const & buf) const Inset * InsetTabular::clone(Buffer const & buf) const
{ {
InsetTabular * t = new InsetTabular(*this, buf); return new InsetTabular(*this, buf);
t->tabular.reset(tabular->clone(t));
return t;
} }