Hi all.
I was testing lyx 1.1.4 with Polish translation. There are some
bugs ;(
In many cases translations dont fit into menu. For example try:
LANG=pl lyx
and open menu: Ustawienia->Akapity or Ustawienia->Dokumentow or
Ustawienia->Papier.
IMHO size of windows should be dynamicly calculated against:
- length of translation
- current font size.
I prepared simply patch with modifies size of some menus to create
more place for translations etc. Please apply.
Also I'm sending little fix for automake DESTDIR feature
(make install DESTDIR=/tmp/not-from-root/)
--
Arkadiusz Miśkiewicz http://www.misiek.eu.org/
PLD GNU/Linux [IPv6 enabled] http://www.pld.org.pl/
diff -urN lyx-1.1.4.org/lib/Makefile.am lyx-1.1.4/lib/Makefile.am
--- lyx-1.1.4.org/lib/Makefile.am Wed Mar 15 23:54:43 2000
+++ lyx-1.1.4/lib/Makefile.am Wed Mar 15 23:56:48 2000
@@ -32,13 +32,13 @@
libinstalldirs:
for dir in $(LYXLIBDIRS) ; do \
- $(mkinstalldirs) $(pkgdatadir)/$$dir ; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \
done
install-data-local: libinstalldirs
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
for i in $${files} ; do \
- $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/$$i ; \
+ $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
done
dist-hook:
diff -urN lyx-1.1.4.org/lib/reLyX/Makefile.am lyx-1.1.4/lib/reLyX/Makefile.am
--- lyx-1.1.4.org/lib/reLyX/Makefile.am Wed Mar 15 23:54:57 2000
+++ lyx-1.1.4/lib/reLyX/Makefile.am Thu Mar 16 00:10:02 2000
@@ -18,11 +18,11 @@
libinstalldirs:
for dir in $(LYXDATADIRS) ; do \
- $(mkinstalldirs) $(pkgdatadir)/$$dir ; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \
done
install-data-local: libinstalldirs
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
for i in $${files} ; do \
- $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/reLyX/$$i ; \
+ $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \
done
diff -urN lyx-1.1.4.org/src/latexoptions.C lyx-1.1.4/src/latexoptions.C
--- lyx-1.1.4.org/src/latexoptions.C Thu Mar 16 22:11:57 2000
+++ lyx-1.1.4/src/latexoptions.C Thu Mar 16 23:03:10 2000
@@ -14,9 +14,9 @@
FL_OBJECT *obj;
FD_LaTeXOptions *fdui = (FD_LaTeXOptions *) fl_calloc(1, sizeof(FD_LaTeXOptions));
- fdui->LaTeXOptions = fl_bgn_form(FL_NO_BOX, 310, 90);
- obj = fl_add_box(FL_UP_BOX, 0, 0, 310, 90, "");
- fdui->accents = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 10, 310, 30,
idex(_("Allow accents on ALL characters|#w")));fl_set_button_shortcut(obj,
scex(_("Allow accents on ALL characters|#w")), 1);
+ fdui->LaTeXOptions = fl_bgn_form(FL_NO_BOX, 370, 90);
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 370, 90, "");
+ fdui->accents = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 10, 370, 30,
+idex(_("Allow accents on ALL characters|#w")));fl_set_button_shortcut(obj,
+scex(_("Allow accents on ALL characters|#w")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
obj = fl_add_button(FL_RETURN_BUTTON, 10, 50, 90, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
diff -urN lyx-1.1.4.org/src/layout_forms.C lyx-1.1.4/src/layout_forms.C
--- lyx-1.1.4.org/src/layout_forms.C Thu Mar 16 22:11:58 2000
+++ lyx-1.1.4/src/layout_forms.C Thu Mar 16 22:56:45 2000
@@ -87,7 +87,7 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_gravity(obj, FL_NorthWest, FL_NoGravity);
fl_set_object_resize(obj, FL_RESIZE_NONE);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 290, 20, 122, 70, "");
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 290, 20, 132, 70, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
@@ -170,7 +170,7 @@
fl_set_object_gravity(obj, FL_NorthWest, FL_NoGravity);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, DocumentSpacingCB, 0);
- fdui->button_bullets = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 110, 130, 30,
idex(_("Bullet Shapes|#B")));fl_set_button_shortcut(obj, scex(_("Bullet Shapes|#B")),
1);
+ fdui->button_bullets = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 110, 140, 30,
+idex(_("Bullet Shapes|#B")));fl_set_button_shortcut(obj, scex(_("Bullet Shapes|#B")),
+1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_gravity(obj, FL_NorthWest, FL_NoGravity);
fl_set_object_resize(obj, FL_RESIZE_NONE);
@@ -293,11 +293,11 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 360, 20, 120, 70, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 210, 20, 140, 70, "");
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 20, 120, 70, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 190, 70, "");
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 210, 70, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
- fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 100, 210, 360, 30,
idex(_("Label Width:|#d")));fl_set_button_shortcut(obj, scex(_("Label Width:|#d")), 1);
+ fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 110, 210, 350, 30,
+idex(_("Label Width:|#d")));fl_set_button_shortcut(obj, scex(_("Label Width:|#d")),
+1);
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);
@@ -327,17 +327,17 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();
- fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 120, 90, 30, "");
+ fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 120, 75, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, ParagraphVSpaceCB, 0);
- fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 160, 90, 30, "");
+ fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 160, 75, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, ParagraphVSpaceCB, 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);
+ fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 85, 120, 85, 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, ParagraphVSpaceCB, 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);
+ fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 85, 160, 85, 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, ParagraphVSpaceCB, 0);
@@ -345,7 +345,7 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- obj = fl_add_text(FL_NORMAL_TEXT, 230, 10, 50, 20, _("Lines"));
+ obj = fl_add_text(FL_NORMAL_TEXT, 240, 10, 50, 20, _("Lines"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
@@ -361,9 +361,9 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
fl_set_object_callback(obj, ParagraphExtraOpen, 0);
- 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);
+ fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 255, 120, 40,
+30, idex(_("Keep|#K")));fl_set_button_shortcut(obj, scex(_("Keep|#K")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- 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);
+ fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 255, 160, 40,
+30, idex(_("Keep|#p")));fl_set_button_shortcut(obj, scex(_("Keep|#p")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form();
diff -urN lyx-1.1.4.org/src/print_form.C lyx-1.1.4/src/print_form.C
--- lyx-1.1.4.org/src/print_form.C Thu Mar 16 22:12:00 2000
+++ lyx-1.1.4/src/print_form.C Thu Mar 16 22:11:49 2000
@@ -22,9 +22,9 @@
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fdui->input_printer = obj = fl_add_input(FL_NORMAL_INPUT, 90, 225, 230, 30, "");
+ fdui->input_printer = obj = fl_add_input(FL_NORMAL_INPUT, 130, 225, 190, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 90, 265, 230, 30, "");
+ fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 130, 265, 190, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->group_radio_printto = fl_bgn_group();
