Commit Graph

10594 Commits

Author SHA1 Message Date
Bo Peng
7a6edab5c1 Embedding: add 'addFile' to embed arbitrary file, fix a few bugs along the way
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19967 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 04:20:34 +00:00
Richard Heck
d7a33bc841 This patch continues 19964. It takes advantage of the work there to simplify a few things elsewhere. First, in ControlDocument::dispatchParams(), we're setting the TextClass and then dispatching the BufferParams, which sets it again now. So we can get rid of the first call. This, however, requires loading the TextClass somewhere other than LFUN_TEXTCLASS_APPLY, which I do in BufferParams::setBaseClass(), which is when you'd actually need to do it. So I've moved some of the loading logic there. (It seemed a good idea to make setBaseClass() return whether it was successful, then, though this isn't used at the moment.)
That makes another simplification both possible and desirable. For some reason, whenever you change the Document Class combobox in Document Settings, LyX tries to read whatever you choose _before_ you try to hit "Apply". Why? I see no good reason. You get the warning earlier that way, but maybe you weren't going to try to load it anyway and were going to change your mind. So I have removed that behavior, in which case you'll get the warning when you try to apply the parameters. This means we can also remove ControlDocument::loadTextclass().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19965 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 04:03:24 +00:00
Richard Heck
1588f9d201 This addresses a bug in the module code so far committed. The problem is that changing the modules used would update the Buffer's TextClass---but it wouldn't update the layouts used by existing paragraphs, the way changing the TextClass does. The solution, obviously, is to do that update. So what I've done is extract that logic from LFUN_TEXTCLASS_APPLY into an updateLayout() routine and then call that from LFUN_BUFFER_PARAMS_APPLY, LFUN_LAYOUT_MODULE_ADD, and LFUN_LAYOUT_MODULES_CLEAR, which are the three places the modules could be changed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19964 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 04:01:13 +00:00
Bo Peng
9ff98fb5bc Fix compiling error caused by Andre's patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19963 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 02:43:14 +00:00
André Pönitz
d5483e3551 somewhat more uniform naming
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19962 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:37:05 +00:00
André Pönitz
fc36725282 Merge QController into individual dialogs. Also various cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
Bo Peng
e4e09c4b0b Embedding: small adjustments of interfaces, single and double click in the embedding dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19960 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:02:34 +00:00
Alfredo Braunstein
c94eb3deeb cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19959 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 20:24:15 +00:00
André Pönitz
7bf090853f fix make dist
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19958 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 18:30:23 +00:00
André Pönitz
5f21448516 fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19957 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 18:16:50 +00:00
Alfredo Braunstein
d44c6722f0 fix two metrics bug + remove an extra metrics call
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19954 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 17:32:27 +00:00
Bo Peng
cc6fe67c35 Embedding feature patch 3: basic gui support
*  lib/ui/stdmenus.inc: add menu item embedded files
	*  src/BufferParams.cpp: set default embedded status to false
	*  src/EmbeddedFiles.h|cpp: add a few member functions
	*  src/frontends/qt4/Dialogs.cpp: add embedding dialog
	*  src/frontends/qt4/GuiEmbeddedFiles.h|cpp: embedding dialog
	*  src/frontends/qt4/ui/EmbeddedFilesUi.ui: embedding dialog
	*  src/frontends/controllers/ControlEmbeddedFiles.h|cpp: embedding dialog control
	*  src/frontends/qt4/Makefile.am: build system update
	*  src/frontends/controllers/Makefile.am
	*  development/scons/scons_manifest.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19953 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 15:42:35 +00:00
Abdelrazak Younes
7d97e555fc Transfer Paragraph::hfillExpansion() to ParagraphMetrics. This also reduce the dependency to Row.h which is probably going to change in the near future.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19951 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 14:46:13 +00:00
Abdelrazak Younes
02227212b2 compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19950 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 14:26:43 +00:00
Abdelrazak Younes
82d372dff8 delete unused definition.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19949 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 14:24:16 +00:00
Abdelrazak Younes
6c111008dc Hack: full repaint of text inset in Tabular. This will do until I can optimize it. We've never done anything but full repaint anyway in tabular.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19948 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 14:02:12 +00:00
Abdelrazak Younes
bf728ca386 de-indent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19947 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 13:46:19 +00:00
Martin Vermeer
795d4ba423 another translation disambiguation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19945 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 12:07:14 +00:00
Martin Vermeer
92e8e19363 Further cleanup, decoration -> geometry, bugfix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19944 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 12:05:41 +00:00
Martin Vermeer
b779dbc683 Fix ambiguity in translation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19943 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 11:09:46 +00:00
Abdelrazak Younes
2bff0157b6 Transfer Text::drawSelection() to TextMetrics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19940 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 10:05:12 +00:00
Abdelrazak Younes
44e4909aba compil fix and cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19939 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 10:01:31 +00:00
José Matox
b3d5000a64 Increment file format due to the embedded feature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19938 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 09:46:14 +00:00
Martin Vermeer
2854410d7b Cleanup: Replace decoration() calls by geometry(). (And get rid of unused call)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19937 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 07:15:32 +00:00
Abdelrazak Younes
3e77ba1eab remove unneeded drawSelection() method.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19936 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 07:10:24 +00:00
André Pönitz
a1cec91afa move our stuff off the Q* namespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19935 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 05:53:55 +00:00
Abdelrazak Younes
44812bdec2 Transfer Text::drawSelection() from InsetText::drawSelection() to InsetText::draw(). This enables to take care of the background at one place. This will also enable to draw only the selection in the future (and not the full inset).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19934 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 22:46:22 +00:00
Abdelrazak Younes
8a45e185dc compil fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19928 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 22:30:31 +00:00
Abdelrazak Younes
32a0ece3de compil fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19927 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 22:30:14 +00:00
André Pönitz
4351ee8c3c cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19926 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 22:25:35 +00:00
Abdelrazak Younes
d0b8d63d2c fix text background painting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19925 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 22:12:13 +00:00
Bo Peng
692363bbca Embedding patch two: read/write embedded files'
*  src/insets/InsetGraphics.h
	*  src/insets/InsetExternal.cpp
	*  src/insets/InsetGraphics.cpp
	*  src/insets/InsetInclude.cpp
	*  src/insets/Inset.h
	*  src/insets/InsetInclude.h
	*  src/insets/InsetExternal.h: register embedded files
	*  src/EmbeddedFiles.h|cpp: core of embedded files
	*  src/Buffer.h|cpp: read/write embed file
	*  src/BufferParams.h|cpp: embedded flag
	*  src/Makefile.am
	*  po/POTFILES.in
	*  development/scons/scons_manifest.py: build system updates


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19924 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 20:46:42 +00:00
André Pönitz
edd3e65556 compile fiz
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19923 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 20:14:33 +00:00
André Pönitz
f82c3e8e65 xpm -> png
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19922 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 20:09:12 +00:00
Abdelrazak Younes
9b9168c31a Fix redrawing bug for multirow inlined collapsable inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19921 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 19:27:33 +00:00
André Pönitz
ed858d73e5 use bald pointers in clone()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19920 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 18:03:17 +00:00
Abdelrazak Younes
b45bc7944d Fix DEPM crash within inset.
* BufferView::updateMetrics(): always clear the full text_metrics_ when doing a full update.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19919 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 16:48:47 +00:00
Abdelrazak Younes
a088c6754a Finally enable single row repainting within insets! The inset width needs to stay fixed of course.
* BufferView::draw(): makes use of PainterInfo::full_repaint
* TextMetrics::drawParagraph(): ditto.
* InsetText::drawSelection(): don't fillRectangle() if there's no selection.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19918 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 15:17:38 +00:00
Enrico Forestieri
821bdfbc8d Save the right timestamp and checksum of an opened file.
* src/Buffer.cpp (Buffer::readFile): save timestamp and checksum
	of the original disk file, and not those of the file converted
	to current format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19916 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 14:50:12 +00:00
Abdelrazak Younes
a904d97565 stupid copy&paste bug fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19915 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 14:26:52 +00:00
Edwin Leuven
d927e69716 single depth for preference items,
fixes bug http://bugzilla.lyx.org/show_bug.cgi?id=4153

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19914 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 14:22:56 +00:00
Abdelrazak Younes
ed1487dd8e * RowPainter: store PainterInfo reference instead of creating one.
* PainterInfo: new full_repaint member.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19913 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 13:53:02 +00:00
Abdelrazak Younes
97f66c07f6 * RowPainter:
- paintOnlyInsets(): new public method for inset painting only in case the inset dimension didn't change within a Row.
- paintInset(): put out everything not strictly related to the inset painting itself.
- paintHfill(): new private method to cut the reduce code in paintText().

* TextMetrics::drawParagraph(): use paintOnlyInsets() when the Row text nor it's dimension changed.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19912 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 13:19:24 +00:00
Alfredo Braunstein
80df00006c solve Bug 3600 by eliminating a call to stripLeadingSpaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19911 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 12:28:22 +00:00
Abdelrazak Younes
3ee543a64e * RowPainter::paintFromPos(): transfer inset part to paintInset()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19910 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 09:01:30 +00:00
Martin Vermeer
99848328b6 Fix old error string in Cases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19908 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 08:21:28 +00:00
Richard Heck
781f1af8d7 Fix bug 3999: Highlight search text.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19907 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-30 01:26:18 +00:00
Abdelrazak Younes
79ba8fe22a Bug fixes. changed_ was always true...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19901 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 23:06:14 +00:00
Richard Heck
7f17f13bfc Get package things working with modules prior to UI patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19900 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 22:59:25 +00:00
Abdelrazak Younes
8239945aa7 Enable use of Row::changed()
* TextMetrics::redoParagraph(): crop the RowList if it is too big.
* ParagraphMetrics::reset():  don't clear its RowList.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19897 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 21:33:11 +00:00