Commit Graph

3764 Commits

Author SHA1 Message Date
Peter Kümmel
e5df7b6978 also compile with merged files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18244 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:31:42 +00:00
Bo Peng
4ce743a0a7 Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
	* src/insets/Inset.h,cpp: LISTINGS_CODE
	* src/insets/InsetInclude.cpp: handle \lstinputlisting
	* src/insets/InsetListings.h,cpp: new listings inset
	* src/insets/InsetListingsParams.h,cpp: parameters from listings package
	* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
	* src/Bidi.cpp: handle LISTINGS_CODE
	* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
	* src/frontends/qt4/ui/ListingsUi.ui: new dialog
	* src/frontends/qt4/ui/IncludeUi.ui: update UI
	* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
	* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
	* src/frontends/qt4/QListings.h,cpp: new listings inset
	* src/frontends/qt4/Dialogs.cpp: new listings dialog
	* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
	* src/frontends/controllers/ControlListings.h,cpp: new listings inset
	* src/LyXFunc.cpp: handle LISTING_CODE
	* src/Paragraph.cpp: handle LISTING_CODE
	* src/factory.cpp: new listings inset
	* src/CutAndPaste.cpp: handle LISTINGS_CODE
	* src/LaTeXFeatures.cpp: require listings
	* src/Text3.cpp: Handle LISTINGS_CODE
	* src/lfuns.h: add LFUN_LISTING_INSERT
	* src/Buffer.cpp: change lyx file format to 269
	* src/BufferParams.h,cpp: add listings_params to preamble
	* lib/lyx2lyx/LyX.py: lyx2lyx 
	* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
	* lib/ui/stdmenus.inc: new menu item (no shortcut!)
	* src/insets/Makefile.am: update autotools
	* src/frontends/controllers/Makefile.am
	* src/frontends/qt4/Makefile.dialogs
	* src/frontends/qt4/Makefile.am
	* po/POTFILES.in: a few more translatable files.
	* development/scons/scons_manifest.py: scons build system
	* development/FORMAT: document format changes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
Edwin Leuven
f5cfb824aa * set some sizehints to ingore so that toc widget does not take up too much space on toggle...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 08:23:57 +00:00
Richard Heck
bd71f0adac Fix for bug 3524: Indent checkbox is enabled even when paragraphs are marked
with skips.

Added helper method canIndent() to controller and appropriate logic to
QParagraph::update_contents().



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18236 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-08 15:35:44 +00:00
Uwe Stöhr
8d8b55cf92 QMathMatrixDialog.cpp: fix part of bug 3475
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18226 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-07 18:30:41 +00:00
Jürgen Spitzmüller
574b28db65 Fix bug 3508:
* src/ToolbarBackend.cpp:
* lib/ui/stdtoolbars.inc:
	- add tooltip to table widget
* src/frontends/qt4/QLToolbar.cpp:
	- display tooltip as icon text

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18208 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-06 07:26:51 +00:00
Abdelrazak Younes
94674dec6a revision 18202: I forgot this one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18203 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 17:46:03 +00:00
Abdelrazak Younes
ab2324315b TOC Widget beautification by Stefan Schimanski:
* lib/images: 3 new icons 
* TocUi/TocWidget: Replace labeled button with icon buttons.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18202 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 17:37:05 +00:00
Abdelrazak Younes
1becd845c1 * LyX::addFileToLoad(): new method for double-clicked file icons on MacOS.
* GuiApplication::event():
  special case for FileOpen events: memorize the filenames if LyX is not properly started yet.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18201 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 17:20:53 +00:00
Abdelrazak Younes
ce3fce19c4 * QLPainter: antialias edges of primitives only if text is antialiased.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18197 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 09:24:44 +00:00
Abdelrazak Younes
58cc6d28e8 Fix antialiasing problem in straight lines within polylines. Prepare for optional antialiasing.
* QLPainter::lines(): use QPainter::drawLine() multiple times instead QPainter::drawPolyline().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18196 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 08:52:40 +00:00
Abdelrazak Younes
9ed920f62a revert 18186: this cannot be done right now because of the way LFUN_BUFFER_PARAMS_APPLY is implemented.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18187 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-03 14:47:22 +00:00
Abdelrazak Younes
696b6a2167 Fix interface problem in order to cleanly support "cursor position memory" in the preamble editor.
* ControlDocument::params(): replace BufferParams local copy with Buffer::params() direct access.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18186 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-03 14:20:12 +00:00
Abdelrazak Younes
cf5a9defdd Restor 1.4.x behaviour: Don't touch the preamble QTextEdit if the preamble text is unchanged.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18154 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-01 17:33:04 +00:00
Michael Schmitt
cd289ad718 * src/frontends/qt4/QParagraph.cpp: reduce the verbosity of a tooltip
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18147 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-01 10:07:29 +00:00
André Pönitz
40e4ab9bf3 distribute content sof tex-strings.cpp to their respective unique places of usage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18130 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-30 21:01:24 +00:00
André Pönitz
e0d54dd3b4 LyXText -> Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 23:33:02 +00:00
Michael Schmitt
295eea310e replace term "Glossary" by "Nomenclature"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18102 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 22:21:00 +00:00
André Pönitz
757d5d67ac resolve the layout.h <=> Layout.h conflict
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18099 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 22:04:32 +00:00
André Pönitz
6add1994c7 rename LyXTextClass* into TextClass*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 19:53:54 +00:00
André Pönitz
0bf9ac02a8 rename LyXLayout into Layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18096 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 18:58:28 +00:00
André Pönitz
fc6ce7cd08 rename LyXFont to Font except in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18095 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 18:17:15 +00:00
André Pönitz
32871c1284 rename InsetBase to Inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18089 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 13:39:47 +00:00
Jürgen Spitzmüller
b0b7aa2bf5 Implement shortcut (M-x) to hide the minibuffer
* src/frontends/controllers/ControlCommandBuffer.{cpp,h}:
	- new member hide()
* src/frontends/qt4QCommandEdit.{cpp,h}:
	- new signal hidePressed(), emit it on M-x/Alt-x
* src/frontends/qt4/QCommandBuffer.{cpp,h}:
	- new slot hideParent(), connected to QCommandEdit::hidePressed()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18081 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 08:58:09 +00:00
Bo Peng
e36fba33ab Last (?) batch of renames:
src/frontends/Alert.h src/frontends/alert.h
src/frontends/Alert.cpp src/frontends/alert.cpp
src/frontends/Alert_pimpl.cpp src/frontends/alert_pimpl.cpp
src/frontends/qt4/Alert_pimpl.cpp src/frontends/qt4/alert_pimpl.cpp
src/frontends/controllers/ButtonPolicies.cpp src/frontends/controllers/ButtonPolicy.cpp
src/frontends/controllers/ButtonPolicies.h src/frontends/controllers/ButtonPolicy.h
src/insets/InsetEnv.cpp src/insets/InsetEnvironment.cpp
src/insets/InsetEnv.h src/insets/InsetEnvironment.h
src/mathed/MathMacroTable.h src/mathed/MacroTable.h
src/mathed/MathMacroTable.cpp src/mathed/MacroTable.cpp
src/lyx_cb.h src/callback.h
src/lyx_cb.cpp src/callback.cpp
src/UpdateFlags.h src/update_flags.h


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18076 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-28 20:44:46 +00:00
André Pönitz
8c622e4ff0 rename/merge LyXLength related stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18067 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-28 12:58:49 +00:00
André Pönitz
50016ccf3a rename LyXKeySym into KeySymbol
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18059 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-27 08:43:38 +00:00
André Pönitz
02703f47bf I guess Windows folks are not too happy with files named color.h and Color.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18048 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 19:21:38 +00:00
André Pönitz
5008ee540f rename LColor into Color
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18046 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 17:34:20 +00:00
André Pönitz
42123ab8a7 rename LCursor->Cursor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18040 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 14:56:30 +00:00
André Pönitz
bf2221d990 forgot and this
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18038 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 13:39:14 +00:00
André Pönitz
ab780e843e forgot these
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18037 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 13:34:23 +00:00
André Pönitz
39e79d8602 rename LyXLex into Lexer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18033 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 11:30:54 +00:00
André Pönitz
f63d0e05df fix problem reported by Uwe
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18029 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 07:12:31 +00:00
André Pönitz
71797f6d72 fix Makefile.am after .C -> .cpp conversion
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18028 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 06:55:43 +00:00
Bo Peng
138b23fac8 Rename files in src/support, step one.
src/support/package.h                              src/support/Package.h    Package
src/support/package.C.in                           src/support/Package.C.in  Package
src/support/path.h                                 src/support/Path.h    Path
src/support/fs_extras.h                            src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h                     src/support/RandomAccessList.h    RandomAccessList
src/support/lyxmanip.h                             src/support/lyxmanip.h NOCLASSES
src/support/rename.C                               src/support/rename.cpp  NOCLASSES
src/support/abort.C                                src/support/abort.cpp  NOCLASSES
src/support/lyxlib.h                               src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h                     src/support/ExceptionMessage.h    ExceptionMessage
src/support/copy.C                                 src/support/copy.cpp  NOCLASSES
src/support/limited_stack.h                        src/support/limited_stack.h    limited_stack
src/support/filefilterlist.C                       src/support/FileFilterList.cpp    ['FileFilterList', 'Filter']
src/support/cow_ptr.h                              src/support/cow_ptr.h    cow_ptr
src/support/os_unix.C                              src/support/os_unix.cpp  NOCLASSES
src/support/socktools.h                            src/support/socktools.h NOCLASSES
src/support/forkedcontr.h                          src/support/ForkedcallsController.h    ForkedcallsController
src/support/os.h                                   src/support/os.h NOCLASSES
src/support/FileMonitor.h                          src/support/FileMonitor.h    FileMonitor
src/support/copied_ptr.h                           src/support/copied_ptr.h    copied_ptr
src/support/translator.h                           src/support/Translator.h    Translator
src/support/filetools.C                            src/support/filetools.cpp  NOCLASSES
src/support/unlink.C                               src/support/unlink.cpp  NOCLASSES
src/support/os_win32.C                             src/support/os_win32.cpp    GetFolderPath
src/support/lstrings.C                             src/support/lstrings.cpp  NOCLASSES
src/support/qstring_helpers.C                      src/support/qstring_helpers.cpp  NOCLASSES
src/support/getcwd.C                               src/support/getcwd.cpp  NOCLASSES
src/support/systemcall.C                           src/support/Systemcall.cpp    Systemcall
src/support/lyxalgo.h                              src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h                       src/support/FileFilterList.h    ['FileFilterList', 'Filter']
src/support/unicode.C                              src/support/unicode.cpp    IconvProcessor
src/support/userinfo.C                             src/support/userinfo.cpp  NOCLASSES
src/support/lyxtime.C                              src/support/lyxtime.cpp  NOCLASSES
src/support/kill.C                                 src/support/kill.cpp  NOCLASSES
src/support/docstring.C                            src/support/docstring.cpp    to_local8bit_failure
src/support/os_cygwin.C                            src/support/os_cygwin.cpp  NOCLASSES
src/support/lyxsum.C                               src/support/lyxsum.cpp  NOCLASSES
src/support/environment.C                          src/support/environment.cpp  NOCLASSES
src/support/filetools.h                            src/support/filetools.h NOCLASSES
src/support/textutils.C                            src/support/textutils.cpp  NOCLASSES
src/support/mkdir.C                                src/support/mkdir.cpp  NOCLASSES
src/support/forkedcall.C                           src/support/Forkedcall.cpp    ['ForkedProcess', 'Forkedcall']
src/support/tempname.C                             src/support/tempname.cpp  NOCLASSES
src/support/os_win32.h                             src/support/os_win32.h    GetFolderPath
src/support/types.h                                src/support/types.h NOCLASSES
src/support/lstrings.h                             src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C                      src/support/ForkedCallQueue.cpp    ForkedCallQueue
src/support/qstring_helpers.h                      src/support/qstring_helpers.h NOCLASSES
src/support/convert.C                              src/support/convert.cpp  NOCLASSES
src/support/filename.C                             src/support/FileName.cpp    ['FileName', 'DocFileName']
src/support/tests/convert.C                        src/support/tests/convert.cpp  NOCLASSES
src/support/tests/filetools.C                      src/support/tests/filetools.cpp  NOCLASSES
src/support/tests/lstrings.C                       src/support/tests/lstrings.cpp  NOCLASSES
src/support/tests/boost.C                          src/support/tests/boost.cpp  NOCLASSES
src/support/docstream.C                            src/support/docstream.cpp    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h                          src/support/std_istream.h NOCLASSES
src/support/systemcall.h                           src/support/Systemcall.h    Systemcall
src/support/chdir.C                                src/support/chdir.cpp  NOCLASSES
src/support/std_ostream.h                          src/support/std_ostream.h NOCLASSES
src/support/unicode.h                              src/support/unicode.h    IconvProcessor
src/support/path.C                                 src/support/Path.cpp    Path
src/support/fs_extras.C                            src/support/fs_extras.cpp  NOCLASSES
src/support/userinfo.h                             src/support/userinfo.h NOCLASSES
src/support/lyxtime.h                              src/support/lyxtime.h NOCLASSES
src/support/docstring.h                            src/support/docstring.h    to_local8bit_failure
src/support/debugstream.h                          src/support/debugstream.h    basic_debugstream
src/support/environment.h                          src/support/environment.h NOCLASSES
src/support/textutils.h                            src/support/textutils.h NOCLASSES
src/support/forkedcall.h                           src/support/Forkedcall.h    ['ForkedProcess', 'Forkedcall']
src/support/socktools.C                            src/support/socktools.cpp  NOCLASSES
src/support/forkedcallqueue.h                      src/support/ForkedCallQueue.h    ForkedCallQueue
src/support/forkedcontr.C                          src/support/ForkedcallsController.cpp    ForkedcallsController
src/support/os.C                                   src/support/os.cpp  NOCLASSES
src/support/convert.h                              src/support/convert.h NOCLASSES
src/support/filename.h                             src/support/FileName.h    ['FileName', 'DocFileName']
src/support/docstream.h                            src/support/docstream.h    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C                          src/support/FileMonitor.cpp    FileMonitor



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +00:00
Bo Peng
9a17e559f2 Rename .C ==> .cpp for files in src/frontends, part two
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18017 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:03:46 +00:00
Bo Peng
31334d3934 Rename .C ==> .cpp for files in src/frontends, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18016 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:02:55 +00:00
Bo Peng
8c5f097b5d Rename .C ==> .cpp for files in src/frontends/qt4, part two
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18015 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 03:53:51 +00:00
Bo Peng
6fdb8bf85a Rename .C ==> .cpp for files in src/frontends/qt4, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18014 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 03:53:02 +00:00
André Pönitz
3ca52db8d1 remove some lyx:: etc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18012 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 23:06:48 +00:00
Michael Schmitt
1e7479247a * src/frontend/qt4/ui/NomenclUi.ui: fix tab order (by Ugras Baran)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18008 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 21:37:43 +00:00
Bo Peng
8d850dcb7e Rename .C => .cpp for files in src/frontends/controllers, step 2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18000 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 18:06:07 +00:00
Bo Peng
98ebb77841 Rename .C => .cpp for files in src/frontends/controllers, step 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17999 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 18:04:04 +00:00
Bo Peng
f6ab280632 merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_helpers to frontend_helpers, step 3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17998 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 17:53:54 +00:00
Bo Peng
5d80bf1a22 merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_helpers to frontend_helpers, step 2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17997 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 17:20:29 +00:00
Bo Peng
65d89a8af3 merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_helpers to frontend_helpers, step 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17996 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 17:15:56 +00:00
André Pönitz
c6b932f467 code cosmetics whitespace, unneeded lyx:: qualification, indentation, unneeded destructors and the like
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17994 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 16:39:21 +00:00
André Pönitz
a77a19e497 more dialog merging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17981 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 10:57:54 +00:00