Commit Graph

21 Commits

Author SHA1 Message Date
Michael Schmitt
78b71f9863 replace "Listings" by "Listing" (plural => singular)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18570 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-29 21:23:23 +00:00
Lars Gullik Bjønnes
897436efbb Whitespace cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18550 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 22:27:45 +00:00
Peter Kümmel
af6a9552ed fix merge build src/frontends/qt4/QDocument.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 15:05:46 +00:00
Bo Peng
5b731aa6a5 InsetListings: use float for placements because of the handling differences between float and floatplacement
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18508 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 14:38:22 +00:00
Bo Peng
b78c1db290 Make listings dialog translatable (mostly strings from InsetListingsParams), fix bug 3645
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18468 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 02:09:58 +00:00
Bo Peng
1cfc04f4ae Add dialect support and showstringspaces parameter to the listings dialog, fix bug 3664. Mostly from Jurgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18467 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 02:05:01 +00:00
Jürgen Spitzmüller
cddcdd08ea make InsetListings ready for dialects, part 1 (joint work with Bo Peng):
* src/insets/InsetListingsParams.cpp:
	- complete list of languages/dialects
	- fix some typos
	- (validate): check for braces

* src/frontends/qt4/QListings.cpp:
	- fix list of languages (not yet complete)
	- make it possible to enter [dialect]language in the advanced widget

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18451 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 04:43:30 +00:00
Jürgen Spitzmüller
68a71fcde1 * src/frontends/qt4/QDocument.cpp (validate_listings_params):
* src/frontends/qt4/QListings.cpp (validate_listings_params):
	- care for the apply button as well.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18444 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-21 14:32:10 +00:00
Jürgen Spitzmüller
0d1a0c9b27 Cleanup the listings dialog and make its content translatable (bug 3645):
* src/frontends/qt4/QListings.cpp:
	- make widget entries translatable
	- clean up and shuffle around some code

* src/frontends/qt4/ui/ListingsUi.ui:
	- set isEditable here, not in QListings.cpp

* src/frontends/qt4/QDocument.cpp:
* src/frontends/qt4/QInclude.cpp:
	- make Listings strings translatable

Fix bug 3654 (by Bo Peng):

* src/frontends/qt4/QListings.h:
	- new slot on_numberSideCO_currentIndexChanged

* src/frontends/qt4/QListings.cpp:
	- use this slot and enable(disable the appropriate widgets

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18432 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 14:31:15 +00:00
Jürgen Spitzmüller
4d5c28c305 * src/frontends/qt4/QListings.cpp:
- add Apply button
* src/frontends/qt4/ui/ListingsUi.ui:
	- add Apply button
	- add accelerators

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18409 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 18:35:28 +00:00
Bo Peng
150d08f03e InsetListings: turn off inline/float when another is clicked, fix bug 3641 and 3642
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18407 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 15:26:42 +00:00
Bo Peng
aa9f87addb InsetListings: fix bug 3627
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18374 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 20:57:03 +00:00
Bo Peng
40a746bb0f InsetListings: Use a combo box for number placement, fix bug 3623
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18372 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 20:28:46 +00:00
Bo Peng
d7ccd7a35f InsetListings: properly clear values of widgets when jumping between insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18329 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-15 02:37:59 +00:00
Bo Peng
72e0b87a90 Separate caption and label from InsetListingsParams and handle them separately in listings and Include dialog, from Jurgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18324 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 20:42:14 +00:00
Bo Peng
6e81ea9be8 InsetListings: fix a few checkbox logics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18310 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 14:55:26 +00:00
Bo Peng
1fb2456cec InsetLisings: fix extra npos comparisons intruduced by wrongful commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18283 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-13 14:39:44 +00:00
Bo Peng
0bbdc3ffeb InsetListings: Enhanced listings dialog, more than 10 widgets are added to handle common listings parameters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18282 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-13 04:06:37 +00:00
Jean-Marc Lasgouttes
e916170647 Use QTextEdit::setPlainText instead of QTextEdit::setText, because the
later is not available in Qt 4.1.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18257 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-10 10:44:16 +00:00
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