rename stdmenus.ui and stdtoolbars.ui to stdmenus.inc and stdtoolbars.inc (bug 2387)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@16735 a592a061-630c-0410-9148-cb99ea01b6c8

development/scons/scons_manifest.py

@@ -2195,8 +2195,8 @@ lib_ui_files = Split('''
     default.ui
     default-alltoolbars.ui
     default-autotoolbars.ui    
-    stdmenus.ui
+    stdmenus.inc
-    stdtoolbars.ui
+    stdtoolbars.inc
 ''')
 
 

lib/ChangeLog

@@ -1,3 +1,11 @@
+2007-01-17  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* 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  <lasgouttes@lyx.org>
 
 	* Makefile.am (dist_layouts_DATA): 

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/stdmenus.inc \
-	ui/stdtoolbars.ui
+	ui/stdtoolbars.inc
 
 install-data-hook:
 	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py

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

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 :
 #

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.
 #

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.
 #

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.
 #

po/ChangeLog

@@ -1,3 +1,7 @@
+2007-01-17  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* Makefile.in.in: adapt to renaming of UI files.
+
 2006-12-27  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* gl.po: update from Ramon Flores.

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)) >$@

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: