anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace "find src -path" call with unix-standard equivalent. (From Lars).

Browse Source 
Resized About LyX dialog to get the Copyright & Version stuff in.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2376 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-07-28 13:03:22 +00:00
parent 5f2e3c4c43
commit baf92c89a1
6 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
po/ChangeLog
View File

@ -1,3 +1,8 @@
2001-07-25 Angus Leeming <a.leeming@ic.ac.uk>
* Makefile.in.in: replaced "find src -path" call with unix-standard
equivalent. (From Lars).
2001-07-25 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-07-25 Lars Gullik Bjønnes <larsbj@birdstep.com>
* po files: merge with lyx.pot * po files: merge with lyx.pot

3
po/Makefile.in.in
View File

@ -198,7 +198,8 @@ Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS) ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
rm -f $@-t \ rm -f $@-t \
&& ( cd $(top_srcdir); \ && ( cd $(top_srcdir); \
grep -l "_(\".*\")" `find src -path src/frontends/kde -prune -o -name \*.[hHC] -print `| \ grep -l "_(\".*\")" `find src -name \*.[hHC] -print` |\
grep -v frontends/kde |\
sed -e '/xforms.forms/d' | \ sed -e '/xforms.forms/d' | \
sort -f -d | uniq ) > $@-t \ sort -f -d | uniq ) > $@-t \
&& echo "src/ext_l10n.h" >> $@-t \ && echo "src/ext_l10n.h" >> $@-t \

3
src/frontends/xforms/ChangeLog
View File

@ -1,5 +1,8 @@
2001-07-26 Angus Leeming <a.leeming@ic.ac.uk> 2001-07-26 Angus Leeming <a.leeming@ic.ac.uk>
* forms/form_aboutlyx.fd: made a bit bigger to get the Copyright &
Version stuff in.
* input_validators.[Ch] (fl_int_filter, fl_float_filter): new methods. * input_validators.[Ch] (fl_int_filter, fl_float_filter): new methods.
* FormGraphics.C (build): uncommented the fl_set_input_return call for * FormGraphics.C (build): uncommented the fl_set_input_return call for

32
src/frontends/xforms/form_aboutlyx.C
View File

@ -22,17 +22,17 @@ FD_form_aboutlyx * FormAboutlyx::build_aboutlyx()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_aboutlyx *fdui = new FD_form_aboutlyx; FD_form_aboutlyx *fdui = new FD_form_aboutlyx;
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 370); fdui->form = fl_bgn_form(FL_NO_BOX, 450, 400);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 370, ""); obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 400, "");
{ {
char const * const dummy = N_("Close|^["); char const * const dummy = N_("Close|^[");
fdui->close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 330, 120, 30, idex(_(dummy))); fdui->close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 300, ""); fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form(); fl_end_form();
@ -54,16 +54,16 @@ FD_form_tab_version * FormAboutlyx::build_tab_version()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_tab_version *fdui = new FD_form_tab_version; FD_form_tab_version *fdui = new FD_form_tab_version;
fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280); fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, ""); obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 310, "");
fdui->text_version = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 150, _("Text")); fdui->text_copyright = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 110, _("Text"));
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
fdui->text_version = obj = fl_add_text(FL_NORMAL_TEXT, 10, 130, 410, 170, _("Text"));
fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE); fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
fdui->text_copyright = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text"));
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;
@ -84,10 +84,10 @@ FD_form_tab_credits * FormAboutlyx::build_tab_credits()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_tab_credits *fdui = new FD_form_tab_credits; FD_form_tab_credits *fdui = new FD_form_tab_credits;
fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280); fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, ""); obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 310, "");
fdui->browser_credits = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 410, 260, ""); fdui->browser_credits = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 410, 290, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form(); fl_end_form();
@ -110,13 +110,13 @@ FD_form_tab_license * FormAboutlyx::build_tab_license()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_tab_license *fdui = new FD_form_tab_license; FD_form_tab_license *fdui = new FD_form_tab_license;
fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280); fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, ""); obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 310, "");
fdui->text_license = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text")); fdui->text_license = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text"));
fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE); fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
fdui->text_warranty = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 150, _("Text")); fdui->text_warranty = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 180, _("Text"));
fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE); fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
fl_end_form(); fl_end_form();

2
src/frontends/xforms/form_aboutlyx.h
View File

@ -24,8 +24,8 @@ struct FD_form_tab_version {
~FD_form_tab_version(); ~FD_form_tab_version();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *text_version;
FL_OBJECT *text_copyright; FL_OBJECT *text_copyright;
FL_OBJECT *text_version;
}; };
struct FD_form_tab_credits { struct FD_form_tab_credits {
~FD_form_tab_credits(); ~FD_form_tab_credits();

62
src/frontends/xforms/forms/form_aboutlyx.fd
View File

@ -9,13 +9,13 @@ Unit of measure: FL_COORD_PIXEL
=============== FORM =============== =============== FORM ===============
Name: form_aboutlyx Name: form_aboutlyx
Width: 450 Width: 450
Height: 370 Height: 400
Number of Objects: 3 Number of Objects: 3
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: UP_BOX type: UP_BOX
box: 0 0 450 370 box: 0 0 450 400
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -33,7 +33,7 @@ argument:
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
type: NORMAL_BUTTON type: NORMAL_BUTTON
box: 320 330 120 30 box: 320 360 120 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -51,7 +51,7 @@ argument: 0
-------------------- --------------------
class: FL_TABFOLDER class: FL_TABFOLDER
type: TOP_TABFOLDER type: TOP_TABFOLDER
box: 10 20 430 300 box: 10 20 430 330
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_TOP_LEFT alignment: FL_ALIGN_TOP_LEFT
@ -69,13 +69,13 @@ argument:
=============== FORM =============== =============== FORM ===============
Name: form_tab_version Name: form_tab_version
Width: 430 Width: 430
Height: 280 Height: 310
Number of Objects: 3 Number of Objects: 3
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: UP_BOX type: UP_BOX
box: 0 0 430 280 box: 0 0 430 310
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -93,25 +93,7 @@ argument:
-------------------- --------------------
class: FL_TEXT class: FL_TEXT
type: NORMAL_TEXT type: NORMAL_TEXT
box: 10 120 410 150 box: 10 10 410 110
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Text
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_version
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 10 410 100
boxtype: FL_FRAME_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
@ -126,16 +108,34 @@ name: text_copyright
callback: callback:
argument: argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 130 410 170
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Text
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_version
callback:
argument:
=============== FORM =============== =============== FORM ===============
Name: form_tab_credits Name: form_tab_credits
Width: 430 Width: 430
Height: 280 Height: 310
Number of Objects: 2 Number of Objects: 2
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: UP_BOX type: UP_BOX
box: 0 0 430 280 box: 0 0 430 310
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -153,7 +153,7 @@ argument:
-------------------- --------------------
class: FL_BROWSER class: FL_BROWSER
type: NORMAL_BROWSER type: NORMAL_BROWSER
box: 10 10 410 260 box: 10 10 410 290
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_BOTTOM alignment: FL_ALIGN_BOTTOM
@ -171,13 +171,13 @@ argument: 0
=============== FORM =============== =============== FORM ===============
Name: form_tab_license Name: form_tab_license
Width: 430 Width: 430
Height: 280 Height: 310
Number of Objects: 3 Number of Objects: 3
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: UP_BOX type: UP_BOX
box: 0 0 430 280 box: 0 0 430 310
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -213,7 +213,7 @@ argument:
-------------------- --------------------
class: FL_TEXT class: FL_TEXT
type: NORMAL_TEXT type: NORMAL_TEXT
box: 10 120 410 150 box: 10 120 410 180
boxtype: FL_FRAME_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE