From 8c8571908083ddc566efeeef1b007f2926048a2f Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sat, 6 Jan 2007 13:42:15 +0000 Subject: [PATCH] * lib/ui/stdmenus.inc: * lib/ui/stdmenus.ui: rename file in order not to confuse users * lib/ui/stdtoolbars.inc: * lib/ui/stdtoolbars.ui: rename file in order not to confuse users * development/scons/scons_manifest.py: * lib/doc/de_Customization.lyx: * lib/Makefile.am: * lib/ui/classic.ui: * lib/ui/default.ui: adjust git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16549 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/scons_manifest.py | 4 ++-- lib/Makefile.am | 4 ++-- lib/doc/de_Customization.lyx | 8 ++++---- lib/ui/classic.ui | 2 +- lib/ui/default.ui | 4 ++-- lib/ui/{stdmenus.ui => stdmenus.inc} | 2 +- lib/ui/{stdtoolbars.ui => stdtoolbars.inc} | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename lib/ui/{stdmenus.ui => stdmenus.inc} (99%) rename lib/ui/{stdtoolbars.ui => stdtoolbars.inc} (99%) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 7663f90374..d51e08c390 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -2248,8 +2248,8 @@ lib_tex_files = Split(''' lib_ui_files = Split(''' classic.ui default.ui - stdmenus.ui - stdtoolbars.ui + stdmenus.inc + stdtoolbars.inc ''') diff --git a/lib/Makefile.am b/lib/Makefile.am index 94761e53be..d0dd27b2f8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -972,8 +972,8 @@ uidir = $(pkgdatadir)/ui dist_ui_DATA = \ ui/classic.ui \ ui/default.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 e10eb66f60..3001d2f5d0 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 482bbfc993..badecdf2cd 100644 --- a/lib/ui/classic.ui +++ b/lib/ui/classic.ui @@ -430,7 +430,7 @@ End # Which toolbars to use. -include "stdtoolbars.ui" +include "stdtoolbars.inc" # The second parameter are the flags : # diff --git a/lib/ui/default.ui b/lib/ui/default.ui index 05ab58ca20..9ce1952f34 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 99% rename from lib/ui/stdmenus.ui rename to lib/ui/stdmenus.inc index f6d4e1fa64..300afaf55a 100644 --- a/lib/ui/stdmenus.ui +++ b/lib/ui/stdmenus.inc @@ -1,6 +1,6 @@ # -*- text -*- -# file stdmenus.ui +# file stdmenus.inc # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. diff --git a/lib/ui/stdtoolbars.ui b/lib/ui/stdtoolbars.inc similarity index 99% rename from lib/ui/stdtoolbars.ui rename to lib/ui/stdtoolbars.inc index 973e05fa9c..3eaeae00bb 100644 --- a/lib/ui/stdtoolbars.ui +++ b/lib/ui/stdtoolbars.inc @@ -1,6 +1,6 @@ # -*- text -*- -# file stdtoolbars.ui +# file stdtoolbars.inc # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING.