diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index f5303df7c6..7ce6539d14 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -2195,8 +2195,8 @@ lib_ui_files = Split(''' default.ui default-alltoolbars.ui default-autotoolbars.ui - stdmenus.ui - stdtoolbars.ui + stdmenus.inc + stdtoolbars.inc ''') diff --git a/lib/ChangeLog b/lib/ChangeLog index 32fc5aed9f..cad4d85a31 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2007-01-17 Jean-Marc Lasgouttes + + * ui/stdmenus.inc: renamed from ui/stdmenus.ui + * ui/stdtoolbars.inc: renamed from ui/stdtoolbars.ui + + * Makefile.am: + * ui/*.ui: adapt. (part of bug 2387) + 2006-12-29 Jean-Marc Lasgouttes * Makefile.am (dist_layouts_DATA): diff --git a/lib/Makefile.am b/lib/Makefile.am index 296b8f5544..5b5138d885 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -972,8 +972,8 @@ dist_ui_DATA = \ ui/default.ui \ ui/default-alltoolbars.ui \ ui/default-autotoolbars.ui \ - ui/stdmenus.ui \ - ui/stdtoolbars.ui + ui/stdmenus.inc \ + ui/stdtoolbars.inc install-data-hook: $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py diff --git a/lib/doc/de_Customization.lyx b/lib/doc/de_Customization.lyx index 8018257a99..20bd7b39d0 100644 --- a/lib/doc/de_Customization.lyx +++ b/lib/doc/de_Customization.lyx @@ -2299,11 +2299,11 @@ classic.ui erzeugt das Aussehen der 1.3.x-Versionen von LyX. \family typewriter -stdmenus.ui +stdmenus.inc \family default beschreibt das Aussehen der Menüleisten und \family typewriter -stdtoolbars.ui +stdtoolbars.inc \family default das Aussehen der Werkzeugleisten. Auch hier ist es derzeit noch nötig, LyX neu zu starten, um Änderungen @@ -2394,11 +2394,11 @@ default.ui . Sie benutzt \family typewriter -stdtoolbars.ui +stdtoolbars.inc \family default und \family typewriter -stdmenus.ui +stdmenus.inc \family default und definiert folgende Werkzeugleisten: \end_layout diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui index abc13964d4..9769f0923f 100644 --- a/lib/ui/classic.ui +++ b/lib/ui/classic.ui @@ -431,7 +431,7 @@ End # Which toolbars to use. -include "stdtoolbars.ui" +include "stdtoolbars.inc" # The second parameter are the flags : # diff --git a/lib/ui/default-alltoolbars.ui b/lib/ui/default-alltoolbars.ui index 6d451369b7..14e9ff1253 100644 --- a/lib/ui/default-alltoolbars.ui +++ b/lib/ui/default-alltoolbars.ui @@ -14,9 +14,9 @@ # The interface is designed (partially) following the KDE Human Interface # Guidelines (http://usability.kde.org/hig/) -Include "stdmenus.ui" +Include "stdmenus.inc" -Include "stdtoolbars.ui" +Include "stdtoolbars.inc" # Which toolbars to use. # diff --git a/lib/ui/default-autotoolbars.ui b/lib/ui/default-autotoolbars.ui index b7de22401f..39b108d513 100644 --- a/lib/ui/default-autotoolbars.ui +++ b/lib/ui/default-autotoolbars.ui @@ -14,9 +14,9 @@ # The interface is designed (partially) following the KDE Human Interface # Guidelines (http://usability.kde.org/hig/) -Include "stdmenus.ui" +Include "stdmenus.inc" -Include "stdtoolbars.ui" +Include "stdtoolbars.inc" # Which toolbars to use. # diff --git a/lib/ui/default.ui b/lib/ui/default.ui index ea485d3ad3..21e62112a6 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -14,9 +14,9 @@ # The interface is designed (partially) following the KDE Human Interface # Guidelines (http://usability.kde.org/hig/) -Include "stdmenus.ui" +Include "stdmenus.inc" -Include "stdtoolbars.ui" +Include "stdtoolbars.inc" # Which toolbars to use. # diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.inc similarity index 100% rename from lib/ui/stdmenus.ui rename to lib/ui/stdmenus.inc diff --git a/lib/ui/stdtoolbars.ui b/lib/ui/stdtoolbars.inc similarity index 100% rename from lib/ui/stdtoolbars.ui rename to lib/ui/stdtoolbars.inc diff --git a/po/ChangeLog b/po/ChangeLog index f12f510a46..2800c6c60d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-01-17 Jean-Marc Lasgouttes + + * Makefile.in.in: adapt to renaming of UI files. + 2006-12-27 Jean-Marc Lasgouttes * gl.po: update from Ramon Flores. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 43d4c5a283..d05f51cf4f 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -487,7 +487,7 @@ languages_l10n.pot: $(top_srcdir)/lib/languages }' \ ${top_srcdir}/lib/languages > $@ -ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui +ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui $(top_srcdir)/lib/ui/*.inc LC_ALL=C ; export LC_ALL ; \ $(AWK) -v top_srcdir="$(top_srcdir)" ' \ function fixupfilename() \ @@ -515,7 +515,7 @@ ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \ fixupfilename(), FNR, line); \ }' \ - ${top_srcdir}/lib/ui/*.ui > $@ + ${top_srcdir}/lib/ui/*.ui ${top_srcdir}/lib/ui/*.inc > $@ i18n.php: $(POFILES) (cd $(srcdir) ; ./postats.sh $(POFILES)) >$@ diff --git a/status.14x b/status.14x index 790432a8f8..8b6d98fcff 100644 --- a/status.14x +++ b/status.14x @@ -22,6 +22,9 @@ What's new - Outline support: it is now possible to move around parts of documents in the Table of Contents dialog. +- Add new UI settings default-autotoolbars and default-alltoolbars + allowing to select what toolbars are active. + - Improve Computer Algebra System support in math editor. - Add support for fixed size math delimiters in math editor. @@ -160,7 +163,7 @@ What's new - Add support for the chars-transpose LFUN (bug 2939). -- Make insertion of forced newline undo-able (bug 3111). +- Fix undo when inserting a line break (bug 3111). - Only one undo step is needed to undo inset-dissolve (bug 2982). @@ -189,7 +192,8 @@ What's new (bug 3055). This also fixes problems with older LyX files (bug 3066) [qt only]. -- fix undo when inserting a line break (bug 3111). +- Rename lib/ui/std*.ui include files to *.inc so that the user is not + tempted to try them (bug 2387). * Build/installation: